Add ObjectIssetFix Trait

composer.json

@@ -1,5 +1,5 @@
 {
-	"name": "laravel/leenooks",
+	"name": "leenooks/laravel",
 	"description": "Leenooks standard templates and tools.",
 	"keywords": ["laravel","leenooks"],
 	"license": "MIT",

resources/components/button/cancel.blade.php

@@ -0,0 +1,11 @@
+<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

resources/components/button/error.blade.php

@@ -0,0 +1,9 @@
+@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

resources/components/button/reset.blade.php

@@ -0,0 +1 @@
+<button type="reset" id="reset" {{ $attributes->class(['mt-4','btn','btn-sm','btn-secondary']) }}>Reset</button>

resources/components/button/submit.blade.php

@@ -0,0 +1 @@
+<button type="submit" id="submit" {{ $attributes->class(['mt-4','btn','btn-sm','btn-success']) }} @disabled(isset($disabled))>{{ $slot }}</button>

resources/components/button/success.blade.php

@@ -0,0 +1,9 @@
+@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

resources/components/errors.blade.php

@@ -1,4 +1,3 @@
-<!-- Errors -->
 @if ($errors->any())
 	<div class="alert alert-danger alert-dismissible">
 		<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>

resources/components/form/base.blade.php

@@ -0,0 +1,23 @@
+<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>

resources/components/form/checkbox.blade.php

@@ -0,0 +1,5 @@
+<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>

resources/components/form/date.blade.php

@@ -0,0 +1,3 @@
+<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>

resources/components/form/email.blade.php

@@ -0,0 +1,3 @@
+<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>

resources/components/form/file.blade.php

@@ -0,0 +1,17 @@
+<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

resources/components/form/number.blade.php

@@ -0,0 +1,3 @@
+<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>

resources/components/form/password.blade.php

@@ -0,0 +1,3 @@
+<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>

resources/components/form/select.blade.php

@@ -0,0 +1,60 @@
+<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

resources/components/form/text.blade.php

@@ -0,0 +1,3 @@
+<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>

resources/components/form/textarea.blade.php

@@ -0,0 +1,43 @@
+
+<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

resources/components/form/time.blade.php

@@ -0,0 +1,3 @@
+<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>

resources/components/form/toggle.blade.php

@@ -0,0 +1,17 @@
+<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>

resources/components/modal/delete.blade.php

@@ -0,0 +1,59 @@
+<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

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

@@ -76,11 +76,20 @@
 							</div>
 						</div>
 
-						<!-- /.col -->
 						<div class="col-4">
-							<button type="submit" name="submit" class="btn btn-primary mr-0 float-right">Sign In</button>
+							<div class="row">
+								<div class="col-12">
+									<button type="submit" name="submit" class="btn btn-sm btn-primary 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>
 
@@ -103,3 +112,17 @@
 	</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

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

@@ -38,11 +38,6 @@
 
 		@section('scripts')
 			@include('adminlte::layouts.partials.scripts')
-
-			{{-- Scripts --}}
-			{!! Asset::scripts() !!}
-
-			@yield('page-scripts')
 		@show
 	</body>
 </html>

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

@@ -27,6 +27,8 @@
 					})
 				})
 			</script>
+
+			@yield('page-scripts')
 		@show
 	</body>
 </html>

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

@@ -41,8 +41,8 @@
 	<![endif]-->
 	--}}
 
-	<!-- STYLESHEETS -->
+	<!-- Page Styles -->
-	{!! Asset::styles() !!}
+	{!! PageAssets::css() !!}
 
 	@yield('page-styles')
 

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

@@ -89,6 +89,23 @@
 	});
 </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>

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)
-					<img src="{{ Gravatar::get(($user->exists AND $user->email) ? $user->email : 'nobody@example.com') }}" class="img-circle elevation-2" alt="User">
+					<i class="fa fa-fw fa-2x fa-user text-white"></i>
 				@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" role="menu" data-accordion="false">
+			<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" 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>

