diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 7ec6718f..a3f84d26 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -23,6 +23,8 @@ class Kernel extends HttpKernel * @var array */ protected $middleware = [ + LocaleSessionRedirect::class, + LaravelLocalizationRedirectFilter::class, Middleware\EncryptCookies::class, StartSession::class, ShareErrorsFromSession::class, diff --git a/app/Http/routes.php b/app/Http/routes.php index 19c7cd70..4d9c385d 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -13,7 +13,6 @@ Route::pattern('url', '[0-9\-a-z]+'); Route::group([ 'prefix' => LaravelLocalization::setLocale(), - 'middleware' => ['localeSessionRedirect', 'localizationRedirect'] ], function () { /** * This route group serves to handle request in admin diff --git a/modules/Blog/ArticleList/Http/routes.php b/modules/Blog/ArticleList/Http/routes.php index 001beb8b..b3d9bbc7 100644 --- a/modules/Blog/ArticleList/Http/routes.php +++ b/modules/Blog/ArticleList/Http/routes.php @@ -1,6 +1 @@ 'web', 'prefix' => 'articlelist', 'namespace' => 'Modules\Blog\ArticleList\Http\Controllers'], function() -{ - Route::get('/', 'ArticleListController@index'); -}); \ No newline at end of file diff --git a/modules/Categories/Http/routes.php b/modules/Categories/Http/routes.php index eb5456cc..52ff9a1a 100644 --- a/modules/Categories/Http/routes.php +++ b/modules/Categories/Http/routes.php @@ -2,7 +2,7 @@ Route::group([ 'prefix' => LaravelLocalization::setLocale() . '/admin/categories', - 'middleware' => ['localeSessionRedirect', 'localizationRedirect', 'web', 'auth', 'adminMenu'], + 'middleware' => ['admin'], 'namespace' => 'Modules\Categories\Http\Controllers' ], function () { Route::get('/', 'CategoriesOverview@getOverview') diff --git a/modules/ContactForm/Http/routes.php b/modules/ContactForm/Http/routes.php index 8387a5db..2ff17cff 100644 --- a/modules/ContactForm/Http/routes.php +++ b/modules/ContactForm/Http/routes.php @@ -1,24 +1,12 @@ ['web', 'auth', 'adminMenu'], - 'namespace' => '\Modules\ContactForm\Http\Controllers\Admin', - 'prefix' => 'admin/contactform' - ], function () { - Route::get('messsages/sent', 'SentMessagesOverview@getList') - ->name('emails.sent'); -}); - Route::group([ 'middleware' => ['web'], 'namespace' => '\Modules\ContactForm\Http\Controllers\Visitor', - 'prefix' => 'contactform' + 'prefix' => LaravelLocalization::setLocale() . '/contactform' ], function () { - - + // method for sending new message - + Route::post('/message/{formId}', 'CreateNewMessage@postMessage') ->name('email.send'); }); \ No newline at end of file diff --git a/modules/Gallery/Http/routes.php b/modules/Gallery/Http/routes.php index 3aa33d49..258f049b 100644 --- a/modules/Gallery/Http/routes.php +++ b/modules/Gallery/Http/routes.php @@ -1,8 +1,8 @@ ['web', 'auth', 'adminMenu'], + 'middleware' => ['admin'], 'namespace' => 'Modules\Gallery\Http\Controllers\Admin', - 'prefix' => 'admin/gallery' + 'prefix' => LaravelLocalization::setLocale() . 'admin/gallery' ], function () { // method for creating slider from photogallery diff --git a/templates/Base/OnePage/Http/routes.php b/templates/Base/OnePage/Http/routes.php index 51e3c7b1..55c87aee 100644 --- a/templates/Base/OnePage/Http/routes.php +++ b/templates/Base/OnePage/Http/routes.php @@ -1,12 +1,6 @@ [ - 'localeSessionRedirect', - 'localizationRedirect', - 'web', - 'auth', - 'adminMenu' - ], + 'middleware' => ['admin'], 'prefix' => \LaravelLocalization::setLocale() . '/admin/template', 'namespace' => 'Templates\Base\OnePage\Http\Controllers\Admin' ], function () {