Merge branch 'main' into 182-lockout-buttons-that-take-some-time-do-s…

…omething-login-signup-register

app/(pre-dashboard)/(landing)/sections/Sponsors.tsx

@@ -5,13 +5,17 @@ export default async function Sponsors() {
   const sponsors = [
      '/sponsors/NJTRANSIT.png',
      '/sponsors/RHNIC_RED_WHITE_RBG.png',
-     '/sponsors/CAIT2.png'
+     '/sponsors/CAIT2.png',
+     '/sponsors/iCIMSWhite.png',
+     '/sponsors/redbull.png'
   ];
 
   const sponsorsLinks = [
     'https://www.njtransit.com/innovation',
     'https://www.canva.com/design/DAGSRyhN4jE/q65xcClKrYfxJka-VgXBwA/watch?utm_content=DAGSRyhN4jE&utm_campaign=share_your_design&utm_medium=link&utm_source=shareyourdesignpanel',
-    'https://cait.rutgers.edu/about/'
+    'https://cait.rutgers.edu/about/',
+    'https://www.icims.com',
+    'https://www.redbull.com/us-en'
  ];
 
   return (

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

app/lib/actions.ts

@@ -74,7 +74,7 @@ export async function authenticate(email: string, password: string) {
         case 'CredentialsSignin':
           return 'Invalid credentials.';
         default:
-          return 'Something went wrong.';
+          return error.message;
       }
     }
     redirect('/dashboard');
@@ -193,7 +193,7 @@ export async function SignUp(
               case 'CredentialsSignin':
                 resp.error = 'Invalid credentials.';
               default:
-                resp.error = 'Something went wrong.';
+                resp.error = error.message;
             }
           }
         }
@@ -285,12 +285,15 @@ export async function SetUser(data: any, user_email_to_update: string) {
       .then(async (res) => {
         let resJSON = await res.json();
         if (resJSON.statusCode !== 200) {
-          if (resJSON.body) {
-            resp.error = resJSON.body;
+          if (resJSON?.error) {
+            resp.error = resJSON.error;
           } else {
             resp.error = 'Unexpected Error';
           }
         }
+        else{
+          resp.response = resJSON.message;
+        }
       })
       .catch((error) => {
         resp.error = error + '; An error occurred retrieving data';

app/lib/data.ts

@@ -181,9 +181,7 @@ export async function RegisterSelf() {
     return resp.error;
   }
 
-  return {
-    error: 'Something went wrong',
-  };
+  return 'Something went wrong';
 }
 
 export async function ConfirmComingOrNot(isComing: boolean): Promise<{

public/schools.csv

@@ -1442,6 +1442,7 @@ RMK College of Engineering
 RNS Institute of Technology
 Robbinsville High School
 Robert Gordon University
+Robert Wood Johnson Medical School
 Rochester Institute of Technology
 Rock Ridge High School
 Roger Williams University
@@ -1465,7 +1466,8 @@ Rustamji Institute of Technology
 Rutgers Preparatory School
 Rutgers University - Newark
 Rutgers University – Camden
-"Rutgers, The State University of New Jersey"
+"Rutgers, The State University of New Jersey"\
+Rutgers New Jersey Medical School
 Ryde School
 Rye High School
 Ryerson University