Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-unnecessary-condition */
/* eslint-disable @typescript-eslint/no-empty-function */
/* eslint-disable @typescript-eslint/no-unsafe-call */

"use client";

import { useEffect, useRef, useState } from "react";
import confetti from "canvas-confetti";
import { Sparkles, Trophy, Volume2, VolumeX } from "lucide-react";

import { Button } from "@forge/ui/button";
Expand Down Expand Up @@ -233,21 +232,6 @@ export default function RaffleDraw({ entries }: { entries: RaffleEntry[] }) {
const finalEntry = visibleEntries[mid];
setWinner(finalEntry ?? null);
playWinnerSound();

// Confetti
if (containerRef.current) {
const rect = containerRef.current.getBoundingClientRect();
void confetti({
particleCount: 150,
spread: 90,
origin: {
x:
rect.left / window.innerWidth +
rect.width / window.innerWidth / 2,
y: rect.top / window.innerHeight,
},
});
}
}
}, animationSpeed);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import ShirtSizePie from "./member-data/ShirtSizePie";
import YearOfStudyPie from "./member-data/YearOfStudyPie";

export default function MemberDemographics() {
const { data: members } = api.member.getMembers.useQuery();
const { data: members } = api.member.getMembers.useQuery({
fetchAll: true,
});
const { data: duesPayingStatus } = api.member.getDuesPayingMembers.useQuery();
const { data: events } = api.event.getEvents.useQuery();
const { data: duesPaymentDates } =
Expand Down
1 change: 0 additions & 1 deletion apps/blade/src/app/admin/forms/[slug]/responses/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export default async function FormResponsesPage({
}: {
params: { slug: string };
}) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const session = await auth();
if (!session) {
redirect(SIGN_IN_PATH);
Expand Down
74 changes: 48 additions & 26 deletions packages/api/src/routers/member.ts
Original file line number Diff line number Diff line change
Expand Up @@ -330,41 +330,63 @@ export const memberRouter = {
getMembers: permProcedure
.input(
z
.object({
currentPage: z.number().min(1).optional(),
pageSize: z.number().min(1).max(100).optional(),
searchTerm: z.string().optional(),
sortField: z
.enum([
"firstName",
"lastName",
"email",
"discordUser",
"dateCreated",
])
.optional(),
sortOrder: z.enum(["desc", "asc"]).optional(),
sortByTime: z.boolean().optional(),
schoolFilter: z.string().optional(),
majorFilter: z.string().optional(),
})
.union([
z.object({
fetchAll: z.literal(true),
}),
z.object({
fetchAll: z.literal(false).optional(),
currentPage: z.number().min(1).optional(),
pageSize: z.number().min(1).optional(),
searchTerm: z.string().optional(),
sortField: z
.enum([
"firstName",
"lastName",
"email",
"discordUser",
"dateCreated",
])
.optional(),
sortOrder: z.enum(["desc", "asc"]).optional(),
sortByTime: z.boolean().optional(),
schoolFilter: z.string().optional(),
majorFilter: z.string().optional(),
}),
])
.optional(),
)
.query(async ({ input, ctx }) => {
controlPerms.or(["READ_MEMBERS", "READ_CLUB_DATA"], ctx);

const currentPage = input?.currentPage ?? 1;
const pageSize = input?.pageSize ?? 10;
// If theres a fetch all flag set to true OR no inputs are passed in get all members
if (
input?.fetchAll ||
(input?.currentPage === undefined &&
input?.pageSize === undefined &&
input?.searchTerm === undefined &&
input?.schoolFilter === undefined &&
input?.majorFilter === undefined &&
input?.sortField === undefined &&
input?.sortByTime === undefined)
) {
return db.query.Member.findMany({
orderBy: asc(Member.id),
});
}

const currentPage = input.currentPage ?? 1;
const pageSize = input.pageSize ?? 10;
const offset = (currentPage - 1) * pageSize;
const searchPattern = `%${input?.searchTerm ?? ""}%`;
const searchPattern = `%${input.searchTerm ?? ""}%`;

// Build the base query
let query = db.select().from(Member);

// Build conditions array
const conditions = [];

if (input?.searchTerm && input.searchTerm.length > 0) {
if (input.searchTerm && input.searchTerm.length > 0) {
conditions.push(
or(
ilike(Member.firstName, searchPattern),
Expand All @@ -377,7 +399,7 @@ export const memberRouter = {
);
}

if (input?.schoolFilter) {
if (input.schoolFilter) {
conditions.push(
eq(
Member.school,
Expand All @@ -386,7 +408,7 @@ export const memberRouter = {
);
}

if (input?.majorFilter) {
if (input.majorFilter) {
conditions.push(
eq(
Member.major,
Expand All @@ -400,7 +422,7 @@ export const memberRouter = {
}

// Sorting
if (input?.sortByTime) {
if (input.sortByTime) {
query = query.orderBy(
input.sortOrder === "desc"
? desc(Member.dateCreated)
Expand All @@ -409,7 +431,7 @@ export const memberRouter = {
? desc(Member.timeCreated)
: asc(Member.timeCreated),
) as typeof query;
} else if (input?.sortField && input.sortOrder) {
} else if (input.sortField && input.sortOrder) {
const sortColumn = Member[input.sortField];
query = query.orderBy(
input.sortOrder === "asc" ? asc(sortColumn) : desc(sortColumn),
Expand Down
7 changes: 2 additions & 5 deletions packages/api/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,11 @@ import Stripe from "stripe";
import z from "zod";

import type { Session } from "@forge/auth/server";
import type { Form } from "@forge/db/schemas/knight-hacks";
import { DISCORD, EVENTS, FORMS, MINIO, PERMISSIONS } from "@forge/consts";
import { db } from "@forge/db/client";
import { JudgeSession, Roles } from "@forge/db/schemas/auth";
import {
Form,
FormSchemaSchema,
FormsSchemas,
} from "@forge/db/schemas/knight-hacks";
import { FormSchemaSchema, FormsSchemas } from "@forge/db/schemas/knight-hacks";
import { client } from "@forge/email";

import { env } from "./env";
Expand Down
Loading