Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
6bc2787602 | ||
|
|
96a6830e61 | ||
|
|
176f680ff7 | ||
|
|
62f66d7eed | ||
|
|
f131db31c6 | ||
|
|
8b83990a66 | ||
|
|
4472202afb | ||
|
|
2040266ab2 | ||
|
|
1774987dea | ||
|
|
6c60298e8f | ||
|
|
41b320a5b9 | ||
|
|
1096f0e28d | ||
|
|
b0730b9ed3 | ||
|
|
163a7f2587 | ||
|
|
4f2707a374 | ||
|
|
0ca66c6d1c |
@@ -10,9 +10,9 @@
|
||||
}
|
||||
],
|
||||
"require": {
|
||||
"igaster/laravel-theme": "^2.0.12",
|
||||
"igaster/laravel-theme": "^2.0.15",
|
||||
"creativeorange/gravatar": "^1.0",
|
||||
"orchestra/asset": "^3.6"
|
||||
"orchestra/asset": "^4.0"
|
||||
},
|
||||
"require-dev": {
|
||||
},
|
||||
|
||||
@@ -5,7 +5,16 @@
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="login-box">
|
||||
@if(isset($login_note) AND $login_note)
|
||||
<div class="alert alert-info alert-dismissible m-auto">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
|
||||
<h5><i class="icon fa fa-info"></i> NOTE!</h5>
|
||||
{!! $login_note !!}
|
||||
</div>
|
||||
<br>
|
||||
@endisset
|
||||
|
||||
<div class="login-box m-auto">
|
||||
<div class="login-logo">
|
||||
<a>{!! config('app.name_html_long') !!}</a>
|
||||
</div>
|
||||
@@ -70,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>
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -13,7 +13,8 @@
|
||||
|
||||
<!-- Content Wrapper. Contains page content -->
|
||||
<div class="content-wrapper">
|
||||
|
||||
<!-- In case we have input fields in the header -->
|
||||
@yield('page-form-start')
|
||||
@include('adminlte::layouts.partials.contentheader')
|
||||
|
||||
<!-- Main content -->
|
||||
@@ -24,6 +25,7 @@
|
||||
</div>
|
||||
</section><!-- /.content -->
|
||||
|
||||
@yield('page-form-end')
|
||||
</div><!-- /.content-wrapper -->
|
||||
|
||||
@isset($controlsidebar)
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
<div class="content-header d-print-none">
|
||||
<div class="container-fluid">
|
||||
<div class="row mb-2">
|
||||
<div class="col-sm-6">
|
||||
<div class="col-sm-8">
|
||||
<h1 class="m-0 text-dark">@yield('contentheader_title', 'Content Title')</h1>
|
||||
<small>@yield('contentheader_description','Description')</small>
|
||||
</div><!-- /.col -->
|
||||
|
||||
<div class="col-sm-6">
|
||||
<div class="col-sm-4">
|
||||
<ol class="breadcrumb float-sm-right small">
|
||||
<li class="breadcrumb-item"><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}">Home</a></li>
|
||||
@isset($breadcrumb)
|
||||
|
||||
@@ -39,7 +39,12 @@
|
||||
<link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}">
|
||||
|
||||
@if(file_exists('css/fixes.css'))
|
||||
<!-- CSS Fixes -->
|
||||
<!-- CSS Fixes -->
|
||||
<link rel="stylesheet" href="{{ asset('/css/fixes.css') }}">
|
||||
@endif
|
||||
|
||||
@if(file_exists('css/custom.css'))
|
||||
<!-- Custom CSS -->
|
||||
<link rel="stylesheet" href="{{ asset('/css/custom.css') }}">
|
||||
@endif
|
||||
</head>
|
||||
@@ -11,7 +11,7 @@
|
||||
<!-- SEARCH FORM -->
|
||||
<form class="form-inline ml-3">
|
||||
<div class="input-group input-group-sm">
|
||||
<input class="form-control form-control-navbar" name="q" type="search" placeholder="Search" aria-label="Search">
|
||||
<input class="form-control form-control-navbar" name="q" type="search" placeholder="Search" aria-label="Search" autocomplete="off">
|
||||
<div class="input-group-append">
|
||||
<button class="btn btn-navbar" type="submit">
|
||||
<i class="fa fa-search"></i>
|
||||
@@ -59,7 +59,7 @@
|
||||
</div>
|
||||
</li>
|
||||
@else
|
||||
<a href="{{ url('login') }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
|
||||
<a href="{{ url()->current().'?login=1' }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
|
||||
@endif
|
||||
|
||||
<!-- Control Side Bar -->
|
||||
|
||||
@@ -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,9 +77,14 @@
|
||||
$(this).removeClass('hold-transition');
|
||||
});
|
||||
}else{
|
||||
$("body").addClass('sidebar-collapse');
|
||||
$("body").queue(sidebaropenclose(false,true));
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
</script>
|
||||
|
||||
@if(file_exists('js/custom.js'))
|
||||
<!-- Any Custom JS -->
|
||||
<script src="{{ asset('js/custom.js') }}"></script>
|
||||
@endif
|
||||
@@ -11,11 +11,16 @@
|
||||
<!-- Sidebar user panel (optional) -->
|
||||
<div class="user-panel mt-3 pb-3 mb-3 d-flex">
|
||||
<div class="image">
|
||||
<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
|
||||
@if($user->exists)
|
||||
<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
|
||||
@else
|
||||
<a name="login" href="{{ url()->current().'?login=1' }}" class="d-block"><i class="pl-1 fa fa-3x fa-lock"></i></a>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
<div class="info">
|
||||
<a href="{{ url('login') }}" class="d-block">{{ $user->name ?: 'Nobody' }}</a>
|
||||
@isset($user->lastlogin)<a span="d-block"><small><span style="color: #747474;">Last On:</span> {{ $user->lastlogin->format('Y-m-d H:i') }}</small></a>@endisset
|
||||
<a href="{{ url('login') }}" class="d-block">{{ $user->exists ? ($user->name ?: 'No Name') : 'Login' }}</a>
|
||||
@isset($user->lastlogin)<a name="login" span="d-block"><small><span style="color: #747474;">Last On:</span> {{ $user->lastlogin->format('Y-m-d H:i') }}</small></a>@endisset
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ if (! function_exists('array_undot')) {
|
||||
$array = [];
|
||||
|
||||
foreach ($dotNotationArray as $key => $value) {
|
||||
array_set($array, $key, $value);
|
||||
\Illuminate\Support\Arr::set($array, $key, $value);
|
||||
}
|
||||
|
||||
return $array;
|
||||
|
||||
Reference in New Issue
Block a user