From 5f08d3a7fec862f57a601c4d45cae44277220659 Mon Sep 17 00:00:00 2001
From: Tony Lea <tnylea@gmail.com>
Date: Tue, 30 Jul 2024 14:53:14 -0400
Subject: [PATCH] Adding updates to themes

---
 config/themes.php                         |  4 +---
 resources/views/index.blade.php           |  2 +-
 resources/views/options.blade.php         |  2 +-
 src/Http/Controllers/ThemesController.php |  2 +-
 src/ThemesServiceProvider.php             | 24 +++++++++++------------
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/config/themes.php b/config/themes.php
index 3f5d041..7edc6ac 100644
--- a/config/themes.php
+++ b/config/themes.php
@@ -1,9 +1,7 @@
 <?php
 
 return [
-
-	'folder' => resource_path('views/themes'),
+	'folder' => resource_path('themes'),
 	'publish_assets' => true,
 	'create_tables' => true
-
 ];
\ No newline at end of file
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index b818327..bbc4910 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -164,7 +164,7 @@
         @if(count($themes) < 1)
 	        <div class="alert alert-warning">
 	            <strong>Wuh oh!</strong>
-	            <p>It doesn't look like you have any themes available in your theme folder located at <code><?= resource_path('views/themes'); ?></code></p>
+	            <p>It doesn't look like you have any themes available in your theme folder located at <code><?= resource_path('themes'); ?></code></p>
 	        </div>
 	    @endif
 
diff --git a/resources/views/options.blade.php b/resources/views/options.blade.php
index dc2649a..a672a3c 100644
--- a/resources/views/options.blade.php
+++ b/resources/views/options.blade.php
@@ -58,7 +58,7 @@
         <div class="panel">
         	<div class="panel-body">
 
-	        		@if(file_exists(config('themes.folder', resource_path('views/themes')) . '/' . $theme->folder . '/options.blade.php'))
+	        		@if(file_exists(config('themes.folder', resource_path('themes')) . '/' . $theme->folder . '/options.blade.php'))
 	        			<?php if (!defined('ACTIVE_THEME_FOLDER')) { define("ACTIVE_THEME_FOLDER", $theme->folder); } ?>
 	        			<form action="{{ route('voyager.theme.options', $theme->folder) }}" method="POST" enctype="multipart/form-data">
 
diff --git a/src/Http/Controllers/ThemesController.php b/src/Http/Controllers/ThemesController.php
index c0199bc..e5a551e 100644
--- a/src/Http/Controllers/ThemesController.php
+++ b/src/Http/Controllers/ThemesController.php
@@ -14,7 +14,7 @@ class ThemesController extends Controller
     private $themes_folder = '';
 
     public function __construct(){
-        $this->themes_folder = config('themes.folder', resource_path('views/themes'));
+        $this->themes_folder = config('themes.folder', resource_path('themes'));
     }
 
     public function index(){
diff --git a/src/ThemesServiceProvider.php b/src/ThemesServiceProvider.php
index b7ede45..0b0f844 100644
--- a/src/ThemesServiceProvider.php
+++ b/src/ThemesServiceProvider.php
@@ -66,9 +66,9 @@ public function boot()
     {
         try{
 
-            dd(config('themes.folder'));
+        //    dd(config('themes.folder'));
 
-            $this->loadViewsFrom(__DIR__.'/../resources/views', 'themes');
+            //$this->loadViewsFrom(config('themes.folder'), 'themes');
 
             $theme = '';
 
@@ -86,17 +86,17 @@ public function boot()
 
             view()->share('theme', $theme);
 
-            $this->themes_folder = config('themes.folder', resource_path('views/themes'));
+            $folder = config('themes.folder', resource_path('themes'));
 
-            $this->loadDynamicMiddleware($this->themes_folder, $theme);
+            $this->loadDynamicMiddleware($folder, $theme);
             $this->registerThemeComponents($theme);
             $this->registerThemeFolioDirectory($theme);
 
             // Make sure we have an active theme
             if (isset($theme)) {
-                $this->loadViewsFrom($this->themes_folder.'/'.@$theme->folder, 'theme');
+                $this->loadViewsFrom($folder.'/'.@$theme->folder, 'theme');
             }
-            $this->loadViewsFrom($this->themes_folder, 'themes_folder');
+            //$this->loadViewsFrom($folder, 'themes_folder');
 
         } catch(\Exception $e){
             return $e->getMessage();
@@ -122,13 +122,13 @@ public function addThemeRoutes($router)
     }
 
     private function registerThemeComponents($theme){
-        Blade::anonymousComponentPath(resource_path('views/themes/' . $theme->folder . '/components/elements'));
-        Blade::anonymousComponentPath(resource_path('views/themes/' . $theme->folder . '/components'));
+        Blade::anonymousComponentPath(config('themes.folder') . '/' . $theme->folder . '/components/elements');
+        Blade::anonymousComponentPath(config('themes.folder') . '/' . $theme->folder . '/components');
     }
 
     private function registerThemeFolioDirectory($theme){
-        if (File::exists(resource_path('views/themes/' . $theme->folder . '/pages'))) {
-            Folio::path(resource_path('views/themes/' . $theme->folder . '/pages'))->middleware([
+        if (File::exists( config('themes.folder') . '/' . $theme->folder . '/pages')) {
+            Folio::path( config('themes.folder') . '/' . $theme->folder . '/pages')->middleware([
                 '*' => [
                     //
                 ],
@@ -184,11 +184,11 @@ protected function ensurePermissionExist()
         }
     }
 
-    private function loadDynamicMiddleware($themes_folder, $theme){
+    private function loadDynamicMiddleware($folder, $theme){
         if (empty($theme)) {
             return;
         }
-        $middleware_folder = $themes_folder . '/' . $theme->folder . '/middleware';
+        $middleware_folder = $folder . '/' . $theme->folder . '/middleware';
         if(file_exists( $middleware_folder )){
             $middleware_files = scandir($middleware_folder);
             foreach($middleware_files as $middleware){