fixed a couple of issues, add more options to config

Author: ctf0

README.md

@@ -61,7 +61,6 @@ Route::group(['middleware' => ['role:admin','perm:access_backend']], function ()
     ```
 
 - if `action` is added, the page `url & prefix` wont be slugged.
-- `action` **default namespace** is `App\Http\Controllers`, so all your controllers should be available under that.
 
 # ToDo
 

src/Traits/NavigationTrait.php

@@ -19,8 +19,8 @@ public function getUrl($name, $code)
         $url = $this->routeLink($name, $code);
 
         if (!$url) {
-            // page is hardcoded
-            return LaravelLocalization::getLocalizedURL($code);
+            // page is hardcoded, means its not saved in the db (ex.php artisan make:auth routes)
+            return LaravelLocalization::getLocalizedURL($code, null, [], true);
         }
 
         // if we have a saved params
@@ -34,7 +34,7 @@ public function getUrl($name, $code)
 
         // no params
         return LaravelLocalization::getLocalizedURL(
-            $code, url($this->rmvNonUsedParams($url)), [], true
+            $code, url($this->rmvUnUsedParams($url)), [], true
         );
     }
 
@@ -143,7 +143,22 @@ protected function routeLink($name, $code)
             $code = app('laravellocalization')->getDefaultLocale();
         }
 
-        return array_get($file, "$name.$code");
+        // check if we have a link according to that "routeName & code"
+        $search = array_get($file, "$name.$code");
+
+        // if notFound, then either redir to home or abort
+        if (!$search) {
+            switch (config('simpleMenu.unFoundLocalizedRoute')) {
+                case 'home':
+                    return '/';
+                    break;
+                case 'error':
+                    return '/404';
+                    break;
+            }
+        }
+
+        return $search;
     }
 
     /**
@@ -160,7 +175,7 @@ protected function getParams($url, $params)
             $url = preg_replace('/\{'.preg_quote($key).'(\?)?\}/', $value, $url);
         }
 
-        return $this->rmvNonUsedParams($url);
+        return $this->rmvUnUsedParams($url);
     }
 
     /**
@@ -171,7 +186,7 @@ protected function getParams($url, $params)
      *
      * @return [type] [description]
      */
-    protected function rmvNonUsedParams($url)
+    protected function rmvUnUsedParams($url)
     {
         return preg_replace('/\{.*\}/', '', $url);
     }

src/Traits/RoutesTrait.php

@@ -5,6 +5,8 @@
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Route;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
+use Mcamara\LaravelLocalization\Middleware\LaravelLocalizationRedirectFilter;
+use Mcamara\LaravelLocalization\Middleware\LocaleSessionRedirect;
 
 trait RoutesTrait
 {
@@ -21,8 +23,12 @@ public function createRoutes()
     {
         Route::group([
             'prefix'     => LaravelLocalization::setLocale(),
-            'middleware' => ['web', 'localeSessionRedirect', 'localizationRedirect'],
-            'namespace'  => 'App\Http\Controllers',
+            'middleware' => [
+                'web',
+                LocaleSessionRedirect::class,
+                LaravelLocalizationRedirectFilter::class,
+            ],
+            'namespace'  => config('simpleMenu.pagesControllerNS'),
             ], function () {
                 $this->utilCheck();
             }
@@ -140,8 +146,13 @@ protected function createRoutesList($action, $page, $routeName)
         foreach ($this->localeCodes as $code) {
             $url = $page->getTranslation('url', $code);
 
-            if (config('simpleMenu.useTitleForUrl') && is_null($page->getTranslation('url', $code))) {
-                $url = slugfy($page->getTranslation('title', $code));
+            if (is_null($page->getTranslation('url', $code))) {
+                if (config('simpleMenu.mainRouteName') == $routeName) {
+                    $url = '/';
+                }
+                if (config('simpleMenu.useTitleForUrl')) {
+                    $url = slugfy($page->getTranslation('title', $code));
+                }
             }
 
             $prefix = $action !== null ? $page->getTranslation('prefix', $code) : slugfy($page->getTranslation('prefix', $code));

src/config/simpleMenu.php

@@ -1,6 +1,12 @@
 <?php
 
 return [
+    /*
+     * the name of the main route '/',
+     * make sure you have a row in ur db with a `route_name = the below`
+     */
+    'mainRouteName'=> 'home',
+
     /*
      * the menu list classes to be used for "render()"
      */
@@ -21,7 +27,18 @@
     'routeListPath' => storage_path('logs/simpleMenu.php'),
 
     /*
-     * if url is empty should we use a slugged title instead ?
+     * if url is empty (ex.'/') should we use a slugged title instead ?
      */
     'useTitleForUrl' => false,
+
+    /*
+     * what happens when a route is available in one locale "en" but not in another "fr"
+     * add either 'home' or 'error'
+     */
+    'unFoundLocalizedRoute' => 'error',
+
+    /*
+     * pages controller namespace
+     */
+    'pagesControllerNS'=> 'App\Http\Controllers',
 ];

src/helpers.php

@@ -8,7 +8,7 @@ function trimfy($value, $limit = 100, $end = ' ...')
     {
         $value = strip_tags($value);
 
-        if (crntLang() != 'en') {
+        if (config('app.locale') != 'en') {
             return strlen($value) <= $limit
                 ? $value
                 : mb_substr($value, 0, $limit, 'UTF-8').$end;