resources/themes/adminlte/views/widget/form_date.blade.php

@@ -1,17 +0,0 @@
-<div class="form-group">
-	<label for="{{ $id }}">{{ $label }}</label>
-	<div class="input-group has-validation">
-		@empty($icon)
-		@else
-			<div class="input-group-prepend">
-				<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
-			</div>
-		@endempty()
-		<input type="date" class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?? $id}}" value="{{ old($old,$value) }}">
-		<span class="invalid-feedback" role="alert">
-			@error($id)
-				{{ $message }}
-			@enderror
-		</span>
-	</div>
-</div>

resources/themes/adminlte/views/widget/form_file.blade.php

@@ -1,39 +0,0 @@
-<div class="form-group">
-	<label for="{{ $id }}">{{ $label }}</label>
-	<div class="input-group has-validation">
-		@empty($icon)
-		@else
-			<div class="input-group-prepend">
-				<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
-			</div>
-		@endempty()
-		<div class="custom-file">
-			<input type="file" class="custom-file-input @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?? $id}}">
-			<label class="custom-file-label input-group-text" for="{{ $id }}">Choose file</label>
-		</div>
-
-		{{--
-		<div class="input-group-append">
-			<button type="submit" class="input-group-text btn btn-success" id="">Upload</button>
-		</div>
-		--}}
-		<span class="invalid-feedback @error($id) d-block @enderror" role="alert">
-			@error($id)
-				{{ $message }}
-			@enderror
-		</span>
-	</div>
-</div>
-
-@section('page-scripts')
-	<script>
-		$(document).ready(function() {
-			$('#{{ $id }}').on('change',function(){
-				//get the file name
-				var fileName = $(this).val();
-				//replace the "Choose a file" label
-				$(this).next('.custom-file-label').html(fileName);
-			})
-		});
-	</script>
-@append

resources/themes/adminlte/views/widget/form_select.blade.php

