From 94ce1a969ca4936456dd184a6c6ff6c7fc634a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 6 Dec 2023 16:38:14 +0100 Subject: [PATCH 01/54] Input fixes --- .../inputs/bigint-foreign-id.blade.php | 14 ++-- .../bo/partials/inputs/int-color.blade.php | 71 +++++++++++++++++++ .../bo/partials/inputs/int-number.blade.php | 14 ++-- .../partials/inputs/tinyint-boolean.blade.php | 8 ++- .../bo/partials/inputs/tinyint-enum.blade.php | 8 ++- .../partials/inputs/varchar-email.blade.php | 17 ++--- .../inputs/varchar-password.blade.php | 15 ++-- .../bo/partials/inputs/varchar.blade.php | 11 ++- 8 files changed, 128 insertions(+), 30 deletions(-) create mode 100644 resources/views/bo/partials/inputs/int-color.blade.php diff --git a/resources/views/bo/partials/inputs/bigint-foreign-id.blade.php b/resources/views/bo/partials/inputs/bigint-foreign-id.blade.php index c0f9f1e..3965cce 100644 --- a/resources/views/bo/partials/inputs/bigint-foreign-id.blade.php +++ b/resources/views/bo/partials/inputs/bigint-foreign-id.blade.php @@ -1,3 +1,4 @@ +{{-- blade-formatter-disable --}} {{-- VARIABLE || COMMENT || TYPE || REQUIRED || DEFAULT @@ -17,15 +18,18 @@ @endif + @if(isset($appendText)) + + +@endif +@include('modules.input-error', [ + 'inputName' => $name, + 'helperId' => "{$id}Help", + 'helper' => $helper +]) + +@push('scripts') + +@endpush diff --git a/resources/views/bo/partials/inputs/int-number.blade.php b/resources/views/bo/partials/inputs/int-number.blade.php index 2a7ee83..6885a98 100644 --- a/resources/views/bo/partials/inputs/int-number.blade.php +++ b/resources/views/bo/partials/inputs/int-number.blade.php @@ -1,3 +1,4 @@ +{{-- blade-formatter-disable --}} {{-- VARIABLE || COMMENT || TYPE || REQUIRED || DEFAULT @@ -28,7 +29,10 @@ name="{{ $name }}" type="number" value="{{ Str::replace(',', '.', strval(old($name, $value ?? $model->{$name} ?? 0))) }}" - class="form-control @if($errors->has($name)) is-invalid @endif" + @class([ + 'form-control', + 'is-invalid' => $errors->has($name) + ]) aria-describedby="{{ $id }}Help" @if(!empty($step)) step="{{ Str::replace(',', '.', strval($step)) }}" @@ -43,15 +47,15 @@ @else min="{{ !empty($unsigned) ? '0' : '-2147483648' }}" @endif - @if(!empty($required)) - required - @endif> + @disabled(!empty($disabled)) + @readonly(!empty($readonly)) + @required(!empty($required))> @if(isset($appendText)) @endif @include('modules.input-error', [ 'inputName' => $name, - 'helperId' => '{{ $id }}Help', + 'helperId' => "{$id}Help", 'helper' => $helper ]) diff --git a/resources/views/bo/partials/inputs/tinyint-boolean.blade.php b/resources/views/bo/partials/inputs/tinyint-boolean.blade.php index e1e633e..124fc36 100644 --- a/resources/views/bo/partials/inputs/tinyint-boolean.blade.php +++ b/resources/views/bo/partials/inputs/tinyint-boolean.blade.php @@ -1,3 +1,4 @@ +{{-- blade-formatter-disable --}} {{-- VARIABLE || COMMENT || TYPE || REQUIRED || DEFAULT @@ -17,10 +18,13 @@ type="checkbox" class="ml-2 form-check-input" value="1" - @if(old($name, (old('_token') ? false : ($model->{$name} ?? false)))) checked @endif> + @disabled(!empty($disabled)) + @readonly(!empty($readonly)) + @required(!empty($required)) + @checked(old($name, (old('_token') ? false : ($model->{$name} ?? false))))> @include('modules.input-error', [ 'inputName' => $name, - 'helperId' => '{{ $id }}Help' , + 'helperId' => "{$id}Help", 'helper' => $helper ]) diff --git a/resources/views/bo/partials/inputs/tinyint-enum.blade.php b/resources/views/bo/partials/inputs/tinyint-enum.blade.php index f9ab473..68f183f 100644 --- a/resources/views/bo/partials/inputs/tinyint-enum.blade.php +++ b/resources/views/bo/partials/inputs/tinyint-enum.blade.php @@ -1,3 +1,4 @@ +{{-- blade-formatter-disable --}} {{-- VARIABLE || COMMENT || TYPE || REQUIRED || DEFAULT @@ -17,7 +18,10 @@ @endif @include('modules.input-error', [ 'inputName' => $name, - 'helperId' => "{{ $id }}Help", + 'helperId' => "{$id}Help", 'helper' => $helper ]) diff --git a/resources/views/bo/partials/inputs/varchar-email.blade.php b/resources/views/bo/partials/inputs/varchar-email.blade.php index 4a2c2e1..24e9e26 100644 --- a/resources/views/bo/partials/inputs/varchar-email.blade.php +++ b/resources/views/bo/partials/inputs/varchar-email.blade.php @@ -1,3 +1,4 @@ +{{-- blade-formatter-disable --}} {{-- VARIABLE || COMMENT || TYPE || REQUIRED || DEFAULT @@ -10,8 +11,8 @@ $model || The model we're creating/editing || Model class || OPTIONNAL || null --}} -@if(!empty($label)) -