Skip to content

Commit 1c31446

Browse files
committed
Merge branch 'development' of https://github.com/guanquann/cs3219-ay2425s1-project-g28 into mongodb-docker
2 parents 63b3805 + 5adfc36 commit 1c31446

File tree

30 files changed

+802
-375
lines changed

30 files changed

+802
-375
lines changed

docker-compose.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,17 @@ services:
2323
networks:
2424
- peerprep-network
2525
restart: on-failure
26+
frontend:
27+
image: peerprep/frontend
28+
build: ./frontend
29+
ports:
30+
- 5173:5173
31+
depends_on:
32+
- user-service
33+
- question-service
34+
networks:
35+
- peerprep-network
36+
restart: on-failure
2637

2738
mongo:
2839
image: mongo

frontend/.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules

frontend/Dockerfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM node:20-alpine
2+
3+
WORKDIR /frontend
4+
5+
COPY package*.json ./
6+
7+
RUN npm ci
8+
9+
COPY . .
10+
11+
EXPOSE 5173
12+
13+
CMD ["npm", "run", "dev"]

frontend/package-lock.json

Lines changed: 308 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frontend/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"react": "^18.3.1",
2626
"react-dom": "^18.3.1",
2727
"react-hook-form": "^7.53.0",
28+
"react-material-ui-carousel": "^3.4.2",
2829
"react-router-dom": "^6.26.2",
2930
"react-toastify": "^10.0.5",
3031
"vite-plugin-svgr": "^4.2.0"
30.2 KB
Loading
10.6 KB
Loading

frontend/public/match_found.png

12 KB
Loading

frontend/public/questions_list.png

17.8 KB
Loading

0 commit comments

Comments
 (0)