Merge pull request #429 from awcodes/fix/dont-load-on-auth-pages

Fix: Don't load panel on auth pages
awcodes · Jan 31, 2024 · 5b6cf2c · 5b6cf2c
2 parents 6aba446 + f07b835
commit 5b6cf2c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 9 deletions.
diff --git a/src/CuratorPlugin.php b/src/CuratorPlugin.php
@@ -4,8 +4,11 @@
 
 use Closure;
 use Filament\Contracts\Plugin;
+use Filament\Facades\Filament;
 use Filament\Panel;
 use Filament\Support\Concerns\EvaluatesClosures;
+use Filament\Support\Facades\FilamentView;
+use Illuminate\Contracts\View\View;
 
 class CuratorPlugin implements Plugin
 {
@@ -36,19 +39,27 @@ public function register(Panel $panel): void
             ->resources([
                 $this->getResource(),
             ]);
+
+        if (! is_panel_auth_route()) {
+            $panel
+                ->renderHook(
+                    'panels::body.end',
+                    fn (): View => view('curator::components.modals.modal')
+                );
+        }
     }
 
     public function boot(Panel $panel): void
     {
-        //
+
     }
 
     public static function make(): static
     {
         return app(static::class);
     }
 
-    public static function get(): static
+    public static function get(): Plugin
     {
         return filament(app(static::class)->getId());
     }

diff --git a/src/CuratorServiceProvider.php b/src/CuratorServiceProvider.php
@@ -56,12 +56,5 @@ public function packageBooted(): void
             AlpineComponent::make('curation', __DIR__ . '/../resources/dist/curation.js'),
             Css::make('curator', __DIR__ . '/../resources/dist/curator.css')->loadedOnRequest(),
         ], 'awcodes/curator');
-
-        if (Filament::getCurrentPanel() && Filament::getCurrentPanel()->hasPlugin('awcodes/curator')) {
-            FilamentView::registerRenderHook(
-                'panels::body.end',
-                fn (): View => view('curator::components.modals.modal')
-            );
-        }
     }
 }
diff --git a/src/helpers.php b/src/helpers.php
@@ -4,6 +4,9 @@
 
 use Awcodes\Curator\Models\Media;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Str;
 
 if (!function_exists('is_media_resizable')) {
     function is_media_resizable(string $ext): bool
@@ -36,3 +39,17 @@ function get_media_items(array|Media|int $ids): Collection|array
         return [];
     }
 }
+
+if(!function_exists('is_panel_auth_route')) {
+    function is_panel_auth_route(): bool
+    {
+        $authRoutes = [
+            '/login',
+            '/password-reset',
+            '/register',
+            '/email-verification',
+        ];
+
+        return Str::of(Request::path())->contains($authRoutes);
+    }
+}