From 426459181acff6fff5736ce703b4bc17955cb2f4 Mon Sep 17 00:00:00 2001
From: Kevin Monisit <monisitkevin@gmail.com>
Date: Fri, 25 Oct 2024 10:09:33 -0400
Subject: [PATCH] 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: {
                   <CardTitle>Delayed Entry</CardTitle>
                   <div>
                     <CardDescription>
-                      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.
                     </CardDescription>
@@ -241,7 +241,7 @@ export default function ProfileHeader(props: {
               <>
                 <CardTitle>
                   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.
                 </CardTitle>
               </>
@@ -282,7 +282,7 @@ export default function ProfileHeader(props: {
                           <CardTitle>
                             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.
                           </CardTitle>
                           <Button
diff --git a/app/dashboard/views/organizerView.tsx b/app/dashboard/views/organizerView.tsx
index 4d9411c..c00bb9b 100644
--- a/app/dashboard/views/organizerView.tsx
+++ b/app/dashboard/views/organizerView.tsx
@@ -74,7 +74,7 @@ function ScanStatus(props: {
         Scan QR to {scanType === 'CHECK IN' ? 'check in' : 'scan for an event'}
       </p>
       <p className="">Status: </p>
-      <p>{fullName && <p className="text-green-500">Scanned: {fullName}</p>}</p>
+      <p>{fullName && <p className="text-white">Found User: {fullName}</p>}</p>
       <p className="">
         {status === 'SUCCESSFUL' && (
           <p className="text-green-500">Successful.</p>
@@ -147,32 +147,21 @@ function OrganizerView() {
     setScannedName(userData.first_name + ' ' + userData.last_name);
 
     if (scannerTab === 'CHECK IN') {
-      if (
-        userData.registration_status === 'confirmed' ||
-        userData.registration_status == 'checked_in' ||
-        userData.registration_status == 'coming' ||
-        (now > timeWhenAllHackersCanComeThrough &&
-          userData.registration_status !== 'unregistered')
-      ) {
-        const resp = await SetUser(
-          { registration_status: 'checked_in' },
-          result,
-        );
-
-        if (resp.error !== '') {
-          setStatus('FAILED');
-          setScanResponse(
-            resp.error +
-              ' : Registration Status: ' +
-              userData.registration_status,
-          );
-          return;
-        }
+      const resp = await SetUser({ registration_status: 'checked_in' }, result);
 
-        setStatus('SUCCESSFUL');
-      } else {
-        setStatus('PENDING');
+      if (!resp) {
+        setStatus('FAILED');
+        setScanResponse('Failed to check in user.');
       }
+
+      if (resp.error !== '') {
+        setStatus('FAILED');
+        setScanResponse(resp.response + '; ' + resp.error);
+        return;
+      }
+
+      setScanResponse(resp.response);
+      setStatus('SUCCESSFUL');
     } else if (scannerTab === 'EVENT') {
       if (selectedEvent == '') {
         alert('Please select an event first!');
@@ -193,14 +182,13 @@ function OrganizerView() {
       const multipleAttendanceStatus = 409;
 
       if (resp.status == multipleAttendanceStatus && !forceAttendance) {
-        console.log('HI');
         setShowForceAttendance(true);
         return;
       }
 
       if (resp.error !== '') {
         setStatus('FAILED');
-        setScanResponse(resp.error);
+        setScanResponse(resp.error + '; ' + resp.response);
         return;
       }
 
@@ -232,7 +220,7 @@ function OrganizerView() {
 
       if (resp.error !== '') {
         setStatus('FAILED');
-        setScanResponse(resp.error);
+        setScanResponse(resp.error + '; ' + resp.response);
         return;
       }
 
@@ -262,7 +250,7 @@ function OrganizerView() {
 
       if (resp.error !== '') {
         setStatus('FAILED');
-        setScanResponse(resp.error);
+        setScanResponse(resp.error + '; ' + resp.response);
         return;
       }
 
@@ -289,13 +277,12 @@ function OrganizerView() {
       try {
         const data = await getSelf();
 
-        const domain = data.response.email.slice(-11)
-        setIsSponsor(domain == "sponsor.com")
-        if (domain == "sponsor.com"){
-          setScannerTab("SPONSOR")
+        const domain = data.response.email.slice(-11);
+        setIsSponsor(domain == 'sponsor.com');
+        if (domain == 'sponsor.com') {
+          setScannerTab('SPONSOR');
           resetScanLog();
         }
-
       } catch (error) {
         console.log(error);
       }
@@ -312,12 +299,12 @@ function OrganizerView() {
             <h1 className="text-center text-3xl">Organizer View</h1>
 
             {/* Two buttons, semi-radio where one button is for the "tab". If active, darken the button */}
-            <div className="grid md:grid-cols-5 justify-center space-x-4">
+            <div className="grid justify-center space-x-4 md:grid-cols-5">
               <button
                 disabled={isSponsor}
                 className={`rounded bg-blue-500 px-4 py-2 font-bold text-white hover:bg-blue-700 ${
                   scannerTab === 'CHECK IN' ? 'bg-blue-700' : ''
-                } ${isSponsor ? "bg-blue-500 hover:bg-blue-500": ""}`}
+                } ${isSponsor ? 'bg-blue-500 hover:bg-blue-500' : ''}`}
                 onClick={() => {
                   setScannerTab('CHECK IN');
                   resetScanLog();
@@ -329,7 +316,7 @@ function OrganizerView() {
                 disabled={isSponsor}
                 className={`rounded bg-blue-500 px-4 py-2 font-bold text-white hover:bg-blue-700 ${
                   scannerTab === 'EVENT' ? 'bg-blue-700' : ''
-                }${isSponsor ? "bg-blue-500 hover:bg-blue-500": ""}`}
+                }${isSponsor ? 'bg-blue-500 hover:bg-blue-500' : ''}`}
                 onClick={() => {
                   setScannerTab('EVENT');
                   resetScanLog();
@@ -341,7 +328,7 @@ function OrganizerView() {
                 disabled={isSponsor}
                 className={`rounded bg-blue-500 px-4 py-2 font-bold text-white hover:bg-blue-700 ${
                   scannerTab === 'MANUAL' ? 'bg-blue-700' : ''
-                }${isSponsor ? "bg-blue-500 hover:bg-blue-500": ""}`}
+                }${isSponsor ? 'bg-blue-500 hover:bg-blue-500' : ''}`}
                 onClick={() => {
                   setScannerTab('MANUAL');
                   resetScanLog();
diff --git a/app/lib/actions.ts b/app/lib/actions.ts
index 887e4ac..ecca30b 100644
--- a/app/lib/actions.ts
+++ b/app/lib/actions.ts
@@ -252,11 +252,10 @@ export async function GetUser(email: string) {
     })
       .then(async (res) => {
         let res_json = await res.json();
-        if (res.status == 200){
-          resp.response = res_json
-        }
-        else{
-          resp.error = res_json
+        if (res.status == 200) {
+          resp.response = res_json;
+        } else {
+          resp.error = res_json;
         }
       })
       .catch((error) => {
@@ -299,9 +298,8 @@ export async function SetUser(data: any, user_email_to_update: string) {
           } else {
             resp.error = 'Unexpected Error';
           }
-        } else {
-          resp.response = resJSON.message;
         }
+        resp.response = resJSON.message;
       })
       .catch((error) => {
         resp.error = error + '; An error occurred retrieving data';
@@ -654,7 +652,7 @@ export async function AttendEventScan(
     if (statusCode === 404) {
       error_message = `User ${scannedEmail} not found. Please try again.`;
     } else if (statusCode === 409) {
-      error_message = `User ${scannedEmail} is already checked in to ${event}!`;
+      error_message = json.message;
     }
 
     if (statusCode === 200 && typeof jsonBody !== 'string') {
diff --git a/app/ui/skeletons.tsx b/app/ui/skeletons.tsx
index 6f38be3..bf92a71 100644
--- a/app/ui/skeletons.tsx
+++ b/app/ui/skeletons.tsx
@@ -1,4 +1,4 @@
-import Navbar from "../(pre-dashboard)/(landing)/sections/Hero/Navbar";
+import Navbar from '../(pre-dashboard)/(landing)/sections/Hero/Navbar';
 import { handleSignOut } from '@/app/lib/actions';
 import { Button } from './button';
 
@@ -65,27 +65,28 @@ export function InvoiceSkeleton() {
 
 export function HackerDashboardSkeleton() {
   return (
-    <div className={`w-screen h-screen  ${shimmer} relative`} >
+    <div className={`h-screen w-screen  ${shimmer} relative`}>
       <div className="flex flex-col items-center pt-[10rem] ">
+        <div className="text-white">Experiencing issues?</div>
         <Button
-          className="my-2 h-8 w-24"
+          className="my-3 h-fit w-fit border border-white text-black hover:bg-black hover:text-white"
           onClick={async () => {
             await handleSignOut();
             window.location.href = '/';
           }}
         >
-          Log Out
+          Click Here to Log Out
         </Button>
         <div className="h-[10rem] w-[10rem] rounded-full bg-gray-600 opacity-40" />
-        <div className="flex flex-col items-center gap-3 w-full h-fit mt-20">
-          <div className="w-[25rem] h-[10rem] rounded bg-gray-600 opacity-40" />
-          <div className="w-[25rem] h-[30rem] rounded bg-gray-600 opacity-40" />
+        <div className="mt-20 flex h-fit w-full flex-col items-center gap-3">
+          <div className="h-[10rem] w-[25rem] rounded bg-gray-600 opacity-40" />
+          <div className="h-[30rem] w-[25rem] rounded bg-gray-600 opacity-40" />
         </div>
       </div>
       {/* <CardSkeleton />
       <CardSkeleton />
       <CardSkeleton /> */}
-    </div >
+    </div>
   );
 }