Merge pull request #67 from lara-zeus/fix-theme-view

fix path folder if not exist in artemis
lara-zeus · Sep 12, 2023 · 10d8e25 · 10d8e25
2 parents 566d39c + 0d6214a
commit 10d8e25
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/CoreServiceProvider.php b/src/CoreServiceProvider.php
@@ -60,10 +60,15 @@ public static function setThemePath(string $path): void
     {
         $viewPath = 'zeus::themes.' . config('zeus.theme') . '.' . $path;
 
+        // check the app folder
         $folder = resource_path('views/vendor/zeus/themes/' . config('zeus.theme') . '/' . $path);
 
         if (! is_dir($folder)) {
-            $viewPath = 'zeus::themes.zeus.' . $path;
+            // check artemis folder
+            $folder = base_path('vendor/lara-zeus/artemis/resources/views/themes/' . config('zeus.theme') . '/' . $path);
+            if (! is_dir($folder)) {
+                $viewPath = 'zeus::themes.zeus.' . $path;
+            }
         }
 
         View::share($path . 'Theme', $viewPath);