No longer using // urls, and fixed sudo rendoring

composer.json

@@ -10,7 +10,9 @@
         }
     ],
     "require": {
-      "igaster/laravel-theme": "2.0.6",
+      "igaster/laravel-theme": "^2.0",
+      "acacha/user": "^0.2.2",
+      "creativeorange/gravatar": "^1.0",
       "orchestra/asset": "^3.6"
     },
     "require-dev": {

resources/themes/adminlte/lang/en/message.php

@@ -24,15 +24,16 @@ return [
     'conditions'              => 'Terms and conditions',
     'register'                => 'Register',
     'login'                   => 'Login',
-    'membreship'              => 'I already have a membership',
+    'membership'              => 'I already have a membership',
     'passwordclickreset'      => 'Click here to reset your password:',
     'signGithub'              => 'Sign in using Github',
     'signFacebook'            => 'Sign in using Facebook',
     'signTwitter'             => 'Sign in using Twitter',
     'signGoogle+'             => 'Sign in using Google+',
-    'signLinkedin'             => 'Sign in using Linkedin',
+    'signLinkedin'            => 'Sign in using Linkedin',
     'signW3id'                => 'Sign in using W3id',
     'signIBMid'               => 'Sign in using IBMid',
+	'signMeetup'              => 'Sign in using Meetup',
     'sendpassword'            => 'Send Password Reset Link',
     'passwordreset'           => 'Reset password',
     'pagenotfound'            => 'Page not found',
@@ -51,35 +52,21 @@ return [
     'level'                   => 'Level',
     'here'                    => 'Here',
     'recentactivity'          => 'Recent Activity',
-    'descriptionpackage'      => 'A Laravel 5 package that switchs default Laravel scaffolding/boilerplate to AdminLTE template',
     'createdby'               => 'Created by',
     'seecode'                 => 'See code at',
     'online'                  => 'Online',
     'home'                    => 'Home',
     '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',
-    'customtemplate'          => 'Custom Template Design',
     'statstab'                => 'Stats Tab Content',
     'generalset'              => 'General Settings',
     'reportpanel'             => 'Report panel usage',
     'checked'                 => 'checked',
-    'informationsettings'     => 'Some information about this general settings option',
     'togglenav'               => 'Toggle navigation',
-    'tabmessages'             => 'You have 4 messages',
     'supteam'                 => 'Support Team',
-    'awesometheme'            => 'Why not buy a new awesome theme?',
     'allmessages'             => 'See All Messages',
-    'notifications'           => 'You have 10 notifications',
-    'newmembers'              => '5 new members joined today',
     'viewall'                 => 'View all',
-    'tasks'                   => 'You have 9 tasks',
     'alltasks'                => 'View all tasks',
-    'desbuttons'              => 'Design some buttons',
     'complete'                => 'Complete',
     'membersince'             => 'Member since',
     'followers'               => 'Followers',
@@ -87,26 +74,15 @@ return [
     'friends'                 => 'Friends',
     'profile'                 => 'Profile',
     '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',
     'contact'                 => 'Contact',
-    'laravelpackage'          => '5 package that switchs default Laravel',
     'to'                      => 'to',
-    'templatewith'            => 'template with',
     'and'                     => 'and',
     'gedstarted'              => 'Get Started!',
-    'amazing'                 => 'Amazing admin template',
-    'basedadminlte'           => 'Based on adminlte bootstrap theme',
-    'awesomepackaged'         => 'Awesome packaged...',
     'by'                      => 'by',
     'at'                      => 'at',
-    'readytouse'              => 'ready to use with Laravel!',
-    'designed'                => 'Designed To Excel',
     'community'               => 'Community',
     'see'                     => 'See',
-    'githubproject'           => 'Github project',
     'post'                    => 'post',
     'issues'                  => 'issues',
     'pullrequests'            => 'Pull requests',
@@ -114,10 +90,6 @@ return [
     'monitoring'              => 'Monitoring',
     'whatnew'                 => 'What\'s New?',
     'features'                => 'Some Features',
-    'design'                  => 'First Class Design',
-    'retina'                  => 'Retina Ready Theme',
-    'support'                 => 'Awesome Support',
-    'responsive'              => 'Responsive Design',
     'screenshots'             => 'Some Screenshots',
     'address'                 => 'Address',
     'dropus'                  => 'Drop Us A Line',
@@ -137,4 +109,6 @@ return [
     'entering'                => 'Entering...',
     'registered'              => 'User Registered!',
     'switchoff'               => 'Switch Back',
+    'success'                 => 'Success!',
+    'resetemaillink'          => 'We have e-mailed your password reset link!',
 ];

resources/themes/adminlte/views/auth/login.blade.php

@@ -1,53 +1,77 @@
 @extends('adminlte::layouts.auth')
 
 @section('htmlheader_title')
-    Log in
+	Log in
 @endsection
 
 @section('content')
-<body class="hold-transition login-page">
+	<div class="login-box">
-    <div id="app" v-cloak>
+		<div class="login-logo">
-        <div class="login-box">
+			<a>{!! config('app.name_html_long') !!}</a>
-            <div class="login-logo">
+		</div>
-                <a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
-            </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">
+		<!-- /.login-logo -->
-                <p class="login-box-msg"> {{ trans('adminlte_lang::message.siginsession') }} </p>
+		<div class="card">
+			<div class="card-body login-card-body">
+				<p class="login-box-msg">{{ trans('adminlte_lang::message.siginsession') }}</p>
 
-                <login-form name="{{ config('auth.providers.users.field','email') }}"
+				<form method="post">
-                            domain="{{ config('auth.defaults.domain','') }}"></login-form>
+					{{ csrf_field() }}
+					<div class="input-group mb-3">
+						<input type="email" name="email" class="form-control" placeholder="Email">
+						<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">
+						<div class="input-group-append">
+							<span class="fa fa-lock input-group-text"></span>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-8">
+							<div class="checkbox icheck">
+								<label>
+									<input type="checkbox" name="remember"> Remember Me
+								</label>
+							</div>
+						</div>
+						<!-- /.col -->
+						<div class="col-4">
+							<button type="submit" name="submit" class="btn btn-primary btn-block btn-flat">Sign In</button>
+						</div>
+						<!-- /.col -->
+					</div>
+				</form>
 
-                <a href="{{ url('/password/reset') }}">{{ trans('adminlte_lang::message.forgotpassword') }}</a><br>
+				@if(count(config('auth.social',[])))
+					@include('adminlte::auth.partials.social_login')
+				@endif
 
-                @if(count(config('auth.social',[])))
+				<p class="mb-1">
-                    @include('adminlte::auth.partials.social_login')
+					<a name="reset" href="{{ url('/password/reset') }}">{{ trans('adminlte_lang::message.forgotpassword') }}</a>
-                @endif
+				</p>
-            </div>
-        </div>
-    </div>
 
-    @include('adminlte::layouts.partials.scripts_auth')
+				@isset($register)
-
+					<p class="mb-0">
-    <script>
+						<a href="register.html" class="text-center">Register a new membership</a>
-        $(function () {
+					</p>
-            $('input').iCheck({
+				@endisset
-                checkboxClass: 'icheckbox_square-blue',
+			</div>
-                radioClass: 'iradio_square-blue',
+			<!-- /.login-card-body -->
-                increaseArea: '20%' // optional
+		</div>
-            });
+	</div>
-        });
+	<!-- /.login-box -->
-    </script>
-</body>
 @endsection

resources/themes/adminlte/views/auth/partials/scripts.blade.php

@@ -0,0 +1,14 @@
+<!-- Compiled app javascript -->
+<script src="{{ url (mix('/js/app.js')) }}"></script>
+<!-- iCheck -->
+<script src="{{ asset('/plugin/iCheck/icheck.min.js') }}"></script>
+
+<script>
+    $(document).ready(function() {
+        $('input').iCheck({
+            checkboxClass: 'icheckbox_square-blue',
+            radioClass   : 'iradio_square-blue',
+            increaseArea : '20%' // optional
+        })
+    })
+</script>

resources/themes/adminlte/views/auth/partials/social_login.blade.php

@@ -1,6 +1,9 @@
-<div class="social-auth-links text-center">
+<div class="social-auth-links text-center mb-3">
 	<p>- OR -</p>
 	@foreach(config('auth.social') as $o)
-		<a href="{{ url('/auth/'.$o['id']) }}" class="btn btn-block btn-social btn-{{ $o['class'] }} btn-flat"><i class="fa fa-{{ $o['icon'] }}"></i> {{ trans('adminlte_lang::message.sign'.$o['name']) }}</a>
+	<a href="{{ url('/auth/'.$o['id']) }}" class="btn btn-block btn-{{ $o['class'] }}">
+		<i class="fa fa-{{ $o['icon'] }} mr-2"></i> {{ trans('adminlte_lang::message.sign'.$o['name']) }}
+	</a>
 	@endforeach
-</div><!-- /.social-auth-links -->
+</div>
+<!-- /.social-auth-links -->

resources/themes/adminlte/views/auth/passwords/email.blade.php

@@ -1,59 +1,45 @@
 @extends('adminlte::layouts.auth')
 
 @section('htmlheader_title')
-    Password recovery
+	Password recovery
 @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 -->
 
-<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>
-
+@endsection
-@endsection

resources/themes/adminlte/views/auth/passwords/reset.blade.php

@@ -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

resources/themes/adminlte/views/auth/register.blade.php

@@ -1,44 +0,0 @@
-@extends('adminlte::layouts.auth')
-
-@section('htmlheader_title')
-    Register
-@endsection
-
-@section('content')
-
-<body class="hold-transition register-page">
-    <div id="app" v-cloak>
-        <div class="register-box">
-            <div class="register-logo">
-                <a href="{{ url('/home') }}">{!! config('app.name_html_long') !!}</a>
-            </div>
-
-            @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="register-box-body">
-                <p class="login-box-msg">Register for access</p>
-
-                <register-form></register-form>
-                <!-- #include('adminlte::auth.partials.social_login') -->
-
-                <a href="{{ url('/login') }}" class="text-center">I already have an account</a>
-            </div><!-- /.form-box -->
-        </div><!-- /.register-box -->
-    </div>
-
-    @include('adminlte::layouts.partials.scripts_auth')
-
-    @include('adminlte::auth.terms')
-
-</body>
-
-@endsection

resources/themes/adminlte/views/errors/403.blade.php

@@ -1,20 +0,0 @@
-@extends('adminlte::layouts.errors')
-
-@section('htmlheader_title')
-    {{ trans('adminlte_lang::message.servererror') }}
-@endsection
-
-@section('main-content')
-
-    <div class="error-page">
-        <h2 class="headline text-red">403</h2>
-        <div class="error-content">
-            <h3><i class="fa fa-warning text-red"></i> Oops! Bad Authentication</h3>
-            <p>
-                Sorry, your authentication failed.
-                {{ trans('adminlte_lang::message.mainwhile') }} <a href='{{ url('/home') }}'>{{ trans('adminlte_lang::message.returndashboard') }}</a>.
-            </p>
-            <br>
-        </div>
-    </div><!-- /.error-page -->
-@endsection

resources/themes/adminlte/views/errors/404.blade.php

@@ -1,20 +0,0 @@
-@extends('adminlte::layouts.errors')
-
-@section('htmlheader_title')
-    {{ trans('adminlte_lang::message.pagenotfound') }}
-@endsection
-
-@section('main-content')
-
-    <div class="error-page">
-        <h2 class="headline text-yellow">404</h2>
-        <div class="error-content">
-            <h3><i class="fa fa-warning text-yellow"></i> Oops! {{ trans('adminlte_lang::message.pagenotfound') }}.</h3>
-            <p>
-                {{ trans('adminlte_lang::message.notfindpage') }}
-                {{ trans('adminlte_lang::message.mainwhile') }} <a href='{{ url('/home') }}'>{{ trans('adminlte_lang::message.returndashboard') }}</a>.
-            </p>
-            <br/>
-        </div><!-- /.error-content -->
-    </div><!-- /.error-page -->
-@endsection

resources/themes/adminlte/views/errors/500.blade.php

@@ -1,20 +0,0 @@
-@extends('adminlte::layouts.errors')
-
-@section('htmlheader_title')
-    {{ trans('adminlte_lang::message.servererror') }}
-@endsection
-
-@section('main-content')
-
-    <div class="error-page">
-        <h2 class="headline text-red">500</h2>
-        <div class="error-content">
-            <h3><i class="fa fa-warning text-red"></i> Oops! {{ trans('adminlte_lang::message.somethingwrong') }}</h3>
-            <h4><i class="text-red"></i> {{ trans($msg) }}</h4>
-            <p>
-                {{ trans('adminlte_lang::message.wewillwork') }}
-                {{ trans('adminlte_lang::message.mainwhile') }} <a href='{{ url('/home') }}'>{{ trans('adminlte_lang::message.returndashboard') }}</a>.
-            </p>
-        </div>
-    </div><!-- /.error-page -->
-@endsection

resources/themes/adminlte/views/layouts/app.blade.php

@@ -1,44 +1,46 @@
 <!DOCTYPE html>
 <html lang="en">
-
+	@section('htmlheader')
-@section('htmlheader')
+		@include('adminlte::layouts.partials.htmlheader')
-	@include('adminlte::layouts.partials.htmlheader')
-@show
-
-<body class="fixed hold-transition skin-blue sidebar-mini">
-	<div id="app" v-cloak>
-		<div class="wrapper">
-			@include('adminlte::layouts.partials.mainheader')
-
-			@include('adminlte::layouts.partials.sidebar')
-
-			<!-- Content Wrapper. Contains page content -->
-			<div class="content-wrapper">
-
-				@include('adminlte::layouts.partials.contentheader')
-
-				<!-- Main content -->
-				<section class="content">
-					<div class="row">
-						<!-- Your Page Content Here -->
-						@yield('main-content')
-					</div>
-				</section><!-- /.content -->
-
-			</div><!-- /.content-wrapper -->
-
-			<!-- #include('adminlte::layouts.partials.controlsidebar') -->
-			@include('adminlte::layouts.partials.footer')
-		</div><!-- ./wrapper -->
-	</div> <!-- ./app -->
-
-	@section('scripts')
-		@include('adminlte::layouts.partials.scripts')
-		{{-- Scripts --}}
-		{!! Asset::scripts() !!}
-
-		@yield('page-scripts')
 	@show
 
-</body>
+	<body class="hold-transition sidebar-mini @if (Cookie::get('toggleState') === 'closed') {{ 'sidebar-collapse' }} @endif">
+		<div id="app">
+			<div class="wrapper">
+				@include('adminlte::layouts.partials.mainheader')
+
+				@include('adminlte::layouts.partials.sidebar')
+
+				<!-- Content Wrapper. Contains page content -->
+				<div class="content-wrapper">
+
+					@include('adminlte::layouts.partials.contentheader')
+
+					<!-- Main content -->
+					<section class="content">
+						<div class="container-fluid">
+							<!-- Your Page Content Here -->
+							@yield('main-content')
+						</div>
+					</section><!-- /.content -->
+
+				</div><!-- /.content-wrapper -->
+
+				@isset($controlsidebar)
+					@include('adminlte::layouts.partials.controlsidebar')
+				@endisset
+
+				@include('adminlte::layouts.partials.footer')
+			</div><!-- ./wrapper -->
+		</div> <!-- ./app -->
+
+		@section('scripts')
+			@include('adminlte::layouts.partials.scripts')
+
+			{{-- Scripts --}}
+			{!! Asset::scripts() !!}
+
+			@yield('page-scripts')
+		@show
+	</body>
 </html>

resources/themes/adminlte/views/layouts/auth.blade.php

@@ -1,8 +1,19 @@
 <!DOCTYPE html>
 <html>
+	@section('htmlheader')
+		@include('adminlte::layouts.partials.htmlheader')
 
-@include('adminlte::layouts.partials.htmlheader')
+		<!-- iCheck -->
+		<link rel="stylesheet" href="{{ asset('/plugin/iCheck/square/blue.css') }}">
+	@show
 
-@yield('content')
+	<body class="hold-transition login-page">
+		<div id="app">
+			@yield('content')
+		</div>
 
+		@section('scripts')
+			@include('adminlte::auth.partials.scripts')
+		@show
+	</body>
 </html>

resources/themes/adminlte/views/layouts/errors.blade.php

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-@include('adminlte::layouts.partials.htmlheader')
-<body>
-    <div id="app" v-cloak>
-        <!-- Main content -->
-        <section class="content">
-            <!-- Your Page Content Here -->
-            @yield('main-content')
-        </section>
-    </div>
-    @section('scripts')
-        @include('adminlte::layouts.partials.scripts')
-    @show
-</body>
-</html>

resources/themes/adminlte/views/layouts/partials/contentheader.blade.php

@@ -1,17 +1,24 @@
 <!-- Content Header (Page header) -->
-<section class="content-header">
+<div class="content-header d-print-none">
-    <div id="search_results"></div>
+	<div class="container-fluid">
-    <h1>
+		<div class="row mb-2">
-        @yield('contentheader_title', 'Content Title')
+			<div class="col-sm-6">
-        <small>@yield('contentheader_description')</small>
+				<h1 class="m-0 text-dark">@yield('contentheader_title', 'Content Title')</h1>
-    </h1>
+				<small>@yield('contentheader_description','Description')</small>
-    <ol class="breadcrumb">
+			</div><!-- /.col -->
-        <li><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}"><i class="fa fa-dashboard"></i>Home</a></li>
 
-        @isset($breadcrumb)
+			<div class="col-sm-6">
-            @foreach ($breadcrumb as $item => $url)
+				<ol class="breadcrumb float-sm-right small">
-                <li><a href="{{url($url)}}">{{ $item }}</a></li>
+					<li class="breadcrumb-item"><a href="{{ url('/home'.(isset($ido) ? '/'.$ido->id : '')) }}">Home</a></li>
-            @endforeach
+					@isset($breadcrumb)
-        @endisset
+						@foreach ($breadcrumb as $item => $url)
-    </ol> <!-- /.breadcrumb -->
+							<li class="breadcrumb-item"><a href="{{url($url)}}">{{ $item }}</a></li>
-</section> <!-- /.content-header -->
+						@endforeach
+					@endisset
+					<li class="breadcrumb-item active">@yield('page_title','Page Title')</li>
+				</ol>
+			</div><!-- /.col -->
+		</div><!-- /.row -->
+	</div><!-- /.container-fluid -->
+</div>
+<!-- /.content-header -->

resources/themes/adminlte/views/layouts/partials/controlsidebar.blade.php

@@ -0,0 +1,5 @@
+<!-- Control Sidebar -->
+<aside class="control-sidebar control-sidebar-dark">
+	<!-- Control sidebar content goes here -->
+</aside>
+<!-- /.control-sidebar -->

resources/themes/adminlte/views/layouts/partials/footer.blade.php

@@ -1,8 +1,10 @@
 <!-- Main Footer -->
-<footer class="main-footer no-print">
+<footer class="main-footer">
-    <!-- To the right -->
+	<!-- To the right -->
-    <div class="pull-right hidden-xs">
+	<div class="float-right d-sm-none d-md-block">
-        <a href="#"></a><b>{{ config('app.name') }}</b></a>
+		{{ config('app.name') }}
-    </div>
+	</div>
-    <strong>&copy Leenooks</strong>
+
-</footer>
+	<!-- Default to the left -->
+	<strong>Copyright &copy; 2014-2018 <a href="#">&copy Leenooks</a>.</strong> All rights reserved.
+</footer>

resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php

@@ -6,23 +6,37 @@
 	<!-- CSRF Token -->
 	<meta name="csrf-token" content="{{ csrf_token() }}">
 
-	<link href="{{ asset('/css/all.css') }}" rel="stylesheet" type="text/css" />
+	<link rel="stylesheet" href="{{ asset('/css/app.css') }}">
+
+	<!-- Font Awesome Icons -->
+	<link rel="stylesheet" href="{{ asset('/plugin/font-awesome/css/font-awesome.min.css') }}">
+	<!-- IonIcons -->
+	<link rel="stylesheet" href="{{ request()->getScheme() }}://code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
+	<!-- Theme style -->
+	<link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}">
+	<!-- Google Font: Source Sans Pro -->
+	<link href="{{ request()->getScheme() }}://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
+	@if(file_exists('css/social.css'))
+		<!-- Social Logins -->
+		<link rel="stylesheet" href="{{ asset('/css/social.css') }}">
+	@endif
+	@if(file_exists('css/print.css'))
+		<!-- Printing Modifications -->
+		<link rel="stylesheet" href="{{ asset('/css/print.css') }}">
+	@endif
 
 	<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
 	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
 	<!--[if lt IE 9]>
-	<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+		<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-	<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+		<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
 	<![endif]-->
 
-	<style>
-		body { color: #333; }
-	</style>
-
 	<script>
 		//See https://laracasts.com/discuss/channels/vue/use-trans-in-vuejs
 		window.trans =
 		@php
+			// @todo Cache this processing
 			// copy all translations from /resources/lang/CURRENT_LOCALE/* to global JS variable
 			$lang_files = File::files(resource_path() . '/lang/' . App::getLocale());
 			$trans = [];
@@ -37,4 +51,9 @@
 
 	<!-- STYLESHEETS -->
 	{!! Asset::styles() !!}
+
+	@if(file_exists('css/fixes.css'))
+	<!-- CSS Fixes -->
+		<link rel="stylesheet" href="{{ asset('/css/fixes.css') }}">
+	@endif
 </head>

resources/themes/adminlte/views/layouts/partials/mainheader.blade.php

@@ -1,104 +1,153 @@
 <!-- Main Header -->
-<header class="main-header">
+<!-- Navbar -->
+<nav class="main-header navbar navbar-expand bg-white navbar-light border-bottom">
+	<!-- Left navbar links -->
+	<ul class="navbar-nav">
+		<li class="nav-item">
+			<a class="nav-link" data-widget="pushmenu" href="#"><i class="fa fa-bars"></i></a>
+		</li>
+	</ul>
 
-	<!-- Logo -->
+	<!-- SEARCH FORM -->
-	<a href="{{ url('/home') }}" class="logo">
+	<form class="form-inline ml-3">
-		<!-- mini logo for sidebar mini 50x50 pixels -->
+		<div class="input-group input-group-sm">
-		<span class="logo-mini">{!! config('app.name_html_short','<b>A</b>N') !!}</span>
+			<input class="form-control form-control-navbar" name="q" type="search" placeholder="Search" aria-label="Search">
-		<!-- logo for regular state and mobile devices -->
+			<div class="input-group-append">
-		<span class="logo-lg">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
+				<button class="btn btn-navbar" type="submit">
-	</a>
+					<i class="fa fa-search"></i>
-
+				</button>
-	<!-- Header Navbar -->
+			</div>
-	<nav class="navbar navbar-static-top" role="navigation">
+			<span name="searching" class="d-none"><i class="fa fa-spinner fa-spin fa-fw" style="margin-top: .33em; width: 1em; height: 1em;"></i></span>
-		<!-- Sidebar toggle button-->
+			<div id="search_results"></div>
-		<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
-			<span class="sr-only">{{ trans('adminlte_lang::message.togglenav') }}</span>
-		</a>
-		<!-- Navbar Right Menu -->
-		<div class="navbar-custom-menu">
-			<ul class="nav navbar-nav">
-				<!-- Tasks Menu -->
-				@if (Auth::guest())
-					<li><a href="{{ url('/register') }}">{{ trans('adminlte_lang::message.register') }}</a></li>
-					<li><a href="{{ url('/login') }}">{{ trans('adminlte_lang::message.login') }}</a></li>
-				@else
-
-					@if (isset($topmenu))
-						<!-- Available Data Menu -->
-						<li class="dropdown tasks-menu" id="import_date">
-							<a href="#" class="dropdown-toggle" data-toggle="dropdown">
-								<span class="hidden-xs">Items</span>
-							</a>
-							<ul class="dropdown-menu">
-								<li class="header">Header</li>
-								<li>
-									<ul class="menu small">
-										&nbsp;
-									</ul>
-								</li>
-								<li class="footer"><a href="#">(Not Active)</a></li>
-							</ul>
-						</li>
-					@endif
-
-					<!-- Top Menu Items -->
-					@include('adminlte::layouts.partials.topmenu')
-
-					<li class="dropdown user user-menu @if($user->switched) bg-red @endif" id="user_menu">
-					<!-- Menu Toggle Button -->
-						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
-							<!-- The user image in the navbar-->
-							<img src="{{ Gravatar::get($user->email) }}" class="user-image" alt="User Image"/>
-							<!-- hidden-xs hides the username on small devices so only the image appears. -->
-							<span class="hidden-xs">{{ $user->name }}</span>
-						</a>
-						<ul class="dropdown-menu">
-							<!-- The user image in the menu -->
-							<li class="user-header">
-								<img src="{{ Gravatar::get($user->email) }}" class="img-circle" alt="User Image" />
-								<p>
-									{{ $user->name }}
-									<small>{{ trans('adminlte_lang::message.login') }}: @if($user->last_access) {{ $user->last_access->format('Y-m-d') }} @else Unknown @endif</small>
-								</p>
-							</li>
-							<!-- Menu Footer-->
-							<li class="user-footer">
-								<div class="pull-left">
-									<a href="{{ url('/settings') }}" class="btn btn-default btn-flat">{{ trans('adminlte_lang::message.profile') }}</a>
-								</div>
-
-								<div class="pull-right">
-									@if ($user->switched)
-										<a href="{{ url('/admin/switch/stop') }}" class="btn btn-default btn-flat" id="switch">
-											{{ trans('adminlte_lang::message.switchoff') }}
-										</a>
-									@else
-										<a href="{{ url('/logout') }}" class="btn btn-default btn-flat" id="logout"
-										   onclick="event.preventDefault();
-													document.getElementById('logout-form').submit();">
-											{{ trans('adminlte_lang::message.signout') }}
-										</a>
-
-										<form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;">
-											{{ csrf_field() }}
-											<input type="submit" value="logout" style="display: none;">
-										</form>
-									@endif
-								</div>
-							</li>
-						</ul>
-					</li>
-
-				@endif
-
-				<!-- Control Sidebar Toggle Button -->
-				@if (isset($controlbar))
-					<li>
-						<a href="#" data-toggle="control-sidebar"><i class="fa fa-gears"></i></a>
-					</li>
-				@endif
-			</ul>
 		</div>
-	</nav>
+	</form>
-</header>
+
+	<!-- Right navbar links -->
+	<ul class="navbar-nav ml-auto">
+		@include('adminlte::layouts.partials.topmenu')
+
+		@if(Auth::check())
+			<!-- Profile Settings -->
+			<li class="nav-item dropdown">
+				<a class="nav-link" data-toggle="dropdown" href="#">
+					<i class="fa fa-cog"></i>
+				</a>
+				<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
+					<span class="dropdown-item dropdown-header @if($user->switched) bg-danger @endif">
+						@if($user->switched)
+							SUDO (<small>{{ $user->name ?: 'User Name' }}</small>)
+						@else
+							{{ $user->name ?: 'User Name' }}
+						@endif
+					</span>
+
+					<div class="dropdown-divider"></div>
+					<a href="{{ url('settings') }}" class="dropdown-item">
+						<i class="fa fa-user mr-2"></i> Settings
+					</a>
+
+					<div class="dropdown-divider"></div>
+					@if ($user->switched)
+						<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item" id="switch">
+							<i class="fa fa-sign-out mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
+						</a>
+					@else
+						<a href="{{ url('logout') }}" class="dropdown-item">
+							<i class="fa fa-sign-out mr-2"></i> Log Out
+						</a>
+					@endif
+				</div>
+			</li>
+		@else
+			<a href="{{ url('login') }}" class="text-muted pr-2"><i class="fa fa-lock"></i></a>
+		@endif
+
+		<!-- Control Side Bar -->
+		@isset($controlsidebar)
+			<li class="nav-item">
+				<a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#">
+					<i class="fa fa-th-large"></i>
+				</a>
+			</li>
+		@endisset
+
+	</ul>
+</nav>
+
+@section('page-scripts')
+	@js('/plugin/bootstrap3-typeahead/js/bootstrap3-typeahead.min.js','bs-typeahead')
+
+	<script type="text/javascript">
+		$(document).ready(function() {
+			$("input[name=q]").typeahead({
+				delay: 500,
+				minLength: 2,
+				items: {{ isset($search_limit) ? $search_limit : 15 }},
+				fitToElement: false,
+				appendTo: "#search_results",
+				source: function (query,process) {
+					search('{{ url("search",['date'=>isset($ido) ? $ido->id : NULL]) }}',query,process);
+				},
+
+				matcher: function () { return true; },
+
+				updater: function (item) {
+					window.parent.location.href = '{{ url("/") }}'+users[item];
+				},
+			})
+			.on('keyup keypress', function(event) {
+				var key = event.keyCode || event.which;
+				if (key === 13) {
+					event.preventDefault();
+					return false;
+				}
+			});
+		});
+
+		var c=0;
+		var search = _.debounce(function(url,query,process,icon){
+			$.ajax({
+				url : url,
+				type : 'GET',
+				data : 'term=' + query,
+				dataType : 'JSON',
+				async : true,
+				cache : false,
+				beforeSend : function() {
+					if (c++ == 0) {
+						if (icon)
+							$('i[name='+icon+']').addClass("fa-spin");
+						else {
+							$('span[name=searching]').removeClass("d-none");
+						}
+					}
+				},
+				success : function(data) {
+					// if json is null, means no match, won't do again.
+					if(data==null || (data.length===0)) return;
+
+					users = {};
+					userLabels = [];
+					_.each(data,function(item,ix,list) {
+						if (_.includes(users,item.label))
+							item.label = item.label + ' #' + item.value;
+
+						userLabels.push(item.label);
+						users[item.label] = item.value;
+					});
+
+					process(userLabels);
+				},
+				complete : function() {
+					if (--c == 0) {
+						if (icon)
+							$('i[name='+icon+']').removeClass("fa-spin");
+						else {
+							$('span[name=searching]').addClass("d-none");
+						}
+					}
+				}
+			})
+		}, 500);
+	</script>
+@append

resources/themes/adminlte/views/layouts/partials/scripts.blade.php

@@ -1,22 +1,65 @@
 <!-- REQUIRED JS SCRIPTS -->
-
+<!-- JQuery and bootstrap are required by Laravel 5.7 in resources/js/bootstrap.js-->
-<!-- JQuery and bootstrap are required by Laravel 5.3 in resources/assets/js/bootstrap.js-->
 <!-- Laravel App -->
 <script src="{{ url(mix('/js/app.js')) }}" type="text/javascript"></script>
+<!-- AdminLTE -->
+<script src="{{ asset('/js/adminlte.min.js') }}"></script>
 
-<!-- Our our CSRF token to each interaction -->
-{{-- @todo Test that we are validating this, also axios should be doing this for us? --}}
 <script type="text/javascript">
-    $.ajaxSetup({
+	// Our CSRF token to each interaction
-        headers: {
+	$.ajaxSetup({
-            'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+		headers: {
-        }
+			'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
-    });
+		}
-</script>
+	});
 
-<!-- Optionally, you can add Slimscroll and FastClick plugins.
+	$.AdminLTESidebarTweak = {};
-      Both of these plugins are recommended to enhance the
+
-      user experience. Slimscroll is required when using the
+	$.AdminLTESidebarTweak.options = {
-      fixed layout. -->
+		EnableRemember: true,
-@js('/site/js/jquery.slimscroll.min.js','jq.slimscroll')
+		//Removes the transition after page reload.
-@js('/site/js/fastclick.min.js','jq.fastclick')
+		NoTransitionAfterReload: false
+	};
+
+	$(function () {
+		"use strict";
+
+		$("body").on("collapsed.lte.pushmenu", function(){
+			if($.AdminLTESidebarTweak.options.EnableRemember) {
+				document.cookie = "toggleState=closed;path=/";
+
+				$("body").delay(500).queue(function () {
+					window.dispatchEvent(new Event('resize'));
+					$(this).dequeue();
+				});
+			}
+		});
+
+		// @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();
+				});
+			}
+		});
+
+		if($.AdminLTESidebarTweak.options.EnableRemember){
+			var re = new RegExp('toggleState' + "=([^;]+)");
+			var value = re.exec(document.cookie);
+			var toggleState = (value != null) ? unescape(value[1]) : null;
+			if(toggleState == 'closed'){
+				if($.AdminLTESidebarTweak.options.NoTransitionAfterReload){
+					$("body").addClass('sidebar-collapse hold-transition').delay(100).queue(function(){
+						$(this).removeClass('hold-transition');
+					});
+				}else{
+					$("body").addClass('sidebar-collapse');
+				}
+			}
+		}
+	});
+</script>

