From 5e37d6103c2be1ba5079c294190160bf33ce6657 Mon Sep 17 00:00:00 2001 From: isaacclad Date: Tue, 23 Jun 2026 18:15:15 +0000 Subject: [PATCH] Standardize desktop topbar widgets to match CRM layout. Co-authored-by: Cursor --- .../topbar-account-switcher.blade.php | 24 + .../partials/topbar-desktop-widgets.blade.php | 44 ++ resources/views/partials/topbar-qr.blade.php | 125 +----- .../partials/topbar-widgets-append.blade.php | 7 + .../partials/topbar-widgets-mid.blade.php | 10 + resources/views/partials/topbar.blade.php | 423 +----------------- 6 files changed, 104 insertions(+), 529 deletions(-) create mode 100644 resources/views/partials/topbar-account-switcher.blade.php create mode 100644 resources/views/partials/topbar-desktop-widgets.blade.php create mode 100644 resources/views/partials/topbar-widgets-append.blade.php create mode 100644 resources/views/partials/topbar-widgets-mid.blade.php diff --git a/resources/views/partials/topbar-account-switcher.blade.php b/resources/views/partials/topbar-account-switcher.blade.php new file mode 100644 index 0000000..dfcaf02 --- /dev/null +++ b/resources/views/partials/topbar-account-switcher.blade.php @@ -0,0 +1,24 @@ +{{-- Account switcher (desktop) — only when the user belongs to more than one account. --}} +@if (isset($accessibleAccounts) && $accessibleAccounts->count() > 1) + +@endif diff --git a/resources/views/partials/topbar-desktop-widgets.blade.php b/resources/views/partials/topbar-desktop-widgets.blade.php new file mode 100644 index 0000000..bb1eca5 --- /dev/null +++ b/resources/views/partials/topbar-desktop-widgets.blade.php @@ -0,0 +1,44 @@ +{{-- + Standard desktop top-right widgets (CRM / Invoice layout): + Afia → notifications → launcher → divider → avatar dropdown. +--}} +@php + $topbarUser = $user ?? auth()->user(); + $initials = collect(explode(' ', trim((string) $topbarUser?->name))) + ->filter()->take(2)->map(fn ($p) => strtoupper(substr($p, 0, 1)))->implode(''); + $avatarUrl = $topbarUser && method_exists($topbarUser, 'avatarUrl') + ? $topbarUser->avatarUrl() + : ($topbarUser?->avatar_url ?? null); + $showUserHeader = $showUser ?? true; +@endphp + +@includeIf('partials.afia-button', ['compact' => true]) + +@includeIf('partials.notification-dropdown') + +@include('partials.launcher') + +@includeIf('partials.topbar-widgets-mid') + + + +
+ + +
+ @include('partials.user-profile-menu', [ + 'items' => \App\Support\UserProfileMenu::items($topbarUser), + 'user' => $topbarUser, + 'showUser' => $showUserHeader, + ]) +
+
diff --git a/resources/views/partials/topbar-qr.blade.php b/resources/views/partials/topbar-qr.blade.php index 8fc872a..be5c790 100644 --- a/resources/views/partials/topbar-qr.blade.php +++ b/resources/views/partials/topbar-qr.blade.php @@ -61,124 +61,15 @@ -
- @if (isset($accessibleAccounts) && $accessibleAccounts->count() > 1) - - @endif - - - - +
@auth - @include('partials.afia-button', ['compact' => true]) + @includeIf('partials.topbar-account-switcher') + @includeIf('partials.topbar-widgets-prepend') + @include('partials.topbar-desktop-widgets', ['user' => $user ?? $u ?? auth()->user(), 'showUser' => true]) + @includeIf('partials.topbar-widgets-append') + @else + Sign in + @include('partials.launcher') @endauth - - @include('partials.launcher')
diff --git a/resources/views/partials/topbar-widgets-append.blade.php b/resources/views/partials/topbar-widgets-append.blade.php new file mode 100644 index 0000000..7b28c07 --- /dev/null +++ b/resources/views/partials/topbar-widgets-append.blade.php @@ -0,0 +1,7 @@ +{{-- Mobile cart icon (after avatar controls). --}} +@if (! empty($cartRoute)) + @include('partials.mobile-header-cart', [ + 'cartUrl' => $cartRoute, + 'cartCount' => $cartCount ?? 0, + ]) +@endif diff --git a/resources/views/partials/topbar-widgets-mid.blade.php b/resources/views/partials/topbar-widgets-mid.blade.php new file mode 100644 index 0000000..311cbc4 --- /dev/null +++ b/resources/views/partials/topbar-widgets-mid.blade.php @@ -0,0 +1,10 @@ +{{-- Desktop cart pill (between launcher and avatar divider). --}} +@if (! empty($cartRoute)) + +@endif diff --git a/resources/views/partials/topbar.blade.php b/resources/views/partials/topbar.blade.php index a0ae239..bcad33b 100644 --- a/resources/views/partials/topbar.blade.php +++ b/resources/views/partials/topbar.blade.php @@ -36,12 +36,7 @@ @endphp
+ >
-
- - - - - - - - - @include('partials.mobile-header-cart', [ - 'cartUrl' => $cartRoute, - 'cartCount' => $cartCount, - ]) - - - - {{-- All-apps launcher (shared, config-driven; see resources/views/partials/launcher) --}} - @include('partials.launcher') +
+ @auth + @includeIf('partials.topbar-account-switcher') + @includeIf('partials.topbar-widgets-prepend') + @include('partials.topbar-desktop-widgets', ['user' => $user ?? $u ?? auth()->user(), 'showUser' => true]) + @includeIf('partials.topbar-widgets-append') + @else + Sign in + @include('partials.launcher') + @endauth
- - {{-- Afia backdrop --}} - - - {{-- Afia slide-over panel --}} -