Remove igaster-theme

Add back igaster/laravel-theme
Disable CustomBlade
2021-11-23 13:07:11 +11:00 · 2021-11-23 12:55:11 +11:00 · 2021-11-23 12:38:59 +11:00 · 2021-11-23 12:38:22 +11:00 · 2021-11-23 11:49:07 +11:00 · 2021-11-22 14:10:06 +11:00
52 changed files with 454 additions and 1144 deletions
--- a/composer.json
+++ b/composer.json
@ -6,10 +6,12 @@
    "authors": [
        {
            "name": "Deon George",
-			"email": "deon@dege.au"
+            "email": "deon@leenooks.net"
        }
    ],
    "require": {
+        "creativeorange/gravatar": "^1.0",
+        "orchestra/asset": "^6.0"
    },
    "require-dev": {
    },
@ -24,6 +26,8 @@
    "extra": {
        "laravel": {
            "providers": [
+                "Orchestra\\Asset\\AssetServiceProvider",
+                "Collective\\Html\\HtmlServiceProvider",
                "Leenooks\\Providers\\LeenooksServiceProvider",
                "Leenooks\\Providers\\CustomBladeServiceProvider"
            ]
--- a/resources/components/button/cancel.blade.php
+++ b/resources/components/button/cancel.blade.php
@ -1,11 +0,0 @@
-<button type="cancel" id="cancel" {{ $attributes->class(['mt-4','btn','btn-sm','btn-danger']) }}>Cancel</button>
-
-@section('page-scripts')
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$('#cancel').on('click',function(item) {
-				return history.back();
-			});
-		});
-	</script>
-@append
--- a/resources/components/button/error.blade.php
+++ b/resources/components/button/error.blade.php
@ -1,9 +0,0 @@
-@if(isset($row) && $row)
-	<div class="row pt-2 pb-2">
-		<div class="col">
-@endif
-			@error($name)<button {{ $attributes->class(['btn','btn-sm','btn-danger']) }}>{{ $message }}</button>@enderror
-@if(isset($row) && $row)
-		</div>
-	</div>
-@endif
--- a/resources/components/button/reset.blade.php
+++ b/resources/components/button/reset.blade.php
@ -1 +0,0 @@
-<button type="reset" id="reset" {{ $attributes->class(['mt-4','btn','btn-sm','btn-secondary']) }}>Reset</button>
--- a/resources/components/button/submit.blade.php
+++ b/resources/components/button/submit.blade.php
@ -1 +0,0 @@
-<button type="submit" id="submit" {{ $attributes->class(['mt-4','btn','btn-sm','btn-success']) }} @disabled(isset($disabled))>{{ $slot }}</button>
--- a/resources/components/button/success.blade.php
+++ b/resources/components/button/success.blade.php
@ -1,9 +0,0 @@
-@if(isset($row) && $row)
-	<div class="row pt-2 pb-2">
-		<div class="col">
-@endif
-			@session('success')<button {{ $attributes->class(['btn','btn-sm','btn-success']) }}>{{ $value }}</button>@endsession
-@if(isset($row) && $row)
-		</div>
-	</div>
-@endif
--- a/resources/components/errors.blade.php
+++ b/resources/components/errors.blade.php
@ -1,11 +0,0 @@
-@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/components/form/base.blade.php
+++ b/resources/components/form/base.blade.php
@ -1,23 +0,0 @@
-<div class="form-group">
-	@if(isset($label))
-		<label {{ $attributes->only(['class']) }} for="{{ $id ?? $name }}">{{ $label }}</label>
-	@endisset
-	<div class="input-group has-validation">
-		@if(isset($icon) || isset($prepend))
-			<div class="input-group-prepend">
-				<span class="input-group-text">@isset($icon)<i class="fas fa-fw {{ $icon }}"></i>@endisset @isset($prepend){!! $prepend !!}@endisset</span>
-			</div>
-		@endif
-		{{ $slot }}
-		<span class="invalid-feedback">
-			@error((! empty($old)) ? $old : $name)
-				{{ $message }}
-			@elseif(isset($feedback))
-				{{ $feedback }}
-			@enderror
-		</span>
-	</div>
-	@isset($helper)
-		<span class="input-helper">{{ $helper }}</span>
-	@endif
-</div>
--- a/resources/components/form/checkbox.blade.php
+++ b/resources/components/form/checkbox.blade.php
@ -1,5 +0,0 @@
-<x-leenooks::form.base {{ $attributes }}>
-	<div class="form-check text-right">
-		<input type="checkbox" class="form-check-input {{ $class ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @checked(old($old ?? $name)) @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
-	</div>
-</x-leenooks::form.base>
--- a/resources/components/form/date.blade.php
+++ b/resources/components/form/date.blade.php
@ -1,3 +0,0 @@
-<x-leenooks::form.base {{ $attributes }}>
-	<input type="date" class="form-control {{ $class ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
-</x-leenooks::form.base>
--- a/resources/components/form/email.blade.php
+++ b/resources/components/form/email.blade.php
@ -1,3 +0,0 @@
-<x-leenooks::form.base {{ $attributes }}>
-	<input type="email" class="form-control {{ $class ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
-</x-leenooks::form.base>
--- a/resources/components/form/file.blade.php
+++ b/resources/components/form/file.blade.php
@ -1,17 +0,0 @@
-<x-leenooks::form.base {{ $attributes }}>
-	<input type="file" class="form-control {{ $class ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
-</x-leenooks::form.base>
-{{ $slot }}
-
-@section('page-scripts')
-	<script>
-		$(document).ready(function() {
-			$('#{{ $id ?? $name }}').on('change',function(){
-				//get the file name
-				var fileName = $(this).val();
-				//replace the "Choose a file" label
-				$(this).parent().next('.input-helper').html(fileName);
-			})
-		});
-	</script>
-@append
--- a/resources/components/form/number.blade.php
+++ b/resources/components/form/number.blade.php
@ -1,3 +0,0 @@
-<x-leenooks::form.base {{ $attributes }}>
-	<input type="number" class="form-control {{ $class ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
-</x-leenooks::form.base>
--- a/resources/components/form/password.blade.php
+++ b/resources/components/form/password.blade.php
@ -1,3 +0,0 @@
-<x-leenooks::form.base {{ $attributes }}>
-	<input type="password" class="form-control {{ $class ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
-</x-leenooks::form.base>
--- a/resources/components/form/select.blade.php
+++ b/resources/components/form/select.blade.php
@ -1,60 +0,0 @@
-<x-leenooks::form.base {{ $attributes }}>
-	<input type="hidden" id="{{ $name }}_disabled" name="{{ $name }}" value="" disabled>
-	<select class="form-control @error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @required(isset($required)) @disabled(isset($disabled))>
-		@if(empty($value) || isset($addnew) || isset($choose))
-			<option value=""></option>
-			@isset($addnew)
-			<option value="new">{{ $addnew ?: 'Add New' }}</option>
-			@endisset
-		@endif
-
-		@isset($options)
-			@empty($groupby)
-				@foreach($options as $option)
-					@continue(! Arr::get($option,'value'))
-					<option value="{{ Arr::get($option,'id') }}" @selected(Arr::get($option,'id') == old($old ?? $name,$value ?? ''))>{{ Arr::get($option,'value') }}</option>
-				@endforeach
-
-			@else
-				@foreach($options->groupBy($groupby) as $group)
-					<optgroup label="{{ $groupby == 'active' ? (Arr::get($group->first(),$groupby) ? 'Active' : 'Not Active') : Arr::get($group->first(),$groupby) }}">
-						@foreach($group as $option)
-							@continue(! Arr::get($option,'value'))
-							<option value="{{ Arr::get($option,'id') }}" @selected(Arr::get($option,'id') == old($old ?? $name,$value ?? ''))>{{ Arr::get($option,'value') }}</option>
-						@endforeach
-					</optgroup>
-				@endforeach
-			@endempty
-		@endisset
-	</select>
-</x-leenooks::form.base>
-
-@pa(select2)
-
-@section('page-scripts')
-	<script type="text/javascript">
-		// Select doesnt support read only so we'll use disable and a new field
-		function {{$id ?? $name}}_readonly(on) {
-			if (on) {
-				$('#{{ $name }}').prop('disabled',true);
-				$('#{{ $name }}_disabled').prop('disabled',false).val($('#{{ $name }}').val());
-
-			} else {
-				$('#{{ $name }}').prop('disabled',false);
-				$('#{{ $name }}_disabled').prop('disabled',true);
-			}
-		}
-
-		$(document).ready(function() {
-			$('#{{ $id ?? $name }}').select2({
-				dropdownAutoWidth: true,
-				width: 'style',
-				@isset($addvalues)
-				tags: true,
-				placeholder: '',
-				allowClear: true,
-				@endisset
-			});
-		});
-	</script>
-@append
--- a/resources/components/form/text.blade.php
+++ b/resources/components/form/text.blade.php
@ -1,3 +0,0 @@
-<x-leenooks::form.base {{ $attributes }}>
-	<input type="text" class="form-control {{ $class ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" placeholder="{{ $placeholder ?? '' }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
-</x-leenooks::form.base>
--- a/resources/components/form/textarea.blade.php
+++ b/resources/components/form/textarea.blade.php
@ -1,43 +0,0 @@
-
-<div class="form-group">
-	@if(isset($label))
-		<label {{ $attributes->only(['class']) }} for="{{ $id ?? $name }}">{{ $label }}</label>
-	@endisset
-	<div class="input-group has-validation">
-		@if(isset($icon) || isset($prepend))
-			<div class="input-group-prepend">
-				<span class="input-group-text">@isset($icon)<i class="fas fa-fw {{ $icon }}"></i>@endisset @isset($prepend){!! $prepend !!}@endisset</span>
-			</div>
-		@endif
-		<div class="w-100">
-			<textarea class="form-control {{ $class ?? ''}} @error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @isset($placeholder)placeholder="{{ $placeholder }}"@endisset @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>{{ old($old ?? $name,$value ?? '') }}</textarea>
-			<span class="invalid-feedback">
-				@error($old ?? $name)
-					{{ $message }}
-				@elseif(isset($feedback))
-					{{ $feedback }}
-				@enderror
-			</span>
-		</div>
-	</div>
-	@isset($helper)
-		<span class="input-helper">{{ $helper }}</span>
-	@endif
-</div>
-
-@pa(simplemde)
-
-@section('page-scripts')
-	<script type="text/javascript">
-		$(document).ready(function() {
-			new SimpleMDE({
-				element: $('#{{ $id ?? $name }}')[0],
-				forceSync: true
-			});
-
-			@error($old ?? $name)
-				$('div.CodeMirror-wrap').addClass('form-control is-invalid');
-			@enderror
-		});
-	</script>
-@append
--- a/resources/components/form/time.blade.php
+++ b/resources/components/form/time.blade.php
@ -1,3 +0,0 @@
-<x-leenooks::form.base {{ $attributes }}>
-	<input type="time" class="form-control {{ $class ?? ''}}@error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
-</x-leenooks::form.base>
--- a/resources/components/form/toggle.blade.php
+++ b/resources/components/form/toggle.blade.php
@ -1,17 +0,0 @@
-<div class="form-group">
-	<div class="input-group has-validation">
-		<div class="custom-control custom-switch custom-switch-off-danger custom-switch-on-success">
-			<input type="checkbox" class="custom-control-input @error((! empty($old)) ? $old : $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @checked(old($old ?? $name,$value ?? '')) @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
-			@if(isset($label))
-				<label class="custom-control-label" for="{{ $id ?? $name }}">{{ $label }}</label>
-			@endif
-		</div>
-		<span class="invalid-feedback">
-			@error($name)
-				{{ $message }}
-			@elseif(isset($feedback))
-				{{ $feedback }}
-			@enderror
-		</span>
-	</div>
-</div>
--- a/resources/components/modal/delete.blade.php
+++ b/resources/components/modal/delete.blade.php
@ -1,59 +0,0 @@
-<div class="modal fade" id="confirm_delete" tabindex="-1">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header bg-danger">
-				<h5 class="modal-title">WARNING: DELETING record</h5>
-				<button type="button" class="btn-close" data-dismiss="modal" aria-label="Close">X</button>
-			</div>
-			<div class="modal-body">
-				<p>This action is irreversible. Are you sure, your sure, that you want to delete it?</p>
-			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-				<a type="button" class="btn btn-danger btn-ok" data-hide="{{ $hide }}">Delete</a>
-			</div>
-		</div>
-	</div>
-</div>
-
-@section('page-scripts')
-	<script type="text/javascript">
-		var confirm_delete = new bootstrap.Modal(document.getElementById('confirm_delete'), {});
-
-		$(document).ready(function() {
-			$('.{{$trigger}}').click(function(e) {
-				confirm_delete.show();
-
-				$('#confirm_delete')
-					.find('.btn-ok')
-					.attr('href',$(this).attr('href'))
-					.attr('data-id',$(this).data('id'));
-
-				return false;
-			});
-
-			$('.btn-ok').click(function(item) {
-				var that = $(this);
-
-				// Delete
-				$.ajax({
-					url: that.attr('href'),
-					method: 'POST',
-					dataType: 'json',
-
-				}).done(function(data) {
-					if (that.data('hide') == 'row')
-						$('a[data-id="'+that.data('id')+'"].{{$trigger}}').closest('tr').hide();
-
-				}).fail(function() {
-					alert('Hmm, that didnt work?');
-				});
-
-				// Clear the data cache
-				that.removeData();
-				confirm_delete.hide();
-				return false;
-			})
-		});
-	</script>
-@append
--- a/resources/themes/adminlte/views/auth/login.blade.php
+++ b/resources/themes/adminlte/views/auth/login.blade.php
@ -76,20 +76,11 @@
 							</div>
 						</div>