resources/themes/adminlte/views/layouts/partials/scripts_auth.blade.php

@@ -1,2 +0,0 @@
-<!-- Compiled app javascript -->
-<script src="{{ url (mix('/js/app.js')) }}"></script>

resources/themes/adminlte/views/layouts/partials/sidebar.blade.php

@@ -1,112 +1,31 @@
-<!-- Left side column. contains the logo and sidebar -->
+<!-- Main Sidebar Container -->
-<aside class="main-sidebar">
+<aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none">
+	<!-- Brand Logo -->
+	<a href="{{ url('home') }}" class="brand-link">
+		<img src="{{ asset('/img/logo.png') }}" alt="Logo" class="brand-image img-circle elevation-3" style="opacity: .8">
+		<span class="brand-text font-weight-light">{!! config('app.name_html_long','<b>App</b>Name') !!}</span>
+	</a>
 
-    <!-- sidebar: style can be found in sidebar.less -->
+	<!-- Sidebar -->
-    <section class="sidebar">
+	<div class="sidebar">
+		<!-- 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">
+			</div>
+			<div class="info">
+				<a href="{{ url('login') }}" class="d-block">{{ $user->name ?: 'Nobody' }}</a>
+			</div>
+		</div>
 
-        <!-- Sidebar user panel (optional) -->
+		<!-- Sidebar Menu -->
-        @if (! Auth::guest())
+		<nav class="mt-2">
-            <div class="user-panel">
+			<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
-                <div class="pull-left image">
+				<!-- Add icons to the links using the .nav-icon class with font-awesome or any other icon font library -->
-                    <img src="{{ Gravatar::get($user->email) }}" class="img-circle" alt="User Image" />
+				@include('adminlte::layouts.partials.sidebarmenu')
-                </div>
+			</ul>
-                <div class="pull-left info">
+		</nav>
-                    <p>{{ Auth::user()->name }}</p>
-                    <!-- Status -->
-                    <a href="#"><i class="fa fa-circle text-success"></i> {{ trans('adminlte_lang::message.online') }}</a>
-                </div>
-            </div>
-        @endif
-
-        <!-- search form (Optional) -->
-        <form action="#" method="get" class="sidebar-form">
-            <div class="input-group">
-              <input type="text" name="q" class="form-control" autocomplete="off" placeholder="{{ trans('adminlte_lang::message.search') }}..."/>
-              <span class="input-group-btn">
-                <button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i></button>
-              </span>
-            </div>
-        </form>
-        <!-- /.search form -->
-
-        <!-- Sidebar Menu -->
-        @include('adminlte::layouts.partials.sidebarmenu')
 		<!-- /.sidebar-menu -->
