MCSS-127: QR Decoding Update (#128)

Co-authored-by: Anthony Tedja <anthonytedja@users.noreply.github.com>
utmmcss · Feb 15, 2024 · 979ffcd · 979ffcd
1 parent 5623ff9
commit 979ffcd
Show file tree

Hide file tree

Showing 5 changed files with 643 additions and 6 deletions.
diff --git 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 ? (
-        <FullPageSpinner />
-      ) : isUserModal ? (
+      {isUserModal ? (
         // Registration validate name before actual check-in
         <Grid
           display="flex"

diff --git a/components/Shared/ScheduleGrid/ScheduleModal/index.tsx b/components/Shared/ScheduleGrid/ScheduleModal/index.tsx
@@ -23,6 +23,7 @@ const ScheduleModal = (props: Props) => {
     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
@@ -116,6 +116,7 @@ const QRCodeScanner = () => {
                   <QrScanner
                     stopDecoding={!context || !enableScanner}
                     onDecode={(qrId) => {
+                      if (!context || !enableScanner) return
                       if (context === 'registration') {
                         handleRegistration(qrId)
                       } else {

diff --git a/public/events/esports.svg b/public/events/esports.svg
diff --git a/types/Event/index.ts b/types/Event/index.ts
@@ -55,6 +55,7 @@ export const eventHosts = [
   'deerhacks',
   'mcss',
   'utmRobotics',
+  'esports',
   'gdsc',
   'cssc',
   'utmsam',