Merge pull request #122 from juzaweb/fix/null-theme-thumbnail-error-17052108890914793362

Fix Call to a member function thumbnailUrl() on null khi ko có theme

Author: juzaweb

src/Http/Controllers/Admin/ThemeController.php

@@ -32,7 +32,7 @@ public function loadData(Request $request)
         }
 
         $currentTheme = Theme::current();
-        $themes = Theme::all()->filter(fn ($theme) => $theme->name() !== $currentTheme->name());
+        $themes = Theme::all()->filter(fn ($theme) => $theme->name() !== $currentTheme?->name());
 
         return $this->success(
             [

src/resources/views/admin/theme/index.blade.php

@@ -42,11 +42,13 @@
     </div>
 
     <div class="row" id="theme-list">
-        <div class="col-md-4 p-2 theme-list-item">
-            @component('core::admin.theme.components.theme-item', ['theme' => $currentTheme, 'active' => true])
+        @if ($currentTheme)
+            <div class="col-md-4 p-2 theme-list-item">
+                @component('core::admin.theme.components.theme-item', ['theme' => $currentTheme, 'active' => true])
 
-            @endcomponent
-        </div>
+                @endcomponent
+            </div>
+        @endif
     </div>
 @endsection