diff --git a/FrontEnd/src/components/HeaderFooter/footer/short/ShortFooter.jsx b/FrontEnd/src/components/HeaderFooter/footer/short/ShortFooter.jsx index 40b83a90d..1b140d7fa 100644 --- a/FrontEnd/src/components/HeaderFooter/footer/short/ShortFooter.jsx +++ b/FrontEnd/src/components/HeaderFooter/footer/short/ShortFooter.jsx @@ -1,3 +1,4 @@ +import { Link } from 'react-router-dom'; import css from './ShortFooter.module.css'; const LINKS = [ @@ -34,7 +35,7 @@ function ShortFooter() {
Copyright 2022 Company name.
{LINKS.map( (element) => ( - {element.title} + {element.title} ))}
diff --git a/FrontEnd/src/components/PrivacyPolicyPage/UI/footer/Footer.js b/FrontEnd/src/components/PrivacyPolicyPage/UI/footer/Footer.js index 5315b74a2..3124dc614 100644 --- a/FrontEnd/src/components/PrivacyPolicyPage/UI/footer/Footer.js +++ b/FrontEnd/src/components/PrivacyPolicyPage/UI/footer/Footer.js @@ -1,3 +1,4 @@ +import { Link } from 'react-router-dom'; import css from './Footer.module.css'; import logo from './logo.svg'; @@ -35,7 +36,7 @@ function Footer() {
Copyright 2022 Company name.
{LINKS.map( (element) => ( - {element.title} + {element.title} ))}
diff --git a/FrontEnd/src/components/PrivacyPolicyPage/UI/header/Menu.js b/FrontEnd/src/components/PrivacyPolicyPage/UI/header/Menu.js index 53f2aa28d..0a76a823c 100644 --- a/FrontEnd/src/components/PrivacyPolicyPage/UI/header/Menu.js +++ b/FrontEnd/src/components/PrivacyPolicyPage/UI/header/Menu.js @@ -1,3 +1,4 @@ +import { Link } from 'react-router-dom'; import css from './Menu.module.css'; const MENU = [ @@ -28,9 +29,9 @@ function Menu() {
{MENU.map((element) => (
- + {element.title} - +
))}
diff --git a/FrontEnd/src/components/PrivacyPolicyPage/UI/header/Profile.js b/FrontEnd/src/components/PrivacyPolicyPage/UI/header/Profile.js index 8947b578f..13c44fd14 100644 --- a/FrontEnd/src/components/PrivacyPolicyPage/UI/header/Profile.js +++ b/FrontEnd/src/components/PrivacyPolicyPage/UI/header/Profile.js @@ -1,3 +1,4 @@ +import { Link } from 'react-router-dom'; import css from './Profile.module.css'; import avatar_image from './Avatar.png'; @@ -6,7 +7,7 @@ function Profile() {
- Профіль + Профіль
); diff --git a/FrontEnd/src/components/ProfileDetail/DetailedInfo/DataContacts.jsx b/FrontEnd/src/components/ProfileDetail/DetailedInfo/DataContacts.jsx index b33506ea9..ca4a6b3d0 100644 --- a/FrontEnd/src/components/ProfileDetail/DetailedInfo/DataContacts.jsx +++ b/FrontEnd/src/components/ProfileDetail/DetailedInfo/DataContacts.jsx @@ -1,4 +1,5 @@ import React from 'react'; +import { Link } from 'react-router-dom'; import { PropTypes } from 'prop-types'; import PhoneEmail from './PhoneEmail'; import classes from './DataContacts.module.css'; @@ -62,9 +63,9 @@ function DataContacts ({ data }) { {value.map((contact, index) => { if (contact.url) { return ( - + {contact.svgPath} - + ); } return null; diff --git a/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/EmailFormContent.js b/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/EmailFormContent.js index 7d0761e82..e114c4be7 100644 --- a/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/EmailFormContent.js +++ b/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/EmailFormContent.js @@ -13,7 +13,7 @@ export function SendEmailRestorePasswordFormContentComponent({ setIsValid }) { const errorMessageTemplates = { required: 'Обов’язкове поле', - email: 'Email не відповідає вимогам', + email: 'Формат електронної адреси некоректний', }; const { @@ -46,7 +46,7 @@ export function SendEmailRestorePasswordFormContentComponent({ setIsValid }) { navigate('/reset-password/modal'); }) .catch(() => { - toast.error('Формат електронної пошти некоректний.'); + toast.error('Зазначена електронна адреса не зареєстрована.'); }); }; @@ -62,9 +62,6 @@ export function SendEmailRestorePasswordFormContentComponent({ setIsValid }) {
- diff --git a/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/EmailFormContent.module.css b/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/EmailFormContent.module.css index 805581efc..e09908fa3 100644 --- a/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/EmailFormContent.module.css +++ b/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/EmailFormContent.module.css @@ -6,29 +6,28 @@ gap: 10px; align-self: stretch; } - + .send-email-form__container { display: flex; flex-direction: column; align-items: flex-start; gap: 8px; } - + .send-email-form__row { display: flex; align-items: flex-start; gap: 8px; } - + .send-email-form__column { display: flex; - width: 257px; height: 84px; padding-bottom: 0px; flex-direction: column; align-items: flex-start; } - + .send-email-form__label { display: flex; gap: 4px; @@ -37,33 +36,22 @@ color: var(--main-black-90, #292e32); font-feature-settings: "calt" off; - /* Text/Body/14-Regular */ font-family: Inter, sans-serif; font-size: 14px; font-style: normal; font-weight: 400; - line-height: 20px; /* 142.857% */ + line-height: 20px; letter-spacing: -0.14px; text-align: left; } - -.send-email-form__label--required { - color: var(--dust-red-5, #ff4d4f); - text-align: right; - font-family: SimSong; - font-size: 14px; - font-style: normal; - font-weight: 400; - line-height: 22.001px; -} - + .send-email-form__label--text { display: flex; flex-direction: column; justify-content: center; flex: 1 0 0; } - + .send-email-form__field { display: flex; width: 520px; @@ -72,7 +60,7 @@ border-radius: 2px; background: var(--main-white, #fff); } - + .send-email-form__input { display: flex; height: 22px; @@ -85,18 +73,17 @@ background: var(--main-white, #fff); color: var(--character-title-85, rgba(0, 0, 0, 0.85)); - /* Body/regular */ font-family: Roboto, sans-serif; font-size: 14px; font-style: normal; font-weight: 400; line-height: 22px; } - + .send-email-form__input:focus { outline: none; } - + .send-email-form__error { display: flex; padding: 1px 0px; @@ -104,11 +91,9 @@ gap: 10px; align-self: stretch; color: var(--red-red-100, #f34444); - - /* Body/regular */ font-family: Roboto, sans-serif; font-size: 14px; font-style: normal; font-weight: 400; line-height: 22px; -} +} \ No newline at end of file diff --git a/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/RestorePasswordFormContent.js b/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/RestorePasswordFormContent.js index aede37452..9ed8a2126 100644 --- a/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/RestorePasswordFormContent.js +++ b/FrontEnd/src/components/RestorePassword/components/restorepassword/restorepassword-form/RestorePasswordFormContent.js @@ -34,7 +34,7 @@ export function RestorePasswordFormContentComponent({ setIsValid }) { handleSubmit, getValues, formState: { errors, isValid }, - } = useForm(); + } = useForm({mode: 'all'}); useEffect(() => { const formIsValid = isValid; @@ -123,7 +123,7 @@ export function RestorePasswordFormContentComponent({ setIsValid }) {
diff --git a/FrontEnd/src/components/RestorePassword/pages/RestorePasswordPage.js b/FrontEnd/src/components/RestorePassword/pages/RestorePasswordPage.js index 4b3ddb80a..27e5f7b79 100644 --- a/FrontEnd/src/components/RestorePassword/pages/RestorePasswordPage.js +++ b/FrontEnd/src/components/RestorePassword/pages/RestorePasswordPage.js @@ -1,3 +1,4 @@ +import { Link } from 'react-router-dom'; import styles from './RestorePasswordPage.module.css'; import DotDecorComponent from '../UI/dotDecor/DotDecor'; import { RestorePasswordFormComponent } from '../components/restorepassword/RestorePasswordForm'; @@ -13,9 +14,9 @@ export function RestorePasswordPage() {
Вже були на нашому сайті?
- + Увійти - +
diff --git a/FrontEnd/src/components/RestorePassword/pages/SendEmailRestorePasswordPage.js b/FrontEnd/src/components/RestorePassword/pages/SendEmailRestorePasswordPage.js index 6af4599b1..6bef30fc9 100644 --- a/FrontEnd/src/components/RestorePassword/pages/SendEmailRestorePasswordPage.js +++ b/FrontEnd/src/components/RestorePassword/pages/SendEmailRestorePasswordPage.js @@ -1,3 +1,4 @@ +import { Link } from 'react-router-dom'; import styles from './SendEmailRestorePassword.module.css'; import DotDecorComponent from '../UI/dotDecor/DotDecor'; import { SendEmailRestorePasswordFormComponent } from '../components/restorepassword/SendEmailForm'; @@ -13,9 +14,9 @@ export function SendEmailRestorePasswordPage() {
Вже були на нашому сайті?
- + Увійти - + diff --git a/FrontEnd/src/components/SignUp/pages/ResendActivationPage.js b/FrontEnd/src/components/SignUp/pages/ResendActivationPage.js index 61caee12b..273a3adea 100644 --- a/FrontEnd/src/components/SignUp/pages/ResendActivationPage.js +++ b/FrontEnd/src/components/SignUp/pages/ResendActivationPage.js @@ -1,3 +1,4 @@ +import { Link } from 'react-router-dom'; import styles from './SignUpPage.module.css'; import DotDecorComponent from '../UI/dotDecor/DotDecor'; import { ResendActivationFormComponent } from '../components/signup/ResendActivationForm'; @@ -13,9 +14,9 @@ export function ResendActivationPage() {
Вже були на нашому сайті?
- + Увійти - + diff --git a/FrontEnd/src/components/SignUp/pages/SignUpModalPage.js b/FrontEnd/src/components/SignUp/pages/SignUpModalPage.js index 1c335c07d..663a231fd 100644 --- a/FrontEnd/src/components/SignUp/pages/SignUpModalPage.js +++ b/FrontEnd/src/components/SignUp/pages/SignUpModalPage.js @@ -15,9 +15,9 @@ export function SignUpModalPage() { Будь ласка перейдіть за посиланням з листа для підтвердження вказаної електронної адреси.
На цьому реєстрацію завершено.
- + Не отримали лист? - +

diff --git a/FrontEnd/src/components/SignUp/pages/SignUpPage.js b/FrontEnd/src/components/SignUp/pages/SignUpPage.js index aee83d8d8..b12e4169c 100644 --- a/FrontEnd/src/components/SignUp/pages/SignUpPage.js +++ b/FrontEnd/src/components/SignUp/pages/SignUpPage.js @@ -1,3 +1,4 @@ +import { Link } from 'react-router-dom'; import styles from './SignUpPage.module.css'; import DotDecorComponent from '../UI/dotDecor/DotDecor'; import { SignUpFormComponent } from '../components/signup/SignUpForm'; @@ -13,9 +14,9 @@ export function SignUpPage() {
Вже були на нашому сайті?
- + Увійти - + diff --git a/FrontEnd/src/components/authorization/LoginPage.jsx b/FrontEnd/src/components/authorization/LoginPage.jsx index bee8d3595..4c8190718 100644 --- a/FrontEnd/src/components/authorization/LoginPage.jsx +++ b/FrontEnd/src/components/authorization/LoginPage.jsx @@ -1,6 +1,6 @@ import { useForm } from 'react-hook-form'; import { useState, useEffect } from 'react'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate, Link } from 'react-router-dom'; import axios from 'axios'; import validator from 'validator'; import EyeVisible from './EyeVisible'; @@ -150,20 +150,20 @@ const LoginContent = (props) => { {errors.unspecifiedError && errors.unspecifiedError.message} - Забули пароль? + Забули пароль?
- + - +
diff --git a/FrontEnd/src/context/AuthContextProvider.js b/FrontEnd/src/context/AuthContextProvider.js index 212cf02e2..003f058f8 100644 --- a/FrontEnd/src/context/AuthContextProvider.js +++ b/FrontEnd/src/context/AuthContextProvider.js @@ -60,12 +60,6 @@ export function AuthProvider ({ children }) { } ); - if (authToken) { - login(authToken); - } else { - logout(); - } - setLoading(false); }, []);