Merge branch 'main' of https://github.com/CS3219-AY2425S1/cs3219-ay2425s1-project-g04

Author: rayyan35p

Frontend/src/components/Sidebar.jsx

@@ -56,6 +56,13 @@ function Sidebar() {
 
         fetchUser();
 
+        // Custom event listener for category updates
+        const handleCategoryChange = () => {
+            fetchCategories();
+        };
+        window.addEventListener("categoryChange", handleCategoryChange);
+
+
         console.log("categories: ", categories)
 
         const matchingServiceHost = '34.126.114.137' || 'localhost';
@@ -87,6 +94,7 @@ function Sidebar() {
 
         return () => {
             websocket.close();
+            window.removeEventListener("categoryChange", handleCategoryChange);
         };
     }, []);
 

Frontend/src/components/question/EditQn.jsx

@@ -61,7 +61,10 @@ function EditQn({ question, handleClose, editQuestion }) {
         console.log(`newCategories are ${newCategories}`);
 
         categoryService.createCategories(newCategories)
-            .then(result => console.log(result.data))
+            .then(result => {
+                console.log(result.data)
+                window.dispatchEvent(new Event("categoryChange"));
+            })
             .catch(e => {
                 if (e.response && e.response.status === 400) {
                 setError(e.response.data.error);
@@ -71,7 +74,26 @@ function EditQn({ question, handleClose, editQuestion }) {
 
         questionService.updateQuestion(question._id, updatedQuestion)
             .then(result => {
-                
+                const initialCategories = question.category;
+                const categoriesRemoved = initialCategories.filter(item => !categories.includes(item));
+
+                // check each category to see if it should be deleted
+                categoriesRemoved.forEach(async (category) => {
+                    try {
+                        const remainingQuestions = await questionService.getQuestionsByCategory(category);
+                        
+                        // if no other questions have this category, delete the category
+                        if (remainingQuestions.length === 0) {
+                            await categoryService.deleteCategory(category);
+                            console.log(`Category ${category} deleted.`);
+                            // dispatch the event here
+                            window.dispatchEvent(new Event("categoryChange"));
+                        }
+                    } catch (err) {
+                        console.error(`Error processing category ${category}:`, err);
+                    }
+                });
+
                 editQuestion(question._id, updatedQuestion);
                 console.log('Question edited successfully:', result)
                 handleClose(); 

Frontend/src/components/question/Question.jsx

@@ -29,6 +29,7 @@ function Question() {
         .then(result => {
             setQuestions(result.data);
         })
+        
         .catch(err => console.log(err));
     }, []);
 
@@ -199,7 +200,7 @@ function Question() {
         return (
             <div
                 className="container-fluid ag-theme-quartz"
-                style={{ height: 500 }}
+                style={{ height: '80vh' }}
             >
                 <AgGridReact
                     rowData={questions}

yaml-of-yamls.yaml

@@ -0,0 +1,295 @@
+# QUESTION SERVICE OK
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: question-deployment
+spec:
+  selector:
+    matchLabels:
+      app: question
+  template:
+    metadata:
+      labels:
+        app: question
+    spec:
+      containers:
+      - name: question
+        image: asia-southeast1-docker.pkg.dev/powerful-lore-423309-n1/cs3219/question-service:latest
+        ports:
+        - containerPort: 3001
+        env:
+        - name: DB_USERNAME 
+          value: "G04DemoUsername"
+        - name: DB_PASSWORD
+          value: "G04DemoPassword"
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: question-service
+spec:
+  type: NodePort
+  selector:
+    app: question
+  ports:
+  - port: 3001 #My wish
+    targetPort: 3001
+
+---
+
+# USER SERVICE OK
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: user-deployment
+spec:
+  selector:
+    matchLabels:
+      app: user
+  template:
+    metadata:
+      labels:
+        app: user
+    spec:
+      containers:
+      - name: user
+        image: asia-southeast1-docker.pkg.dev/powerful-lore-423309-n1/cs3219/user-service:latest
+        ports:
+        - containerPort: 3002
+        env:
+        - name: ENV 
+          value: "PROD"
+        - name: DB_CLOUD_URI
+          value: "mongodb+srv://G04DemoUsername:[email protected]/User-DB?retryWrites=true&w=majority&appName=CS3219"
+        - name: PORT 
+          value: "3002"
+        - name: JWT_SECRET 
+          value: "cwztSBrxeqzSTXWnLMbKazZYmnS3BhfO0/GHKo3+7cMWV2CvSzKaG0NOJ1rtF/5pV3xLUpblGFCfbs/DZIx1Mbc9qv8SrW7U77rbZlPEefnhAyUBEJXIOxlM5NgsY0xkzYH+D60QJZlsMcDn6goq73lFWeiW3QgsGSxucXtuHaT4sGZ6i8y+WkfVaMz8pD2nUU1nW6lTDlLLEDA/1cUUodMHDcMNZ1XpiAQYXR0Kc4hyqkBUInZQDfsyh76PJ+TthOQihybrhO3FDtDX7/AXO2Cgutz8LRVO0mPCz8vn8GE8RpOphYO6AqF2NoncABcDK+Q0/CaZ+tUq3UY3J7oZgg=="
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: user-service
+spec:
+  type: NodePort
+  selector:
+    app: user
+  ports:
+  - port: 3002 #My wish
+    targetPort: 3002
+
+---
+
+# # COLLAB SERVICE
+# apiVersion: apps/v1
+# kind: Deployment
+# metadata:
+#   name: collab-deployment
+# spec:
+#   selector:
+#     matchLabels:
+#       app: collab
+#   template:
+#     metadata:
+#       labels:
+#         app: collab
+#     spec:
+#       containers:
+#       - name: collab
+#         image: asia-southeast1-docker.pkg.dev/powerful-lore-423309-n1/cs3219/collab-service:latest
+#         ports:
+#         - containerPort: 3004
+
+# ---
+
+# apiVersion: v1
+# kind: Service
+# metadata:
+#   name: collab-service
+# spec:
+#   type: NodePort
+#   selector:
+#     app: collab
+#   ports:
+#   - port: 3004 #My wish
+#     targetPort: 3004
+#   - port: 1234
+#     targetPort: 1234
+
+# ---
+
+# # MATCHING SERVICE
+# apiVersion: apps/v1
+# kind: Deployment
+# metadata:
+#   name: matching-deployment
+# spec:
+#   selector:
+#     matchLabels:
+#       app: matching
+#   template:
+#     metadata:
+#       labels:
+#         app: matching
+#     spec:
+#       containers:
+#       - name: matching
+#         image: asia-southeast1-docker.pkg.dev/powerful-lore-423309-n1/cs3219/matching-service:latest
+#         ports:
+#         - containerPort: 8080
+#         env:
+#         - name: PORT
+#           value: "8080"
+#         - name: RABBITMQ_URL  
+#           value: "amqps://ofolkusu:[email protected]/ofolkusu"
+
+# ---
+
+# apiVersion: v1
+# kind: Service
+# metadata:
+#   name: matching-service
+# spec:
+#   type: NodePort
+#   selector:
+#     app: matching
+#   ports:
+#   - port: 8080 #My wish
+#     targetPort: 8080
+# 
+# ---
+# HISTORY SERVICE
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: history-deployment
+spec:
+  selector:
+    matchLabels:
+      app: history
+  template:
+    metadata:
+      labels:
+        app: history
+    spec:
+      containers:
+      - name: history
+        image: asia-southeast1-docker.pkg.dev/powerful-lore-423309-n1/cs3219/history-service:latest
+        ports:
+        - containerPort: 3005
+        env:
+        - name: DB_USERNAME 
+          value: "G04DemoUsername"
+        - name: DB_PASSWORD
+          value: "G04DemoPassword"
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: history-service
+spec:
+  type: NodePort
+  selector:
+    app: history
+  ports:
+  - port: 3005 #My wish
+    targetPort: 3005
+
+---
+
+# INGRESS
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: peerprep-ingress
+  annotations:
+    kubernetes.io/ingress.class: "gce"
+    kubernetes.io/ingress.global-static-ip-name: peerprep-ip
+spec:
+  defaultBackend:
+   service:
+     name: question-service
+     port:
+       number: 3001
+  rules:
+  - http:
+      paths:
+      # Question Service
+      - path: /api/categories
+        pathType: Prefix
+        backend:
+          service:
+            name: question-service
+            port:
+              number: 3001
+      - path: /api/questions
+        pathType: Prefix
+        backend:
+          service:
+            name: question-service
+            port:
+              number: 3001
+      # User Service
+      - path: /auth
+        pathType: Prefix
+        backend:
+          service:
+            name: user-service
+            port:
+              number: 3002
+      - path: /users
+        pathType: Prefix
+        backend:
+          service:
+            name: user-service
+            port:
+              number: 3002
+      # History Service
+      - path: /api/histories
+        pathType: Prefix
+        backend:
+          service:
+            name: history-service
+            port:
+              number: 3005
+
+# apiVersion: apps/v1
+# kind: Deployment
+# metadata:
+#   name: frontend-deployment
+# spec:
+#   selector:
+#     matchLabels:
+#       app: frontend
+#   template:
+#     metadata:
+#       labels:
+#         app: frontend
+#     spec:
+#       containers:
+#       - name: frontend
+#         image: asia-southeast1-docker.pkg.dev/powerful-lore-423309-n1/cs3219/frontend:test2
+#         ports:
+#         - containerPort: 8080
+
+# ---
+# apiVersion: v1
+# kind: Service
+# metadata:
+#   name: frontend-service
+# spec:
+#   type: NodePort
+#   selector:
+#     app: frontend
+#   ports:
+#   - protocol: TCP
+#     port: 80 #My wish
+#     targetPort: 8080
+
+# ---