v3.2.7

- change unFoundLocalizedRoute config to root  instead of home for clearity
- fix issue for adding mulitple middlewares
- update wiki
- cleanup

Author: ctf0

README.md

@@ -95,7 +95,7 @@ return [
     /*
      * where to redirect when a route is available in one locale "en" but not in another "fr" ?
      */
-    'unFoundLocalizedRoute' => 'home',
+    'unFoundLocalizedRoute' => 'root',
 
     /*
      * package models

src/Traits/NavigationTrait.php

@@ -61,8 +61,9 @@ public function getRoute($crntRouteName, array $params = null)
             return;
         }
 
-        $locale = $this->getCrntLocale();
-        $url    = $this->routeLink($crntRouteName, $locale);
+        $locale               = $this->getCrntLocale();
+        $url                  = $this->routeLink($crntRouteName, $locale);
+        $forceDefaultLocation = LaravelLocalization::hideDefaultLocaleInURL() && $locale == LaravelLocalization::getDefaultLocale() ? false : true;
 
         // resolve route params
         if ($params) {
@@ -71,12 +72,7 @@ public function getRoute($crntRouteName, array $params = null)
                     session([$key => $value]);
 
                     // fix link not being 'is-active' when "hideDefaultLocaleInURL => true"
-                    if (LaravelLocalization::hideDefaultLocaleInURL() && $locale == LaravelLocalization::getDefaultLocale()) {
-                        $finalUrl = LaravelLocalization::getLocalizedURL($locale, url($this->getParams($url, $value)), []);
-                    } else {
-                        $finalUrl = LaravelLocalization::getLocalizedURL($locale, url($this->getParams($url, $value)), [], true);
-                    }
-
+                    $finalUrl       = LaravelLocalization::getLocalizedURL($locale, url($this->getParams($url, $value)), [], $forceDefaultLocation);
                     $this->urlRoute = $finalUrl;
 
                     return $finalUrl;
@@ -131,15 +127,14 @@ protected function routeLink($name, $code)
     {
         $searchCode = $this->searchForRoute($name, $code);
 
-        // if notFound, then either redir to home or abort
+        // if notFound, then either redir to home or show 404
         if (!$searchCode) {
             switch (config('simpleMenu.unFoundLocalizedRoute')) {
-                case 'home':
-                    return '/';
-                    break;
                 case 'error':
-                    return '404';
+                    return $name;
                     break;
+                default:
+                    return '/';
             }
         }
 

src/Traits/RoutesTrait.php

@@ -3,8 +3,6 @@
 namespace ctf0\SimpleMenu\Traits;
 
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
-use Mcamara\LaravelLocalization\Middleware\LocaleSessionRedirect;
-use Mcamara\LaravelLocalization\Middleware\LaravelLocalizationRedirectFilter;
 
 trait RoutesTrait
 {
@@ -17,8 +15,8 @@ public function createRoutes()
             'prefix'     => LaravelLocalization::setLocale(),
             'middleware' => [
                 'web',
-                LocaleSessionRedirect::class,
-                LaravelLocalizationRedirectFilter::class,
+                'localeSessionRedirect',
+                'localizationRedirect',
             ],
         ], function () {
             $this->utilCheck();
@@ -78,9 +76,9 @@ protected function routeGen($page)
         $breadCrumb  = $page->getAncestors();
 
         // middlewares
-        $middlewares = $page->middlewares;
-        $roles       = 'role:' . implode(',', $page->roles->pluck('name')->toArray());
-        $permissions = 'perm:' . implode(',', $page->permissions->pluck('name')->toArray());
+        $middlewares = is_null($page->middlewares) ? null : preg_split('/[\s,]+/', $page->middlewares);
+        $roles       = empty($page->roles->pluck('name')->toArray()) ? null : 'role:' . implode(',', $page->roles->pluck('name')->toArray());
+        $permissions = empty($page->permissions->pluck('name')->toArray()) ? null : 'perm:' . implode(',', $page->permissions->pluck('name')->toArray());
 
         // cache the page so we can pass the page params to the controller@method
         $compact = compact('template', 'title', 'body', 'desc', 'meta', 'cover', 'breadCrumb', 'middlewares', 'roles', 'permissions');
@@ -95,7 +93,7 @@ protected function routeGen($page)
             ? $action
             : '\ctf0\SimpleMenu\Controllers\DummyController@handle';
 
-        $mds = is_null($middlewares) ? [$roles, $permissions] : [$middlewares, $roles, $permissions];
+        $mds = array_filter(array_flatten([$middlewares, $roles, $permissions]));
 
         app('router')->get($route)
             ->uses($uses)

src/config/simpleMenu.php

@@ -24,9 +24,10 @@
      * where to redirect when a route is available in one locale "en" but not in another "fr" ?
      *
      * add
-     * 'home' = '/' (or) 'error' = '404'
+     * 'root' = '/'
+     * 'error' = '404'
      */
-    'unFoundLocalizedRoute' => 'home',
+    'unFoundLocalizedRoute' => 'root',
 
     /*
      * package models