diff --git a/.env.example b/.env.example index bb272bc96..e07a867d1 100644 --- a/.env.example +++ b/.env.example @@ -35,6 +35,8 @@ MINIO_SECRET_KEY="minioadmin" # Blade URL BLADE_URL="http://localhost:3000" +NEXT_PUBLIC_BLADE_URL="http://localhost:3000" +BLOOMKNIGHTS_URL="http://localhost:3006" # Passkit WWDR_CERT_BASE64="wwdr-cert-b64" @@ -48,4 +50,4 @@ TEAM_IDENTIFIER="team-identifier" LISTMONK_URL="https://localhost/" LISTMONK_USER="ci" LISTMONK_TOKEN="ci" -LISTMONK_FROM_EMAIL="ci@localhost" \ No newline at end of file +LISTMONK_FROM_EMAIL="ci@localhost" diff --git a/apps/blade/src/app/_components/admin/hackathon/manage/hackathon-manager.tsx b/apps/blade/src/app/_components/admin/hackathon/manage/hackathon-manager.tsx index 3b5c8573f..368e14dd1 100644 --- a/apps/blade/src/app/_components/admin/hackathon/manage/hackathon-manager.tsx +++ b/apps/blade/src/app/_components/admin/hackathon/manage/hackathon-manager.tsx @@ -1,7 +1,6 @@ "use client"; import { useState } from "react"; -import Link from "next/link"; import { ExternalLink, Loader2, Pencil, Plus, ShieldCheck } from "lucide-react"; import { z } from "zod"; @@ -55,7 +54,9 @@ import { getHackathonBackgroundIssues, getHackathonDateWindowIssues, getHackathonEmailTemplateIssues, + hackathonConfirmationCapacitySchema, hackathonDisplayNameSchema, + hackathonPortalBaseUrlSchema, hackathonRouteNameSchema, hackathonThemeSchema, } from "@forge/validators"; @@ -105,6 +106,8 @@ const formSchema = z applicationBackgroundKey: hackathonApplicationBackgroundKeySchema, emailTemplateEnabled: z.boolean(), emailTemplateKey: hackathonEmailTemplateKeySchema, + portalBaseUrl: z.string(), + confirmationCapacity: z.string(), applicationOpen: z.string().min(1, "Application open is required."), applicationDeadline: z.string().min(1, "Application deadline is required."), confirmationDeadline: z @@ -119,6 +122,28 @@ const formSchema = z const confirmationDeadline = new Date(values.confirmationDeadline); const startDate = new Date(values.startDate); const endDate = new Date(values.endDate); + const portalResult = hackathonPortalBaseUrlSchema.safeParse( + values.portalBaseUrl, + ); + const capacityResult = hackathonConfirmationCapacitySchema.safeParse( + values.confirmationCapacity, + ); + + if (!portalResult.success) { + ctx.addIssue({ + code: z.ZodIssueCode.custom, + message: portalResult.error.issues[0]?.message ?? "Invalid portal URL.", + path: ["portalBaseUrl"], + }); + } + + if (!capacityResult.success) { + ctx.addIssue({ + code: z.ZodIssueCode.custom, + message: capacityResult.error.issues[0]?.message ?? "Invalid capacity.", + path: ["confirmationCapacity"], + }); + } for (const issue of getHackathonBackgroundIssues(values)) { ctx.addIssue({ @@ -197,6 +222,8 @@ function getDefaultValues( ), emailTemplateEnabled: hackathon.emailTemplateEnabled, emailTemplateKey: getSafeEmailTemplateKey(hackathon.emailTemplateKey), + portalBaseUrl: hackathon.portalBaseUrl ?? "", + confirmationCapacity: hackathon.confirmationCapacity?.toString() ?? "", applicationOpen: toDateTimeLocalValue(hackathon.applicationOpen), applicationDeadline: toDateTimeLocalValue(hackathon.applicationDeadline), confirmationDeadline: toDateTimeLocalValue( @@ -223,6 +250,8 @@ function getDefaultValues( applicationBackgroundKey: DEFAULT_BACKGROUND_KEY, emailTemplateEnabled: false, emailTemplateKey: DEFAULT_EMAIL_TEMPLATE_KEY, + portalBaseUrl: "", + confirmationCapacity: "", applicationOpen: toDateTimeLocalValue(applicationOpen), applicationDeadline: toDateTimeLocalValue(applicationDeadline), confirmationDeadline: toDateTimeLocalValue(confirmationDeadline), @@ -246,6 +275,10 @@ function toMutationPayload(values: HackathonFormValues) { emailTemplateKey: values.emailTemplateEnabled ? (values.emailTemplateKey as EmailTemplateKey | undefined) : null, + portalBaseUrl: hackathonPortalBaseUrlSchema.parse(values.portalBaseUrl), + confirmationCapacity: hackathonConfirmationCapacitySchema.parse( + values.confirmationCapacity, + ), applicationOpen: new Date(values.applicationOpen), applicationDeadline: new Date(values.applicationDeadline), confirmationDeadline: new Date(values.confirmationDeadline), @@ -401,8 +434,15 @@ export function HackathonManager() {
{hackathon.displayName}
- /hacker/application/{hackathon.name} + {hackathon.portalBaseUrl ?? + "No participant portal configured"}
+ {hackathon.confirmationCapacity != null && ( +
+ Capacity:{" "} + {hackathon.confirmationCapacity.toLocaleString()} +
+ )}
@@ -437,12 +477,20 @@ export function HackathonManager() {
- + {hackathon.portalBaseUrl ? ( + + ) : ( + Portal missing + )}
diff --git a/apps/blade/src/app/_components/dashboard/dashboard-entry-dialogs.tsx b/apps/blade/src/app/_components/dashboard/dashboard-entry-dialogs.tsx deleted file mode 100644 index b6f8e7509..000000000 --- a/apps/blade/src/app/_components/dashboard/dashboard-entry-dialogs.tsx +++ /dev/null @@ -1,89 +0,0 @@ -"use client"; - -import { useState } from "react"; -import Link from "next/link"; - -import { Button } from "@forge/ui/button"; -import { - Dialog, - DialogClose, - DialogContent, - DialogDescription, - DialogFooter, - DialogHeader, - DialogTitle, -} from "@forge/ui/dialog"; - -import { TacoTuesday } from "../discord-modal"; - -interface DashboardHackathon { - applicationsOpen: boolean; - displayName: string; - isLive: boolean; - name: string; -} - -export function DashboardEntryDialogs({ - currentHackathon, - hasHacker, - hasMember, - showDiscordPrompt, -}: { - currentHackathon: DashboardHackathon | null; - hasHacker: boolean; - hasMember: boolean; - showDiscordPrompt: boolean; -}) { - const [routingOpen, setRoutingOpen] = useState(currentHackathon != null); - - const hackathonAction = hasHacker - ? `Open ${currentHackathon?.displayName ?? "Hackathon"} Dashboard` - : currentHackathon?.applicationsOpen - ? `Register for ${currentHackathon.displayName}` - : `View ${currentHackathon?.displayName ?? "Hackathon"}`; - const memberAction = hasMember - ? "Continue to Member Dashboard" - : "Explore Knight Hacks Membership"; - - return ( - <> - {currentHackathon && ( - - - - - {currentHackathon.displayName} is{" "} - {currentHackathon.isLive ? "live" : "coming up"} - - - {hasHacker - ? `You have a ${currentHackathon.displayName} application. Choose which dashboard you want to open.` - : `Choose whether you are here for ${currentHackathon.displayName} or year-round Knight Hacks membership.`} - - - - - - - - - - - )} - - {!routingOpen && showDiscordPrompt && } - - ); -} diff --git a/apps/blade/src/app/_components/dashboard/hackathon-dashboard/components.tsx b/apps/blade/src/app/_components/dashboard/hackathon-dashboard/components.tsx deleted file mode 100644 index c4f4e8c36..000000000 --- a/apps/blade/src/app/_components/dashboard/hackathon-dashboard/components.tsx +++ /dev/null @@ -1,88 +0,0 @@ -import type { SelectHackathon } from "@forge/db/schemas/knight-hacks"; - -import type { api as serverCall } from "~/trpc/server"; -import { HackerAppCard } from "~/app/_components/option-cards"; -import { BaseHackathonCountdown } from "./countdown"; -import { BaseHackathonData } from "./hackathon-data"; -import { BaseHackathonUpcomingEvents } from "./upcoming-events"; - -export { - BaseHackathonGuideButton, - BaseHackathonQRCodeButton, - BaseHackathonWalletButton, -} from "./hackathon-data"; -export { BaseHackathonCountdown } from "./countdown"; -export * from "./issue-dialog"; -export { BaseHackathonUpcomingEvents } from "./upcoming-events"; - -const DEFAULT_HACKER_GUIDE_HREF = - "https://knight-hacks.notion.site/knight-hacks-viii"; - -export function BaseHackathonRegistrationPrompt({ - hackathon, -}: { - hackathon: SelectHackathon; -}) { - return ( -
-

- Register for {hackathon.displayName} today! -

-
- -
-
- ); -} - -export function BaseHackathonDashboard({ - guideHref = DEFAULT_HACKER_GUIDE_HREF, - hackathon, - hacker, -}: { - guideHref?: string; - hackathon: SelectHackathon; - hacker: Awaited>; -}) { - if (!hacker) { - return ; - } - - return ( - <> -
- - -
- -
- -
-
-
- -
-
-
- -
-
-
- -
-
- -
- - ); -} diff --git a/apps/blade/src/app/_components/dashboard/hackathon-dashboard/countdown.tsx b/apps/blade/src/app/_components/dashboard/hackathon-dashboard/countdown.tsx deleted file mode 100644 index 3bab0cd08..000000000 --- a/apps/blade/src/app/_components/dashboard/hackathon-dashboard/countdown.tsx +++ /dev/null @@ -1,127 +0,0 @@ -"use client"; - -import { useEffect, useState } from "react"; - -import { Card, CardContent } from "@forge/ui/card"; - -export function BaseHackathonCountdown({ endDate }: { endDate: Date }) { - const [timeLeft, setTimeLeft] = useState({ - days: 0, - hours: 0, - minutes: 0, - seconds: 0, - }); - - useEffect(() => { - const targetDate = endDate.getTime(); - - const updateCountdown = () => { - const now = new Date().getTime(); - const distance = targetDate - now; - - if (distance < 0) { - setTimeLeft({ days: 0, hours: 0, minutes: 0, seconds: 0 }); - return; - } - - const days = Math.floor(distance / (1000 * 60 * 60 * 24)); - const hours = Math.floor( - (distance % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60), - ); - const minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60)); - const seconds = Math.floor((distance % (1000 * 60)) / 1000); - - setTimeLeft({ days, hours, minutes, seconds }); - }; - - updateCountdown(); - const interval = setInterval(updateCountdown, 1000); - - return () => clearInterval(interval); - }, [endDate]); - - const formatNumber = (num: number) => String(num).padStart(2, "0"); - - return ( -
- - -

- HACKING ENDS IN -

- -
- {/* Days */} -
- - -
- {formatNumber(timeLeft.days)} -
-
- Days -
-
- D -
- - -
:
-
- - {/* Hours */} -
- - -
- {formatNumber(timeLeft.hours)} -
-
- Hours -
-
- H -
- - -
:
-
- - {/* Minutes */} -
- - -
- {formatNumber(timeLeft.minutes)} -
-
- Minutes -
-
- M -
- - -
:
-
- - {/* Seconds */} - - -
- {formatNumber(timeLeft.seconds)} -
-
- Seconds -
-
- S -
- - -
- - -
- ); -} diff --git a/apps/blade/src/app/_components/dashboard/hackathon-dashboard/hackathon-data.tsx b/apps/blade/src/app/_components/dashboard/hackathon-dashboard/hackathon-data.tsx deleted file mode 100644 index 5b2f6f9de..000000000 --- a/apps/blade/src/app/_components/dashboard/hackathon-dashboard/hackathon-data.tsx +++ /dev/null @@ -1,137 +0,0 @@ -"use client"; - -import Link from "next/link"; -import { BookOpen, CircleCheckBig } from "lucide-react"; - -import type { SelectHackathon } from "@forge/db/schemas/knight-hacks"; -import { Button } from "@forge/ui/button"; - -import type { api as serverCall } from "~/trpc/server"; -import { HackerQRCodePopup } from "~/app/_components/dashboard/hacker-dashboard/hacker-qr-button"; -import { DownloadQRPass } from "~/app/_components/dashboard/member-dashboard/download-qr-pass"; -import { HACKER_STATUS_MAP } from "~/consts"; -import { api } from "~/trpc/react"; -import { BaseHackathonIssueButton } from "./issue-dialog"; - -type HackerProfile = Awaited< - ReturnType<(typeof serverCall.hackerQuery)["getHacker"]> ->; - -export function BaseHackathonQRCodeButton() { - return ; -} - -export function BaseHackathonWalletButton({ - profile, -}: { - profile: HackerProfile; -}) { - return ( - - ); -} - -export function BaseHackathonGuideButton({ href }: { href: string }) { - return ( - - ); -} - -export function BaseHackathonData({ - data, - guideHref, - hackathon, -}: { - data: HackerProfile; - guideHref: string; - hackathon: SelectHackathon; -}) { - const { data: hacker, isError } = api.hackerQuery.getHacker.useQuery( - { hackathonName: hackathon.name }, - { - initialData: data, - }, - ); - - if (isError || !hacker) { - return ( -
-

- Something went wrong. Please refresh and try again. -

-
- ); - } - - const hackerStatus = HACKER_STATUS_MAP.checkedin.name; - const hackerStatusColor = HACKER_STATUS_MAP.checkedin.color; - - return ( -
- {/* Name, Status, and Actions */} -
- {/* Profile Card */} -
-
- {/* Name and Info Column */} -
-

- {hacker.firstName} {hacker.lastName} -

- - {/* Status Badge */} -
-
- - {hackerStatus} - - - -
-
-
-
-
- - {/* Action Buttons */} -
-

- Quick Actions -

- - {/* Primary actions */} -
- - -
- - {/* Secondary actions */} -
- - -
-
-
-
- ); -} diff --git a/apps/blade/src/app/_components/dashboard/hackathon-dashboard/issue-dialog.tsx b/apps/blade/src/app/_components/dashboard/hackathon-dashboard/issue-dialog.tsx deleted file mode 100644 index 2dbd7d119..000000000 --- a/apps/blade/src/app/_components/dashboard/hackathon-dashboard/issue-dialog.tsx +++ /dev/null @@ -1,96 +0,0 @@ -"use client"; - -import { useState } from "react"; -import { AlertCircle } from "lucide-react"; - -import { Button } from "@forge/ui/button"; -import { - Dialog, - DialogContent, - DialogDescription, - DialogFooter, - DialogHeader, - DialogTitle, - DialogTrigger, -} from "@forge/ui/dialog"; -import { Label } from "@forge/ui/label"; -import { Textarea } from "@forge/ui/textarea"; -import { toast } from "@forge/ui/toast"; - -import { api } from "~/trpc/react"; - -export function BaseHackathonIssueButton() { - const [open, setOpen] = useState(false); - const [issue, setIssue] = useState(""); - - const reportIssueMutation = - api.eventFeedback.logHackathonFeedback.useMutation({ - onSuccess: () => { - setOpen(false); - setIssue(""); - toast.success("Issue reported successfully!"); - }, - onError: (error) => { - const errorMessage = - error instanceof Error ? error.message : "An error occurred"; - toast.error(`Error: ${errorMessage}`); - }, - }); - - const handleSubmit = (e: React.FormEvent) => { - e.preventDefault(); - if (issue.trim()) { - reportIssueMutation.mutate({ description: issue }); - } - }; - - return ( - - - - - -
- - Report an Issue - - Describe the issue you're experiencing. We'll look into it as soon - as possible. - - -
-
- -