Merge pull request #201 from HackRU/logout-organizer-issue

logout while in organizer view
HackRU · Oct 8, 2024 · 0f3d008 · 0f3d008
2 parents 37374af + 1d037d1
commit 0f3d008
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx
@@ -184,7 +184,7 @@ export default function Dashboard() {
         data.set('file', waiverFile);
         const requiredFields = ["first_name","last_name","resume","github","major","short_answer","shirt_size","hackathon_count","dietary_restrictions","special_needs","age","school","grad_year","gender","level_of_study","country_of_residence","ethnicity","how_you_heard_about_hackru","reasons","phone_number"]
         const fieldtext = ["First Name", "Last Name", "Resume", "Github", "major", "What are you hoping to experience at HackRU?", "Shirt Size", "Hackathon Count", "Dietary Restrictions", "Anything we should account for?", 
-          'age', "schhool", "Graduation Year", "Gender",  "Level of Study", "Country of Residence", "Ethnicity", "How you heard about hackru", "reasons for attending", "phone number"
+          'age', "school", "Graduation Year", "Gender",  "Level of Study", "Country of Residence", "Ethnicity", "How you heard about hackru", "reasons for attending", "phone number"
         ]
         for (let i = 0; i < requiredFields.length; i++) {
           if (!userData[requiredFields[i]]){

diff --git a/app/dashboard/views/organizerView.tsx b/app/dashboard/views/organizerView.tsx
@@ -8,6 +8,7 @@ import EventScan from './eventScan';
 import { AttendEventScan, GetUser, SetUser } from '@/app/lib/actions';
 import PopupDialog from '../components/dialog';
 import { set } from 'zod';
+import Page from '@/app/(pre-dashboard)/(landing)/page';
 
 type STATUS =
   | 'SUCCESSFUL'
@@ -107,6 +108,7 @@ function OrganizerView() {
   const [houseOfScannedUser, setHouseOfScannedUser] = useState<string>('');
   const [scannedName, setScannedName] = useState<string>('');
   const [confirmation, setConfirmation] = useState<boolean>(false);
+  const [isLoggedIn, setIsLoggedIn] = useState(true);
 
   const resetScanLog = () => {
     setScannedName('');
@@ -115,6 +117,14 @@ function OrganizerView() {
     setStatus('AWAITING SCAN');
   };
 
+  const logout = () => {
+    setIsLoggedIn(false);
+  }
+
+  if(!isLoggedIn) {
+    return <Page /> //render page is user is not logged in
+  }
+
   const handleOnScan = async (
     result: string,
     forceAttendance: boolean = false,
@@ -231,6 +241,13 @@ function OrganizerView() {
                 Event
               </button>
             </div>
+
+            <button 
+              className='mt-2 rounded bg-red-500 px-4 py-2 font-bold text-white hover:bg-red-700'
+              onClick={logout}
+            >
+                  Logout 
+            </button>
           </div>
           {showForceAttendance && (
             <PopupDialog