diff --git a/app/Http/Controllers/Qms/DisplayPublicController.php b/app/Http/Controllers/Qms/DisplayPublicController.php index cb6b71d..0382bee 100644 --- a/app/Http/Controllers/Qms/DisplayPublicController.php +++ b/app/Http/Controllers/Qms/DisplayPublicController.php @@ -6,6 +6,7 @@ use App\Http\Controllers\Controller; use App\Models\VoiceAnnouncement; use App\Services\Qms\DisplayService; use App\Services\Qms\VoiceAnnouncementService; +use App\Support\OrganizationBranding; use Illuminate\Http\JsonResponse; use Illuminate\View\View; @@ -23,6 +24,7 @@ class DisplayPublicController extends Controller $this->displays->touch($screen); $payload = $this->displays->payload($screen); + $organization = $screen->organization; return view('qms.display.public', [ 'screen' => $screen, @@ -30,6 +32,12 @@ class DisplayPublicController extends Controller 'dataUrl' => '/display/'.$token.'/data', 'playedUrl' => '/display/'.$token.'/announcements/__ID__/played', 'pollMs' => config('qms.display_poll_ms', 1200), + 'logoUrl' => $organization + ? OrganizationBranding::logoUrl($organization) + : asset(OrganizationBranding::DEFAULT_LOGO), + 'logoAlt' => $organization + ? OrganizationBranding::logoAlt($organization) + : 'Ladill Queue', ]); } diff --git a/resources/css/app.css b/resources/css/app.css index cb0d870..52e0eec 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -268,39 +268,34 @@ html.qr-mobile-page body { pointer-events: none; } -/* Public queue display — waiting-area TV screens */ +/* Public queue display — waiting-area TV screens (light theme) */ .qms-display { min-height: 100vh; background: - radial-gradient(ellipse 80% 50% at 50% -10%, rgb(49 46 129 / 0.45), transparent), - linear-gradient(180deg, rgb(15 23 42) 0%, rgb(2 6 23) 100%); - color: #fff; + radial-gradient(ellipse 90% 60% at 50% -20%, rgb(238 242 255 / 0.9), transparent), + linear-gradient(180deg, rgb(248 250 252) 0%, rgb(255 255 255) 100%); + color: rgb(15 23 42); } .qms-display__grid-bg { background-image: - linear-gradient(rgb(255 255 255 / 0.03) 1px, transparent 1px), - linear-gradient(90deg, rgb(255 255 255 / 0.03) 1px, transparent 1px); + linear-gradient(rgb(148 163 184 / 0.08) 1px, transparent 1px), + linear-gradient(90deg, rgb(148 163 184 / 0.08) 1px, transparent 1px); background-size: 48px 48px; } .qms-display__ticket { - background: linear-gradient(145deg, rgb(67 56 202) 0%, rgb(79 70 229) 45%, rgb(99 102 241) 100%); + background: linear-gradient(180deg, #fff 0%, rgb(248 250 252) 100%); + border: 1px solid rgb(226 232 240); box-shadow: - 0 0 0 1px rgb(255 255 255 / 0.08), - 0 20px 40px -12px rgb(0 0 0 / 0.45); + 0 1px 2px rgb(15 23 42 / 0.04), + 0 20px 40px -16px rgb(79 70 229 / 0.15); } .qms-display__ticket-number { font-variant-numeric: tabular-nums; letter-spacing: -0.04em; - text-shadow: 0 2px 16px rgb(0 0 0 / 0.25); -} - -.qms-display__stat { - background: rgb(255 255 255 / 0.04); - border: 1px solid rgb(255 255 255 / 0.08); - backdrop-filter: blur(8px); + color: rgb(67 56 202); } .qms-display__live-dot { @@ -314,6 +309,6 @@ html.qr-mobile-page body { .qms-display__unlock { background: - radial-gradient(ellipse 60% 40% at 50% 0%, rgb(79 70 229 / 0.35), transparent), - rgb(2 6 23 / 0.96); + radial-gradient(ellipse 60% 40% at 50% 0%, rgb(199 210 254 / 0.5), transparent), + rgb(255 255 255 / 0.97); } diff --git a/resources/views/qms/display/public.blade.php b/resources/views/qms/display/public.blade.php index c6f2a0b..2c0f434 100644 --- a/resources/views/qms/display/public.blade.php +++ b/resources/views/qms/display/public.blade.php @@ -1,18 +1,15 @@ -@php - $p = $initialPayload; -@endphp - + - + {{ $screen->name }} · Queue Display @vite(['resources/css/app.css', 'resources/js/app.js']) -
-
-
+
+
-

Tap to enable announcements

-

Your browser needs one interaction before this screen can call tickets aloud.

+

Tap to enable announcements

+

Your browser needs one interaction before this screen can call tickets aloud.

- {{-- Header --}} -
-
-
-

- {{ $p['screen']['organization_name'] ?? $screen->organization?->name ?? 'Queue display' }} -

-

- {{ $p['screen']['name'] ?? $screen->name }} -

- @if (! empty($p['screen']['branch_name'])) -

{{ $p['screen']['branch_name'] }}

- @endif +
+
+
+ {{ $logoAlt }}
-
- +
+ Live
-

--:--

-

+

--:--

+

- {{-- Main --}} -
- {{-- Now serving --}} -
-
-
-

Now serving

-

Please proceed to your counter when called

-
+
+
+
+

Now serving

+

Please proceed to your counter when your number appears

-
+
-
- -
-

Please wait

-

Your ticket number will appear here when it is called.

+
+
+

Please wait

+

Your ticket number will appear here when it is called.

+
- - {{-- Stats sidebar --}} -
- {{-- Footer --}} -