-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3 from Takiera/module3-task1
- Loading branch information
Showing
11 changed files
with
601 additions
and
331 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,36 @@ | ||
| import MainPage from '../../pages/main-page'; | ||
| import FavoritesPage from '../../pages/favorites-page'; | ||
| import LoginPage from '../../pages/login-page'; | ||
| import OfferPage from '../../pages/offer-page'; | ||
| import NotFoundPage from '../../pages/not-found-page'; | ||
| import PrivateRoute from '../private-route/private-route'; | ||
| import { Route, BrowserRouter, Routes } from 'react-router-dom'; | ||
| import { AppRoute, AuthorizationStatus } from '../../consts'; | ||
|
|
||
| type AppProps = { | ||
| offersCount: number; | ||
| } | ||
| }; | ||
|
|
||
| export default function App({offersCount}: AppProps): JSX.Element { | ||
| export default function App({ offersCount }: AppProps): JSX.Element { | ||
| return ( | ||
| <MainPage | ||
| offersCount = {offersCount} | ||
| /> | ||
| <BrowserRouter> | ||
| <Routes> | ||
| <Route | ||
| path={AppRoute.Main} | ||
| element={<MainPage offersCount={offersCount} />} | ||
| /> | ||
| <Route | ||
| path={AppRoute.Favorites} | ||
| element={ | ||
| <PrivateRoute authorizationStatus={AuthorizationStatus.Auth}> | ||
| <FavoritesPage /> | ||
| </PrivateRoute> | ||
| } | ||
| /> | ||
| <Route path={AppRoute.Login} element={<LoginPage />} /> | ||
| <Route path={AppRoute.Offer} element={<OfferPage />} /> | ||
| <Route path="*" element={<NotFoundPage />} /> | ||
| </Routes> | ||
| </BrowserRouter> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| export default function Header() { | ||
| return ( | ||
| <header className="header"> | ||
| <div className="container"> | ||
| <div className="header__wrapper"> | ||
| <div className="header__left"> | ||
| <a className="header__logo-link" href="main.html"> | ||
| <img | ||
| className="header__logo" | ||
| src="img/logo.svg" | ||
| alt="6 cities logo" | ||
| width="81" | ||
| height="41" | ||
| /> | ||
| </a> | ||
| </div> | ||
| <nav className="header__nav"> | ||
| <ul className="header__nav-list"> | ||
| <li className="header__nav-item user"> | ||
| <a | ||
| className="header__nav-link header__nav-link--profile" | ||
| href="#" | ||
| > | ||
| <div className="header__avatar-wrapper user__avatar-wrapper"></div> | ||
| <span className="header__user-name user__name"> | ||
| Oliver.conner@gmail.com | ||
| </span> | ||
| <span className="header__favorite-count">3</span> | ||
| </a> | ||
| </li> | ||
| <li className="header__nav-item"> | ||
| <a className="header__nav-link" href="#"> | ||
| <span className="header__signout">Sign out</span> | ||
| </a> | ||
| </li> | ||
| </ul> | ||
| </nav> | ||
| </div> | ||
| </div> | ||
| </header> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| import { Navigate } from 'react-router-dom'; | ||
| import { AppRoute, AuthorizationStatus } from '../../consts'; | ||
|
|
||
| type PrivateRouteProps = { | ||
| authorizationStatus: AuthorizationStatus; | ||
| children: JSX.Element; | ||
| }; | ||
|
|
||
| function PrivateRoute(props: PrivateRouteProps): JSX.Element { | ||
| const { authorizationStatus, children } = props; | ||
|
|
||
| return authorizationStatus === AuthorizationStatus.Auth ? ( | ||
| children | ||
| ) : ( | ||
| <Navigate to={AppRoute.Login} /> | ||
| ); | ||
| } | ||
|
|
||
| export default PrivateRoute; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| export enum AppRoute { | ||
| Main = '/', | ||
| Login = '/login', | ||
| Favorites = '/favorites', | ||
| Offer = '/offer/:id' | ||
| } | ||
|
|
||
| export enum AuthorizationStatus { | ||
| Auth = 'AUTH', | ||
| NoAuth = 'NO_AUTH', | ||
| Unknown = 'UNKNOWN', | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.