-
diff --git a/src/lib/components/new-users-table/text.svelte b/src/lib/components/new-users-table/text.svelte
deleted file mode 100644
index 5aca253..0000000
--- a/src/lib/components/new-users-table/text.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-{text}
diff --git a/src/lib/components/registration-form.svelte b/src/lib/components/registration-form.svelte
index 867befd..a1d2332 100644
--- a/src/lib/components/registration-form.svelte
+++ b/src/lib/components/registration-form.svelte
@@ -1,8 +1,10 @@
- table.getColumn("email")?.setFilterValue(e.currentTarget.value)}
- onchange={e => {
- table.getColumn("email")?.setFilterValue(e.currentTarget.value);
- }}
- class="max-w-sm"
- />
-
-
- {#snippet child({ props })}
-
- {/snippet}
-
-
- {#each table.getAllColumns().filter(col => col.getCanHide()) as column (column)}
- column.getIsVisible(), v => column.toggleVisibility(!!v)}
- >
- {column.columnDef.header}
-
- {/each}
-
-
-
-
-
-
- {#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
-
- {#each headerGroup.headers as header (header.id)}
-
- {#if !header.isPlaceholder}
-
- {/each}
-
- {/each}
-
-
- {#each table.getRowModel().rows as row (row.id)}
-
- {#each row.getVisibleCells() as cell (cell.id)}
-
-
- {/each}
-
- {:else}
-
- No results... maybe you can relax?
-
- {/each}
-
-
-
-
-
-
- {table.getFilteredSelectedRowModel().rows.length} of
- {table.getFilteredRowModel().rows.length} row(s) selected.
-
-
-
-
-
-
{@render children?.()}
diff --git a/src/lib/components/ui/drawer/drawer-header.svelte b/src/lib/components/ui/drawer/drawer-header.svelte
index 65d2de5..861f956 100644
--- a/src/lib/components/ui/drawer/drawer-header.svelte
+++ b/src/lib/components/ui/drawer/drawer-header.svelte
@@ -13,7 +13,7 @@
{@render children?.()}
diff --git a/src/lib/components/ui/drawer/drawer-overlay.svelte b/src/lib/components/ui/drawer/drawer-overlay.svelte
index 53f78a2..84df1e8 100644
--- a/src/lib/components/ui/drawer/drawer-overlay.svelte
+++ b/src/lib/components/ui/drawer/drawer-overlay.svelte
@@ -12,9 +12,6 @@
-;
-export const StudentId = z.string().regex(/^\d{7}$/);
-export type StudentId = z.infer;
-
export const Login = z.object({
email: z.email().max(100),
_password: z.string(), // don't use password schema for logging in, it's used on registration
@@ -27,28 +24,18 @@ export type Login = z.infer;
export const Registration = z.object({
name: z.string().min(1).max(100),
email: z.email().max(100),
- student_id: StudentId,
- reason: z.string().min(1).max(10000),
+ _password: Password,
});
export type Registration = z.infer;
// db schemas
-export const Student = z.object({
- student_id: StudentId,
- created_at: z.coerce.date(),
- updated_at: z.coerce.date(),
-});
-export type Student = z.infer;
-
export const User = z.object({
id: z.uuid(),
- student_id: StudentId,
email: z.email().max(64),
name: z.string().max(64),
- role: z.enum(["inactive", "unapproved", "blocked", "club", "sga", "admin"]),
- pending: z.boolean().default(false),
- request_reason: z.string().max(1000).nullable(),
+ role: z.enum(["inactive", "student", "blocked", "club", "sga", "admin"]),
+ expected_graduation_year: z.number().int().nullable(),
last_login: z.coerce.date(),
created_at: z.coerce.date(),
updated_at: z.coerce.date(),
@@ -58,10 +45,8 @@ export type User = z.infer;
export const NewUser = User.pick({
id: true,
- student_id: true,
email: true,
name: true,
- request_reason: true,
created_at: true,
updated_at: true,
});
@@ -95,7 +80,6 @@ export const ClubUser = z.object({
position: z.string().max(100),
user_id: z.uuid(),
club_id: z.uuid(),
- for_semester: z.uuid().nullable(),
created_at: z.coerce.date(),
updated_at: z.coerce.date(),
});
@@ -119,13 +103,24 @@ export const Event = z.object({
});
export type Event = z.infer;
-export const Tap = z.object({
+export const WalletPass = z.object({
+ id: z.uuid(),
+ user_id: z.uuid(),
+ public_id: z.string().max(10),
+ variant: z.enum(["apple", "google"]),
+ expires_at: z.coerce.date(),
+ created_at: z.coerce.date(),
+ updated_at: z.coerce.date(),
+});
+export type WalletPass = z.infer;
+
+export const Scan = z.object({
id: z.uuid(),
- student_id: StudentId,
+ wallet_pass_id: z.uuid(),
event_id: z.uuid(),
created_at: z.coerce.date(),
});
-export type Tap = z.infer;
+export type Scan = z.infer;
export const Location = z.object({
id: z.uuid(),
@@ -138,7 +133,7 @@ export type Location = z.infer;
// API Request schemas
export const PointCheck = z.object({
- student_id: StudentId,
+ wallet_pass_id: z.string().max(10),
});
export type PointCheck = z.infer;
diff --git a/src/lib/server/postgres.ts b/src/lib/server/postgres.ts
index 8af94d1..7603630 100644
--- a/src/lib/server/postgres.ts
+++ b/src/lib/server/postgres.ts
@@ -1,5 +1,5 @@
import { privateEnv } from "$lib/env/private";
-import { Semester, Student, User } from "$lib/models";
+import { Semester, User, WalletPass } from "$lib/models";
import { error } from "@sveltejs/kit";
import postgres from "postgres";
@@ -87,29 +87,15 @@ export async function getLastSemester(): Promise {
return Semester.parse(result[0]);
}
-export async function createStudent({
- student_id
-}: Pick): Promise {
- const result = await sql`
- INSERT INTO students (student_id)
- VALUES (${student_id})
- RETURNING *
- `;
-
- return Student.parse(result[0]);
-}
-
export async function createUser(
- student_id: string,
email: string,
name: string,
- request_reason: string,
- role = "unapproved",
+ role = "student",
password_hash?: string,
): Promise {
const result = await sql`
- INSERT INTO users (student_id, email, name, role, request_reason, password_hash)
- VALUES (${student_id}, ${email}, ${name}, ${role}, ${request_reason}, ${password_hash ?? null})
+ INSERT INTO users (email, name, role, password_hash)
+ VALUES (${email}, ${name}, ${role}, ${password_hash ?? null})
RETURNING *
`;
@@ -124,25 +110,48 @@ export async function updateUserPassword(email: string, password_hash: string) {
`;
}
-export async function studentExists(student_id: string): Promise {
+export async function userExists(email: string): Promise {
const result = await sql`
SELECT student_id
- FROM students
- WHERE student_id = ${student_id}
+ FROM users
+ WHERE email = ${email}
LIMIT 1
`;
return result.count === 1;
}
-export async function userExists(student_id: string, email: string): Promise {
+export function generatePassId(): string {
+ const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+ return Array.from(crypto.getRandomValues(new Uint8Array(10)))
+ .map(b => chars[b % chars.length])
+ .join('');
+};
+
+/// Returns an active pass from the database for a given user ID, or undefined if none exists
+export async function getPassFromUserId(userId: string): Promise {
const result = await sql`
- SELECT student_id
- FROM users
- WHERE student_id = ${student_id}
- OR email = ${email}
+ SELECT wp.id FROM wallet_passes wp
+ JOIN users u ON wp.user_id = u.id
+ WHERE u.id = ${userId}
LIMIT 1
- `;
+ `;
- return result.count === 1;
-}
+ if (result.count === 0) {
+ return undefined;
+ }
+
+ return WalletPass.parse(result[0]);
+};
+
+/// Internally creates a pass and returns the WalletPass object. This does not generate the actual pass file.
+export async function createPass(userId: string, variant: 'apple' | 'google', expiresAt: Date): Promise {
+ const passId = generatePassId();
+ const result = await sql`
+ INSERT INTO wallet_passes (user_id, public_id, variant, expires_at)
+ VALUES (${userId}, ${passId}, ${variant}, ${expiresAt})
+ RETURNING *
+ `;
+
+ return WalletPass.parse(result[0]);
+}
\ No newline at end of file
diff --git a/src/lib/utils/schema.sql b/src/lib/utils/schema.sql
index 8f75fff..1f9d8f7 100644
--- a/src/lib/utils/schema.sql
+++ b/src/lib/utils/schema.sql
@@ -1,21 +1,11 @@
CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
--- regular students (They won't be able to login to anything)
-CREATE TABLE IF NOT EXISTS students (
- student_id VARCHAR(7) PRIMARY KEY,
- created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
- updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
-);
-
--- Club eboard members and SGA (and probably OSI too)
CREATE TABLE IF NOT EXISTS users (
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
- student_id VARCHAR(7) REFERENCES students(student_id) NOT NULL,
email VARCHAR(64) UNIQUE NOT NULL,
name VARCHAR(64) NOT NULL,
- role VARCHAR(10) NOT NULL DEFAULT 'unapproved', -- 'inactive', 'unapproved', 'blocked', 'club', 'sga', 'admin'
- pending BOOLEAN NOT NULL DEFAULT FALSE,
- request_reason VARCHAR(1000),
+ role VARCHAR(10) NOT NULL DEFAULT 'student', -- 'inactive', 'student', 'blocked', 'club', 'sga', 'admin'
+ expected_graduation_year INT,
password_hash TEXT,
last_login TIMESTAMPTZ NOT NULL DEFAULT now(),
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
@@ -49,7 +39,6 @@ CREATE TABLE IF NOT EXISTS club_users(
position TEXT NOT NULL,
user_id UUID REFERENCES users(id) NOT NULL,
club_id UUID REFERENCES clubs(id) NOT NULL,
- for_semester UUID REFERENCES semesters(id),
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
);
@@ -71,12 +60,23 @@ CREATE TABLE IF NOT EXISTS events (
updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
);
-CREATE TABLE IF NOT EXISTS taps (
+CREATE TABLE IF NOT EXISTS wallet_passes (
+ id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+ user_id UUID REFERENCES users(id),
+ public_id VARCHAR(10) UNIQUE NOT NULL,
+ variant VARCHAR(6) NOT NULL -- 'apple' or 'google'
+ expires_at TIMESTAMPTZ NOT NULL,
+ created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+ updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+ UNIQUE (id, user_id) -- One pass per user (if they get a new one the old one is deleted)
+);
+
+CREATE TABLE IF NOT EXISTS scans (
id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
- student_id VARCHAR(7) REFERENCES students(student_id) NOT NULL,
+ wallet_pass_id UUID REFERENCES wallet_passes(id) NOT NULL,
event_id UUID REFERENCES events(id) NOT NULL,
created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
- UNIQUE (student_id, event_id)
+ UNIQUE (wallet_pass_id, event_id)
);
CREATE TABLE IF NOT EXISTS locations (
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index 8acadc2..2d03da5 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -57,7 +57,7 @@ export const load: PageServerLoad = async () => {
return {
stats: null,
- unavailable: false,
+ unavailable: true,
};
} catch (err: unknown) {
if (isHttpError(err, 503)) {
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index e51b0d1..870924c 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -12,7 +12,11 @@
const stats = $derived(data.stats);
$effect(() => {
- if (data.unavailable) {
+ if (data.unavailable && data.stats === null) {
+ toast.warning("Failed to load Penmen Pride stats. There may be no semesters to load data from.", {
+ duration: 10000,
+ });
+ } else if (data.unavailable) {
toast.error("Failed to load Penmen Pride stats. Please try again later.", { duration: 10000 });
}
});
@@ -126,8 +130,22 @@
here.
-
- How do i earn points?
+
+ How does it work?
+
+ First, get a Penmen Pride Pass by visiting this page. You'll add it to your mobile phones wallet (either Apple Wallet or Google Wallet). Then, attend
+ events that have Penmen Pride!
When you attend an event, an SGA senator will scan your Penmen + Pride Pass at the event and you'll earn points! + Important: You should make an account here on Penmen Pride so you don't + lose your points, and so you can check your points at any time! You'll be prompted to create an account + when you get your Penmen Pride Pass, or you can create one + here. +
+
+
+ Where can I earn points?
Events that have Penmen Pride are listed
here. By attending them, you'll earn
@@ -136,7 +154,7 @@
iPad to claim your points!
-
+
What can I do with my points?
When the semester ends, the students with the most points will win prizes!
@@ -144,21 +162,22 @@ here.
-
+
How can I check my points?
- Head to the points checking page
- here, and enter your student ID.
+ A few different ways! You can enter your 10 digit pass ID on the point checking page here, or follow your phone's specific instructions below:
+
+ Apple: Double click your power button to open your wallet, tap/click your pass, tap the 3 dots in the top right, then tap 'Pass details'. You'll see a URL that will show your points!
+ Google: WIP (sorry)
-
+
I have an event I want Penmen Pride to be at! How do I request it?
- As a club E-Board member, you can request an account
- here. After approval from SGA, you can
- login
- here and create a new event.
- If you already have an account, just login and create a new event! + As a club E-Board member of a club, or a staff member/student worker of an office on campus, please + email SGA to obtain permissions for your account to be able to request events, see scan statistics, and more!
diff --git a/src/routes/app/+page.server.ts b/src/routes/app/+page.server.ts
index 7745f02..e5120f9 100644
--- a/src/routes/app/+page.server.ts
+++ b/src/routes/app/+page.server.ts
@@ -11,23 +11,6 @@ export const load: PageServerLoad = async ({ locals }) => {
// Get active semester, or fall back to last semester if none active
const semester = (await getActiveSemester(false).catch(() => undefined)) ?? (await getLastSemester());
- if (!semester) {
- // No semester at all - return minimal data
- return {
- club: undefined,
- platform: {
- semester: {
- eventsHosted: 0,
- pointsEarned: 0,
- attendanceCount: 0,
- upcomingEvents: 0,
- uniqueClubsHostingEvents: 0,
- },
- allTime: { eventsHosted: 0, pointsEarned: 0, attendanceCount: 0 },
- },
- };
- }
-
// Platform-wide statistics
const [
upcomingEventsResult,
@@ -39,33 +22,33 @@ export const load: PageServerLoad = async ({ locals }) => {
platformAllTimePointsResult,
platformAllTimeAttendanceResult,
] = await Promise.all([
- sql`
+ semester ? sql`
SELECT COUNT(*) as count
FROM events
WHERE semester_id = ${semester.id}
- `,
- sql`
+ ` : undefined,
+ semester ? sql`
SELECT COUNT(DISTINCT club_id) as count
FROM events
WHERE semester_id = ${semester.id}
- `,
- sql`
+ ` : undefined,
+ semester ? sql`
SELECT COUNT(*) as count
FROM events
WHERE semester_id = ${semester.id}
- `,
- sql`
+ ` : undefined,
+ semester ? sql`
SELECT SUM(e.point_value) as total_points
- FROM taps t
- JOIN events e ON t.event_id = e.id
+ FROM scans s
+ JOIN events e ON s.event_id = e.id
WHERE e.semester_id = ${semester.id}
- `,
- sql`
- SELECT COUNT(t.id) as count
- FROM taps t
- JOIN events e ON t.event_id = e.id
+ ` : undefined,
+ semester ? sql`
+ SELECT COUNT(s.id) as count
+ FROM scans s
+ JOIN events e ON s.event_id = e.id
WHERE e.semester_id = ${semester.id}
- `,
+ ` : undefined,
sql`
SELECT COUNT(*) as count
FROM events
@@ -73,13 +56,13 @@ export const load: PageServerLoad = async ({ locals }) => {
`,
sql`
SELECT SUM(e.point_value) as total_points
- FROM taps t
- JOIN events e ON t.event_id = e.id
+ FROM scans s
+ JOIN events e ON s.event_id = e.id
`,
sql`
- SELECT COUNT(t.id) as count
- FROM taps t
- JOIN events e ON t.event_id = e.id
+ SELECT COUNT(s.id) as count
+ FROM scans s
+ JOIN events e ON s.event_id = e.id
`,
]);
@@ -111,40 +94,40 @@ export const load: PageServerLoad = async ({ locals }) => {
clubAllTimePointsResult,
clubAllTimeAttendanceResult,
] = await Promise.all([
- sql`
+ semester ? sql`
SELECT COUNT(*) as count
FROM club_users
WHERE club_id = ${userClub.id}
AND for_semester = ${semester.id}
- `,
- sql`
+ ` : undefined,
+ semester ? sql`
SELECT COUNT(*) as count
FROM events e
JOIN club_users cu ON e.club_id = cu.club_id
WHERE cu.user_id = ${locals.user.id} AND e.semester_id = ${semester.id}
- `,
- sql`
+ ` : undefined,
+ semester ? sql`
SELECT SUM(e.point_value) as total_points
- FROM taps t
- JOIN events e ON t.event_id = e.id
+ FROM scans s
+ JOIN events e ON s.event_id = e.id
JOIN club_users cu ON e.club_id = cu.club_id
WHERE cu.user_id = ${locals.user.id} AND e.semester_id = ${semester.id}
- `,
- sql`
- SELECT COUNT(t.id) as count
- FROM taps t
- JOIN events e ON t.event_id = e.id
+ ` : undefined,
+ semester ? sql`
+ SELECT COUNT(s.id) as count
+ FROM scans s
+ JOIN events e ON s.event_id = e.id
JOIN club_users cu ON e.club_id = cu.club_id
WHERE cu.user_id = ${locals.user.id} AND e.semester_id = ${semester.id}
- `,
- sql`
+ ` : undefined,
+ semester ? sql`
SELECT COUNT(*) as count
FROM events e
JOIN club_users cu ON e.club_id = cu.club_id
WHERE cu.user_id = ${locals.user.id}
AND e.starts_at > now()
AND e.semester_id = ${semester.id}
- `,
+ ` : undefined,
sql`
SELECT COUNT(*) as count
FROM events e
@@ -153,15 +136,15 @@ export const load: PageServerLoad = async ({ locals }) => {
`,
sql`
SELECT SUM(e.point_value) as total_points
- FROM taps t
- JOIN events e ON t.event_id = e.id
+ FROM scans s
+ JOIN events e ON s.event_id = e.id
JOIN club_users cu ON e.club_id = cu.club_id
WHERE cu.user_id = ${locals.user.id}
`,
sql`
- SELECT COUNT(t.id) as count
- FROM taps t
- JOIN events e ON t.event_id = e.id
+ SELECT COUNT(s.id) as count
+ FROM scans s
+ JOIN events e ON s.event_id = e.id
JOIN club_users cu ON e.club_id = cu.club_id
WHERE cu.user_id = ${locals.user.id}
`,
@@ -169,17 +152,17 @@ export const load: PageServerLoad = async ({ locals }) => {
clubStats = {
semester: {
- eventsHosted: Number(clubSemesterEventsResult[0]?.count ?? 0),
- pointsEarned: Number(clubSemesterPointsResult[0]?.total_points ?? 0),
- attendanceCount: Number(clubSemesterAttendanceResult[0]?.count ?? 0),
- upcomingEvents: Number(clubUpcomingEventsResult[0]?.count ?? 0),
+ eventsHosted: clubSemesterEventsResult ? Number(clubSemesterEventsResult[0]?.count ?? 0) : 0,
+ pointsEarned: clubSemesterPointsResult ? Number(clubSemesterPointsResult[0]?.total_points ?? 0) : 0,
+ attendanceCount: clubSemesterAttendanceResult ? Number(clubSemesterAttendanceResult[0]?.count ?? 0) : 0,
+ upcomingEvents: clubUpcomingEventsResult ? Number(clubUpcomingEventsResult[0]?.count ?? 0) : 0,
},
allTime: {
eventsHosted: Number(clubAllTimeEventsResult[0]?.count ?? 0),
pointsEarned: Number(clubAllTimePointsResult[0]?.total_points ?? 0),
attendanceCount: Number(clubAllTimeAttendanceResult[0]?.count ?? 0),
},
- members: Number(clubMembersResult[0]?.count ?? 0),
+ members: clubMembersResult ? Number(clubMembersResult[0]?.count ?? 0) : 0,
};
}
@@ -187,11 +170,11 @@ export const load: PageServerLoad = async ({ locals }) => {
club: clubStats,
platform: {
semester: {
- eventsHosted: Number(platformSemesterEventsResult[0]?.count ?? 0),
- pointsEarned: Number(platformSemesterPointsResult[0]?.total_points ?? 0),
- attendanceCount: Number(platformSemesterAttendanceResult[0]?.count ?? 0),
- upcomingEvents: Number(upcomingEventsResult[0]?.count ?? 0),
- uniqueClubsHostingEvents: Number(uniqueClubsHostingEventsResult[0]?.count ?? 0),
+ eventsHosted: platformSemesterEventsResult ? Number(platformSemesterEventsResult[0]?.count ?? 0) : 0,
+ pointsEarned: platformSemesterPointsResult ? Number(platformSemesterPointsResult[0]?.total_points ?? 0) : 0,
+ attendanceCount: platformSemesterAttendanceResult ? Number(platformSemesterAttendanceResult[0]?.count ?? 0) : 0,
+ upcomingEvents: upcomingEventsResult ? Number(upcomingEventsResult[0]?.count ?? 0): 0,
+ uniqueClubsHostingEvents: uniqueClubsHostingEventsResult ? (uniqueClubsHostingEventsResult[0]?.count ?? 0) : 0,
},
allTime: {
eventsHosted: Number(platformAllTimeEventsResult[0]?.count ?? 0),
diff --git a/src/routes/app/+page.svelte b/src/routes/app/+page.svelte
index cb54b0f..9839161 100644
--- a/src/routes/app/+page.svelte
+++ b/src/routes/app/+page.svelte
@@ -21,6 +21,16 @@
"What's up, ",
"Ahoy, ",
"Today's a good day, ",
+ "How goes it, ",
+ "Greetings, ",
+ "Nice to see you, ",
+ "Good day, ",
+ "Aloha, ",
+ "Long time no see, ",
+ "Pleased to see you, ",
+ "Very nice to see you, ",
+ "Hola, ",
+ "Nice to have you back, "
];
const greeting = hydratable("greeting", () => nameGreetings[Math.floor(Math.random() * nameGreetings.length)]);
diff --git a/src/routes/app/events/[slug]/+page.server.ts b/src/routes/app/events/[slug]/+page.server.ts
index 2c184f0..0ddef1a 100644
--- a/src/routes/app/events/[slug]/+page.server.ts
+++ b/src/routes/app/events/[slug]/+page.server.ts
@@ -1,6 +1,6 @@
import type { PageServerLoad } from './$types';
import { sql } from '$lib/server/postgres';
-import { Event, Club, Tap } from '$lib/models';
+import { Event, Club, Scan } from '$lib/models';
import { existsSync } from 'fs';
import { error } from '@sveltejs/kit';
import path from 'path';
@@ -27,7 +27,7 @@ export const load: PageServerLoad = async ({ params }) => {
`,
sql`
SELECT *
- FROM taps
+ FROM scans
WHERE event_id = ${slug}
ORDER BY created_at ASC
`
@@ -39,7 +39,7 @@ export const load: PageServerLoad = async ({ params }) => {
const event = Event.parse(eventResult.at(0));
const club = Club.parse(clubResult.at(0));
- const event_taps = tapsResult.map((row: unknown) => Tap.parse(row));
+ const event_taps = tapsResult.map((row: unknown) => Scan.parse(row));
let hasFlyer = false;
if (event.image_filename) {
diff --git a/src/routes/app/requests/users/+page.server.ts b/src/routes/app/requests/users/+page.server.ts
deleted file mode 100644
index 3ae1ba4..0000000
--- a/src/routes/app/requests/users/+page.server.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { NewUser } from "$lib/models";
-import { sql } from "$lib/server/postgres";
-import { sgaOrAbove } from "$lib/utils/permissions";
-import { redirect } from "@sveltejs/kit";
-import type { PageServerLoad } from "./$types";
-
-export const load: PageServerLoad = async ({ locals }) => {
- const result = await sql`
- SELECT
- id,
- student_id,
- email,
- name,
- request_reason,
- created_at,
- updated_at
- FROM users
- WHERE users.role = 'unapproved'
- `;
- const users = result.map(row => NewUser.parse(row));
-
- return {
- newUserRequests: users,
- };
-};
diff --git a/src/routes/app/requests/users/+page.svelte b/src/routes/app/requests/users/+page.svelte
deleted file mode 100644
index 99ac957..0000000
--- a/src/routes/app/requests/users/+page.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-([]);
+ let scanHistory = $state([]);
let isCapturing = $state(false);
let showPastEvents = $state(false);
@@ -68,7 +66,7 @@
// Clear any text that might have gotten into the input
setTimeout(() => {
- tap.fields.student_id.set("");
+ scan.fields.wallet_pass_id.set("");
}, 10);
if (selectedEvent === "") {
@@ -89,42 +87,41 @@
}
async function parseCardData(raw: string) {
- let match = raw.match(/^;77(\d+)=/);
- if (match) {
- const studentId = match[1];
+ try {
+ const walletPassId = raw; // The scanners will pickup the entire QR code which we can just use it directly
if (
- swipeHistory.find(r => {
- return r.studentId === studentId;
+ scanHistory.find(r => {
+ return r.wallet_pass_id === walletPassId;
})
) {
flash("error");
- toast.error("Duplicate swipe", { description: "That student has already swiped for this event!" });
- return
+ toast.error("Duplicate scan", { description: "That student has already scanned for this event!" });
+ return;
}
try {
- await manualTap({ student_id: studentId, event_id: selectedEvent });
+ await manualScan({ wallet_pass_id: walletPassId, event_id: selectedEvent });
} catch (error: any) {
flash("error");
- toast.error("Failed to tap student", { description: error?.body.message });
+ toast.error("Failed to scan student", { description: error?.body.message });
return;
}
flash("success");
- toast.success("Card scanned", { description: `Scanned student ID: ${studentId}` });
+ toast.success("Pass scanned", { description: `Scanned wallet pass ID: ${walletPassId}` });
- // Add to swipe history
- swipeHistory = [
+ // Add to scan history
+ scanHistory = [
{
- studentId,
+ wallet_pass_id: walletPassId,
eventName: eventName,
timestamp: new Date(),
},
- ...swipeHistory,
+ ...scanHistory,
];
- } else {
+ } catch (error) {
flash("error");
- toast.error("Failed to parse card data");
+ toast.error(`Failed to parse card data: ${error}`);
}
}
@@ -154,16 +151,16 @@
- Swipe History
+ Scan History
- {swipeHistory.length} scan{swipeHistory.length !== 1 ? "s" : ""} this session
+ {scanHistory.length} scan{scanHistory.length !== 1 ? "s" : ""} this session
- {#if swipeHistory.length === 0}
-
Your Penmen Pride Account has been approved!
-Good news! Your account has been approved by the Student Government Association.
-Please click the link below to activate your account and set your password:
-Activate Account -If you did not request this account, please ignore this email.
-This link will expire in 3 days. If you do not activate your account within this time, you can request a password reset from the login page.
`, - subject: "Activate your Penmen Pride account", - to: targetUser.email, - }) - .then(() => { - console.log(`Sent approval email to ${targetUser.email}`); - }) - .catch(console.error); - - return { - user: User.parse(updatedUser[0]), - }; - }, -); diff --git a/src/lib/functions/new-users/block.remote.ts b/src/lib/functions/new-users/block.remote.ts deleted file mode 100644 index c6c0d14..0000000 --- a/src/lib/functions/new-users/block.remote.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { form, getRequestEvent } from "$app/server"; -import { User } from "$lib/models"; -import { sql } from "$lib/server/postgres"; -import { sgaOrAbove } from "$lib/utils/permissions"; -import { error } from "@sveltejs/kit"; -import z from "zod"; - -export const blockUser = form(z.object({ userId: z.string() }), async ({ userId }) => { - const { locals } = getRequestEvent(); - if (!locals.user) error(401, { message: "Unauthorized" }); - if (!sgaOrAbove(locals.user.role)) error(403, { message: "Forbidden" }); - - const users = await sql` - SELECT * - FROM users u - WHERE u.id = ${userId} - LIMIT 1 - `; - if (users.length === 0) error(404, { message: "User not found." }); - - const targetUser = User.parse(users[0]); - if (targetUser.role !== "unapproved") error(403, { message: "This account has already been approved." }); - - const updatedUser = await sql` - UPDATE users - SET role = 'blocked', updated_at = now() - WHERE id = ${targetUser.id} - RETURNING * - `; - if (updatedUser.count === 0) error(500, { message: "Failed to approve user." }); - - return User.parse(updatedUser[0]); -}); diff --git a/src/lib/functions/new-users/deny.remote.ts b/src/lib/functions/new-users/deny.remote.ts deleted file mode 100644 index 60c4ee6..0000000 --- a/src/lib/functions/new-users/deny.remote.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { form, getRequestEvent } from "$app/server"; -import { User } from "$lib/models"; -import { sql } from "$lib/server/postgres"; -import { sgaOrAbove } from "$lib/utils/permissions"; -import { error } from "@sveltejs/kit"; -import z from "zod"; - -export const denyUserRequest = form(z.object({ userId: z.string() }), async ({ userId }) => { - const { locals } = getRequestEvent(); - if (!locals.user) error(401, { message: "Unauthorized" }); - if (!sgaOrAbove(locals.user.role)) error(403, { message: "Forbidden" }); - - const users = await sql` - SELECT * - FROM users u - WHERE u.id = ${userId} - LIMIT 1 - `; - if (users.length === 0) error(404, { message: "User not found." }); - - const targetUser = User.parse(users[0]); - if (targetUser.role !== "unapproved") error(403, { message: "This account has already been approved." }); - - const updatedUser = await sql` - DELETE FROM users - WHERE id = ${targetUser.id} - `; - if (updatedUser.count === 0) error(500, { message: "Failed to deny user." }); - - return { success: true }; -}); diff --git a/src/lib/functions/onboarding.remote.ts b/src/lib/functions/onboarding.remote.ts index e0d22c2..44538d0 100644 --- a/src/lib/functions/onboarding.remote.ts +++ b/src/lib/functions/onboarding.remote.ts @@ -17,13 +17,12 @@ export const setPassword = form(SetPassword, async ({ _password, token }) => { if (users.length === 0) error(401, { message: "Invalid credentials" }); const user = User.parse(users[0]); - if (!user.pending) error(403, { message: "This account has already been activated." }); - - if (user.role === "unapproved") - error(403, { message: "Access denied. Please wait for approval email from SGA before logging in." }); + + if (user.role === "blocked") + error(403, { message: "Access denied. Your account has been blocked." }); if (user.role === "inactive") - error(401, { message: "Access denied. Your account has been marked as inactive. Contact SGA for assistance." }); + error(403, { message: "Access denied. Your account has been marked as inactive. Contact SGA for assistance." }); const passwordHash = await hashPassword(_password); diff --git a/src/lib/functions/register.remote.ts b/src/lib/functions/register.remote.ts index 837cbe2..d3a489a 100644 --- a/src/lib/functions/register.remote.ts +++ b/src/lib/functions/register.remote.ts @@ -1,18 +1,16 @@ import { form } from "$app/server"; import { Registration } from "$lib/models"; -import { createStudent, createUser, studentExists, userExists } from "$lib/server/postgres"; +import { createUser, userExists } from "$lib/server/postgres"; import { error } from "@sveltejs/kit"; export const register = form(Registration, async register => { - const [foundStudent, foundUser] = await Promise.all([ - studentExists(register.student_id), - userExists(register.student_id, register.email), + const [foundUser] = await Promise.all([ + userExists(register.email), ]); - if (foundUser) error(409, { message: "A user with that email or student ID already exists." }); + if (foundUser) error(409, { message: "A user with that email already exists." }); - if (!foundStudent) await createStudent(register); - await createUser(register.student_id, register.email, register.name, register.reason, "unapproved"); + await createUser(register.email, register.name); return { success: true }; }); diff --git a/src/lib/functions/reset-password.remote.ts b/src/lib/functions/reset-password.remote.ts index 255c310..39a20a2 100644 --- a/src/lib/functions/reset-password.remote.ts +++ b/src/lib/functions/reset-password.remote.ts @@ -18,11 +18,11 @@ export const resetPassword = form(SetPassword, async ({ _password, token }) => { const user = User.parse(users[0]); - if (user.role === "unapproved") - error(403, { message: "Access denied. Please wait for approval email from SGA before logging in." }); + if (user.role === "blocked") + error(403, { message: "Access denied. Your account has been blocked." }); if (user.role === "inactive") - error(401, { message: "Access denied. Your account has been marked as inactive. Contact SGA for assistance." }); + error(403, { message: "Access denied. Your account has been marked as inactive. Contact SGA for assistance." }); const passwordHash = await hashPassword(_password); diff --git a/src/lib/functions/scan.remote.ts b/src/lib/functions/scan.remote.ts new file mode 100644 index 0000000..4e712fa --- /dev/null +++ b/src/lib/functions/scan.remote.ts @@ -0,0 +1,45 @@ +import { form, getRequestEvent, command } from "$app/server"; +import { Event, Scan } from "$lib/models"; +import { sql } from "$lib/server/postgres"; +import { sgaOrAbove } from "$lib/utils/permissions"; +import { error } from "@sveltejs/kit"; + +export const scan = form(Scan.omit({ id: true, created_at: true }), async ({ wallet_pass_id, event_id }) => { + return await submitScan(wallet_pass_id, event_id); +}); + +export const manualScan = command(Scan.omit({ id: true, created_at: true }), async ({ wallet_pass_id, event_id }) => { + return await submitScan(wallet_pass_id, event_id); +}); + +async function submitScan(wallet_pass_id: string, event_id: string) { + const { locals } = getRequestEvent(); + if (!locals.user) error(401, { message: "Unauthorized" }); + if (!sgaOrAbove(locals.user.role)) error(403, { message: "Forbidden" }); + + // TODO: confirm pass here + // TODO: also try to get user if theres an attached one + + const [_event] = await sql` + SELECT * + FROM events + WHERE id = ${event_id} + LIMIT 1 +`; + if (!_event) error(404, { message: "Event not found." }); + + const event = Event.parse(_event); + + if (event.approval_status !== "accepted") error(403, { message: "Cannot tap into an event that is not accepted." }); + + const result = await sql` + INSERT INTO scans (wallet_pass_id, event_id) + VALUES (${wallet_pass_id}, ${event_id}) + ON CONFLICT (wallet_pass_id, event_id) DO NOTHING + RETURNING * +`; + if (result.length === 0) + error(500, { message: `${wallet_pass_id} has already been tapped for ${event.name}.` }); + + return { scan: Scan.parse(result[0]) }; +} diff --git a/src/lib/functions/tap.remote.ts b/src/lib/functions/tap.remote.ts deleted file mode 100644 index e841789..0000000 --- a/src/lib/functions/tap.remote.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { form, getRequestEvent, command } from "$app/server"; -import { Event, Student, Tap } from "$lib/models"; -import { sql } from "$lib/server/postgres"; -import { sgaOrAbove } from "$lib/utils/permissions"; -import { error } from "@sveltejs/kit"; - -export const tap = form(Tap.omit({ id: true, created_at: true }), async ({ student_id, event_id }) => { - return await submitTap(student_id, event_id); -}); - -export const manualTap = command(Tap.omit({ id: true, created_at: true }), async ({ student_id, event_id }) => { - return await submitTap(student_id, event_id); -}); - -async function submitTap(student_id: string, event_id: string) { - const { locals } = getRequestEvent(); - if (!locals.user) error(401, { message: "Unauthorized" }); - if (!sgaOrAbove(locals.user.role)) error(403, { message: "Forbidden" }); - - const [_student] = await sql` - INSERT INTO students (student_id) - VALUES (${student_id}) - ON CONFLICT (student_id) DO UPDATE - SET student_id = EXCLUDED.student_id - RETURNING * -`; - if (!_student) error(404, { message: "Failed to fetch student data." }); - - const student = Student.parse(_student); - - const [_event] = await sql` - SELECT * - FROM events - WHERE id = ${event_id} - LIMIT 1 -`; - if (!_event) error(404, { message: "Event not found." }); - - const event = Event.parse(_event); - - if (event.approval_status !== "accepted") error(403, { message: "Cannot tap into an event that is not accepted." }); - - const result = await sql` - INSERT INTO taps (student_id, event_id) - VALUES (${student_id}, ${event_id}) - ON CONFLICT (student_id, event_id) DO NOTHING - RETURNING * -`; - if (result.length === 0) - error(500, { message: `${student.student_id} has already been tapped for ${event.name}.` }); - - return { student, tap: Tap.parse(result[0]) }; -} diff --git a/src/lib/functions/user/points.remote.ts b/src/lib/functions/user/points.remote.ts index 6a15b7e..a984ec9 100644 --- a/src/lib/functions/user/points.remote.ts +++ b/src/lib/functions/user/points.remote.ts @@ -15,16 +15,16 @@ export const getPointsInActiveSemester = form(PointCheck, async check => { const [semesterResult, allTimeResult] = await Promise.all([ sql` SELECT COALESCE(SUM(e.point_value), 0) as total_points - FROM taps t - JOIN events e ON t.event_id = e.id - WHERE t.student_id = ${check.student_id} + FROM scans s + JOIN events e ON s.event_id = e.id + WHERE s.wallet_pass_id = ${check.wallet_pass_id} AND e.semester_id = ${semester.id} `, sql` SELECT COALESCE(SUM(e.point_value), 0) as total_points - FROM taps t - JOIN events e ON t.event_id = e.id - WHERE t.student_id = ${check.student_id} + FROM scans s + JOIN events e ON s.event_id = e.id + WHERE s.wallet_pass_id = ${check.wallet_pass_id} ` ]); @@ -37,9 +37,9 @@ export const getPointsInActiveSemester = form(PointCheck, async check => { export const getPointsAllTime = query(PointCheck, async check => { const points = await sql` SELECT COALESCE(SUM(e.point_value), 0) as total_points - FROM taps t - JOIN events e ON t.event_id = e.id - WHERE t.student_id = ${check.student_id} + FROM scans s + JOIN events e ON s.event_id = e.id + WHERE s.wallet_pass_id = ${check.wallet_pass_id} `; return { points: Number.parseInt(points.at(0)?.total_points) }; }); \ No newline at end of file diff --git a/src/lib/models.ts b/src/lib/models.ts index b6538c2..bfdec3e 100644 --- a/src/lib/models.ts +++ b/src/lib/models.ts @@ -10,14 +10,11 @@ export const Password = z .refine(val => /[0-9]/.test(val), { error: "Password must contain at least one number.", }) - .refine(val => /[^A-Za-z0-9].*[^A-Za-z0-9]/.test(val), { - error: "Password must contain at least two special characters.", + .refine(val => /[^A-Za-z0-9]/.test(val), { + error: "Password must contain at least one special character.", }); export type Password = z.inferWhen you attend an event, an SGA senator will scan your Penmen + Pride Pass at the event and you'll earn points! + Important: You should make an account here on Penmen Pride so you don't + lose your points, and so you can check your points at any time! You'll be prompted to create an account + when you get your Penmen Pride Pass, or you can create one + here. +
@@ -144,21 +162,22 @@ here.
+ Apple: Double click your power button to open your wallet, tap/click your pass, tap the 3 dots in the top right, then tap 'Pass details'. You'll see a URL that will show your points!
+ Google: WIP (sorry)
- If you already have an account, just login and create a new event! + As a club E-Board member of a club, or a staff member/student worker of an office on campus, please + email SGA to obtain permissions for your account to be able to request events, see scan statistics, and more!
-
diff --git a/src/routes/app/scan/+page.svelte b/src/routes/app/scan/+page.svelte
index cc47c56..aa04b68 100644
--- a/src/routes/app/scan/+page.svelte
+++ b/src/routes/app/scan/+page.svelte
@@ -5,24 +5,22 @@
import { Label } from "$lib/components/ui/label/index.js";
import * as Card from "$lib/components/ui/card";
import * as Select from "$lib/components/ui/select";
- import { tap, manualTap } from "$lib/functions/tap.remote";
- import { Tap } from "$lib/models";
+ import { scan, manualScan } from "$lib/functions/scan.remote";
+ import { Scan } from "$lib/models";
import { toast } from "svelte-sonner";
import type { PageProps } from "./$types";
import EventSelector from "$lib/components/event-selector.svelte";
interface SwipeRecord {
- studentId: string;
+ wallet_pass_id: string;
eventName: string;
timestamp: Date;
}
const { data }: PageProps = $props();
-
-
let selectedEvent = $state("");
- let swipeHistory = $stateNo swipes yet
+ {#if scanHistory.length === 0} +No scans yet
{:else}
- {#each swipeHistory as record (record.timestamp.getTime())}
+ {#each scanHistory as record (record.timestamp.getTime())}
{
- pending = true;
- try {
- await submit();
- form.reset();
- toast.success("Password reset requested", {
- description:
- "If the email is associated with an account, you will receive a password reset email shortly.",
- });
- } catch (error: any) {
- // ignore redirects
- if (error?.status >= 300 && error?.status < 400) {
- throw error;
- }
- console.error("forgot failed", error);
- toast.error("Password reset request failed", { description: error?.body.message });
- } finally {
- pending = false;
+ {...requestPasswordReset.preflight(z.object({ email: z.email() })).enhance(async form => {
+ pending = true;
+ try {
+ await form.submit();
+ form.element.reset();
+ toast.success("Password reset requested", {
+ description:
+ "If the email is associated with an account, you will receive a password reset email shortly.",
+ });
+ } catch (error: any) {
+ // ignore redirects
+ if (error?.status >= 300 && error?.status < 400) {
+ throw error;
}
- })}
+ console.error("forgot failed", error);
+ toast.error("Password reset request failed", { description: error?.body.message });
+ } finally {
+ pending = false;
+ }
+ })}
/>
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index bf7fd5b..523ad62 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -1,41 +1,44 @@
diff --git a/src/routes/onboarding/[token]/+page.svelte b/src/routes/onboarding/[token]/+page.svelte
index 754c63f..1f17c1e 100644
--- a/src/routes/onboarding/[token]/+page.svelte
+++ b/src/routes/onboarding/[token]/+page.svelte
@@ -26,11 +26,11 @@
-
{formatTime(record.timestamp)}
diff --git a/src/routes/forgot/+page.svelte b/src/routes/forgot/+page.svelte
index 7ada4f8..1b89251 100644
--- a/src/routes/forgot/+page.svelte
+++ b/src/routes/forgot/+page.svelte
@@ -24,28 +24,26 @@
{record.studentId}
+{record.wallet_pass_id}
{record.eventName}
-
+
+
-
+
-
+
- {
- pending = true;
- try {
- await submit();
- form.reset();
- } catch (error: any) {
- // ignore redirects
- if (error?.status >= 300 && error?.status < 400) {
- throw error;
+
\ No newline at end of file
+ })}
+ />
+
+
-
-
+
-
+ {
+ pending = true;
+ try {
+ await form.submit();
+ form.element.reset();
+ } catch (error: any) {
+ // ignore redirects
+ if (error?.status >= 300 && error?.status < 400) {
+ throw error;
+ }
+ console.error("login failed", error);
+ toast.error("Login failed", { description: error?.body.message });
+ } finally {
+ pending = false;
}
- console.error("login failed", error);
- toast.error("Login failed", { description: error?.body.message });
- } finally {
- pending = false;
- }
- })}/>
-
-