Merge branch 'development' into chore/refactor

Author: nicolelim02

backend/question-service/.dockerignore

@@ -0,0 +1,4 @@
+node_modules
+tests
+.env*
+*.md

backend/question-service/Dockerfile

@@ -0,0 +1,13 @@
+FROM node:20-alpine
+
+WORKDIR /question-service
+
+COPY package*.json ./
+
+RUN npm ci
+
+COPY . .
+
+EXPOSE 3000
+
+CMD ["npm", "start"]

backend/question-service/package-lock.json

@@ -0,0 +1,4 @@
+node_modules
+tests
+.env*
+*.md

backend/user-service/.dockerignore

@@ -0,0 +1,13 @@
+FROM node:20-alpine
+
+WORKDIR /user-service
+
+COPY package*.json ./
+
+RUN npm ci
+
+COPY . .
+
+EXPOSE 3001
+
+CMD ["npm", "start"]

backend/user-service/Dockerfile

@@ -0,0 +1,25 @@
+services:
+  user-service:
+    image: peerprep/user-service
+    build: ./backend/user-service
+    env_file: ./backend/user-service/.env
+    ports:
+      - 3001:3001
+    networks:
+      - peerprep-network
+    restart: on-failure
+  question-service:
+    image: peerprep/question-service
+    build: ./backend/question-service
+    env_file: ./backend/question-service/.env
+    ports:
+      - 3000:3000
+    depends_on:
+      - user-service
+    networks:
+      - peerprep-network
+    restart: on-failure
+
+networks:
+  peerprep-network:
+    driver: bridge

docker-compose.yml

@@ -66,6 +66,17 @@ const QuestionList: React.FC = () => {
     );
   };
 
+  const updateQuestionList = () => {
+    getQuestionList(
+      page + 1, // convert from 0-based indexing
+      rowsPerPage,
+      searchFilter,
+      complexityFilter,
+      categoryFilter,
+      dispatch
+    );
+  };
+
   // For handling edit / delete menu
   const [targetQuestion, setTargetQuestion] = useState<string | null>(null);
   const [menuAnchor, setMenuAnchor] = useState<HTMLElement | null>(null);
@@ -106,25 +117,11 @@ const QuestionList: React.FC = () => {
 
     toast.success(SUCCESS_QUESTION_DELETE);
     getQuestionCategories(dispatch);
-    getQuestionList(
-      page + 1, // convert from 0-based indexing
-      rowsPerPage,
-      searchFilter,
-      complexityFilter,
-      categoryFilter,
-      dispatch
-    );
-  };
-
-  const updateQuestionList = () => {
-    getQuestionList(
-      page + 1, // convert from 0-based indexing
-      rowsPerPage,
-      searchFilter,
-      complexityFilter,
-      categoryFilter,
-      dispatch
-    );
+    if (state.questionCount % rowsPerPage !== 1 || page === 0) {
+      updateQuestionList();
+    } else {
+      setPage(page - 1);
+    }
   };
 
   useEffect(() => {
@@ -137,8 +134,10 @@ const QuestionList: React.FC = () => {
     } else {
       updateQuestionList();
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [searchFilter, complexityFilter, categoryFilter]);
 
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   useEffect(() => updateQuestionList(), [page]);
 
   // Check if the user is admin

frontend/src/pages/QuestionList/index.tsx

@@ -6,4 +6,7 @@ import svgr from "vite-plugin-svgr";
 export default defineConfig({
   plugins: [react(), svgr()],
   optimizeDeps: { include: ["@mui/material", "@mui/icons-material"] },
+  server: {
+    host: true,
+  },
 });