Bind theme in service provider

ttimot24 · Dec 3, 2024 · cb0af2c · cb0af2c
1 parent 3509098
commit cb0af2c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/app/Controllers/WebsiteController.php b/app/Controllers/WebsiteController.php
@@ -19,12 +19,9 @@ class WebsiteController extends Controller
 
     private $theme;
 
-    public function __construct(Request $request){
-
+    public function __construct(Request $request, \App\Libs\Theme $theme){
         $this->request = $request;
-
-        $this->theme = new \App\Libs\Theme(\Settings::get('theme'));
-
+        $this->theme = $theme;
     }
 
     /**

diff --git a/app/Providers/ThemeServiceProvider.php b/app/Providers/ThemeServiceProvider.php
@@ -19,10 +19,12 @@ public function boot()
 
             $theme = new Theme(\App\Model\Settings::get('theme'));
 
-            // For website
-            if (!\Request::is(\Config::get('horizontcms.backend_prefix') . "/*")) {
-                $this->loadJsonTranslationsFrom(base_path($theme->getPath() . "resources/lang"));
-            }
+            $this->app->bind(Theme::class, function ($app) use($theme) {
+                return $theme;
+            });
+
+
+            $this->registerTranslations($theme);
 
             $this->registerThemeViews($theme);
 
@@ -31,6 +33,12 @@ public function boot()
         }
     }
 
+    protected function registerTranslations(Theme $theme){
+        if (!\Request::is(\Config::get('horizontcms.backend_prefix') . "/*")) {
+            $this->loadJsonTranslationsFrom(base_path($theme->getPath() . "resources/lang"));
+        }
+    }
+
     protected function registerThemeViews(Theme $theme){
         \View::addNamespace('theme', [
             $theme->getPath() . "app" . DIRECTORY_SEPARATOR . "View",