Add routing to collab room

CS3219-AY2425S1 · Oct 31, 2024 · 4b8b23e · 4b8b23e
1 parent 392d1ab
commit 4b8b23e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/frontend/components/collab/chat.tsx b/frontend/components/collab/chat.tsx
@@ -19,13 +19,11 @@ export default function Chat() {
   const lastMessageRef = useRef<HTMLDivElement | null>(null);
 
   useEffect(() => {
-    scrollToBottom();
+    if (partnerMessages.length > 0 || aiMessages.length > 0) {
+      scrollToBottom();
+    }
   }, [partnerMessages, aiMessages]);
 
-  useEffect(() => {
-    scrollToBottom();
-  }, [chatTarget]);
-
   const scrollToBottom = () => {
     if (lastMessageRef.current) {
       lastMessageRef.current.scrollIntoView({ behavior: "smooth" });

diff --git a/frontend/components/matching/find-match.tsx b/frontend/components/matching/find-match.tsx
@@ -99,7 +99,7 @@ export default function FindMatch() {
             description: "Successfully matched",
             variant: "success",
           });
-          router.push(`/collaboration/${roomId}`);
+          router.push(`collab/${roomId}`);
         } else {
           toast({
             title: "Error",
@@ -148,7 +148,7 @@ export default function FindMatch() {
               description: "Successfully matched",
               variant: "success",
             });
-            router.push(`/collaboration/${roomId}`);
+            router.push(`collab/${roomId}`);
           } else {
             toast({
               title: "Error",