Merge pull request #8 from codions/develop

fabioassuncao · web-flow · commit 9ac055eed7e8 · 2023-05-31T15:32:17.000-03:00
Added helper method to obtain an instance of a class present in the current theme
diff --git a/resources/stubs/template/resources/views/layouts/app.blade.php b/resources/stubs/template/resources/views/layouts/app.blade.php
@@ -16,6 +16,7 @@
 
     <!-- Scripts -->
     <script src="https://cdn.jsdelivr.net/gh/alpinejs/alpine@v2.7.0/dist/alpine.js" defer></script>
+    @livewireStyles
 </head>
 
 <body class="font-sans antialiased">
@@ -37,6 +38,8 @@
     </div>
 
     @stack('modals')
+
+    @livewireScripts
 </body>
 
-</html>
+</html>
diff --git a/resources/stubs/template/resources/views/layouts/guest.blade.php b/resources/stubs/template/resources/views/layouts/guest.blade.php
@@ -16,12 +16,16 @@
 
     <!-- Scripts -->
     <script src="https://cdn.jsdelivr.net/gh/alpinejs/alpine@v2.7.0/dist/alpine.js" defer></script>
+
+    @livewireStyles
 </head>
 
 <body>
     <div class="font-sans text-gray-900 antialiased">
         {{ $slot }}
     </div>
+
+    @livewireScripts
 </body>
 
-</html>
+</html>
diff --git a/src/Theme.php b/src/Theme.php
@@ -13,6 +13,7 @@
 use Codions\ThemesManager\Traits\HasProviders;
 use Codions\ThemesManager\Traits\HasTranslations;
 use Codions\ThemesManager\Traits\HasViews;
+use Exception;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Log;
@@ -208,6 +209,21 @@ public function getNamespace(string $path = null): string
         return "Themes\\$vendor\\$name\\" . $path;
     }
 
+    public function getInstance(string $path)
+    {
+        if (! $this->enabled()) {
+            $this->requireClass($path);
+        }
+
+        $class = $this->getNamespace($path);
+
+        if (! class_exists($class)) {
+            throw new Exception("Class not found: {$class}");
+        }
+
+        return new $class;
+    }
+
     /**
      * Check if has parent Theme.
      */
diff --git a/src/Traits/Autoloader.php b/src/Traits/Autoloader.php
@@ -13,15 +13,20 @@ trait Autoloader
     public function registerAutoloader()
     {
         spl_autoload_register(function ($class) {
-            $class = str_replace($this->getNamespace(), '', $class);
+            $this->requireClass($class);
+        });
+    }
+
+    protected function requireClass($class)
+    {
+        $class = str_replace($this->getNamespace(), '', $class);
 
-            $class = str_replace('\\', DIRECTORY_SEPARATOR, $class);
-            $file = $this->getPath("src/{$class}.php");
+        $class = str_replace('\\', DIRECTORY_SEPARATOR, $class);
+        $file = $this->getPath("src/{$class}.php");
 
-            if (file_exists($file)) {
-                require_once $file;
-            }
-        });
+        if (file_exists($file)) {
+            require_once $file;
+        }
     }
 
     protected function registerLivewireComponents()
