diff --git a/app/Http/Controllers/FoodServiceController.php b/app/Http/Controllers/FoodServiceController.php index 63a4563..27b73ab 100644 --- a/app/Http/Controllers/FoodServiceController.php +++ b/app/Http/Controllers/FoodServiceController.php @@ -3,7 +3,11 @@ namespace App\Http\Controllers; use App\Enums\Page; +use App\Models\Encart; +use App\Models\Picto; +use App\Models\Product; use App\Models\SeoDatum; +use App\Models\Title; use Illuminate\Http\Request; class FoodServiceController extends Controller @@ -13,6 +17,12 @@ class FoodServiceController extends Controller $page = Page::foodservice(); $seoDatum = SeoDatum::where('page',$page)->first(); - return view('front.food-service', compact('seoDatum')); + $encart_food = Encart::where('page', Page::foodHeader()->value)->first(); + $title_foodBloc2 = Title::where('page', Page::foodBloc2()->value)->first(); + $pictos_food = Picto::where('page', Page::foodBloc2()->value)->get(); + $products_food = Product::where('is_food_service', true)->get(); + + return view('front.food-service', compact('seoDatum' , 'encart_food', 'title_foodBloc2', + 'pictos_food', 'products_food')); } } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 79801f2..e0e7dc8 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -3,6 +3,9 @@ namespace App\Http\Controllers; use App\Enums\Page; +use App\Models\Encart; +use App\Models\Post; +use App\Models\Product; use App\Models\SeoDatum; use App\Models\Slide; use App\Models\Slider; @@ -32,9 +35,20 @@ class HomeController extends Controller }); })->orderBy('order', 'ASC') ->get(); - return view('front.home', compact('slider', 'slides', 'seoDatum')); } else { - return view('front.home', compact('slider', 'seoDatum')); + $slides = null; } + + $encart_home = Encart::where('page', Page::homeHeader()->value)->first(); + + $post_home = Post::where([ + ['date_start', '<=', Carbon::now()->format('Y-m-d H:i:s')], + ['date_end', '>', Carbon::now()->format('Y-m-d H:i:s')], + ['on_top', true] + ])->first(); + // Limitation à 3 produits affichés sur la homepage + $products_home = Product::where('is_on_top', true)->take(3)->get(); + + return view('front.home', compact('slider', 'slides', 'seoDatum', 'encart_home', 'post_home', 'products_home')); } } diff --git a/app/Http/Controllers/LegalsController.php b/app/Http/Controllers/LegalsController.php index 79ed21a..2449959 100644 --- a/app/Http/Controllers/LegalsController.php +++ b/app/Http/Controllers/LegalsController.php @@ -17,6 +17,6 @@ class LegalsController extends Controller $seoDatum = new SeoDatum(); $seoDatum->title = $mentions_legales->title; - return view('front.legals', compact('seoDatum')); + return view('front.legals', compact('seoDatum' ,'mentions_legales')); } } diff --git a/app/Http/Controllers/MarqueController.php b/app/Http/Controllers/MarqueController.php index 79e41c1..3cc030b 100644 --- a/app/Http/Controllers/MarqueController.php +++ b/app/Http/Controllers/MarqueController.php @@ -3,7 +3,12 @@ namespace App\Http\Controllers; use App\Enums\Page; +use App\Models\Encart; +use App\Models\Moment; +use App\Models\Picto; +use App\Models\PictoBrand; use App\Models\SeoDatum; +use App\Models\Title; use Illuminate\Http\Request; class MarqueController extends Controller @@ -13,6 +18,19 @@ class MarqueController extends Controller $page = Page::marque(); $seoDatum = SeoDatum::where('page',$page)->first(); - return view('front.a-propos', compact('seoDatum')); + $encart_marqueHeader = Encart::where('page', Page::marqueHeader()->value)->first(); + $encart_marqueBloc4l = Encart::where('page', Page::marqueBloc4l()->value)->first(); + $encart_marqueBloc4r = Encart::where('page', Page::marqueBloc4r()->value)->first(); + $encart_marqueFooter = Encart::where('page', Page::marqueFooter()->value)->first(); + + $pictobrands_marque = PictoBrand::all(); + $pictos_marqueBloc2 = Picto::where('page', Page::marqueBloc2()->value)->get(); + $title_marqueBloc2 = Title::where('page', Page::marqueBloc2()->value)->first(); + $title_marqueBloc4 = Title::where('page', Page::marqueBloc4()->value)->first(); + $moments = Moment::where('page', Page::marqueHistory()->value)->get(); + + return view('front.a-propos', compact('seoDatum', 'encart_marqueHeader', 'encart_marqueBloc4l', + 'encart_marqueBloc4r', 'encart_marqueFooter', 'pictobrands_marque', 'title_marqueBloc2', + 'pictos_marqueBloc2', 'moments', 'title_marqueBloc4')); } } diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php index 332cd9d..855574d 100644 --- a/app/Http/Controllers/NewsController.php +++ b/app/Http/Controllers/NewsController.php @@ -3,8 +3,14 @@ namespace App\Http\Controllers; use App\Enums\Page; +use App\Models\Advice; +use App\Models\Post; +use App\Models\Product; use App\Models\SeoDatum; +use App\Models\Text; +use App\Models\Title; use Illuminate\Http\Request; +use Illuminate\Support\Carbon; class NewsController extends Controller { @@ -13,6 +19,19 @@ class NewsController extends Controller $page = Page::news(); $seoDatum = SeoDatum::where('page',$page)->first(); - return view('front.news', compact('seoDatum')); + $advice_news = Advice::all()->first(); + $texts_news = Text::where('page', Page::newsQuestions()->value)->get(); + $title_newsPosts = Title::where('page', Page::newsPosts()->value)->first(); + + $posts = Post::where([ + ['date_start', '<=', Carbon::now()->format('Y-m-d H:i:s')], + ['date_end', '>', Carbon::now()->format('Y-m-d H:i:s')], + ]) + ->orderBy('created_at', 'DESC') + ->get(); + + $products_news = Product::where('is_news', true)->get(); + + return view('front.news', compact('seoDatum', 'advice_news' , 'texts_news', 'title_newsPosts', 'posts', 'products_news')); } } diff --git a/app/Http/Controllers/PolicyController.php b/app/Http/Controllers/PolicyController.php index cd83b21..41a908d 100644 --- a/app/Http/Controllers/PolicyController.php +++ b/app/Http/Controllers/PolicyController.php @@ -17,6 +17,6 @@ class PolicyController extends Controller $seoDatum = new SeoDatum(); $seoDatum->title = $privacy_policy->title; - return view('front.policy', compact('seoDatum')); + return view('front.policy', compact('seoDatum', 'privacy_policy')); } } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 23836ca..ed8bdf1 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -2,7 +2,8 @@ namespace App\Http; -use App\Http\Middleware\InitVarsGlobals; +use App\Http\Middleware\BackEndGlobals; +use App\Http\Middleware\FrontEndGlobals; use App\Http\Middleware\LangCheck; use Illuminate\Foundation\Http\Kernel as HttpKernel; @@ -63,7 +64,8 @@ class Kernel extends HttpKernel 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, - 'init-vars' => InitVarsGlobals::class, 'lang-check' => LangCheck::class, + 'front-end-globals' => FrontEndGlobals::class, + 'back-end-globals' => BackEndGlobals::class, ]; } diff --git a/app/Http/Middleware/InitVarsGlobals.php b/app/Http/Middleware/BackEndGlobals.php similarity index 59% rename from app/Http/Middleware/InitVarsGlobals.php rename to app/Http/Middleware/BackEndGlobals.php index b9040c3..6012e0d 100644 --- a/app/Http/Middleware/InitVarsGlobals.php +++ b/app/Http/Middleware/BackEndGlobals.php @@ -2,37 +2,29 @@ namespace App\Http\Middleware; -use Closure; -use Illuminate\Http\Request; 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; -use App\Models\Product; use App\Models\Text; use App\Models\Title; -use Illuminate\Support\Carbon; use Illuminate\Support\Facades\View; +use Closure; +use Illuminate\Http\Request; -class InitVarsGlobals +class BackEndGlobals { /** * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next - * @return mixed + * @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next + * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse */ public function handle(Request $request, Closure $next) { $encart_home = Encart::where('page', Page::homeHeader()->value)->first(); $encart_marqueHeader = Encart::where('page', Page::marqueHeader()->value)->first(); - $encart_marqueBloc2 = Encart::where('page', Page::marqueBloc2()->value)->first(); - $encart_marqueBloc3 = Encart::where('page', Page::marqueBloc3()->value)->first(); $encart_marqueBloc4l = Encart::where('page', Page::marqueBloc4l()->value)->first(); $encart_marqueBloc4r = Encart::where('page', Page::marqueBloc4r()->value)->first(); $encart_marqueFooter = Encart::where('page', Page::marqueFooter()->value)->first(); @@ -40,28 +32,8 @@ class InitVarsGlobals $mentions_legales = Text::where('page', Page::mentions()->value)->first(); $privacy_policy = Text::where('page', Page::charte()->value)->first(); - $pictobrands_marque = PictoBrand::all(); - $advice_news = Advice::all()->first(); - $posts = Post::where([ - ['date_start', '<=', Carbon::now()->format('Y-m-d H:i:s')], - ['date_end', '>', Carbon::now()->format('Y-m-d H:i:s')], - ]) - ->orderBy('created_at', 'DESC') - ->get(); - $post_home = Post::where([ - ['date_start', '<=', Carbon::now()->format('Y-m-d H:i:s')], - ['date_end', '>', Carbon::now()->format('Y-m-d H:i:s')], - ['on_top', true] - ])->first(); - // Limitation à 3 produits affichés sur la homepage - $products_home = Product::where('is_on_top', true)->take(3)->get(); - // produits affichés sur la page news - $products_news = Product::where('is_news', true)->get(); - // Produits affichés sur la page Food Service - $products_food = Product::where('is_food_service', true)->get(); - $pictos_marqueBloc2 = Picto::where('page', Page::marqueBloc2()->value)->get(); $pictos_food = Picto::where('page', Page::foodBloc2()->value)->get(); @@ -72,26 +44,12 @@ 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); - View::share('encart_marqueBloc3', $encart_marqueBloc3); View::share('encart_marqueBloc4l', $encart_marqueBloc4l); View::share('encart_marqueBloc4r', $encart_marqueBloc4r); View::share('encart_marqueFooter', $encart_marqueFooter); View::share('encart_food', $encart_food); - - View::share('pictobrands_marque', $pictobrands_marque); - - View::share('post_home', $post_home); - View::share('posts', $posts); - - View::share('products_home', $products_home); - View::share('products_news', $products_news); - View::share('products_food', $products_food); - View::share('advice_news', $advice_news); View::share('pictos_marqueBloc2', $pictos_marqueBloc2); @@ -104,8 +62,6 @@ class InitVarsGlobals View::share('title_foodBloc2', $title_foodBloc2); View::share('title_newsPosts', $title_newsPosts); - View::share('moments', $moments); - View::share('mentions_legales', $mentions_legales); View::share('privacy_policy', $privacy_policy); diff --git a/app/Http/Middleware/FrontEndGlobals.php b/app/Http/Middleware/FrontEndGlobals.php new file mode 100644 index 0000000..f61f8bd --- /dev/null +++ b/app/Http/Middleware/FrontEndGlobals.php @@ -0,0 +1,54 @@ +getName(); + $routeParamsFR = Route::current()->parameters(); + $routeParamsEN = $routeParamsFR; + $routeParamsES = $routeParamsFR; + array_walk($routeParamsFR, array($this, 'unbind'),''); + array_walk($routeParamsEN, array($this, 'unbind'),'en'); + array_walk($routeParamsES, array($this, 'unbind'),'es'); + if (preg_match('/^(en|es)/', $currentRoute )) { + $currentRouteFR = preg_replace('/^(en|es)\./', '', $currentRoute,1); + $currentRouteEN = preg_replace('/^(en|es)/', 'en', $currentRoute,1); + $currentRouteES = preg_replace('/^(en|es)/', 'es', $currentRoute,1); + } else { + $currentRouteFR = $currentRoute; + $currentRouteEN = 'en.'.$currentRoute; + $currentRouteES = 'es.'.$currentRoute; + } + + View::share('currentRouteFR', $currentRouteFR); + View::share('currentRouteEN', $currentRouteEN); + View::share('currentRouteES', $currentRouteES); + View::share('routeParamsFR', $routeParamsFR); + View::share('routeParamsEN', $routeParamsEN); + View::share('routeParamsES', $routeParamsES); + + return $next($request); + } + + public function unbind(&$item,$k,$lang) { + if($k=='gammeSlug' || $k=='productSlug') { + $item = $item->getTranslation('slug', $lang); + } + } +} diff --git a/resources/lang/en/urls.php b/resources/lang/en/urls.php new file mode 100644 index 0000000..896ad13 --- /dev/null +++ b/resources/lang/en/urls.php @@ -0,0 +1,14 @@ + 'contact', + 'food-service' => 'food-service', + 'gamme' => 'category', + 'gammes' => 'products', + 'legals' => 'terms-and-conditions', + 'marque' => 'brand', + 'news' => 'news', + 'policy' => 'privacy-policy', + 'produit' => 'product', + 'search' => 'search', +); diff --git a/resources/lang/es/urls.php b/resources/lang/es/urls.php new file mode 100644 index 0000000..95312e1 --- /dev/null +++ b/resources/lang/es/urls.php @@ -0,0 +1,14 @@ + 'contacto', + 'food-service' => 'food-service', + 'gamme' => 'gama', + 'gammes' => 'productos', + 'legals' => 'terminos-y-condiciones-de-uso', + 'marque' => 'marca', + 'news' => 'noticias', + 'policy' => 'política-de-privacidad', + 'produit' => 'producto', + 'search' => 'buscar', +); diff --git a/resources/lang/fr/urls.php b/resources/lang/fr/urls.php new file mode 100644 index 0000000..7b61d3b --- /dev/null +++ b/resources/lang/fr/urls.php @@ -0,0 +1,14 @@ + 'notre-marque', + 'gammes' => 'nos-gammes', + 'gamme' => 'gamme', + 'produit' => 'produit', + 'news' => 'nos-actualites', + 'food-service' => 'food-service', + 'legals' => 'mentions-legales', + 'policy' => 'charte-confidentialite', + 'search' => 'recherche', + 'contact' => 'contact' +]; diff --git a/resources/views/layouts/frontend/app-header.blade.php b/resources/views/layouts/frontend/app-header.blade.php index 1105f5d..881fc2d 100644 --- a/resources/views/layouts/frontend/app-header.blade.php +++ b/resources/views/layouts/frontend/app-header.blade.php @@ -14,7 +14,7 @@