From 7bf122def527734ef8861bd8b8c32d321e108410 Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Mon, 6 Nov 2023 09:28:34 +0100 Subject: [PATCH] fix joinus->video_id --- app/Console/Commands/UserCreate.php | 12 ++++----- .../Controllers/Bo/JoinuspageController.php | 2 +- .../Bo/Joinuspage/StoreJoinuspageRequest.php | 2 +- app/Models/Joinuspage.php | 4 +-- database/factories/JoinuspageFactory.php | 2 +- ..._10_18_180112_create_joinuspages_table.php | 2 +- resources/lang/en/validation.php | 2 +- resources/lang/fr/validation.php | 2 +- .../views/bo/pages/joinuspages/form.blade.php | 27 ++++++++++--------- .../bo/pages/joinuspages/index-list.blade.php | 4 +-- resources/views/fo/pages/join-us.blade.php | 2 +- 11 files changed, 30 insertions(+), 31 deletions(-) diff --git a/app/Console/Commands/UserCreate.php b/app/Console/Commands/UserCreate.php index 57b463f..90c2dbb 100644 --- a/app/Console/Commands/UserCreate.php +++ b/app/Console/Commands/UserCreate.php @@ -200,18 +200,16 @@ class UserCreate extends Command try { $tmp = $this->choice( 'Select his role', - [RoleEnum::conceptor->name, RoleEnum::admin->name, RoleEnum::visitor->name], - RoleEnum::visitor->name, + [RoleEnum::conceptor->label(), RoleEnum::admin->label(), RoleEnum::visitor->label()], + RoleEnum::visitor->label(), $maxAttempts = null, $allowMultipleSelections = false ); - if ($tmp === RoleEnum::conceptor->name) { + if ($tmp === RoleEnum::conceptor->label()) { $tmp = RoleEnum::conceptor; - } - if ($tmp === RoleEnum::admin->name) { + } elseif ($tmp === RoleEnum::admin->label()) { $tmp = RoleEnum::admin; - } - if ($tmp === RoleEnum::visitor->name) { + } elseif ($tmp === RoleEnum::visitor->label()) { $tmp = RoleEnum::visitor; } $validator = Validator::make(['role' => $tmp], [ diff --git a/app/Http/Controllers/Bo/JoinuspageController.php b/app/Http/Controllers/Bo/JoinuspageController.php index a5e0c62..2c33cfc 100644 --- a/app/Http/Controllers/Bo/JoinuspageController.php +++ b/app/Http/Controllers/Bo/JoinuspageController.php @@ -37,7 +37,7 @@ class JoinuspageController extends Controller $joinuspageModels, $search, null, - 'video_url', + 'video_id', ); } $searchFields = \implode(', ', [ diff --git a/app/Http/Requests/Bo/Joinuspage/StoreJoinuspageRequest.php b/app/Http/Requests/Bo/Joinuspage/StoreJoinuspageRequest.php index 5916a08..c582c8d 100644 --- a/app/Http/Requests/Bo/Joinuspage/StoreJoinuspageRequest.php +++ b/app/Http/Requests/Bo/Joinuspage/StoreJoinuspageRequest.php @@ -24,7 +24,7 @@ class StoreJoinuspageRequest extends FormRequest public function rules() { return [ - 'video_url' => 'required|string|between:3,255', + 'video_id' => 'required|string|regex:%([^"&?\/\s]{11})%i', ]; } } diff --git a/app/Models/Joinuspage.php b/app/Models/Joinuspage.php index 81ba675..4f19412 100644 --- a/app/Models/Joinuspage.php +++ b/app/Models/Joinuspage.php @@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; /** - * @property string $video_url Lien de la vidéo youtube à afficher. + * @property string $video_id Lien de la vidéo youtube à afficher. * @property-read \Carbon\Carbon $created_at Created date. * @property-read \Carbon\Carbon $updated_at Updated date. */ @@ -22,7 +22,7 @@ class Joinuspage extends Model * @var array */ protected $fillable = [ - 'video_url', + 'video_id', ]; /** diff --git a/database/factories/JoinuspageFactory.php b/database/factories/JoinuspageFactory.php index d0abb0d..48a465a 100644 --- a/database/factories/JoinuspageFactory.php +++ b/database/factories/JoinuspageFactory.php @@ -14,7 +14,7 @@ class JoinuspageFactory extends Factory public function definition() { return [ - 'video_url' => 'https://www.youtube.com/watch?v=6B4O-_1CQoI', + 'video_id' => '6B4O-_1CQoI', ]; } } diff --git a/database/migrations/2023_10_18_180112_create_joinuspages_table.php b/database/migrations/2023_10_18_180112_create_joinuspages_table.php index 7d01094..9a14bb9 100644 --- a/database/migrations/2023_10_18_180112_create_joinuspages_table.php +++ b/database/migrations/2023_10_18_180112_create_joinuspages_table.php @@ -15,7 +15,7 @@ return new class extends Migration { Schema::create('joinuspages', function (Blueprint $table) { $table->id(); - $table->string('video_url')->comment('Lien de la vidéo youtube à afficher'); + $table->string('video_id')->comment('Id de la vidéo youtube à afficher'); $table->timestamps(); }); } diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 2fd8c98..f9ea995 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -266,7 +266,7 @@ return [ 'key_together_3' => 'key number for "live together" 3', 'key_together_4' => 'key number for "live together" 4', 'key_territory' => 'key number for "integrate its territory"', - 'video_url' => 'URL of the video', + 'video_id' => 'URL of the video', 'job' => 'job', 'statut' => 'statut', 'society' => 'society', diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php index 3815d1b..1a9858a 100644 --- a/resources/lang/fr/validation.php +++ b/resources/lang/fr/validation.php @@ -268,7 +268,7 @@ return [ 'key_together_3' => 'Chiffre clé "vivre ensemble" 3', 'key_together_4' => 'Chiffre clé "vivre ensemble" 4', 'key_territory' => 'Chiffre clé "intégrer son territoire"', - 'video_url' => 'URL de la vidéo', + 'video_id' => 'URL de la vidéo', 'job' => 'métier', 'statut' => 'statut', 'society' => 'société', diff --git a/resources/views/bo/pages/joinuspages/form.blade.php b/resources/views/bo/pages/joinuspages/form.blade.php index 398b183..16c1544 100644 --- a/resources/views/bo/pages/joinuspages/form.blade.php +++ b/resources/views/bo/pages/joinuspages/form.blade.php @@ -1,6 +1,6 @@
- {{-- VIDEO URL --}} -
+ {{-- VIDEO ID --}} +
{{ Str::ucfirst(__('validation.attributes.url')) }}
@@ -8,23 +8,24 @@ @include('bo.partials.inputs.varchar', [ 'id' => 'joinuspageVideoUrl', 'label' => __(':field :inter:model', [ - 'field' => Str::ucfirst(__('validation.custom.video_url')), + 'field' => Str::ucfirst(__('validation.custom.video_id')), 'inter' => __('validation.custom.of_the.female'), 'model' => __('models.classes.joinuspage'), ]), 'hasWordCounter' => true, - 'name' => 'video_url', + 'name' => 'video_id', 'required' => true, 'model' => $joinuspageModel ?? null, - 'helper' => __('validation.between.string', [ - 'attribute' => __(':field :inter:model', [ - 'field' => __('validation.custom.video_url'), - 'inter' => __('validation.custom.of_the.female'), - 'model' => __('models.classes.joinuspage'), - ]), - 'min' => 3, - 'max' => 255, - ]), + 'helper' => + __('validation.between.string', [ + 'attribute' => __(':field :inter:model', [ + 'field' => __('validation.custom.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')]), ])
diff --git a/resources/views/bo/pages/joinuspages/index-list.blade.php b/resources/views/bo/pages/joinuspages/index-list.blade.php index af0a84f..8456408 100644 --- a/resources/views/bo/pages/joinuspages/index-list.blade.php +++ b/resources/views/bo/pages/joinuspages/index-list.blade.php @@ -3,7 +3,7 @@ @include('bo.modules.table-col-sorter', [ 'cols' => [ - 'video_url' => Str::ucfirst(__('validation.attributes.url')), + 'video_id' => Str::ucfirst(__('validation.attributes.url')), 'updated_at' => Str::ucfirst(__('validation.attributes.updated_at')), ], ]) @@ -11,7 +11,7 @@ @foreach ($joinuspageModels as $joinuspageModel) - {{ $joinuspageModel->video_url }} + {{ $joinuspageModel->video_id }} {{ $joinuspageModel->updated_at->isoFormat('LLLL') }} diff --git a/resources/views/fo/pages/join-us.blade.php b/resources/views/fo/pages/join-us.blade.php index 5d1c8b2..4eb6ed6 100644 --- a/resources/views/fo/pages/join-us.blade.php +++ b/resources/views/fo/pages/join-us.blade.php @@ -104,7 +104,7 @@

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

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

-
+
{{ __('cookie-notice.custom.youtube.warning') }}