Skip to content

Commit

Permalink
merge from main
Browse files Browse the repository at this point in the history
  • Loading branch information
JihengLi committed Sep 13, 2024
2 parents 9da4e7d + 64fc095 commit 315277c
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion components/hacker/HackerDash.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ export default function HackerDash({ userApplicationStatus, setUserApplicationSt
<br />
You have been accepted to VandyHacks!
<div style={{ width: '100%', height: '16px' }}></div>
<a href="https://vhl.ink/discord" target="_blank" rel="noreferrer">
<a href="https://discord.gg/WUMXjsZ6SF" target="_blank" rel="noreferrer">
<Button size="large" type="link">
Click here to join our Discord
</Button>
Expand Down
2 changes: 1 addition & 1 deletion components/hacker/hacking-start/TeamManagement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ const TeamManagement = () => {
Team
<div className={styles.Description}>
You can create a team or join a team (1 - 4 people per team). Devpost link must be submitted by 12:30 PM
on October 29th.
on September 29th.
</div>
{!teamData && (
<>
Expand Down
6 changes: 3 additions & 3 deletions email/html/accepted.html
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@
<b>VandyHacks XI: Racing Edition</b>! We enjoyed
reading your application and would love to see
your ideas come to life during our event on
<b>October 28th-29th</b>!
<b>September 28th-29th</b>!
</div>
</td>
</tr>
Expand All @@ -449,7 +449,7 @@
">
Head over to the application portal
<a href="https://apply.vandyhacks.org">here</a>
and confirm your attendance by October 26th,
and confirm your attendance by September 26th,
12:00 PM CDT.
</div>
</td>
Expand Down Expand Up @@ -478,7 +478,7 @@
<a href="mailto:[email protected]"
>[email protected]</a
>. In the meantime, join our
<a href="https://vhl.ink/discord"
<a href="https://discord.gg/WUMXjsZ6SF"
>discord server</a
>
to stay up to date on the latest VH news!
Expand Down
7 changes: 4 additions & 3 deletions email/html/confirmed.html
Original file line number Diff line number Diff line change
Expand Up @@ -448,8 +448,8 @@
to our event. We'll be in touch again soon with
more information on our opening ceremony, but as
a reminder, festivities will start at 12:00 PM
CDT Saturday, October 28th, and wrap up by 5:30
PM CDT Sunday, October 29th.
CDT Saturday, September 28th, and wrap up by
5:30 PM CDT Sunday, September 29th.
</div>
</td>
</tr>
Expand Down Expand Up @@ -477,7 +477,8 @@
<li>
<b
>Join our Discord
<a href="https://vhl.ink/discord"
<a
href="https://discord.gg/WUMXjsZ6SF"
>here</a
></b
>
Expand Down
2 changes: 1 addition & 1 deletion email/html/reminderToSubmit.html
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@
<a href="https://vandyhacks.org"
>vandyhacks.org</a
>
by <b>October 16th, at 11:59pm</b> to have the
by <b>September 16th, at 11:59pm</b> to have the
chance to create unique projects, win prizes,
attend workshops/speaker events, network with
our sponsors, receive cool swag, eat free food,
Expand Down
4 changes: 2 additions & 2 deletions email/html/travelForm.html
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@
To be considered for travel reimbursements you
must complete this form by
<b
>October 13th, 2023 at 11:59 PM US Central
>September 13th, 2024 at 11:59 PM US Central
Time</b
>. There will be no exceptions to this deadline,
so please make sure you plan accordingly.
Expand Down Expand Up @@ -575,7 +575,7 @@
text-align: left;
color: #637381;
">
We look forward to seeing you in October!
We look forward to seeing you in September!
</div>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions email/templates/accepted.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ export default async (user: UserData): Promise<SendEmailRequest> => ({
Text: {
Charset: 'UTF-8',
Data: `Hi ${escapeChars(user.name || user.name)},
Congratulations! You’re invited to be a part of VandyHacks XI: Racing Edition! We enjoyed reading your application and would love to see your ideas come to life during our event on October 28th-29th!
Congratulations! You’re invited to be a part of VandyHacks XI: Racing Edition! We enjoyed reading your application and would love to see your ideas come to life during our event on September 28th-29th!
Head over to the application portal here and confirm your attendance by October 26th, 12:00 PM CDT.
Head over to the application portal here and confirm your attendance by September 26th, 12:00 PM CDT.
If you have any questions or concerns, check out our FAQ or reach out to us at [email protected]. In the meantime join our discord server to stay up to date on the latest VH news!
Expand Down
2 changes: 1 addition & 1 deletion email/templates/confirmed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default async (user: UserData): Promise<SendEmailRequest> => ({
Data: `Hey ${escapeChars(user.name)},
We're so excited that you'll be joining us for VandyHacks XI: Racing Edition!
This email is just to confirm that you've RSVPed to our event. We'll be in touch again soon with more information on our opening ceremony, but as a reminder, festivities will start at 12:00 PM CDT Saturday, October 28th, and wrap up by 5:30 PM CDT Sunday, October 29th.
This email is just to confirm that you've RSVPed to our event. We'll be in touch again soon with more information on our opening ceremony, but as a reminder, festivities will start at 12:00 PM CDT Saturday, September 28th, and wrap up by 5:30 PM CDT Sunday, September 29th.
In the meantime, be sure to complete the following:
Expand Down
2 changes: 1 addition & 1 deletion email/templates/reminderToSubmit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default async (user: UserData): Promise<SendEmailRequest> => ({
Data: `Applications Closing Soon!
Hi ${escapeChars(user.name)},
We’ve noticed you’ve created an application with us, but we do not have a record of your submission. We would love to have you join VandyHacks XI: Racing Edition!
Make sure you apply at vandyhacks.org by October 16th, at 11:59pm to have the chance to create unique projects, win prizes, attend workshops/speaker events, network with our sponsors, receive cool swag, eat free food, and so much more!
Make sure you apply at vandyhacks.org by September 16th, at 11:59pm to have the chance to create unique projects, win prizes, attend workshops/speaker events, network with our sponsors, receive cool swag, eat free food, and so much more!
Feel free to email us at [email protected] if you have any questions
Cheers,
The VandyHacks Team`,
Expand Down
4 changes: 2 additions & 2 deletions pages/api/apply.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse<
{ application: application._id, applicationStatus: ApplicationStatus.SUBMITTED }
);

await sendEmail(await submitted(user));
if (body.applyTravelReimbursement === 'yes') await sendEmail(await travelForm(user));
// await sendEmail(await submitted(user));
// if (body.applyTravelReimbursement === 'yes') await sendEmail(await travelForm(user));

return res.send(200);
default:
Expand Down
1 change: 0 additions & 1 deletion scripts/cli-util/modify-hacker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { promptAction } from '../dev-cli';
import { ApplicationStatus, TeamData, UserData } from '../../types/database';
import { ObjectId } from 'mongoose';

// TODO: zi
/**
* Quickly change the application status of hacker.
* A hacker has multiple application statuses.
Expand Down

0 comments on commit 315277c

Please sign in to comment.