Merge pull request #174 from PeerPrep/elroy-bug-fixes

fix: fix portal and landing bug

Author: elroygohjy

frontend/src/app/admin/portal/page.tsx

@@ -28,25 +28,27 @@ const AdminPortalPage = () => {
     MultiValue<SelectOptionType>
   >([]);
 
+  const fetchAndSetAllUsers = () => {
+    fetchAllUsers().then((allUsers) => {
+      setAdminOptions(
+        allUsers.payload
+          .filter((user: User) => user.role === "user")
+          .map((user: User) => ({ label: user.name, value: user.uid })),
+      );
+    });
+  };
+
   useEffect(() => {
-    if (isAdmin) {
-      fetchAllUsers().then((allUsers) => {
-        setAdminOptions(
-          allUsers.payload
-            .filter((user: User) => user.role === "user")
-            .map((user: User) => ({ label: user.name, value: user.uid })),
-        );
-      });
-    }
-  }, [api, contextHolder]);
+    fetchAndSetAllUsers();
+  }, []);
 
   const handleSelectChange = (
     selectedOptions: MultiValue<SelectOptionType>,
   ) => {
-    setSelectedQnType(selectedOptions);
+    setSelectedAdmins(selectedOptions);
   };
 
-  const [selectedQnType, setSelectedQnType] = useState<
+  const [selectedAdmins, setSelectedAdmins] = useState<
     MultiValue<SelectOptionType>
   >([]);
 
@@ -84,7 +86,7 @@ const AdminPortalPage = () => {
             instanceId="admin-portal"
             isMulti
             required
-            value={selectedQnType}
+            value={selectedAdmins}
             onChange={handleSelectChange}
             name="question type"
             options={adminOptions}
@@ -95,7 +97,7 @@ const AdminPortalPage = () => {
         <Button
           className="btn-accent"
           onClick={() => {
-            promoteToAdmin(selectedQnType.map((option) => option.value))
+            promoteToAdmin(selectedAdmins.map((option) => option.value))
               .then((res) => {
                 if (res.statusMessage.type.toLowerCase() === "success") {
                   api.success({
@@ -110,7 +112,8 @@ const AdminPortalPage = () => {
                 }
               })
               .then(() => {
-                setSelectedQnType([]);
+                fetchAndSetAllUsers();
+                setSelectedAdmins([]);
               });
           }}
         >

frontend/src/app/page.tsx

@@ -6,7 +6,6 @@ import useRedirectLogin from "./hooks/useRedirectLogin";
 
 export default function Home() {
   useRedirectLogin();
-  const router = useRouter();
   return (
     <main className="h-full">
       <Image
@@ -23,11 +22,12 @@ export default function Home() {
           Collaborative mock interviews to boost your confidence and nail your
           dream job interviews.
         </h2>
-        <Button
-          onClick={() => router.push("/login")}
-          className="btn-accent m-2 w-36"
-          children={<span>Get Started!</span>}
-        />
+        <a href="/login">
+          <Button
+            className="btn-accent m-2 w-36"
+            children={<span>Get Started!</span>}
+          />
+        </a>
       </section>
     </main>
   );