From e23955f32607184536eb320a5da0a7abac5e53c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Kr=C4=8Dek?= Date: Sat, 28 Jun 2025 00:52:01 +0200 Subject: [PATCH 1/9] Remove leftover debugging code --- .../private/events/creator/+page.svelte | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/routes/private/events/creator/+page.svelte b/src/routes/private/events/creator/+page.svelte index fd4af95..e82c77c 100644 --- a/src/routes/private/events/creator/+page.svelte +++ b/src/routes/private/events/creator/+page.svelte @@ -32,20 +32,12 @@ let step: number = $state(0); - // let stepConditions = $derived([ - // authorized, - // !!new_event?.name, - // !!participants?.length, - // !!subject && !!body - // ]); - - // for debugging purpouses - let stepConditions = [ - true, - true, - true, - true - ]; + let stepConditions = $derived([ + authorized, + !!event?.name, + !!participants?.length, + !!email.subject + ]); function nextStep() { if (step < steps.length - 1) step += 1; -- 2.49.1 From 48cfe901a0bb7ecba6af832ccd35899bb8a71b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Kr=C4=8Dek?= Date: Sat, 28 Jun 2025 00:52:14 +0200 Subject: [PATCH 2/9] Fix terminology on the final page --- src/routes/private/events/creator/finish/+page.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/private/events/creator/finish/+page.svelte b/src/routes/private/events/creator/finish/+page.svelte index c940fab..2d0a95a 100644 --- a/src/routes/private/events/creator/finish/+page.svelte +++ b/src/routes/private/events/creator/finish/+page.svelte @@ -155,15 +155,15 @@
-

Creating database entries

+

Creating QR codes for participants

