Merge pull request #80 from ruiqi7/feature/matching-websocket

Remove navbar buttons from collab page
CS3219-AY2425S1 · Oct 20, 2024 · c5be563 · c5be563
2 parents 14a2277 + 48d54fe
commit c5be563
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/frontend/src/components/Navbar/index.tsx b/frontend/src/components/Navbar/index.tsx
@@ -21,7 +21,7 @@ import {
   USE_AUTH_ERROR_MESSAGE,
   USE_MATCH_ERROR_MESSAGE,
 } from "../../utils/constants";
-import { isMatchingPage } from "../../utils/url";
+import { isMatchingPage, isCollabPage } from "../../utils/url";
 import { useMatch } from "../../contexts/MatchContext";
 
 type NavbarItem = { label: string; link: string; needsLogin: boolean };
@@ -82,7 +82,9 @@ const Navbar: React.FC<NavbarProps> = (props) => {
           >
             PeerPrep
           </Typography>
-          {!isMatchingPage(path) ? (
+          {isCollabPage(path) ? (
+            <></>
+          ) : !isMatchingPage(path) ? (
             <Stack direction={"row"} alignItems={"center"} spacing={2}>
               {navbarItems
                 .filter((item) => !item.needsLogin || (item.needsLogin && user))

diff --git a/frontend/src/utils/url.ts b/frontend/src/utils/url.ts
@@ -2,3 +2,8 @@ export const isMatchingPage = (path: string) => {
   const pattern = /^(?<prefix>\/matching)(?<ignore>\/.*)*$/;
   return pattern.test(path);
 };
+
+export const isCollabPage = (path: string) => {
+  const pattern = /^(?<prefix>\/collaboration)(?<ignore>\/.*)*$/;
+  return pattern.test(path);
+};