diff --git a/app/Http/Middleware/SecureHeaders.php b/app/Http/Middleware/SecureHeaders.php index 48b78a4..0b55b3d 100644 --- a/app/Http/Middleware/SecureHeaders.php +++ b/app/Http/Middleware/SecureHeaders.php @@ -68,6 +68,7 @@ class SecureHeaders 'https://recaptcha.google.com/recaptcha/', 'https://www.google.com/maps/', 'https://www.youtube.com', + 'https://player.vimeo.com', ]) . ';', "font-src 'self' data: " . \implode(' ', [ // * VITE DEV diff --git a/app/Http/Requests/Bo/Homepage/UpdateHomepageRequest.php b/app/Http/Requests/Bo/Homepage/UpdateHomepageRequest.php index daa7f4a..f192477 100644 --- a/app/Http/Requests/Bo/Homepage/UpdateHomepageRequest.php +++ b/app/Http/Requests/Bo/Homepage/UpdateHomepageRequest.php @@ -2,6 +2,7 @@ namespace App\Http\Requests\Bo\Homepage; +use App\Rules\IsValidVimeoId; use App\Rules\IsValidYoutubeId; use App\Traits\Requests\HasPicture; use Illuminate\Foundation\Http\FormRequest; @@ -49,9 +50,14 @@ class UpdateHomepageRequest extends FormRequest 'presentation_title' => 'required|string|between:3,255', 'presentation_content' => 'required|string', 'display_video' => 'present|boolean', - 'youtube_video_id' => [ + 'video_id' => [ 'nullable', 'required_if:display_video,true', - new IsValidYoutubeId() + 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); + } + } ], ]; return \array_merge( @@ -68,6 +74,7 @@ class UpdateHomepageRequest extends FormRequest public function attributes(): array { return [ + 'video_id' => trans('validation.custom.video_id'), 'title_part1' => trans('validation.custom.title_part1'), 'title_part2' => trans('validation.custom.title_part2'), 'title_part3' => trans('validation.custom.title_part3'), 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/app/Models/Homepage.php b/app/Models/Homepage.php index 7f92c7a..788edc4 100644 --- a/app/Models/Homepage.php +++ b/app/Models/Homepage.php @@ -14,7 +14,7 @@ use Illuminate\Database\Eloquent\Model; * @property string|null $picture Path of the picture (640px * 390px). * @property string $picture_alt Picture alt attribute. * @property string $picture_title Picture title attribute. - * @property string $youtube_video_id The youtube video Id. + * @property string $video_id The youtube or vimeo video Id. * @property boolean $display_video Wether to display video or picture. * @property string $presentation_title Presentation title. * @property string $presentation_content WYSIWYG - Presentation content. @@ -40,7 +40,7 @@ class Homepage extends Model 'picture_title', 'presentation_title', 'presentation_content', - 'youtube_video_id', + 'video_id', 'display_video', ]; diff --git a/app/Rules/IsValidVimeoId.php b/app/Rules/IsValidVimeoId.php new file mode 100644 index 0000000..4a91da6 --- /dev/null +++ b/app/Rules/IsValidVimeoId.php @@ -0,0 +1,43 @@ +isMatch('/^[0-9]{8,10}$/'); + } +} diff --git a/app/Rules/IsValidYoutubeId.php b/app/Rules/IsValidYoutubeId.php index c1db71f..1a41009 100644 --- a/app/Rules/IsValidYoutubeId.php +++ b/app/Rules/IsValidYoutubeId.php @@ -26,8 +26,19 @@ class IsValidYoutubeId implements ValidationRule public function validate(string $attribute, mixed $value, \Closure $fail): void { // phpcs:enable - if (!Str::of($value)->isMatch('/[0-9A-Za-z_-]{10}[048AEIMQUYcgkosw]/')) { + if (!self::validates($value)) { $fail(trans('validation.youtube_id')); } } + + /** + * Validate a value + * + * @param mixed $value + * @return boolean + */ + public static function validates(mixed $value): bool + { + return Str::of($value)->isMatch('/^[0-9A-Za-z_-]{10}[048AEIMQUYcgkosw]$/'); + } } diff --git a/database/migrations/2024_02_09_111729_setup_vimeo_video.php b/database/migrations/2024_02_09_111729_setup_vimeo_video.php new file mode 100644 index 0000000..4ca146e --- /dev/null +++ b/database/migrations/2024_02_09_111729_setup_vimeo_video.php @@ -0,0 +1,32 @@ +renameColumn('youtube_video_id', 'video_id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down(): void + { + Schema::table('homepages', function (Blueprint $table) { + $table->renameColumn('video_id', 'youtube_video_id'); + }); + } +}; diff --git a/resources/lang/en/cookie-notice.php b/resources/lang/en/cookie-notice.php index d57c65b..80bcf65 100644 --- a/resources/lang/en/cookie-notice.php +++ b/resources/lang/en/cookie-notice.php @@ -36,6 +36,12 @@ return [ 'labelLink' => 'Learn more', 'warning' => 'You must accept cookies to view this video', ], + 'vimeo' => [ + 'name' => 'Vimeo', + 'description' => 'Les cookies placés via les services de partage de vidéos sont destinés à permettre à l’utilisateur de visionner des contenus multimédias directement sur le site.', + 'labelLink' => 'En apprendre plus', + 'warning' => 'Vous devez accepter les cookies pour visionner cette vidéo', + ], 'matomo' => [ 'title' => 'Matomo', 'description' => 'Audience measurement services are used to generate traffic statistics, which are useful for improving the site.', diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 62d4df3..f4ea10c 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -217,6 +217,7 @@ return [ ], 'youtube_id' => ':attribute must be a valid Youtube video ID', + 'vimeo_id' => ':attribute must be a valid Vimeo video ID', 'custom' => [ 'of_the' => [ @@ -230,7 +231,6 @@ return [ 'attribute_title' => 'title attribute', 'background' => 'background', 'category' => 'category', - 'category' => 'category', 'civility' => 'civility', 'cooking_advice' => 'cooking advice', 'description' => 'description', @@ -272,7 +272,6 @@ return [ 'product_name' => 'product name', 'publication' => 'publication', 'publish_at' => 'publication date', - 'publish_at' => 'publication date', 'send_data' => 'autorization to send data', 'seo_description' => 'SEO description', 'seo_title' => 'SEO title', @@ -287,7 +286,8 @@ return [ 'title_part2' => 'title part two', 'title_part3' => 'title part three', 'unpublish_at' => 'end of publication date', - 'unpublish_at' => 'end of publication date', 'video_id' => 'ID of the video', + 'youtube_video_id' => 'ID of the youtube video', + 'vimeo_video_id' => 'ID of the vimeo video', ], ]; diff --git a/resources/lang/fr/cookie-notice.php b/resources/lang/fr/cookie-notice.php index 8d9a655..05161ec 100644 --- a/resources/lang/fr/cookie-notice.php +++ b/resources/lang/fr/cookie-notice.php @@ -36,6 +36,12 @@ return [ 'labelLink' => 'En apprendre plus', 'warning' => 'Vous devez accepter les cookies pour visionner cette vidéo', ], + 'vimeo' => [ + 'name' => 'Vimeo', + 'description' => 'Les cookies placés via les services de partage de vidéos sont destinés à permettre à l’utilisateur de visionner des contenus multimédias directement sur le site.', + 'labelLink' => 'En apprendre plus', + 'warning' => 'Vous devez accepter les cookies pour visionner cette vidéo', + ], 'matomo' => [ 'title' => 'Matomo', 'description' => 'Les services de mesure d’audience permettent de générer des statistiques de fréquentation utiles à l’amélioration du site.', diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php index 4906d5d..cbdf286 100644 --- a/resources/lang/fr/validation.php +++ b/resources/lang/fr/validation.php @@ -219,6 +219,7 @@ return [ ], 'youtube_id' => ':attribute doit être un ID de vidéo Youtube valide', + 'vimeo_id' => ':attribute doit être un ID de vidéo Vimeo valide', 'custom' => [ 'of_the' => [ @@ -232,7 +233,6 @@ return [ 'attribute_title' => 'attribut title', 'background' => 'fond', 'category' => 'catégorie', - 'category' => 'catégorie', 'civility' => 'civilité', 'cooking_advice' => 'conseil de réchauffage', 'description' => 'description', @@ -274,7 +274,6 @@ return [ 'product_name' => 'nom du produit', 'publication' => 'publication', 'publish_at' => 'date de publication', - 'publish_at' => 'date de publication', 'send_data' => 'autorisation d\'enregistrer des données', 'seo_description' => 'description SEO', 'seo_title' => 'titre SEO', @@ -290,9 +289,9 @@ return [ 'title_part3' => 'dernière partie du titre', 'type' => 'type', 'unpublish_at' => 'date de fin de publication', - 'unpublish_at' => 'date de fin de publication', 'video_id' => 'ID de la vidéo', 'youtube_video_id' => 'ID de la vidéo youtube', + 'vimeo_video_id' => 'ID de la vidéo viméo', 'display_video' => 'affichage de la vidéo', ], ]; diff --git a/resources/views/bo/pages/homepages/form.blade.php b/resources/views/bo/pages/homepages/form.blade.php index 714fbc4..d074889 100644 --- a/resources/views/bo/pages/homepages/form.blade.php +++ b/resources/views/bo/pages/homepages/form.blade.php @@ -170,33 +170,34 @@ - {{-- YOUTUBE VIDEO ID --}} + {{-- VIDEO ID --}}
- {{ Str::ucfirst(__('validation.custom.youtube_video_id')) }} + {{ Str::ucfirst(__('validation.custom.video_id')) }}
@include('bo.partials.inputs.varchar', [ 'id' => 'homepageVideoUrl', 'label' => __(':field :inter:model', [ - 'field' => Str::ucfirst(__('validation.custom.youtube_video_id')), + 'field' => Str::ucfirst(__('validation.custom.video_id')), 'inter' => __('validation.custom.of_the.female'), 'model' => __('models.classes.homepage'), ]), 'hasWordCounter' => true, - 'name' => 'youtube_video_id', + 'name' => 'video_id', 'required' => false, 'model' => $homepageModel ?? null, 'helper' => - __('validation.between.string', [ + __('validation.string', [ 'attribute' => __(':field :inter:model', [ - 'field' => __('validation.custom.youtube_video_id'), + '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)."), + ]) . + ' ' . + __(" 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..ce3439b 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'), ]), - '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/home.blade.php b/resources/views/fo/pages/home.blade.php index bf7f59f..a1d0d28 100644 --- a/resources/views/fo/pages/home.blade.php +++ b/resources/views/fo/pages/home.blade.php @@ -2,8 +2,7 @@ @section('title', $staticPageModel->seo_title ?? __('Accueil')) @section('description', $staticPageModel->seo_description ?? __('Description site')) -@section('breadcrumb', - request()->route()->getName()) +@section('breadcrumb', request()->route()->getName()) @section('content')
@@ -22,14 +21,28 @@
@if ($homepageModel->display_video)
-
- - - {{ __('cookie-notice.custom.youtube.warning') }} - - -
+ @if (\App\Rules\IsValidVimeoId::validates($homepageModel->video_id)) +
+ + + {{ __('cookie-notice.custom.vimeo.warning') }} + + +
+ @endif + @if (\App\Rules\IsValidYoutubeId::validates($homepageModel->video_id)) + {{-- For loop to work need to provide a playlist --}} + {{-- http://web.archive.org/web/20121016180134/http://brianwong.com/blog/2012-youtube-embed-code-autoplay-on-and-all-other-parameters/ --}} +
+ + + {{ __('cookie-notice.custom.youtube.warning') }} + + +
+ @endif
@else
{{ $rangeModel->picture_thumbnail_alt }} + title="{{ $rangeModel->picture_thumbnail_title }}" + alt="{{ $rangeModel->picture_thumbnail_alt }}">
{{ __('> En savoir +') }} 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))
@@ -111,6 +112,16 @@
+ @endif + @if (\App\Rules\IsValidVimeoId::validates($joinuspageModel->video_id)) +
+ + + {{ __('cookie-notice.custom.vimeo.warning') }} + + +
+ @endif

{{ __('Pour consulter l\'ensemble de nos vidéos métiers, rendez-vous sur notre chaîne') }} diff --git a/resources/views/vendor/cn-cookies.blade.php b/resources/views/vendor/cn-cookies.blade.php index 856cc66..ca86c0e 100644 --- a/resources/views/vendor/cn-cookies.blade.php +++ b/resources/views/vendor/cn-cookies.blade.php @@ -44,7 +44,7 @@ $cookies['youtube'] = [ $cookies['youtube']['script'] = <<