From e3a002fe8c215d972e6144d1dc9d3a27e7c747dd Mon Sep 17 00:00:00 2001 From: Alex Justesen Date: Fri, 8 Dec 2023 10:21:26 -0500 Subject: [PATCH 1/3] use redirect method instead of a closure --- routes/web.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routes/web.php b/routes/web.php index 724bd3625..71c8ffea6 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,6 +1,7 @@ middleware('x-frame-allow') ->name('home'); -Route::get('/login', function () { - return redirect('/admin/login'); -})->name('login'); +Route::redirect('/login', '/admin/login') + ->name('login'); require __DIR__.'/debug.php'; From cd7c1adff5e09caec856ff3dc227f3832ad50ded Mon Sep 17 00:00:00 2001 From: Alex Justesen Date: Fri, 8 Dec 2023 10:22:49 -0500 Subject: [PATCH 2/3] moved public dashboard link to the header --- app/Filament/Pages/Dashboard.php | 15 +++++++++++++++ app/Providers/Filament/AdminPanelProvider.php | 4 ---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/Filament/Pages/Dashboard.php b/app/Filament/Pages/Dashboard.php index 71a684114..5e8522dfa 100644 --- a/app/Filament/Pages/Dashboard.php +++ b/app/Filament/Pages/Dashboard.php @@ -14,6 +14,8 @@ class Dashboard extends BasePage { + public bool $publicDashboard = false; + protected static ?string $pollingInterval = null; protected static ?string $navigationIcon = 'heroicon-o-chart-bar'; @@ -22,11 +24,24 @@ class Dashboard extends BasePage protected static string $view = 'filament.pages.dashboard'; + public function mount() + { + $settings = new GeneralSettings(); + + $this->publicDashboard = $settings->public_dashboard_enabled; + } + protected function getHeaderActions(): array { return [ + Action::make('home') + ->label('Public Dashboard') + ->color('gray') + ->hidden(! $this->publicDashboard) + ->url('/'), Action::make('speedtest') ->label('Queue Speedtest') + ->color('primary') ->action('queueSpeedtest') ->hidden(fn (): bool => ! auth()->user()->is_admin && ! auth()->user()->is_user), ]; diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php index 897af94b8..88f41dfd2 100644 --- a/app/Providers/Filament/AdminPanelProvider.php +++ b/app/Providers/Filament/AdminPanelProvider.php @@ -80,10 +80,6 @@ public function panel(Panel $panel): Panel ->collapsible(false), ]) ->navigationItems([ - NavigationItem::make('Home') - ->url('/') - ->icon('heroicon-o-home') - ->sort(0), NavigationItem::make('Documentation') ->url('https://docs.speedtest-tracker.dev/', shouldOpenInNewTab: true) ->icon('heroicon-o-book-open') From 884409ec54bd85870a370eef9c47ae8e92053313 Mon Sep 17 00:00:00 2001 From: Alex Justesen Date: Fri, 8 Dec 2023 10:27:07 -0500 Subject: [PATCH 3/3] removed unused import --- routes/web.php | 1 - 1 file changed, 1 deletion(-) diff --git a/routes/web.php b/routes/web.php index 71c8ffea6..e7e830f7f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,7 +1,6 @@