From 987f3eddefcf67f456fa68f3eb085c6c662f4855 Mon Sep 17 00:00:00 2001 From: Nico Deblauwe Date: Thu, 20 Feb 2025 05:57:12 +0100 Subject: [PATCH] BUGFIX :bug: Towards a more resilient template (#20) * Update Header.php * Update AdminLayout.php --- src/View/Components/Adminlayout/AdminLayout.php | 3 ++- src/View/Layouts/FluxAdmin/Header.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/View/Components/Adminlayout/AdminLayout.php b/src/View/Components/Adminlayout/AdminLayout.php index a1ca956..751d0f0 100644 --- a/src/View/Components/Adminlayout/AdminLayout.php +++ b/src/View/Components/Adminlayout/AdminLayout.php @@ -3,6 +3,7 @@ namespace Ndeblauw\BlueAdmin\View\Components\Adminlayout; use Illuminate\Support\Facades\Route; +use Illuminate\Support\Str; use Illuminate\View\Component; class AdminLayout extends Component @@ -43,7 +44,7 @@ private function findActiveTopLevelMenuItem() $routename = Route::currentRouteName(); $fake_index_routename = str($routename)->replace(['show', 'create', 'edit'], 'index')->toString(); - $current_route = Route::has($fake_index_routename) + $current_route = Str::of($fake_index_routename)->contains('.index') && Route::has($fake_index_routename) ? str(route($fake_index_routename))->replace(config('app.url').'/','')->toString() : Route::current()->uri; // todo - make more fault tolerant !!! (https etc) diff --git a/src/View/Layouts/FluxAdmin/Header.php b/src/View/Layouts/FluxAdmin/Header.php index 25996a9..7b27ae5 100644 --- a/src/View/Layouts/FluxAdmin/Header.php +++ b/src/View/Layouts/FluxAdmin/Header.php @@ -3,6 +3,7 @@ namespace Ndeblauw\BlueAdmin\View\Layouts\FluxAdmin; use Illuminate\Support\Facades\Route; +use Illuminate\Support\Str; use Illuminate\View\Component; class Header extends Component @@ -34,7 +35,7 @@ public function findActiveTopLevelMenuItem() { $routename = Route::currentRouteName(); $fake_index_routename = str($routename)->replace(['show', 'create', 'edit'], 'index')->toString(); - $current_route = Route::has($fake_index_routename) + $current_route = Str::of($fake_index_routename)->contains('.index') && Route::has($fake_index_routename) ? str(route($fake_index_routename))->replace(config('app.url').'/','')->toString() : Route::current()?->uri;