minor bug fix and few improvement in asset manager

avored · Oct 19, 2020 · f961241 · f961241
1 parent a1d2049
commit f961241
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/AssetsManager.php b/src/AssetsManager.php
@@ -45,7 +45,7 @@ public function getCSS($key)
         $index = $this->styles->search(function($item) use ($key) {
             return $item->key() === $key;
         });
-        return $this->styles->get($key);
+        return $this->styles->get($index);
     }
 
     /**
@@ -79,6 +79,7 @@ public function registerCSS($item)
      */
     public function renderJS(): View
     {
+        // dd($this->scripts);
         return view('avored-assets::js.index')
             ->with('scripts', $this->scripts);
     }

diff --git a/src/Controllers/AssetController.php b/src/Controllers/AssetController.php
@@ -8,7 +8,12 @@ class AssetController
 {
     public function adminJS(string $key)
     {
-        $file = Asset::getJS($key);
+        $asset = Asset::getJS($key);
+        $file = $asset->path();
+
+        if ($file === null && !file_exists($file)) {
+            throw new \Exception('JS File not found: ' . $file);
+        }
 
         $expires = strtotime('+1 year');
         $lastModified = filemtime($file);
@@ -24,8 +29,13 @@ public function adminJS(string $key)
 
     public function adminCSS($key)
     {
-        $file = Asset::getCSS($key);
+        $asset = Asset::getJS($key);
+        $file = $asset->path();
 
+        if ($file === null && !file_exists($file)) {
+            throw new \Exception('CSS File not found: ' . $file);
+        }
+
         $expires = strtotime('+1 year');
         $lastModified = filemtime($file);
         $cacheControl = 'public, max-age=31536000';