fixed merge conflict errors

uwblueprint · Sep 21, 2024 · 5db2c10 · 5db2c10
1 parent 06e180a
commit 5db2c10
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/frontend/src/components/auth/PrivateRoute.tsx b/frontend/src/components/auth/PrivateRoute.tsx
@@ -10,15 +10,16 @@ const PrivateRoute: React.FC<{ children: React.ReactElement }> = ({
   children,
 }) => {
   const { authenticatedUser } = useContext(AuthContext);
-  return ( // after return, add "authenticatedUser ?""
+  return (
+    // after return, add "authenticatedUser ?""
     <Flex>
       <SideBar />
       {children}
     </Flex>
-  // ) : (
-  //   <Navigate to={LOGIN_PAGE} />
-  // );
-  )
+    // ) : (
+    //   <Navigate to={LOGIN_PAGE} />
+    // );
+  );
 };
 
 export default PrivateRoute;
diff --git a/frontend/src/components/pages/announcements/AnnouncementsGroups.tsx b/frontend/src/components/pages/announcements/AnnouncementsGroups.tsx
@@ -136,9 +136,6 @@ const GroupList: React.FC<{
   const [processedAnnouncements, setProcessedAnnouncements] =
     useState<ProcessedGroupAnnouncements>();
 
-  const [searchRooms, setSearchRooms] = useState<number[]>([]);
-  const [allRooms, setAllRooms] = useState([1, 2, 3, 4, 5, 6]);
-
   useEffect(() => {
     const processedData: ProcessedGroupAnnouncements = {
       all: {},