diff --git a/src/app.d.ts b/src/app.d.ts index fa296f8..ba1aeea 100644 --- a/src/app.d.ts +++ b/src/app.d.ts @@ -107,6 +107,10 @@ declare namespace DB { work: string location: string message: string + + field: string + kakao: string + dinner: string } interface Email { diff --git a/src/lib/components/AdminTable.svelte b/src/lib/components/AdminTable.svelte index 856f646..83965b7 100644 --- a/src/lib/components/AdminTable.svelte +++ b/src/lib/components/AdminTable.svelte @@ -28,21 +28,33 @@ 신청일 이름 Email + 거주지 직업 직장 - 거주지 + + + 필드 + 카톡 + 2차 참석? + 처음 참여? 비고 - {#each $activeTickets as ticket, index (ticket.id)} + {#each $activeTickets.slice().reverse() as ticket, index (ticket.id)} {index + 1} {ticket.createdAt.toDate().toLocaleDateString()} {ticket.name} {ticket.email} + {ticket.location} {ticket.occupation} {ticket.work} - {ticket.location} + + + {ticket.field ? ticket.field : '해당없음'} + {ticket.kakao ? ticket.kakao : '해당없음'} + {ticket.dinner ? ticket.dinner : '해당없음'} + {ticket.firstTime} {ticket.message} @@ -55,15 +67,21 @@ - {#each $cancelledTickets as ticket, index (ticket.id)} + {#each $cancelledTickets.slice().reverse() as ticket, index (ticket.id)} {index + 1} {ticket.createdAt.toDate().toLocaleDateString()} {ticket.name} {ticket.email} + {ticket.location} {ticket.occupation} {ticket.work} - {ticket.location} + + + {ticket.field ? ticket.field : '해당없음'} + {ticket.kakao ? ticket.kakao : '해당없음'} + {ticket.dinner ? ticket.dinner : '해당없음'} + {ticket.firstTime} {ticket.message} diff --git a/src/lib/components/Drawer.svelte b/src/lib/components/Drawer.svelte index 40dc082..fffc87a 100644 --- a/src/lib/components/Drawer.svelte +++ b/src/lib/components/Drawer.svelte @@ -5,6 +5,7 @@ import {AdminTable} from './index' import {selectedEventId} from '$lib/store' import {twMerge} from 'tailwind-merge' + export let events: DB.Event[] export let ticketValue: Map diff --git a/src/lib/server/actions/index.ts b/src/lib/server/actions/index.ts index 1be16dc..4da66cc 100644 --- a/src/lib/server/actions/index.ts +++ b/src/lib/server/actions/index.ts @@ -144,8 +144,8 @@ export async function handleKofiWebhook(data: Omit await createTicket(ticketData) diff --git a/src/routes/checkout/[eventId]/+page.svelte b/src/routes/checkout/[eventId]/+page.svelte index dbaf74d..3c35dcd 100644 --- a/src/routes/checkout/[eventId]/+page.svelte +++ b/src/routes/checkout/[eventId]/+page.svelte @@ -23,6 +23,10 @@ work: '', location: '', message: '', + + field: '', + kakao: '', + dinner: '', } $: isFree = event?.price === '0.00' @@ -59,11 +63,21 @@ {event && event.location}

Summary

- + + + {#if event?.id === 'recCay7Taim9hFJbF'} + + {:else} + + {/if} @@ -151,46 +165,88 @@ class="w-full px-3 py-2 border border-gray-300 rounded-md text-sm focus:outline-none focus:border-royalBlue-500" /> -
- -
- - - - - - - - {#if formData.occupation === 'other'} - +
+ +
+ + +
+ +
+ + +
+ {:else} +
+ +
+ + {#if formData.occupation === 'other'} + + {/if} +
-
-
- - -
+
+ + +
+ {/if}
+ + {#if event?.id === 'recCay7Taim9hFJbF'} +
+ +