diff --git a/resources/views/layouts/user.blade.php b/resources/views/layouts/user.blade.php index 86fc419..982c204 100644 --- a/resources/views/layouts/user.blade.php +++ b/resources/views/layouts/user.blade.php @@ -1,42 +1,9 @@ @php - $mobileFullScreenPage = request()->routeIs('user.search') - || request()->routeIs('user.products.cart') - || request()->routeIs('user.domains.cart') - || request()->routeIs('user.domains.checkout') - || request()->routeIs('user.products.checkout') - || request()->routeIs('user.products.order') - || request()->routeIs('profile.edit') - || request()->routeIs('account.settings') + $mobileFullScreenPage = request()->routeIs('account.settings') || request()->routeIs('user.qr-codes.create') || request()->routeIs('user.qr-codes.show'); $qrMobilePage = request()->routeIs('user.qr-codes.create') || request()->routeIs('user.qr-codes.show'); - - $mobileCartCount = 0; - $mobileCartRoute = route('user.products.cart'); - if (auth()->check()) { - $mobileProductCartCount = \App\Models\RcServiceOrder::query() - ->where('user_id', auth()->id()) - ->whereIn('status', [ - \App\Models\RcServiceOrder::STATUS_CART, - \App\Models\RcServiceOrder::STATUS_PENDING_PAYMENT, - ]) - ->count(); - - $mobileDomainCartCount = \App\Models\DomainOrder::query() - ->where('user_id', auth()->id()) - ->whereIn('status', [ - \App\Models\DomainOrder::STATUS_CART, - \App\Models\DomainOrder::STATUS_PENDING_PAYMENT, - ]) - ->count(); - - $mobileCartCount = $mobileProductCartCount + $mobileDomainCartCount; - - if ($mobileProductCartCount === 0 && $mobileDomainCartCount > 0) { - $mobileCartRoute = route('user.domains.cart'); - } - } @endphp $qrMobilePage])> @@ -66,7 +33,7 @@ {{-- Main content --}}
- @include('partials.topbar') + @include('partials.topbar-qr')
$mobileFullScreenPage, ])> @include('partials.flash') - @include('partials.mailbox-link-banner')
route('qr.dashboard'), 'homeActive' => request()->routeIs('qr.dashboard'), - 'searchUrl' => route('user.search'), - 'searchActive' => request()->routeIs('user.search'), - 'notificationsUrl' => route('user.notifications.index'), - 'notificationsActive' => request()->routeIs('user.notifications.*'), - 'unreadUrl' => route('user.notifications.unread'), - 'profileActive' => request()->routeIs('profile.edit') || request()->routeIs('account.settings'), + 'searchUrl' => route('user.qr-codes.index'), + 'searchActive' => request()->routeIs('user.qr-codes.*'), + 'notificationsUrl' => route('notifications.index'), + 'notificationsActive' => request()->routeIs('notifications.*'), + 'unreadUrl' => route('notifications.unread'), + 'profileActive' => request()->routeIs('account.settings'), 'profileName' => $navUser?->name ?? '', 'profileSubtitle' => $navUser?->email ?? '', 'profileMenuItems' => [ - ['type' => 'link', 'label' => 'Profile', 'href' => route('profile.edit')], ['type' => 'link', 'label' => 'Account Settings', 'href' => route('account.settings')], ['type' => 'link', 'label' => 'Overview', 'href' => route('qr.dashboard')], ['type' => 'logout', 'label' => 'Logout', 'action' => route('logout')], diff --git a/resources/views/partials/topbar-qr.blade.php b/resources/views/partials/topbar-qr.blade.php new file mode 100644 index 0000000..350392d --- /dev/null +++ b/resources/views/partials/topbar-qr.blade.php @@ -0,0 +1,116 @@ +@php + $user = auth()->user(); + $initials = collect(explode(' ', trim((string) $user?->name))) + ->filter() + ->take(2) + ->map(fn ($part) => strtoupper(substr($part, 0, 1))) + ->implode(''); +@endphp + +
+
+ +

Ladill QR Plus

+
+ +
+ + + + + @include('partials.launcher') +
+