+						<!-- /.col -->
 						<div class="col-4">
-							<div class="row">
-								<div class="col-12">
-									<button type="submit" name="submit" class="btn btn-sm btn-primary float-right">Sign In</button>
+							<button type="submit" name="submit" class="btn btn-primary mr-0 float-right">Sign In</button>
 						</div>
-							</div>
-
-							<div class="row">
-								<div class="col-12 pt-2">
-									<button type="button" id="passkey" class="btn btn-sm btn-primary float-right"><i class="bi bi-key"></i> Passkey</button>
-								</div>
-							</div>
-						</div>
-
+						<!-- /.col -->
 					</div>
 				</form>

@ -112,17 +103,3 @@
 	</div>
 	<!-- /.login-box -->
@endsection
-
-@section('page-scripts')
-	<!-- Passkeys -->
-	<script type='text/javascript' src='{{ asset('/passkey/passkey.js') }}'></script>
-
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$('#passkey').on('click',function() {
-				passkey_check('{{ csrf_token() }}','{{ redirect()->intended("/passkey/loggedin")->getTargetUrl() }}');
-				return false;
-			});
-		});
-	</script>
-@append
--- a/resources/themes/adminlte/views/layouts/app.blade.php
+++ b/resources/themes/adminlte/views/layouts/app.blade.php
@ -38,6 +38,11 @@

 		@section('scripts')
 			@include('adminlte::layouts.partials.scripts')
+
+			{{-- Scripts --}}
+			{!! Asset::scripts() !!}
+
+			@yield('page-scripts')
 		@show
 	</body>
 </html>
--- a/resources/themes/adminlte/views/layouts/auth.blade.php
+++ b/resources/themes/adminlte/views/layouts/auth.blade.php
@ -27,8 +27,6 @@
 					})
 				})
 			</script>
-
-			@yield('page-scripts')
 		@show
 	</body>
 </html>
--- a/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/htmlheader.blade.php
@ -6,19 +6,16 @@
 	<!-- CSRF Token -->
 	<meta name="csrf-token" content="{{ csrf_token() }}">

-	{{--
-	<!-- Included in adminlte -->
-	<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
-	--}}
+	<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">

 	<!-- Font Awesome Icons -->
