Fixed boot gate for super_admin. Added SPA support for production. ri…

…ckdbcn/filament-email to v1.6.0. Minor fixes.
marcogermani87 · Aug 30, 2024 · c8c8122 · c8c8122
1 parent e43d460
commit c8c8122
Show file tree

Hide file tree

Showing 20 changed files with 446 additions and 487 deletions.
diff --git a/src/.env.example b/src/.env.example
@@ -4,7 +4,7 @@ APP_KEY=base64:87ATL+uC34Ka+wY9lE383tUb+DtRgSHukRsNxnuocBM=
 APP_DEBUG=true
 APP_TIMEZONE="Europe/Rome"
 APP_URL=http://localhost:8001
-ASSET_URL=http://localhost:8001
+ASSET_URL="${APP_URL}"
 
 APP_LOCALE=en
 APP_FALLBACK_LOCALE=en
@@ -63,3 +63,8 @@ AWS_BUCKET=
 AWS_USE_PATH_STYLE_ENDPOINT=false
 
 VITE_APP_NAME="${APP_NAME}"
+
+FILAMENT_EMAIL_FACTORY_ATTACHMENTS_MAX=10
+
+FILAMENT_EMAIL_DEMO_TENANT_ENABLED=false
+FILAMENT_EMAIL_DEMO_FILAMENT_SHIELD_ENABLED=false
diff --git a/src/app/Policies/EmailPolicy.php b/src/app/Policies/EmailPolicy.php
@@ -2,8 +2,8 @@
 
 namespace App\Policies;
 
+use App\Models\Email;
 use App\Models\User;
-use RickDBCN\FilamentEmail\Models\Email;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class EmailPolicy

diff --git a/src/app/Policies/RolePolicy.php b/src/app/Policies/RolePolicy.php
@@ -3,8 +3,8 @@
 namespace App\Policies;
 
 use App\Models\User;
-use Spatie\Permission\Models\Role;
 use Illuminate\Auth\Access\HandlesAuthorization;
