From 4ab9b1877bc9df042fb9a0bb1577df6051c640ae Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Wed, 23 Oct 2024 18:05:46 -0400 Subject: [PATCH 01/19] Update profileHeader.tsx (#228) --- app/dashboard/components/profileHeader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dashboard/components/profileHeader.tsx b/app/dashboard/components/profileHeader.tsx index 480615f..22ea255 100644 --- a/app/dashboard/components/profileHeader.tsx +++ b/app/dashboard/components/profileHeader.tsx @@ -241,7 +241,7 @@ export default function ProfileHeader(props: { <> You are confirmed! You are guaranteed entry if you check in - between 9am to 10:45am. Aftwards, 10:45 will be check in + between 9am to 10:45am. Afterwards, 10:45am will be check in acceptance on a first come first serve basis. From eb2f79f36e988112a9353085d2fa5610dbbfb178 Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Thu, 24 Oct 2024 07:51:46 -0400 Subject: [PATCH 02/19] status change --- app/dashboard/components/profileHeader.tsx | 27 +++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/app/dashboard/components/profileHeader.tsx b/app/dashboard/components/profileHeader.tsx index 22ea255..440ac70 100644 --- a/app/dashboard/components/profileHeader.tsx +++ b/app/dashboard/components/profileHeader.tsx @@ -223,20 +223,21 @@ export default function ProfileHeader(props: { )} - {userData.registration_status == 'waitlisted' && ( - <> -
- Delayed Entry -
- - You will be able to check in after 10:45am on a first come - first serve basis. Please be there as soon as possible to - secure your spot. - + {userData.registration_status == 'waitlisted' && + userData.registration_status == 'waitlisted' && ( + <> +
+ Delayed Entry +
+ + You will be able to check in after 10:45am on a first + come first serve basis. Please be there as soon as + possible to secure your spot. + +
-
- - )} + + )} {userData.registration_status == 'confirmed' && ( <> From 95db0b0f21931598a0c9d559110185d90e65a667 Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Thu, 24 Oct 2024 07:54:28 -0400 Subject: [PATCH 03/19] Typo fix --- app/dashboard/components/profileHeader.tsx | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/app/dashboard/components/profileHeader.tsx b/app/dashboard/components/profileHeader.tsx index 440ac70..a7773b6 100644 --- a/app/dashboard/components/profileHeader.tsx +++ b/app/dashboard/components/profileHeader.tsx @@ -223,21 +223,21 @@ export default function ProfileHeader(props: {
)} - {userData.registration_status == 'waitlisted' && - userData.registration_status == 'waitlisted' && ( - <> -
- Delayed Entry -
- - You will be able to check in after 10:45am on a first - come first serve basis. Please be there as soon as - possible to secure your spot. - -
+ {(userData.registration_status == 'waitlisted' || + userData.registration_status == 'waitlisted') && ( + <> +
+ Delayed Entry +
+ + You will be able to check in after 10:45am on a first come + first serve basis. Please be there as soon as possible to + secure your spot. +
- - )} +
+ + )} {userData.registration_status == 'confirmed' && ( <> From dd80d41f8c8a164b34982c436dd12b8ecb6f58b2 Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Thu, 24 Oct 2024 07:57:56 -0400 Subject: [PATCH 04/19] Waitlist typo fix --- app/dashboard/components/profileHeader.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/dashboard/components/profileHeader.tsx b/app/dashboard/components/profileHeader.tsx index a7773b6..a793408 100644 --- a/app/dashboard/components/profileHeader.tsx +++ b/app/dashboard/components/profileHeader.tsx @@ -223,8 +223,7 @@ export default function ProfileHeader(props: {
)} - {(userData.registration_status == 'waitlisted' || - userData.registration_status == 'waitlisted') && ( + {userData.registration_status == 'waitlist' && ( <>
Delayed Entry From 426459181acff6fff5736ce703b4bc17955cb2f4 Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Fri, 25 Oct 2024 10:09:33 -0400 Subject: [PATCH 05/19] Improved scanning messages (#229) --- app/dashboard/components/profileHeader.tsx | 6 +-- app/dashboard/views/organizerView.tsx | 63 +++++++++------------- app/lib/actions.ts | 14 +++-- app/ui/skeletons.tsx | 17 +++--- 4 files changed, 43 insertions(+), 57 deletions(-) diff --git a/app/dashboard/components/profileHeader.tsx b/app/dashboard/components/profileHeader.tsx index a793408..3506481 100644 --- a/app/dashboard/components/profileHeader.tsx +++ b/app/dashboard/components/profileHeader.tsx @@ -229,7 +229,7 @@ export default function ProfileHeader(props: { Delayed Entry
- You will be able to check in after 10:45am on a first come + You will be able to check in after 10:30am on a first come first serve basis. Please be there as soon as possible to secure your spot. @@ -241,7 +241,7 @@ export default function ProfileHeader(props: { <> You are confirmed! You are guaranteed entry if you check in - between 9am to 10:45am. Afterwards, 10:45am will be check in + between 9am to 10:30am. Afterwards, 10:30am will be check in acceptance on a first come first serve basis. @@ -282,7 +282,7 @@ export default function ProfileHeader(props: { You have indicated you are coming. If your status changes to confirmed you are guaranteed entry - between 9am and 10:45am. After 10:45am, check in + between 9am and 10:30am. After 10:30am, check in will be first come first serve.
-
-
-
+
+
+
{/* */} -
+
); } From 5b618ba5c3de45e642b93d9123b9f57e74c09396 Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Fri, 25 Oct 2024 10:26:01 -0400 Subject: [PATCH 06/19] Added required opt in choice for MLH --- app/dashboard/page.tsx | 94 ++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 44 deletions(-) diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx index 1c3cded..7fce41c 100644 --- a/app/dashboard/page.tsx +++ b/app/dashboard/page.tsx @@ -390,9 +390,8 @@ export default function Dashboard() { : 0, }); - if (data.error != ''){ - alert(data.error.message) - + if (data.error != '') { + alert(data.error.message); } setUserData(data.response); @@ -440,6 +439,46 @@ export default function Dashboard() { } else if (userData?.role['director']) { return ; } else if (userData?.role.hacker) { + if (userData?.opt_in == null) { + return ( +
+ + + + Would you like to opt-in to Major League Hacking emails? You + must choose before you can proceed. + + + + + + + +
+ ); + } return (
@@ -471,39 +510,6 @@ export default function Dashboard() { )} - {userData?.opt_in == null && ( - - - Would you like to opt-in to Major League Hacking emails - - - - - - - )} {userData?.registration_status === 'checked_in' && false && ( @@ -692,23 +698,23 @@ export default function Dashboard() { Links - - Links to various things - + Links to various things - )} + (
@@ -726,7 +732,7 @@ export default function Dashboard() {
- + )
From 4531f7ead4c6b75a23497fe7829da94181d55952 Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Fri, 25 Oct 2024 10:36:09 -0400 Subject: [PATCH 07/19] Added header to pre-dashboard-pre-opt-in page --- app/dashboard/page.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx index 7fce41c..8ac39ed 100644 --- a/app/dashboard/page.tsx +++ b/app/dashboard/page.tsx @@ -442,6 +442,12 @@ export default function Dashboard() { if (userData?.opt_in == null) { return (
+ From 212bd7313a4417ff93f41758d93869fc2854c0fd Mon Sep 17 00:00:00 2001 From: Andrew Somers <67980093+avsomers25@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:22:05 -0400 Subject: [PATCH 08/19] Update profileHeader.tsx --- app/dashboard/components/profileHeader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dashboard/components/profileHeader.tsx b/app/dashboard/components/profileHeader.tsx index 3506481..b5df023 100644 --- a/app/dashboard/components/profileHeader.tsx +++ b/app/dashboard/components/profileHeader.tsx @@ -218,7 +218,7 @@ export default function ProfileHeader(props: { <>
- Registered! You will be emailed about acceptance soon. + Registered! There is an extremely high chance that you do not have space for you this fall, we hope to see you in spring! Registrations open at least a full month before the event and are first come first serve.
From 6ecdeedbda6be525b038cb79457fb20c5ae47420 Mon Sep 17 00:00:00 2001 From: Andrew Somers <67980093+avsomers25@users.noreply.github.com> Date: Fri, 25 Oct 2024 13:18:55 -0400 Subject: [PATCH 09/19] Update profileHeader.tsx --- app/dashboard/components/profileHeader.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/dashboard/components/profileHeader.tsx b/app/dashboard/components/profileHeader.tsx index b5df023..1a7ceb7 100644 --- a/app/dashboard/components/profileHeader.tsx +++ b/app/dashboard/components/profileHeader.tsx @@ -95,6 +95,13 @@ export default function ProfileHeader(props: { {userData.registration_status == 'unregistered' && ( + <> +
+ Unregistered – at this point, you will not be able to attend HackRU, we hope to see you in the spring! +
+ + )} + {false && userData.registration_status == 'unregistered' && ( <> {waiverState && (

From 9342dafc7cfbaaac56533a51197d025b454bde95 Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Sat, 26 Oct 2024 12:28:55 -0400 Subject: [PATCH 10/19] Change to message --- app/dashboard/views/organizerView.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/dashboard/views/organizerView.tsx b/app/dashboard/views/organizerView.tsx index 7acd9eb..cb5c336 100644 --- a/app/dashboard/views/organizerView.tsx +++ b/app/dashboard/views/organizerView.tsx @@ -388,9 +388,9 @@ function OrganizerView() { }} setOpen={setShowForceAttendance} open={showForceAttendance} - content={`This hacker has already attended this event. - Are you sure you want to force another attendance count?`} - title={'Multiple attendance detected for this event.'} + content={`Either this student has reached event attendance limit or the student is not checked in. + Do you want to force attendance? (If they are not checked in, scan in will fail.)`} + title={`An error occurred.`} /> )} {confirmation && ( From 10c1c40d946210d447178bdea450a15ec7c7a2f8 Mon Sep 17 00:00:00 2001 From: Andrew Somers <67980093+avsomers25@users.noreply.github.com> Date: Sat, 26 Oct 2024 12:42:35 -0400 Subject: [PATCH 11/19] Update page.tsx --- app/dashboard/page.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx index 8ac39ed..59ba3a1 100644 --- a/app/dashboard/page.tsx +++ b/app/dashboard/page.tsx @@ -669,7 +669,7 @@ export default function Dashboard() { {pointsData && userData.registration_status == 'checked_in' && ( - Points Information + Points Information Your current points balance and total earned points. At the end of the hackathon, there will be a grand raffle for prizes @@ -681,13 +681,13 @@ export default function Dashboard() {

Current Balance:{' '} - + {pointsData.balance} points

Total Points Earned:{' '} - + {pointsData.total_points} points

From 4bc49b88c17c189fa70ad6b1283f31a55cec34bb Mon Sep 17 00:00:00 2001 From: Andrew Somers <67980093+avsomers25@users.noreply.github.com> Date: Sat, 26 Oct 2024 16:18:48 -0400 Subject: [PATCH 12/19] new points --- app/dashboard/views/organizerView.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/dashboard/views/organizerView.tsx b/app/dashboard/views/organizerView.tsx index cb5c336..3f5d733 100644 --- a/app/dashboard/views/organizerView.tsx +++ b/app/dashboard/views/organizerView.tsx @@ -73,12 +73,14 @@ const eventPoints = { 'winning-trivia':50, 'participating-trivia':15, 'printing-photo':-10, - 'stickers':-15, - 'lotion':-25, - 'tote-bag':-25, - 'playing-cards':-30, - 'stuffed-animals':-30, - 'lego-sets':-70, + 'stickers':-10, + 'lotion':-15, + 'tote-bag':-35, + 'playing-cards':-35, + 'small-stuffed-animals':-25, + 'medium-stuffed-animals':-50, + 'large-stuffed-animals':-70, + 'lego-sets':-100, }; function ScanStatus(props: { From 33ab30b51f14f0d14caf7040153d0e8a50bc1467 Mon Sep 17 00:00:00 2001 From: Andrew Somers <67980093+avsomers25@users.noreply.github.com> Date: Sat, 26 Oct 2024 16:32:16 -0400 Subject: [PATCH 13/19] Update organizerView.tsx --- app/dashboard/views/organizerView.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/dashboard/views/organizerView.tsx b/app/dashboard/views/organizerView.tsx index 3f5d733..bd04626 100644 --- a/app/dashboard/views/organizerView.tsx +++ b/app/dashboard/views/organizerView.tsx @@ -66,9 +66,9 @@ const eventPoints = { 'hidden-cat':15, 'win-blackjack':10, 'minigold-ho1':20, - 'winning-videogame':20, + 'winning-videogame':15, 'participating-videogame':5, - 'winning-slots':20, + 'winning-slots':15, 'participating-slots':-5, 'winning-trivia':50, 'participating-trivia':15, From 19d860684180e49636fc6c3258474694b8372c43 Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Sat, 26 Oct 2024 17:30:43 -0400 Subject: [PATCH 14/19] point adjustment --- app/dashboard/views/organizerView.tsx | 58 +++++++++++++-------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/app/dashboard/views/organizerView.tsx b/app/dashboard/views/organizerView.tsx index bd04626..929ee05 100644 --- a/app/dashboard/views/organizerView.tsx +++ b/app/dashboard/views/organizerView.tsx @@ -52,35 +52,35 @@ const events = [ ]; const eventPoints = { - 'lunch-saturday':0, - 'github-copilot':15, - 'icims-tech-talk':15, - 'NTICE-talk':15, - 'usacs-resume-workshop':15, - 'figma-workshop':15, - 'NJT-metro':15, - 'dinner-saturday':0, - 'breakfast-sunday':0, - 'lunch-sunday':0, - 'cat-attire':15, - 'hidden-cat':15, - 'win-blackjack':10, - 'minigold-ho1':20, - 'winning-videogame':15, - 'participating-videogame':5, - 'winning-slots':15, - 'participating-slots':-5, - 'winning-trivia':50, - 'participating-trivia':15, - 'printing-photo':-10, - 'stickers':-10, - 'lotion':-15, - 'tote-bag':-35, - 'playing-cards':-35, - 'small-stuffed-animals':-25, - 'medium-stuffed-animals':-50, - 'large-stuffed-animals':-70, - 'lego-sets':-100, + 'lunch-saturday': 0, + 'github-copilot': 15, + 'icims-tech-talk': 15, + 'NTICE-talk': 15, + 'usacs-resume-workshop': 15, + 'figma-workshop': 15, + 'NJT-metro': 15, + 'dinner-saturday': 0, + 'breakfast-sunday': 0, + 'lunch-sunday': 0, + 'cat-attire': 15, + 'hidden-cat': 15, + 'win-blackjack': 10, + 'minigold-ho1': 20, + 'winning-videogame': 15, + 'participating-videogame': 5, + 'winning-slots': 15, + 'participating-slots': -5, + 'winning-trivia': 50, + 'participating-trivia': 15, + 'printing-photo': -10, + stickers: -10, + lotion: -15, + 'tote-bag': -35, + 'playing-cards': -35, + 'small-stuffed-animals': -25, + 'medium-stuffed-animals': -50, + 'large-stuffed-animals': -70, + 'lego-sets': -120, }; function ScanStatus(props: { From a9156b771ff2f09aa058b1cbedd1df6d4e84709d Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Sat, 26 Oct 2024 18:00:07 -0400 Subject: [PATCH 15/19] new points --- app/dashboard/views/organizerView.tsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/dashboard/views/organizerView.tsx b/app/dashboard/views/organizerView.tsx index 929ee05..d6c534e 100644 --- a/app/dashboard/views/organizerView.tsx +++ b/app/dashboard/views/organizerView.tsx @@ -43,12 +43,14 @@ const events = [ 'winning-trivia', 'participating-trivia', 'printing-photo', - 'stickers', + 'stickers-pin', 'lotion', 'tote-bag', 'playing-cards', - 'stuffed-animals', 'lego-sets', + 'small-cat-stuffed-animals', + 'medium-stuffed-animals', + 'squishmallow', ]; const eventPoints = { @@ -73,14 +75,14 @@ const eventPoints = { 'winning-trivia': 50, 'participating-trivia': 15, 'printing-photo': -10, - stickers: -10, + 'stickers-pin': -10, lotion: -15, 'tote-bag': -35, 'playing-cards': -35, - 'small-stuffed-animals': -25, + 'small-cat-stuffed-animals': -25, 'medium-stuffed-animals': -50, - 'large-stuffed-animals': -70, - 'lego-sets': -120, + squishmallow: -80, + 'lego-sets': -110, }; function ScanStatus(props: { From ec368641053722441ea3ec07eb33cad4713c36e0 Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Sat, 26 Oct 2024 19:15:31 -0400 Subject: [PATCH 16/19] Change --- app/dashboard/views/organizerView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/dashboard/views/organizerView.tsx b/app/dashboard/views/organizerView.tsx index d6c534e..1024f52 100644 --- a/app/dashboard/views/organizerView.tsx +++ b/app/dashboard/views/organizerView.tsx @@ -75,7 +75,7 @@ const eventPoints = { 'winning-trivia': 50, 'participating-trivia': 15, 'printing-photo': -10, - 'stickers-pin': -10, + 'stickers-pin': -3, lotion: -15, 'tote-bag': -35, 'playing-cards': -35, From 48a25d4c4b280e60620992373abae024284b939c Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Sun, 27 Oct 2024 12:57:29 -0400 Subject: [PATCH 17/19] message --- app/dashboard/raffle/page.tsx | 1 + app/lib/actions.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/app/dashboard/raffle/page.tsx b/app/dashboard/raffle/page.tsx index 4015b81..b233ee5 100644 --- a/app/dashboard/raffle/page.tsx +++ b/app/dashboard/raffle/page.tsx @@ -163,6 +163,7 @@ export default function RafflePage() { })); const response = await UpdateBuyIns(buyIns); + console.log(response.response); if (response.error) { throw new Error(response.error); } diff --git a/app/lib/actions.ts b/app/lib/actions.ts index ecca30b..dd5185b 100644 --- a/app/lib/actions.ts +++ b/app/lib/actions.ts @@ -873,6 +873,7 @@ export async function UpdateBuyIns( console.log(resJSON); if (res.status !== 200) { resp.error = 'Error Updating Buy-Ins'; + resp.response = resJSON; } else { resp.response = resJSON; } From 902f469f3efd8469df01fe5d8a022ae6f801c90f Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Sun, 27 Oct 2024 13:57:42 -0400 Subject: [PATCH 18/19] Prize Mapping change --- app/dashboard/raffle/page.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/dashboard/raffle/page.tsx b/app/dashboard/raffle/page.tsx index b233ee5..5b757e8 100644 --- a/app/dashboard/raffle/page.tsx +++ b/app/dashboard/raffle/page.tsx @@ -39,17 +39,17 @@ interface PrizeInfo { } const prizeMapping: Record = { - prizeA: { - name: 'XBOX', - description: '1TB', + amazon: { + name: 'Amazon Gift Card', + description: '$50 Dollar Amazon Gift Card', }, - prizeB: { - name: 'Backpack', - description: 'Holloway Backpack', + matcha: { + name: 'Matcha Kit', + description: 'Starter Matcha Kit with Matcha Powder and Whisker', }, - prizeC: { - name: 'Backpack 2', - description: 'Spiderman backpack', + blanket: { + name: 'Weighted Blanket', + description: '20 Pound Weighted Blanket', }, }; From 1d2b38264a70fd19468ea50766ef7210ea3a07d6 Mon Sep 17 00:00:00 2001 From: Andrew Somers <67980093+avsomers25@users.noreply.github.com> Date: Tue, 19 Nov 2024 18:53:03 -0500 Subject: [PATCH 19/19] Update page.tsx --- app/dashboard/page.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx index 59ba3a1..a1c386a 100644 --- a/app/dashboard/page.tsx +++ b/app/dashboard/page.tsx @@ -439,7 +439,9 @@ export default function Dashboard() { } else if (userData?.role['director']) { return ; } else if (userData?.role.hacker) { - if (userData?.opt_in == null) { + //FALSE SINCE WE WANT TO OPT IN ON REGISTRATION + //REMOVE ONCE OPTIN WORKING AS EXPECTED + if (false && userData?.opt_in == null) { return (