+
+
diff --git a/src/routes/+page.ts b/src/routes/+page.ts
new file mode 100644
index 0000000..189f71e
--- /dev/null
+++ b/src/routes/+page.ts
@@ -0,0 +1 @@
+export const prerender = true;
diff --git a/src/routes/policies/+page.svelte b/src/routes/policies/+page.svelte
index 7e616bf..9f4343c 100644
--- a/src/routes/policies/+page.svelte
+++ b/src/routes/policies/+page.svelte
@@ -64,17 +64,19 @@
Privacy Policies
{#each policies as policy}
-
+
{policy.name}
@@ -94,15 +96,15 @@
-
+
{/each}
diff --git a/src/routes/policies/+page.ts b/src/routes/policies/+page.ts
new file mode 100644
index 0000000..fb72c23
--- /dev/null
+++ b/src/routes/policies/+page.ts
@@ -0,0 +1,14 @@
+import { redirect } from '@sveltejs/kit';
+
+import type { PageLoad } from './$types';
+
+import { PUBLIC_CLOSING_DATE } from '$env/static/public';
+
+export const load: PageLoad = () => {
+ const currentDate = new Date();
+ const deadline = new Date(PUBLIC_CLOSING_DATE);
+ if (currentDate >= deadline) {
+ throw redirect(302, '/');
+ }
+ return {};
+};
diff --git a/src/routes/register/+page.server.ts b/src/routes/register/+page.server.ts
index 13ede35..0b8a7cd 100644
--- a/src/routes/register/+page.server.ts
+++ b/src/routes/register/+page.server.ts
@@ -3,14 +3,23 @@ import { superValidate } from 'sveltekit-superforms/server';
import { prepareMail, sendEmail } from '$lib/server/email';
import { deserializeNested, prepareData } from '$lib/server/form';
-import { TeamSchema } from '$lib/server/schema';
+import { TeamFileSchema, TeamSchema } from '$lib/server/schema';
import type { Team, TeamFile } from '$lib/server/schema';
import { UploadFile } from '$lib/server/storage';
import { supabase } from '$lib/server/supabase';
import type { Actions, PageServerLoad } from './$types';
+import { PUBLIC_CLOSING_DATE } from '$env/static/public';
+
export const load: PageServerLoad = async ({ url }) => {
+ const currentDate = new Date();
+ const deadline = new Date(PUBLIC_CLOSING_DATE);
+
+ if (currentDate >= deadline) {
+ throw redirect(302, '/');
+ }
+
const consent = url.searchParams.get('consent');
const verify = url.searchParams.get('verify');
if (!consent || !verify) {
@@ -24,6 +33,13 @@ export const load: PageServerLoad = async ({ url }) => {
export const actions: Actions = {
default: async ({ request }) => {
+ const currentDate = new Date();
+ const deadline = new Date(PUBLIC_CLOSING_DATE);
+
+ if (currentDate >= deadline) {
+ throw redirect(302, '/');
+ }
+
const formData = await request.formData();
const { data, files } = deserializeNested(formData) as { data: Team; files: TeamFile };
@@ -32,23 +48,18 @@ export const actions: Actions = {
const form = await superValidate(data, TeamSchema);
if (!form.valid) {
- console.log(form.errors);
- return fail(400, { form, error: 'Form is not valid.\nSome input might be incorrect.' });
+ return fail(400, { form, error: 'ข้อมูลบางช่องอาจจะกรอกผิดหรือไม่ได้กรอก.' });
}
const teamId = crypto.randomUUID();
const { students, team } = prepareData(teamId, data, files);
- const { error: teamInsertError } = await supabase.from('team').insert(team);
- if (teamInsertError) {
- console.log(teamInsertError);
- return fail(500, { form, error: teamInsertError });
- }
-
- const { error: studentInsertError } = await supabase.from('student').insert(students);
- if (studentInsertError) {
- return fail(500, { form, error: studentInsertError });
+ try {
+ TeamFileSchema.parse(files);
+ } catch (error) {
+ console.log(error);
+ return fail(501, { form, error: 'ระบบรองรับไฟล์ PDF ขนาดไม่เกิน 5 MB เท่านั้น' });
}
const uploadPromise: Promise
[] = [
@@ -67,23 +78,38 @@ export const actions: Actions = {
try {
await Promise.all(uploadPromise);
- await sendEmail(prepareMail(students, team), [
- {
- name: `${team.teacher_prefix}${team.teacher_firstname} ${team.teacher_lastname}`,
- email: team.teacher_email
- },
- ...students.map((student) => {
- return {
- name: `${student.name_prefix}${student.firstname} ${student.lastname}`,
- email: student.email
- };
- })
- ]);
} catch (error) {
console.log(error);
- return fail(501, { form, error: error });
+ return fail(501, { form, error: `Upload file error ${JSON.stringify(error)}` });
+ }
+
+ const { error: teamInsertError } = await supabase.from('team').insert(team);
+ if (teamInsertError) {
+ console.log(teamInsertError);
+ return fail(500, { form, error: `Database Insert error ${JSON.stringify(teamInsertError)}` });
+ }
+
+ const { error: studentInsertError } = await supabase.from('student').insert(students);
+ if (studentInsertError) {
+ return fail(500, {
+ form,
+ error: `Database Insert error ${JSON.stringify(studentInsertError)}`
+ });
}
- throw redirect(302, '/register/completed');
+ await sendEmail(prepareMail(students, team), [
+ {
+ name: `${team.teacher_prefix}${team.teacher_firstname} ${team.teacher_lastname}`,
+ email: team.teacher_email
+ },
+ ...students.map((student) => {
+ return {
+ name: `${student.name_prefix}${student.firstname} ${student.lastname}`,
+ email: student.email
+ };
+ })
+ ]);
+
+ return { form };
}
};
diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte
index d376db2..a894099 100644
--- a/src/routes/register/+page.svelte
+++ b/src/routes/register/+page.svelte
@@ -17,17 +17,20 @@
import type { ActionData, PageData } from './$types';
import { browser } from '$app/environment';
+ import { goto } from '$app/navigation';
$: if (browser) window.localStorage.form = JSON.stringify($formContent);
let student_number = 2;
- let submitting = false;
export let data: PageData;
- const { enhance, errors } = superForm(data.form, {
- onSubmit: () => (submitting = true),
- onResult: () => (submitting = false)
+ const { enhance, errors, delayed } = superForm(data.form, {
+ onResult({result}) {
+ if (result.type === 'success') {
+ setTimeout(() => goto('/register/completed'), 50);
+ }
+ }
});
const teacherNamePrefixItems = ['นาย', 'นาง', 'นางสาว'];
@@ -46,55 +49,65 @@
let errorModal: boolean;
- $: errorModal = (form && form.error) as boolean;
+ $: errorModal = (form && form.error != null) as boolean;
- Register
+ Register - Bangmod Hackathon 2024