Skip to content

Commit

Permalink
Merge branch 'main' into feature/user/#2
Browse files Browse the repository at this point in the history
  • Loading branch information
bbmini96 authored Jun 21, 2024
2 parents 8379775 + d0c8814 commit 82f7fdf
Show file tree
Hide file tree
Showing 10 changed files with 351 additions and 31 deletions.
237 changes: 237 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"@testing-library/user-event": "^13.5.0",
"axios": "^1.7.2",
"cookie": "^0.6.0",
"highlight.js": "^11.9.0",
"http-proxy-middleware": "^3.0.0",
"react": "^18.3.1",
"react-cookie": "^7.1.4",
Expand All @@ -22,6 +23,8 @@
"react-query": "^3.39.3",
"react-router-dom": "^6.23.1",
"react-scripts": "5.0.1",
"rehype-highlight": "^7.0.0",
"rehype-raw": "^7.0.0",
"remark-gfm": "^4.0.0",
"styled-components": "^6.1.11",
"web-vitals": "^2.1.4"
Expand Down
7 changes: 6 additions & 1 deletion src/App.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
import React from 'react';
import { BrowserRouter, Routes, Route } from 'react-router-dom';
import MainPage from './pages/MainPage';
import MainPage from './pages/PersonPage';
import LoginPage from './pages/SignUpPage';
import SignUpPage from './pages/SignUpPage';
import SingInPage from './pages/SignInPage';
import UpdateInfo from './pages/UpdateInfo';
import PersonPage from './pages/PersonPage';

function App() {
return (
<div>
<BrowserRouter>
<Routes>

<Route path="/" element = {<MainPage/>}></Route>
<Route path="/sign-up" element = {<SignUpPage/>}></Route>
<Route path="/login" element = {<SingInPage/>}></Route>

<Route path="/person/:id" element = {<PersonPage/>}></Route>

<Route path='/info/update/:infoId' element={<UpdateInfo />} />
</Routes>
</BrowserRouter>
Expand Down
Loading

0 comments on commit 82f7fdf

Please sign in to comment.