Skip to content

Commit

Permalink
Merge branch 'dev' into 장재혁
Browse files Browse the repository at this point in the history
  • Loading branch information
foxholic9 authored Jun 10, 2024
2 parents 93010e0 + e6b46c1 commit 9f27334
Show file tree
Hide file tree
Showing 53 changed files with 2,346 additions and 474 deletions.
121 changes: 114 additions & 7 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 @@ -13,14 +13,17 @@
"dependencies": {
"axios": "^1.7.2",
"classnames": "^2.5.1",
"date-fns": "^3.6.0",
"react": "^18.2.0",
"react-datepicker": "^6.9.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.23.1",
"sass": "^1.77.3"
},
"devDependencies": {
"@types/axios": "^0.14.0",
"@types/react": "^18.2.66",
"@types/react-datepicker": "^6.2.0",
"@types/react-dom": "^18.2.22",
"@typescript-eslint/eslint-plugin": "^7.11.0",
"@typescript-eslint/parser": "^7.11.0",
Expand Down
4 changes: 4 additions & 0 deletions public/icon/add_image_box.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/icon/checked_gray.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 12 additions & 9 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,25 @@ import DashboardForId from './pages/dashboard.{dashboardid}';
import Login from './pages/login-signup/login/Login';
import SignUp from './pages/login-signup/signup/SignUp';
import MyPage from './pages/mypage/MyPage';
import { DashboardProvider } from './contexts/DashboardContext';

/*
페이지 라우팅 분리,
*/
function App() {
return (
<BrowserRouter>
<Routes>
<Route index element={<Home />} />
<Route path="/mydashboard" element={<MyDashboard />} />
<Route path="/dashboard/1/edit" element={<DashboardEdit />} />
<Route path="/dashboard/1" element={<DashboardForId />} />
<Route path="/login" element={<Login />} />
<Route path="/signup" element={<SignUp />} />
<Route path="/mypage" element={<MyPage />} />
</Routes>
<DashboardProvider>
<Routes>
<Route index element={<Home />} />
<Route path="/mydashboard" element={<MyDashboard />} />
<Route path="/dashboard/1/edit" element={<DashboardEdit />} />
<Route path="/dashboard/:id" element={<DashboardForId />} />
<Route path="/login" element={<Login />} />
<Route path="/signup" element={<SignUp />} />
<Route path="/mypage" element={<MyPage />} />
</Routes>
</DashboardProvider>
</BrowserRouter>
);
}
Expand Down
80 changes: 0 additions & 80 deletions src/components/ModalDropdown/ModalDropdown.module.scss

This file was deleted.

Loading

0 comments on commit 9f27334

Please sign in to comment.