From cd7f460a3d814865bddff5956ec7478c3f9f7113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 9 Feb 2024 12:53:55 +0100 Subject: [PATCH] Join us add vimeo video possibility --- .../Bo/Joinuspage/UpdateJoinuspageRequest.php | 12 +++++++++++- .../views/bo/pages/homepages/form.blade.php | 10 +++++----- .../views/bo/pages/joinuspages/form.blade.php | 17 +++++++++-------- resources/views/fo/pages/join-us.blade.php | 11 +++++++++++ 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/app/Http/Requests/Bo/Joinuspage/UpdateJoinuspageRequest.php b/app/Http/Requests/Bo/Joinuspage/UpdateJoinuspageRequest.php index 8a23506..a425205 100644 --- a/app/Http/Requests/Bo/Joinuspage/UpdateJoinuspageRequest.php +++ b/app/Http/Requests/Bo/Joinuspage/UpdateJoinuspageRequest.php @@ -2,6 +2,8 @@ namespace App\Http\Requests\Bo\Joinuspage; +use App\Rules\IsValidVimeoId; +use App\Rules\IsValidYoutubeId; use Illuminate\Foundation\Http\FormRequest; class UpdateJoinuspageRequest extends FormRequest @@ -24,7 +26,15 @@ class UpdateJoinuspageRequest extends FormRequest public function rules() { return [ - 'video_id' => 'required|string|regex:%([^"&?\/\s]{11})%i', + 'video_id' => [ + 'required', 'string', + function (string $attribute, mixed $value, \Closure $fail) { + if (!IsValidYoutubeId::validates($value) and !IsValidVimeoId::validates($value)) { + (new IsValidYoutubeId())->validate($attribute, $value, $fail); + (new IsValidVimeoId())->validate($attribute, $value, $fail); + } + } + ], ]; } diff --git a/resources/views/bo/pages/homepages/form.blade.php b/resources/views/bo/pages/homepages/form.blade.php index 26a6318..d074889 100644 --- a/resources/views/bo/pages/homepages/form.blade.php +++ b/resources/views/bo/pages/homepages/form.blade.php @@ -170,7 +170,7 @@ - {{-- YOUTUBE VIDEO ID --}} + {{-- VIDEO ID --}}
{{ Str::ucfirst(__('validation.custom.video_id')) }} @@ -188,16 +188,16 @@ 'required' => false, 'model' => $homepageModel ?? null, 'helper' => - __('validation.between.string', [ + __('validation.string', [ 'attribute' => __(':field :inter:model', [ 'field' => __('validation.custom.youtube_video_id') . ' ou ' . __('validation.custom.vimeo_video_id'), 'inter' => __('validation.custom.of_the.female'), 'model' => __('models.classes.homepage'), ]), - 'min' => 11, - 'max' => 12, - ]) . __("Doit être l'id de la vidéo Youtube eg:\u{00A0}(MH19CxWqluY) ou Vimeo eg:\u{00A0}(369521302)."), + ]) . + ' ' . + __(" Youtube eg:\u{00A0}(MH19CxWqluY) ou Vimeo eg:\u{00A0}(369521302)."), 'placeholder' => 'MH19CxWqluY', ])
diff --git a/resources/views/bo/pages/joinuspages/form.blade.php b/resources/views/bo/pages/joinuspages/form.blade.php index 16c1544..ee5ca76 100644 --- a/resources/views/bo/pages/joinuspages/form.blade.php +++ b/resources/views/bo/pages/joinuspages/form.blade.php @@ -2,7 +2,7 @@ {{-- VIDEO ID --}}
- {{ Str::ucfirst(__('validation.attributes.url')) }} + {{ Str::ucfirst(__('validation.custom.video_id')) }}
@include('bo.partials.inputs.varchar', [ @@ -17,16 +17,17 @@ 'required' => true, 'model' => $joinuspageModel ?? null, 'helper' => - __('validation.between.string', [ + __('validation.string', [ 'attribute' => __(':field :inter:model', [ - 'field' => __('validation.custom.video_id'), + 'field' => + __('validation.custom.youtube_video_id') . ' ou ' . __('validation.custom.vimeo_video_id'), 'inter' => __('validation.custom.of_the.female'), - 'model' => __('models.classes.joinuspage'), + 'model' => __('models.classes.homepage'), ]), - 'min' => 3, - 'max' => 255, - ]) . __(' Doit être l\'id de la vidéo.'), - 'placeholder' => __('crud.placeholders.beautiful', ['field' => __('validation.attributes.url')]), + ]) . + ' ' . + __(" Youtube eg:\u{00A0}(MH19CxWqluY) ou Vimeo eg:\u{00A0}(369521302)."), + 'placeholder' => 'MH19CxWqluY', ])
diff --git a/resources/views/fo/pages/join-us.blade.php b/resources/views/fo/pages/join-us.blade.php index f385f26..f81d6f6 100644 --- a/resources/views/fo/pages/join-us.blade.php +++ b/resources/views/fo/pages/join-us.blade.php @@ -104,6 +104,7 @@

{{ __('Nous sommes tous animés par la passion de nos métiers !') }}

{{ __('Une équipe de talents à renforcer.') }}

+ @if (\App\Rules\IsValidYoutubeId::validates($joinuspageModel->video_id)) + @endif + @if (\App\Rules\IsValidVimeoId::validates($joinuspageModel->video_id)) + + @endif

{{ __('Pour consulter l\'ensemble de nos vidéos métiers, rendez-vous sur notre chaîne') }}