From 12496101e1aa7764e71187210016dc3b5107376c Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Mon, 22 Jul 2024 23:09:45 +1000
Subject: [PATCH] Rename back to leenooks/laravel, start to use components for
 html widgets, updated login form to include passkey

---
 composer.json                                 |  2 +-
 resources/components/form/base.blade.php      | 18 ++++++
 resources/components/form/email.blade.php     |  3 +
 resources/components/form/password.blade.php  |  3 +
 resources/components/form/select.blade.php    | 42 ++++++++++++++
 resources/components/form/text.blade.php      |  3 +
 resources/components/success.blade.php        |  1 +
 .../adminlte/views/auth/login.blade.php       | 31 ++++++++--
 .../adminlte/views/layouts/auth.blade.php     |  2 +
 .../views/widget/form_select.blade.php        | 57 -------------------
 .../adminlte/views/widget/form_text.blade.php | 17 ------
 .../views/widget/success_button.blade.php     |  1 -
 src/Providers/LeenooksServiceProvider.php     | 12 ++--
 13 files changed, 108 insertions(+), 84 deletions(-)
 create mode 100644 resources/components/form/base.blade.php
 create mode 100644 resources/components/form/email.blade.php
 create mode 100644 resources/components/form/password.blade.php
 create mode 100644 resources/components/form/select.blade.php
 create mode 100644 resources/components/form/text.blade.php
 create mode 100644 resources/components/success.blade.php
 delete mode 100644 resources/themes/adminlte/views/widget/form_select.blade.php
 delete mode 100644 resources/themes/adminlte/views/widget/form_text.blade.php
 delete mode 100644 resources/themes/adminlte/views/widget/success_button.blade.php

diff --git a/composer.json b/composer.json
index 862f925..1f8db2a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-	"name": "laravel/leenooks",
+	"name": "leenooks/laravel",
 	"description": "Leenooks standard templates and tools.",
 	"keywords": ["laravel","leenooks"],
 	"license": "MIT",
diff --git a/resources/components/form/base.blade.php b/resources/components/form/base.blade.php
new file mode 100644
index 0000000..271be94
--- /dev/null
+++ b/resources/components/form/base.blade.php
@@ -0,0 +1,18 @@
+<div class="form-group">
+	@if(isset($label))
+		<label for="{{ $id ?? $name }}">{{ $label }}</label>
+	@endisset
+	<div class="input-group has-validation">
+		@isset($icon)
+			<div class="input-group-prepend">
+				<span class="input-group-text"><i class="fas fa-fw {{ $icon }}"></i></span>
+			</div>
+		@endisset()
+		{{ $slot }}
+		<span class="invalid-feedback" role="alert">
+			@error($name)
+				{{ $message }}
+			@enderror
+		</span>
+	</div>
+</div>
\ No newline at end of file
diff --git a/resources/components/form/email.blade.php b/resources/components/form/email.blade.php
new file mode 100644
index 0000000..5e0083a
--- /dev/null
+++ b/resources/components/form/email.blade.php
@@ -0,0 +1,3 @@
+<x-leenooks::form.base {{ $attributes }}>
+	<input type="email" class="form-control {{ $classes ?? ''}}@error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($name,$value ?? "") }}">
+</x-leenooks::form.base>
\ No newline at end of file
diff --git a/resources/components/form/password.blade.php b/resources/components/form/password.blade.php
new file mode 100644
index 0000000..2fde082
--- /dev/null
+++ b/resources/components/form/password.blade.php
@@ -0,0 +1,3 @@
+<x-leenooks::form.base {{ $attributes }}>
+	<input type="password" class="form-control {{ $classes ?? ''}}@error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($name,$value ?? "") }}">
+</x-leenooks::form.base>
\ No newline at end of file
diff --git a/resources/components/form/select.blade.php b/resources/components/form/select.blade.php
new file mode 100644
index 0000000..5d4a79b
--- /dev/null
+++ b/resources/components/form/select.blade.php
@@ -0,0 +1,42 @@
+<x-leenooks::form.base {{ $attributes }}>
+	<select class="form-control @error($name) is-invalid @enderror" id="{{ $id }}" name="{{ $name }}">
+		@if(isset($addvalues) && $addvalues)
+			<option id="new"></option>
+		@endif
+
+		@empty($groupby)
+			@foreach($options as $option)
+				@continue(! Arr::get($option,'value'))
+				<option value="{{ Arr::get($option,'id') }}" @selected(Arr::get($option,'id') == 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)
+						@empty(Arr::get($option,'value')) @continue @endempty
+						<option value="{{ Arr::get($option,'id') }}" @selected(Arr::get($option,'id') == old($old,$value))>{{ Arr::get($option,'value') }}</option>
+					@endforeach
+				</optgroup>
+			@endforeach
+		@endempty
+	</select>
+</x-leenooks::form.base>
+
+@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
\ No newline at end of file
diff --git a/resources/components/form/text.blade.php b/resources/components/form/text.blade.php
new file mode 100644
index 0000000..7858650
--- /dev/null
+++ b/resources/components/form/text.blade.php
@@ -0,0 +1,3 @@
+<x-leenooks::form.base {{ $attributes }}>
+	<input type="text" class="form-control {{ $classes ?? ''}}@error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($name,$value ?? "") }}">
+</x-leenooks::form.base>
\ No newline at end of file
diff --git a/resources/components/success.blade.php b/resources/components/success.blade.php
new file mode 100644
index 0000000..6edb2db
--- /dev/null
+++ b/resources/components/success.blade.php
@@ -0,0 +1 @@
+<button {{ $attributes->class(['btn','btn-sm','btn-success']) }}>{{ $slot }}</button>
\ No newline at end of file
diff --git a/resources/themes/adminlte/views/auth/login.blade.php b/resources/themes/adminlte/views/auth/login.blade.php
index 9494c9e..6e7c53e 100644
--- a/resources/themes/adminlte/views/auth/login.blade.php
+++ b/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>
 
