Refactor env

Author: jolynloh

backend/user-service/src/model/repository.ts

@@ -1,13 +1,17 @@
 import UserModel, { IUser } from "./user-model";
-import "dotenv/config";
+import dotenv from "dotenv";
 import { connect } from "mongoose";
 
+dotenv.config();
+
 export async function connectToDB() {
   const mongoDBUri: string | undefined =
     process.env.NODE_ENV === "production"
       ? process.env.MONGO_CLOUD_URI
       : process.env.MONGO_LOCAL_URI;
 
+  console.log(mongoDBUri);
+
   if (!mongoDBUri) {
     throw new Error("MongoDB URI is not provided");
   }

frontend/src/utils/api.ts

@@ -1,9 +1,14 @@
 import axios from "axios";
 
-const usersUrl = "http://localhost:3001/api";
-const questionsUrl = "http://localhost:3000/api/questions";
-const codeExecutionUrl = "http://localhost:3004/api/run";
-const qnHistoriesUrl = "http://localhost:3006/api/qnhistories";
+const usersUrl =
+  import.meta.env.VITE_USER_SERVICE_URL ?? "http://localhost:3001/api";
+const questionsUrl =
+  import.meta.env.VITE_QN_SERVICE_URL ?? "http://localhost:3000/api/questions";
+const codeExecutionUrl =
+  import.meta.env.VITE_CODE_EXEC_SERVICE_URL ?? "http://localhost:3004/api/run";
+const qnHistoriesUrl =
+  import.meta.env.VITE_QN_HIST_SERVICE_URL ??
+  "http://localhost:3006/api/qnhistories";
 
 export const questionClient = axios.create({
   baseURL: questionsUrl,

frontend/src/utils/collabSocket.ts

@@ -32,7 +32,8 @@ export type CollabSessionData = {
   awareness: Awareness;
 };
 
-const COLLAB_SOCKET_URL = "http://localhost:3003";
+const COLLAB_SOCKET_URL =
+  import.meta.env.VITE_COLLAB_SERVICE_URL ?? "http://localhost:3003";
 export const collabSocket = io(COLLAB_SOCKET_URL, {
   reconnectionAttempts: 3,
   autoConnect: false,

frontend/src/utils/communicationSocket.ts

@@ -13,7 +13,8 @@ export enum CommunicationEvents {
   DISCONNECTED = "disconnected",
 }
 
-const COMMUNICATION_SOCKET_URL = "http://localhost:3005";
+const COMMUNICATION_SOCKET_URL =
+  import.meta.env.VITE_COMM_SERVICE_URL ?? "http://localhost:3005";
 
 export const communicationSocket = io(COMMUNICATION_SOCKET_URL, {
   reconnectionAttempts: 3,

frontend/src/utils/matchSocket.ts

@@ -1,6 +1,9 @@
 import { io } from "socket.io-client";
 
-const MATCH_SOCKET_URL = "http://localhost:3002";
+const MATCH_SOCKET_URL =
+  import.meta.env.VITE_MATCH_SERVICE_URL ?? "http://localhost:3002";
+
+console.log(import.meta.env.VITE_MATCH_SERVICE_URL);
 
 export const matchSocket = io(MATCH_SOCKET_URL, {
   reconnectionAttempts: 3,