Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
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,71 +1,91 @@ | ||
| import { Helmet } from 'react-helmet-async'; | ||
| import { FormEvent, useState } from 'react'; | ||
| import { Layout } from '../../components/layout.tsx'; | ||
| import { LoginInfo } from '../../dataTypes/user.ts'; | ||
| import { store } from '../../store/store.ts'; | ||
| import { login } from '../../store/actions.ts'; | ||
|
|
||
| export function LoginPage(): React.JSX.Element { | ||
| const [loginInfo, setLoginInfo] = useState<LoginInfo>({ | ||
| email: '', | ||
| password: '', | ||
| }); | ||
| const handleSubmit = (e: FormEvent) => { | ||
| e.preventDefault(); | ||
| store.dispatch(login(loginInfo)); | ||
| }; | ||
|
|
||
| const validateEmail = (email: string) => { | ||
| const re = /^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,}$/; | ||
| return re.test(String(email).toLowerCase()); | ||
| }; | ||
| const isValid = () => | ||
| loginInfo.email && | ||
| validateEmail(loginInfo.email) && | ||
| loginInfo.password && | ||
| loginInfo.password.length > 3 && | ||
| loginInfo.password.match(/[a-zA-z]/g) && | ||
| loginInfo.password.match(/[0-9]/g); | ||
| return ( | ||
| <div className="page page--gray page--login"> | ||
| <Layout dontShowUserInfo> | ||
| <main className="page__main page__main--login"> | ||
| <Helmet> | ||
| <title>6 cities - login</title> | ||
| </Helmet> | ||
| <div className="page__login-container container"> | ||
| <section className="login"> | ||
| <h1 className="login__title">Sign in</h1> | ||
| <form className="login__form form"> | ||
| <div className="login__input-wrapper form__input-wrapper"> | ||
| <label className="visually-hidden">E-mail</label> | ||
| <input | ||
| className="login__input form__input" | ||
| type="email" | ||
| name="email" | ||
| placeholder="Email" | ||
| onChange={(event) => | ||
| setLoginInfo({ ...loginInfo, email: event.target.value }) | ||
| } | ||
| required | ||
| /> | ||
| </div> | ||
| <div className="login__input-wrapper form__input-wrapper"> | ||
| <label className="visually-hidden">Password</label> | ||
| <input | ||
| className="login__input form__input" | ||
| type="password" | ||
| name="password" | ||
| placeholder="Password" | ||
| onChange={(event) => | ||
| setLoginInfo({ | ||
| ...loginInfo, | ||
| password: event.target.value, | ||
| }) | ||
| } | ||
| required | ||
| /> | ||
| </div> | ||
| <button | ||
| className="login__submit form__submit button" | ||
| type="submit" | ||
| onClick={handleSubmit} | ||
| disabled={!isValid()} | ||
| > | ||
| Sign in | ||
| </button> | ||
| </form> | ||
| </section> | ||
| <section className="locations locations--login locations--current"> | ||
| <div className="locations__item"> | ||
| <a className="locations__item-link" href="#"> | ||
| <span>Amsterdam</span> | ||
| </a> | ||
| </div> | ||
| </section> | ||
| </div> | ||
| </main> | ||
| </Layout> | ||
| </div> | ||
| ); | ||
| } | ||
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,48 @@ | ||
| import axios, { | ||
| AxiosError, | ||
| AxiosInstance, | ||
| InternalAxiosRequestConfig, | ||
| } from 'axios'; | ||
| import { getToken } from '../utils/token-utils.ts'; | ||
| import { store } from '../store/store.ts'; | ||
| import { AuthorizationStatus } from '../dataTypes/enums/authorization-status.ts'; | ||
| import { setAuthorizationStatus } from '../store/actions.ts'; | ||
|
|
||
| const BACKEND_URL = 'https://14.design.htmlacademy.pro/six-cities'; | ||
| const REQUEST_TIMEOUT = 5000; | ||
|
|
||
| type DetailMessageType = { | ||
| errorType: string; | ||
| message: string; | ||
| }; | ||
|
|
||
| export const createAPI = (): AxiosInstance => { | ||
| const api = axios.create({ | ||
| baseURL: BACKEND_URL, | ||
| timeout: REQUEST_TIMEOUT, | ||
| }); | ||
|
|
||
| api.interceptors.request.use((config: InternalAxiosRequestConfig) => { | ||
| const token = getToken(); | ||
|
|
||
| if (token && config.headers) { | ||
| config.headers['x-token'] = token; | ||
| } | ||
|
|
||
| return config; | ||
| }); | ||
|
|
||
| api.interceptors.response.use( | ||
| (response) => response, | ||
| (error: AxiosError<DetailMessageType>) => { | ||
| if (error.response && error.response.status === 401) { | ||
| store.dispatch( | ||
| setAuthorizationStatus(AuthorizationStatus.Unauthorized), | ||
| ); | ||
| } | ||
| throw error; | ||
| }, | ||
| ); | ||
|
|
||
| return api; | ||
| }; |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,29 @@ | ||
| import { Navigate } from 'react-router-dom'; | ||
| import { useAppSelector } from '../store/store.ts'; | ||
| import { AuthorizationStatus } from '../dataTypes/enums/authorization-status.ts'; | ||
| import { AppRoutes } from '../dataTypes/enums/app-routes.ts'; | ||
|
|
||
| interface AuthorizationWrapperProps { | ||
| children: React.JSX.Element; | ||
| fallbackUrl: AppRoutes; | ||
| } | ||
|
|
||
| export function AuthorizationWrapperForAuthorizedOnly({ | ||
| children, | ||
| fallbackUrl, | ||
| }: AuthorizationWrapperProps): React.JSX.Element { | ||
| const isAuthorized = | ||
| useAppSelector((state) => state.authorizationStatus) === | ||
| AuthorizationStatus.Authorized; | ||
| return isAuthorized ? children : <Navigate to={fallbackUrl} />; | ||
| } | ||
|
|
||
| export function AuthorizationWrapperForUnauthorizedOnly({ | ||
| children, | ||
| fallbackUrl, | ||
| }: AuthorizationWrapperProps): React.JSX.Element { | ||
| const isUnauthorized = | ||
| useAppSelector((state) => state.authorizationStatus) === | ||
| AuthorizationStatus.Unauthorized; | ||
| return isUnauthorized ? children : <Navigate to={fallbackUrl} />; | ||
| } |
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,15 +1,26 @@ | ||
| import { AppRoutes } from '../dataTypes/enums/app-routes.ts'; | ||
| import { Link } from 'react-router-dom'; | ||
| import { store, useAppSelector } from '../store/store.ts'; | ||
| import { AuthorizationStatus } from '../dataTypes/enums/authorization-status.ts'; | ||
| import { logout } from '../store/actions.ts'; | ||
|
|
||
| interface LayoutProps { | ||
| children: React.JSX.Element; | ||
| showFooter?: boolean; | ||
| dontShowUserInfo?: boolean; | ||
| } | ||
|
|
||
| export function Layout({ | ||
| children, | ||
| showFooter, | ||
| dontShowUserInfo, | ||
| }: LayoutProps): React.JSX.Element { | ||
| const isAuthorized = | ||
| useAppSelector((state) => state.authorizationStatus) === | ||
| AuthorizationStatus.Authorized; | ||
| const handleLogout = () => { | ||
| store.dispatch(logout()); | ||
| }; | ||
| return ( | ||
| <> | ||
| <header className="header"> | ||
|
|
@@ -26,27 +37,44 @@ export function Layout({ | |
| /> | ||
| </Link> | ||
| </div> | ||
| {dontShowUserInfo || | ||
| (isAuthorized ? ( | ||
| <nav className="header__nav"> | ||
| <ul className="header__nav-list"> | ||
| <li className="header__nav-item user"> | ||
| <Link | ||
| className="header__nav-link header__nav-link--profile" | ||
| to={AppRoutes.Favorites} | ||
| > | ||
| <div className="header__avatar-wrapper user__avatar-wrapper"></div> | ||
| <span className="header__user-name user__name"> | ||
| [email protected] | ||
| </span> | ||
| <span className="header__favorite-count">3</span> | ||
| </Link> | ||
| </li> | ||
| <li className="header__nav-item"> | ||
| <a className="header__nav-link" onClick={handleLogout}> | ||
| <span className="header__signout">Sign out</span> | ||
| </a> | ||
| </li> | ||
| </ul> | ||
| </nav> | ||
| ) : ( | ||
| <nav className="header__nav"> | ||
| <ul className="header__nav-list"> | ||
| <li className="header__nav-item user"> | ||
| <Link | ||
| className="header__nav-link header__nav-link--profile" | ||
| to={AppRoutes.Login} | ||
| > | ||
| <div className="header__avatar-wrapper user__avatar-wrapper"></div> | ||
| <span className="header__login">Sign in</span> | ||
| </Link> | ||
| </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 |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| export enum ApiRoutes { | ||
| Offers = '/offers', | ||
| Login = '/login', | ||
| Logout = '/logout', | ||
| } |
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.