Compare commits

...

3 Commits

Author SHA1 Message Date
Deon George
6bc2787602 Improved sidebar open/close handling 2020-03-11 12:41:36 +11:00
Deon George
96a6830e61 Changed carbon method naming to be consistent with Carbon itself 2020-02-08 17:52:13 +11:00
Deon George
176f680ff7 Enabled password reset forms 2020-01-22 20:48:42 +11:00
5 changed files with 138 additions and 81 deletions

View File

@@ -79,12 +79,12 @@
@endif
<p class="mb-1">
<a name="reset" href="{{ url('/password/reset') }}">{{ trans('adminlte_lang::message.forgotpassword') }}</a>
<a name="reset" href="{{ url('password/reset') }}">{{ trans('adminlte_lang::message.forgotpassword') }}</a>
</p>
@isset($register)
<p class="mb-0">
<a href="register.html" class="text-center">Register a new membership</a>
<a href="{{ url('register') }}" class="text-center">{{ trans('adminlte_lang::message.register') }}</a>
</p>
@endisset
</div>

View File

@@ -5,41 +5,63 @@
@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 -->
<div class="login-box m-auto">
<div class="login-logo">
<a>{!! config('app.name_html_long') !!}</a>
</div>
@if (session('status'))
<div class="alert alert-success">
{{ session('status') }}
@if (Session::has('status'))
<div class="text-center mb-3">
<div class="alert alert-success m-auto">
<strong>OK!</strong> {{ Session::get('status') }}
</div>
@endif
</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
@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>
<!-- /.login-logo -->
<div class="card">
<div class="card-body login-card-body">
<p class="login-box-msg">You forgot your password? Here you can easily retrieve a new password.</p>
<email-reset-password-form></email-reset-password-form>
<form method="post" action="{{ url('password/email') }}">
{{ csrf_field() }}
<div class="input-group mb-3">
<input type="email" name="email" class="form-control" placeholder="Email" required>
<div class="input-group-append">
<span class="fa fa-envelope input-group-text"></span>
</div>
</div>
<div class="row">
<div class="col-12">
<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.sendpassword') }}</button>
</div>
<!-- /.col -->
</div>
</form>
<a href="{{ url('/login') }}">Log in</a><br>
</div><!-- /.login-box-body -->
<p class="mt-3 mb-1">
<a href="{{ url('login') }}">{{ trans('adminlte_lang::message.login') }}</a>
</p>
</div><!-- /.login-box -->
@isset($register)
<p class="mb-0">
<a href="{{ url('register') }}" class="text-center">{{ trans('adminlte_lang::message.register') }}</a>
</p>
@endisset
</div>
<!-- /.login-card-body -->
</div>
</div>
@include('adminlte::layouts.partials.scripts_auth')
</body>
<!-- /.login-box -->
@endsection

View File

@@ -5,42 +5,65 @@
@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 -->
<div class="login-box m-auto">
<div class="login-logo">
<a>{!! config('app.name_html_long') !!}</a>
</div>
@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
@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
<!-- /.login-logo -->
<div class="card">
<div class="card-body login-card-body">
<p class="login-box-msg">You are only one step a way from your new password, set your new password now.</p>
<div class="login-box-body">
<p class="login-box-msg">{{ trans('adminlte_lang::message.passwordreset') }}</p>
<form method="post" action="{{ url('password/reset') }}">
{{ csrf_field() }}
<div class="input-group mb-3">
<input type="email" name="email" class="form-control" placeholder="Email" required>
<div class="input-group-append">
<span class="fa fa-envelope input-group-text"></span>
</div>
</div>
<div class="input-group mb-3">
<input type="password" name="password" class="form-control" placeholder="Password" required>
<div class="input-group-append">
<span class="fa fa-lock input-group-text"></span>
</div>
</div>
<div class="input-group mb-3">
<input type="password" name="password_confirmation" class="form-control" placeholder="Confirm Password" data-match="#password" required>
<div class="input-group-append">
<span class="fa fa-lock input-group-text"></span>
</div>
</div>
<div class="row">
<div class="col-12">
<button type="submit" class="btn btn-primary btn-block">{{ trans('adminlte_lang::message.passwordreset') }}</button>
</div>
<!-- /.col -->
</div>
<input type="hidden" name="token" value="{{ $token }}">
</form>
<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 -->
<p class="mt-3 mb-1">
<a href="{{ url('login') }}">Login</a>
@isset($register)
<a href="{{ url('register') }}" class="text-center">{{ trans('adminlte_lang::message.register') }}</a>
@endisset
</p>
</div>
<!-- /.login-card-body -->
</div>
</div>
@include('adminlte::layouts.partials.scripts_auth')
</body>
<!-- /.login-box -->
@endsection

View File

@@ -14,6 +14,7 @@
});
$.AdminLTESidebarTweak = {};
$.AdminLTESidebarTweak.Open = true;
$.AdminLTESidebarTweak.options = {
EnableRemember: true,
@@ -24,6 +25,29 @@
// Work out our timezone.
const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
/**
* Open and close the sidebar
* @param state
* @param addclass
*/
function sidebaropenclose(state,addclass) {
// Dont do anything if the state hasnt changed.
if (state == $.AdminLTESidebarTweak.Open) {
return;
}
$.AdminLTESidebarTweak.Open = state;
if (addclass !== 'undefined')
$("body")
.addClass(state ? 'sidebar-open' : 'sidebar-collapse');
$(this).delay(500).queue(function() {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
}
$(function () {
"use strict";
@@ -31,22 +55,15 @@
if($.AdminLTESidebarTweak.options.EnableRemember) {
document.cookie = "toggleState=closed;path=/";
$("body").delay(500).queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
$("body").queue(sidebaropenclose(false));
}
});
// @todo this is not firing.
$("body").on("shown.lte.pushmenu", function(){
if($.AdminLTESidebarTweak.options.EnableRemember){
document.cookie = "toggleState=opened;path=/";
$("body").delay(500).queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
$("body").queue(sidebaropenclose(true));
}
});
@@ -60,12 +77,7 @@
$(this).removeClass('hold-transition');
});
}else{
$("body")
.addClass('sidebar-collapse')
.delay(500).queue(function () {
window.dispatchEvent(new Event('resize'));
$(this).dequeue();
});
$("body").queue(sidebaropenclose(false,true));
}
}
}

View File

@@ -34,7 +34,7 @@ class Carbon extends CarbonBase
*
* @return static
*/
public function firstOfHalf($dayOfWeek = null)
public function startOfHalf($dayOfWeek = null)
{
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF - 5, 1)->firstOfMonth($dayOfWeek);
}
@@ -49,7 +49,7 @@ class Carbon extends CarbonBase
*
* @return static
*/
public function lastOfHalf($dayOfWeek = null)
public function endOfHalf($dayOfWeek = null)
{
return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF, 1)->lastOfMonth($dayOfWeek);
}