final submission

.env.example

@@ -6,4 +6,5 @@ POSTGRES_DB="user-service"
 PG_PORT=5432
 SECRET_KEY=
 
-REDIS_PASSWORD=
+REDIS_PASSWORD=
+REACT_APP_BACKEND_HOST="localhost"

README.md

@@ -1,13 +1,10 @@
 # Running this project
 
-Simply run `docker-compose up --build` or `docker compose up --build`
+Simply run `docker-compose up --build` or `docker compose up --build` from the root of this repo with the correct `.env` file.
 
+Please see `.env.example` for an idea of what variables the env file should have.
 
-# For devs
+The website should be accessible at port 80 and 443
 
-TBA
 
-To manually push to our service registry, please set up gcloud authentication with our project title
-Then build the images as you would normally with `docker-compose build`
-Then push the builds to the registry with `docker-compose push`
 

api_gateway/src/index.ts

@@ -8,7 +8,7 @@ import { isLocal } from './proxy/service_addresses';
 import cors from 'cors';
 
 const corsOptions = {
-    origin: ["http://peerprep-g10.com", "https://peerprep-g10.com", "http://localhost:3000"],
+    origin: ["http://peerprep-g10.com", "https://peerprep-g10.com", "http://localhost:3000", "http://localhost", "https://localhost"],
     methods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
     optionsSuccessStatus: 200,
     credentials: true,    

code_execution/src/executor_client.ts

@@ -4,8 +4,7 @@ import { callbacks, langToId } from "./shared";
 import { judge0Result, judge0submission, submissionResult } from "./types";
 import { submitSubmission } from "./submission_client";
 
-const JUDGE_API_URL = "http://peerprep-g10.com:2358"; //"https://judge0-ce.p.rapidapi.com";
-const API_KEY = process.env.JUDGE0_API_KEY;
+const JUDGE_API_URL = "http://judge0:2358"; //"https://judge0-ce.p.rapidapi.com";
 
 async function submitIndividual(submission: judge0submission) {
   const response = await axios.post(

docker-compose.yml

@@ -6,6 +6,8 @@ services:
     build:
       context: ./frontend
       dockerfile: Dockerfile.prod
+      args:
+        - REACT_APP_BACKEND_HOST=${REACT_APP_BACKEND_HOST}
     image: asia-southeast1-docker.pkg.dev/cs3219-400714/peerprep/frontend:latest
     environment:
       - REACT_APP_ENV_TYPE=prod
@@ -94,13 +96,13 @@ services:
       dockerfile: Dockerfile.prod
     environment:
       - PORT=8090
-      - JUDGE0_API_KEY=${JUDGE0_API_KEY}
     ports:
       - "8090:8090"
     volumes:
       - questions_test_cases:/app/question_test_cases
 
   judge0-server:
+      container_name: judge0
       image: judge0/judge0:1.13.0
       ports:
         - "2358:2358"

docker_compose_dev.yml

@@ -52,7 +52,6 @@ services:
       context: ./code_execution
     environment:
       - PORT=8090
-      - JUDGE0_API_KEY=${JUDGE0_API_KEY}
     ports:
       - "8090:8090"
     volumes:

frontend/Dockerfile.prod

@@ -3,13 +3,21 @@ FROM node:18-alpine as build
 WORKDIR /app
 COPY package.json ./
 COPY package-lock.json ./
+COPY create-env-file.sh ./
 RUN npm ci
 COPY . ./
+
+ARG REACT_APP_BACKEND_HOST
+
+RUN sh create-env-file.sh REACT_APP_BACKEND_HOST=$REACT_APP_BACKEND_HOST
 RUN npm run build
 
 
 # Serve stage
 FROM nginx:alpine
+COPY nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=build /app/build /usr/share/nginx/html
+COPY --from=build /app/.env /usr/share/nginx/html
+
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

frontend/create-env-file.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+#
+
+touch .env
+
+for envvar in "$@" 
+do
+   echo "$envvar" >> .env
+done

frontend/nginx.conf

@@ -0,0 +1,15 @@
+server {
+    listen       80;
+    server_name  localhost;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+        try_files $uri /index.html;                 
+    }
+
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}

frontend/src/api/gateway.ts

@@ -1,10 +1,12 @@
 import axios from 'axios'
 
+const backendHost = process.env.REACT_APP_BACKEND_HOST;
+
 export const apiGatewayClient = axios.create({
-    baseURL: process.env.NODE_ENV === 'production'? 'http://peerprep-g10.com:8000' : 'http://localhost:8000' ,
+    baseURL: process.env.NODE_ENV === 'production'? `http://${backendHost}:8000` : 'http://localhost:8000' ,
     withCredentials: true
 })
 
 
-export const wsMatchMakeURL = process.env.NODE_ENV === 'production'? 'http://peerprep-g10.com:7999' : 'http://localhost:7999'
-export const wsCollabUrl = process.env.NODE_ENV === 'production'? 'ws://peerprep-g10.com:8083' :'ws://localhost:8083'
+export const wsMatchMakeURL = process.env.NODE_ENV === 'production'? `http://${backendHost}:7999` : 'http://localhost:7999'
+export const wsCollabUrl = process.env.NODE_ENV === 'production'? `ws://${backendHost}:8083` :'ws://localhost:8083'

frontend/src/reducers/authSlice.ts

@@ -30,7 +30,7 @@ const dummyAdmin: User = {
 };
 
 const initialState: AuthState = {
-    user: dummyUser // null
+    user: null
 }
 
 const userSlice = createSlice({

question_service/src/controller/questionController.ts

@@ -214,17 +214,20 @@ export const updateQuestion = async (req : any, res : any) => {
 // @access  admin only
 export const deleteQuestion = async (req : any, res : any) => {
     try {
-        // function provided by mongoose to find an Question document with a given ID
-        // req.params.id is retrieved from /:id in route
-        const question = await Question.findById(req.params.id);
-        if(question === null) {
-            throw Error('Invalid ID. Question not found in database.');
-        }
+      // function provided by mongoose to find an Question document with a given ID
+      // req.params.id is retrieved from /:id in route
+      const question = await Question.findById(req.params.id);
+      if (question === null) {
+        throw Error("Invalid ID. Question not found in database.");
+      }
 
-        await fs.rm(`/app/question_test_cases/${question._id}`);
-        await question.deleteOne();
-        res.status(200).json({ message: 'Question removed' });
+      const testcases = `/app/question_test_cases/${question._id}/`;
+      if (fs.existsSync(testcases)) {
+        await fs.rm(testcases, { recursive: true });
+      }
+      await question.deleteOne();
+      res.status(200).json({ message: "Question removed" });
     } catch (error: any) {
-        res.status(404).json({ message: error.message })
+      res.status(404).json({ message: error.message });
     }
 }