diff --git a/apps/web/public/img/dash/pass/bg.png b/apps/web/public/img/dash/pass/bg.png index 646062c6..9fa91c6f 100644 Binary files a/apps/web/public/img/dash/pass/bg.png and b/apps/web/public/img/dash/pass/bg.png differ diff --git a/apps/web/src/app/api/registration/create/route.ts b/apps/web/src/app/api/registration/create/route.ts index 783dc742..836a7c1a 100644 --- a/apps/web/src/app/api/registration/create/route.ts +++ b/apps/web/src/app/api/registration/create/route.ts @@ -104,9 +104,9 @@ export async function POST(req: Request) { skills: body.skills.map((v) => v.text.toLowerCase()), profilePhoto: user.imageUrl, isFullyRegistered: true, - phoneNumber:body.phoneNumber, + phoneNumber: body.phoneNumber, isSearchable: body.profileIsSearchable, - countryOfResidence:body.countryOfResidence, + countryOfResidence: body.countryOfResidence, }); await tx.insert(userHackerData).values({ diff --git a/apps/web/src/app/dash/pass/page.tsx b/apps/web/src/app/dash/pass/page.tsx index cf75abd6..0dc16f3f 100644 --- a/apps/web/src/app/dash/pass/page.tsx +++ b/apps/web/src/app/dash/pass/page.tsx @@ -51,8 +51,8 @@ function EventPass({ qrPayload, user, clerk, guild }: EventPassProps) { return (
-
-
+
+
{`${user.firstName}'s
-
-
- {""} -
-
- {/* {``} */} +
+
+
+ {""} +
+
+

{c.hackathonName}{" "} - + {c.itteration}

@@ -106,10 +102,10 @@ function EventPass({ qrPayload, user, clerk, guild }: EventPassProps) {
-
+
-
+
+
}> -
-
- -
- - +
+
+ +
+ + {/* */} - - -
+ + +
); } export const runtime = "edge"; -export const revalidate = 30; \ No newline at end of file +export const revalidate = 30; diff --git a/apps/web/src/components/dash/shared/TiltWrapper.tsx b/apps/web/src/components/dash/shared/TiltWrapper.tsx index 5b8e531b..2a04d502 100644 --- a/apps/web/src/components/dash/shared/TiltWrapper.tsx +++ b/apps/web/src/components/dash/shared/TiltWrapper.tsx @@ -18,7 +18,7 @@ export default function TiltWrapper({ children }: { children: ReactNode }) { tiltReverse={true} glareEnable={doTilt} glareMaxOpacity={0.2} - glareColor="hsl(var(--hackathon-primary))" + glareColor="#94a3b8" glarePosition="all" glareBorderRadius="1.5rem" tiltEnable={doTilt} diff --git a/apps/web/src/components/landing/About.tsx b/apps/web/src/components/landing/About.tsx index 190a25cb..d5d802ee 100644 --- a/apps/web/src/components/landing/About.tsx +++ b/apps/web/src/components/landing/About.tsx @@ -24,12 +24,12 @@ export default function About() { return (
-
+
{/* ABOUT US Section */} -
+

ABOUT US

@@ -45,7 +45,7 @@ export default function About() {
{/* WHO CAN ATTEND Section */} -
+

WHO CAN ATTEND?

@@ -62,7 +62,7 @@ export default function About() { {/* Celebrating 10 Years Section */}
-
+

CELEBRATING 10 YEARS
@@ -71,9 +71,7 @@ export default function About() { {/* Mobile: Truncated content with read more */}
{/* Animation for scrolling. Has to have exact heights so it knows where to animate to and from*/} - + <> {isExpanded ? "This year marks a significant milestone for RowdyHacks, as we celebrate 10 years of fostering creativity, collaboration, and mentorship right here at UTSA! Since our inception, RowdyHacks has brought together students, developers, and tech enthusiasts from all walks of life to engage in healthy competition, collaborate on innovative projects, and learn new skills they might not encounter in a traditional classroom setting. Over the past decade, we've witnessed incredible growth. We take pride in our inclusive community-building and empowering the next generation of tech leaders. Together, we've created an ecosystem where innovation thrives, friendships are formed, and the future is built, one hack at a time. As we celebrate this remarkable journey, we look forward to what the next 10 years hold for RowdyHacks. Whether you've been with us from the start or are joining us for the first time, let's make this milestone year one to remember. Let's hack, create, and shape the future—together!" diff --git a/apps/web/src/components/landing/Footer.tsx b/apps/web/src/components/landing/Footer.tsx index 7bc59c0a..b4ab3628 100644 --- a/apps/web/src/components/landing/Footer.tsx +++ b/apps/web/src/components/landing/Footer.tsx @@ -66,7 +66,7 @@ export default function Footer() {

Made with </> & ♥ @ RowdyHacks
© RowdyHacks & Association of Computing Machinery - at UTSA2024. All Rights Reserved. + at UTSA 2024. All Rights Reserved.

diff --git a/apps/web/src/components/landing/Hero.tsx b/apps/web/src/components/landing/Hero.tsx index acfcd202..08b2ae73 100644 --- a/apps/web/src/components/landing/Hero.tsx +++ b/apps/web/src/components/landing/Hero.tsx @@ -7,33 +7,34 @@ export default function Home() {
- +

{"HACK<"} -
+
{"&future>"}

-

+

October 26th - 27th 2024

-
- -
-
-

+

+ SAN PEDRO I, UTSA +

+
+ +
+
+

register

-
+
+
- ); } @@ -42,12 +43,6 @@ function Overlay() { return (
- {/* Start Corners */} - {/*
-
-
-
*/} - {/* End Corners */}

ROWDYHACKS X · SAN PEDRO I, UTSA

diff --git a/apps/web/src/components/landing/TeamMember.tsx b/apps/web/src/components/landing/TeamMember.tsx index 870d8eeb..63cfab4a 100644 --- a/apps/web/src/components/landing/TeamMember.tsx +++ b/apps/web/src/components/landing/TeamMember.tsx @@ -12,6 +12,7 @@ import { import { Oswald } from "next/font/google"; import Image from "next/image"; import { useState } from "react"; +import c from "config"; const oswald = Oswald({ variable: "--font-oswald", subsets: ["latin"], @@ -99,7 +100,7 @@ export default function TeamMember({ person }: { person: Person }) { priority={true} alt="Person Placeholder" onError={(e) => { - setSrc("/img/logo/hackkit.svg"); + setSrc(`${c.icon.svg}`); setStyling(FallBackStyling); }} /> diff --git a/apps/web/src/components/landing/WorkWithUs.tsx b/apps/web/src/components/landing/WorkWithUs.tsx index 0da3ac4b..7adbba9b 100644 --- a/apps/web/src/components/landing/WorkWithUs.tsx +++ b/apps/web/src/components/landing/WorkWithUs.tsx @@ -4,9 +4,9 @@ import Link from "next/link"; export default function WorkWithUs() { return ( -
-
-
+
+
+

Volunteers/Mentors

@@ -40,7 +40,7 @@ export default function WorkWithUs() {
-
+

Partners

diff --git a/apps/web/src/components/registration/RegisterForm.tsx b/apps/web/src/components/registration/RegisterForm.tsx index a78c3547..a7d81759 100644 --- a/apps/web/src/components/registration/RegisterForm.tsx +++ b/apps/web/src/components/registration/RegisterForm.tsx @@ -92,8 +92,8 @@ export default function RegisterForm({ defaultEmail }: RegisterFormProps) { shirtSize: "" as any, schoolID: "", university: "", - phoneNumber:"", - countryOfResidence:"", + phoneNumber: "", + countryOfResidence: "", }, }); @@ -116,10 +116,9 @@ export default function RegisterForm({ defaultEmail }: RegisterFormProps) { } }, [universityValue]); - - useEffect(()=>{ - console.log(countryValue) - },[countryValue]) + useEffect(() => { + console.log(countryValue); + }, [countryValue]); async function onSubmit(data: z.infer) { console.log(data); @@ -180,7 +179,7 @@ export default function RegisterForm({ defaultEmail }: RegisterFormProps) { setIsLoading(false); alert( `Something went wrong while attempting to register. Please try again. If this is a continuing issue, please reach out to us at ${c.issueEmail}.`, - ) + ); return console.log( `Recieved a unexpected response from the server. Please try again. If this is a continuing issue, please reach out to us at ${c.issueEmail}.`, ); diff --git a/apps/web/src/components/shared/Navbar.tsx b/apps/web/src/components/shared/Navbar.tsx index a7f212f6..7dd8d928 100644 --- a/apps/web/src/components/shared/Navbar.tsx +++ b/apps/web/src/components/shared/Navbar.tsx @@ -5,11 +5,11 @@ import { Button } from "../shadcn/ui/button"; import ProfileButton from "./ProfileButton"; import { auth, currentUser } from "@clerk/nextjs"; import NavBarLinksGrouper from "./NavBarLinksGrouper"; -import { Oswald } from "next/font/google"; +import { Open_Sans } from "next/font/google"; import { cn } from "@/lib/utils/client/cn"; -const oswald = Oswald({ - variable: "--font-oswald", +const openSans = Open_Sans({ + variable: "--font-open-sans", subsets: ["latin"], }); @@ -23,7 +23,7 @@ export default async function Navbar({ className }: NavbarProps) {
@@ -40,7 +40,9 @@ export default async function Navbar({ className }: NavbarProps) { height={32} /> {/*
*/} -

+

{c.hackathonName}

diff --git a/apps/web/src/components/shared/ProfileButton.tsx b/apps/web/src/components/shared/ProfileButton.tsx index f521fa5e..c05dd48e 100644 --- a/apps/web/src/components/shared/ProfileButton.tsx +++ b/apps/web/src/components/shared/ProfileButton.tsx @@ -147,6 +147,11 @@ export default async function ProfileButton() { Profile + + + Dashboard + + Event Pass diff --git a/apps/web/src/validators/shared/RegisterForm.ts b/apps/web/src/validators/shared/RegisterForm.ts index 7b212037..a0a81f1d 100644 --- a/apps/web/src/validators/shared/RegisterForm.ts +++ b/apps/web/src/validators/shared/RegisterForm.ts @@ -9,7 +9,9 @@ const defaultPrettyError = { const noProfanityValidator = (val: any) => !isProfane(val); const noProfanityMessage = "Profanity is not allowed"; -const countryCodesArray = c.registration.countries.map(countryObject => countryObject.code); +const countryCodesArray = c.registration.countries.map( + (countryObject) => countryObject.code, +); export const RegisterFormValidator = z.object({ firstName: z @@ -49,25 +51,25 @@ export const RegisterFormValidator = z.object({ z.literal("PREFERNOTSAY", defaultPrettyError), ]), race: z.union([ - z.literal("Asian Indian",defaultPrettyError), - z.literal("Asian (Other)",defaultPrettyError), - z.literal("Black or African",defaultPrettyError), - z.literal("Chinese",defaultPrettyError), - z.literal("Filipino",defaultPrettyError), - z.literal("Guamanian or Chamorro",defaultPrettyError), - z.literal("Hispanic / Latino / Spanish Origin",defaultPrettyError), - z.literal("Japanese",defaultPrettyError), - z.literal("Korean",defaultPrettyError), - z.literal("Middle Eastern",defaultPrettyError), - z.literal("Native American or Alaskan Native",defaultPrettyError), - z.literal("Native Hawaiian",defaultPrettyError), - z.literal("Samoan",defaultPrettyError), - z.literal("Vietnamese",defaultPrettyError), - z.literal("White",defaultPrettyError), - z.literal("Other Asian (Thai, Cambodian, etc)",defaultPrettyError), - z.literal("Other Pacific Islander",defaultPrettyError), - z.literal("Other",defaultPrettyError), - z.literal("Prefer Not to Answer",defaultPrettyError), + z.literal("Asian Indian", defaultPrettyError), + z.literal("Asian (Other)", defaultPrettyError), + z.literal("Black or African", defaultPrettyError), + z.literal("Chinese", defaultPrettyError), + z.literal("Filipino", defaultPrettyError), + z.literal("Guamanian or Chamorro", defaultPrettyError), + z.literal("Hispanic / Latino / Spanish Origin", defaultPrettyError), + z.literal("Japanese", defaultPrettyError), + z.literal("Korean", defaultPrettyError), + z.literal("Middle Eastern", defaultPrettyError), + z.literal("Native American or Alaskan Native", defaultPrettyError), + z.literal("Native Hawaiian", defaultPrettyError), + z.literal("Samoan", defaultPrettyError), + z.literal("Vietnamese", defaultPrettyError), + z.literal("White", defaultPrettyError), + z.literal("Other Asian (Thai, Cambodian, etc)", defaultPrettyError), + z.literal("Other Pacific Islander", defaultPrettyError), + z.literal("Other", defaultPrettyError), + z.literal("Prefer Not to Answer", defaultPrettyError), ]), ethnicity: z.union([ z.literal("Hispanic or Latino", defaultPrettyError), @@ -163,9 +165,9 @@ export const RegisterFormValidator = z.object({ }) .toLowerCase() .refine(noProfanityValidator, noProfanityMessage), - profileDiscordName: z - .string() - .max(40, { message: "Username should not be longer than 40 characters" }), + profileDiscordName: z.string().max(40, { + message: "Username should not be longer than 40 characters", + }), pronouns: z.string().min(1).max(15), bio: z .string() diff --git a/packages/config/hackkit.config.ts b/packages/config/hackkit.config.ts index fed8c6dd..ee510cda 100644 --- a/packages/config/hackkit.config.ts +++ b/packages/config/hackkit.config.ts @@ -804,7 +804,7 @@ const c = { links: [ { name: "Open Source", - link: "https://github.com/acmutsa/CodeQuantum2023", + link: "https://github.com/acmutsa/HackKit", }, ], otherHackathons: [ @@ -861,10 +861,10 @@ const c = { guide: "https://go.rowdyhacks.org/discord", }, icon: { - sm: "/img/logo/hackkit.svg", + sm: "/img/logo/rhbttf.svg", md: "/img/logo/hackkit-md.png", lg: "/img/logo/hackkit-lg.png", - svg: "/img/logo/hackkit.svg", + svg: "/img/logo/rhbttf.svg", }, dashPaths: { dash: { @@ -897,12 +897,12 @@ const c = { maxResumeSizeInBytes: 4194304, maxProfilePhotoSizeInBytes: 3145728, maxFileSizeInBytes: 4194304, - eventPassBgImage: "/img/dash/pass/bg.png", + eventPassBgImage: "/img/logo/rhbttf.svg", noResumeProvidedURL: "https://static.acmutsa.org/No%20Resume%20Provided.pdf", // Come in and change this date to whenever the hackathon starts startDate: new Date(new Date(2024, 9, 26).setHours(9)), - prettyLocation: "San Pedro I", + prettyLocation: "San Pedro I, UTSA", roleBadges: { hacker: { title: "Hacker", @@ -972,17 +972,8 @@ const publicRoutes = [ /^\/user\//, "/404", "/bugreport", + "/faq", ]; -// Generally it is reccomended to put your primary audience's university at the top of this list. - - - - export default c; -export { - defaultTheme, - bucketResumeBaseUploadUrl, - perms, - publicRoutes, -}; +export { defaultTheme, bucketResumeBaseUploadUrl, perms, publicRoutes }; diff --git a/packages/db/schema.ts b/packages/db/schema.ts index 391c674f..02f79c5c 100644 --- a/packages/db/schema.ts +++ b/packages/db/schema.ts @@ -76,7 +76,9 @@ export const userCommonData = pgTable("user_common_data", { skills: json("skills").notNull().$type().default([]), profilePhoto: varchar("profile_photo", { length: 255 }).notNull(), phoneNumber: varchar("phone_number", { length: 30 }).notNull(), - countryOfResidence: varchar("country_of_residence", { length: 3 }).notNull(), + countryOfResidence: varchar("country_of_residence", { + length: 3, + }).notNull(), // metadata isFullyRegistered: boolean("is_fully_registered").notNull().default(false),