From cf3dceb994cfa1347d52d65f98591cde4733b02c Mon Sep 17 00:00:00 2001 From: Mark Gregory Date: Thu, 18 Jun 2026 12:30:16 +0100 Subject: [PATCH] fixed system --- .../views/components/layouts/app.blade.php | 947 +----------------- Modules/Helpdesk/changelog.yaml | 7 + Modules/Helpdesk/module.json | 2 +- .../resources/views/dashboard/index.blade.php | 31 +- resources/css/app.css | 29 + .../views/layouts/partials/topbar.blade.php | 62 +- 6 files changed, 107 insertions(+), 971 deletions(-) diff --git a/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php b/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php index 164ea198..8e26723a 100644 --- a/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php +++ b/Modules/Helpdesk/Resources/views/components/layouts/app.blade.php @@ -1,944 +1,5 @@ - - -@include('partials.head') +@props(['title' => null]) - - - - - -
- - - - -
- ("layouts.partials.topbar") - -
- {{ $slot }} -
-
-
- -@fluxScripts - - - - + + {{ $slot }} + diff --git a/Modules/Helpdesk/changelog.yaml b/Modules/Helpdesk/changelog.yaml index 3f55c96f..8f79d47d 100644 --- a/Modules/Helpdesk/changelog.yaml +++ b/Modules/Helpdesk/changelog.yaml @@ -380,3 +380,10 @@ versions: - Added browser coverage to keep Helpdesk settings free of direct Tickets and Kanban shortcut links. - Kept module.json version in sync with changelog.yaml. + +- version: 1.9.25 + date: 2026-06-18 + changed: + - Replaced the duplicated Helpdesk application shell with the shared application layout so Helpdesk uses the same mobile navigation and top bar as the rest of WMS. + - Preserved the existing Helpdesk views while centralising the layout surface to reduce future mobile regressions. + - Kept module.json version in sync with changelog.yaml. diff --git a/Modules/Helpdesk/module.json b/Modules/Helpdesk/module.json index e1a97b1a..85ed1a24 100644 --- a/Modules/Helpdesk/module.json +++ b/Modules/Helpdesk/module.json @@ -22,5 +22,5 @@ "Modules\\Helpdesk\\Providers\\HelpdeskServiceProvider" ], "files": [], - "version": "1.9.24" + "version": "1.9.25" } diff --git a/Modules/Platform/resources/views/dashboard/index.blade.php b/Modules/Platform/resources/views/dashboard/index.blade.php index 20425a45..92ce0d12 100644 --- a/Modules/Platform/resources/views/dashboard/index.blade.php +++ b/Modules/Platform/resources/views/dashboard/index.blade.php @@ -1,5 +1,5 @@ -
+
-
+
@foreach ([['Companies', $companiesCount], ['Active', $activeCompaniesCount], ['Warehouses', $warehousesCount], ['Prices', $pricesCount], ['Licences', $licensesCount]] as [$label, $value])

{{ $label }}

@@ -20,8 +20,8 @@ @endforeach
-
-
+
+

Tenant usage

@@ -34,8 +34,9 @@
-
+
-
+

Platform mix

@@ -56,8 +57,9 @@
-
+
-
+

Company status

@@ -78,8 +80,9 @@
-
+
-
+

Pricing

@@ -123,9 +126,9 @@
-
+
@foreach ($prices as $price) -
+

@@ -164,8 +167,8 @@

-
-
+
+

Administration

diff --git a/resources/css/app.css b/resources/css/app.css index 60879e10..3998ef43 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -930,3 +930,32 @@ select:focus[data-flux-control] { } } } + +@layer components { + .wms-content, + .wms-main-panel, + .wms-app-shell { + min-width: 0; + } + + .wms-content canvas { + max-width: 100%; + } + + @media (max-width: 1023px) { + .wms-content { + width: 100%; + max-width: 100vw; + overflow-x: hidden; + padding-inline: 0.875rem; + } + + .wms-page-hero { + max-width: 100%; + } + + .wms-sidebar-nav { + -webkit-overflow-scrolling: touch; + } + } +} diff --git a/resources/views/layouts/partials/topbar.blade.php b/resources/views/layouts/partials/topbar.blade.php index 024bc7bd..89d2f4a1 100644 --- a/resources/views/layouts/partials/topbar.blade.php +++ b/resources/views/layouts/partials/topbar.blade.php @@ -1,4 +1,4 @@ -{{-- Top Menu Bar --}} +{{-- Shared Application Top Bar --}} @php $user = auth()->user(); $dashboardRoute = Route::has('platform.dashboard') && method_exists($user, 'isMpbaPlatformAdmin') && $user?->isMpbaPlatformAdmin() @@ -7,23 +7,58 @@ @endphp