banquise/pelican-panel-mirror
8
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-09-08 09:38:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Installer, Admin & Exit admin redirect (#1640)

Browse Source
This commit is contained in:
MartinOscar 2025-08-30 14:37:59 +02:00 committed by GitHub
parent 4aae2562ea
commit a8241bf9f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Livewire/Installer/PanelInstaller.php
View File

@ -2,7 +2,6 @@
namespace App\Livewire\Installer; namespace App\Livewire\Installer;
use App\Filament\Admin\Pages\Dashboard;
use App\Livewire\Installer\Steps\CacheStep; use App\Livewire\Installer\Steps\CacheStep;
use App\Livewire\Installer\Steps\DatabaseStep; use App\Livewire\Installer\Steps\DatabaseStep;
use App\Livewire\Installer\Steps\EnvironmentStep; use App\Livewire\Installer\Steps\EnvironmentStep;
@ -14,6 +13,7 @@ use App\Services\Users\UserCreationService;
use App\Traits\CheckMigrationsTrait; use App\Traits\CheckMigrationsTrait;
use App\Traits\EnvironmentWriterTrait; use App\Traits\EnvironmentWriterTrait;
use Exception; use Exception;
use Filament\Facades\Filament;
use Filament\Forms\Components\Actions\Action; use Filament\Forms\Components\Actions\Action;
use Filament\Forms\Components\Wizard; use Filament\Forms\Components\Wizard;
use Filament\Forms\Concerns\InteractsWithForms; use Filament\Forms\Concerns\InteractsWithForms;
@ -106,7 +106,7 @@ class PanelInstaller extends SimplePage implements HasForms
$this->writeToEnv('env_session'); $this->writeToEnv('env_session');
// Redirect to admin panel // Redirect to admin panel
$this->redirect(Dashboard::getUrl()); $this->redirect(Filament::getPanel('admin')->getUrl());
} catch (Halt) { } catch (Halt) {
} }
} }

3
app/Providers/Filament/AdminPanelProvider.php
View File

@ -3,6 +3,7 @@
namespace App\Providers\Filament; namespace App\Providers\Filament;
use App\Filament\Pages\Auth\EditProfile; use App\Filament\Pages\Auth\EditProfile;
use Filament\Facades\Filament;
use Filament\Navigation\MenuItem; use Filament\Navigation\MenuItem;
use Filament\Navigation\NavigationGroup; use Filament\Navigation\NavigationGroup;
use Filament\Panel; use Filament\Panel;
@ -23,7 +24,7 @@ class AdminPanelProvider extends PanelProvider
->url(fn () => EditProfile::getUrl(panel: 'app')), ->url(fn () => EditProfile::getUrl(panel: 'app')),
MenuItem::make() MenuItem::make()
->label(fn () => trans('profile.exit_admin')) ->label(fn () => trans('profile.exit_admin'))
->url('/') ->url(fn () => Filament::getPanel('app')->getUrl())
->icon('tabler-arrow-back') ->icon('tabler-arrow-back')
->sort(24), ->sort(24),
]) ])

2
app/Providers/Filament/AppPanelProvider.php
View File

@ -18,7 +18,7 @@ class AppPanelProvider extends PanelProvider
->userMenuItems([ ->userMenuItems([
MenuItem::make() MenuItem::make()
->label(trans('profile.admin')) ->label(trans('profile.admin'))
->url('/admin') ->url(fn () => Filament::getPanel('admin')->getUrl())
->icon('tabler-arrow-forward') ->icon('tabler-arrow-forward')
->sort(5) ->sort(5)
->visible(fn () => auth()->user()->canAccessPanel(Filament::getPanel('admin'))), ->visible(fn () => auth()->user()->canAccessPanel(Filament::getPanel('admin'))),