From a8241bf9f333219b01dacdb99ad61559cd8e3e93 Mon Sep 17 00:00:00 2001
From: MartinOscar <40749467+rmartinoscar@users.noreply.github.com>
Date: Sat, 30 Aug 2025 14:37:59 +0200
Subject: [PATCH] Fix Installer, Admin & Exit admin redirect (#1640)

---
 app/Livewire/Installer/PanelInstaller.php     | 4 ++--
 app/Providers/Filament/AdminPanelProvider.php | 3 ++-
 app/Providers/Filament/AppPanelProvider.php   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Livewire/Installer/PanelInstaller.php b/app/Livewire/Installer/PanelInstaller.php
index 370412c15..3cd71c012 100644
--- a/app/Livewire/Installer/PanelInstaller.php
+++ b/app/Livewire/Installer/PanelInstaller.php
@@ -2,7 +2,6 @@
 
 namespace App\Livewire\Installer;
 
-use App\Filament\Admin\Pages\Dashboard;
 use App\Livewire\Installer\Steps\CacheStep;
 use App\Livewire\Installer\Steps\DatabaseStep;
 use App\Livewire\Installer\Steps\EnvironmentStep;
@@ -14,6 +13,7 @@ use App\Services\Users\UserCreationService;
 use App\Traits\CheckMigrationsTrait;
 use App\Traits\EnvironmentWriterTrait;
 use Exception;
+use Filament\Facades\Filament;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\Wizard;
 use Filament\Forms\Concerns\InteractsWithForms;
@@ -106,7 +106,7 @@ class PanelInstaller extends SimplePage implements HasForms
             $this->writeToEnv('env_session');
 
             // Redirect to admin panel
-            $this->redirect(Dashboard::getUrl());
+            $this->redirect(Filament::getPanel('admin')->getUrl());
         } catch (Halt) {
         }
     }
diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php
index a35e6ce84..d1075b316 100644
--- a/app/Providers/Filament/AdminPanelProvider.php
+++ b/app/Providers/Filament/AdminPanelProvider.php
@@ -3,6 +3,7 @@
 namespace App\Providers\Filament;
 
 use App\Filament\Pages\Auth\EditProfile;
+use Filament\Facades\Filament;
 use Filament\Navigation\MenuItem;
 use Filament\Navigation\NavigationGroup;
 use Filament\Panel;
@@ -23,7 +24,7 @@ class AdminPanelProvider extends PanelProvider
                     ->url(fn () => EditProfile::getUrl(panel: 'app')),
                 MenuItem::make()
                     ->label(fn () => trans('profile.exit_admin'))
-                    ->url('/')
+                    ->url(fn () => Filament::getPanel('app')->getUrl())
                     ->icon('tabler-arrow-back')
                     ->sort(24),
             ])
diff --git a/app/Providers/Filament/AppPanelProvider.php b/app/Providers/Filament/AppPanelProvider.php
index 8d7b2de6c..36ca978b1 100644
--- a/app/Providers/Filament/AppPanelProvider.php
+++ b/app/Providers/Filament/AppPanelProvider.php
@@ -18,7 +18,7 @@ class AppPanelProvider extends PanelProvider
             ->userMenuItems([
                 MenuItem::make()
                     ->label(trans('profile.admin'))
-                    ->url('/admin')
+                    ->url(fn () => Filament::getPanel('admin')->getUrl())
                     ->icon('tabler-arrow-forward')
                     ->sort(5)
                     ->visible(fn () => auth()->user()->canAccessPanel(Filament::getPanel('admin'))),