mirror of
https://github.com/pelican-dev/panel.git
synced 2025-11-08 12:29:26 +01:00
change order of operations when registering panel
this makes sure plugins always register after our default configuration
This commit is contained in:
parent
217685dd79
commit
4f1e98c09e
@ -3,6 +3,7 @@
|
||||
namespace App\Providers\Filament;
|
||||
|
||||
use AchyutN\FilamentLogViewer\FilamentLogViewer;
|
||||
use App\Facades\Plugins;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Facades\Filament;
|
||||
use Filament\Navigation\NavigationGroup;
|
||||
@ -12,12 +13,10 @@ class AdminPanelProvider extends PanelProvider
|
||||
{
|
||||
public function panel(Panel $panel): Panel
|
||||
{
|
||||
$panel
|
||||
$panel = parent::panel($panel)
|
||||
->id('admin')
|
||||
->path('admin')
|
||||
->homeUrl('/');
|
||||
|
||||
return parent::panel($panel)
|
||||
->homeUrl('/')
|
||||
->breadcrumbs(false)
|
||||
->sidebarCollapsibleOnDesktop(fn () => !$panel->hasTopNavigation())
|
||||
->userMenuItems([
|
||||
@ -42,5 +41,9 @@ class AdminPanelProvider extends PanelProvider
|
||||
->navigationGroup(fn () => trans('admin/dashboard.advanced'))
|
||||
->navigationIcon('tabler-file-info'),
|
||||
]);
|
||||
|
||||
Plugins::loadPanelPlugins($panel);
|
||||
|
||||
return $panel;
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
namespace App\Providers\Filament;
|
||||
|
||||
use AchyutN\FilamentLogViewer\FilamentLogViewer;
|
||||
use App\Facades\Plugins;
|
||||
use Filament\Actions\Action;
|
||||
use Filament\Facades\Filament;
|
||||
use Filament\Panel;
|
||||
@ -11,11 +12,9 @@ class AppPanelProvider extends PanelProvider
|
||||
{
|
||||
public function panel(Panel $panel): Panel
|
||||
{
|
||||
$panel
|
||||
$panel = parent::panel($panel)
|
||||
->id('app')
|
||||
->default();
|
||||
|
||||
return parent::panel($panel)
|
||||
->default()
|
||||
->breadcrumbs(false)
|
||||
->navigation(false)
|
||||
->topbar(true)
|
||||
@ -31,5 +30,9 @@ class AppPanelProvider extends PanelProvider
|
||||
FilamentLogViewer::make()
|
||||
->authorize(false),
|
||||
]);
|
||||
|
||||
Plugins::loadPanelPlugins($panel);
|
||||
|
||||
return $panel;
|
||||
}
|
||||
}
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
namespace App\Providers\Filament;
|
||||
|
||||
use App\Enums\CustomizationKey;
|
||||
use App\Facades\Plugins;
|
||||
use App\Filament\Pages\Auth\EditProfile;
|
||||
use App\Filament\Pages\Auth\Login;
|
||||
use App\Http\Middleware\LanguageMiddleware;
|
||||
@ -28,7 +27,7 @@ abstract class PanelProvider extends BasePanelProvider
|
||||
{
|
||||
public function panel(Panel $panel): Panel
|
||||
{
|
||||
$panel
|
||||
return $panel
|
||||
->spa()
|
||||
->databaseNotifications()
|
||||
->brandName(config('app.name', 'Pelican'))
|
||||
@ -95,9 +94,5 @@ abstract class PanelProvider extends BasePanelProvider
|
||||
->authMiddleware([
|
||||
Authenticate::class,
|
||||
]);
|
||||
|
||||
Plugins::loadPanelPlugins($panel);
|
||||
|
||||
return $panel;
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Providers\Filament;
|
||||
|
||||
use App\Facades\Plugins;
|
||||
use App\Filament\Admin\Resources\Servers\Pages\EditServer;
|
||||
use App\Filament\App\Resources\Servers\Pages\ListServers;
|
||||
use App\Http\Middleware\Activity\ServerSubject;
|
||||
@ -15,12 +16,10 @@ class ServerPanelProvider extends PanelProvider
|
||||
{
|
||||
public function panel(Panel $panel): Panel
|
||||
{
|
||||
$panel
|
||||
$panel = parent::panel($panel)
|
||||
->id('server')
|
||||
->path('server')
|
||||
->homeUrl(fn () => Filament::getPanel('app')->getUrl());
|
||||
|
||||
return parent::panel($panel)
|
||||
->homeUrl(fn () => Filament::getPanel('app')->getUrl())
|
||||
->tenant(Server::class, 'uuid_short')
|
||||
->userMenuItems([
|
||||
Action::make('to_serverList')
|
||||
@ -46,5 +45,9 @@ class ServerPanelProvider extends PanelProvider
|
||||
->tenantMiddleware([
|
||||
ServerSubject::class,
|
||||
]);
|
||||
|
||||
Plugins::loadPanelPlugins($panel);
|
||||
|
||||
return $panel;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user