-	<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.4/css/all.css">
+	<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.3/css/all.css">
 	{{--
-	<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.4/css/v4-shims.css">
+	<link rel="stylesheet" href="//use.fontawesome.com/releases/v5.15.3/css/v4-shims.css">
 	--}}

 	<!-- Theme style -->
-	<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/admin-lte@3.2.0/dist/css/adminlte.min.css">
+	<link rel="stylesheet" href="//cdn.jsdelivr.net/npm/admin-lte@3.1.0/dist/css/adminlte.min.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">
@ -41,8 +38,8 @@
 	<![endif]-->
 	--}}

-	<!-- Page Styles -->
-	{!! PageAssets::css() !!}
+	<!-- STYLESHEETS -->
+	{!! Asset::styles() !!}

 	@yield('page-styles')

--- a/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/mainheader.blade.php
@ -83,7 +83,7 @@

 	<script type="text/javascript">
 		$(document).ready(function() {
-			$('input[name=q]').typeahead({
+			$("input[name=q]").typeahead({
 				autoSelect: false,
 				scrollHeight: 10,
 				theme: 'bootstrap4',
@ -149,11 +149,6 @@
 							$('span[name=searching]').addClass("d-none");
 						}
 					}
-				},
-				statusCode: {
-					401: function() {
-						window.parent.location.href = '{{ route('login') }}';
-					}
 				}
 			})
 		}, 500);
--- a/resources/themes/adminlte/views/layouts/partials/scripts.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/scripts.blade.php
@ -2,9 +2,9 @@
 <!-- Bootstrap & Jquery App -->
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" crossorigin="anonymous"></script>
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.min.js" integrity="sha512-WFN04846sdKMIP5LKNphMaWzU7YpMyCU245etK3g/2ARYbPK9Ub18eG+ljU96qKRCWh+quCY7yefSmlkQw1ANQ==" crossorigin="anonymous"></script>
-<script type="text/javascript" src="//cdn.jsdelivr.net/npm/bootstrap@4.6.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-fQybjgWLrvvRgtW6bFlB7jaZrFsaBXjsOMm/tB9LTS58ONXgqbR9W8oWht/amnpF" crossorigin="anonymous"></script>
+<script type="text/javascript" src="//cdn.jsdelivr.net/npm/bootstrap@4.6.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-Piv4xVNRyMGpqkS2by6br4gNJ7DXjqk09RmUpJ8jgGtD7zP9yug3goQfGII0yAns" crossorigin="anonymous"></script>
 <!-- AdminLTE -->
-<script type="text/javascript" src="//cdn.jsdelivr.net/npm/admin-lte@3.2.0/dist/js/adminlte.min.js"></script>
+<script type="text/javascript" src="//cdn.jsdelivr.net/npm/admin-lte@3.1.0/dist/js/adminlte.min.js"></script>

 <!-- Additional Utilities -->
 <script src="{{ asset('plugin/bootstrap3-typeahead/js/bootstrap3-typeahead.min.js') }}"></script>
@ -44,7 +44,7 @@
 		$.AdminLTESidebarTweak.Open = state;

 		if (addclass !== 'undefined')
