Added disabled to components, new components, button and modal

resources/components/button/cancel.blade.php

@@ -0,0 +1,11 @@
+<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">
+		$(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" style="margin-top: 2.0rem !important;" {{ $attributes->class(['btn','btn-sm','btn-secondary']) }}>Reset</button>

resources/components/button/submit.blade.php

@@ -0,0 +1 @@
+<button type="submit" id="submit" style="margin-top: 2.0rem !important;" {{ $attributes->class(['btn','btn-sm','btn-success']) }}>{{ $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/form/base.blade.php

@@ -1,18 +1,23 @@
+@if(isset($label))
+	<label {{ $attributes->only(['class']) }} for="{{ $id ?? $name }}">{{ $label }}</label>
+@endisset
 <div class="form-group">
-	@if(isset($label))
-		<label for="{{ $id ?? $name }}">{{ $label }}</label>
-	@endisset
 	<div class="input-group has-validation">
-		@isset($icon)
+		@if(isset($icon) || isset($prepend))
 			<div class="input-group-prepend">
-				<span class="input-group-text"><i class="fas fa-fw {{ $icon }}"></i></span>
+				<span class="input-group-text">@isset($icon)<i class="fas fa-fw {{ $icon }}"></i>@endisset @isset($prepend){!! $prepend !!}@endisset</span>
 			</div>
-		@endisset()
+		@endif()
 		{{ $slot }}
 		<span class="invalid-feedback" role="alert">
-			@error($name)
+			@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/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($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @checked(isset($checked)) @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 {{ $classes ?? ''}}@error($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

@@ -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)) @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 {{ $classes ?? ''}}@error($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/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)) @disabled(isset($disabled))>
 </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="{{ $name }}" @required(isset($required)) @disabled(isset($disabled))>
 		@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)
-						@empty(Arr::get($option,'value')) @continue @endempty
+						@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,8 +28,20 @@
 	@js(select2,autofocus)
 
 	<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 }}').select2({
+			$('#{{ $id ?? $name }}').select2({
 				dropdownAutoWidth: true,
 				width: 'style',
 				@isset($addvalues)

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 ?? "") }}">
+	<input type="text" class="form-control {{ $class ?? ''}}@error($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/textarea.blade.php

@@ -0,0 +1,3 @@
+<x-leenooks::form.base {{ $attributes }}>
+	<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>
+</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 ?? '')) @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" role="alert">
+			@error($name)
+				{{ $message }}
+			@elseif(isset($feedback))
+				{{ $feedback }}
+			@enderror
+		</span>
+	</div>
+</div>

resources/components/modal/delete.blade.php

@@ -0,0 +1,35 @@
+<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">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();
+				console.log($('#confirm_delete')
+					.find('.btn-ok'));
+				$('#confirm_delete')
+					.find('.btn-ok')
+					.attr('href',e.currentTarget.href);
+				return false;
+			});
+		});
+	</script>
+@append

resources/components/success.blade.php

@@ -1 +0,0 @@
-<button {{ $attributes->class(['btn','btn-sm','btn-success']) }}>{{ $slot }}</button>

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_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');
     }
 }

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;
 	}
 }