Merge pull request #1 from Darrin-Lin/Camp_2024

Camp 2024 updates

d1/schema.sql

@@ -30,9 +30,9 @@ CREATE TABLE TaskProgress (
     -- 完成日期
     avatar TEXT,
     -- 完成日期
-    quiz TEXT,
+    quiz TEXT
     -- GitHub 帳號
-    github TEXT
+    -- github TEXT
 );
 
 DROP TABLE IF EXISTS Application;
@@ -65,5 +65,14 @@ CREATE TABLE IF NOT EXISTS Payment (
     email TEXT NOT NULL PRIMARY KEY,
     account TEXT NOT NULL,
     time TEXT NOT NULL,
-    updated TEXT NOT NULL
+    updated TEXT NOT NULL,
+    correct TEXT
+);
+
+CREATE TABLE IF NOT EXISTS Voting (
+    email TEXT NOT NULL,
+    target TEXT NOT NULL,
+    vote INT NOT NULL,
+    PRIMARY KEY (email, target)
+
 );

src/lib/auth.ts

@@ -8,7 +8,7 @@ export const task = store<Record<z.infer<typeof TaskSchema>["task"], string | nu
 	profile: null,
 	avatar: null,
 	quiz: null,
-	github: null,
+	// github: null,
 });
 
 token.subscribe((jwt) => {

src/lib/schema.ts

@@ -44,5 +44,7 @@ export const ProfileSchema = z.object({
 });
 
 export const TaskSchema = z.object({
-	task: z.enum(["profile", "avatar", "quiz", "github"]),
+	// task: z.enum(["profile", "avatar", "quiz", "github"]),
+	task: z.enum(["profile", "avatar", "quiz"]),
+
 });

src/lib/server/db/schema.ts

@@ -33,7 +33,7 @@ export interface TaskProgress {
 	profile: string;
 	avatar: string;
 	quiz: string;
-	github: string;
+	// github: string;
 }
 
 export interface Voting {
@@ -61,6 +61,7 @@ export interface Payment {
 	account: string;
 	time: string;
 	updated: string;
+	correct: string;
 }
 
 export interface Database {

src/lib/server/task.ts

@@ -1,6 +1,7 @@
 import { db } from "./db";
 
-export const tasks = ["profile", "avatar", "quiz", "github"] as const;
+// export const tasks = ["profile", "avatar", "quiz", "github"] as const;
+export const tasks = ["profile", "avatar", "quiz"] as const;
 export const selfchecks = ["quiz"];
 
 export async function complete(

src/routes/admin/+page.svelte

@@ -1,6 +1,8 @@
 <script lang="ts">
 	import { hash } from "$lib/hash";
-	import { spacing } from "pangu";
+	// import { spacing } from "pangu";
+	import pkg from "pangu";
+	const { spacing } = pkg;
 	import Icon from "@iconify/svelte";
 	import type { PageData } from "./$types";
 
@@ -40,7 +42,7 @@
 				alert("投票失敗");
 				console.error("投票失敗", await res.text());
 			}
-
+			console.log("投票成功", target, choice);
 			data.applications.map((app) => {
 				if (app.email === target) {
 					app.vote = choice;
@@ -109,11 +111,19 @@
 											</span>
 										</h1>
 										<p class="py-6">
+											自我介紹：
 											{spacing(app.self_intro)}
 										</p>
 										<p class="py-6">
+											動機：
 											{spacing(app.motivation)}
 										</p>
+										<p class="py-6">
+											報名時間：
+											{spacing(app.created).split("T")[0] +
+												" " +
+												spacing(app.created).split("T")[1].split(".")[0]}
+										</p>
 										<div class="rounded-lg border border-primary p-4">
 											{app.status}
 										</div>

src/routes/admin/api/admit/+server.ts

@@ -0,0 +1,37 @@
+import { db } from "$lib/server/db";
+import type { RequestHandler } from "./$types";
+import { json, redirect } from "@sveltejs/kit";
+import { env } from "$env/dynamic/private";
+
+
+export const PATCH: RequestHandler = async ({ locals, request }) => {
+    if (!locals.token) {
+        console.log("Someone is trying to access admin page without token");
+        throw redirect(302, "/login");
+    }
+
+    if (!env.ADMIN_EMAIL_REGEX) {
+        console.error("ADMIN_EMAIL_REGEX is not set");
+        throw new Error("ADMIN_EMAIL_REGEX is not set");
+    }
+
+    const email_regex = new RegExp(env.ADMIN_EMAIL_REGEX);
+    if (!email_regex.test(locals.token.email)) {
+        console.log(
+            `${locals.token.email} is trying to access admin page which does not match ${env.ADMIN_EMAIL_REGEX}`,
+        );
+        throw redirect(302, "/login");
+    }
+
+
+    // get email and input_status from request body
+    const { email, input_status }: { email: string, input_status: string } = await request.json();
+    const now = new Date().toISOString();
+    await db
+        .updateTable("Application")
+        .set({ status: input_status, updated: now })
+        .where("email", "=", email)
+        .execute();
+
+    return json({ ok: true });
+}

src/routes/admin/api/payment/+server.ts

@@ -0,0 +1,33 @@
+import { env } from "$env/dynamic/private";
+import { db } from "$lib/server/db";
+import { json, redirect } from "@sveltejs/kit";
+import type { RequestHandler } from "./$types";
+
+export const PATCH: RequestHandler = async ({ locals, request }) => {
+    if (!locals.token) {
+        console.log("Someone is trying to access admin page without token");
+        throw redirect(302, "/login");
+    }
+
+    if (!env.ADMIN_EMAIL_REGEX) {
+        console.error("ADMIN_EMAIL_REGEX is not set");
+        throw new Error("ADMIN_EMAIL_REGEX is not set");
+    }
+
+    const email_regex = new RegExp(env.ADMIN_EMAIL_REGEX);
+    if (!email_regex.test(locals.token.email)) {
+        console.log(
+            `${locals.token.email} is trying to access admin page which does not match ${env.ADMIN_EMAIL_REGEX}`,
+        );
+        throw redirect(302, "/login");
+    }
+
+    const { email, correctness }: { email: string; correctness: string } = await request.json();
+    await db
+        .updateTable("Payment")
+        .set({ correct: correctness })
+        .where("email", "=", email)
+        .execute();
+    console.log(`Payment correctness for ${email} is set to ${correctness}`);
+    return json({ ok: true });
+};

src/routes/admin/scoreboard/+page.server.ts

@@ -44,8 +44,10 @@ export const load: PageServerLoad = async ({ locals, platform }) => {
 			"Profile.skill_mastered",
 			(b) => b.fn.sum("vote").as("score"),
 			"Application.status",
+			"Application.created",
 			"Payment.account",
 			"Payment.time as pay_date",
+			"Payment.correct",
 			"Attachment.file",
 		])
 		.orderBy("score", "desc");