Merge remote-tracking branch 'origin/collab-gorilla' into collab-gorilla

Author: DistractedCat

compose.yaml

@@ -1,6 +1,7 @@
 services:
   peerprep:
     build: peerprep
+    image: modembcc/peerprep
     env_file:
       - peerprep/.env
     ports:
@@ -16,6 +17,7 @@ services:
 
   user-service:
     build: user-service
+    image: modembcc/user-service
     volumes:
       - /user-service/node_modules
     env_file:
@@ -32,6 +34,7 @@ services:
 
   backend:
     build: backend
+    image: modembcc/backend
     env_file:
       - backend/.env
     ports:
@@ -70,6 +73,7 @@ services:
 
   matching-service:
     build: matching-service
+    image: modembcc/matching-service
     env_file:
       - matching-service/.env
     extra_hosts:
@@ -85,6 +89,7 @@ services:
 
   matching-service-api:
     build: matching-service-api
+    image: modembcc/matching-service-api
     env_file:
       - matching-service-api/.env
     extra_hosts:
@@ -102,6 +107,7 @@ services:
 
   storage-blob-api:
     build: storage-blob-api
+    image: modembcc/storage-blob-api
     env_file:
       - storage-blob-api/.env
     extra_hosts:
@@ -118,6 +124,7 @@ services:
 
   collab:
     build: collab
+    image: modembcc/collab
     env_file:
       - collab/.env
     ports:

peerprep/components/questionpage/CollabEditor.tsx

@@ -172,22 +172,23 @@ export default function CollabEditor({ question, roomID, authToken }: Props) {
           }
         />
 
-        {roomID && connected ? (
-          <div className="h-full align-middle">
-            <PeerprepButton onClick={handleCloseConnection}>
-              Close Room
-            </PeerprepButton>
-          </div>
-        ) : (
-          <div className="h-full align-middle">
-            <PeerprepButton
-              onClick={handleCloseConnection}
-              className="disabled"
-            >
-              Disconnected. Check logs.
-            </PeerprepButton>
-          </div>
-        )}
+        {roomID &&
+          (connected ? (
+            <div className="h-full align-middle">
+              <PeerprepButton onClick={handleCloseConnection}>
+                Close Room
+              </PeerprepButton>
+            </div>
+          ) : (
+            <div className="h-full align-middle">
+              <PeerprepButton
+                onClick={handleCloseConnection}
+                className="disabled"
+              >
+                Disconnected. Check logs.
+              </PeerprepButton>
+            </div>
+          ))}
       </div>
       <AceEditor
         mode={language}