More components for forms, updated base component, updated CompsiteKeys based on thiagoprz/eloquent-composite-key

resources/components/button/cancel.blade.php

@@ -0,0 +1,11 @@
+<button type="cancel" id="cancel" {{ $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/reset.blade.php

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

resources/components/button/submit.blade.php

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

resources/components/button/success.blade.php

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

resources/components/form/base.blade.php

@@ -2,17 +2,24 @@
 	@if(isset($label))
 		<label for="{{ $id ?? $name }}">{{ $label }}</label>
 	@endisset
-	<div class="input-group has-validation">
+	<div class="form-group">
-		@isset($icon)
+		<div class="input-group has-validation">
-			<div class="input-group-prepend">
+			@if(isset($icon) || isset($prepend))
-				<span class="input-group-text"><i class="fas fa-fw {{ $icon }}"></i></span>
+				<div class="input-group-prepend">
-			</div>
+					<span class="input-group-text">@isset($icon)<i class="fas fa-fw {{ $icon }}"></i>@endisset @isset($prepend){!! $prepend !!}@endisset</span>
-		@endisset()
+				</div>
-		{{ $slot }}
+			@endif()
-		<span class="invalid-feedback" role="alert">
+			{{ $slot }}
-			@error($name)
+			<span class="invalid-feedback" role="alert">
-				{{ $message }}
+				@error($name)
-			@enderror
+					{{ $message }}
-		</span>
+				@elseif(isset($feedback))
+					{{ $feedback }}
+				@enderror
+			</span>
+		</div>
+		@isset($helper)
+			<span class="input-helper">{{ $helper }}</span>
+		@endif
 	</div>
 </div>

resources/components/form/file.blade.php

@@ -0,0 +1,17 @@
+<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))>
+</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/select.blade.php

@@ -7,14 +7,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($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,$value ?? ''))>{{ Arr::get($option,'value') }}</option>
 					@endforeach
 				</optgroup>
 			@endforeach

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 {{ $classes ?? ''}}@error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($name,$value ?? "") }}" @readonly(isset($readonly)) @required(isset($required))>
 </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($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @isset($placeholder)placeholder="{{ $placeholder }}"@endisset>{{ old($name,$value ?? "") }}</textarea>
+</x-leenooks::form.base>

resources/components/success.blade.php

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

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

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