Gate Events-linked joins behind registration and badge check-in.
Deploy Ladill Meet / deploy (push) Successful in 43s
Deploy Ladill Meet / deploy (push) Successful in 43s
Attendees register or sign in with a badge before the display-name screen; email is no longer collected on the Meet join form. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -71,5 +71,72 @@ Alpine.data('leaveFeedback', () => ({
|
||||
},
|
||||
}));
|
||||
|
||||
Alpine.data('meetBadgeScanner', () => ({
|
||||
scanning: false,
|
||||
scanError: '',
|
||||
scanner: null,
|
||||
|
||||
toggle() {
|
||||
if (this.scanning) {
|
||||
this.stop();
|
||||
return;
|
||||
}
|
||||
|
||||
this.scanning = true;
|
||||
this.scanError = '';
|
||||
this.$nextTick(() => this.start());
|
||||
},
|
||||
|
||||
start() {
|
||||
if (typeof Html5Qrcode === 'undefined') {
|
||||
this.scanError = 'QR scanner could not load. Enter your badge code manually.';
|
||||
this.scanning = false;
|
||||
return;
|
||||
}
|
||||
|
||||
const el = document.getElementById('meet-badge-qr-reader');
|
||||
if (!el) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.scanner = new Html5Qrcode('meet-badge-qr-reader');
|
||||
this.scanner.start(
|
||||
{ facingMode: 'environment' },
|
||||
{ fps: 10, qrbox: { width: 220, height: 220 } },
|
||||
(decoded) => {
|
||||
const code = (decoded || '').trim().toUpperCase();
|
||||
if (!code) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.stop();
|
||||
const input = document.querySelector('input[name="badge_code"]');
|
||||
if (input) {
|
||||
input.value = code;
|
||||
}
|
||||
|
||||
input?.closest('form')?.requestSubmit();
|
||||
},
|
||||
() => {},
|
||||
).catch(() => {
|
||||
this.scanError = 'Camera access was denied or unavailable.';
|
||||
this.scanning = false;
|
||||
});
|
||||
},
|
||||
|
||||
stop() {
|
||||
if (!this.scanner) {
|
||||
this.scanning = false;
|
||||
return;
|
||||
}
|
||||
|
||||
this.scanner.stop().catch(() => {}).finally(() => {
|
||||
this.scanner.clear().catch(() => {});
|
||||
this.scanner = null;
|
||||
this.scanning = false;
|
||||
});
|
||||
},
|
||||
}));
|
||||
|
||||
window.Alpine = Alpine;
|
||||
Alpine.start();
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
<x-meet-kiosk-layout :title="'Register · '.$room->title" :organization="$organization">
|
||||
<div class="flex min-h-[calc(100vh-8rem)] flex-col items-center justify-center text-center">
|
||||
<div class="w-full max-w-lg">
|
||||
<h1 class="text-3xl font-bold tracking-tight text-slate-900 sm:text-4xl">{{ $room->title }}</h1>
|
||||
|
||||
@if ($eventTitle)
|
||||
<p class="mt-2 text-sm font-medium text-indigo-600">{{ $eventTitle }}</p>
|
||||
@endif
|
||||
|
||||
@if ($room->scheduled_at)
|
||||
<p class="mt-3 text-base text-slate-500">
|
||||
{{ $room->scheduled_at->timezone($room->timezone)->format('l, j F Y · g:i A T') }}
|
||||
</p>
|
||||
@endif
|
||||
|
||||
<p class="mt-6 text-sm leading-relaxed text-slate-600">
|
||||
Register for this event before joining the {{ $sessionNoun }}. Paid tickets must be completed before you can enter.
|
||||
</p>
|
||||
|
||||
@if ($errors->any())
|
||||
<div class="mt-6 rounded-2xl border border-red-200 bg-red-50 px-4 py-3 text-left text-sm text-red-700">
|
||||
{{ $errors->first() }}
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if ($registrationUrl)
|
||||
<a href="{{ $registrationUrl }}"
|
||||
class="btn-primary btn-primary-lg mt-8 inline-flex w-full items-center justify-center py-4 text-base font-semibold">
|
||||
Register for event
|
||||
</a>
|
||||
@else
|
||||
<p class="mt-8 rounded-2xl border border-amber-200 bg-amber-50 px-4 py-3 text-sm text-amber-800">
|
||||
Event registration is not available. Contact the organizer.
|
||||
</p>
|
||||
@endif
|
||||
|
||||
<div class="relative my-10">
|
||||
<div class="absolute inset-0 flex items-center" aria-hidden="true">
|
||||
<div class="w-full border-t border-slate-200"></div>
|
||||
</div>
|
||||
<div class="relative flex justify-center">
|
||||
<span class="bg-slate-100 px-3 text-sm font-medium text-slate-500">Already registered?</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form method="POST" action="{{ route('meet.join.verify-badge', $room) }}" class="text-left">
|
||||
@csrf
|
||||
|
||||
<label class="block text-sm font-medium text-slate-700">Badge code</label>
|
||||
<input type="text" name="badge_code" required placeholder="Enter your badge code"
|
||||
value="{{ old('badge_code') }}"
|
||||
autocomplete="off"
|
||||
class="mt-2 w-full rounded-2xl border-slate-200 bg-white px-4 py-3.5 font-mono uppercase tracking-widest text-slate-900 shadow-sm ring-1 ring-slate-200 placeholder:normal-case placeholder:tracking-normal placeholder:text-slate-400 focus:border-indigo-500 focus:ring-indigo-500">
|
||||
|
||||
<button type="submit" class="btn-primary mt-4 w-full py-3.5 text-sm font-semibold">
|
||||
Sign in with badge
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<div class="mt-6" x-data="meetBadgeScanner" x-cloak>
|
||||
<button type="button" @click="toggle()"
|
||||
class="w-full rounded-2xl border border-slate-200 bg-white px-4 py-3 text-sm font-medium text-slate-700 shadow-sm hover:bg-slate-50">
|
||||
<span x-text="scanning ? 'Stop scanning' : 'Scan badge QR code'"></span>
|
||||
</button>
|
||||
|
||||
<div x-show="scanning" class="mt-4 overflow-hidden rounded-2xl border border-slate-200 bg-black">
|
||||
<div id="meet-badge-qr-reader" class="w-full"></div>
|
||||
</div>
|
||||
|
||||
<p x-show="scanError" x-text="scanError" class="mt-3 text-left text-sm text-red-600"></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@push('head')
|
||||
<script src="https://unpkg.com/html5-qrcode@2.3.8/html5-qrcode.min.js"></script>
|
||||
@endpush
|
||||
</x-meet-kiosk-layout>
|
||||
@@ -1,7 +1,4 @@
|
||||
<x-meet-kiosk-layout :title="'Join · '.$room->title" :organization="$organization">
|
||||
@php
|
||||
$sessionNoun = $room->isConference() ? 'conference' : 'meeting';
|
||||
@endphp
|
||||
<div class="flex min-h-[calc(100vh-8rem)] flex-col items-center justify-center text-center">
|
||||
<div class="w-full max-w-lg">
|
||||
<h1 class="text-3xl font-bold tracking-tight text-slate-900 sm:text-4xl">{{ $room->title }}</h1>
|
||||
@@ -32,15 +29,8 @@
|
||||
@guest
|
||||
<label class="block text-sm font-medium text-slate-700">Your name</label>
|
||||
<input type="text" name="display_name" required placeholder="How should we show your name?"
|
||||
value="{{ old('display_name') }}"
|
||||
value="{{ old('display_name', $defaultDisplayName ?? '') }}"
|
||||
class="mt-2 w-full rounded-2xl border-slate-200 bg-white px-4 py-3.5 text-slate-900 shadow-sm ring-1 ring-slate-200 placeholder:text-slate-400 focus:border-indigo-500 focus:ring-indigo-500">
|
||||
|
||||
@if ($isWebinar ?? false)
|
||||
<label class="mt-4 block text-sm font-medium text-slate-700">Email</label>
|
||||
<input type="email" name="email" required placeholder="you@example.com"
|
||||
value="{{ old('email') }}"
|
||||
class="mt-2 w-full rounded-2xl border-slate-200 bg-white px-4 py-3.5 text-slate-900 shadow-sm ring-1 ring-slate-200 placeholder:text-slate-400 focus:border-indigo-500 focus:ring-indigo-500">
|
||||
@endif
|
||||
@endguest
|
||||
|
||||
@auth
|
||||
@@ -50,11 +40,11 @@
|
||||
@endauth
|
||||
|
||||
@if ($room->setting('waiting_room', true) && ! ($user && $user->ownerRef() === $room->host_user_ref))
|
||||
<p class="mt-4 text-xs text-slate-500">The host will admit you when the {{ $sessionNoun }} is ready.</p>
|
||||
<p class="mt-4 text-xs text-slate-500">The host will admit you when the {{ $sessionNoun ?? 'session' }} is ready.</p>
|
||||
@endif
|
||||
|
||||
<button type="submit" class="btn-primary btn-primary-lg mt-8 w-full py-4 text-base font-semibold">
|
||||
Join {{ $sessionNoun }}
|
||||
Join {{ $sessionNoun ?? 'session' }}
|
||||
</button>
|
||||
</form>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user