Merge pull request #717 from nabeelio/715-Theme

Apply theme globally; add mail templates into theme folder #715

app/Http/Kernel.php

@@ -45,6 +45,7 @@ class Kernel extends HttpKernel
             ShareErrorsFromSession::class,
             // VerifyCsrfToken::class,
             SubstituteBindings::class,
+            SetActiveTheme::class,
         ],
     ];
 

app/Http/Middleware/SetActiveTheme.php

@@ -15,6 +15,23 @@ class SetActiveTheme implements Middleware
 {
     public function handle(Request $request, Closure $next)
     {
+        $skip = [
+            'admin',
+            'admin/*',
+            'api',
+            'api/*',
+            'importer',
+            'importer/*',
+            'install',
+            'install/*',
+            'update',
+            'update/*',
+        ];
+
+        if ($request->is($skip)) {
+            return $next($request);
+        }
+
         try {
             $theme = setting('general.theme');
         } catch (\Exception $e) {

app/Providers/RouteServiceProvider.php

@@ -39,7 +39,7 @@ class RouteServiceProvider extends ServiceProvider
     private function mapWebRoutes()
     {
         Route::group([
-            'middleware' => ['web', 'theme'],
+            'middleware' => ['web'],
             'namespace'  => $this->namespace,
         ], function ($router) {
             Route::group([