Fix login and password resets forms
This commit is contained in:
Deon George
parent
f1787aaa32
commit
98b7b9f6a8
@ -24,7 +24,7 @@ return [
|
|||||||
'conditions' => 'Terms and conditions',
|
'conditions' => 'Terms and conditions',
|
||||||
'register' => 'Register',
|
'register' => 'Register',
|
||||||
'login' => 'Login',
|
'login' => 'Login',
|
||||||
'membreship' => 'I already have a membership',
|
'membership' => 'I already have a membership',
|
||||||
'passwordclickreset' => 'Click here to reset your password:',
|
'passwordclickreset' => 'Click here to reset your password:',
|
||||||
'signGithub' => 'Sign in using Github',
|
'signGithub' => 'Sign in using Github',
|
||||||
'signFacebook' => 'Sign in using Facebook',
|
'signFacebook' => 'Sign in using Facebook',
|
||||||
@ -51,35 +51,21 @@ return [
|
|||||||
'level' => 'Level',
|
'level' => 'Level',
|
||||||
'here' => 'Here',
|
'here' => 'Here',
|
||||||
'recentactivity' => 'Recent Activity',
|
'recentactivity' => 'Recent Activity',
|
||||||
'descriptionpackage' => 'A Laravel 5 package that switchs default Laravel scaffolding/boilerplate to AdminLTE template',
|
|
||||||
'createdby' => 'Created by',
|
'createdby' => 'Created by',
|
||||||
'seecode' => 'See code at',
|
'seecode' => 'See code at',
|
||||||
'online' => 'Online',
|
'online' => 'Online',
|
||||||
'home' => 'Home',
|
'home' => 'Home',
|
||||||
'header' => 'HEADER',
|
'header' => 'HEADER',
|
||||||
'anotherlink' => 'Another Link',
|
|
||||||
'multilevel' => 'Multilevel',
|
|
||||||
'linklevel2' => 'Link in level2',
|
|
||||||
'birthday' => 'Langdon\'s Birthday',
|
|
||||||
'birthdaydate' => 'Will be 23 on April 24th',
|
|
||||||
'progress' => 'Tasks Progress',
|
'progress' => 'Tasks Progress',
|
||||||
'customtemplate' => 'Custom Template Design',
|
|
||||||
'statstab' => 'Stats Tab Content',
|
'statstab' => 'Stats Tab Content',
|
||||||
'generalset' => 'General Settings',
|
'generalset' => 'General Settings',
|
||||||
'reportpanel' => 'Report panel usage',
|
'reportpanel' => 'Report panel usage',
|
||||||
'checked' => 'checked',
|
'checked' => 'checked',
|
||||||
'informationsettings' => 'Some information about this general settings option',
|
|
||||||
'togglenav' => 'Toggle navigation',
|
'togglenav' => 'Toggle navigation',
|
||||||
'tabmessages' => 'You have 4 messages',
|
|
||||||
'supteam' => 'Support Team',
|
'supteam' => 'Support Team',
|
||||||
'awesometheme' => 'Why not buy a new awesome theme?',
|
|
||||||
'allmessages' => 'See All Messages',
|
'allmessages' => 'See All Messages',
|
||||||
'notifications' => 'You have 10 notifications',
|
|
||||||
'newmembers' => '5 new members joined today',
|
|
||||||
'viewall' => 'View all',
|
'viewall' => 'View all',
|
||||||
'tasks' => 'You have 9 tasks',
|
|
||||||
'alltasks' => 'View all tasks',
|
'alltasks' => 'View all tasks',
|
||||||
'desbuttons' => 'Design some buttons',
|
|
||||||
'complete' => 'Complete',
|
'complete' => 'Complete',
|
||||||
'membersince' => 'Member since',
|
'membersince' => 'Member since',
|
||||||
'followers' => 'Followers',
|
'followers' => 'Followers',
|
||||||
@ -87,26 +73,15 @@ return [
|
|||||||
'friends' => 'Friends',
|
'friends' => 'Friends',
|
||||||
'profile' => 'Profile',
|
'profile' => 'Profile',
|
||||||
'signout' => 'Sign out',
|
'signout' => 'Sign out',
|
||||||
'landingdescription' => 'Laravel 5 package that switchs default Laravel scaffolding/boilerplate to AdminLTE template with Bootstrap 3.0 and Pratt Landing page',
|
|
||||||
'landingdescriptionpratt' => 'Acacha AdminLTE Laravel package template Landing page - Using Pratt',
|
|
||||||
'description' => 'Description',
|
|
||||||
'showcase' => 'Showcase',
|
'showcase' => 'Showcase',
|
||||||
'contact' => 'Contact',
|
'contact' => 'Contact',
|
||||||
'laravelpackage' => '5 package that switchs default Laravel',
|
|
||||||
'to' => 'to',
|
'to' => 'to',
|
||||||
'templatewith' => 'template with',
|
|
||||||
'and' => 'and',
|
'and' => 'and',
|
||||||
'gedstarted' => 'Get Started!',
|
'gedstarted' => 'Get Started!',
|
||||||
'amazing' => 'Amazing admin template',
|
|
||||||
'basedadminlte' => 'Based on adminlte bootstrap theme',
|
|
||||||
'awesomepackaged' => 'Awesome packaged...',
|
|
||||||
'by' => 'by',
|
'by' => 'by',
|
||||||
'at' => 'at',
|
'at' => 'at',
|
||||||
'readytouse' => 'ready to use with Laravel!',
|
|
||||||
'designed' => 'Designed To Excel',
|
|
||||||
'community' => 'Community',
|
'community' => 'Community',
|
||||||
'see' => 'See',
|
'see' => 'See',
|
||||||
'githubproject' => 'Github project',
|
|
||||||
'post' => 'post',
|
'post' => 'post',
|
||||||
'issues' => 'issues',
|
'issues' => 'issues',
|
||||||
'pullrequests' => 'Pull requests',
|
'pullrequests' => 'Pull requests',
|
||||||
@ -114,10 +89,6 @@ return [
|
|||||||
'monitoring' => 'Monitoring',
|
'monitoring' => 'Monitoring',
|
||||||
'whatnew' => 'What\'s New?',
|
'whatnew' => 'What\'s New?',
|
||||||
'features' => 'Some Features',
|
'features' => 'Some Features',
|
||||||
'design' => 'First Class Design',
|
|
||||||
'retina' => 'Retina Ready Theme',
|
|
||||||
'support' => 'Awesome Support',
|
|
||||||
'responsive' => 'Responsive Design',
|
|
||||||
'screenshots' => 'Some Screenshots',
|
'screenshots' => 'Some Screenshots',
|
||||||
'address' => 'Address',
|
'address' => 'Address',
|
||||||
'dropus' => 'Drop Us A Line',
|
'dropus' => 'Drop Us A Line',
|
||||||
@ -137,4 +108,6 @@ return [
|
|||||||
'entering' => 'Entering...',
|
'entering' => 'Entering...',
|
||||||
'registered' => 'User Registered!',
|
'registered' => 'User Registered!',
|
||||||
'switchoff' => 'Switch Back',
|
'switchoff' => 'Switch Back',
|
||||||
|
'success' => 'Success!',
|
||||||
|
'resetemaillink' => 'We have e-mailed your password reset link!',
|
||||||
];
|
];
|
||||||
|
|||||||
@ -1,53 +1,54 @@
|
|||||||
@extends('adminlte::layouts.auth')
|
@extends('adminlte::layouts.auth')
|
||||||
|
|
||||||
@section('htmlheader_title')
|
@section('htmlheader_title')
|
||||||
Log in
|
Log in
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
<body class="hold-transition login-page">
|
<body class="hold-transition login-page">
|
||||||
<div id="app" v-cloak>
|
<div id="app" v-cloak>
|
||||||
<div class="login-box">
|
<div class="login-box">
|
||||||
<div class="login-logo">
|
<div class="login-logo">
|
||||||
<a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
|
<a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
|
||||||
</div><!-- /.login-logo -->
|
</div><!-- /.login-logo -->
|
||||||
|
|
||||||
@if (count($errors) > 0)
|
@if (count($errors) > 0)
|
||||||
<div class="alert alert-danger">
|
<div class="alert alert-danger">
|
||||||
<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
|
<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
|
||||||
<ul>
|
<ul>
|
||||||
@foreach ($errors->all() as $error)
|
@foreach ($errors->all() as $error)
|
||||||
<li>{{ $error }}</li>
|
<li>{{ $error }}</li>
|
||||||
@endforeach
|
@endforeach
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
<div class="login-box-body">
|
<div class="login-box-body">
|
||||||
<p class="login-box-msg"> {{ trans('adminlte_lang::message.siginsession') }} </p>
|
<p class="login-box-msg">{{ trans('adminlte_lang::message.siginsession') }}</p>
|
||||||
|
|
||||||
<login-form name="{{ config('auth.providers.users.field','email') }}"
|
<login-form name="{{ config('auth.providers.users.field','email') }}"
|
||||||
domain="{{ config('auth.defaults.domain','') }}"></login-form>
|
domain="{{ config('auth.defaults.domain','') }}"></login-form>
|
||||||
|
|
||||||
<a href="{{ url('/password/reset') }}">{{ trans('adminlte_lang::message.forgotpassword') }}</a><br>
|
<a href="{{ url('/password/reset') }}">{{ trans('adminlte_lang::message.forgotpassword') }}</a><br>
|
||||||
|
|
||||||
@if(count(config('auth.social',[])))
|
@if(count(config('auth.social',[])))
|
||||||
@include('adminlte::auth.partials.social_login')
|
@include('adminlte::auth.partials.social_login')
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div><!-- /.login-box-body -->
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@include('adminlte::layouts.partials.scripts_auth')
|
</div><!-- /.login-box -->
|
||||||
|
</div>
|
||||||
|
|
||||||
<script>
|
@include('adminlte::layouts.partials.scripts_auth')
|
||||||
$(function () {
|
|
||||||
$('input').iCheck({
|
<script>
|
||||||
checkboxClass: 'icheckbox_square-blue',
|
$(function () {
|
||||||
radioClass: 'iradio_square-blue',
|
$('input').iCheck({
|
||||||
increaseArea: '20%' // optional
|
checkboxClass: 'icheckbox_square-blue',
|
||||||
});
|
radioClass: 'iradio_square-blue',
|
||||||
});
|
increaseArea: '20%' // optional
|
||||||
</script>
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
</body>
|
</body>
|
||||||
@endsection
|
@endsection
|
||||||
@ -1,59 +1,45 @@
|
|||||||
@extends('adminlte::layouts.auth')
|
@extends('adminlte::layouts.auth')
|
||||||
|
|
||||||
@section('htmlheader_title')
|
@section('htmlheader_title')
|
||||||
Password recovery
|
Password recovery
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
<body class="hold-transition login-page">
|
||||||
|
<div id="app" v-cloak>
|
||||||
|
<div class="login-box">
|
||||||
|
<div class="login-logo">
|
||||||
|
<a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
|
||||||
|
</div><!-- /.login-logo -->
|
||||||
|
|
||||||
<body class="login-page">
|
@if (session('status'))
|
||||||
<div id="app">
|
<div class="alert alert-success">
|
||||||
|
{{ session('status') }}
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
<div class="login-box">
|
@if (count($errors) > 0)
|
||||||
<div class="login-logo">
|
<div class="alert alert-danger">
|
||||||
<a href="{{ url('/home') }}"><b>Admin</b>LTE</a>
|
<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
|
||||||
</div><!-- /.login-logo -->
|
<ul>
|
||||||
|
@foreach ($errors->all() as $error)
|
||||||
|
<li>{{ $error }}</li>
|
||||||
|
@endforeach
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
@if (session('status'))
|
<div class="login-box-body">
|
||||||
<div class="alert alert-success">
|
<p class="login-box-msg">{{ trans('adminlte_lang::message.passwordreset') }}</p>
|
||||||
{{ session('status') }}
|
|
||||||
</div>
|
|
||||||
@endif
|
|
||||||
|
|
||||||
@if (count($errors) > 0)
|
<email-reset-password-form></email-reset-password-form>
|
||||||
<div class="alert alert-danger">
|
|
||||||
<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
|
|
||||||
<ul>
|
|
||||||
@foreach ($errors->all() as $error)
|
|
||||||
<li>{{ $error }}</li>
|
|
||||||
@endforeach
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
@endif
|
|
||||||
|
|
||||||
<div class="login-box-body">
|
<a href="{{ url('/login') }}">Log in</a><br>
|
||||||
<p class="login-box-msg">Reset Password</p>
|
</div><!-- /.login-box-body -->
|
||||||
|
|
||||||
<email-reset-password-form></email-reset-password-form>
|
</div><!-- /.login-box -->
|
||||||
|
</div>
|
||||||
|
|
||||||
<a href="{{ url('/login') }}">Log in</a><br>
|
@include('adminlte::layouts.partials.scripts_auth')
|
||||||
|
|
||||||
</div><!-- /.login-box-body -->
|
|
||||||
|
|
||||||
</div><!-- /.login-box -->
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@include('adminlte::layouts.partials.scripts_auth')
|
|
||||||
|
|
||||||
<script>
|
|
||||||
$(function () {
|
|
||||||
$('input').iCheck({
|
|
||||||
checkboxClass: 'icheckbox_square-blue',
|
|
||||||
radioClass: 'iradio_square-blue',
|
|
||||||
increaseArea: '20%' // optional
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
@endsection
|
@endsection
|
||||||
@ -0,0 +1,46 @@
|
|||||||
|
@extends('adminlte::layouts.auth')
|
||||||
|
|
||||||
|
@section('htmlheader_title')
|
||||||
|
Password reset
|
||||||
|
@endsection
|
||||||
|
|
||||||
|
@section('content')
|
||||||
|
<body class="hold-transition login-page">
|
||||||
|
<div id="app" v-cloak>
|
||||||
|
<div class="login-box">
|
||||||
|
<div class="login-logo">
|
||||||
|
<a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
|
||||||
|
</div><!-- /.login-logo -->
|
||||||
|
|
||||||
|
@if (session('status'))
|
||||||
|
<div class="alert alert-success">
|
||||||
|
{{ session('status') }}
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if (count($errors) > 0)
|
||||||
|
<div class="alert alert-danger">
|
||||||
|
<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
|
||||||
|
<ul>
|
||||||
|
@foreach ($errors->all() as $error)
|
||||||
|
<li>{{ $error }}</li>
|
||||||
|
@endforeach
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<div class="login-box-body">
|
||||||
|
<p class="login-box-msg">{{ trans('adminlte_lang::message.passwordreset') }}</p>
|
||||||
|
|
||||||
|
<reset-password-form token="{{ $token }}">></reset-password-form>
|
||||||
|
|
||||||
|
<a href="{{ url('/login') }}">Log in</a><br>
|
||||||
|
<a href="{{ url('/register') }}" class="text-center">{{ trans('adminlte_lang::message.register') }}</a>
|
||||||
|
</div><!-- /.login-box-body -->
|
||||||
|
|
||||||
|
</div><!-- /.login-box -->
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@include('adminlte::layouts.partials.scripts_auth')
|
||||||
|
</body>
|
||||||
|
@endsection
|
||||||
Loading…
Reference in New Issue
Block a user