Add old tag for components, for values that are nested in an array. Enable LeenooksCarbon to accept a string date when setting.

resources/components/button/cancel.blade.php

@@ -1,4 +1,4 @@
-<button type="cancel" id="cancel" {{ $attributes->class(['btn','btn-sm','btn-danger']) }}>Cancel</button>
+<button type="cancel" id="cancel" style="margin-top: 2.0rem !important;" {{ $attributes->class(['btn','btn-sm','btn-danger']) }}>Cancel</button>
 
 @section('page-scripts')
 	<script type="text/javascript">

resources/components/button/reset.blade.php

@@ -1 +1 @@
-<button type="reset" id="reset" {{ $attributes->class(['btn','btn-sm','btn-secondary']) }}>Reset</button>
+<button type="reset" id="reset" style="margin-top: 2.0rem !important;" {{ $attributes->class(['btn','btn-sm','btn-secondary']) }}>Reset</button>

resources/components/button/submit.blade.php

@@ -1 +1 @@
-<button type="submit" id="submit" {{ $attributes->class(['btn','btn-sm','btn-success']) }}>{{ $slot }}</button>
+<button type="submit" id="submit" style="margin-top: 2.0rem !important;" {{ $attributes->class(['btn','btn-sm','btn-success']) }}>{{ $slot }}</button>

resources/components/form/base.blade.php

@@ -1,25 +1,23 @@
+@if(isset($label))
+	<label for="{{ $id ?? $name }}">{{ $label }}</label>
+@endisset
 <div class="form-group">
-	@if(isset($label))
-		<label for="{{ $id ?? $name }}">{{ $label }}</label>
-	@endisset
-	<div class="form-group">
-		<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" role="alert">
-				@error($name)
-					{{ $message }}
-				@elseif(isset($feedback))
-					{{ $feedback }}
-				@enderror
-			</span>
-		</div>
-		@isset($helper)
-			<span class="input-helper">{{ $helper }}</span>
-		@endif
+	<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" role="alert">
+			@error($old ?? $name)
+				{{ $message }}
+			@elseif(isset($feedback))
+				{{ $feedback }}
+			@enderror
+		</span>
 	</div>
-</div>
+	@isset($helper)
+		<span class="input-helper">{{ $helper }}</span>
+	@endif
+</div>

resources/components/form/date.blade.php

@@ -0,0 +1,3 @@
+<x-leenooks::form.base {{ $attributes }}>
+	<input type="date" class="form-control {{ $classes ?? ''}}@error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required))>
+</x-leenooks::form.base>

resources/components/form/email.blade.php

@@ -1,3 +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 ?? "") }}">
+	<input type="email" class="form-control {{ $classes ?? ''}}@error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required))>
 </x-leenooks::form.base>

resources/components/form/file.blade.php

@@ -1,5 +1,5 @@
 <x-leenooks::form.base {{ $attributes }}>
-	<input type="file" class="form-control {{ $classes ?? ''}}@error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @readonly(isset($readonly)) @required(isset($required))>
+	<input type="file" class="form-control {{ $classes ?? ''}}@error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @readonly(isset($readonly)) @required(isset($required))>
 </x-leenooks::form.base>
 {{ $slot }}
 

resources/components/form/password.blade.php

@@ -1,3 +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 ?? "") }}">
+	<input type="password" class="form-control {{ $classes ?? ''}}@error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required))>
 </x-leenooks::form.base>

resources/components/form/select.blade.php

@@ -1,5 +1,6 @@
 <x-leenooks::form.base {{ $attributes }}>
-	<select class="form-control @error($name) is-invalid @enderror" id="{{ $id }}" name="{{ $name }}">
+	<input type="hidden" id="{{ $name }}_disabled" name="{{ $name }}" value="" disabled>
+	<select class="form-control @error($old ?? $name) is-invalid @enderror" id="{{ $id }}" name="{{ $name }}">
 		@if(isset($addvalues) && $addvalues)
 			<option id="new"></option>
 		@endif
@@ -7,14 +8,14 @@
 		@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>
+				<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,$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
 				</optgroup>
 			@endforeach
@@ -27,6 +28,18 @@
 	@js(select2,autofocus)
 
 	<script type="text/javascript">
+		// Select doesnt support read only so we'll use disable and a new field
+		function {{$id}}_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 }}').select2({
 				dropdownAutoWidth: true,

resources/components/form/text.blade.php

@@ -1,3 +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 ?? "") }}" @readonly(isset($readonly)) @required(isset($required))>
+	<input type="text" class="form-control {{ $classes ?? ''}}@error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required))>
 </x-leenooks::form.base>

resources/components/form/textarea.blade.php

@@ -1,3 +1,3 @@
 <x-leenooks::form.base {{ $attributes }}>
-	<textarea class="form-control {{ $classes ?? ''}} @error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @isset($placeholder)placeholder="{{ $placeholder }}"@endisset>{{ old($name,$value ?? "") }}</textarea>
+	<textarea class="form-control {{ $classes ?? ''}} @error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @isset($placeholder)placeholder="{{ $placeholder }}"@endisset>{{ old($old ?? $name,$value ?? '') }}</textarea>
 </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($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @checked(old($old ?? $name,$value ?? ''))>
+			@if(isset($label))
+				<label class="custom-control-label" for="{{ $id ?? $name }}">{{ $label }}</label>
+			@endif
+		</div>
+		<span class="invalid-feedback" role="alert">
+			@error($name)
+				{{ $message }}
+			@elseif(isset($feedback))
+				{{ $feedback }}
+			@enderror
+		</span>
+	</div>
+</div>

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

src/Casts/LeenooksCarbon.php

@@ -4,6 +4,7 @@ namespace Leenooks\Casts;
 
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Database\Eloquent\Model;
+use Leenooks\Carbon;
 
 class LeenooksCarbon implements CastsAttributes
 {
@@ -12,9 +13,9 @@ class LeenooksCarbon implements CastsAttributes
      *
      * @param  array<string, mixed>  $attributes
      */
-    public function get(Model $model, string $key, mixed $value, array $attributes): mixed
+    public function get(Model $model, string $key, mixed $value, array $attributes): Carbon
     {
-        return \Leenooks\Carbon::create($value);
+        return Carbon::create($value);
     }
 
     /**
@@ -22,8 +23,8 @@ class LeenooksCarbon implements CastsAttributes
      *
      * @param  array<string, mixed>  $attributes
      */
-    public function set(Model $model, string $key, mixed $value, array $attributes): mixed
+    public function set(Model $model, string $key, mixed $value, array $attributes): string
     {
-        return $value->format('Y-m-d H:i:s');
+        return ($value instanceof Carbon ? $value : $this->get($model,$key,$value,$attributes))->format('Y-m-d H:i:s');
     }
 }