refactor: set view

Author: jevantang

app/Exceptions/ErrorException.php

@@ -9,13 +9,28 @@
 namespace Fresns\WebsiteEngine\Exceptions;
 
 use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\View;
 
 class ErrorException extends \Exception
 {
     public function render()
     {
         // dd($this->getCode(), $this->getMessage());
 
+        // set view
+        $themeFskey = fs_theme('fskey');
+        if ($themeFskey) {
+            View::addLocation(base_path("themes/{$themeFskey}"));
+
+            $currentPaths = View::getFinder()->getPaths();
+
+            $currentPaths = array_unique($currentPaths);
+
+            array_unshift($currentPaths, base_path("themes/{$themeFskey}"));
+
+            View::getFinder()->setPaths($currentPaths);
+        }
+
         if (\request()->wantsJson()) {
             return \response()->json([
                 'code' => $this->getCode(),

app/Http/Middleware/WebConfiguration.php

@@ -89,7 +89,18 @@ public function handle(Request $request, Closure $next)
         }
 
         // set view
-        View::addLocation(base_path("themes/{$themeFskey}"));
+        $themeFskey = fs_theme('fskey');
+        if ($themeFskey) {
+            View::addLocation(base_path("themes/{$themeFskey}"));
+
+            $currentPaths = View::getFinder()->getPaths();
+
+            $currentPaths = array_unique($currentPaths);
+
+            array_unshift($currentPaths, base_path("themes/{$themeFskey}"));
+
+            View::getFinder()->setPaths($currentPaths);
+        }
 
         // set headers
         if (is_local_api()) {