From 2e454d3a65dbc1c6650680be0545cd5930aa5f3f Mon Sep 17 00:00:00 2001 From: Alexis Gousseau Date: Tue, 22 Nov 2022 15:54:53 +0100 Subject: [PATCH] =?UTF-8?q?retour=20conformit=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Requests/Bo/Breeders/StoreBreederRequest.php | 3 ++- app/Providers/RouteServiceProvider.php | 2 ++ resources/views/back/breeders/form.blade.php | 6 +++--- routes/web-bo.php | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/Http/Requests/Bo/Breeders/StoreBreederRequest.php b/app/Http/Requests/Bo/Breeders/StoreBreederRequest.php index 3c4100f..fe46029 100644 --- a/app/Http/Requests/Bo/Breeders/StoreBreederRequest.php +++ b/app/Http/Requests/Bo/Breeders/StoreBreederRequest.php @@ -44,6 +44,7 @@ class StoreBreederRequest extends FormRequest */ public function rules() { + $regex = '/^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$/'; return \array_merge( [ 'firstname' => 'required|string|min:1|max:255', @@ -54,7 +55,7 @@ class StoreBreederRequest extends FormRequest 'banner_title' => 'required_with:banner|nullable|string|min:6|max:255', 'title' => 'required|string|min:6|max:255', 'testimony' => 'required|string|min:15', - 'video' => 'required|string|min:6|max:255', + 'video' => 'required|string|min:6|max:255|regex:' . $regex, 'status' => 'required|boolean', ], $this->pictureRules('banner', 1919, 423, 1919, 423), diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index ce1e390..5555a4b 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -3,6 +3,7 @@ namespace App\Providers; use App\Lib\Helpers\ToolboxHelper; +use App\Models\Breeder; use App\Models\News; use App\Models\Product; use App\Models\Range; @@ -53,6 +54,7 @@ class RouteServiceProvider extends ServiceProvider $q->whereSlug($value)->orWhere('id', $value); })->firstOrFail(); }); + Route::model('breeder', Breeder::class); } /** diff --git a/resources/views/back/breeders/form.blade.php b/resources/views/back/breeders/form.blade.php index acc6730..877bce6 100644 --- a/resources/views/back/breeders/form.blade.php +++ b/resources/views/back/breeders/form.blade.php @@ -48,7 +48,7 @@ @include('back.modules.input-error', [ 'inputName' => 'biography', 'helperId' => 'breederModelBiographyHelp', - 'helper' => __('Relisez bien votre biography avant de la publier.'), + 'helper' => __('Relisez bien votre biographie avant de la publier.'), ]) @@ -102,7 +102,7 @@ $data = [ 'id' => 'breederModelBanner', 'name' => 'banner', - 'helper' => __('L\'image va servir de vignette pour l\'éleveur, doit être de 1919px (hauteur) par 423px (largeur).'), + 'helper' => __('L\'image va servir de bandeau pour la page éleveur, doit être de 1919px (hauteur) par 423px (largeur).'), 'width' => 1919, 'height' => 423, 'value' => $breederModel->banner ?? '', @@ -192,7 +192,7 @@ @include('back.modules.input-error', [ 'inputName' => 'status', 'helperId' => 'breederStatusHelp', - 'helper' => __('Le produit est visible ou non'), + 'helper' => __('L\'éleveur est visible ou non'), ]) diff --git a/routes/web-bo.php b/routes/web-bo.php index f41ff2a..c6cec78 100644 --- a/routes/web-bo.php +++ b/routes/web-bo.php @@ -74,8 +74,8 @@ Route::prefix('bo')->name('bo.')->group(function () { // * BREEDER Route::resource('breeders', BreederController::class)->except(['show']) ->withoutMiddleware('htmlsanitize') - ->middleware('htmlsanitize:ingredients'); + ->middleware('htmlsanitize:biography,testimony,ingredients'); Route::post('/breeders/{breeder}/change-published', [BreederController::class, 'changePublished']) - ->name('breeders.change-published'); + ->name('breeders.change-published'); }); });