fixed route caching

Author: ctf0

src/Controller/DummyController.php

@@ -4,12 +4,13 @@
 
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Route;
+use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
 
 class DummyController extends Controller
 {
     public function handle()
     {
-        extract(cache(Route::currentRouteName()));
+        extract(cache(LaravelLocalization::getCurrentLocale().'-'.Route::currentRouteName()));
 
         return view(config('simpleMenu.templatePath').".$template", compact('title', 'body', 'desc', 'breadCrump'));
     }

src/Models/Page.php

@@ -13,7 +13,7 @@ class Page extends Node
 {
     use HasRoles, HasTranslations;
 
-    protected $guarded = ['id'];
+    protected $guarded   = ['id'];
     public $translatable = ['title', 'body', 'desc', 'prefix', 'url'];
 
     public static function boot()
@@ -30,9 +30,9 @@ public static function boot()
                     $name = "{$item}Menu-{$code}Pages";
                     Cache::forget($name);
                 });
+                Cache::forget("{$code}-{$model->route_name}");
             }
 
-            Cache::forget($model->route_name);
             File::delete(config('simpleMenu.routeListPath'));
         });
 
@@ -42,9 +42,9 @@ public static function boot()
                     $name = "{$item}Menu-{$code}Pages";
                     Cache::forget($name);
                 });
+                Cache::forget("{$code}-{$model->route_name}");
             }
 
-            Cache::forget($model->route_name);
             File::delete(config('simpleMenu.routeListPath'));
         });
     }

src/Traits/RoutesTrait.php

@@ -34,7 +34,7 @@ public function createRoutes()
     protected function utilCheck()
     {
         if (!File::exists($this->listFileDir)) {
-            $this->localeCodes = array_keys(LaravelLocalization::getSupportedLocales());
+            $this->localeCodes   = array_keys(LaravelLocalization::getSupportedLocales());
             $this->listFileFound = false;
 
             $this->utilLoop();
@@ -60,20 +60,20 @@ protected function utilLoop()
     protected function pageComp($page)
     {
         // page data
-        $title = $page->title;
-        $body = $page->body;
-        $desc = $page->desc;
-        $template = $page->template;
+        $title      = $page->title;
+        $body       = $page->body;
+        $desc       = $page->desc;
+        $template   = $page->template;
         $breadCrump = $page->getAncestors();
 
         // route data
-        $url = $page->getTranslationWithoutFallback('url', app()->getLocale());
-        $action = $page->action;
-        $prefix = $page->getTranslationWithoutFallback('prefix', app()->getLocale());
+        $url       = $page->getTranslationWithoutFallback('url', app()->getLocale());
+        $action    = $page->action;
+        $prefix    = $page->getTranslationWithoutFallback('prefix', app()->getLocale());
         $routeName = $page->route_name;
 
         // middlewares
-        $roles = 'role:'.implode(',', $page->roles()->pluck('name')->toArray());
+        $roles       = 'role:'.implode(',', $page->roles()->pluck('name')->toArray());
         $permissions = 'perm:'.implode(',', $page->permissions()->pluck('name')->toArray());
 
         // make route
@@ -92,7 +92,7 @@ protected function routeGen($routeName, $url, $prefix, $action, $roles, $permiss
         }
 
         // cache the page so we pass the page params to the controller@method
-        Cache::rememberForever($routeName, function () use ($template, $title, $body, $desc, $breadCrump) {
+        Cache::rememberForever(LaravelLocalization::getCurrentLocale().'-'.$routeName, function () use ($template, $title, $body, $desc, $breadCrump) {
             return compact('template', 'title', 'body', 'desc', 'breadCrump');
         });
 
@@ -117,7 +117,7 @@ protected function routeGen($routeName, $url, $prefix, $action, $roles, $permiss
     protected function createRoutesList($action, $page, $routeName)
     {
         foreach ($this->localeCodes as $code) {
-            $url = $page->getTranslationWithoutFallback('url', $code);
+            $url    = $page->getTranslationWithoutFallback('url', $code);
             $prefix = $page->getTranslationWithoutFallback('prefix', $code);
 
             if ($this->escapeEmptyRoute($url)) {

src/views/breadCrump.blade.php

@@ -2,8 +2,8 @@
     @foreach ($items as $one)
         @include('SimpleMenu::partials.r_params')
 
-        <li>
-            <a href="{{ SimpleMenu::urlRoute() }}" class="{{ request()->url() == SimpleMenu::urlRoute() ? 'is-active' : '' }}">
+        <li class="{{ request()->url() == SimpleMenu::urlRoute() ? 'is-active' : '' }}">
+            <a href="{{ SimpleMenu::urlRoute() }}">
                 {{ $one->title }}
             </a>
         </li>