@@ -1,57 +0,0 @@
-<div class="form-group">
-	<label for="{{ $id }}">{{ $label }}</label>
-	<div class="input-group has-validation">
-		@empty($icon)
-		@else
-			<div class="input-group-prepend">
-				<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
-			</div>
-		@endempty()
-
-		<select class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?? $id}}">
-			@if(! isset($addvalues) || ! $addvalues)
-				<option id="new"></option>
-			@endif
-			@empty($groupby)
-				@foreach($options as $option)
-					@empty(Arr::get($option,'value')) @continue @endempty
-					<option value="{{ Arr::get($option,'id') }}" @if(Arr::get($option,'id') == old($old,$value))selected @endif>{{ 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)
-							@empty(Arr::get($option,'value')) @continue @endempty
-							<option value="{{ Arr::get($option,'id') }}" @if(Arr::get($option,'id') == old($old,$value))selected @endif>{{ Arr::get($option,'value') }}</option>
-						@endforeach
-					</optgroup>
-				@endforeach
-			@endempty
-		</select>
-
-		<span class="invalid-feedback" role="alert">
-			@error($id)
-				{{ $message }}
-			@enderror
-		</span>
-	</div>
-</div>
-
-@section('page-scripts')
-	@css(select2)
-	@js(select2,autofocus)
-
-	<script type="text/javascript">
-		$(document).ready(function() {
-			$('#{{ $id }}').select2({
-				dropdownAutoWidth: true,
-				width: 'style',
-				@isset($addvalues)
-					tags: true,
-					placeholder: '',
-					allowClear: true,
-				@endisset
-			});
-		});
-	</script>
-@append

resources/themes/adminlte/views/widget/form_text.blade.php

@@ -1,17 +0,0 @@
-<div class="form-group">
-	<label for="{{ $id }}">{{ $label }}</label>
-	<div class="input-group has-validation">
-		@empty($icon)
-		@else
-			<div class="input-group-prepend">
-				<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
-			</div>
-		@endempty()
-		<input type="text" class="form-control {{ $classes ?? ''}}@error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?: $id }}" value="{{ old($old ?? $name,$value) }}">
-		<span class="invalid-feedback" role="alert">
-			@error($id)
-				{{ $message }}
-			@enderror
-		</span>
-	</div>
-</div>

resources/themes/adminlte/views/widget/form_toggle.blade.php

@@ -1,11 +0,0 @@
-<div class="form-group">
-	<div class="custom-control custom-switch custom-switch-off-danger custom-switch-on-success">
-		<input type="checkbox" class="custom-control-input" id="{{ $id }}" name="{{ $name ?: $id }}" {{ old($old ?? $name,$value) ? 'checked' : '' }}>
-		<label class="custom-control-label" for="{{ $id }}">{{ $label }}</label>
-	</div>
-	<span class="invalid-feedback @error($id) d-block @enderror" role="alert">
-		@error($id)
-			{{ $message }}
-		@enderror
-	</span>
-</div>

resources/themes/adminlte/views/widget/status.blade.php

@@ -1,3 +0,0 @@
-@include('adminlte::widget.success')
-
-@include('adminlte::widget.errors')

resources/themes/adminlte/views/widget/success.blade.php

@@ -1,10 +0,0 @@
-<!-- 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

resources/themes/adminlte/views/widget/success_button.blade.php

@@ -1 +0,0 @@
-@if(session()->has('success'))<span class="ml-3 pt-0 pb-0 pr-1 pl-1 btn btn-outline-success float-right"><small>{{ session()->get('success') }}</small></span>@endif

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

@@ -38,9 +38,6 @@
 		@section('scripts')
 			@include('architect::layouts.partials.scripts')
 
-			{{-- Scripts --}}
-			{!! Asset::scripts() !!}
-
 			@yield('page-scripts')
 		@show
 	</body>

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

@@ -12,9 +12,6 @@
 		@section('scripts')
 			@include('architect::auth.partials.scripts')
 
-			{{-- Scripts --}}
-			{!! Asset::scripts() !!}
-
 			@yield('page-scripts')
 		@show
 	</body>

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

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

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

@@ -38,9 +38,6 @@
 		@section('scripts')
 			@include('metronic::layouts.partials.scripts')
 
-			{{-- Scripts --}}
-			{!! Asset::scripts() !!}
-
 			@yield('page-scripts')
 		@show
 	</body>

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

@@ -14,10 +14,10 @@
 	--}}
 
 	<!-- Theme style -->
-	@themecss('/css/components.css','components-css')
+	<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/components.css') }}">
-	@themecss('/css/style.css','style-css')
+	<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/style.css') }}">
-	@themecss('/css/style-responsive.css','style-responsive-css')
+	<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/style-responsive.css') }}">
-	@themecss('/css/themes/blue.css','theme-blue-css')
+	<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/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,10 +32,7 @@
 	<link rel="shortcut icon" href="{{ object_get($site,'favicon','favicon.ico') }}" />
 
 	<!-- Custom CSS -->
-	@php(Asset::add('custom-css','/css/custom.css'))
+	<link rel="stylesheet" href="{{ asset('theme/frontend/metronic/css/custom.css') }}">
-
-	<!-- STYLESHEETS -->
-	{!! Asset::styles() !!}
 
 	@yield('page-styles')
 </head>

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

@@ -18,5 +18,5 @@
 
 @if(file_exists('js/custom.js'))
 	<!-- Any Custom JS -->
-	<script src="{{ asset('js/custom.js') }}"></script>
+	<script type="text/javascript" src="{{ asset('js/custom.js') }}"></script>
 @endif

src/Carbon.php

