From 739320b3341c674114589f4839a5a803356706fa Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Fri, 13 May 2022 12:47:18 +0200 Subject: [PATCH 1/4] translatable urls --- app/Http/Kernel.php | 6 +- ...InitVarsGlobals.php => BackEndGlobals.php} | 11 +- app/Http/Middleware/FrontEndGlobals.php | 146 ++++++++++++++++++ resources/lang/en/urls.php | 12 ++ resources/lang/es/urls.php | 8 + resources/lang/fr/urls.php | 14 ++ .../layouts/frontend/app-header.blade.php | 25 +-- .../vendor/translation/forms/select.blade.php | 2 +- routes/web.php | 26 ++-- 9 files changed, 210 insertions(+), 40 deletions(-) rename app/Http/Middleware/{InitVarsGlobals.php => BackEndGlobals.php} (95%) create mode 100644 app/Http/Middleware/FrontEndGlobals.php create mode 100644 resources/lang/en/urls.php create mode 100644 resources/lang/es/urls.php create mode 100644 resources/lang/fr/urls.php 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 95% rename from app/Http/Middleware/InitVarsGlobals.php rename to app/Http/Middleware/BackEndGlobals.php index b9040c3..f971782 100644 --- a/app/Http/Middleware/InitVarsGlobals.php +++ b/app/Http/Middleware/BackEndGlobals.php @@ -2,12 +2,9 @@ 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; @@ -17,15 +14,17 @@ 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) { diff --git a/app/Http/Middleware/FrontEndGlobals.php b/app/Http/Middleware/FrontEndGlobals.php new file mode 100644 index 0000000..72d28c9 --- /dev/null +++ b/app/Http/Middleware/FrontEndGlobals.php @@ -0,0 +1,146 @@ +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(); + $encart_food = Encart::where('page', Page::foodHeader()->value)->first(); + $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(); + + $texts_news = Text::where('page', Page::newsQuestions()->value)->get(); + + $title_marqueBloc2 = Title::where('page', Page::marqueBloc2()->value)->first(); + $title_marqueBloc4 = Title::where('page', Page::marqueBloc4()->value)->first(); + $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); + View::share('pictos_food', $pictos_food); + + View::share('texts_news', $texts_news); + + View::share('title_marqueBloc2', $title_marqueBloc2); + View::share('title_marqueBloc4', $title_marqueBloc4); + 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); + + //header menu + $currentRoute = Route::current()->getName(); + $routeParamsFR = Route::current()->parameters(); + $routeParamsEN = $routeParamsFR; + $routeParamsES = $routeParamsFR; + $routeOriginalParams = Route::current()->originalParameters(); + 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..2842a33 --- /dev/null +++ b/resources/lang/en/urls.php @@ -0,0 +1,12 @@ + 'contact', + 'food-service' => 'food-service', + 'gamme' => 'category', + 'gammes' => 'products', + 'marque' => 'brand', + 'news' => 'news', + 'produit' => 'product', + 'search' => 'search', +); diff --git a/resources/lang/es/urls.php b/resources/lang/es/urls.php new file mode 100644 index 0000000..9a06929 --- /dev/null +++ b/resources/lang/es/urls.php @@ -0,0 +1,8 @@ + 'productos', + 'marque' => 'marca', + 'news' => 'noticias', + 'produit' => 'producto', +); 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 @@