Clean up api-gateway index and docker-compose yml

Author: szelongq

ApiGatewayService/src/index.ts

@@ -1,81 +1,33 @@
 import express from "express";
 import httpProxy from "http-proxy";
 import cors from "cors";
-// import http from 'http';
-// import { Server } from 'socket.io';
 
 const app = express();
 const proxy = httpProxy.createProxyServer();
 app.use(cors());
 
-// // Create an HTTP server and attach Socket.IO to it
-// const server = http.createServer(app);
-// const io = new Server(server, {
-//     cors: {
-//       origin: '*',
-//     },
-//     path: 'ws'
-//   });
-
 // Define routes for each backend service for local development
 // app.use('/questionservice', (req, res) => {
 //     proxy.web(req, res, { target: 'http://localhost:3002' });
 // });
-
 // app.use('/authservice', (req, res) => {
 //     proxy.web(req, res, { target: 'http://localhost:3003' });
 // });
-
 // app.use('/userservice', (req, res) => {
 //     proxy.web(req, res, { target: 'http://localhost:3004' });
 // });
 
-// app.use('/matchingservice', (req, res) => {
-//     proxy.web(req, res, { target: 'http://localhost:3005' });
-// });
-
-//Define routes for each backend service for production/docker containers
+// Define routes for each backend service for production/docker containers
 app.use("/questionservice", (req, res) => {
-  proxy.web(req, res, { target: "http://localhost:3002" });
-  //http://question-service:3002
-  //http://localhost:3002
+  proxy.web(req, res, { target: "http://question-service:3002" });
 });
-
 app.use("/authservice", (req, res) => {
-  proxy.web(req, res, { target: "http://localhost:3003" });
-  //http://auth-service:3003
-  //http://localhost:3003
+  proxy.web(req, res, { target: "http://auth-service:3003" });
 });
-
 app.use("/userservice", (req, res) => {
-  proxy.web(req, res, { target: "http://localhost:3004" });
-  // http://user-service:3004
-  //http://localhost:3004
-});
-
-app.use("/matchingservice", (req, res) => {
-  proxy.web(req, res, { target: "http://localhost:3005" });
-  //http://matching-service:3005
-  //http://localhost:3005
+  proxy.web(req, res, { target: "http://user-service:3004" });
 });
 
-//Define routes for each backend service for production/docker containers
-// app.use("/questionservice", (req, res) => {
-//   proxy.web(req, res, { target: "http://question-service:3002" });
-// });
-
-// app.use("/authservice", (req, res) => {
-//   proxy.web(req, res, { target: "http://auth-service:3003" });
-// });
-
-// app.use("/userservice", (req, res) => {
-//   proxy.web(req, res, { target: "http://user-service:3004" });
-// });
-
-// app.use("/matchingservice", (req, res) => {
-//   proxy.web(req, res, { target: "http://matching-service:3005" });
-// });
-
 
 // Start the server
 app.listen(3001, () => {

docker-compose.yml

@@ -1,5 +1,13 @@
 version: '3'
 services:
+  frontend:
+    container_name: frontend
+    build:
+      context: ./frontend
+    image: frontend-image
+    ports:
+      - "3000:3000"
+      
   api-gateway:
     container_name: api-gateway
     build:
@@ -13,56 +21,32 @@ services:
     build:
       context: ./AuthService
     image: auth-service-image
-    # ports:
-    #   - "3001:3001"
-
-  matching-service:
-    container_name: matching-service
-    build:
-      context: ./MatchingService
-    image: matching-service-image
-    ports:
-      - "3005:3005"
-    stdin_open: true
 
   question-service:
     container_name: question-service
     build:
       context: ./QuestionService
     image: question-service-image
-    # ports:
-    #   - "3001:3001"
 
   user-service:
     container_name: user-service
     build:
       context: ./UserService
     image: user-service-image
-    # ports:
-    #   - "3001:3001"
-  
-  # collab-service:
-  #   container_name: collab-service
-    
-  #   build:
-  #     context: ./CollabService
-  #   image: collab-service-image
-  #   ports:
-  #     - "3006:3006"
-    
 
+  matching-service:
+    container_name: matching-service
+    build:
+      context: ./MatchingService
+    image: matching-service-image
+    ports:
+      - "3005:3005"
+    stdin_open: true
+    
   chat-service:
     container_name: chat-service
     build:
       context: ./ChatService
     image: chat-service-image
     ports:
-      - "3007:3007"
-
-  frontend:
-    container_name: frontend
-    build:
-      context: ./frontend
-    image: frontend-image
-    ports:
-      - "3000:3000"
+      - "3007:3007"