Skip to content

Commit 3255424

Browse files
authored
Merge branch 'develop' into feature/question-service/adding-questions
2 parents 8ec8bd7 + 4882033 commit 3255424

38 files changed

+2065
-194
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Node
22
node_modules/
33
**/node_modules/
4+
.env
45

56
# TypeScript build output
67
**/dist/

.nvmrc

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

frontend/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ pnpm-debug.log*
88
lerna-debug.log*
99

1010
node_modules
11+
.env
1112
dist
1213
dist-ssr
1314
*.local

frontend/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@
1212
"preview": "vite preview"
1313
},
1414
"dependencies": {
15+
"@tanstack/react-query": "^5.90.2",
16+
"@tanstack/react-query-devtools": "^5.90.2",
17+
"axios": "^1.12.2",
1518
"react": "^19.1.1",
16-
"react-dom": "^19.1.1"
19+
"react-dom": "^19.1.1",
20+
"react-router-dom": "^7.9.2"
1721
},
1822
"devDependencies": {
1923
"@eslint/compat": "^1.3.2",

frontend/public/vite.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

frontend/src/App.css

Lines changed: 0 additions & 42 deletions
This file was deleted.

frontend/src/App.tsx

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,17 @@
11
import {useState} from 'react';
2-
import reactLogo from './assets/react.svg';
3-
import viteLogo from '../public/vite.svg';
4-
import './App.css';
2+
import {Route, Routes} from 'react-router-dom';
3+
import Register from './pages/register';
54

6-
function App() {
7-
const [count, setCount] = useState(0);
5+
export function Home() {
6+
return <div>Home</div>;
7+
}
88

9+
function App() {
910
return (
10-
<>
11-
<div>
12-
<a href="https://vite.dev" target="_blank" rel="noreferrer">
13-
<img src={viteLogo} className="logo" alt="Vite logo" />
14-
</a>
15-
<a href="https://react.dev" target="_blank" rel="noreferrer">
16-
<img src={reactLogo} className="logo react" alt="React logo" />
17-
</a>
18-
</div>
19-
<h1>Vite + React</h1>
20-
<div className="card">
21-
<button type="button" onClick={() => setCount(prevCount => prevCount + 1)}>
22-
count is {count}
23-
</button>
24-
<p>
25-
Edit <code>src/App.tsx</code> and save to test HMR
26-
</p>
27-
</div>
28-
<p className="read-the-docs">Click on the Vite and React logos to learn more</p>
29-
</>
11+
<Routes>
12+
<Route path="/" element={<Home />} />
13+
<Route path="/register" element={<Register />} />
14+
</Routes>
3015
);
3116
}
3217

Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 2 additions & 0 deletions
Loading

frontend/src/assets/peerprep-icon.svg

Lines changed: 190 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)