@@ -13,7 +13,7 @@ class Carbon extends CarbonBase
 {
     const MONTHS_PER_HALF = 6;
 
-    public function __get($name)
+    public function __get(string $name): mixed
     {
        switch ($name) {
             case 'half':
@@ -57,7 +57,7 @@ class Carbon extends CarbonBase
      *
      * @return static
      */
-    public function startOfHalf($dayOfWeek = null)
+    public function startOfHalf(int $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($dayOfWeek = null)
+    public function endOfHalf(int $dayOfWeek=NULL)
     {
         return $this->setDate($this->year, $this->half * static::MONTHS_PER_HALF, 1)->lastOfMonth($dayOfWeek);
     }

src/Casts/LeenooksCarbon.php

@@ -0,0 +1,30 @@
+<?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');
+    }
+}

src/Commands/ScheduleList.php

@@ -1,66 +0,0 @@
-<?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);
-	}
-}

src/Controllers/SwitchUserController.php

@@ -3,7 +3,6 @@
 namespace Leenooks\Controllers;
 
 use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
 use Illuminate\Support\Facades\Auth;
 use Redirect;
 use Session;
@@ -57,6 +56,6 @@ class SwitchUserController extends Controller
 		if ($user = Session::pull('orig_user'))
 			Auth::login($user);
 
-		return Redirect::to(RouteServiceProvider::HOME);
+		return Redirect::to('/home');
 	}
 }

src/Http/Middleware/ActiveUser.php

@@ -0,0 +1,26 @@
+<?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);
+	}
+}

src/PageAssets.php

@@ -0,0 +1,213 @@
+<?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('')
+			: '';
+	}
+}

src/Providers/CustomBladeServiceProvider.php

@@ -5,7 +5,6 @@ namespace Leenooks\Providers;
 use Illuminate\Support\Facades\Blade;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\ServiceProvider;
