From 552f18174d9f2c29d8479fca6161962e4ffbec69 Mon Sep 17 00:00:00 2001 From: J164 Date: Tue, 17 Dec 2024 15:15:58 -0600 Subject: [PATCH 1/2] fix text color on landing page --- components/Home/Events/Events.module.scss | 1 + components/Home/Events/Events.tsx | 4 ++-- next.config.js | 12 +----------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/components/Home/Events/Events.module.scss b/components/Home/Events/Events.module.scss index a6796e97..7370ff56 100644 --- a/components/Home/Events/Events.module.scss +++ b/components/Home/Events/Events.module.scss @@ -52,6 +52,7 @@ top: 17%; left: 50%; transform: translateX(-50%); + color: black; h1 { font-size: 81px; diff --git a/components/Home/Events/Events.tsx b/components/Home/Events/Events.tsx index f492b5b6..c2729055 100644 --- a/components/Home/Events/Events.tsx +++ b/components/Home/Events/Events.tsx @@ -16,14 +16,14 @@ const Events: FC = () => { Urbana-Champaign's premiere collegiate hackathon.

- Join us in-person from February 23th to February 25th at the + Join us in-person from February 28th to March 2nd at the Siebel Center for Computer Science! Participants can work individually or in teams to submit projects to a specific track for a chance to win prizes.{" "}

- Adventure awaits! + Pursue your prophecy!

diff --git a/next.config.js b/next.config.js index 41696fd1..658404ac 100644 --- a/next.config.js +++ b/next.config.js @@ -1,14 +1,4 @@ /** @type {import('next').NextConfig} */ -const nextConfig = { - async redirects() { - return [ - { - source: "/", - destination: "https://hype.hackillinois.org", - permanent: false - } - ]; - } -}; +const nextConfig = {}; module.exports = nextConfig; From 5f568d78f9324265989fc3b42b60ea61d9f241bf Mon Sep 17 00:00:00 2001 From: J164 Date: Tue, 17 Dec 2024 15:16:17 -0600 Subject: [PATCH 2/2] ask code of conduct question --- .../Pages/Transportation/Transportation.tsx | 40 ++++--------------- components/Registration/validation.ts | 8 +--- util/api.ts | 3 +- util/types.ts | 1 + 4 files changed, 12 insertions(+), 40 deletions(-) diff --git a/components/Registration/Pages/Transportation/Transportation.tsx b/components/Registration/Pages/Transportation/Transportation.tsx index cd819711..7d24d818 100644 --- a/components/Registration/Pages/Transportation/Transportation.tsx +++ b/components/Registration/Pages/Transportation/Transportation.tsx @@ -4,29 +4,10 @@ import Checkboxes, { import styles from "./Transportation.module.scss"; import React from "react"; -const travelAcknowledgeOptions = [ +const acknowledgeOptions = [ { - label: "Yes", - value: "YES", - isRadio: true - }, - { - label: "No", - value: "NO", - isRadio: true - } -] satisfies CheckboxOption[]; - -const travelMethodOptions = [ - { - label: "Self Travel", - value: "SELF_TRAVEL", - isRadio: true - }, - { - label: "Bus Charter", - value: "BUS_CHARTER", - isRadio: true + label: "", + value: "YES" } ] satisfies CheckboxOption[]; @@ -37,18 +18,11 @@ type PropTypes = { const Transportation: React.FC = ({ onChangePage }) => { return (
-

Transportation

- +

Code of Conduct

diff --git a/components/Registration/validation.ts b/components/Registration/validation.ts index 25b43cc1..0c00db05 100644 --- a/components/Registration/validation.ts +++ b/components/Registration/validation.ts @@ -58,14 +58,10 @@ const hackSpecific = yup.object({ }); const transportation = yup.object({ - travelAcknowledge: yup + acknowledge: yup .array() .of(yup.string()) - .min(1, "Please select one option"), - travelMethod: yup - .array() - .of(yup.string()) - .min(1, "Please select one option") + .min(1, "Please acknowledge the Code of Conduct") }); const registrationSchemas = [ diff --git a/util/api.ts b/util/api.ts index 5a91e657..8884fdd8 100644 --- a/util/api.ts +++ b/util/api.ts @@ -165,7 +165,7 @@ export async function uploadFile(file: File, type: FileType): Promise { export function registerUpdate( registration: RegistrationType ): Promise> { - console.log("submitted", registration); + // console.log("submitted", registration); return requestv2("POST", `/registration`, registration).catch(body => handleError(body) ); @@ -210,6 +210,7 @@ export function registrationFromAPI( return { ...registration, + acknowledge: [], race: registration.race.length === 1 ? registration.race[0] : "", gradYear: registration.gradYear === 0 ? "" : `${registration.gradYear}`, requestedTravelReimbursement, diff --git a/util/types.ts b/util/types.ts index 8c6291ad..3e1b1c7b 100644 --- a/util/types.ts +++ b/util/types.ts @@ -23,6 +23,7 @@ export type RegistrationData = { hackOutreach: string[]; hackInterest: string[]; dietaryRestrictions: string[]; + acknowledge: string[]; requestedTravelReimbursement: string[]; isProApplicant: boolean; };