diff --git a/src/app.css b/src/app.css index 97f54b0..f173aa4 100644 --- a/src/app.css +++ b/src/app.css @@ -1,5 +1 @@ -@import 'tailwindcss'; - -body { - font-family: "Roboto", sans-serif; -} \ No newline at end of file +@import 'tailwindcss'; \ No newline at end of file diff --git a/src/app.html b/src/app.html index 77a5ff5..d2d0706 100644 --- a/src/app.html +++ b/src/app.html @@ -10,3 +10,11 @@
%sveltekit.body%
+ + + \ No newline at end of file diff --git a/src/routes/auth/+page.server.ts b/src/routes/auth/+page.server.ts index 57908d2..39c04e2 100644 --- a/src/routes/auth/+page.server.ts +++ b/src/routes/auth/+page.server.ts @@ -7,8 +7,17 @@ export const actions: Actions = { const formData = await request.formData() const email = formData.get('email') as string const password = formData.get('password') as string + const display_name = formData.get('display_name') as string - const { error } = await supabase.auth.signUp({ email, password }) + const { error } = await supabase.auth.signUp({ + email, + password, + options: { + data: { + display_name: display_name + } + } + }); if (error) { console.error(error) redirect(303, '/auth/error') diff --git a/src/routes/auth/+page.svelte b/src/routes/auth/+page.svelte index cded2fe..3da7d61 100644 --- a/src/routes/auth/+page.svelte +++ b/src/routes/auth/+page.svelte @@ -7,6 +7,10 @@ Password + \ No newline at end of file diff --git a/src/routes/private/scanner/+page.svelte b/src/routes/private/scanner/+page.svelte index b03a903..12c0e9c 100644 --- a/src/routes/private/scanner/+page.svelte +++ b/src/routes/private/scanner/+page.svelte @@ -15,10 +15,17 @@ console.log('New QR code found:', scanned_id); scan_state = ScanState.scanning; - data.supabase.from('qrcodes').select().eq('id', scanned_id).then( response => { + data.supabase + .from('qrcodes') + .select(`*, event ( id, name ), scanned_by ( id, display_name )`) + .eq('id', scanned_id) + .then( response => { if (response.data && response.data.length > 0) { ticket_data = response.data[0]; scan_state = ScanState.scan_successful; + data.supabase.rpc('scan_ticket', { _ticket_id: scanned_id}) + console.log(scanned_id) + console.log(response.data[0]); } else { ticket_data = defaultTicketData; scan_state = ScanState.scan_failed; @@ -27,22 +34,6 @@ }); - - -{#if scan_state === ScanState.scan_successful} - -{/if} - -{#if scan_state === ScanState.scan_failed} -

Scan failed. Please try again.

-{/if} - -{#if scan_state === ScanState.scanning} -

Fetching data...

-{/if} + diff --git a/src/routes/private/scanner/TicketDisplay.svelte b/src/routes/private/scanner/TicketDisplay.svelte index 5d360b1..8e2dc00 100644 --- a/src/routes/private/scanner/TicketDisplay.svelte +++ b/src/routes/private/scanner/TicketDisplay.svelte @@ -1,14 +1,24 @@ -

{ticket_data.name}

-

{ticket_data.surname}

+{#if scan_state === ScanState.scanning} +

Waiting for data...

- \ No newline at end of file +{:else if scan_state === ScanState.scan_failed} +

Scan failed. Please try again.

+ +{:else if scan_state === ScanState.scan_successful} + {#if ticket_data.scanned} +

Ticket already scanned!

+

By {ticket_data.scanned_by} at {ticket_data.scanned_at}

+ {:else} +

Scan successful!

+
    +
  1. {ticket_data.name} {ticket_data.surname}
  2. +
+ {/if} +{/if} \ No newline at end of file