Register theme views

ttimot24 · Feb 19, 2024 · 29e86d9 · 29e86d9
1 parent b586884
commit 29e86d9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/app/Http/Middleware/WebsiteMiddleware.php b/app/Http/Middleware/WebsiteMiddleware.php
@@ -15,13 +15,6 @@ class WebsiteMiddleware
      */
     public function handle($request, Closure $next)
     {
-
-
-        \View::addNamespace('theme', [
-            "themes/".$request->settings['theme']."/app".DIRECTORY_SEPARATOR."View",
-            "themes/".$request->settings['theme']."/resources".DIRECTORY_SEPARATOR."views",
-        ]);
-
         $response = $next($request);
 
         $widgets = new \App\Libs\ShortCode();

diff --git a/app/Providers/ThemeServiceProvider.php b/app/Providers/ThemeServiceProvider.php
@@ -13,12 +13,21 @@ class ThemeServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-
+        // For website
         if (!app()->runningInConsole() && !\Request::is(\Config::get('horizontcms.backend_prefix') . "/*")) {
             $theme = \App\Model\Settings::get('theme');
             $this->loadJsonTranslationsFrom(base_path("themes/" . $theme . "/resources/lang"));
         }
 
+        // For everything
+        if(!app()->runningInConsole()){
+            $theme = \App\Model\Settings::get('theme');
+            \View::addNamespace('theme', [
+                "themes/".$theme."/app".DIRECTORY_SEPARATOR."View",
+                "themes/".$theme."/resources".DIRECTORY_SEPARATOR."views",
+            ]);
+        }
+
     }
 
     /**