@@ -102,4 +111,18 @@
 		</div>
 	</div>
 	<!-- /.login-box -->
-@endsection
\ No newline at end of file
+@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() }}','/passkey/loggedin');
+				return false;
+			});
+		});
+	</script>
+@append
\ No newline at end of file
diff --git a/resources/themes/adminlte/views/layouts/auth.blade.php b/resources/themes/adminlte/views/layouts/auth.blade.php
index c3bf5de..6357dcd 100644
--- a/resources/themes/adminlte/views/layouts/auth.blade.php
+++ b/resources/themes/adminlte/views/layouts/auth.blade.php
@@ -27,6 +27,8 @@
 					})
 				})
 			</script>
+
+			@yield('page-scripts')
 		@show
 	</body>
 </html>
\ No newline at end of file
diff --git a/resources/themes/adminlte/views/widget/form_select.blade.php b/resources/themes/adminlte/views/widget/form_select.blade.php
deleted file mode 100644
index 688e50c..0000000
--- a/resources/themes/adminlte/views/widget/form_select.blade.php
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/resources/themes/adminlte/views/widget/form_text.blade.php b/resources/themes/adminlte/views/widget/form_text.blade.php
deleted file mode 100644
index f45168c..0000000
--- a/resources/themes/adminlte/views/widget/form_text.blade.php
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/resources/themes/adminlte/views/widget/success_button.blade.php b/resources/themes/adminlte/views/widget/success_button.blade.php
deleted file mode 100644
index ef80179..0000000
--- a/resources/themes/adminlte/views/widget/success_button.blade.php
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/src/Providers/LeenooksServiceProvider.php b/src/Providers/LeenooksServiceProvider.php
index 7bccb44..c1fbff6 100644
--- a/src/Providers/LeenooksServiceProvider.php
+++ b/src/Providers/LeenooksServiceProvider.php
@@ -2,8 +2,10 @@
 
 namespace Leenooks\Providers;
 
+use Illuminate\Support\Facades\Blade;
 use Leenooks\Http\Middleware\GuestUser;
 use Illuminate\Routing\Router;
+use Illuminate\Support\Collection;
 use Illuminate\Support\ServiceProvider;
 
 /**
@@ -13,7 +15,7 @@ use Illuminate\Support\ServiceProvider;
  */
 class LeenooksServiceProvider extends ServiceProvider
 {
-	private $_path = '';
+	private string $_path = '';
 
 	/**
 	 * Bootstrap the application services.
@@ -31,10 +33,12 @@ class LeenooksServiceProvider extends ServiceProvider
 
 		$this->loadViewsFrom($this->_path.'/resources/themes/metronic/views/', 'metronic');
 
-		// Enable a Collect::recursive() function
-		\Illuminate\Support\Collection::macro('recursive', function () {
-			return $this->map(function ($value) {
+		//Blade::componentNamespace('Leenooks\\Components','leenooks');
+		Blade::anonymousComponentPath($this->_path.'/resources/components', 'leenooks');
 
+		// 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();
 				}