Added ScopeActive Trait. Change user model to be under Models

Updates for Laravel 8
Initial new theme ArchitectUI
2021-04-21 16:53:51 +10:00 · 2021-02-05 23:28:09 +11:00 · 2020-09-02 00:17:33 +10:00 · 2020-08-23 10:31:08 +10:00 · 2020-08-04 16:14:35 +10:00 · 2020-07-10 09:43:40 +10:00
31 changed files with 1073 additions and 225 deletions
--- a/composer.json
+++ b/composer.json
@@ -10,10 +10,9 @@
        }
    ],
    "require": {
-      "igaster/laravel-theme": "^2.0",
-      "acacha/user": "^0.2.2",
+      "igaster/laravel-theme": "^2.0.17",
      "creativeorange/gravatar": "^1.0",
-      "orchestra/asset": "^3.6"
+      "orchestra/asset": "^6.0"
    },
    "require-dev": {
    },
--- a/resources/themes/adminlte/lang/en/message.php
+++ b/resources/themes/adminlte/lang/en/message.php
@@ -29,11 +29,11 @@ return [
    'signGithub'              => 'Sign in using Github',
    'signFacebook'            => 'Sign in using Facebook',
    'signTwitter'             => 'Sign in using Twitter',
-    'signGoogle+'             => 'Sign in using Google+',
+    'signGoogle'              => 'Sign in using Google',
    'signLinkedin'            => 'Sign in using Linkedin',
    'signW3id'                => 'Sign in using W3id',
    'signIBMid'               => 'Sign in using IBMid',
-	'signMeetup'              => 'Sign in using Meetup',
+    'signMeetup'              => 'Sign in using Meetup',
    'sendpassword'            => 'Send Password Reset Link',
    'passwordreset'           => 'Reset password',
    'pagenotfound'            => 'Page not found',
--- a/resources/themes/adminlte/views/auth/login.blade.php
+++ b/resources/themes/adminlte/views/auth/login.blade.php
@@ -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">&times;</button>
+			<h5><i class="icon fas 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>
@@ -21,6 +30,15 @@
 			</div>
 		@endif

+		@if (Session::has('error'))
+			<div class="alert alert-danger">
+				<strong>Whoops!</strong> {{ trans('adminlte_lang::message.someproblems') }}<br><br>
+				<ul>
+					<li>{{ Session::get('error') }}</li>
+				</ul>
+			</div>
+		@endif
+
 		<!-- /.login-logo -->
 		<div class="card">
 			<div class="card-body login-card-body">
@@ -28,18 +46,27 @@

 				<form method="post">
 					{{ 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 class="row">
+						<div class="col-12">
+							<div class="input-group mb-3">
+								<input type="email" name="email" class="form-control" placeholder="Email">
+								<div class="input-group-append">
+									<span class="input-group-text"><i class="fas fa-envelope fa-fw"></i></span>
+								</div>
+							</div>
+						</div>
+
+						<div class="col-12">
+							<div class="input-group mb-3">
+								<input type="password" name="password" class="form-control" placeholder="Password">
+								<div class="input-group-append">
+									<span class="input-group-text"><i class="fas fa-key fa-fw"></i></span>
+								</div>
+							</div>
 						</div>
 					</div>
+
 					<div class="row">
 						<div class="col-8">
 							<div class="checkbox icheck">
@@ -48,9 +75,10 @@
 								</label>
 							</div>
 						</div>
+
 						<!-- /.col -->
 						<div class="col-4">
-							<button type="submit" name="submit" class="btn btn-primary btn-block btn-flat">Sign In</button>
+							<button type="submit" name="submit" class="btn btn-primary mr-0 float-right">Sign In</button>
 						</div>
 						<!-- /.col -->
 					</div>
@@ -61,12 +89,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>
--- a/resources/themes/adminlte/views/auth/partials/scripts.blade.php
+++ b/resources/themes/adminlte/views/auth/partials/scripts.blade.php
@@ -1,7 +1,7 @@
 <!-- Compiled app javascript -->
-<script src="{{ url (mix('/js/app.js')) }}"></script>
+<script src="{{ asset('/js/app.js') }}"></script>
 <!-- iCheck -->
-<script src="/plugin/iCheck/icheck.min.js"></script>
+<script src="{{ asset('/plugin/iCheck/icheck.min.js') }}"></script>

 <script>
    $(document).ready(function() {
--- a/resources/themes/adminlte/views/auth/partials/social_login.blade.php
+++ b/resources/themes/adminlte/views/auth/partials/social_login.blade.php
@@ -1,8 +1,8 @@
 <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-{{ $o['class'] }}">
-		<i class="fa fa-{{ $o['icon'] }} mr-2"></i> {{ trans('adminlte_lang::message.sign'.$o['name']) }}
+	<a href="{{ url('/auth/'.$o['id']) }}" class="btn btn-block {{ $o['class'] }}">
+		<i class="{{ $o['icon'] }} fa-fw mr-2"></i> {{ trans('adminlte_lang::message.sign'.$o['name']) }}
 	</a>
 	@endforeach
 </div>
--- a/resources/themes/adminlte/views/auth/passwords/email.blade.php
+++ b/resources/themes/adminlte/views/auth/passwords/email.blade.php
@@ -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="fas 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
--- a/resources/themes/adminlte/views/auth/passwords/reset.blade.php
+++ b/resources/themes/adminlte/views/auth/passwords/reset.blade.php
@@ -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="fas fa-envelope fa-fw 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="fas 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="fas 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
--- a/resources/themes/adminlte/views/layouts/app.blade.php
+++ b/resources/themes/adminlte/views/layouts/app.blade.php
@@ -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)
--- a/resources/themes/adminlte/views/layouts/auth.blade.php
+++ b/resources/themes/adminlte/views/layouts/auth.blade.php
@@ -4,7 +4,7 @@
 		@include('adminlte::layouts.partials.htmlheader')

 		<!-- iCheck -->
-		<link rel="stylesheet" href="/plugin/iCheck/square/blue.css">
+		<link rel="stylesheet" href="{{ asset('/plugin/iCheck/square/blue.css') }}">
 	@show

 	<body class="hold-transition login-page">
--- a/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/contentheader.blade.php
@@ -1,12 +1,13 @@
 <!-- Content Header (Page header) -->
-<div class="content-header">
+<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)
@@ -14,10 +15,12 @@
 							<li class="breadcrumb-item"><a href="{{url($url)}}">{{ $item }}</a></li>
 						@endforeach
 					@endisset
-					<li class="breadcrumb-item active">@yield('page_title','Page Title')</li>
+					@if(View::hasSection('page_title'))
+						<li class="breadcrumb-item active">@yield('page_title','Page Title')</li>
+					@endif
 				</ol>
 			</div><!-- /.col -->
 		</div><!-- /.row -->
 	</div><!-- /.container-fluid -->
 </div>
-<!-- /.content-header -->
+<!-- /.content-header -->
--- a/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
@@ -1,28 +1,27 @@
 <head>
 	<meta charset="UTF-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
-	<title>{{ config('app.name') }} - @yield('htmlheader_title', 'Your title here')</title>
+	<title>{{ config('app.name') }} - @yield('htmlheader_title','Your title here')</title>
 	<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
 	<!-- CSRF Token -->
 	<meta name="csrf-token" content="{{ csrf_token() }}">

-	<link href="{{ asset('/css/app.css') }}" rel="stylesheet" type="text/css" />
+	<link rel="stylesheet" href="{{ asset('/css/app.css') }}">

 	<!-- Font Awesome Icons -->
-	<link rel="stylesheet" href="/plugin/font-awesome/css/font-awesome.min.css">
-	<!-- IonIcons -->
-	<link rel="stylesheet" href="//code.ionicframework.com/ionicons/2.0.1/css/ionicons.min.css">
-	<!-- Theme style -->
-	<link rel="stylesheet" href="/css/adminlte.min.css">
+	<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/all.css') }}">
+	<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/v4-shims.css') }}">
+
 	<!-- Google Font: Source Sans Pro -->
-	<link href="//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" rel="stylesheet">
+	<link href="https://fonts.googleapis.com/css2?family={{ str_replace(' ','+',config('app.font') ?: 'IBM Plex Sans') }}:wght@300&display=swap" rel="stylesheet">
+
 	@if(file_exists('css/social.css'))
 		<!-- Social Logins -->
-		<link rel="stylesheet" href="/css/social.css">
+		<link rel="stylesheet" href="{{ asset('/css/social.css') }}">
 	@endif
 	@if(file_exists('css/print.css'))
 		<!-- Printing Modifications -->
-		<link rel="stylesheet" href="/css/print.css">
+		<link rel="stylesheet" href="{{ asset('/css/print.css') }}">
 	@endif

 	<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
@@ -32,28 +31,19 @@
 		<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
 	<![endif]-->

-	<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 = [];
-			foreach ($lang_files as $f) {
-				$filename = pathinfo($f)['filename'];
-				$trans[$filename] = trans($filename);
-			}
-			$trans['adminlte_lang_message'] = trans('adminlte_lang::message');
-			echo json_encode($trans);
-		@endphp
-	</script>
-
 	<!-- STYLESHEETS -->
 	{!! Asset::styles() !!}

+	<!-- Theme style -->
+	<link rel="stylesheet" href="{{ asset('/css/adminlte.min.css') }}">
+
 	@if(file_exists('css/fixes.css'))
-	<!-- CSS Fixes -->
-		<link rel="stylesheet" href="/css/fixes.css">
+		<!-- CSS Fixes -->
+		<link rel="stylesheet" href="{{ asset('/css/fixes.css') }}">
 	@endif
-</head>
+
+	@if(file_exists('css/custom.css'))
+		<!-- Custom CSS -->
+		<link rel="stylesheet" href="{{ asset('/css/custom.css') }}">
+	@endif
+</head>
--- a/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
@@ -4,20 +4,20 @@
 	<!-- 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>
+			<a class="nav-link" data-widget="pushmenu" href="#"><i class="fas fa-bars"></i></a>
 		</li>
 	</ul>

 	<!-- 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>
+					<i class="fas fa-search"></i>
 				</button>
 			</div>
-			<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>
+			<span name="searching" class="d-none"><i class="fas fa-spinner fa-spin fa-fw" style="margin-top: .33em; width: 1em; height: 1em;"></i></span>
 			<div id="search_results"></div>
 		</div>
 	</form>
@@ -30,31 +30,43 @@
 			<!-- Profile Settings -->
 			<li class="nav-item dropdown">
 				<a class="nav-link" data-toggle="dropdown" href="#">
-					<i class="fa fa-cog"></i>
+					<i class="fas fa-cog"></i>
 				</a>
 				<div class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
-					<span class="dropdown-item dropdown-header">{{ $user->name ?: 'User Name' }}</span>
+					<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
+						<i class="fas fa-user mr-2"></i> Settings
 					</a>

 					<div class="dropdown-divider"></div>
-					<a href="{{ url('logout') }}" class="dropdown-item">
-						<i class="fa fa-sign-out mr-2"></i> Log Out
-					</a>
+					@if ($user->switched)
+						<a href="{{ url('/admin/switch/stop') }}" class="dropdown-item" id="switch">
+							<i class="fas fa-sign-out-alt mr-2"></i> {{ trans('adminlte_lang::message.switchoff') }}
+						</a>
+					@else
+						<a href="{{ url('logout') }}" class="dropdown-item">
+							<i class="fas fa-sign-out-alt 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>
+			<a href="{{ url()->current().'?login=1' }}" class="text-muted pr-2"><i class="fas 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>
+					<i class="fas fa-th"></i>
 				</a>
 			</li>
 		@endisset
@@ -63,15 +75,25 @@
 </nav>

@section('page-scripts')
-	@js('/plugin/bootstrap3-typeahead/js/bootstrap3-typeahead.min.js','bs-typeahead')
+	<style>
+		/* Solid border */
+		div.typeahead.dropdown-menu > .dropdown-header {
+			color: #000000;
+			text-align: left;
+		}
+	</style>

 	<script type="text/javascript">
 		$(document).ready(function() {
 			$("input[name=q]").typeahead({
+				autoSelect: false,
+				scrollHeight: 10,
+				theme: 'bootstrap4',
 				delay: 500,
 				minLength: 2,
-				items: {{ isset($search_limit) ? $search_limit : 15 }},
+				items: {{ isset($search_limit) ? $search_limit : 100 }},
 				fitToElement: false,
+				selectOnBlur: false,
 				appendTo: "#search_results",
 				source: function (query,process) {
 					search('{{ url("search",['date'=>isset($ido) ? $ido->id : NULL]) }}',query,process);
@@ -79,8 +101,13 @@

 				matcher: function () { return true; },

+				// Disable sorting and just return the items (items should by the ajax method)
+				sorter: function(items) {
+					return items;
+				},
+
 				updater: function (item) {
-					window.parent.location.href = '{{ url("/") }}'+users[item];
+					window.parent.location.href = item.value;
 				},
 			})
 			.on('keyup keypress', function(event) {
@@ -114,17 +141,7 @@
 					// 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);
+					process(data);
 				},
 				complete : function() {
 					if (--c == 0) {
--- a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php
@@ -1,9 +1,9 @@
 <!-- REQUIRED JS SCRIPTS -->
 <!-- JQuery and bootstrap are required by Laravel 5.7 in resources/js/bootstrap.js-->
 <!-- Laravel App -->
-<script src="{{ url(mix('/js/app.js')) }}" type="text/javascript"></script>
+<script src="{{ asset('/js/app.js') }}" type="text/javascript"></script>
 <!-- AdminLTE -->
-<script src="/js/adminlte.min.js"></script>
+<script src="{{ asset('/js/adminlte.min.js') }}"></script>

 <script type="text/javascript">
 	// Our CSRF token to each interaction
@@ -14,6 +14,8 @@
 	});

 	$.AdminLTESidebarTweak = {};
+	$.AdminLTESidebarTweak.Open = true;
+	$.AdminLTESidebarTweak.ResizeDelay = 1000;

 	$.AdminLTESidebarTweak.options = {
 		EnableRemember: true,
@@ -21,6 +23,32 @@
 		NoTransitionAfterReload: false
 	};

+	// 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($.AdminLTESidebarTweak.ResizeDelay).queue(function() {
+			window.dispatchEvent(new Event('resize'));
+			$(this).dequeue();
+		});
+	}
+
 	$(function () {
 		"use strict";

@@ -28,22 +56,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));
 			}
 		});

@@ -57,9 +78,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
--- a/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php
@@ -1,8 +1,8 @@
 <!-- Main Sidebar Container -->
-<aside class="main-sidebar sidebar-dark-primary elevation-4">
+<aside class="main-sidebar sidebar-dark-primary elevation-4 d-print-none">
 	<!-- Brand Logo -->
 	<a href="{{ url('home') }}" class="brand-link">
-		<img src="/img/logo.png" alt="Logo" class="brand-image img-circle elevation-3" style="opacity: .8">
+		<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>

@@ -11,10 +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(isset($user) AND $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 fas fa-lock fa-2x"></i></a>
+				@endif
 			</div>
+
 			<div class="info">
-				<a href="{{ url('login') }}" class="d-block">{{ $user->name ?: 'Nobody' }}</a>
+				<a href="{{ url('login') }}" class="d-block">{{ (isset($user) AND $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>

@@ -28,4 +34,4 @@
 		<!-- /.sidebar-menu -->
 	</div>
 	<!-- /.sidebar -->
-</aside>
+</aside>
--- a/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/sidebarmenu.blade.php
@@ -2,7 +2,7 @@

 <li class="nav-item">
 	<a href="#" class="nav-link @if(Route::current()->getName() == 'home') active @endif">
-		<i class="nav-icon fa fa-th"></i>
+		<i class="nav-icon fas fa-th"></i>
 		<p>
 			My Link Title
 			<span class="right badge badge-danger">New</span>
--- a/resources/themes/adminlte/views/widget/status.blade.php
+++ b/resources/themes/adminlte/views/widget/status.blade.php
@@ -0,0 +1,23 @@
+<!-- Success -->
+@if(session()->has('success'))
+	<div class="alert alert-success alert-dismissible">
+		<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+		<h5><i class="icon fas fa-check"></i> Success!</h5>
+		<ul>
+			<li>{{ session()->get('success') }}</li>
+		</ul>
+	</div>
+@endif
+
+<!-- Errors -->
+@if ($errors->any())
+	<div class="alert alert-danger alert-dismissible">
+		<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+		<h5><i class="icon fas fa-ban"></i> Whoops!</h5>
+		<ul>
+			@foreach ($errors->all() as $error)
+				<li>{!! $error !!}</li>
+			@endforeach
+		</ul>
+	</div>
+@endif
--- a/resources/themes/architect/views/layouts/app.blade.php
+++ b/resources/themes/architect/views/layouts/app.blade.php
@@ -0,0 +1,45 @@
+<!doctype html>
+<html lang="en">
+	@section('htmlheader')
+		@include('architect::layouts.partials.htmlheader')
+	@show
+
+	<body>
+		<div class="app-container app-theme-white body-tabs-shadow fixed-sidebar">
+			@include('architect::layouts.partials.topmenu')
+
+			{{--
+			@include('architect::layouts.partials.controlsidebar')
+			--}}
+
+			<div class="app-main">
+				@include('architect::layouts.partials.sidebarmenu')
+
+				<div class="app-main__outer">
+					<div class="app-main__inner">
+						@include('architect::layouts.partials.contentheader')
+
+						<!-- Main content -->
+						<div class="row">
+							<div class="col-12">
+								<!-- Your Page Content Here -->
+								@yield('main-content')
+							</div>
+						</div>
+					</div>
+
+					@include('architect::layouts.partials.contentfooter')
+				</div>
+			</div>
+		</div>
+
+		@section('scripts')
+			@include('architect::layouts.partials.scripts')
+
+			{{-- Scripts --}}
+			{!! Asset::scripts() !!}
+
+			@yield('page-scripts')
+		@show
+	</body>
+</html>
--- a/resources/themes/architect/views/layouts/partials/contentfooter.blade.php
+++ b/resources/themes/architect/views/layouts/partials/contentfooter.blade.php
@@ -0,0 +1,29 @@
+<div class="app-wrapper-footer">
+	<div class="app-footer">
+		<div class="app-footer__inner">
+			<div class="app-footer-left">
+				<ul class="nav">
+					{{--
+					<li class="nav-item">
+						<a href="javascript:void(0);" class="nav-link">Footer Link 1</a>
+					</li>
+					--}}
+				</ul>
+			</div>
+			<div class="app-footer-right">
+				<ul class="nav">
+					{{--
+					<li class="nav-item">
+						<a href="javascript:void(0);" class="nav-link">
+							<div class="badge badge-success mr-1 ml-0">
+								<small>NEW</small>
+							</div>
+							Footer Link 4
+						</a>
+					</li>
+					--}}
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
--- a/resources/themes/architect/views/layouts/partials/contentheader.blade.php
+++ b/resources/themes/architect/views/layouts/partials/contentheader.blade.php
@@ -0,0 +1,44 @@
+<div class="app-page-title">
+	<div class="page-title-wrapper">
+		<div class="page-title-heading">
+			<div class="page-title-icon">
+				<i class="@yield('page_icon','pe-7s-car')"></i>
+			</div>
+			<div>
+				@yield('page_title','Page Title')
+				<div class="page-title-subheading">
+					@yield('page_subtitle','Page Sub Title')
+				</div>
+			</div>
+		</div>
+		<div class="page-title-actions">
+			{{--
+			<button type="button" data-toggle="tooltip" title="Example Tooltip" data-placement="bottom" class="btn-shadow mr-3 btn btn-dark">
+				<i class="fa fa-star"></i>
+			</button>
+			--}}
+			<div class="d-inline-block dropdown">
+				<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn-shadow dropdown-toggle btn btn-info">
+					<span class="btn-icon-wrapper pr-2 opacity-7">
+						<i class="fa fa-business-time fa-w-20"></i>
+					</span>
+					Item Menu
+				</button>
+
+				<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right">
+					<ul class="nav flex-column">
+						{{--
+						<li class="nav-item">
+							<a href="javascript:void(0);" class="nav-link">
+								<i class="nav-link-icon lnr-inbox"></i>
+								<span>Inbox</span>
+								<div class="ml-auto badge badge-pill badge-secondary">86</div>
+							</a>
+						</li>
+						--}}
+					</ul>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
--- a/resources/themes/architect/views/layouts/partials/controlsidebar.blade.php
+++ b/resources/themes/architect/views/layouts/partials/controlsidebar.blade.php
@@ -0,0 +1,195 @@
+<div class="ui-theme-settings">
+	<button type="button" id="TooltipDemo" class="btn-open-options btn btn-warning">
+		<i class="fas fa-cog fa-w-16 fa-spin fa-2x"></i>
+	</button>
+	<div class="theme-settings__inner">
+		<div class="scrollbar-container">
+			<div class="theme-settings__options-wrapper">
+				<h3 class="themeoptions-heading">Layout Options</h3>
+				<div class="p-3">
+					<ul class="list-group">
+						<li class="list-group-item">
+							<div class="widget-content p-0">
+								<div class="widget-content-wrapper">
+									<div class="widget-content-left mr-3">
+										<div class="switch has-switch switch-container-class" data-class="fixed-header">
+											<div class="switch-animate switch-on">
+												<input type="checkbox" checked data-toggle="toggle" data-onstyle="success">
+											</div>
+										</div>
+									</div>
+									<div class="widget-content-left">
+										<div class="widget-heading">Fixed Header</div>
+										<div class="widget-subheading">Makes the header top fixed, always visible!</div>
+									</div>
+								</div>
+							</div>
+						</li>
+						<li class="list-group-item">
+							<div class="widget-content p-0">
+								<div class="widget-content-wrapper">
+									<div class="widget-content-left mr-3">
+										<div class="switch has-switch switch-container-class" data-class="fixed-sidebar">
+											<div class="switch-animate switch-on">
+												<input type="checkbox" checked data-toggle="toggle" data-onstyle="success">
+											</div>
+										</div>
+									</div>
+									<div class="widget-content-left">
+										<div class="widget-heading">Fixed Sidebar</div>
+										<div class="widget-subheading">Makes the sidebar left fixed, always visible!</div>
+									</div>
+								</div>
+							</div>
+						</li>
+						<li class="list-group-item">
+							<div class="widget-content p-0">
+								<div class="widget-content-wrapper">
+									<div class="widget-content-left mr-3">
+										<div class="switch has-switch switch-container-class" data-class="fixed-footer">
+											<div class="switch-animate switch-off">
+												<input type="checkbox" data-toggle="toggle" data-onstyle="success">
+											</div>
+										</div>
+									</div>
+									<div class="widget-content-left">
+										<div class="widget-heading">Fixed Footer</div>
+										<div class="widget-subheading">Makes the app footer bottom fixed, always visible!</div>
+									</div>
+								</div>
+							</div>
+						</li>
+					</ul>
+				</div>
+				<h3 class="themeoptions-heading">
+					<div>Header Options</div>
+					<button type="button" class="btn-pill btn-shadow btn-wide ml-auto btn btn-focus btn-sm switch-header-cs-class" data-class="">
+						Restore Default
+					</button>
+				</h3>
+				<div class="p-3">
+					<ul class="list-group">
+						<li class="list-group-item">
+							<h5 class="pb-2">Choose Color Scheme</h5>
+							<div class="theme-settings-swatches">
+								<div class="swatch-holder bg-primary switch-header-cs-class" data-class="bg-primary header-text-light"></div>
+								<div class="swatch-holder bg-secondary switch-header-cs-class" data-class="bg-secondary header-text-light"></div>
+								<div class="swatch-holder bg-success switch-header-cs-class" data-class="bg-success header-text-dark"></div>
+								<div class="swatch-holder bg-info switch-header-cs-class" data-class="bg-info header-text-dark"></div>
+								<div class="swatch-holder bg-warning switch-header-cs-class" data-class="bg-warning header-text-dark"></div>
+								<div class="swatch-holder bg-danger switch-header-cs-class" data-class="bg-danger header-text-light"></div>
+								<div class="swatch-holder bg-light switch-header-cs-class" data-class="bg-light header-text-dark"></div>
+								<div class="swatch-holder bg-dark switch-header-cs-class" data-class="bg-dark header-text-light"></div>
+								<div class="swatch-holder bg-focus switch-header-cs-class" data-class="bg-focus header-text-light"></div>
+								<div class="swatch-holder bg-alternate switch-header-cs-class" data-class="bg-alternate header-text-light"></div>
+								<div class="divider"></div>
+								<div class="swatch-holder bg-vicious-stance switch-header-cs-class" data-class="bg-vicious-stance header-text-light"></div>
+								<div class="swatch-holder bg-midnight-bloom switch-header-cs-class" data-class="bg-midnight-bloom header-text-light"></div>
+								<div class="swatch-holder bg-night-sky switch-header-cs-class" data-class="bg-night-sky header-text-light"></div>
+								<div class="swatch-holder bg-slick-carbon switch-header-cs-class" data-class="bg-slick-carbon header-text-light"></div>
+								<div class="swatch-holder bg-asteroid switch-header-cs-class" data-class="bg-asteroid header-text-light"></div>
+								<div class="swatch-holder bg-royal switch-header-cs-class" data-class="bg-royal header-text-light"></div>
+								<div class="swatch-holder bg-warm-flame switch-header-cs-class" data-class="bg-warm-flame header-text-dark"></div>
+								<div class="swatch-holder bg-night-fade switch-header-cs-class" data-class="bg-night-fade header-text-dark"></div>
+								<div class="swatch-holder bg-sunny-morning switch-header-cs-class" data-class="bg-sunny-morning header-text-dark"></div>
+								<div class="swatch-holder bg-tempting-azure switch-header-cs-class" data-class="bg-tempting-azure header-text-dark"></div>
+								<div class="swatch-holder bg-amy-crisp switch-header-cs-class" data-class="bg-amy-crisp header-text-dark"></div>
+								<div class="swatch-holder bg-heavy-rain switch-header-cs-class" data-class="bg-heavy-rain header-text-dark"></div>
+								<div class="swatch-holder bg-mean-fruit switch-header-cs-class" data-class="bg-mean-fruit header-text-dark"></div>
+								<div class="swatch-holder bg-malibu-beach switch-header-cs-class" data-class="bg-malibu-beach header-text-light"></div>
+								<div class="swatch-holder bg-deep-blue switch-header-cs-class" data-class="bg-deep-blue header-text-dark"></div>
+								<div class="swatch-holder bg-ripe-malin switch-header-cs-class" data-class="bg-ripe-malin header-text-light"></div>
+								<div class="swatch-holder bg-arielle-smile switch-header-cs-class" data-class="bg-arielle-smile header-text-light"></div>
+								<div class="swatch-holder bg-plum-plate switch-header-cs-class" data-class="bg-plum-plate header-text-light"></div>
+								<div class="swatch-holder bg-happy-fisher switch-header-cs-class" data-class="bg-happy-fisher header-text-dark"></div>
+								<div class="swatch-holder bg-happy-itmeo switch-header-cs-class" data-class="bg-happy-itmeo header-text-light"></div>
+								<div class="swatch-holder bg-mixed-hopes switch-header-cs-class" data-class="bg-mixed-hopes header-text-light"></div>
+								<div class="swatch-holder bg-strong-bliss switch-header-cs-class" data-class="bg-strong-bliss header-text-light"></div>
+								<div class="swatch-holder bg-grow-early switch-header-cs-class" data-class="bg-grow-early header-text-light"></div>
+								<div class="swatch-holder bg-love-kiss switch-header-cs-class" data-class="bg-love-kiss header-text-light"></div>
+								<div class="swatch-holder bg-premium-dark switch-header-cs-class" data-class="bg-premium-dark header-text-light"></div>
+								<div class="swatch-holder bg-happy-green switch-header-cs-class" data-class="bg-happy-green header-text-light"></div>
+							</div>
+						</li>
+					</ul>
+				</div>
+				<h3 class="themeoptions-heading">
+					<div>Sidebar Options</div>
+					<button type="button" class="btn-pill btn-shadow btn-wide ml-auto btn btn-focus btn-sm switch-sidebar-cs-class" data-class="">
+						Restore Default
+					</button>
+				</h3>
+				<div class="p-3">
+					<ul class="list-group">
+						<li class="list-group-item">
+							<h5 class="pb-2">Choose Color Scheme
+							</h5>
+							<div class="theme-settings-swatches">
+								<div class="swatch-holder bg-primary switch-sidebar-cs-class" data-class="bg-primary sidebar-text-light"></div>
+								<div class="swatch-holder bg-secondary switch-sidebar-cs-class" data-class="bg-secondary sidebar-text-light"></div>
+								<div class="swatch-holder bg-success switch-sidebar-cs-class" data-class="bg-success sidebar-text-dark"></div>
+								<div class="swatch-holder bg-info switch-sidebar-cs-class" data-class="bg-info sidebar-text-dark"></div>
+								<div class="swatch-holder bg-warning switch-sidebar-cs-class" data-class="bg-warning sidebar-text-dark"></div>
+								<div class="swatch-holder bg-danger switch-sidebar-cs-class" data-class="bg-danger sidebar-text-light"></div>
+								<div class="swatch-holder bg-light switch-sidebar-cs-class" data-class="bg-light sidebar-text-dark"></div>
+								<div class="swatch-holder bg-dark switch-sidebar-cs-class" data-class="bg-dark sidebar-text-light"></div>
+								<div class="swatch-holder bg-focus switch-sidebar-cs-class" data-class="bg-focus sidebar-text-light"></div>
+								<div class="swatch-holder bg-alternate switch-sidebar-cs-class" data-class="bg-alternate sidebar-text-light"></div>
+								<div class="divider"></div>
+								<div class="swatch-holder bg-vicious-stance switch-sidebar-cs-class" data-class="bg-vicious-stance sidebar-text-light"></div>
+								<div class="swatch-holder bg-midnight-bloom switch-sidebar-cs-class" data-class="bg-midnight-bloom sidebar-text-light"></div>
+								<div class="swatch-holder bg-night-sky switch-sidebar-cs-class" data-class="bg-night-sky sidebar-text-light"></div>
+								<div class="swatch-holder bg-slick-carbon switch-sidebar-cs-class" data-class="bg-slick-carbon sidebar-text-light"></div>
+								<div class="swatch-holder bg-asteroid switch-sidebar-cs-class" data-class="bg-asteroid sidebar-text-light"></div>
+								<div class="swatch-holder bg-royal switch-sidebar-cs-class" data-class="bg-royal sidebar-text-light"></div>
+								<div class="swatch-holder bg-warm-flame switch-sidebar-cs-class" data-class="bg-warm-flame sidebar-text-dark"></div>
+								<div class="swatch-holder bg-night-fade switch-sidebar-cs-class" data-class="bg-night-fade sidebar-text-dark"></div>
+								<div class="swatch-holder bg-sunny-morning switch-sidebar-cs-class" data-class="bg-sunny-morning sidebar-text-dark"></div>
+								<div class="swatch-holder bg-tempting-azure switch-sidebar-cs-class" data-class="bg-tempting-azure sidebar-text-dark"></div>
+								<div class="swatch-holder bg-amy-crisp switch-sidebar-cs-class" data-class="bg-amy-crisp sidebar-text-dark"></div>
+								<div class="swatch-holder bg-heavy-rain switch-sidebar-cs-class" data-class="bg-heavy-rain sidebar-text-dark"></div>
+								<div class="swatch-holder bg-mean-fruit switch-sidebar-cs-class" data-class="bg-mean-fruit sidebar-text-dark"></div>
+								<div class="swatch-holder bg-malibu-beach switch-sidebar-cs-class" data-class="bg-malibu-beach sidebar-text-light"></div>
+								<div class="swatch-holder bg-deep-blue switch-sidebar-cs-class" data-class="bg-deep-blue sidebar-text-dark"></div>
+								<div class="swatch-holder bg-ripe-malin switch-sidebar-cs-class" data-class="bg-ripe-malin sidebar-text-light"></div>
+								<div class="swatch-holder bg-arielle-smile switch-sidebar-cs-class" data-class="bg-arielle-smile sidebar-text-light"></div>
+								<div class="swatch-holder bg-plum-plate switch-sidebar-cs-class" data-class="bg-plum-plate sidebar-text-light"></div>
+								<div class="swatch-holder bg-happy-fisher switch-sidebar-cs-class" data-class="bg-happy-fisher sidebar-text-dark"></div>
+								<div class="swatch-holder bg-happy-itmeo switch-sidebar-cs-class" data-class="bg-happy-itmeo sidebar-text-light"></div>
+								<div class="swatch-holder bg-mixed-hopes switch-sidebar-cs-class" data-class="bg-mixed-hopes sidebar-text-light"></div>
+								<div class="swatch-holder bg-strong-bliss switch-sidebar-cs-class" data-class="bg-strong-bliss sidebar-text-light"></div>
+								<div class="swatch-holder bg-grow-early switch-sidebar-cs-class" data-class="bg-grow-early sidebar-text-light"></div>
+								<div class="swatch-holder bg-love-kiss switch-sidebar-cs-class" data-class="bg-love-kiss sidebar-text-light"></div>
+								<div class="swatch-holder bg-premium-dark switch-sidebar-cs-class" data-class="bg-premium-dark sidebar-text-light"></div>
+								<div class="swatch-holder bg-happy-green switch-sidebar-cs-class" data-class="bg-happy-green sidebar-text-light"></div>
+							</div>
+						</li>
+					</ul>
+				</div>
+				<h3 class="themeoptions-heading">
+					<div>Main Content Options</div>
+					<button type="button" class="btn-pill btn-shadow btn-wide ml-auto active btn btn-focus btn-sm">Restore Default
+					</button>
+				</h3>
+				<div class="p-3">
+					<ul class="list-group">
+						<li class="list-group-item">
+							<h5 class="pb-2">Page Section Tabs
+							</h5>
+							<div class="theme-settings-swatches">
+								<div role="group" class="mt-2 btn-group">
+									<button type="button" class="btn-wide btn-shadow btn-primary btn btn-secondary switch-theme-class" data-class="body-tabs-line">
+										Line
+									</button>
+									<button type="button" class="btn-wide btn-shadow btn-primary active btn btn-secondary switch-theme-class" data-class="body-tabs-shadow">
+										Shadow
+									</button>
+								</div>
+							</div>
+						</li>
+					</ul>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
--- a/resources/themes/architect/views/layouts/partials/htmlheader.blade.php
+++ b/resources/themes/architect/views/layouts/partials/htmlheader.blade.php
@@ -0,0 +1,53 @@
+<head>
+	<!--
+	=========================================================
+	* ArchitectUI HTML Theme Dashboard - v1.0.0
+	=========================================================
+	* Product Page: https://dashboardpack.com
+	* Copyright 2019 DashboardPack (https://dashboardpack.com)
+	* Licensed under MIT (https://github.com/DashboardPack/architectui-html-theme-free/blob/master/LICENSE)
+	=========================================================
+	* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+	-->
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta http-equiv="Content-Language" content="en">
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<title>{{ config('app.name') }} - @yield('htmlheader_title','Your title here')</title>
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no" />
+
+	<meta name="description" content="phpLDAPadmin - A web interface into LDAP data management">
+	<meta name="msapplication-tap-highlight" content="no">
+
+	<!-- CSRF Token -->
+	<meta name="csrf-token" content="{{ csrf_token() }}">
+
+	{{--
+	<!-- Font Awesome Icons -->
+	<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/all.css') }}">
+	--}}
+
+	<!-- Google Font: Source Sans Pro -->
+	<link href="https://fonts.googleapis.com/css2?family={{ str_replace(' ','+',config('app.font') ?: 'IBM Plex Sans') }}:wght@300&display=swap" rel="stylesheet">
+
+	@if(file_exists('css/print.css'))
+		<!-- Printing Modifications -->
+		<link rel="stylesheet" href="{{ asset('/css/print.css') }}">
+	@endif
+
+	<!-- STYLESHEETS -->
+	{!! Asset::styles() !!}
+
+	<!-- Theme style -->
+	<link rel="stylesheet" href="{{ asset('/css/architect.min.css') }}">
+
+	@if(file_exists('css/fixes.css'))
+		<!-- 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>
--- a/resources/themes/architect/views/layouts/partials/scripts.blade.php
+++ b/resources/themes/architect/views/layouts/partials/scripts.blade.php
@@ -0,0 +1,96 @@
+{{--
+<script src="{{ asset('/js/app.js') }}" type="text/javascript"></script>
+--}}
+<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
+<!-- Architect -->
+<script src="{{ asset('/js/architect.min.js') }}"></script>
+
+<script type="text/javascript">
+	// Our CSRF token to each interaction
+	$.ajaxSetup({
+		headers: {
+			'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+		}
+	});
+
+	$.ArchitectSidebarTweak = {};
+	$.ArchitectSidebarTweak.Open = true;
+	$.ArchitectSidebarTweak.ResizeDelay = 1000;
+
+	$.ArchitectSidebarTweak.options = {
+		EnableRemember: true,
+		//Removes the transition after page reload.
+		NoTransitionAfterReload: false
+	};
+
+	// 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 == $.ArchitectSidebarTweak.Open) {
+			return;
+		}
+
+		$.ArchitectSidebarTweak.Open = state;
+
+		if (addclass !== 'undefined')
+			if (state)
+				$(".app-container")
+					.removeClass('closed-sidebar');
+			else
+				$(".app-container")
+					.addClass('closed-sidebar');
+
+		$(this).delay($.ArchitectSidebarTweak.ResizeDelay).queue(function() {
+			window.dispatchEvent(new Event('resize'));
+			$(this).dequeue();
+		});
+	}
+
+	$(function () {
+		"use strict";
+
+		// @todo This event were for AdminLTE.
+		$("body").on("collapsed.lte.pushmenu", function(){
+			if($.ArchitectSidebarTweak.options.EnableRemember) {
+				document.cookie = "toggleState=closed;path=/";
+
+				$("body").queue(sidebaropenclose(false));
+			}
+		});
+
+		$("body").on("shown.lte.pushmenu", function(){
+			if($.ArchitectSidebarTweak.options.EnableRemember){
+				document.cookie = "toggleState=opened;path=/";
+
+				$("body").queue(sidebaropenclose(true));
+			}
+		});
+
+		if($.ArchitectSidebarTweak.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($.ArchitectSidebarTweak.options.NoTransitionAfterReload){
+					$("body").addClass('sidebar-collapse hold-transition').delay(100).queue(function(){
+						$(this).removeClass('hold-transition');
+					});
+				}else{
+					$("body").queue(sidebaropenclose(false,true));
+				}
+			}
+		}
+	});
+</script>
+
+@if(file_exists('js/custom.js'))
+	<!-- Any Custom JS -->
+	<script src="{{ asset('js/custom.js') }}"></script>
+@endif
--- a/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php
+++ b/resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php
@@ -0,0 +1,85 @@
+<div class="app-sidebar sidebar-shadow">
+	<div class="app-header__logo">
+		<div class="logo-src"></div>
+		<div class="header__pane ml-auto">
+			<div>
+				<button type="button" class="hamburger close-sidebar-btn hamburger--elastic" data-class="closed-sidebar">
+					<span class="hamburger-box">
+						<span class="hamburger-inner"></span>
+					</span>
+				</button>
+			</div>
+		</div>
+	</div>
+	<div class="app-header__mobile-menu">
+		<div>
+			<button type="button" class="hamburger hamburger--elastic mobile-toggle-nav">
+				<span class="hamburger-box">
+					<span class="hamburger-inner"></span>
+				</span>
+			</button>
+		</div>
+	</div>
+	<div class="app-header__menu">
+		<span>
+			<button type="button" class="btn-icon btn-icon-only btn btn-primary btn-sm mobile-toggle-header-nav">
+				<span class="btn-icon-wrapper">
+					<i class="fas fa-ellipsis-v fa-w-6"></i>
+				</span>
+			</button>
+		</span>
+	</div>
+	<div class="scrollbar-sidebar scrollbar-container">
+		<div class="app-sidebar__inner">
+			<ul class="vertical-nav-menu">
+				<li class="app-sidebar__heading">Header</li>
+				<li>
+					<a href="index.html" class="mm-active">
+						<i class="metismenu-icon pe-7s-rocket"></i>  Example 1
+					</a>
+				</li>
+				{{--
+				<li class="app-sidebar__heading">UI Components</li>
+				<li>
+					<a href="#">
+						<i class="metismenu-icon pe-7s-diamond"></i> Elements
+						<i class="metismenu-state-icon pe-7s-angle-down caret-left"></i>
+					</a>
+					<ul>
+						<li>
+							<a href="elements-buttons-standard.html">
+								<i class="metismenu-icon"></i> Buttons
+							</a>
+						</li>
+					</ul>
+				</li>
+				<li>
+					<a href="#">
+						<i class="metismenu-icon pe-7s-car"></i> Components
+						<i class="metismenu-state-icon pe-7s-angle-down caret-left"></i>
+					</a>
+					<ul>
+						<li>
+							<a href="components-tabs.html">
+								<i class="metismenu-icon"></i> Tabs
+							</a>
+						</li>
+
+					</ul>
+				</li>
+				<li>
+					<a href="tables-regular.html">
+						<i class="metismenu-icon pe-7s-display2"></i> Tables
+					</a>
+				</li>
+				<li class="app-sidebar__heading">Widgets</li>
+				<li>
+					<a href="dashboard-boxes.html">
+						<i class="metismenu-icon pe-7s-display2"></i> Dashboard Boxes
+					</a>
+				</li>
+				--}}
+			</ul>
+		</div>
+	</div>
+</div>
--- a/resources/themes/architect/views/layouts/partials/topmenu.blade.php
+++ b/resources/themes/architect/views/layouts/partials/topmenu.blade.php
@@ -0,0 +1,91 @@
+<div class="app-header header-shadow bg-dark header-text-light">
+	<div class="app-header__logo">
+		<div class="logo-src"></div>
+		<div class="header__pane ml-auto">
+			<div>
+				<button type="button" class="hamburger close-sidebar-btn hamburger--elastic" data-class="closed-sidebar">
+					<span class="hamburger-box">
+						<span class="hamburger-inner"></span>
+					</span>
+				</button>
+			</div>
+		</div>
+	</div>
+	<div class="app-header__mobile-menu">
+		<div>
+			<button type="button" class="hamburger hamburger--elastic mobile-toggle-nav">
+				<span class="hamburger-box">
+					<span class="hamburger-inner"></span>
+				</span>
+			</button>
+		</div>
+	</div>
+	<div class="app-header__menu">
+		<span>
+			<button type="button" class="btn-icon btn-icon-only btn btn-primary btn-sm mobile-toggle-header-nav">
+				<span class="btn-icon-wrapper">
+					<i class="fas fa-ellipsis-v fa-w-6"></i>
+				</span>
+			</button>
+		</span>
+	</div>
+	<div class="app-header__content">
+		<div class="app-header-left">
+			<div class="search-wrapper">
+				<div class="input-holder">
+					<input type="text" class="search-input" placeholder="Type to search">
+					<button class="search-icon"><span></span></button>
+				</div>
+				<button class="close"></button>
+			</div>
+
+			<ul class="header-menu nav">
+				{{--
+				<li class="nav-item">
+					<a href="javascript:void(0);" class="nav-link">
+						<i class="nav-link-icon fas fa-database"></i> Statistics
+					</a>
+				</li>
+				--}}
+			</ul>
+		</div>
+
+		<div class="app-header-right">
+			<div class="header-btn-lg pr-0">
+				<div class="widget-content p-0">
+					<div class="widget-content-wrapper">
+						<div class="widget-content-left">
+							<div class="btn-group">
+								<a data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="p-0 btn">
+									<img width="42" class="rounded-circle" src="assets/images/avatars/1.jpg" alt="">
+									<i class="fas fa-angle-down ml-2 opacity-8"></i>
+								</a>
+								<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right">
+									<button type="button" tabindex="0" class="dropdown-item">User Account</button>
+									<button type="button" tabindex="0" class="dropdown-item">Settings</button>
+									<h6 tabindex="-1" class="dropdown-header">Header</h6>
+									<button type="button" tabindex="0" class="dropdown-item">Actions</button>
+									<div tabindex="-1" class="dropdown-divider"></div>
+									<button type="button" tabindex="0" class="dropdown-item">Dividers</button>
+								</div>
+							</div>
+						</div>
+						<div class="widget-content-left  ml-3 header-user-info">
+							<div class="widget-heading">
+								{{ $user->name ?? 'John Smith' }}
+							</div>
+							<div class="widget-subheading">
+								{{ $user->title ?? 'Primary Developer' }}
+							</div>
+						</div>
+						<div class="widget-content-right header-user-info ml-3">
+							<button type="button" class="btn-shadow p-1 btn btn-primary btn-sm show-toastr-example">
+								<i class="fas text-white fa-calendar pr-1 pl-1"></i>
+							</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
--- a/src/Carbon.php
+++ b/src/Carbon.php
@@ -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);
    }
--- a/src/Controllers/AdminController.php
+++ b/src/Controllers/AdminController.php
@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
 use Redirect;
 use Session;

-use App\User;
+use App\Models\User;

 class AdminController extends Controller
 {
@@ -26,9 +26,6 @@ class AdminController extends Controller
 		return ! Session::get('orig_user');
 	}

-	/**
-	 * @todo Change the background color (or something) so we know we are switched
-	 */
 	public function user_switch_start($id)
 	{
 		if ($this->switch_session() AND $this->switch_authorised($id))
--- a/src/GuestUser.php
+++ b/src/GuestUser.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Leenooks;
+
+use Illuminate\Notifications\Notifiable;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+
+class GuestUser extends Authenticatable
+{
+    use Notifiable;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'name', 'email', 'password',
+    ];
+
+    /**
+     * The attributes that should be hidden for arrays.
+     *
+     * @var array
+     */
+    protected $hidden = [
+        'password', 'remember_token',
+    ];
+}
--- a/src/Http/Middleware/GuestUser.php
+++ b/src/Http/Middleware/GuestUser.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Leenooks\Http\Middleware;
+
+use Closure;
+
+/**
+ * Class GuestUser
+ * @package Leenooks\Laravel\Http\Middleware
+ */
+class GuestUser
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        view()->share('loggedin',auth()->check());
+        view()->share('user', auth()->user() ?: new \Leenooks\GuestUser);
+
+        return $next($request);
+    }
+}
--- a/src/Providers/LeenooksServiceProvider.php
+++ b/src/Providers/LeenooksServiceProvider.php
@@ -2,6 +2,7 @@

 namespace Leenooks\Providers;

+use Leenooks\Http\Middleware\GuestUser;
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;

@@ -12,60 +13,60 @@ use Illuminate\Support\ServiceProvider;
 */
 class LeenooksServiceProvider extends ServiceProvider
 {
-        private $_path = '';
+	private $_path = '';

-    /**
-     * Bootstrap the application services.
-     *
-     * @param Router $router
-     */
-    public function boot(Router $router)
-    {
-        $this->loadViewsFrom($this->_path.'/resources/themes/adminlte/views/', 'adminlte');
-	$this->loadTranslationsFrom($this->_path.'/resources/themes/adminlte/lang/', 'adminlte_lang');
+	/**
+	 * Bootstrap the application services.
+	 *
+	 * @param Router $router
+	 */
+	public function boot(Router $router)
+	{
+		$router->pushMiddlewareToGroup('web',GuestUser::class);

-	// Enable a recusive() collection function so that we can just arrives in config/*.php
-	\Illuminate\Support\Collection::macro('recursive', function () {
-		return $this->map(function ($value) {
-			if (is_array($value) || is_object($value)) {
-				return collect($value)->recursive();
-			}
+		$this->loadViewsFrom($this->_path.'/resources/themes/adminlte/views/', 'adminlte');
+		$this->loadTranslationsFrom($this->_path.'/resources/themes/adminlte/lang/', 'adminlte_lang');

-			return $value;
+		$this->loadViewsFrom($this->_path.'/resources/themes/architect/views/', 'architect');
+
+		// Enable a Collect::recursive() function
+		\Illuminate\Support\Collection::macro('recursive', function () {
+			return $this->map(function ($value) {
+
+				if (is_array($value) || is_object($value)) {
+					return collect($value)->recursive();
+				}
+
+				return $value;
+			});
 		});
-	});
-    }
+	}

-    /**
-     * Register the application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        if (! $this->_path) {
-            $this->_path = realpath(__DIR__.'/../../');
-        }
-    }
+	/**
+	 * Register the application services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		if (! $this->_path) {
+			$this->_path = realpath(__DIR__.'/../../');
+		}
+	}

-    /**
-     * Views copy path.
-     *
-     * @return array
-     */
-    public function views()
-    {
-        return [
-            $this->_path.'/resources/views/auth'              =>
-                resource_path('views/vendor/adminlte/auth'),
-            $this->_path.'/resources/views/errors'            =>
-                resource_path('views/vendor/adminlte/errors'),
-            $this->_path.'/resources/views/layouts'           =>
-                resource_path('views/vendor/adminlte/layouts'),
-            $this->_path.'/resources/views/home.blade.php'    =>
-                resource_path('views/vendor/adminlte/home.blade.php'),
-            $this->_path.'/resources/views/welcome.blade.php' =>
-                resource_path('views/welcome.blade.php'),
-        ];
-    }
-}
+	/**
+	 * Views copy path.
+	 *
+	 * @return array
+	 */
+	public function views()
+	{
+		return [
+			$this->_path.'/resources/views/auth' => resource_path('views/vendor/adminlte/auth'),
+			$this->_path.'/resources/views/errors' => resource_path('views/vendor/adminlte/errors'),
+			$this->_path.'/resources/views/layouts' => resource_path('views/vendor/adminlte/layouts'),
+			$this->_path.'/resources/views/home.blade.php' => resource_path('views/vendor/adminlte/home.blade.php'),
+			$this->_path.'/resources/views/welcome.blade.php' => resource_path('views/welcome.blade.php'),
+		];
+	}
+}
--- a/src/Traits/ScopeActive.php
+++ b/src/Traits/ScopeActive.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * Add a ScopeActive to an Eloquent Model
+ */
+namespace Leenooks\Traits;
+
+trait ScopeActive
+{
+	/**
+	 * Only query active records
+	 */
+	public function scopeActive()
+	{
+		return $this->where('active',TRUE);
+	}
+}
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -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;
Author	SHA1	Message	Date
Deon George	de2b894b55	Added ScopeActive Trait. Change user model to be under Models	2021-04-21 16:53:51 +10:00
Deon George	47075871dc	Updates for Laravel 8	2021-02-05 23:28:09 +11:00
Deon George	0a541c1a36	Initial new theme ArchitectUI	2020-09-02 00:17:33 +10:00
Deon George	7dc9ebf3a6	Some minor improvements for projects that dont set /page_title	2020-08-23 10:31:08 +10:00
Deon George	432606760b	Update for Laravel 7.x	2020-08-04 16:14:35 +10:00
Deon George	958dbc7092	Remove @todo comment that has been implemented	2020-07-10 09:43:40 +10:00
Deon George	12f33b6853	Remove unnecessary console.log()	2020-06-23 12:34:28 +10:00
Deon George	b67df24219	Disable sorting - should be sorted by ajax method	2020-06-11 16:19:40 +10:00
Deon George	7ffcdb139a	Enable font selection override	2020-05-26 11:26:00 +10:00
Deon George	5a9437db37	bootstrap typeahead now part of app.js - updated and optimised enabling categories	2020-05-26 11:12:54 +10:00
Deon George	9389fd9e83	Added widget for success/error messages	2020-05-06 17:13:15 +10:00
Deon George	87819891a1	Updated Fontawesome to v5	2020-05-06 16:30:41 +10:00
Deon George	b3924ea239	Make resize delay configurable and default 1000	2020-03-12 09:13:55 +11:00
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
Deon George	62f66d7eed	Fixes for laravel 6	2020-01-14 21:43:40 +11:00
Deon George	f131db31c6	Added custom.js, login redirects to current page, added form-start/form-end and change breadcrumb width	2020-01-09 18:44:07 +11:00
Deon George	8b83990a66	Changed not logged in user to padlock with 'Login'	2019-12-16 11:29:34 +11:00
Deon George	4472202afb	Display improvements for login note	2019-11-29 11:13:24 +11:00
Deon George	2040266ab2	Disable autocomplete in search	2019-11-26 09:58:45 +11:00
Deon George	1774987dea	Dispatch resize event if sidebar collapsed	2019-11-22 14:22:37 +11:00
Deon George	6c60298e8f	Add a note on the login page	2019-11-21 14:33:33 +11:00
Deon George	41b320a5b9	Fix file_exist check for custom.css	2019-11-17 23:26:12 +11:00
Deon George	1096f0e28d	Added custom.css to app.blade	2019-10-30 14:31:32 +08:00
Deon George	b0730b9ed3	Revert name to igaster/laravel-theme	2019-10-30 14:15:20 +08:00
Deon George	163a7f2587	Add github cvs to composer	2019-10-30 12:15:23 +08:00
Deon George	4f2707a374	Switch laravel-them to fix issue with @ directives	2019-10-30 09:49:19 +08:00
Deon George	0ca66c6d1c	Updated orchestra/asset	2019-10-11 15:50:06 +11:00
Deon George	5833122ab5	Removed Acache/User	2019-10-11 14:47:13 +11:00
Deon George	a946ce4418	Added error dialog on login box	2019-09-03 14:38:19 +10:00
Deon George	e5ff189d3e	Added tz and move adminlte css to later	2019-08-20 15:50:15 +10:00
Deon George	1efdfca55f	Remove mix() for now	2019-07-03 17:16:46 +10:00
Deon George	6d876f2c94	No longer using // urls, and fixed sudo rendoring	2019-06-17 11:44:56 +10:00