From 143fa51eb270e1b33d4ad6143bd147a36dd839e3 Mon Sep 17 00:00:00 2001
From: jayllo-c <jaylotc@gmail.com>
Date: Sun, 10 Nov 2024 14:56:08 +0800
Subject: [PATCH] fix termination description

now displays correct message when only one user is in the session.
---
 frontend/peerprep/.env.sample                        | 12 ++++++------
 .../components/collaboration/CollabNavbar.tsx        |  1 +
 .../components/collaboration/TerminateModal.tsx      |  8 +++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/frontend/peerprep/.env.sample b/frontend/peerprep/.env.sample
index 215f000ecb..101b845d4c 100644
--- a/frontend/peerprep/.env.sample
+++ b/frontend/peerprep/.env.sample
@@ -1,9 +1,9 @@
-NEXT_PUBLIC_USER_SERVICE_URL=http://localhost:8003
-NEXT_PUBLIC_MATCHING_SERVICE_URL=http://localhost:8004
-NEXT_PUBLIC_QUESTION_SERVICE_URL=http://localhost:8002
-NEXT_PUBLIC_COLLAB_SERVICE_URL=http://localhost:8005
-NEXT_PUBLIC_MATCHING_SOCKET_URL=http://localhost:8004
-NEXT_PUBLIC_COLLAB_SOCKET_URL=http://localhost:8005
+NEXT_PUBLIC_USER_SERVICE_URL=http://localhost:8004
+NEXT_PUBLIC_MATCHING_SERVICE_URL=http://localhost:8002
+NEXT_PUBLIC_QUESTION_SERVICE_URL=http://localhost:8003
+NEXT_PUBLIC_COLLAB_SERVICE_URL=http://localhost:8010
+NEXT_PUBLIC_MATCHING_SOCKET_URL=http://localhost:8002
+NEXT_PUBLIC_COLLAB_SOCKET_URL=http://localhost:8010
 NEXT_PUBLIC_MATCHING_SOCKET_PATH=/socket.io
 NEXT_PUBLIC_COLLAB_SOCKET_PATH=/socket.io
 NEXT_PUBLIC_IMAGE_UPLOAD_KEY= # You can get this from portive
diff --git a/frontend/peerprep/components/collaboration/CollabNavbar.tsx b/frontend/peerprep/components/collaboration/CollabNavbar.tsx
index 9a8c090f23..87ffa9247c 100644
--- a/frontend/peerprep/components/collaboration/CollabNavbar.tsx
+++ b/frontend/peerprep/components/collaboration/CollabNavbar.tsx
@@ -66,6 +66,7 @@ export const CollabNavbar = ({
         <NavbarItem className="flex items-center justify-end gap-3">
           <TerminateModal
             isModalVisible={isModalVisible}
+            usersInRoom={usersInRoom}
             userConfirmed={userConfirmed}
             isCancelled={isCancelled}
             isFirstToCancel={isFirstToCancel}
diff --git a/frontend/peerprep/components/collaboration/TerminateModal.tsx b/frontend/peerprep/components/collaboration/TerminateModal.tsx
index 357fec0e18..0f1fe3d70b 100644
--- a/frontend/peerprep/components/collaboration/TerminateModal.tsx
+++ b/frontend/peerprep/components/collaboration/TerminateModal.tsx
@@ -11,6 +11,7 @@ import {
 
 interface TerminateModalProps {
   isModalVisible: boolean;
+  usersInRoom: string[];
   userConfirmed: boolean;
   isCancelled: boolean;
   isFirstToCancel: boolean;
@@ -22,6 +23,7 @@ interface TerminateModalProps {
 
 export default function TerminateModal({
   isModalVisible,
+  usersInRoom = [],
   userConfirmed,
   isCancelled,
   isFirstToCancel,
@@ -30,6 +32,10 @@ export default function TerminateModal({
   handleConfirm,
   setIsCancelled,
 }: TerminateModalProps) {
+
+  
+  const terminateDescription = usersInRoom.length > 1 ? "Both users need to confirm to terminate the session." : "Other user has left, click to terminate.";
+
   return (
     <div className="flex justify-center items-center h-full w-full">
       <Button className="" variant="flat" color="danger" onClick={openModal}>
@@ -50,7 +56,7 @@ export default function TerminateModal({
           </ModalHeader>
           <ModalBody>
             <p className="text-center">
-              Both users need to confirm to terminate the session.
+              {terminateDescription}
             </p>
           </ModalBody>
           <ModalFooter>