Merge pull request #41 from ruiqi7/deployment/docker

Containerize user service

Author: feliciagan

backend/user-service/.dockerignore

@@ -0,0 +1,3 @@
+node_modules
+.env
+tests

backend/user-service/Dockerfile

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

docker-compose.yml

@@ -0,0 +1,14 @@
+services:
+  user-service:
+    image: peerprep/user-service
+    build: ./backend/user-service
+    env_file: ./backend/user-service/.env
+    ports:
+      - 3001:3001
+    networks:
+      - peerprep-network
+    restart: always
+
+networks:
+  peerprep-network:
+    driver: bridge

frontend/src/pages/QuestionList/index.tsx

@@ -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 % 10 !== 1 || page === 0) {
+      updateQuestionList();
+    } else {
+      setPage(page - 1);
+    }
   };
 
   useEffect(() => {