-			$('body')
+			$("body")
 				.addClass(state ? 'sidebar-open' : 'sidebar-collapse');

 		$(this).delay($.AdminLTESidebarTweak.ResizeDelay).queue(function() {
@ -56,7 +56,7 @@
 	$(function () {
 		"use strict";

-		$('body').on('collapsed.lte.pushmenu', function(){
+		$("body").on("collapsed.lte.pushmenu", function(){
 			if($.AdminLTESidebarTweak.options.EnableRemember) {
 				document.cookie = "toggleState=closed;path=/";

@ -64,7 +64,7 @@
 			}
 		});

-		$('body').on('shown.lte.pushmenu', function(){
+		$("body").on("shown.lte.pushmenu", function(){
 			if($.AdminLTESidebarTweak.options.EnableRemember){
 				document.cookie = "toggleState=opened;path=/";

@ -89,23 +89,6 @@
 	});
 </script>

-<script type="text/javascript">
-	$(document).ready(function() {
-		$('body')
-			.addClass('sidebar-collapse')
-			.delay(500)
-			.queue(function () {
-				window.dispatchEvent(new Event('resize'));
-				$(this).dequeue();
-			});
-	});
-</script>
-
-<!-- Page Scripts -->
-{!! PageAssets::js() !!}
-
-@yield('page-scripts')
-
@if(file_exists('js/custom.js'))
 	<!-- Any Custom JS -->
 	<script src="{{ asset('js/custom.js') }}"></script>
--- a/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php
+++ b/resources/themes/adminlte/views/layouts/partials/sidebar.blade.php
@ -12,7 +12,7 @@
 		<div class="user-panel mt-3 pb-3 mb-3 d-flex">
 			<div class="image">
 				@if(isset($user) AND $user->exists)
-					<i class="fa fa-fw fa-2x fa-user text-white"></i>
+					<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
@ -26,7 +26,7 @@

 		<!-- Sidebar Menu -->
 		<nav class="mt-2">
-			<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" data-accordion="false">
+			<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu" data-accordion="false">
 				<!-- Add icons to the links using the .nav-icon class with font-awesome or any other icon font library -->
 				@include('adminlte::layouts.partials.sidebarmenu')
 			</ul>
--- 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/auth/login.blade.php
+++ b/resources/themes/architect/views/auth/login.blade.php
@ -1,114 +0,0 @@
-@extends('architect::layouts.auth')
-
-@section('htmlheader_title')
-	Log in
-@endsection
-
-@section('content')
-	<!-- /.login-logo -->
-	<div class="app-container app-theme-white body-tabs-shadow">
-		<div class="app-container">
-			<div class="h-100 bg-animation">
-				<div class="d-flex h-100 justify-content-center align-items-center">
-					<div class="mx-auto app-login-box col-md-8">
-						@if(file_exists('login-note.html'))
-							<div class="mx-auto card text-white card-body bg-primary w-50">
-								<h5 class="text-white card-title"><i class="icon fa-2x fas fa-info pr-3"></i><span class="font-size-xlg">NOTE</span></h5>
-								<span class="w-100 pb-0">
-									{!! file_get_contents('login-note.html') !!}
-								</span>
-							</div>
-						@endif
-
-						<div class="modal-dialog w-100 mx-auto">
-							<div class="modal-content">
-								<form class="needs-validation" novalidate method="post">
-									{{ csrf_field() }}
-
-									<div class="modal-body">
-										<div class="h5 modal-title text-center">
-											<h4 class="mt-2">
-												<div class="app-logo mx-auto mb-3"><img class="w-75" src="{{ url('img/logo-h-lg.png') }}"></div>
-												<small>@lang('Sign in to <strong>:server</strong>',['server'=>'Foo'])</small>
-											</h4>
-										</div>
-
-										<div class="form-row">
-											<div class="col-md-12 mt-3">
-												<label class="mb-1">Email</label>
-												<input name="email" id="user" placeholder="" type="email" class="form-control" required="">
-												<div class="invalid-feedback">
-													@lang('Please enter your email')
-												</div>
-											</div>
-
-											<div class="col-md-12 mt-2">
-												<label class="mb-1">@lang('Password')</label>
-												<input name="password" id="password" placeholder="" type="password" class="form-control" required>
-												<div class="invalid-feedback">
-													@lang('Please enter your password')
-												</div>
-											</div>
-										</div>
-									</div>
-
-									<div class="modal-footer">
-										@if (count($errors) > 0)
-											<div class="alert alert-danger w-100">
-												<strong>Whoops!</strong> Something went wrong?<br><br>
-												<ul>
-													@foreach ($errors->all() as $error)
-														<li>{{ $error }}</li>
-													@endforeach
-												</ul>
-											</div>
-										@endif
-										<div class="float-right">
-											<button class="btn btn-primary btn-lg">Login</button>
-										</div>
-									</div>
-								</form>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-@endsection
-
-@section('page-scripts')
-	<style>
-		label {
-			text-transform: uppercase;
-			letter-spacing: 0.05em;
-			font-size: 85%;
-			font-weight: bold;
-		}
-
-		table.table tr:last-child {
-			border-bottom: 1px solid #e9ecef;
-		}
-	</style>
-
-	<script>
-		// Example starter JavaScript for disabling form submissions if there are invalid fields
-		(function () {
-			'use strict';
-			window.addEventListener('load',function () {
-				// Fetch all the forms we want to apply custom Bootstrap validation styles to
-				var forms = document.getElementsByClassName('needs-validation');
-				// Loop over them and prevent submission
-				var validation = Array.prototype.filter.call(forms, function (form) {
-					form.addEventListener('submit', function (event) {
-						if (form.checkValidity() === false) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-						form.classList.add('was-validated');
-					}, false);
-				});
-			}, false);
-		})();
-	</script>
-@append
--- a/resources/themes/architect/views/auth/partials/scripts.blade.php
+++ b/resources/themes/architect/views/auth/partials/scripts.blade.php
--- a/resources/themes/architect/views/layouts/app.blade.php
+++ b/resources/themes/architect/views/layouts/app.blade.php
@ -1,5 +1,5 @@
-<!DOCTYPE html>
-<html>
+<!doctype html>
+<html lang="en">
 	@section('htmlheader')
 		@include('architect::layouts.partials.htmlheader')
 	@show
@ -8,17 +8,16 @@
 		<div class="app-container app-theme-white body-tabs-shadow fixed-sidebar">
 			@include('architect::layouts.partials.topmenu')

-			@includeIf('architect::layouts.partials.controlsidebar')
+			{{--
+			@include('architect::layouts.partials.controlsidebar')
+			--}}

 			<div class="app-main">
 				@include('architect::layouts.partials.sidebarmenu')

 				<div class="app-main__outer">
 					<div class="app-main__inner">
-						<div class="main-content">
-							@if (trim($__env->yieldContent('page_title')))
 						@include('architect::layouts.partials.contentheader')
-							@endif

 						<!-- Main content -->
 						<div class="row">
@ -28,7 +27,6 @@
 							</div>
 						</div>
 					</div>
-					</div>

 					@include('architect::layouts.partials.contentfooter')
 				</div>
@ -38,6 +36,9 @@
 		@section('scripts')
 			@include('architect::layouts.partials.scripts')

+			{{-- Scripts --}}
+			{!! Asset::scripts() !!}
+
 			@yield('page-scripts')
 		@show
 	</body>
--- a/resources/themes/architect/views/layouts/auth.blade.php
+++ b/resources/themes/architect/views/layouts/auth.blade.php
@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-	@section('htmlheader')
-		@include('architect::layouts.partials.htmlheader')
-	@show
-
-	<body class="hold-transition login-page">
-		<div id="app">
-			@yield('content')
-		</div>
-
-		@section('scripts')
-			@include('architect::auth.partials.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
@ -5,7 +5,7 @@
 				<ul class="nav">
 					{{--
 					<li class="nav-item">
-						<a href="javascript:void(0);" class="nav-link">Footer Link</a>
+						<a href="javascript:void(0);" class="nav-link">Footer Link 1</a>
 					</li>
 					--}}
 				</ul>
@ -18,7 +18,7 @@
 							<div class="badge badge-success mr-1 ml-0">
 								<small>NEW</small>
 							</div>
-							Footer Link
+							Footer Link 4
 						</a>
 					</li>
 					--}}
--- a/resources/themes/architect/views/layouts/partials/contentheader.blade.php
+++ b/resources/themes/architect/views/layouts/partials/contentheader.blade.php
@ -1,30 +1,26 @@
 <div class="app-page-title">
 	<div class="page-title-wrapper">
 		<div class="page-title-heading">
-			@if (trim($__env->yieldContent('page_icon')))
-				<div class="page-title-icon f32">
-					<i class="@yield('page_icon','')"></i>
+			<div class="page-title-icon">
+				<i class="@yield('page_icon','pe-7s-car')"></i>
 			</div>
-			@endif
 			<div>
 				@yield('page_title','Page Title')
 				<div class="page-title-subheading">
-					@yield('page_subtitle','')
+					@yield('page_subtitle','Page Sub Title')
 				</div>
 			</div>
 		</div>
-
-		@isset($page_actions)
 		<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>
+				<i class="fas 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>
+						<i class="fas fa-business-time fa-w-20"></i>
 					</span>
 					Item Menu
 				</button>
@ -44,6 +40,5 @@
 				</div>
 			</div>
 		</div>
-		@endif
 	</div>
 </div>
--- a/resources/themes/architect/views/layouts/partials/htmlheader.blade.php
+++ b/resources/themes/architect/views/layouts/partials/htmlheader.blade.php
@ -35,6 +35,9 @@
 		<link rel="stylesheet" href="{{ asset('/css/print.css') }}">
 	@endif

+	<!-- STYLESHEETS -->
+	{!! Asset::styles() !!}
+
 	<!-- Theme style -->
 	<link rel="stylesheet" href="{{ asset('/css/architect.min.css') }}">

--- a/resources/themes/architect/views/layouts/partials/topmenu.blade.php
+++ b/resources/themes/architect/views/layouts/partials/topmenu.blade.php
@ -43,7 +43,7 @@
 				{{--
 				<li class="nav-item">
 					<a href="javascript:void(0);" class="nav-link">
-						<i class="nav-link-icon fas fa-database"></i> Link
+						<i class="nav-link-icon fas fa-database"></i> Statistics
 					</a>
 				</li>
 				--}}
--- a/resources/themes/metronic/views/layouts/app.blade.php
+++ b/resources/themes/metronic/views/layouts/app.blade.php
@ -38,6 +38,9 @@
 		@section('scripts')
 			@include('metronic::layouts.partials.scripts')

+			{{-- Scripts --}}
+			{!! Asset::scripts() !!}
+
 			@yield('page-scripts')
 		@show
 	</body>
--- a/resources/themes/metronic/views/layouts/partials/htmlheader.blade.php
+++ b/resources/themes/metronic/views/layouts/partials/htmlheader.blade.php
@ -14,10 +14,10 @@
 	--}}

 	<!-- Theme style -->
-	<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/components.css') }}">
-	<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/style.css') }}">
-	<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/style-responsive.css') }}">
-	<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/themes/blue.css') }}">
+	@css('css/components.css')
+	@css('css/style.css')
+	@css('css/style-responsive.css')
+	@css('css/themes/blue.css')

 	<!-- Google Font: Source Sans Pro -->
 	<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700|PT+Sans+Narrow|Source+Sans+Pro:200,300,400,600,700,900&amp;subset=all" rel="stylesheet" type="text/css">
@ -32,7 +32,10 @@
 	<link rel="shortcut icon" href="{{ object_get($site,'favicon','favicon.ico') }}" />

 	<!-- Custom CSS -->
-	<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/custom.css') }}">
+	@css('css/custom.css')
+
+	<!-- STYLESHEETS -->
+	{!! Asset::styles() !!}

 	@yield('page-styles')
 </head>
--- a/resources/themes/metronic/views/layouts/partials/scripts.blade.php
+++ b/resources/themes/metronic/views/layouts/partials/scripts.blade.php
@ -18,5 +18,5 @@

@if(file_exists('js/custom.js'))
 	<!-- Any Custom JS -->
-	<script type="text/javascript" src="{{ asset('js/custom.js') }}"></script>
+	<script src="{{ asset('js/custom.js') }}"></script>
@endif
--- a/src/Carbon.php
+++ b/src/Carbon.php
@ -13,7 +13,7 @@ class Carbon extends CarbonBase
 {
    const MONTHS_PER_HALF = 6;

-    public function __get(string $name): mixed
+    public function __get($name)
    {
       switch ($name) {
            case 'half':
@ -57,7 +57,7 @@ class Carbon extends CarbonBase
     *
     * @return static
     */
-    public function startOfHalf(int $dayOfWeek=NULL)
+    public function startOfHalf($dayOfWeek = null)
    {
        return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF - 5, 1)->firstOfMonth($dayOfWeek);
    }
@ -72,7 +72,7 @@ class Carbon extends CarbonBase
     *
     * @return static
     */
-    public function endOfHalf(int $dayOfWeek=NULL)
+    public function endOfHalf($dayOfWeek = null)
    {
        return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF, 1)->lastOfMonth($dayOfWeek);
    }
--- a/src/Casts/LeenooksCarbon.php
+++ b/src/Casts/LeenooksCarbon.php
@ -1,30 +0,0 @@
-<?php
-
-namespace Leenooks\Casts;
-
-use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
-use Illuminate\Database\Eloquent\Model;
-use Leenooks\Carbon;
-
-class LeenooksCarbon implements CastsAttributes
-{
-    /**
-     * Cast the given value.
-     *
-     * @param  array<string, mixed>  $attributes
-     */
-    public function get(Model $model, string $key, mixed $value, array $attributes): ?Carbon
-    {
-        return $value ? Carbon::create($value) : NULL;
-    }
-
-    /**
-     * Prepare the given value for storage.
-     *
-     * @param  array<string, mixed>  $attributes
-     */
-    public function set(Model $model, string $key, mixed $value, array $attributes): string|null
-    {
-        return ($value instanceof Carbon ? $value : $this->get($model,$key,$value,$attributes))?->format('Y-m-d H:i:s');
-    }
-}
--- a/src/Commands/ScheduleList.php
+++ b/src/Commands/ScheduleList.php
@ -0,0 +1,66 @@
+<?php
+
+namespace Leenooks\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Console\Scheduling\Schedule;
+
+class ScheduleList extends Command
+{
+	protected $signature = 'schedule:list';
+
+	protected $description = 'List when scheduled commands are executed.';
+
+	/**
+	 * @var Schedule
+	 */
+	protected $schedule;
+
+	/**
+	 * ScheduleList constructor.
+	 *
+	 * @param Schedule $schedule
+	 */
+	public function __construct(Schedule $schedule)
+	{
+		parent::__construct();
+
+		$this->schedule = $schedule;
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		$events = array_map(function ($event) {
+			return [
+				'cron' => $event->expression,
+				'command' => static::fixupCommand($event->command),
+			];
+		}, $this->schedule->events());
+
+		$this->table(
+			['Cron', 'Command'],
+			$events
+		);
+	}
+
+	/**
+	 * If it's an artisan command, strip off the PHP
+	 *
+	 * @param $command
+	 * @return string
+	 */
+	protected static function fixupCommand($command)
+	{
+		$parts = explode(' ', $command);
+		if (count($parts) > 2 && $parts[1] === "'artisan'") {
+			array_shift($parts);
+		}
+
+		return implode(' ', $parts);
+	}
+}
--- a/src/Controllers/AdminController.php
+++ b/src/Controllers/AdminController.php
@ -0,0 +1,54 @@
+<?php
+
+namespace Leenooks\Controllers;
+
+use Illuminate\Support\Facades\Auth;
+use App\Http\Controllers\Controller;
+use Redirect;
+use Session;
+
+use App\Models\User;
+
+class AdminController extends Controller
+{
+	public function __construct()
+	{
+		$this->middleware('auth');
+	}
+
+	public function switch_authorised($id)
+	{
+		return (method_exists(Auth::user(),'isAdmin') && Auth::user()->isAdmin($id)) ? TRUE : FALSE;
+	}
+
+	public function switch_session()
+	{
+		return ! Session::get('orig_user');
+	}
+
+	public function user_switch_start($id)
+	{
+		if ($this->switch_session() AND $this->switch_authorised($id))
+		{
+			$uo = User::find($id);
+
+			if (! $uo)
+				abort(404,'User not found');
+
+			Session::put('orig_user',Auth::id());
+			Auth::login($uo);
+		}
+
+		return Redirect::to('/home');
+	}
+
+	public function user_switch_stop()
+	{
+		if ($id = Session::pull('orig_user')) {
+			$uo = User::find($id);
+			Auth::login($uo);
+		}
+
+		return Redirect::to('/home');
+	}
+}
--- a/src/Controllers/SwitchUserController.php
+++ b/src/Controllers/SwitchUserController.php
@ -1,61 +0,0 @@
-<?php
-
-namespace Leenooks\Controllers;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Auth;
-use Redirect;
-use Session;
-
-use App\Models\User;
-
-class SwitchUserController extends Controller
-{
-	public function __construct()
-	{
-		$this->middleware('auth');
-	}
-
-	/**
-	 * Determine if the user is authorised to switch to another user
-	 *
-	 * @param User $user
-	 * @return bool
-	 */
-	public function switch_authorised(User $user): bool
-	{
-		return (method_exists(Auth::user(),'isAdmin') && Auth::user()->isAdmin($user)) ? TRUE : FALSE;
-	}
-
-	/**
-	 * Switch to a different user
-	 *
-	 * @param User $user
-	 * @return mixed
-	 */
-	public function switch_start(User $user)
-	{
-		if ($user->switched)
-			abort(403,'User already switched');
-
-		if ($this->switch_authorised($user)) {
-			Session::put('orig_user',Auth::user());
-			Auth::login($user);
-		}
-
-		return Redirect::to('/home');
-	}
-
-	/**
-	 * Return back from the switch users
-	 *
-	 * @return mixed
-	 */
-	public function switch_stop()
-	{
-		if ($user = Session::pull('orig_user'))
-			Auth::login($user);
-
-		return Redirect::to('/home');
-	}
-}
--- a/src/Http/Middleware/ActiveUser.php
+++ b/src/Http/Middleware/ActiveUser.php
@ -1,26 +0,0 @@
-<?php
-
-namespace Leenooks\Http\Middleware;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class ActiveUser
-{
-	/**
-	 * Handle an incoming request.
-	 *
-	 * @param Request $request
-	 * @param \Closure $next
-	 * @return mixed
-	 */
-	public function handle(Request $request,\Closure $next)
-	{
-		if ((! Auth::user()?->exists) || (! Auth::user()->active)) {
-			Auth::logout();
-			abort(403,'Your account is not active');
-		}
-
-		return $next($request);
-	}
-}
--- a/src/PageAssets.php
+++ b/src/PageAssets.php
@ -1,213 +0,0 @@
-<?php
-
-namespace Leenooks;
-
-use Illuminate\Support\Arr;
-use Illuminate\Support\Collection;
-
-/**
- * Useful tools (js/css) used when rendering pages
- */
-class PageAssets
-{
-	// Types that we can handle
-	private const array types = [
-		'css',
-		'js',
-	];
-
-	public const array assets = [
-		'datatables' => [
-			'base' => [
-				'css' => [
-					'//cdn.datatables.net/2.1.2/css/dataTables.bootstrap4.css',
-					//'//cdn.datatables.net/2.1.2/css/dataTables.dataTables.min.css',
-				],
-				'js' => [
-					'//cdn.datatables.net/2.1.2/js/dataTables.min.js',
-					'//cdn.datatables.net/2.1.2/js/dataTables.bootstrap4.min.js',
-				],
-			],
-			'buttons' => [
-				'css' => [
-					'//cdn.datatables.net/buttons/3.1.0/css/buttons.bootstrap4.min.css',
-					//'//cdn.datatables.net/buttons/3.1.0/css/buttons.dataTables.min.css',
-				],
-				'js' => [
-					'//cdn.datatables.net/buttons/3.1.0/js/dataTables.buttons.min.js',
-					//'//cdn.datatables.net/buttons/3.1.0/js/buttons.dataTables.min.js',
-					'//cdn.datatables.net/buttons/3.1.0/js/buttons.bootstrap4.min.js',
-					'//cdnjs.cloudflare.com/ajax/libs/jszip/3.2.0/jszip.min.js',
-				],
-			],
-			'conditionalpaging' => [
-				'js' => [
-					'//cdn.datatables.net/plug-ins/2.0.5/features/conditionalPaging/dataTables.conditionalPaging.min.js',
-				],
-			],
-			'fixedheader' => [
-				'css' => [
-					'//cdn.datatables.net/fixedheader/4.0.1/css/fixedHeader.bootstrap4.min.css',
-					//'//cdn.datatables.net/fixedheader/4.0.1/css/fixedHeader.dataTables.min.css',
-				],
-				'js' => [
-					'//cdn.datatables.net/fixedheader/4.0.1/js/dataTables.fixedHeader.min.js',
-					//'//cdn.datatables.net/fixedheader/4.0.1/js/fixedHeader.dataTables.min.js',
-					'//cdn.datatables.net/fixedheader/4.0.1/js/fixedHeader.bootstrap4.min.js',
-				]
-			],
-			'responsive' => [
-				'css' => [
-					'//cdn.datatables.net/responsive/3.0.2/css/responsive.bootstrap4.min.css',
-					//'//cdn.datatables.net/responsive/3.0.2/css/responsive.dataTables.min.css',
-				],
-				'js' => [
-					'//cdn.datatables.net/responsive/3.0.2/js/dataTables.responsive.min.js',
-					//'//cdn.datatables.net/responsive/3.0.2/js/responsive.bootstrap.min.js',
-					'//cdn.datatables.net/responsive/3.0.2/js/responsive.bootstrap4.min.js',
-				]
-			],
-			'rowgroup' => [
-				'css' => [
-					'//cdn.datatables.net/rowgroup/1.5.0/css/rowGroup.bootstrap4.min.css',
-					//'//cdn.datatables.net/rowgroup/1.5.0/css/rowGroup.dataTables.min.css',
-				],
-				'js' => [
-					'//cdn.datatables.net/rowgroup/1.5.0/js/dataTables.rowGroup.min.js',
-					//'//cdn.datatables.net/rowgroup/1.5.0/js/rowGroup.dataTables.min.js',
-					'//cdn.datatables.net/rowgroup/1.5.0/js/rowGroup.bootstrap4.min.js',
-				],
-			],
-			'searchpanes' => [
-				'css' => [
-					'//cdn.datatables.net/searchpanes/2.3.1/css/searchPanes.bootstrap4.min.css',
-					//'//cdn.datatables.net/searchpanes/2.3.1/css/searchPanes.dataTables.min.css',
-				],
-				'js' => [
-					'//cdn.datatables.net/searchpanes/2.3.1/js/dataTables.searchPanes.min.js',
-					//'//cdn.datatables.net/searchpanes/2.3.1/js/searchPanes.dataTables.min.js',
-					'//cdn.datatables.net/searchpanes/2.3.1/js/searchPanes.bootstrap4.min.js',
-				],
-			],
-			'searchpanes-left' => [
-				'css' => [
-					'/plugin/dataTables/leftSearchPanes.css',
-				],
-			],
-			'select' => [
-				'css' => [
-					'//cdn.datatables.net/select/2.0.3/css/select.bootstrap4.min.css',
-					//'//cdn.datatables.net/select/2.0.3/css/select.dataTables.min.css',
-				],
-				'js' => [
-					'//cdn.datatables.net/select/2.0.3/js/dataTables.select.min.js',
-					//'//cdn.datatables.net/select/2.0.3/js/select.dataTables.min.js',
-					'//cdn.datatables.net/select/2.0.3/js/select.bootstrap4.min.js',
-				]
-			],
-		],
-		'select2' => [
-			'base' => [
-				'css' => [
-					'//cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css',
-				],
-				'js' => [
-					'//cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js',
-				],
-			],
-			'autofocus' => [
-				'js' => [
-					'/plugin/select2/fix-autofocus.js',
-				],
-			]
-		],
-		'simplemde' => [
-			'base' => [
-				'css' => [
-					'//cdn.jsdelivr.net/simplemde/latest/simplemde.min.css',
-				],
-				'js' => [
-					'//cdn.jsdelivr.net/simplemde/latest/simplemde.min.js',
-				],
-			],
-		],
-	];
-
-	// Items to manage
-	public static Collection $items;
-
-	// Add an item to the list
-	public static function add(string $type,Collection|array|string $asset): void
-	{
-		if (! in_array($type,self::types))
-			throw new \Exception('Invalid type: '.$type);
-
-		if (! isset(self::$items))
-			self::init();
-
-		if (is_string($asset))
-			self::$items
-				->get($type)
-				->push($asset)
-				->unique();
-		else
-			self::$items->put($type,
-				self::$items
-					->get($type)
-					->merge($asset->values())
-					->unique());
-	}
-
-	// Add a predefined asset
-	public static function asset(string $id): void
-	{
-		if (! isset(self::$items))
-			self::init();
-
-		if (str_contains($id,',')) {
-			[$item,$arguments] = explode(',',$id,2);
-			$arguments = collect(explode('|',$arguments));
-
-		} else {
-			$item = $id;
-			$arguments = collect();
-		}
-
-		$arguments = $arguments->prepend('base');
-		$asset = collect(Arr::get(self::assets,$item))->only($arguments);
-
-		foreach (self::types as $type)
-			if ($x=$asset->pluck($type)->filter()->flatten())
-				self::add($type,$x);
-	}
-
-	// Render the CSS items
-	public static function css(): string
-	{
-		return isset(self::$items)
-			? self::$items
-				->get('css')
-				->map(fn($item)=>sprintf('<link rel="stylesheet" href="%s">',$item))
-				->join('')
-			: '';
-	}
-
-	public static function init(): void
-	{
-		self::$items = collect([
-			'js' => collect(),
-			'css' => collect(),
-		]);
-	}
-
-	// Render the JS items
-	public static function js(): string
-	{
-		return isset(self::$items)
-			? self::$items
-				->get('js')
-				->map(fn($item)=>sprintf('<script type="text/javascript" src="%s"></script>',$item))
-				->join('')
-			: '';
-	}
-}
--- a/src/Providers/CustomBladeServiceProvider.php
+++ b/src/Providers/CustomBladeServiceProvider.php
@ -5,6 +5,7 @@ namespace Leenooks\Providers;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\ServiceProvider;
+use Ramsey\Collection\Collection;

 class CustomBladeServiceProvider extends ServiceProvider
 {
@ -15,53 +16,169 @@ class CustomBladeServiceProvider extends ServiceProvider
     */
    public function boot()
    {
-		Blade::directive('css',function(string $expression) {
+		Blade::directive('css',function(string $expression,array $args=[]) {
 			return $this->resolve('css',$expression);
+
+			switch (trim($expression,"'")) {
+				case 'select2':
+					return
+						'<link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css">';
+
+				case 'simplemde':
+					return
+						'<link type="text/css" rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css">';
+
+				default:
+					throw new \Exception('Unknown CSS: '.$expression);
+			}
 		});

-		Blade::directive('js',function($expression) {
+		Blade::directive('js',function($expression,string $options=NULL) {
+			Log::debug('JS: '.$expression);
 			return $this->resolve('js',$expression);
+
+			switch (trim($expression,"'")) {
+				case 'select2':
+					return
+						'<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>'.
+						'<script type="text/javascript" src="'.asset('plugin/select2/fix-autofocus.js').'"></script>';
+
+				case 'simplemde':
+					return
+						'<script type="text/javascript" src="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script>';
+
+				default:
+					throw new \Exception('Unknown JS: '.$expression);
+			}
 		});
    }

 	private function resolve(string $content,string $expression): string
 	{
-		if (str_contains($expression,',')) {
+		if (str_contains($expression,','))
 			[$type,$arguments] = explode(',',$expression,2);
-			$arguments = explode('|',$arguments);

-		} else {
+		else {
 			$type = $expression;
-			$arguments = [];
+			$arguments = '';
 		}

-		$return = collect();
-		$css = collect();
-		$js = collect();
+		$arguments = explode('|',trim($arguments,"'"));
+
+		$return = collect();
+
+		switch ($x=trim($type,"'")) {
+			case '':
+				Log::debug('Render ...');
+				dd(__METHOD__,'here');
+				break;

-		switch ($type) {
 			case 'datatables':
-			case 'select2':
-			case 'simplemde':
-				Log::alert(sprintf('Blade @css/@js for %s deprecicated, use @pa',$type));
+				switch ($content) {
+					case 'css':
+						// Base
+						$return->push('https://cdn.datatables.net/1.10.23/css/jquery.dataTables.min.css');
+
+						foreach ($arguments as $option) {
+							switch ($option) {
+								case '':
+									break;
+
+								case 'bootstrap4':
+									$return->push('/plugin/dataTables/dataTables.bootstrap4.css');
+									break;
+
+								case 'buttons':
+									$return->push('https://cdn.datatables.net/buttons/1.6.5/css/buttons.dataTables.min.css');
+									break;
+
+								case 'fixedheader':
+									$return->push('https://cdn.datatables.net/fixedheader/3.1.7/css/fixedHeader.dataTables.min.css');
+									break;
+
+								case 'rowgroup':
+									$return->push('https://cdn.datatables.net/rowgroup/1.1.2/css/rowGroup.dataTables.min.css');
+									break;
+
+								case 'responsive':
+									$return->push('http://cdn.datatables.net/responsive/2.2.6/css/responsive.dataTables.min.css');
+									break;
+
+								case 'searchpanes':
+									$return->push('https://cdn.datatables.net/searchpanes/1.2.1/css/searchPanes.dataTables.min.css');
+									break;
+
+								case 'searchpanes-left':
+									$return->push('/plugin/dataTables/leftSearchPanes.css');
+									break;
+
+								case 'select':
+									$return->push('https://cdn.datatables.net/select/1.3.1/css/select.dataTables.min.css');
+									break;
+
+								default:
+									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$x,$content,$option));
+							}
+						}
+
+						break;
+
+					case 'js':
+						// Base
+						$return->push('https://cdn.datatables.net/1.10.23/js/jquery.dataTables.min.js');
+
+						foreach ($arguments as $option) {
+							switch ($option) {
+								case 'bootstrap4':
+									$return->push('/plugin/dataTables/dataTables.bootstrap4.js');
+									break;
+
+								case 'buttons':
+									$return->push('https://cdn.datatables.net/buttons/1.6.5/js/dataTables.buttons.min.js');
+									$return->push('https://cdn.datatables.net/buttons/1.6.5/js/buttons.html5.min.js');
+									$return->push('https://cdnjs.cloudflare.com/ajax/libs/jszip/3.2.0/jszip.min.js');
+									break;
+
+								case 'fixedheader':
+									$return->push('https://cdn.datatables.net/fixedheader/3.1.7/js/dataTables.fixedHeader.min.js');
+									break;
+
+								case 'responsive':
+									$return->push('https://cdn.datatables.net/responsive/2.2.6/js/dataTables.responsive.min.js');
+									break;
+
+								case 'rowgroup':
+									$return->push('https://cdn.datatables.net/rowgroup/1.1.2/js/dataTables.rowGroup.min.js');
+									break;
+
+								case 'searchpanes':
+									$return->push('https://cdn.datatables.net/searchpanes/1.2.1/js/dataTables.searchPanes.min.js');
+									break;
+
+								case 'select':
+									$return->push('https://cdn.datatables.net/select/1.3.1/js/dataTables.select.min.js');
+									break;
+
+								case 'default':
+									$return->push('');
+									break;
+
+								default:
+									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$x,$content,$option));
+							}
+						}
+				}
+
 				break;

 			case 'datepick':
 				switch ($content) {
 					case 'css':
-						$css->put($type,'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/css/bootstrap-datepicker.min.css');
+						$return->push('https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/css/bootstrap-datepicker.min.css');
 						break;

 					case 'js':
-						$js->put($type,'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js');
-				}
-
-				break;
-
-			case 'debounce':
-				switch ($content) {
-					case 'js':
-						$js->put($type,'js/debounce.js');
+						$return->push('https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js');
 				}

 				break;
@ -70,119 +187,56 @@ class CustomBladeServiceProvider extends ServiceProvider
 				switch ($content) {
 					case 'js':
 						// Base
-						$js->put($type,'https://code.highcharts.com/highcharts.js');
+						$return->push('https://code.highcharts.com/highcharts.js');

 						foreach ($arguments as $option) {
-							$key = $type.':'.$option;
 							switch ($option) {
-								case '3d':
-									$js->put($key,'https://code.highcharts.com/highcharts-3d.js');
-									$js->put($key.'mouseover','/plugin/highcharts/3dmouseover.js');
+								case '':
 									break;

 								case 'data':
-									$js->put($key,'https://code.highcharts.com/modules/data.js');
+									$return->push('https://code.highcharts.com/modules/data.js');
 									break;

 								case 'defaults':
-									$js->put($key,'/plugin/highcharts/defaults.js');
+									$return->push('/plugin/highcharts/defaults.js');
 									break;

 								case 'drilldown':
-									$js->put($key,'https://code.highcharts.com/modules/drilldown.js');
-									break;
-
-								case 'export':
-									$js->put($key,'https://code.highcharts.com/modules/exporting.js');
-									$js->put($key.'data','https://code.highcharts.com/modules/export-data.js');
-									break;
-
-								case 'funnel':
-									$js->put($key,'https://code.highcharts.com/modules/funnel.js');
+									$return->push('https://code.highcharts.com/modules/drilldown.js');
 									break;

 								case 'heatmap':
-									$js->put($key,'https://code.highcharts.com/modules/heatmap.js');
-									break;
-
-								case 'solidguage':
-									$js->put($key,'https://code.highcharts.com/highcharts-more.js');
-									$js->put($key.'accessiblity','https://code.highcharts.com/modules/accessibility.js');
-									$js->put($key.'solid-guage','https://code.highcharts.com/modules/solid-gauge.js');
-									break;
-
-								case 'theme-dark':
-									$js->put($key,'https://code.highcharts.com/themes/dark-unica.js');
-									break;
-
-								default:
-									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
-							}
-						}
-				}
-
-				break;
-
-			case 'highcharts-stock':
-				switch ($content) {
-					case 'js':
-						// Base
-						$js->put($type,'https://code.highcharts.com/stock/highstock.js');
-
-						foreach ($arguments as $option) {
-							$key = $type.':'.$option;
-							switch ($option) {
-								case 'data':
-									$js->put($key,'https://code.highcharts.com/stock/modules/data.js');
+									$return->push('https://code.highcharts.com/modules/heatmap.js');
 									break;

 								case 'export':
-									$js->put($key,'https://code.highcharts.com/stock/modules/exporting.js');
+									$return->push('https://code.highcharts.com/modules/exporting.js');
+									$return->push('https://code.highcharts.com/modules/export-data.js');
+									break;
+
+								case 'theme-dark':
+									$return->push('https://code.highcharts.com/themes/dark-unica.js');
 									break;

 								default:
-									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
+									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$x,$content,$option));
 							}
 						}
 				}

 				break;

-			case 'summernote':
-				switch ($content) {
-					case 'css':
-						// Base
-						$css->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.css');
-
-						break;
-
-					case 'js':
-						// Base
-						$js->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.js');
-				}
-
-				break;
-
-			case 'validation':
-				switch ($content) {
-					case 'js':
-						// Base
-						$js->put('validate','https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/jquery.validate.min.js');
-						$js->put('validate.additional','https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/additional-methods.min.js');
-				}
-
-				break;
-
 			default:
 				throw new \Exception(sprintf('Unknown Expression: [%s]',$expression));
 		}

-		if ($js->count())
-			$return = $return->merge($js->map(fn($item)=>sprintf('<script type="text/javascript" src="%s"></script>',$item)));
+		switch ($content) {
+			case 'css':
+				return '<link type="text/css" rel="stylesheet" href="'.$return->join('"><link type="text/css" rel="stylesheet" href="').'">';

-		if ($css->count())
-			$return = $return->merge($css->map(fn($item)=>sprintf('<link rel="stylesheet" href="%s">',$item)));
-
-		return $return->join('');
+			case 'js':
+				return '<script type="text/javascript" src="'.$return->join('"></script><script type="text/javascript" src="').'"></script>';
+		}
 	}
 }
--- a/src/Providers/LeenooksServiceProvider.php
+++ b/src/Providers/LeenooksServiceProvider.php
@ -2,14 +2,9 @@

 namespace Leenooks\Providers;

-use Illuminate\Foundation\AliasLoader;
-use Illuminate\Support\Facades\Blade;
-use Illuminate\Routing\Router;
-use Illuminate\Support\Collection;
-use Illuminate\Support\ServiceProvider;
 use Leenooks\Http\Middleware\GuestUser;
-use Leenooks\PageAssets;
-use Leenooks\Traits\SingleOrFail;
+use Illuminate\Routing\Router;
+use Illuminate\Support\ServiceProvider;

 /**
 * Class GuestUserServiceProvider.
@ -18,9 +13,7 @@ use Leenooks\Traits\SingleOrFail;
 */
 class LeenooksServiceProvider extends ServiceProvider
 {
-	use SingleOrFail;
-
-	private string $_path = '';
+	private $_path = '';

 	/**
 	 * Bootstrap the application services.
@ -29,12 +22,6 @@ class LeenooksServiceProvider extends ServiceProvider
 	 */
 	public function boot(Router $router)
 	{
-		self::bootSingleOrfail();
-
-		// Custom Aliases
-		$loader = AliasLoader::getInstance();
-		$loader->alias('PageAssets',PageAssets::class);
-
 		$router->pushMiddlewareToGroup('web',GuestUser::class);

 		$this->loadViewsFrom($this->_path.'/resources/themes/adminlte/views/', 'adminlte');
@ -44,17 +31,10 @@ class LeenooksServiceProvider extends ServiceProvider

 		$this->loadViewsFrom($this->_path.'/resources/themes/metronic/views/', 'metronic');

-		//Blade::componentNamespace('Leenooks\\Components','leenooks');
-		Blade::anonymousComponentPath($this->_path.'/resources/components', 'leenooks');
-
-		// Add our page assets
-		Blade::directive('pa',function($expression) {
-			return sprintf('<?php PageAssets::asset(\'%s\') ?>',$expression);
-		});
-
 		// Enable a Collect::recursive() function
-		Collection::macro('recursive', function () {
+		\Illuminate\Support\Collection::macro('recursive', function () {
 			return $this->map(function ($value) {
+
 				if (is_array($value) || is_object($value)) {
 					return collect($value)->recursive();
 				}
--- a/src/Traits/CompositeKeys.php
+++ b/src/Traits/CompositeKeys.php
@ -25,90 +25,33 @@ trait CompositeKeys {
 	{
 		$keys = $this->getKeyName();

-		return !is_array($keys)
-			? parent::setKeysForSaveQuery($query)
-			: $query->where(function($q) use($keys) {
-				foreach ($keys as $key){
-					$q->where($key,$this->getAttribute($key));
+		if (! is_array($keys)) {
+			return parent::setKeysForSaveQuery($query);
 		}
-			});
+
+		foreach($keys as $keyName) {
+			$query->where($keyName, '=', $this->getKeyForSaveQuery($keyName));
+		}
+
+		return $query;
 	}

 	/**
-	 * Get the casts array.
-	 *
-	 * @return array
-	 */
-	public function getCasts()
-	{
-		if ($this->getIncrementing())
-			return array_merge([$this->getKeyName() => $this->getKeyType()],$this->casts);
-
-		return $this->casts;
-	}
-
-	/**
-	 * @return false
-	 */
-	public function getIncrementing()
-	{
-		return FALSE;
-	}
-
-	/**
-	 * Get the value of the model's primary key.
+	 * Get the primary key value for a save query.
 	 *
+	 * @param mixed $keyName
 	 * @return mixed
 	 */
-	public function getKey()
+	protected function getKeyForSaveQuery($keyName = null)
 	{
-		$fields = $this->getKeyName();
-		$keys = [];
-
-		array_map(function($key) use(&$keys) {
-			$keys[] = $this->getAttribute($key);
-		}, $fields);
-
-		return $keys;
+		if (is_null($keyName)) {
+			$keyName = $this->getKeyName();
 		}

-	/**
-	 * Finds model by primary keys
-	 *
-	 * @param array $ids
-	 * @return mixed
-	 */
-	public static function find(array $ids)
-	{
-		$modelClass = get_called_class();
-		$model = new $modelClass();
-		$keys = $model->primaryKey;
-
-		return $model->where(function($query) use($ids,$keys) {
-			foreach ($keys as $idx => $key) {
-				if (isset($ids[$idx]))
-					$query->where($key, $ids[$idx]);
-				else
-					$query->whereNull($key);
-			}
-		})->first();
+		if (isset($this->original[$keyName])) {
+			return $this->original[$keyName];
 		}

-	/**
-	 * Find model by primary key or throws ModelNotFoundException
-	 *
-	 * @param array $ids
-	 * @return mixed
-	 */
-	public static function findOrFail(array $ids)
-	{
-		$modelClass = get_called_class();
-		$model = new $modelClass();
-		$record = $model->find($ids);
-
-		if (! $record)
-			throw new ModelNotFoundException;
-
-		return $record;
+		return $this->getAttribute($keyName);
 	}
 }
--- a/src/Traits/ObjectIssetFix.php
+++ b/src/Traits/ObjectIssetFix.php
@ -1,15 +0,0 @@
-<?php
-
-/**
- * Fix for when there is a call to pluck() for values resolved via __get()
- */
-namespace Leenooks\Traits;
-
-trait ObjectIssetFix
-{
-	// Fix for a call to pluck('something') (which is resolved via __get()), but it returns false.
-	public function __isset($key)
-	{
-		return (bool)$this->{$key};
-	}
-}
--- a/src/Traits/SingleOrFail.php
+++ b/src/Traits/SingleOrFail.php
@ -32,8 +32,8 @@ trait SingleOrFail
 			return NULL;
 		});

-		// When a query should return 1 object, or setup to create a new object
-		Builder::macro('singleOrNew',function (array $args=[]) {
+		// When a query should return 1 object, or NULL if it doesnt
+		Builder::macro('singleOrNew',function ($args) {
 			$result = $this->where($args)->get();

 			if ($result->count() == 1)
--- a/src/Traits/UserSwitch.php
+++ b/src/Traits/UserSwitch.php
@ -7,27 +7,14 @@ namespace Leenooks\Traits;

 use Session;

-use App\Models\User;
-
 trait UserSwitch
 {
-	/**
-	 * Return if this is a switched user
-	 *
-	 * @return mixed
-	 */
 	public function getSwitchedAttribute()
 	{
 		return Session::get('orig_user');
 	}

-	/**
-	 * If the user record has an admin attribute, we'll return that
-	 *
-	 * @param User|null $user
-	 * @return false|mixed
-	 */
-	public function isAdmin(User $user=NULL)
+	public function isAdmin($id)
 	{
 		return isset($this->admin) ? $this->admin : FALSE;
 	}
Author	SHA1	Message	Date
Deon George	3603583059	Remove igaster-theme	2021-11-23 13:07:11 +11:00
Deon George	ea3867be0c	Add back igaster/laravel-theme	2021-11-23 12:55:11 +11:00
Deon George	55543e0ea3	Disable CustomBlade	2021-11-23 12:38:59 +11:00
Deon George	33d192bd1a	Disable CustomBlade	2021-11-23 12:38:22 +11:00
Deon George	d0d46ed6f1	Add back orchestra/asset	2021-11-23 11:49:07 +11:00
Deon George	7df5a2c1d9	Remove igaster/laravel-theme	2021-11-22 14:10:06 +11:00
Deon George	ca99748361	Remove orchestra/asset, using our our blade now	2021-11-22 13:52:16 +11:00
				`@ -1 +0,0 @@`
				`<button type="reset" id="reset" {{ $attributes->class(['mt-4','btn','btn-sm','btn-secondary']) }}>Reset</button>`
				`@ -1 +0,0 @@`
				`<button type="submit" id="submit" {{ $attributes->class(['mt-4','btn','btn-sm','btn-success']) }} @disabled(isset($disabled))>{{ $slot }}</button>`