-use Orchestra\Support\Facades\Asset;
 
 class CustomBladeServiceProvider extends ServiceProvider
 {
@@ -16,11 +15,11 @@ class CustomBladeServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-		Blade::directive('css',function(string $expression,array $args=[]) {
+		Blade::directive('css',function(string $expression) {
 			return $this->resolve('css',$expression);
 		});
 
-		Blade::directive('js',function($expression,string $options=NULL) {
+		Blade::directive('js',function($expression) {
 			return $this->resolve('js',$expression);
 		});
     }
@@ -37,111 +36,24 @@ class CustomBladeServiceProvider extends ServiceProvider
 		}
 
 		$return = collect();
-		$urls = collect();
+		$css = collect();
+		$js = collect();
 
 		switch ($type) {
 			case 'datatables':
-				switch ($content) {
+			case 'select2':
-					case 'css':
+			case 'simplemde':
-						// Base
+				Log::alert(sprintf('Blade @css/@js for %s deprecicated, use @pa',$type));
-						$urls->put($type,'https://cdn.datatables.net/1.10.23/css/jquery.dataTables.min.css');
-
-						foreach ($arguments as $option) {
-							$key = $type.':'.$option;
-							switch ($option) {
-								case 'bootstrap4':
-									$urls->put($key,'/plugin/dataTables/dataTables.bootstrap4.css');
-									break;
-
-								case 'buttons':
-									$urls->put($key,'https://cdn.datatables.net/buttons/1.6.5/css/buttons.dataTables.min.css');
-									break;
-
-								case 'fixedheader':
-									$urls->put($key,'https://cdn.datatables.net/fixedheader/3.1.7/css/fixedHeader.dataTables.min.css');
-									break;
-
-								case 'rowgroup':
-									$urls->put($key,'https://cdn.datatables.net/rowgroup/1.1.2/css/rowGroup.dataTables.min.css');
-									break;
-
-								case 'responsive':
-									$urls->put($key,'http://cdn.datatables.net/responsive/2.2.6/css/responsive.dataTables.min.css');
-									break;
-
-								case 'searchpanes':
-									$urls->put($key,'https://cdn.datatables.net/searchpanes/1.2.1/css/searchPanes.dataTables.min.css');
-									break;
-
-								case 'searchpanes-left':
-									$urls->put('searchpanes:searchpanes-left','/plugin/dataTables/leftSearchPanes.css');
-									break;
-
-								case 'select':
-									$urls->put($key,'https://cdn.datatables.net/select/1.3.1/css/select.dataTables.min.css');
-									break;
-
-								default:
-									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
-							}
-						}
-
-						break;
-
-					case 'js':
-						// Base
-						$urls->put($type,'https://cdn.datatables.net/1.10.23/js/jquery.dataTables.min.js');
-
-						foreach ($arguments as $option) {
-							$key = $type.':'.$option;
-
-							switch ($option) {
-								case 'bootstrap4':
-									$urls->put($key,'/plugin/dataTables/dataTables.bootstrap4.js');
-									break;
-
-								case 'buttons':
-									$urls->put($key,'https://cdn.datatables.net/buttons/1.6.5/js/dataTables.buttons.min.js');
-									$urls->put($key.'html5','https://cdn.datatables.net/buttons/1.6.5/js/buttons.html5.min.js');
-									$urls->put($key.'jszip','https://cdnjs.cloudflare.com/ajax/libs/jszip/3.2.0/jszip.min.js');
-									break;
-
-								case 'fixedheader':
-									$urls->put($key,'https://cdn.datatables.net/fixedheader/3.1.7/js/dataTables.fixedHeader.min.js');
-									break;
-
-								case 'responsive':
-									$urls->put($key,'https://cdn.datatables.net/responsive/2.2.6/js/dataTables.responsive.min.js');
-									break;
-
-								case 'rowgroup':
-									$urls->put($key,'https://cdn.datatables.net/rowgroup/1.1.2/js/dataTables.rowGroup.min.js');
-									break;
-
-								case 'searchpanes':
-									$urls->put($key,'https://cdn.datatables.net/searchpanes/1.2.1/js/dataTables.searchPanes.min.js');
-									break;
-
-								case 'select':
-									$urls->put($key,'https://cdn.datatables.net/select/1.3.1/js/dataTables.select.min.js');
-									break;
-
-								default:
-									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
-							}
-						}
-				}
-
 				break;
 
 			case 'datepick':
 				switch ($content) {
 					case 'css':
-						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/css/bootstrap-datepicker.min.css');
+						$css->put($type,'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/css/bootstrap-datepicker.min.css');
 						break;
 
 					case 'js':
-						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js');
+						$js->put($type,'https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.9.0/js/bootstrap-datepicker.min.js');
 				}
 
 				break;
@@ -149,7 +61,7 @@ class CustomBladeServiceProvider extends ServiceProvider
 			case 'debounce':
 				switch ($content) {
 					case 'js':
-						$urls->put($type,'js/debounce.js');
+						$js->put($type,'js/debounce.js');
 				}
 
 				break;
@@ -158,49 +70,49 @@ class CustomBladeServiceProvider extends ServiceProvider
 				switch ($content) {
 					case 'js':
 						// Base
-						$urls->put($type,'https://code.highcharts.com/highcharts.js');
+						$js->put($type,'https://code.highcharts.com/highcharts.js');
 
 						foreach ($arguments as $option) {
 							$key = $type.':'.$option;
 							switch ($option) {
 								case '3d':
-									$urls->put($key,'https://code.highcharts.com/highcharts-3d.js');
+									$js->put($key,'https://code.highcharts.com/highcharts-3d.js');
-									$urls->put($key.'mouseover','/plugin/highcharts/3dmouseover.js');
+									$js->put($key.'mouseover','/plugin/highcharts/3dmouseover.js');
 									break;
 
 								case 'data':
-									$urls->put($key,'https://code.highcharts.com/modules/data.js');
+									$js->put($key,'https://code.highcharts.com/modules/data.js');
 									break;
 
 								case 'defaults':
-									$urls->put($key,'/plugin/highcharts/defaults.js');
+									$js->put($key,'/plugin/highcharts/defaults.js');
 									break;
 
 								case 'drilldown':
-									$urls->put($key,'https://code.highcharts.com/modules/drilldown.js');
+									$js->put($key,'https://code.highcharts.com/modules/drilldown.js');
 									break;
 
 								case 'export':
-									$urls->put($key,'https://code.highcharts.com/modules/exporting.js');
+									$js->put($key,'https://code.highcharts.com/modules/exporting.js');
-									$urls->put($key.'data','https://code.highcharts.com/modules/export-data.js');
+									$js->put($key.'data','https://code.highcharts.com/modules/export-data.js');
 									break;
 
 								case 'funnel':
-									$urls->put($key,'https://code.highcharts.com/modules/funnel.js');
+									$js->put($key,'https://code.highcharts.com/modules/funnel.js');
 									break;
 
 								case 'heatmap':
-									$urls->put($key,'https://code.highcharts.com/modules/heatmap.js');
+									$js->put($key,'https://code.highcharts.com/modules/heatmap.js');
 									break;
 
 								case 'solidguage':
-									$urls->put($key,'https://code.highcharts.com/highcharts-more.js');
+									$js->put($key,'https://code.highcharts.com/highcharts-more.js');
-									$urls->put($key.'accessiblity','https://code.highcharts.com/modules/accessibility.js');
+									$js->put($key.'accessiblity','https://code.highcharts.com/modules/accessibility.js');
-									$urls->put($key.'solid-guage','https://code.highcharts.com/modules/solid-gauge.js');
+									$js->put($key.'solid-guage','https://code.highcharts.com/modules/solid-gauge.js');
 									break;
 
 								case 'theme-dark':
-									$urls->put($key,'https://code.highcharts.com/themes/dark-unica.js');
+									$js->put($key,'https://code.highcharts.com/themes/dark-unica.js');
 									break;
 
 								default:
@@ -215,17 +127,17 @@ class CustomBladeServiceProvider extends ServiceProvider
 				switch ($content) {
 					case 'js':
 						// Base
-						$urls->put($type,'https://code.highcharts.com/stock/highstock.js');
+						$js->put($type,'https://code.highcharts.com/stock/highstock.js');
 
 						foreach ($arguments as $option) {
 							$key = $type.':'.$option;
 							switch ($option) {
 								case 'data':
-									$urls->put($key,'https://code.highcharts.com/stock/modules/data.js');
+									$js->put($key,'https://code.highcharts.com/stock/modules/data.js');
 									break;
 
 								case 'export':
-									$urls->put($key,'https://code.highcharts.com/stock/modules/exporting.js');
+									$js->put($key,'https://code.highcharts.com/stock/modules/exporting.js');
 									break;
 
 								default:
@@ -236,59 +148,17 @@ class CustomBladeServiceProvider extends ServiceProvider
 
 				break;
 
-			case 'select2':
-				switch ($content) {
-					case 'css':
-						// Base
-						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css');
-
-						break;
-
-					case 'js':
-						// Base
-						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js');
-
-						foreach ($arguments as $option) {
-							$key = $type.':'.$option;
-							switch ($option) {
-								case 'autofocus':
-									$urls->put($key,'plugin/select2/fix-autofocus.js');
-									break;
-
-								default:
-									throw new \Exception(sprintf('Unknown [%s] option: [%s:%s]',$type,$content,$option));
-							}
-						}
-				}
-
-				break;
-
-			case 'simplemde':
-				switch ($content) {
-					case 'css':
-						// Base
-						$urls->put($type,'https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css');
-
-						break;
-
-					case 'js':
-						// Base
-						$urls->put($type,'https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js');
-				}
-
-				break;
-
 			case 'summernote':
 				switch ($content) {
 					case 'css':
 						// Base
-						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.css');
+						$css->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.css');
 
 						break;
 
 					case 'js':
 						// Base
-						$urls->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.js');
+						$js->put($type,'https://cdnjs.cloudflare.com/ajax/libs/summernote/0.8.18/summernote-bs4.js');
 				}
 
 				break;
@@ -297,8 +167,8 @@ class CustomBladeServiceProvider extends ServiceProvider
 				switch ($content) {
 					case 'js':
 						// Base
-						$urls->put('validate','https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/jquery.validate.min.js');
+						$js->put('validate','https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/jquery.validate.min.js');
-						$urls->put('validate.additional','https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/additional-methods.min.js');
+						$js->put('validate.additional','https://cdn.jsdelivr.net/npm/jquery-validation@1.19.3/dist/additional-methods.min.js');
 				}
 
 				break;
@@ -307,13 +177,12 @@ class CustomBladeServiceProvider extends ServiceProvider
 				throw new \Exception(sprintf('Unknown Expression: [%s]',$expression));
 		}
 
-		if ($urls->count())
+		if ($js->count())
-			return $urls->map(function($item,$key) {
+			$return = $return->merge($js->map(fn($item)=>sprintf('<script type="text/javascript" src="%s"></script>',$item)));
-				$dependancy='';
-				if (str_contains($key,':'))
-					[$dependancy,$key] = explode(':',$key);
 
-				return "<?php Asset::add('$key','$item','$dependancy'); ?>";
+		if ($css->count())
-			})->join('');
+			$return = $return->merge($css->map(fn($item)=>sprintf('<link rel="stylesheet" href="%s">',$item)));
+
+		return $return->join('');
 	}
 }

src/Providers/LeenooksServiceProvider.php

@@ -2,9 +2,14 @@
 
 namespace Leenooks\Providers;
 
-use Leenooks\Http\Middleware\GuestUser;
+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;
 
 /**
  * Class GuestUserServiceProvider.
@@ -13,7 +18,9 @@ use Illuminate\Support\ServiceProvider;
  */
 class LeenooksServiceProvider extends ServiceProvider
 {
-	private $_path = '';
+	use SingleOrFail;
+
+	private string $_path = '';
 
 	/**
 	 * Bootstrap the application services.
@@ -22,6 +29,12 @@ 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');
@@ -31,10 +44,17 @@ class LeenooksServiceProvider extends ServiceProvider
 
 		$this->loadViewsFrom($this->_path.'/resources/themes/metronic/views/', 'metronic');
 
-		// Enable a Collect::recursive() function
+		//Blade::componentNamespace('Leenooks\\Components','leenooks');
-		\Illuminate\Support\Collection::macro('recursive', function () {
+		Blade::anonymousComponentPath($this->_path.'/resources/components', 'leenooks');
-			return $this->map(function ($value) {
 
+		// 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 () {
+			return $this->map(function ($value) {
 				if (is_array($value) || is_object($value)) {
 					return collect($value)->recursive();
 				}

src/Traits/CompositeKeys.php

@@ -25,33 +25,90 @@ trait CompositeKeys {
 	{
 		$keys = $this->getKeyName();
 
-		if (! is_array($keys)) {
+		return !is_array($keys)
-			return parent::setKeysForSaveQuery($query);
+			? parent::setKeysForSaveQuery($query)
-		}
+			: $query->where(function($q) use($keys) {
-
+				foreach ($keys as $key){
-		foreach($keys as $keyName) {
+					$q->where($key,$this->getAttribute($key));
-			$query->where($keyName, '=', $this->getKeyForSaveQuery($keyName));
+				}
-		}
+			});
-
-		return $query;
 	}
 
 	/**
-	 * Get the primary key value for a save 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.
 	 *
-	 * @param mixed $keyName
 	 * @return mixed
 	 */
-	protected function getKeyForSaveQuery($keyName = null)
+	public function getKey()
 	{
-		if (is_null($keyName)) {
+		$fields = $this->getKeyName();
-			$keyName = $this->getKeyName();
+		$keys = [];
-		}
 
-		if (isset($this->original[$keyName])) {
+		array_map(function($key) use(&$keys) {
-			return $this->original[$keyName];
+			$keys[] = $this->getAttribute($key);
-		}
+		}, $fields);
 
-		return $this->getAttribute($keyName);
+		return $keys;
+	}
+
+	/**
+	 * 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();
+	}
+
+	/**
+	 * 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;
 	}
 }

src/Traits/ObjectIssetFix.php

@@ -0,0 +1,15 @@
+<?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};
+	}
+}