Merge pull request #55 from CS3219-AY2425S1/ui-update

UI update
CS3219-AY2425S1 · Nov 13, 2024 · 185c951 · 185c951
2 parents 62d797c + 5718737
commit 185c951
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/client/src/components/HomePage/BasicCard.js b/client/src/components/HomePage/BasicCard.js
@@ -22,7 +22,7 @@ export default function BasicCard({ title, description, label, link }) {
         borderRadius: "16px"
       }}
     >
-      <CardContent sx={{ border: "1px solid red", flex: "1 1 auto" }}>
+      <CardContent sx={{ flex: "1 1 auto" }}>
         <Typography
           variant="h4"
           component="div"
@@ -35,7 +35,7 @@ export default function BasicCard({ title, description, label, link }) {
           {description}
         </Typography>
       </CardContent>
-      <CardActions sx={{ justifyContent: "center", border: "1px solid red" }}>
+      <CardActions sx={{ justifyContent: "center" }}>
         <Button size="small" variant="outlined" onClick={handleButtonClick}>
           {label}
         </Button>

diff --git a/server/chat-service/server.js b/server/chat-service/server.js
@@ -37,9 +37,15 @@ io.on("connection", (socket) => {
   socket.on("disconnect", (reason, details) => {
     console.log("User disconnected from chat service:", socket.id);
     console.log("Reason", reason);
-    console.log("Message", details.message);
-    console.log("Description", details.description);
-    console.log("Context", details.context);
+    if (details && details.message) {
+      console.log("Message", details.message);
+    }
+    if (details && details.description) {
+      console.log("Description", details.description);
+    }
+    if (details && details.context) {
+      console.log("Context", details.context);
+    }
   });
 });
 

diff --git a/server/collaboration-service/server.js b/server/collaboration-service/server.js
@@ -31,9 +31,15 @@ io.on("connection", (socket) => {
   socket.on("disconnect", (reason, details) => {
     console.log("Client disconnected");
     console.log("Reason", reason);
-    console.log("Message", details.message);
-    console.log("Description", details.description);
-    console.log("Context", details.context);
+    if (details && details.message) {
+      console.log("Message", details.message);
+    }
+    if (details && details.description) {
+      console.log("Description", details.description);
+    }
+    if (details && details.context) {
+      console.log("Context", details.context);
+    }
   });
 });