-    </section>
+	</div>
-    <!-- /.sidebar -->
+	<!-- /.sidebar -->
-</aside>
+</aside>
-
-@section('page-scripts')
-	@js('/site/js/bootstrap3-typeahead.min.js','bs-typeahead')
-
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$("input[name=q]").typeahead({
-				delay: 300,
-				minLength: 2,
-				fitToElement: false,
-				appendTo: "#search_results",
-				source: function (query,process) {
-					search('{{ url("search",['date'=>isset($ido) ? $ido->id : NULL]) }}',query,process);
-				},
-
-				matcher: function () { return true; },
-
-				updater: function (item) {
-					window.parent.location.href = '{{ url("/") }}'+users[item];
-				},
-			})
-            .on('keyup keypress', function(event) {
-                var key = event.keyCode || event.which;
-                if (key === 13) {
-                    event.preventDefault();
-                    return false;
-                }
-            });
-		});
-
-		var c=0;
-		var search = _.debounce(function(url,query,process,icon){
-			$.ajax({
-				url : url,
-				type : 'GET',
-				data : 'term=' + query,
-				dataType : 'JSON',
-				async : false,
-				cache : false,
-				beforeSend : function() {
-					if (c++ == 0) {
-						if (icon)
-							$('i[name='+icon+']').addClass("fa-spin");
-						else
-							$('i[name=searching]').removeClass("hidden");
-					}
-				},
-				success : function(data) {
-					// if json is null, means no match, won't do again.
-					if(data==null || (data.length===0)) return;
-
-					users = {};
-					userLabels = [];
-					_.each(data,function(item,ix,list) {
-						if (_.includes(users,item.label))
-							item.label = item.label + ' #' + item.value;
-
-						userLabels.push(item.label);
-						users[item.label] = item.value;
-					});
-
-					process(userLabels);
-				},
-				complete : function() {
-					if (--c == 0) {
-						if (icon)
-							$('i[name='+icon+']').removeClass("fa-spin");
-						else
-							$('i[name=searching]').addClass("hidden");
-					}
-				}
-			})
-		}, 500);
-	</script>
-@append

resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php

@@ -1,5 +1,11 @@
-<ul class="sidebar-menu" data-widget="tree">
+<li class="nav-header">MAIN</li>
-	<li class="header"><b>MENU</b></li>
+
-		<!-- Optionally, you can add icons to the links -->
+<li class="nav-item">
-	<li @if(Route::current()->getName() == 'home')class="active"@endif><a href="{{ url('home',['date'=>(isset($ido) ? $ido->id : NULL)]) }}"><i class='fa fa-link'></i> <span>{{ trans('adminlte_lang::message.home') }}</span></a></li>
+	<a href="#" class="nav-link @if(Route::current()->getName() == 'home') active @endif">
-</ul>
+		<i class="nav-icon fa fa-th"></i>
+		<p>
+			My Link Title
+			<span class="right badge badge-danger">New</span>
+		</p>
+	</a>
+</li>

resources/themes/adminlte/views/layouts/partials/topmenu.blade.php

@@ -0,0 +1,7 @@
+{{--
+@foreach ($topmenu as $url => $title)
+	<li class="nav-item d-none d-sm-inline-block">
+		<a href="{{ $url }}" class="nav-link">{{ $title }}</a>
+	</li>
+@endforeach
+--}}

src/helpers.php

@@ -12,4 +12,18 @@ if (! function_exists('is_json')) {
 
 		return (json_last_error() == JSON_ERROR_NONE);
 	}
+}
+
+// Inverse of array_dot()
+if (! function_exists('array_undot')) {
+	function array_undot($dotNotationArray)
+	{
+		$array = [];
+
+		foreach ($dotNotationArray as $key => $value) {
+			array_set($array, $key, $value);
+		}
+
+		return $array;
+	}
 }