From 979ffcd9af7b752b9a3f267607300824f7cddc98 Mon Sep 17 00:00:00 2001 From: Hana Dowe <113059487+hana-dowe@users.noreply.github.com> Date: Thu, 15 Feb 2024 16:55:08 -0500 Subject: [PATCH] MCSS-127: QR Decoding Update (#128) Co-authored-by: Anthony Tedja --- components/Dashboard/ModalScanner/index.tsx | 7 +- .../ScheduleGrid/ScheduleModal/index.tsx | 1 + pages/dashboard/scanner/index.tsx | 1 + public/events/esports.svg | 639 ++++++++++++++++++ types/Event/index.ts | 1 + 5 files changed, 643 insertions(+), 6 deletions(-) create mode 100644 public/events/esports.svg diff --git a/components/Dashboard/ModalScanner/index.tsx b/components/Dashboard/ModalScanner/index.tsx index a8fbdd4..f9f1b73 100644 --- a/components/Dashboard/ModalScanner/index.tsx +++ b/components/Dashboard/ModalScanner/index.tsx @@ -9,7 +9,6 @@ import Typography from '@mui/material/Typography' import useMediaQuery from '@mui/material/useMediaQuery' import Modal from '@/components/Dashboard/Modal' -import FullPageSpinner from '@/components/Shared/FullPageSpinner' import theme from '@/styles/theme' import { User } from '@/types/User' @@ -45,7 +44,6 @@ const ModalScanner = (props: Props) => { const isValidateName = isUserModal && userContext.success === undefined const getModalTitle = () => { - if (isLoading) return '' if (isUserModal) { if (userContext.success === undefined) return 'Registration' return userContext.success ? 'Success' : 'Error' @@ -56,7 +54,6 @@ const ModalScanner = (props: Props) => { const modalTitle = getModalTitle() const getModalColor = () => { - if (isLoading) return '' if (isUserModal) { if (userContext.success === undefined) return '' return userContext.success ? theme.palette.success.dark : theme.palette.error.dark @@ -131,9 +128,7 @@ const ModalScanner = (props: Props) => { }, }} > - {isLoading ? ( - - ) : isUserModal ? ( + {isUserModal ? ( // Registration validate name before actual check-in { deerhacks: 'DeerHacks', mcss: 'MCSS', utmRobotics: 'UTM Robotics', + esports: 'Esports', gdsc: 'GDSC', cssc: 'CSSC', utmsam: 'UTMSAM', diff --git a/pages/dashboard/scanner/index.tsx b/pages/dashboard/scanner/index.tsx index 85eb78d..f01b887 100644 --- a/pages/dashboard/scanner/index.tsx +++ b/pages/dashboard/scanner/index.tsx @@ -116,6 +116,7 @@ const QRCodeScanner = () => { { + if (!context || !enableScanner) return if (context === 'registration') { handleRegistration(qrId) } else { diff --git a/public/events/esports.svg b/public/events/esports.svg new file mode 100644 index 0000000..41c550f --- /dev/null +++ b/public/events/esports.svg @@ -0,0 +1,639 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/types/Event/index.ts b/types/Event/index.ts index 7b98d1e..1274503 100644 --- a/types/Event/index.ts +++ b/types/Event/index.ts @@ -55,6 +55,7 @@ export const eventHosts = [ 'deerhacks', 'mcss', 'utmRobotics', + 'esports', 'gdsc', 'cssc', 'utmsam',