Skip to content

Commit

Permalink
Merge pull request #26 from MargoMarm/features/ParamsForm
Browse files Browse the repository at this point in the history
Features/params form
  • Loading branch information
MargoMarm committed Sep 18, 2023
2 parents 411a640 + c2d4564 commit aacfdf9
Show file tree
Hide file tree
Showing 18 changed files with 1,457 additions and 102 deletions.
118 changes: 86 additions & 32 deletions package-lock.json

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

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/x-date-pickers": "^6.13.0",
"@mui/icons-material": "^5.14.9",
"@mui/material": "^5.14.9",
"@mui/x-date-pickers": "^6.14.0",
"@reduxjs/toolkit": "^1.9.5",
"@table-library/react-table-library": "^4.1.7",
"@vitejs/plugin-react-swc": "^3.3.2",
"axios": "^1.5.0",
"dayjs": "^1.11.9",
"formik": "^2.4.4",
"modern-normalize": "^2.0.0",
"prop-types": "^15.8.1",
Expand All @@ -29,6 +32,7 @@
"react-toastify": "^9.1.3",
"redux-persist": "^6.0.0",
"styled-components": "^6.0.7",
"swiper": "^10.2.0",
"yup": "^1.2.0"
},
"devDependencies": {
Expand Down
10 changes: 8 additions & 2 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,30 @@ const Home = lazy(() => import('../src/pages/Home/Home'));
const SignIn = lazy(() => import('../src/pages/SignIn/SignIn'));
const SignUp = lazy(() => import('../src/pages/SignUp/SignUp'));
const Products = lazy(() => import('../src/pages/Products/Products'));

const Params = lazy(() => import('../src/pages/Params/Params'));

const Exercises = lazy(() => import('../src/pages/Exercises/Exercises'));

const Error = lazy(() => import('../src/pages/Error/Error'));
const Dairy = lazy(() => import('../src/pages/Diary/Dairy'));

const test = import.meta.env.VITE_API_TEST;

function App() {
// console.log(test);

console.log(test);

return (
<Routes>
<Route path="/" element={<SharedLayout />}>
<Route index element={<Home />} />
<Route path="/signin" element={<SignIn />} />
<Route path="/signup" element={<SignUp />} />
<Route path="/products" element={<Products />} />
<Route path="/params" element={<Params />} />
<Route path="/exercises" element={<Exercises />} />
<Route path="/dairy" element={<Dairy />} />

<Route path="/error" element={<Error />} />
</Route>
</Routes>
Expand Down
Loading

0 comments on commit aacfdf9

Please sign in to comment.