Merge pull request #96 from CS3219-AY2425S1/ecs-deployment

Ecs deployment

Author: SilasTSL

.env.example

@@ -16,6 +16,3 @@ PEERPREP_QUESTION_INITDB_NAME=peerprepQuestionServiceDB # must match question se
 PEERPREP_USER_INITDB_NAME=peerprepUserServiceDB # must match user service .env file and init-mongo.js
 PEERPREP_MATCHING_INITDB_NAME=peerprepMatchingServiceDB # must match user service .env file and init-mongo.js
 PEERPREP_COLLABORATION_INITDB_NAME=peerprepCollaborationServiceDB # must match collab service .env file and init-mongo.js
-
-REACT_APP_LOCAL_API_URL=http://localhost #http://52.221.131.145 for production
-REACT_APP_SOCKET_URL=http://localhost:3003 #http://52.221.131.145:3003 for production

docker-compose.yml

@@ -125,8 +125,6 @@ services:
             - CHOKIDAR_USEPOLLING=true
             - WATCHPACK_POLLING=true
             - WDS_SOCKET_PORT=0
-            - REACT_APP_LOCAL_API_URL=${REACT_APP_LOCAL_API_URL}
-            - REACT_APP_SOCKET_URL=${REACT_APP_SOCKET_URL}
 
     # Nginx API Gateway
     nginx:

frontend/.env.example

@@ -1,5 +1,6 @@
 REACT_APP_LOCAL_API_URL=http://localhost
 REACT_APP_SOCKET_URL=http://localhost:3003
+REACT_APP_COLLAB_SOCKET_URL=localhost:3004
 
 # Copy root .env
 # If using mongoDB containerization, set to true. Else set to false (i.e local testing)

frontend/src/domain/context/CollaborationContext.tsx

@@ -50,7 +50,7 @@ export const CollaborationProvider: React.FC<{ children: ReactNode }> = ({ child
     useEffect(() => {
         if (!roomId) return;
         const ydoc = new Y.Doc();
-        const provider = new WebsocketProvider(`ws://localhost:3004/${roomId}`, roomId, ydoc);
+        const provider = new WebsocketProvider(`ws://${process.env.REACT_APP_COLLAB_SOCKET_URL}/${roomId}`, roomId, ydoc);
         setProvider(provider);
 
         provider.awareness.setLocalStateField(USERNAME, username);