mirror of
https://github.com/pelican-dev/panel.git
synced 2025-09-08 06:08:40 +02:00
Fix Installer, Admin & Exit admin redirect (#1640)
This commit is contained in:
parent
4aae2562ea
commit
a8241bf9f3
@ -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) {
|
||||
}
|
||||
}
|
||||
|
@ -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),
|
||||
])
|
||||
|
@ -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'))),
|
||||
|
Loading…
x
Reference in New Issue
Block a user