From 308bafb72fd41242a079984eecaa270da54dfb35 Mon Sep 17 00:00:00 2001 From: Zi Nean Teoh <58854510+zineanteoh@users.noreply.github.com> Date: Thu, 7 Sep 2023 11:24:01 -0500 Subject: [PATCH] Switch to VH X application design (#359) * implement apply screen * update info to vhx 2023 * switch assets to vhx * clean up assets * checkpoint for application page * Media query madness * revert to default design (antd is hard to change styling) * clean up old, unused scripts * upgrade codeql analze to v2 * add scan strategy to override default * upgrade codeql version --------- Co-authored-by: jacoblurie29 --- .github/workflows/scan.yml | 11 +- components/signIn.tsx | 16 +- pages/HackerDash.tsx | 307 ++++++++++------ pages/api/email/templates/accepted.ts | 4 +- pages/api/email/templates/confirmed.ts | 5 +- pages/api/email/templates/rejected.ts | 4 +- pages/api/email/templates/reminderToSubmit.ts | 6 +- pages/api/email/templates/submitted.ts | 6 +- pages/api/email/templates/travelForm.ts | 8 +- pages/index.tsx | 8 +- public/background-1.png | Bin 0 -> 62340 bytes public/background-2.png | Bin 46940 -> 0 bytes public/background.png | Bin 35328 -> 827030 bytes public/form-background.png | Bin 745802 -> 0 bytes public/form-background.svg | 1 - public/form-submit.png | Bin 21019 -> 0 bytes public/input-background.png | Bin 11921 -> 0 bytes public/vh-banner.png | Bin 30993 -> 0 bytes public/vh-logo.png | Bin 0 -> 178889 bytes public/vh.png | Bin 60131 -> 284477 bytes public/vhlogo-brown.svg | 1 - scripts/.gitignore | 2 - scripts/addTestUsers.ts | 48 --- scripts/convertJudgeSchedules.py | 64 ---- ...dgeSchedules.py => createJudgeSchedule.py} | 0 scripts/populateDb.ts | 266 -------------- scripts/teams.txt | 100 ----- styles/Form.module.css | 346 ++++++++++++++++-- styles/Signin.module.css | 23 +- 29 files changed, 550 insertions(+), 676 deletions(-) create mode 100644 public/background-1.png delete mode 100644 public/background-2.png delete mode 100644 public/form-background.png delete mode 100644 public/form-background.svg delete mode 100644 public/form-submit.png delete mode 100644 public/input-background.png delete mode 100644 public/vh-banner.png create mode 100644 public/vh-logo.png delete mode 100644 public/vhlogo-brown.svg delete mode 100644 scripts/.gitignore delete mode 100644 scripts/addTestUsers.ts delete mode 100644 scripts/convertJudgeSchedules.py rename scripts/{createJudgeSchedules.py => createJudgeSchedule.py} (100%) delete mode 100644 scripts/populateDb.ts delete mode 100644 scripts/teams.txt diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml index 7dcf19b3..9632c4d1 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -14,12 +14,17 @@ jobs: permissions: security-events: write + strategy: + fail-fast: false + matrix: + language: ['javascript'] + steps: - name: Checkout repository uses: actions/checkout@v2 - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 - name: Autobuild - uses: github/codeql-action/autobuild@v1 + uses: github/codeql-action/autobuild@v2 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 diff --git a/components/signIn.tsx b/components/signIn.tsx index 65058f82..fa8903d9 100644 --- a/components/signIn.tsx +++ b/components/signIn.tsx @@ -19,16 +19,16 @@ export default function SignIn() { style={{ alignItems: 'center', }}> - VandyHacks Logo + VandyHacks Logo
-
- VandyHacks IX +
+ VandyHacks X
@@ -36,7 +36,7 @@ export default function SignIn() { size="large" type="primary" icon={} - style={{ borderRadius: '4px' }} + className={styles.ButtonStyle} onClick={() => signIn('github')}> Sign in with GitHub @@ -50,14 +50,14 @@ export default function SignIn() { // onFinishFailed={onFinishFailed} autoComplete="off"> Email} + label={} name="email" rules={[{ required: true, message: 'Please input your email!' }]}> Password} + label={} name="password" rules={[{ required: true, message: 'Please input your password!' }]}> @@ -67,7 +67,7 @@ export default function SignIn() { size="large" type="primary" icon={} - style={{ borderRadius: '4px' }} + className={styles.ButtonStyle} htmlType="submit"> Sign in with Email diff --git a/pages/HackerDash.tsx b/pages/HackerDash.tsx index d53ab678..722561be 100644 --- a/pages/HackerDash.tsx +++ b/pages/HackerDash.tsx @@ -202,12 +202,11 @@ export default function HackerDash({ userApplicationStatus, setUserApplicationSt {!user && } {user && ( -
- +
+ +
+
VandyHacks X Registration
+
{user.applicationStatus === ApplicationStatus.CREATED && ( -
+
-
+
Signed in as {session?.user?.email}
First Name

} name="firstName" rules={[{ required: true, message: 'Please input your first name!' }]}>
Last Name

} name="lastName" rules={[{ required: true, message: 'Please input your last name!' }]}>
- + Preferred Name

} + name="preferredName">
Gender

} name="gender" rules={[{ required: true, message: 'Please select an option!' }]}> @@ -265,8 +272,9 @@ export default function HackerDash({ userApplicationStatus, setUserApplicationSt
Date of Birth

} rules={[{ required: true, message: 'Please select your date of birth!' }]}>
Phone Number

} name="phoneNumber" rules={[{ required: true, message: 'Please input your phone number!' }]}>
School

} name="school" rules={[{ required: true, message: 'Please input your school!' }]}>
Major

} name="major" rules={[{ required: true, message: 'Please input your major!' }]}>
Graduation Year

} name="graduationYear" rules={[{ required: true, message: 'Please select your graduation year!' }]}> @@ -306,68 +318,82 @@ export default function HackerDash({ userApplicationStatus, setUserApplicationSt
Address Line 1

} name="address1" rules={[{ required: true, message: 'Please input your address!' }]}>
- + Address Line 2

} + name="address2">
-
- - - - - - - - - - - - { - return new Promise((res, rej) => { - const val = parseInt(value); - if (isNaN(val)) rej(); - else if (val < 501 || val > 99999) rej(); - else if (value.length !== 5) rej(); - else res(null); - }); - }, - message: 'Please input a valid 5 digit zip code!', - }, - ]}> - - - -
+ + City

} + name={'city'} + rules={[{ required: true, message: 'Please input your city!' }]}> + +
+ + State

} + name={'state'} + rules={[{ required: true, message: 'Please input your state!' }]}> + +
+ + ZIP Code

} + name={'zip'} + rules={[ + { + validator: (_, value) => { + return new Promise((res, rej) => { + const val = parseInt(value); + if (isNaN(val)) rej(); + else if (val < 501 || val > 99999) rej(); + else if (value.length !== 5) rej(); + else res(null); + }); + }, + message: 'Please input a valid 5 digit zip code!', + }, + ]}> + +
+ Race

} rules={[{ required: true, message: 'Please select at least one option!' }]}> - +
- - + Dietary Restrictions

}> +
- - + Accommodation needs

}> +
First-time hacker?

} rules={[{ required: true, message: 'Please select an option!' }]} tooltip="Beginner hackers are warmly welcomed!"> @@ -376,47 +402,75 @@ export default function HackerDash({ userApplicationStatus, setUserApplicationSt
Why would you like to attend VandyHacks?

} rules={[ { required: true, message: 'Please tell us why you want to attend VandyHacks!', }, ]}> -