Skip to content

Commit 25f0c45

Browse files
leepoeaikleepoeaik
committed
Merge remote-tracking branch 'origin/develop' into feature/collaborative-code-editor
2 parents e65d7b8 + 5d6b3d8 commit 25f0c45

35 files changed

+59172
-6545
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
# Node
22
node_modules/
33
**/node_modules/
4-
.env
4+
55

66
# TypeScript build output
77
**/dist/
88

9+
10+
.env.test
11+
coverage/
912
.partykit
1013
.env.test
1114
# Dependencies

‎.vscode/settings.json‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,20 @@
77
"port": 5433,
88
"askForPassword": true,
99
"driver": "PostgreSQL",
10+
"name": "Question DB (Local)",
11+
"database": "question-db",
12+
"username": "user"
13+
},
14+
{
15+
"ssh": "Disabled",
16+
"previewLimit": 50,
17+
"server": "localhost",
18+
"port": 5433,
19+
"askForPassword": true,
20+
"driver": "PostgreSQL",
21+
"name": "PeerPrep DB (Local)",
1022
"database": "peerprep_db",
11-
"username": "peerprep_user",
12-
"name": "PeerPrep DB (Local)"
23+
"username": "peerprep_user"
1324
}
1425
]
1526
}

‎docker-compose.yml‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,17 @@ services:
99
- question-data:/var/lib/postgresql/data
1010
- ./question-service/db:/docker-entrypoint-initdb.d
1111
environment:
12-
POSTGRES_USER: user
13-
POSTGRES_PASSWORD: password
12+
POSTGRES_USER: postgres
13+
POSTGRES_PASSWORD: postgres
1414
POSTGRES_DB: question-db
1515
networks:
1616
- app-network
17+
healthcheck:
18+
test: ["CMD-SHELL", "pg_isready -U postgres"]
19+
interval: 5s
20+
timeout: 5s
21+
retries: 5
22+
1723

1824
# --- FRONTEND ---
1925
frontend:
@@ -62,7 +68,7 @@ services:
6268
ports:
6369
- '8083:8083'
6470
environment:
65-
- NODE_ENV=development
71+
- NODE_ENV=production
6672
- PORT=8083
6773
env_file:
6874
- ./.env
@@ -74,6 +80,20 @@ services:
7480
networks:
7581
- app-network
7682

83+
question-test:
84+
build:
85+
context: ./question-service
86+
dockerfile: Dockerfile
87+
command: ["npm", "test"]
88+
env_file:
89+
- ./question-service/.env
90+
depends_on:
91+
question-db-pg:
92+
condition: service_healthy
93+
networks:
94+
- app-network
95+
96+
7797

7898
# Matching service
7999
matching-service:

‎frontend/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ dist-ssr
2323
*.njsproj
2424
*.sln
2525
*.sw?
26+
.env

‎frontend/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
5+
<link rel="icon" type="image/svg+xml" href="/peerprep-icon.png" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7-
<title>Vite + React + TS</title>
7+
<title>PeerPrep</title>
88
</head>
99
<body>
1010
<div id="root"></div>

‎frontend/peerprep-icon.png‎

15 KB
Loading

‎frontend/src/App.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import {Route, Routes} from 'react-router-dom';
2+
import Home from './pages/home';
23
import Register from './pages/register';
34
import Input from './collaboration/pages/Input';
45
import {CollabPage} from './collaboration/pages/CollabPage';
56

6-
export function Home() {
7-
return <div>Home</div>;
8-
}
9-
107
function App() {
118
return (
129
<Routes>

‎frontend/src/assets/lightning-icon.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎frontend/src/assets/target-icon.svg‎

Lines changed: 6 additions & 0 deletions
Loading

‎frontend/src/assets/user-icon.svg‎

Lines changed: 4 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)