From 7cd38e539932d38c119fad4a592cbd78bc1819f3 Mon Sep 17 00:00:00 2001 From: Kevin Monisit Date: Tue, 19 Mar 2024 13:27:59 -0400 Subject: [PATCH] Work on event scanning --- app/dashboard/page.tsx | 6 ++---- app/dashboard/views/organizerView.tsx | 17 ++++++++++++++-- app/lib/actions.ts | 29 +++++++++++++++++++++------ 3 files changed, 40 insertions(+), 12 deletions(-) diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx index b0af856..8db78a7 100644 --- a/app/dashboard/page.tsx +++ b/app/dashboard/page.tsx @@ -172,7 +172,7 @@ export default function Dashboard() { ); } - if (userData?.role['organizer']) { + if (!userData?.role['organizer']) { return () } else if (userData?.role['director']) { @@ -203,7 +203,7 @@ export default function Dashboard() { -
+
@@ -211,9 +211,7 @@ export default function Dashboard() {
- -
Profile diff --git a/app/dashboard/views/organizerView.tsx b/app/dashboard/views/organizerView.tsx index 91bf952..688dc70 100644 --- a/app/dashboard/views/organizerView.tsx +++ b/app/dashboard/views/organizerView.tsx @@ -35,7 +35,7 @@ function ScanStatus(props: { status: STATUS, scanType: ScannerTab }) { } { status === "PENDING" && -

Come again later at ${timeWhenAllHackersCanComeThrough.toString()}

+

Come again later at {timeWhenAllHackersCanComeThrough.toString()}

} { status === "FAILED" && @@ -61,8 +61,10 @@ function OrganizerView() { const [openScanner, setOpenScanner] = useState(false); const [scannerTab, setScannerTab] = useState("CHECK IN"); const [selectedEvent, setSelectedEvent] = useState(""); + const [scanResponse, setScanResponse] = useState(""); const handleOnScan = async (result: string) => { + setStatus("AWAITING RESPONSE"); if (scannerTab === "CHECK IN") { const resp = await GetUser(result); if (typeof resp.response === 'string') { @@ -84,7 +86,15 @@ function OrganizerView() { alert("Please select an event first!"); } - AttendEventScan(selectedEvent, result); + const resp = await AttendEventScan(result, selectedEvent); + if (resp.error !== '') { + setStatus("FAILED"); + setScanResponse(resp.error); + return; + } + + setScanResponse(resp.response); + setStatus("SUCCESSFUL"); } }; @@ -127,6 +137,9 @@ function OrganizerView() { onChange={handleEventSelectChange} /> } +

+ {scanResponse} +