From 37fca9803b4534b991dde3aed9c2beaebb0a3754 Mon Sep 17 00:00:00 2001 From: Mark Gregory Date: Tue, 30 Jun 2026 16:58:36 +0100 Subject: [PATCH] change to menu system to make unified menu --- .../partials/sidebar-support-menu.blade.php | 0 .../partials/wms-support-navigation.blade.php | 0 .../views/layouts/app/sidebar.blade.php | 11 + .../views/components/layouts/app.blade.php | 10 +- .../views/layouts/app/sidebar.blade.php | 1183 +---------------- .../views/components/layouts/app.blade.php | 1120 +--------------- .../components/layouts/sidebar.blade.php | 916 +------------ resources/views/layouts/app/sidebar.blade.php | 121 +- 8 files changed, 88 insertions(+), 3273 deletions(-) rename {Modules => .sidebar-refactor-backup/Modules}/Helpdesk/Resources/views/partials/sidebar-support-menu.blade.php (100%) rename {resources => .sidebar-refactor-backup/resources}/views/partials/wms-support-navigation.blade.php (100%) create mode 100644 Helpdesk/Resources/views/layouts/app/sidebar.blade.php diff --git a/Modules/Helpdesk/Resources/views/partials/sidebar-support-menu.blade.php b/.sidebar-refactor-backup/Modules/Helpdesk/Resources/views/partials/sidebar-support-menu.blade.php similarity index 100% rename from Modules/Helpdesk/Resources/views/partials/sidebar-support-menu.blade.php rename to .sidebar-refactor-backup/Modules/Helpdesk/Resources/views/partials/sidebar-support-menu.blade.php diff --git a/resources/views/partials/wms-support-navigation.blade.php b/.sidebar-refactor-backup/resources/views/partials/wms-support-navigation.blade.php similarity index 100% rename from resources/views/partials/wms-support-navigation.blade.php rename to .sidebar-refactor-backup/resources/views/partials/wms-support-navigation.blade.php diff --git a/Helpdesk/Resources/views/layouts/app/sidebar.blade.php b/Helpdesk/Resources/views/layouts/app/sidebar.blade.php new file mode 100644 index 00000000..ce8e81b8 --- /dev/null +++ b/Helpdesk/Resources/views/layouts/app/sidebar.blade.php @@ -0,0 +1,11 @@ +{{-- + Helpdesk sidebar compatibility wrapper. + + The real sidebar/layout lives in resources/views/layouts/app/sidebar.blade.php. + Keep this file as a thin delegate only so Helpdesk-specific references do not fork the sidebar. + + Asset order is controlled by the central sidebar file: + @livewireScripts + @fluxScripts +--}} +@include('layouts.app.sidebar') diff --git a/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php b/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php index 8e26723a..59ce0d3b 100644 --- a/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php +++ b/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php @@ -1,5 +1,9 @@ @props(['title' => null]) - - {{ $slot }} - +{{-- + Helpdesk compatibility component. + + Do not call from here: when Laravel resolves this component path first, + that creates an infinite component loop. Delegate directly to the central WMS layout instead. +--}} +@include('layouts.app.sidebar') diff --git a/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php b/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php index 90af9101..1e1eed30 100644 --- a/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php +++ b/Modules/Helpdesk/Resources/views/layouts/app/sidebar.blade.php @@ -1,1180 +1,3 @@ - - -@include('partials.head') - - - - - - - -
- - - - -
- ("layouts.partials.topbar") - -
- {{ $slot }} -
-
-
- -
- - - - @livewireScripts - @fluxScripts - - - - - +@include('layouts.app.sidebar') +@livewireScripts +@fluxScripts diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php index 215a6b0b..861707e2 100644 --- a/resources/views/components/layouts/app.blade.php +++ b/resources/views/components/layouts/app.blade.php @@ -1,1115 +1,7 @@ - - -@include('partials.head') +{{-- + Compatibility component for . - - - - - - -
- - - - -
- @include('layouts.partials.topbar') - -
- {{ $slot }} -
-
-
- - @fluxScripts - - - - - + The real WMS application/sidebar layout lives in resources/views/layouts/app/sidebar.blade.php. + Keep this file as a thin delegate only; do not duplicate sidebar markup here. +--}} +@include('layouts.app.sidebar') diff --git a/resources/views/components/layouts/sidebar.blade.php b/resources/views/components/layouts/sidebar.blade.php index e8ba6c06..e239b913 100644 --- a/resources/views/components/layouts/sidebar.blade.php +++ b/resources/views/components/layouts/sidebar.blade.php @@ -1,911 +1,7 @@ - - -@include('partials.head') +{{-- + Compatibility component for legacy references. - - - - - - @vite(['resources/css/app.css']) - -
- - - - -
- @include('layouts.partials.topbar') - -
- {{ $slot }} -
-
-
- -
- - - - @fluxScripts - - - - - + The real WMS application/sidebar layout lives in resources/views/layouts/app/sidebar.blade.php. + Keep this file as a thin delegate only; do not duplicate sidebar markup here. +--}} +@include('layouts.app.sidebar') diff --git a/resources/views/layouts/app/sidebar.blade.php b/resources/views/layouts/app/sidebar.blade.php index 45695eb2..225cc110 100644 --- a/resources/views/layouts/app/sidebar.blade.php +++ b/resources/views/layouts/app/sidebar.blade.php @@ -279,72 +279,6 @@ -
- - -
- @if (Route::has('warehouses.index')) - - - {{ __('Warehouses') }} - - @endif - - @if (Route::has('warehouse-rules.index')) - - - {{ __('Validation Rules') }} - - @endif - - @if (auth()->user()?->isMpbaPlatformAdmin() && Route::has('platform.prices.index')) - - - {{ __('Prices') }} - - @endif - - @if (Route::has('configuration.index')) - - - {{ __('Configuration') }} - - @endif - - @if (Route::has('security.index')) - - - {{ __('Security') }} - - @endif - - @if (Route::has('audit.index')) - - - {{ __('Audit') }} - - @endif -
-
- @if (auth()->user()?->isMpbaPlatformAdmin())
@endif @@ -541,6 +529,7 @@ document.addEventListener('livewire:navigated', showSessionToastsOnce); + @livewireScripts @fluxScripts