fixed some bugs and deleted some log statements

TritonSE · Jun 15, 2024 · 953e86c · 953e86c
1 parent 6d9b4af
commit 953e86c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/frontend/src/components/NotificationCard/NotificationTable.tsx b/frontend/src/components/NotificationCard/NotificationTable.tsx
@@ -76,7 +76,7 @@ export default function NotificationTable({ firebaseToken }: NotificationsProps)
             name={user.name}
             email={user.email}
             // account_type={user.role}
-            account_type={user.accountType} // console log shows correct property name is accountType
+            account_type={user.role} // console log shows correct property name is accountType
             onApprove={() => handleApproveUser(user.email)}
             onDeny={() => handleDenyUser(user.email)}
           />

diff --git a/frontend/src/components/StudentsTable/StudentsTable.tsx b/frontend/src/components/StudentsTable/StudentsTable.tsx
@@ -44,7 +44,6 @@ export default function StudentsTable() {
             obj[student._id] = student;
             return obj;
           }, {} as StudentMap);
-          console.log(result.data);
 
           setAllStudents(studentsObject);
           setIsLoading(false);

diff --git a/frontend/src/hooks/redirect.tsx b/frontend/src/hooks/redirect.tsx
@@ -53,7 +53,7 @@ export const useRedirection = ({ checkShouldRedirect, redirectURL }: UseRedirect
  */
 export const useRedirectToHomeIfSignedIn = () => {
   useRedirection({
-    checkShouldRedirect: ({ firebaseUser, piaUser }) => firebaseUser !== null && piaUser !== null,
+    checkShouldRedirect: ({ firebaseUser, piaUser }) => firebaseUser !== null && piaUser !== null && piaUser.approvalStatus,
     redirectURL: HOME_URL,
   });
 };