feat: adds new routes to routes, and adapts DetectLanguage logic

Author: samberrry

src/Middleware/DetectLanguage.php

@@ -3,21 +3,33 @@
 
 namespace BinshopsBlog\Middleware;
 
+use BinshopsBlog\Models\BinshopsConfiguration;
 use Closure;
 use BinshopsBlog\Models\BinshopsLanguage;
 
 class DetectLanguage
 {
     public function handle($request, Closure $next)
     {
-        $lang = BinshopsLanguage::where('locale', $request->route('locale'))
+        $locale = $request->route('locale');
+        $noLocaleRoute = false;
+
+        if (!$request->route('locale')){
+            $noLocaleRoute = true;
+            $locale = BinshopsConfiguration::get('DEFAULT_LANGUAGE_LOCALE');
+        }
+        $lang = BinshopsLanguage::where('locale', $locale)
             ->where('active', true)
             ->first();
 
         if (!$lang){
             return abort(404);
         }
-        $request->attributes->add(['lang_id' => $lang->id, 'locale' => $lang->locale]);
+        $request->attributes->add([
+            'lang_id' => $lang->id,
+            'locale' => $lang->locale,
+            'noLocaleRoute' => $noLocaleRoute
+        ]);
 
         return $next($request);
     }

src/routes.php

@@ -24,16 +24,33 @@
 
         // throttle to a max of 10 attempts in 3 minutes:
         Route::group(['middleware' => 'throttle:10,3'], function () {
-
             Route::post('save_comment/{blogPostSlug}',
                 'BinshopsCommentWriterController@addNewComment')
                 ->name('binshopsblog.comments.add_new_comment');
+        });
+    });
 
+    Route::group(['prefix' => config('binshopsblog.blog_prefix', 'blog')], function () {
 
-        });
+        Route::get('/', 'BinshopsReaderController@index')
+            ->name('binshopsblognolocale.index');
 
-    });
+        Route::get('/search', 'BinshopsReaderController@search')
+            ->name('binshopsblognolocale.search');
 
+        Route::get('/category{subcategories}', 'BinshopsReaderController@view_category')->where('subcategories', '^[a-zA-Z0-9-_\/]+$')->name('binshopsblognolocale.view_category');
+
+        Route::get('/{blogPostSlug}',
+            'BinshopsReaderController@viewSinglePost')
+            ->name('binshopsblognolocale.single');
+
+        // throttle to a max of 10 attempts in 3 minutes:
+        Route::group(['middleware' => 'throttle:10,3'], function () {
+            Route::post('save_comment/{blogPostSlug}',
+                'BinshopsCommentWriterController@addNewComment')
+                ->name('binshopsblognolocale.comments.add_new_comment');
+        });
+    });
 
     /* Admin backend routes - CRUD for posts, categories, and approving/deleting submitted comments */
     Route::group(['prefix' => config('binshopsblog.admin_prefix', 'blog_admin')], function () {