diff --git a/app/Http/Requests/Bo/UpdateMiniCrudRequest.php b/app/Http/Requests/Bo/UpdateMiniCrudRequest.php index f33f708..22b93fa 100644 --- a/app/Http/Requests/Bo/UpdateMiniCrudRequest.php +++ b/app/Http/Requests/Bo/UpdateMiniCrudRequest.php @@ -71,11 +71,16 @@ abstract class UpdateMiniCrudRequest extends FormRequest ]); break; case InputType::string()->value: - case InputType::email()->value: $rules = array_merge($rules, [ "data.$iptName.value" => $this->compileValidate('required|string|min:1', $input) ]); break; + case InputType::email()->value: + $rules = array_merge($rules, [ + "data.$iptName.value" => + $this->compileValidate('required|email:rfc,strict,dns,spoof,filter', $input) + ]); + break; case InputType::text()->value: $mergeRules = $this->compileValidate('required|string|min:10', $input); $mergeRules = collect($mergeRules) diff --git a/app/Traits/Models/MiniCrudModel.php b/app/Traits/Models/MiniCrudModel.php index 33bfa0c..906ce00 100644 --- a/app/Traits/Models/MiniCrudModel.php +++ b/app/Traits/Models/MiniCrudModel.php @@ -63,6 +63,7 @@ trait MiniCrudModel case InputType::boolean()->value: case InputType::text()->value: case InputType::number()->value: + case InputType::email()->value: case InputType::string()->value: case InputType::videoVimeo()->value: break; diff --git a/resources/views/back/modules/minicrud-form-inputs.blade.php b/resources/views/back/modules/minicrud-form-inputs.blade.php index 424e397..5719295 100644 --- a/resources/views/back/modules/minicrud-form-inputs.blade.php +++ b/resources/views/back/modules/minicrud-form-inputs.blade.php @@ -26,7 +26,7 @@ @include('back.modules.input-error', [ 'inputName' => 'data[{{$k}}][value]', 'helperId' => '{{$k}}StringHelp', - 'helper' => $input['helper'], + 'helper' => $input['helper'] ?? '', ]) @@ -55,7 +55,7 @@ @include('back.modules.input-error', [ 'inputName' => 'data[{{$k}}][value]', 'helperId' => '{{$k}}NumberHelp', - 'helper' => $input['helper'], + 'helper' => $input['helper'] ?? '', ]) @@ -89,7 +89,7 @@ @include('back.modules.input-error', [ 'inputName' => 'data[{{$k}}][text]', 'helperId' => '{{$k}}TextHelp', - 'helper' => $input['helper'], + 'helper' => $input['helper'] ?? '', ]) @@ -119,7 +119,7 @@ @include('back.modules.input-error', [ 'inputName' => 'data[{{$k}}][value]', 'helperId' => '{{$k}}BooleanHelp', - 'helper' => $input['helper'], + 'helper' => $input['helper'] ?? '', ]) @@ -202,10 +202,36 @@ @break + @case(App\Enums\InputType::email()->value) +
+
+
+
+ {{ $input['label'] }} + @if(!empty($input['tooltip'])) + + + + @endif +
+
+
+ + @include('back.modules.input-error', [ + 'inputName' => 'data[{{$k}}][value]', + 'helperId' => '{{$k}}StringHelp', + 'helper' => $input['helper'] ?? '', + ]) +
+
+
+
+
+ @break + @case(App\Enums\InputType::imageArray()->value) - @case(App\Enums\InputType::labelArray()->value) - @default @php throw new Exception('Input type not handled'); @endphp @endswitch