Merge pull request #43 from CS3219-AY2425S1/PEER-234-Editor-UI

PEER-234: Add Editor UI

Author: SeeuSim

.env.local

@@ -10,7 +10,7 @@ QUESTION_PGDATA="/data/qn-db"
 
 COLLAB_SERVICE_NAME=collab-express
 COLLAB_EXPRESS_PORT=9003
-COLLAB_EXPRESS_DB_PORT=5435
+COLLAB_EXPRESS_DB_PORT=5434
 COLLAB_PGDATA="/data/collab-db"
 
 MATCHING_SERVICE_NAME=match-express

.github/workflows/build-docker.yaml

@@ -183,7 +183,7 @@ jobs:
           cache-to: type=gha,mode=max
 
   results:
-    if: ${{ always() }}
+    if: ${{ always() && !github.event.pull_request.draft }}
     runs-on: ubuntu-latest
     name: Final Results
     needs: build-and-push-image

backend/collaboration/.env.docker

@@ -2,7 +2,7 @@ PEERPREP_UI_HOST=http://host.docker.internal:5173
 
 EXPRESS_PORT=9003
 EXPRESS_DB_HOST=host.docker.internal
-EXPRESS_DB_PORT=5435
+EXPRESS_DB_PORT=5434
 POSTGRES_DB=collab
 POSTGRES_USER=peerprep-collab-express
 POSTGRES_PASSWORD=6rYE0nIzI2ThzDO

backend/collaboration/.env.local

@@ -2,7 +2,7 @@ PEERPREP_UI_HOST="http://localhost:5173"
 
 EXPRESS_PORT=9003
 EXPRESS_DB_HOST="localhost"
-EXPRESS_DB_PORT=5435
+EXPRESS_DB_PORT=5434
 POSTGRES_DB="collab"
 POSTGRES_USER="peerprep-collab-express"
 POSTGRES_PASSWORD="6rYE0nIzI2ThzDO"

backend/collaboration/src/server.ts

@@ -15,7 +15,21 @@ import { setUpWSServer } from './ws';
 
 const app = express();
 
-app.use(pino());
+app.use(
+  pino({
+    serializers: {
+      req: ({ id, method, url, headers: { host, referer }, query, params }) => ({
+        id,
+        method,
+        url,
+        headers: { host, referer },
+        query,
+        params,
+      }),
+      res: ({ statusCode }) => ({ statusCode }),
+    },
+  })
+);
 app.use(json());
 app.use(
   cors({

backend/matching/src/server.ts

@@ -11,7 +11,21 @@ import { UI_HOST } from './config';
 import { createWs } from './ws';
 
 const app = express();
-app.use(pino());
+app.use(
+  pino({
+    serializers: {
+      req: ({ id, method, url, headers: { host, referer }, query, params }) => ({
+        id,
+        method,
+        url,
+        headers: { host, referer },
+        query,
+        params,
+      }),
+      res: ({ statusCode }) => ({ statusCode }),
+    },
+  })
+);
 app.use(json());
 app.use(
   cors({

backend/question/src/server.ts

@@ -13,7 +13,21 @@ import { logger } from '@/lib/utils';
 import questionsRouter from '@/routes/question';
 
 const app = express();
-app.use(pino());
+app.use(
+  pino({
+    serializers: {
+      req: ({ id, method, url, headers: { host, referer }, query, params }) => ({
+        id,
+        method,
+        url,
+        headers: { host, referer },
+        query,
+        params,
+      }),
+      res: ({ statusCode }) => ({ statusCode }),
+    },
+  })
+);
 app.use(json());
 app.use(helmet());
 app.use(

backend/user/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "user-express",
+  "name": "user",
   "version": "1.0.0",
   "main": "dist/index.js",
   "scripts": {

backend/user/src/server.ts

@@ -16,7 +16,21 @@ import authCheckRoutes from '@/routes/auth-check';
 import userRoutes from '@/routes/user';
 
 const app = express();
-app.use(pino());
+app.use(
+  pino({
+    serializers: {
+      req: ({ id, method, url, headers: { host, referer }, query, params }) => ({
+        id,
+        method,
+        url,
+        headers: { host, referer },
+        query,
+        params,
+      }),
+      res: ({ statusCode }) => ({ statusCode }),
+    },
+  })
+);
 app.use(json());
 app.use(helmet());
 app.use(cookieParser());

docker-compose.yaml

@@ -227,6 +227,8 @@ services:
     environment:
       - VITE_USER_SERVICE=http://${USER_SERVICE_NAME}:${USER_EXPRESS_PORT}
       - VITE_QUESTION_SERVICE=http://${QUESTION_SERVICE_NAME}:${QUESTION_EXPRESS_PORT}
+      - VITE_COLLAB_SERVICE=http://${COLLAB_SERVICE_NAME}:${COLLAB_EXPRESS_PORT}
+      - VITE_COLLAB_WS=ws://${COLLAB_SERVICE_NAME}:${COLLAB_EXPRESS_PORT}
       - VITE_MATCHING_SERVICE=http://${MATCHING_SERVICE_NAME}:${MATCHING_EXPRESS_PORT}
       - FRONTEND_PORT=${FRONTEND_PORT}
     depends_on: