Assignment 5

.github/workflows/deploy.yaml

@@ -1,8 +1,5 @@
 name: Deploy MultiDocker
 on:
-  pull_request:
-    branches:
-      - master
   push:
     branches:
       - master
@@ -16,47 +13,28 @@ jobs:
 
       - name: Login to Docker Hub
         run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-
-      - name: Create env file for userservice test
-        run: echo -e "${{ secrets.USER_SERVICE_TEST_ENV_FILE}}" > ./user-service/.env
 
-      - name: Build PostgreSQL Docker image
-        working-directory: ./user-service
-        run: |
-          docker build -f Dockerfile.postgres-db -t user-service-psql .
+      - name: Create env file for user service
+        run: echo -e "${{ secrets.USER_SERVICE_ENV_FILE }}" > ./user-service/.env
 
-      - name: Start PostgreSQL Docker container
-        working-directory: ./user-service
-        run: |
-          docker run -p 1111:5432 -e POSTGRES_PASSWORD=123 --name user-service-db -d user-service-psql
-          sleep 10
+      - name: Create env file for matching service
+        run: echo -e "${{ secrets.MATCHING_SERVICE_ENV_FILE }}" > ./matching-service/.env
 
-      - name: Build and test user-service
-        working-directory: ./user-service
-        run: |
-          npm ci
-          npm run test
+      - name: Create env file for collaboration service
+        run: echo -e "${{ secrets.COLLABORATION_SERVICE_ENV_FILE }}" > ./collaboration-service/.env
 
-      - name: Stop and remove PostgreSQL Docker container
-        run: |
-          docker stop user-service-db
-          docker rm user-service-db
-    
       - name: Build and test client
         working-directory: ./client
         run: |
-          npm ci
+          npm install
           npm test
       
       - name: Build and test question-service
         working-directory: ./question-service
         run: |
-          npm ci
+          npm install
           npm test
             
-      - name: Prevent PR merge
-        if: github.event.pull_request.merged == 'true'
-        run: echo "This PR cannot be merged. Please make necessary changes."
       # - name: Build Docker containers
       #   run: docker-compose -f docker-compose.yml build
 

client/Dockerfile

@@ -1,24 +1,8 @@
 FROM node:16-alpine as builder
-WORKDIR '/client'
+WORKDIR './client'
 COPY ./package.json ./
+RUN npm install
 COPY . .
-RUN npm ci
-RUN npm run build
-
-FROM nginx:alpine
-COPY --from=builder /client/build /usr/share/nginx/html
-COPY nginx.conf /etc/nginx/conf.d/default.conf  
-CMD ["nginx", "-g", "daemon off;"]
-
-# To test it alone, run "docker build -t client ." inside /client
-# To run the image, run "docker run -d -p 3002:3002 client" inside /client
-
-# For dev mode
-# FROM node:16-alpine as builder
-# WORKDIR './client'
-# COPY ./package.json ./
-# RUN npm install
-# COPY . .
-# # RUN npm run build // only use for deployment
-# EXPOSE 3002
-# CMD ["npm", "start"]
+# RUN npm run build // only use for deployment
+EXPOSE 3002
+CMD ["npm", "start"]

client/package.json

@@ -13,7 +13,6 @@
     "axios": "^1.4.0",
     "axios-mock-adapter": "^1.22.0",
     "babel-jest": "^29.7.0",
-    "dotenv": "^16.3.1",
     "fetch-mock": "^9.11.0",
     "framer-motion": "^10.12.16",
     "identity-obj-proxy": "^3.0.0",

client/src/api/Auth.js

@@ -1,7 +1,8 @@
 import axios from "axios";
 import Cookies from 'js-cookie';
+import { authServiceURL } from "./config";
 
-const baseURL = process.env.REACT_APP_USER_SERVICE_URL;
+const baseURL = authServiceURL;
 
 
 function epochToDays(epochTimestamp) {
@@ -126,6 +127,34 @@ export const getUserProfile = async () => {
     }
 }
 
+export const getSpecificUserProfile = async (uuid) => {
+    var curr_user_token = Cookies.get('token');
+
+    const config = {
+        method: 'post',
+        url: baseURL + '/user',
+        headers: {
+            'Content-Type': 'application/json',
+            Authorization: `Bearer ${curr_user_token}`
+        },
+        data: {
+            uuid: uuid
+        }
+    };
+
+    try {
+        const response = await axios(config);
+        if (response.status === 200) {
+            const data = response.data.res;
+            return data;
+        } else {
+            console.error('Failed to retrieve user profile. Status:', response.status);
+        }
+    } catch (error) {
+        console.error('Error while fetching user profile:', error);
+    }
+}
+
 export const editProfile = async (input) => {
     var curr_user_token = Cookies.get('token');
     var uuid = Cookies.get('uuid');