Merge branch 'main' of github.com:CS3219-AY2425S1/cs3219-ay2425s1-project-g15

Author: tingkai-mai

frontend/src/app/collaboration/components/editor.tsx

@@ -134,6 +134,8 @@ function Collaboration({ room, language, code, setLanguage }: Readonly<Props>) {
     editor: { onDidChangeCursorPosition: (arg0: (e: any) => void) => void },
     monaco: any
   ) {
+    monaco.editor.setTheme("vs-dark");
+
     editorRef.current = editor;
 
     if (providerRef.current && docRef.current) {

frontend/src/app/collaboration/components/video.tsx

@@ -42,7 +42,7 @@ const VideoCall = ({ provider }: VideoCallProps) => {
           urls: "turn:global.relay.metered.ca:80?transport=tcp",
           username: "2b012e1176eda910d0c8a755",
           credential: "6KjvgYahJZ21gdAp",
-        }
+        },
       ],
     });
 
@@ -90,7 +90,7 @@ const VideoCall = ({ provider }: VideoCallProps) => {
           urls: "turn:global.relay.metered.ca:80?transport=tcp",
           username: "2b012e1176eda910d0c8a755",
           credential: "6KjvgYahJZ21gdAp",
-        }
+        },
       ],
     });
 
@@ -227,13 +227,18 @@ const VideoCall = ({ provider }: VideoCallProps) => {
       removed.forEach((clientId) => {
         console.log("Client disconnected:", clientId);
         if (remoteVideoRef.current) {
+          console.log("remote video exists");
           if (clientId !== provider.awareness.clientID) {
             remoteVideoRef.current.srcObject = null;
             remoteStreamRef.current = null;
             setRemoteVideoSourceObject(false);
             iceCandidatesQueue.current = [];
             startPC();
-            if (videoStart) startCall();
+            console.log(`Video start ${videoStart}`);
+            if (videoStart) {
+              console.log("restarting call");
+              startCall();
+            }
           } else {
             setVideoStart(false);
           }