{#if participants_status === StepStatus.Waiting} Waiting... {:else if participants_status === StepStatus.Loading} Creating entries... {:else if participants_status === StepStatus.Success} - Database entries created successfully. + QR codes created successfully. {:else if participants_status === StepStatus.Failure} - Failed to create database entries. + Failed to create QR codes. {/if}
-- 2.49.1 From 5e3804edbcfeea1a8cfcf4559e768d19f420fb3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Kr=C4=8Dek?= Date: Sun, 29 Jun 2025 14:40:04 +0200 Subject: [PATCH 3/9] Add service worker --- src/service-worker.ts | 84 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 src/service-worker.ts diff --git a/src/service-worker.ts b/src/service-worker.ts new file mode 100644 index 0000000..2f88ac4 --- /dev/null +++ b/src/service-worker.ts @@ -0,0 +1,84 @@ +/// +import { build, files, version } from '$service-worker'; + +// Create a unique cache name for this deployment +const CACHE = `cache-${version}`; + +console.log("Service worker is live!") + +const ASSETS = [ + ...build, // the app itself + ...files // everything in `static` +]; + +self.addEventListener('install', (event) => { + // Create a new cache and add all files to it + async function addFilesToCache() { + const cache = await caches.open(CACHE); + await cache.addAll(ASSETS); + } + + event.waitUntil(addFilesToCache()); + + console.log("Service worker is live!") +}); + +self.addEventListener('activate', (event) => { + // Remove previous cached data from disk + async function deleteOldCaches() { + for (const key of await caches.keys()) { + if (key !== CACHE) await caches.delete(key); + } + } + + event.waitUntil(deleteOldCaches()); +}); + +self.addEventListener('fetch', (event) => { + // ignore POST requests etc + if (event.request.method !== 'GET') return; + + async function respond() { + const url = new URL(event.request.url); + const cache = await caches.open(CACHE); + + // `build`/`files` can always be served from the cache + if (ASSETS.includes(url.pathname)) { + const response = await cache.match(url.pathname); + + if (response) { + return response; + } + } + + // for everything else, try the network first, but + // fall back to the cache if we're offline + try { + const response = await fetch(event.request); + + // if we're offline, fetch can return a value that is not a Response + // instead of throwing - and we can't pass this non-Response to respondWith + if (!(response instanceof Response)) { + throw new Error('invalid response from fetch'); + } + + if (response.status === 200) { + cache.put(event.request, response.clone()); + } + + return response; + } catch (err) { + const response = await cache.match(event.request); + + if (response) { + return response; + } + + // if there's no cache, then just error out + // as there is nothing we can do to respond to this request + throw err; + } + } + + event.respondWith(respond()); +}); \ No newline at end of file -- 2.49.1 From cf854f124298733fec8dbd6a60c7ceeb37a487be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Kr=C4=8Dek?= Date: Sun, 29 Jun 2025 15:06:30 +0200 Subject: [PATCH 4/9] Better previewes for creator --- .../creator/steps/StepCraftEmail.svelte | 13 +- .../creator/steps/StepCreateEvent.svelte | 22 +--- .../steps/StepUploadParticipants.svelte | 120 +++++++++++++----- 3 files changed, 106 insertions(+), 49 deletions(-) diff --git a/src/routes/private/events/creator/steps/StepCraftEmail.svelte b/src/routes/private/events/creator/steps/StepCraftEmail.svelte index bd914c0..32c878c 100644 --- a/src/routes/private/events/creator/steps/StepCraftEmail.svelte +++ b/src/routes/private/events/creator/steps/StepCraftEmail.svelte @@ -57,10 +57,13 @@ > Edit email -
-
    -
  1. {email.subject}
    2. -
  2. {email.body}
    3. -
+
+

Email Preview

+
+ {email.subject} +
+
+ {email.body} +
{/if} \ No newline at end of file diff --git a/src/routes/private/events/creator/steps/StepCreateEvent.svelte b/src/routes/private/events/creator/steps/StepCreateEvent.svelte index 8730dd7..7d69dc5 100644 --- a/src/routes/private/events/creator/steps/StepCreateEvent.svelte +++ b/src/routes/private/events/creator/steps/StepCreateEvent.svelte @@ -66,21 +66,13 @@ > Edit the event -{/if} - -{#if !showForm} -
- {#if loading} - Loading... - {:else if Object.keys(event).length > 0} -
    -
  1. {event.name}
    2. -
  2. {event.date}
    3. -
+
+

Event Preview

+ {#if Object.keys(event).length > 0} +
    +
  • {event.name}
    • +
  • {event.date}
    • +
{:else} No event created yet... {/if} diff --git a/src/routes/private/events/creator/steps/StepUploadParticipants.svelte b/src/routes/private/events/creator/steps/StepUploadParticipants.svelte index 70e9e4f..ac8cf52 100644 --- a/src/routes/private/events/creator/steps/StepUploadParticipants.svelte +++ b/src/routes/private/events/creator/steps/StepUploadParticipants.svelte @@ -2,19 +2,20 @@ import Papa from 'papaparse'; let { participants = $bindable() } = $props(); - let loading = $state(false); let showForm = $derived(participants.length === 0); + let errors = $state([]); + + function isValidEmail(email: string): boolean { + return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email); + } async function handleSubmit(e: Event) { e.preventDefault(); - loading = true; + errors = []; const form = e.target as HTMLFormElement; const fileInput = form.elements.namedItem('participants') as HTMLInputElement; const file = fileInput?.files?.[0]; - if (!file) { - loading = false; - return; - } + if (!file) return; const csvText = await file.text(); const { data: parsedRows } = Papa.parse(csvText, { skipEmptyLines: true, @@ -24,13 +25,36 @@ if (parsedRows.length > 0) { parsedRows.shift(); } - participants = parsedRows.map((row: string[]) => ({ - name: row[0], - surname: row[1], - email: row[2] - })); + const validated = []; + parsedRows.forEach((row, idx) => { + if (!row || row.length < 3) { + errors.push(`Row ${idx + 2} is missing columns.`); + return; + } + const [name, surname, email] = row; + if (!name || !surname || !email) { + errors.push(`Row ${idx + 2} has missing values.`); + return; + } + validated.push({ + name, + surname, + email, + email_valid: isValidEmail(email) + }); + }); + if (errors.length > 0) { + return; // Do not proceed if there are errors + } + if (validated.length === 0) { + participants = []; + return; + } + participants = validated.sort((a, b) => { + if (a.email_valid === b.email_valid) return 0; + return a.email_valid ? 1 : -1; + }); showForm = false; - loading = false; } function showEditForm() { @@ -39,6 +63,15 @@ {#if showForm} + {#if errors.length > 0} +
+
    + {#each errors as err} +
  • {err}
    • + {/each} +
+
+ {/if}
- {#if loading} - Loading... - {:else if participants.length === 0} - No participants yet... - {:else} -
    - {#each participants as p, i} -
  • -
    -
    {p.name} {p.surname}
    -
    {p.email}
    -
    -
    • - {/each} -
- {/if} +
+
+

Participants ({participants.length})

+ {#if participants.length > 0} + {#if participants.some((p) => !p.email_valid)} + Some emails appear invalid + {:else} + All emails appear valid + {/if} + {/if} +
+ +
    + {#each participants as p} +
  • + {#if p.email_valid} + + + + {:else} + + + + + + {/if} + {p.name} {p.surname} + + {p.email} +
    • + {/each} +
{/if} -- 2.49.1 From 61018b2326b8be42f155ff49ec04432a9212a95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Kr=C4=8Dek?= Date: Sun, 29 Jun 2025 15:06:58 +0200 Subject: [PATCH 5/9] Remove leftover debugging code from service-worker --- src/service-worker.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/service-worker.ts b/src/service-worker.ts index 2f88ac4..935445d 100644 --- a/src/service-worker.ts +++ b/src/service-worker.ts @@ -4,8 +4,6 @@ import { build, files, version } from '$service-worker'; // Create a unique cache name for this deployment const CACHE = `cache-${version}`; -console.log("Service worker is live!") - const ASSETS = [ ...build, // the app itself ...files // everything in `static` @@ -19,8 +17,6 @@ self.addEventListener('install', (event) => { } event.waitUntil(addFilesToCache()); - - console.log("Service worker is live!") }); self.addEventListener('activate', (event) => { -- 2.49.1 From 1e8d5941edfe6d324b97982951656143698174e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Kr=C4=8Dek?= Date: Sun, 29 Jun 2025 16:01:54 +0200 Subject: [PATCH 6/9] Add warning to users --- src/routes/private/events/creator/finish/+page.svelte | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/routes/private/events/creator/finish/+page.svelte b/src/routes/private/events/creator/finish/+page.svelte index 2d0a95a..64dcda3 100644 --- a/src/routes/private/events/creator/finish/+page.svelte +++ b/src/routes/private/events/creator/finish/+page.svelte @@ -169,7 +169,8 @@
-

Sending emails

+

Sending emails

+

After pressing send, you must not exit this window until the mail are all sent!

{#if email_status === StepStatus.Waiting}
Waiting... @@ -179,7 +180,7 @@ class="ml-4 px-6 py-2 rounded font-semibold transition disabled:opacity-50 disabled:cursor-not-allowed {event_status === StepStatus.Success && participants_status === StepStatus.Success ? 'bg-blue-600 hover:bg-blue-700 text-white' : 'bg-gray-400 text-white'}" > - Launch Mail Campaign + Send all emails
{:else} -- 2.49.1 From c7275b7ae84686aa75a66a7a74f68077e5e8b56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Kr=C4=8Dek?= Date: Sun, 29 Jun 2025 16:38:37 +0200 Subject: [PATCH 7/9] Added support for archived past events --- src/routes/private/events/+page.svelte | 25 ++++--- src/routes/private/events/SingleEvent.svelte | 19 +++++ .../private/events/archived/+page.svelte | 75 +++++++++++++++++++ 3 files changed, 109 insertions(+), 10 deletions(-) create mode 100644 src/routes/private/events/SingleEvent.svelte create mode 100644 src/routes/private/events/archived/+page.svelte diff --git a/src/routes/private/events/+page.svelte b/src/routes/private/events/+page.svelte index 155002e..47dc1f6 100644 --- a/src/routes/private/events/+page.svelte +++ b/src/routes/private/events/+page.svelte @@ -1,16 +1,26 @@ @@ -28,15 +38,10 @@ {/each} {:else} {#each events as event} - -
- {event.name} - {event.date} -
- + + {/each} + {#each archived_events as event} + {/each} {/if}
diff --git a/src/routes/private/events/SingleEvent.svelte b/src/routes/private/events/SingleEvent.svelte new file mode 100644 index 0000000..ef08e73 --- /dev/null +++ b/src/routes/private/events/SingleEvent.svelte @@ -0,0 +1,19 @@ + + + +
+ + {#if archived} + + {/if} + {name} + + {date} +
+ \ No newline at end of file diff --git a/src/routes/private/events/archived/+page.svelte b/src/routes/private/events/archived/+page.svelte new file mode 100644 index 0000000..e309c53 --- /dev/null +++ b/src/routes/private/events/archived/+page.svelte @@ -0,0 +1,75 @@ + + +

Archived Event Overview

+ +
+
+ {#if loading} +
+
+ {:else} + {event_data?.name} + {event_data?.date} + {/if} +
+
+ +
+
+ + + + {#if loading} +
+ {:else} + Total participants ({event_data?.total_participants}) + {/if} +
+
+
+ + + + {#if loading} +
+ {:else} + Scanned participants ({event_data?.scanned_participants}) + {/if} +
+
-- 2.49.1 From 1508b501af11b340e2a2323b0ccdfb04dad51e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Kr=C4=8Dek?= Date: Sun, 29 Jun 2025 17:12:36 +0200 Subject: [PATCH 8/9] Add the ability to add participants to already created events --- .../private/events/creator/+page.svelte | 179 +++++++++++------- .../events/creator/finish/+page.svelte | 23 ++- .../creator/steps/StepCreateEvent.svelte | 24 ++- .../events/creator/steps/StepOverview.svelte | 6 +- src/routes/private/events/event/+page.svelte | 32 ++-- 5 files changed, 167 insertions(+), 97 deletions(-) diff --git a/src/routes/private/events/creator/+page.svelte b/src/routes/private/events/creator/+page.svelte index e82c77c..0b2e1f0 100644 --- a/src/routes/private/events/creator/+page.svelte +++ b/src/routes/private/events/creator/+page.svelte @@ -1,86 +1,129 @@ -
- - - Step {step + 1} of {steps.length} - - +
+ {#if isAddingParticipants} +

Add Participants to "{event.name}"

+ {/if}
{#if step == 0} - + {:else if step == 1} - + {:else if step == 2} - + {:else if step == 3} - + {:else if step == 4} - + {/if} + +
+ +
+
+ + + Step {step + 1} of {steps.length} + + +
+
diff --git a/src/routes/private/events/creator/finish/+page.svelte b/src/routes/private/events/creator/finish/+page.svelte index 64dcda3..93dc831 100644 --- a/src/routes/private/events/creator/finish/+page.svelte +++ b/src/routes/private/events/creator/finish/+page.svelte @@ -29,9 +29,18 @@ all_data = JSON.parse(sessionStorage.getItem(session_storage_id) || '{}'); try { - event_status = StepStatus.Loading; - const createdEvent = await createEventInSupabase(all_data.event); - event_status = StepStatus.Success; + let createdEvent; + + if (all_data.isAddingParticipants && all_data.existingEventId) { + // Skip event creation for existing events + event_status = StepStatus.Success; + createdEvent = { id: all_data.existingEventId, ...all_data.event }; + } else { + // Create new event + event_status = StepStatus.Loading; + createdEvent = await createEventInSupabase(all_data.event); + event_status = StepStatus.Success; + } participants_status = StepStatus.Loading; createdParticipants = await createParticipantsInSupabase(all_data.participants, createdEvent); @@ -141,13 +150,17 @@
-

Creating event

+

+ {all_data.isAddingParticipants ? 'Using existing event' : 'Creating event'} +

{#if event_status === StepStatus.Waiting} Waiting... {:else if event_status === StepStatus.Loading} Creating event... {:else if event_status === StepStatus.Success} - Event created successfully. + + {all_data.isAddingParticipants ? 'Using existing event.' : 'Event created successfully.'} + {:else if event_status === StepStatus.Failure} Failed to create event. {/if} diff --git a/src/routes/private/events/creator/steps/StepCreateEvent.svelte b/src/routes/private/events/creator/steps/StepCreateEvent.svelte index 7d69dc5..5c96e46 100644 --- a/src/routes/private/events/creator/steps/StepCreateEvent.svelte +++ b/src/routes/private/events/creator/steps/StepCreateEvent.svelte @@ -1,8 +1,8 @@ @@ -59,13 +61,15 @@ {/if} {#if !showForm} - + {#if !readonly} + + {/if}

Event Preview

{#if Object.keys(event).length > 0} diff --git a/src/routes/private/events/creator/steps/StepOverview.svelte b/src/routes/private/events/creator/steps/StepOverview.svelte index cd77d45..836d1bd 100644 --- a/src/routes/private/events/creator/steps/StepOverview.svelte +++ b/src/routes/private/events/creator/steps/StepOverview.svelte @@ -1,7 +1,7 @@