Use theme check in all frontend routes #638 (#645)

This commit is contained in:
Nabeel S
2020-03-28 14:45:25 -04:00
committed by GitHub
parent ba0ae05c2a
commit 3e7d5f6195
3 changed files with 7 additions and 8 deletions
@@ -15,6 +15,5 @@ class PageIconNullable extends Migration
public function down() public function down()
{ {
} }
} }
+2
View File
@@ -7,6 +7,7 @@ use App\Http\Middleware\EncryptCookies;
use App\Http\Middleware\InstalledCheck; use App\Http\Middleware\InstalledCheck;
use App\Http\Middleware\JsonResponse; use App\Http\Middleware\JsonResponse;
use App\Http\Middleware\RedirectIfAuthenticated; use App\Http\Middleware\RedirectIfAuthenticated;
use App\Http\Middleware\SetActiveTheme;
use App\Http\Middleware\TrustProxies; use App\Http\Middleware\TrustProxies;
use App\Http\Middleware\UpdatePending; use App\Http\Middleware\UpdatePending;
use Illuminate\Auth\Middleware\Authenticate; use Illuminate\Auth\Middleware\Authenticate;
@@ -54,6 +55,7 @@ class Kernel extends HttpKernel
'can' => Authorize::class, 'can' => Authorize::class,
'guest' => RedirectIfAuthenticated::class, 'guest' => RedirectIfAuthenticated::class,
'json' => JsonResponse::class, 'json' => JsonResponse::class,
'theme' => SetActiveTheme::class,
'throttle' => ThrottleRequests::class, 'throttle' => ThrottleRequests::class,
'update_pending' => UpdatePending::class, 'update_pending' => UpdatePending::class,
]; ];
+5 -7
View File
@@ -2,7 +2,6 @@
namespace App\Providers; namespace App\Providers;
use App\Http\Middleware\SetActiveTheme;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
@@ -40,14 +39,14 @@ class RouteServiceProvider extends ServiceProvider
private function mapWebRoutes() private function mapWebRoutes()
{ {
Route::group([ Route::group([
'middleware' => 'web', 'middleware' => ['web', 'theme'],
'namespace' => $this->namespace, 'namespace' => $this->namespace,
], function ($router) { ], function ($router) {
Route::group([ Route::group([
'namespace' => 'Frontend', 'namespace' => 'Frontend',
'prefix' => '', 'prefix' => '',
'as' => 'frontend.', 'as' => 'frontend.',
'middleware' => ['auth', SetActiveTheme::class], 'middleware' => ['auth'],
], function () { ], function () {
Route::resource('dashboard', 'DashboardController'); Route::resource('dashboard', 'DashboardController');
@@ -85,10 +84,9 @@ class RouteServiceProvider extends ServiceProvider
}); });
Route::group([ Route::group([
'namespace' => 'Frontend', 'namespace' => 'Frontend',
'prefix' => '', 'prefix' => '',
'as' => 'frontend.', 'as' => 'frontend.',
'middleware' => [SetActiveTheme::class],
], function () { ], function () {
Route::get('/', 'HomeController@index')->name('home'); Route::get('/', 'HomeController@index')->name('home');
Route::get('r/{id}', 'PirepController@show')->name('pirep.show.public'); Route::get('r/{id}', 'PirepController@show')->name('pirep.show.public');