resources/components/form/base.blade.php

@@ -1,15 +1,15 @@
+@if(isset($label))
+	<label {{ $attributes->only(['class']) }} for="{{ $id ?? $name }}">{{ $label }}</label>
+@endisset
 <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
+		@endif()
 		{{ $slot }}
-		<span class="invalid-feedback">
+		<span class="invalid-feedback" role="alert">
 			@error($old ?? $name)
 				{{ $message }}
 			@elseif(isset($feedback))
@@ -20,4 +20,4 @@
 	@isset($helper)
 		<span class="input-helper">{{ $helper }}</span>
 	@endif
-</div>
+</div>

resources/components/form/select.blade.php

@@ -8,24 +8,22 @@
 			@endisset
 		@endif
 
-		@isset($options)
+		@empty($groupby)
-			@empty($groupby)
+			@foreach($options as $option)
-				@foreach($options as $option)
+				@continue(! Arr::get($option,'value'))
-					@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>
-					<option value="{{ Arr::get($option,'id') }}" @selected(Arr::get($option,'id') == old($old ?? $name,$value ?? ''))>{{ Arr::get($option,'value') }}</option>
+			@endforeach
-				@endforeach
 
-			@else
+		@else
-				@foreach($options->groupBy($groupby) as $group)
+			@foreach($options->groupBy($groupby) as $group)
-					<optgroup label="{{ $groupby == 'active' ? (Arr::get($group->first(),$groupby) ? 'Active' : 'Not Active') : Arr::get($group->first(),$groupby) }}">
+				<optgroup label="{{ $groupby == 'active' ? (Arr::get($group->first(),$groupby) ? 'Active' : 'Not Active') : Arr::get($group->first(),$groupby) }}">
-						@foreach($group as $option)
+					@foreach($group as $option)
-							@continue(! Arr::get($option,'value'))
+						@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>
+						<option value="{{ Arr::get($option,'id') }}" @selected(Arr::get($option,'id') == old($old ?? $name,$value ?? ''))>{{ Arr::get($option,'value') }}</option>
-						@endforeach
+					@endforeach
-					</optgroup>
+				</optgroup>
-				@endforeach
+			@endforeach
-			@endempty
+		@endempty
-		@endisset
 	</select>
 </x-leenooks::form.base>
 

resources/components/form/textarea.blade.php

@@ -1,43 +1,3 @@
-
+<x-leenooks::form.base {{ $attributes }}>
-<div class="form-group">
+	<textarea class="form-control {{ $classes ?? ''}} @error($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>
-	@if(isset($label))
+</x-leenooks::form.base>
-		<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 {{ $classes ?? ''}} @error($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/toggle.blade.php

@@ -6,7 +6,7 @@
 				<label class="custom-control-label" for="{{ $id ?? $name }}">{{ $label }}</label>
 			@endif
 		</div>
-		<span class="invalid-feedback">
+		<span class="invalid-feedback" role="alert">
 			@error($name)
 				{{ $message }}
 			@elseif(isset($feedback))

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

@@ -120,7 +120,7 @@
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$('#passkey').on('click',function() {
-				passkey_check('{{ csrf_token() }}','{{ redirect()->intended("/passkey/loggedin")->getTargetUrl() }}');
+				passkey_check('{{ csrf_token() }}','/passkey/loggedin');
 				return false;
 			});
 		});

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

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

src/PageAssets.php

@@ -121,16 +121,6 @@ class PageAssets
 				],
 			]
 		],
-		'simplemde' => [
-			'base' => [
-				'css' => [
-					'//cdn.jsdelivr.net/simplemde/latest/simplemde.min.css',
-				],
-				'js' => [
-					'//cdn.jsdelivr.net/simplemde/latest/simplemde.min.js',
-				],
-			],
-		],
 	];
 
 	// Items to manage

src/Providers/CustomBladeServiceProvider.php

@@ -42,7 +42,6 @@ class CustomBladeServiceProvider extends ServiceProvider
 		switch ($type) {
 			case 'datatables':
 			case 'select2':
-			case 'simplemde':
 				Log::alert(sprintf('Blade @css/@js for %s deprecicated, use @pa',$type));
 				break;
 
@@ -148,6 +147,21 @@ class CustomBladeServiceProvider extends ServiceProvider
 
 				break;
 
+			case 'simplemde':
+				switch ($content) {
+					case 'css':
+						// Base
+						$css->put($type,'https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css');
+
+						break;
+
+					case 'js':
+						// Base
+						$js->put($type,'https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js');
+				}
+
+				break;
+
 			case 'summernote':
 				switch ($content) {
 					case 'css':

src/Providers/LeenooksServiceProvider.php

@@ -4,12 +4,13 @@ namespace Leenooks\Providers;
 
 use Illuminate\Foundation\AliasLoader;
 use Illuminate\Support\Facades\Blade;
+use Leenooks\Http\Middleware\GuestUser;
 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 Orchestra\Support\Facades\Asset;
 
 /**
  * Class GuestUserServiceProvider.