+use Spatie\Permission\Models\Role;
 
 class RolePolicy
 {

diff --git a/src/app/Providers/AppServiceProvider.php b/src/app/Providers/AppServiceProvider.php
@@ -4,6 +4,7 @@
 
 use BezhanSalleh\FilamentLanguageSwitch\LanguageSwitch;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\ServiceProvider;
 
@@ -14,7 +15,9 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
-        //
+        Gate::before(function ($user, $ability) {
+            return $user->hasRole('super_admin') ? true : null;
+        });
     }
 
     /**

diff --git a/src/app/Providers/Filament/AdminPanelProvider.php b/src/app/Providers/Filament/AdminPanelProvider.php
@@ -25,6 +25,7 @@
 use Illuminate\Routing\Middleware\SubstituteBindings;
 use Illuminate\Session\Middleware\AuthenticateSession;
 use Illuminate\Session\Middleware\StartSession;
+use Illuminate\Support\Facades\App;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
 use MarcoGermani87\FilamentCookieConsent\FilamentCookieConsent;
 use MarcoGermani87\FilamentMatomo\FilamentMatomo;
@@ -34,13 +35,19 @@ class AdminPanelProvider extends PanelProvider
 {
     public function panel(Panel $panel): Panel
     {
-        return $panel
+        $panel = $panel
             ->default()
             ->id('admin')
             ->path('admin')
-//            ->tenant(Team::class)
-//            ->tenantRegistration(RegisterTeam::class)
-//            ->tenantProfile(EditTeamProfile::class)
+            ->spa(!App::hasDebugModeEnabled());
+
+        if (config('filament-email-demo.tenant_enabled')) {
+            $panel->tenant(Team::class)
+                ->tenantRegistration(RegisterTeam::class)
+                ->tenantProfile(EditTeamProfile::class);
+        }
+
+        return $panel
             ->login(Login::class)
             ->colors([
                 'primary' => Color::Amber,
@@ -71,12 +78,22 @@ public function panel(Panel $panel): Panel
             ->authMiddleware([
                 Authenticate::class,
             ])
-            ->plugins([
-                FilamentEmail::make(),
-                FilamentRouteStatisticsPlugin::make(),
-                FilamentCookieConsent::make(),
-                FilamentMatomo::make(),
-                //FilamentShieldPlugin::make(),
-            ]);
+            ->plugins($this->getPlugins());
+    }
+
+    private function getPlugins(): array
+    {
+        $plugins = [
+            FilamentEmail::make(),
+            FilamentRouteStatisticsPlugin::make(),
+            FilamentCookieConsent::make(),
+            FilamentMatomo::make(),
+        ];
+
+        if (config('filament-email-demo.filament_shield_enabled')) {
+            $plugins[] = FilamentShieldPlugin::make();
+        }
+
+        return $plugins;
     }
 }
diff --git a/src/bootstrap/cache/packages.php b/src/bootstrap/cache/packages.php
@@ -191,6 +191,17 @@
       'Livewire' => 'Livewire\\Livewire',
     ),
   ),
+  'malzariey/filament-daterangepicker-filter' => 
+  array (
+    'providers' => 
+    array (
+      0 => 'Malzariey\\FilamentDaterangepickerFilter\\FilamentDaterangepickerFilterServiceProvider',
+    ),
+    'aliases' => 
+    array (
+      'FilamentDaterangepickerFilter' => 'Malzariey\\FilamentDaterangepickerFilter\\Facades\\FilamentDaterangepickerFilter',
+    ),
+  ),
   'marcogermani87/filament-cookie-consent' => 
   array (
     'providers' => 

diff --git a/src/bootstrap/cache/services.php b/src/bootstrap/cache/services.php
@@ -46,18 +46,19 @@
     42 => 'Laravel\\Sail\\SailServiceProvider',
     43 => 'Laravel\\Tinker\\TinkerServiceProvider',
     44 => 'Livewire\\LivewireServiceProvider',
-    45 => 'MarcoGermani87\\FilamentCookieConsent\\FilamentCookieConsentServiceProvider',
-    46 => 'MarcoGermani87\\FilamentMatomo\\FilamentMatomoServiceProvider',
-    47 => 'Carbon\\Laravel\\ServiceProvider',
-    48 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    49 => 'Termwind\\Laravel\\TermwindServiceProvider',
-    50 => 'RickDBCN\\FilamentEmail\\FilamentEmailServiceProvider',
-    51 => 'RyanChandler\\BladeCaptureDirective\\BladeCaptureDirectiveServiceProvider',
-    52 => 'Spatie\\CookieConsent\\CookieConsentServiceProvider',
-    53 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
-    54 => 'Spatie\\Permission\\PermissionServiceProvider',
-    55 => 'App\\Providers\\AppServiceProvider',
-    56 => 'App\\Providers\\Filament\\AdminPanelProvider',
+    45 => 'Malzariey\\FilamentDaterangepickerFilter\\FilamentDaterangepickerFilterServiceProvider',
+    46 => 'MarcoGermani87\\FilamentCookieConsent\\FilamentCookieConsentServiceProvider',
+    47 => 'MarcoGermani87\\FilamentMatomo\\FilamentMatomoServiceProvider',
+    48 => 'Carbon\\Laravel\\ServiceProvider',
+    49 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    50 => 'Termwind\\Laravel\\TermwindServiceProvider',
+    51 => 'RickDBCN\\FilamentEmail\\FilamentEmailServiceProvider',
+    52 => 'RyanChandler\\BladeCaptureDirective\\BladeCaptureDirectiveServiceProvider',
+    53 => 'Spatie\\CookieConsent\\CookieConsentServiceProvider',
+    54 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
+    55 => 'Spatie\\Permission\\PermissionServiceProvider',
+    56 => 'App\\Providers\\AppServiceProvider',
+    57 => 'App\\Providers\\Filament\\AdminPanelProvider',
   ),
   'eager' => 
   array (
@@ -92,18 +93,19 @@
     28 => 'LaracraftTech\\LaravelUsefulAdditions\\LaravelUsefulAdditionsServiceProvider',
     29 => 'Laravel\\Octane\\OctaneServiceProvider',
     30 => 'Livewire\\LivewireServiceProvider',
-    31 => 'MarcoGermani87\\FilamentCookieConsent\\FilamentCookieConsentServiceProvider',
-    32 => 'MarcoGermani87\\FilamentMatomo\\FilamentMatomoServiceProvider',
-    33 => 'Carbon\\Laravel\\ServiceProvider',
-    34 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
-    35 => 'Termwind\\Laravel\\TermwindServiceProvider',
-    36 => 'RickDBCN\\FilamentEmail\\FilamentEmailServiceProvider',
-    37 => 'RyanChandler\\BladeCaptureDirective\\BladeCaptureDirectiveServiceProvider',
-    38 => 'Spatie\\CookieConsent\\CookieConsentServiceProvider',
-    39 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
-    40 => 'Spatie\\Permission\\PermissionServiceProvider',
-    41 => 'App\\Providers\\AppServiceProvider',
-    42 => 'App\\Providers\\Filament\\AdminPanelProvider',
+    31 => 'Malzariey\\FilamentDaterangepickerFilter\\FilamentDaterangepickerFilterServiceProvider',
+    32 => 'MarcoGermani87\\FilamentCookieConsent\\FilamentCookieConsentServiceProvider',
+    33 => 'MarcoGermani87\\FilamentMatomo\\FilamentMatomoServiceProvider',
+    34 => 'Carbon\\Laravel\\ServiceProvider',
+    35 => 'NunoMaduro\\Collision\\Adapters\\Laravel\\CollisionServiceProvider',
+    36 => 'Termwind\\Laravel\\TermwindServiceProvider',
+    37 => 'RickDBCN\\FilamentEmail\\FilamentEmailServiceProvider',
+    38 => 'RyanChandler\\BladeCaptureDirective\\BladeCaptureDirectiveServiceProvider',
+    39 => 'Spatie\\CookieConsent\\CookieConsentServiceProvider',
+    40 => 'Spatie\\LaravelIgnition\\IgnitionServiceProvider',
+    41 => 'Spatie\\Permission\\PermissionServiceProvider',
+    42 => 'App\\Providers\\AppServiceProvider',
+    43 => 'App\\Providers\\Filament\\AdminPanelProvider',
   ),
   'deferred' => 
   array (

diff --git a/src/composer.json b/src/composer.json
@@ -17,7 +17,7 @@
         "laravel/tinker": "^2.9",
         "marcogermani87/filament-cookie-consent": "^1.0",
         "marcogermani87/filament-matomo": "^1.0",
-        "rickdbcn/filament-email": "^1.4"
+        "rickdbcn/filament-email": "^1.6"
     },
     "require-dev": {
         "fakerphp/faker": "^1.23",