diff --git a/app/Http/Middleware/InitVarsGlobals.php b/app/Http/Middleware/InitVarsGlobals.php index c29aadd..c711d54 100644 --- a/app/Http/Middleware/InitVarsGlobals.php +++ b/app/Http/Middleware/InitVarsGlobals.php @@ -8,6 +8,7 @@ use App\Enums\Page; use App\Models\Advice; use App\Models\Encart; use App\Models\Gamme; +use App\Models\Moment; use App\Models\Picto; use App\Models\PictoBrand; use App\Models\Post; @@ -67,6 +68,8 @@ class InitVarsGlobals $title_foodBloc2 = Title::where('page', Page::foodBloc2()->value)->first(); $title_newsPosts = Title::where('page', Page::newsPosts()->value)->first(); + $moments = Moment::where('page', Page::marqueHistory()->value)->get(); + View::share('encart_home', $encart_home); View::share('encart_marqueHeader', $encart_marqueHeader); View::share('encart_marqueBloc2', $encart_marqueBloc2); @@ -96,6 +99,8 @@ class InitVarsGlobals View::share('title_foodBloc2', $title_foodBloc2); View::share('title_newsPosts', $title_newsPosts); + View::share('moments', $moments); + return $next($request); } } diff --git a/app/Http/Requests/UpdateEncartRequest.php b/app/Http/Requests/UpdateEncartRequest.php index 10af8be..851f93e 100644 --- a/app/Http/Requests/UpdateEncartRequest.php +++ b/app/Http/Requests/UpdateEncartRequest.php @@ -32,7 +32,7 @@ class UpdateEncartRequest extends FormRequest // ], 'text' => 'required|max:2047', 'picture' => 'sometimes|image|mimes:jpeg,png,jpg|max:2048', - 'alt_text_picture' => 'required|max:255', + 'alt_text_picture' => 'sometimes|max:255', ]; } } diff --git a/app/Http/Requests/UpdateMomentRequest.php b/app/Http/Requests/UpdateMomentRequest.php new file mode 100644 index 0000000..195d3df --- /dev/null +++ b/app/Http/Requests/UpdateMomentRequest.php @@ -0,0 +1,34 @@ +check(); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + 'title' => 'required|max:255', + 'subtitle' => 'sometimes|max:255', + 'text' => 'required|max:2047', + 'picture' => 'sometimes|image|mimes:jpeg,png,jpg|max:2048', + 'alt_text_picture' => 'sometimes|max:255', + ]; + } +} diff --git a/database/seeders/MomentsSeeder.php b/database/seeders/MomentsSeeder.php index a16ed1e..21c31cb 100644 --- a/database/seeders/MomentsSeeder.php +++ b/database/seeders/MomentsSeeder.php @@ -43,11 +43,77 @@ class MomentsSeeder extends Seeder $moment->page = Page::marqueHistory(); $moment->title = "1961"; $moment->subtitle = "Le poulet prend son envol."; - $moment->text = "
Il s'exporte d’abord vers l’Allemagne et la Suisse, puis, dans les années 70 vers d’autres pays comme la Russie ou le Liban.
"; + $moment->text = "Il s'exporte d’abord vers l’Allemagne et la Suisse, puis, dans les années 70 vers d’autres pays comme la Russie ou le Liban.
"; $upload = new SplFileInfo(resource_path('seeds/moments/1961.jpg')); $imgpath = Utils::storeImage($upload, $moment->getTable()); $moment->picture = $imgpath; $moment->alt_text_picture = $moment->subtitle; $moment->save(); + + $moment = new Moment(); + $moment->page = Page::marqueHistory(); + $moment->title = "1980"; + $moment->subtitle = "L'expansion internationale se poursuit."; + $moment->text = "Le développement de la marque à l'export continue tout au long de la décennie, principalement vers le Moyen-Orient mais aussi en Afrique.
"; + $upload = new SplFileInfo(resource_path('seeds/moments/1980.jpg')); + $imgpath = Utils::storeImage($upload, $moment->getTable()); + $moment->picture = $imgpath; + $moment->alt_text_picture = $moment->subtitle; + $moment->save(); + + $moment = new Moment(); + $moment->page = Page::marqueHistory(); + $moment->title = "1992"; + $moment->subtitle = "La naissance d'un produit iconique !"; + $moment->text = "Le spécialiste de la volaille lance sa Chicken Franks Doux, un produit emblématique. Et vous l'adorez depuis !
"; + $upload = new SplFileInfo(resource_path('seeds/moments/1992.jpg')); + $imgpath = Utils::storeImage($upload, $moment->getTable()); + $moment->picture = $imgpath; + $moment->alt_text_picture = $moment->subtitle; + $moment->save(); + + $moment = new Moment(); + $moment->page = Page::marqueHistory(); + $moment->title = "1992"; + $moment->subtitle = "Un nouveau défi."; + $moment->text = "Toujours désireuse d'apporter plus de variété dans vos assiettes, la marque Doux se lance dans la production de produits élaborés destinés à l’export, tels que les nuggets, les burgers ou les escalopes panées.
"; + $upload = new SplFileInfo(resource_path('seeds/moments/1992_bis.jpg')); + $imgpath = Utils::storeImage($upload, $moment->getTable()); + $moment->picture = $imgpath; + $moment->alt_text_picture = $moment->subtitle; + $moment->save(); + + $moment = new Moment(); + $moment->page = Page::marqueHistory(); + $moment->title = "2018"; + $moment->subtitle = "L'année du renouveau."; + $moment->text = "La marque Doux intègre LDC, leader français de la volaille.
"; + $upload = new SplFileInfo(resource_path('seeds/moments/2018.jpg')); + $imgpath = Utils::storeImage($upload, $moment->getTable()); + $moment->picture = $imgpath; + $moment->alt_text_picture = $moment->subtitle; + $moment->save(); + + $moment = new Moment(); + $moment->page = Page::marqueHistory(); + $moment->title = "2019"; + $moment->subtitle = "Un vent de fraicheur."; + $moment->text = "La marque Doux s'offre un nouveau look plus moderne, sans rien changer au goût tant apprécié de ses produits.
"; + $upload = new SplFileInfo(resource_path('seeds/moments/88832_2.png')); + $imgpath = Utils::storeImage($upload, $moment->getTable()); + $moment->picture = $imgpath; + $moment->alt_text_picture = $moment->subtitle; + $moment->save(); + + $moment = new Moment(); + $moment->page = Page::marqueHistory(); + $moment->title = "2021"; + $moment->subtitle = "Doux Innove..."; + $moment->text = "...et lance le Steak haché de poulet façon bouchère et les Mini Chicken Franks : Découvrez ces nouveaux produits inédits !
"; + $upload = new SplFileInfo(resource_path('seeds/moments/2021.jpg')); + $imgpath = Utils::storeImage($upload, $moment->getTable()); + $moment->picture = $imgpath; + $moment->alt_text_picture = $moment->subtitle; + $moment->save(); } } diff --git a/public/css/preload-front.css b/public/css/preload-front.css index 701fa4b..f7ab292 100644 --- a/public/css/preload-front.css +++ b/public/css/preload-front.css @@ -4140,6 +4140,8 @@ img{ width:-moz-max-content; width:max-content; margin:0 auto; + display:flex; + flex-direction:column; } #frise-autoscroll .img-frise .svg-mask{ position:-webkit-sticky; diff --git a/resources/sass/frontend/_globals.scss b/resources/sass/frontend/_globals.scss index 3e48f14..230039d 100644 --- a/resources/sass/frontend/_globals.scss +++ b/resources/sass/frontend/_globals.scss @@ -28,6 +28,8 @@ img { position: relative; width: max-content; margin: 0 auto; + display: flex; + flex-direction: column; .svg-mask { position: sticky; diff --git a/resources/seeds/moments/1980.jpg b/resources/seeds/moments/1980.jpg new file mode 100644 index 0000000..6dee9be Binary files /dev/null and b/resources/seeds/moments/1980.jpg differ diff --git a/resources/seeds/moments/1992.jpg b/resources/seeds/moments/1992.jpg new file mode 100644 index 0000000..bf65f8a Binary files /dev/null and b/resources/seeds/moments/1992.jpg differ diff --git a/resources/seeds/moments/1992_bis.jpg b/resources/seeds/moments/1992_bis.jpg new file mode 100644 index 0000000..0d1fee9 Binary files /dev/null and b/resources/seeds/moments/1992_bis.jpg differ diff --git a/resources/seeds/moments/2018.jpg b/resources/seeds/moments/2018.jpg new file mode 100644 index 0000000..67b9b9e Binary files /dev/null and b/resources/seeds/moments/2018.jpg differ diff --git a/resources/seeds/moments/2021.jpg b/resources/seeds/moments/2021.jpg new file mode 100644 index 0000000..8d12df5 Binary files /dev/null and b/resources/seeds/moments/2021.jpg differ diff --git a/resources/seeds/moments/88832_2.png b/resources/seeds/moments/88832_2.png new file mode 100644 index 0000000..da30f69 Binary files /dev/null and b/resources/seeds/moments/88832_2.png differ diff --git a/resources/views/back/moments/edit.blade.php b/resources/views/back/moments/edit.blade.php index abf25bf..30d0248 100644 --- a/resources/views/back/moments/edit.blade.php +++ b/resources/views/back/moments/edit.blade.php @@ -31,7 +31,7 @@ @include('back.modules.input-error', ['inputName'=>'text']){{ $encart_marqueHeader->text}}
+ {!! $encart_marqueHeader->text !!}
+
+
+
{!! $moment->text !!}
+{!! $moment->text !!}
+{!! $moment->text !!}
+{{ $encart_marqueBloc4l->text}}
+{!! $encart_marqueBloc4l->text !!}
{{ $encart_marqueBloc4r->text}}
+{!! $encart_marqueBloc4r->text !!}
{{ $encart_marqueFooter->text}}
+{!! $encart_marqueFooter->text !!}