Merge pull request #234 from Dev-Pulse-Community/filament-admin-panel…

…-rendering-issue-fix Filament admin panel rendering issue fix
liberu-cms · Aug 13, 2024 · ba27deb · ba27deb
2 parents f52e5f9 + 10d7deb
commit ba27deb
Show file tree

Hide file tree

Showing 13 changed files with 94 additions and 117 deletions.
diff --git a/app/Filament/Admin/Pages/Dashboard.php b/app/Filament/Admin/Pages/Dashboard.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Filament\Admin\Pages;
+
+use Filament\Pages\Page;
+class Dashboard extends Page
+{
+
+    public static ?string $title = 'Dashboard';
+
+    public static $icon = 'heroicon-o-home';
+
+    public static string $view = 'filament.pages.dashboard';
+
+}
diff --git a/app/Providers/Filament/AppPanelProvider.php b/app/Providers/Filament/AppPanelProvider.php
@@ -41,10 +41,10 @@ public function panel(Panel $panel): Panel
             ->default()
             ->id('app')
             ->path('app')
-            ->login([AuthenticatedSessionController::class, 'create'])
-            ->registration()
-            ->passwordReset()
-            ->emailVerification()
+            // ->login([AuthenticatedSessionController::class, 'create'])
+            // ->registration()
+            // ->passwordReset()
+            // ->emailVerification()
             ->viteTheme('resources/css/filament/admin/theme.css')
             ->colors([
                 'primary' => Color::Gray,
@@ -98,20 +98,20 @@ public function panel(Panel $panel): Panel
         //     ]);
         // }
 
-        if (Features::hasTeamFeatures()) {
-            $panel
-                ->tenant(Team::class, ownershipRelationship: 'team')
-                ->tenantRegistration(Pages\CreateTeam::class)
-                ->tenantProfile(Pages\EditTeam::class)
-                ->userMenuItems([
-                    MenuItem::make()
-                        ->label('Team Settings')
-                        ->icon('heroicon-o-cog-6-tooth')
-                        ->url(fn () => $this->shouldRegisterMenuItem()
-                            ? url(Pages\EditTeam::getUrl())
-                            : url($panel->getPath())),
-                ]);
-        }
+        // if (Features::hasTeamFeatures()) {
+        //     $panel
+        //         ->tenant(Team::class, ownershipRelationship: 'team')
+        //         ->tenantRegistration(Pages\CreateTeam::class)
+        //         ->tenantProfile(Pages\EditTeam::class)
+        //         ->userMenuItems([
+        //             MenuItem::make()
+        //                 ->label('Team Settings')
+        //                 ->icon('heroicon-o-cog-6-tooth')
+        //                 ->url(fn () => $this->shouldRegisterMenuItem()
+        //                     ? url(Pages\EditTeam::getUrl())
+        //                     : url($panel->getPath())),
+        //         ]);
+        // }
 
         return $panel;
     }

diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -17,7 +17,7 @@ class RouteServiceProvider extends ServiceProvider
      *
      * @var string
      */
-    public const HOME = '/admin';
+    public const HOME = '/admin/dashboard';
 
     /**
      * Define your route model bindings, pattern filters, and other route configuration.

diff --git a/composer.json b/composer.json
@@ -9,8 +9,7 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "bezhansalleh/filament-shield": "*",
-        "filament/filament": "*",
+        "bezhansalleh/filament-shield": "^3.2",
         "guzzlehttp/guzzle": "^7.8",
         "joelbutcher/socialstream": "*",
         "laravel/framework": "^11.0",
@@ -26,6 +25,7 @@
     },
     "require-dev": {
         "fakerphp/faker": "^1.23",
+        "filament/filament": "^3.2",
         "laravel/pint": "^1.14",
         "laravel/sail": "^1.28",
         "mockery/mockery": "^1.6",

diff --git a/composer.lock b/composer.lock
diff --git a/public/build/assets/app-4H06IkzR.css b/public/build/assets/app-4H06IkzR.css
diff --git a/public/build/assets/app-Dj3lq3wS.css b/public/build/assets/app-Dj3lq3wS.css
diff --git a/public/build/manifest.json b/public/build/manifest.json
@@ -1,6 +1,6 @@
 {
   "resources/css/app.css": {
-    "file": "assets/app-4H06IkzR.css",
+    "file": "assets/app-Dj3lq3wS.css",
     "src": "resources/css/app.css",
     "isEntry": true
   },

diff --git a/public/js/filament/forms/components/date-time-picker.js b/public/js/filament/forms/components/date-time-picker.js
diff --git a/public/js/filament/forms/components/file-upload.js b/public/js/filament/forms/components/file-upload.js
diff --git a/public/js/filament/forms/components/textarea.js b/public/js/filament/forms/components/textarea.js
diff --git a/resources/views/filament/pages/dashboard.blade.php b/resources/views/filament/pages/dashboard.blade.php
@@ -1,33 +1,5 @@
 <x-filament-panels::page>
-    <x-filament::grid columns="4">
-        <x-filament::grid.column>
-            <x-filament::card>
-                <h2 class="text-lg font-semibold">TEST</h2>
-                <p class="text-3xl font-bold"> 100 </p>
-            </x-filament::card>
-        </x-filament::grid.column>
-
-        <x-filament::grid.column>
-            <x-filament::card>
-                <h2 class="text-lg font-semibold">TEST</h2>
-                <p class="text-3xl font-bold"> 100 </p>
-            </x-filament::card>
-        </x-filament::grid.column>
-
-        <x-filament::grid.column>
-            <x-filament::card>
-                <h2 class="text-lg font-semibold">TEST</h2>
-                <p class="text-3xl font-bold"> 100 </p>
-            </x-filament::card>
-        </x-filament::grid.column>
-
-        <x-filament::grid.column>
-            <x-filament::card>
-                <h2 class="text-lg font-semibold">TEST</h2>
-                <p class="text-3xl font-bold"> 100 </p>
-            </x-filament::card>
-        </x-filament::grid.column>
-    </x-filament::grid>
+
 
     <x-filament::card class="mt-6">
         <h2 class="text-lg font-semibold mb-4">App Recent Activity</h2>