Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
ViktorSvertoka committed Sep 14, 2023
2 parents 31575f3 + 895e671 commit 5be20d3
Show file tree
Hide file tree
Showing 14 changed files with 79 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@
"*.{js,jsx}": "eslint --cache --fix",
"*./src": "prettier --write"
}
}
}
30 changes: 24 additions & 6 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
import { Route, Routes } from 'react-router-dom';
import SharedLayout from './components/SharedLayout/SharedLayout';
import FirstPage from './pages/FirstPage/FirstPage';
import SecondPage from './pages/SecondPage/SecondPage';
import HalfPage from './pages/HalfPage/HalfPage';
// import FirstPage from './pages/FirstPage/FirstPage';
// import SecondPage from './pages/SecondPage/SecondPage';
// import HalfPage from './pages/HalfPage/HalfPage';
import ErrorPage from './pages/ErrorPage/ErrorPage';
import SignUpPage from './pages/SignUpPage/SignUpPage';
import SignUpBodyPage from './pages/SignUpBodyPage/SignUpBodyPage';
import SignInPage from './pages/SignInPage/SignInPage';
import DiaryPage from './pages/DiaryPage/DiaryPage';
import ProductsPage from './pages/ProductsPage/ProductsPage';
import ExercisesPage from './pages/ExercisesPage/ExercisesPage';
import ProfilePage from './pages/ProfilePage/ProfilePage';
import HomePage from './pages/HomePage/HomePage';
import SignUpAccessPage from './pages/SignUpAccessPage/SignUpAccessPage';
import SignUpBloodPage from './pages/SignUpBloodPage/SignUpBloodPage';

const test = import.meta.env.VITE_API_TEST;

Expand All @@ -12,10 +22,18 @@ function App() {
return (
<Routes>
<Route path="/" element={<SharedLayout />}>
<Route path="/first" element={<FirstPage />} />
<Route path="/second" element={<SecondPage />}>
<Route path=":half" element={<HalfPage />} />
<Route index element={<HomePage />} />
<Route path="signup" element={<SignUpPage />} />
<Route path="params">
<Route path="body" element={<SignUpBodyPage />} />
<Route path="blood" element={<SignUpBloodPage />} />
<Route path="access" element={<SignUpAccessPage />} />
</Route>
<Route path="signin" element={<SignInPage />} />
<Route path="diary" element={<DiaryPage />} />
<Route path="products" element={<ProductsPage />} />
<Route path="exercises" element={<ExercisesPage />} />
<Route path="profile" element={<ProfilePage />} />

<Route path="*" element={<ErrorPage />} />
</Route>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Header/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ export const Header = () => {
return (
<HeaderContainer>
<Navigation>
<StyledLink to="/first">First</StyledLink>
<StyledLink to="/second">Second</StyledLink>
<StyledLink to="/signup">SignUpPage</StyledLink>
<StyledLink to="/signin">SignInPage</StyledLink>
</Navigation>
</HeaderContainer>
);
Expand Down
4 changes: 2 additions & 2 deletions src/index.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body {
background-color: #000;
background-image: url('./assets/background.png');
background-color: #fff;
/* background-image: url('./assets/background.png'); */
background-size: auto 100%;
background-position: center center;
background-repeat: no-repeat;
Expand Down
5 changes: 5 additions & 0 deletions src/pages/DiaryPage/DiaryPage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const DiaryPage = () => {
return <div>Diary page</div>;
};

export default DiaryPage;
5 changes: 5 additions & 0 deletions src/pages/ExercisesPage/ExercisesPage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const ExercisesPage = () => {
return <div>ExercisesPage</div>;
};

export default ExercisesPage;
5 changes: 5 additions & 0 deletions src/pages/HomePage/HomePage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const HomePage = () => {
return <div>HomePage</div>;
};

export default HomePage;
5 changes: 5 additions & 0 deletions src/pages/ProductsPage/ProductsPage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const ProductsPage = () => {
return <div>ProductsPage</div>;
};

export default ProductsPage;
5 changes: 5 additions & 0 deletions src/pages/ProfilePage/ProfilePage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const ProfilePage = () => {
return <div>ProfilePage</div>;
};

export default ProfilePage;
5 changes: 5 additions & 0 deletions src/pages/SignInPage/SignInPage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const SignInPage = () => {
return <div>SignInPage</div>;
};

export default SignInPage;
5 changes: 5 additions & 0 deletions src/pages/SignUpAccessPage/SignUpAccessPage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const SignUpAccessPage = () => {
return <div>SignUpAccessPage</div>;
};

export default SignUpAccessPage;
5 changes: 5 additions & 0 deletions src/pages/SignUpBloodPage/SignUpBloodPage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const SignUpBloodPage = () => {
return <div>SignUpBloodPage</div>;
};

export default SignUpBloodPage;
5 changes: 5 additions & 0 deletions src/pages/SignUpBodyPage/SignUpBodyPage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const SignUpBodyPage = () => {
return <div>SignUpBodyPage Page</div>;
};

export default SignUpBodyPage;
5 changes: 5 additions & 0 deletions src/pages/SignUpPage/SignUpPage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const SignUpPage = () => {
return <div>SignUp Page</div>;
};

export default SignUpPage;

0 comments on commit 5be20d3

Please sign in to comment.