From 8ed1859e9345998c59dfb431f570fddb3949816b Mon Sep 17 00:00:00 2001 From: Mikola Date: Mon, 11 Sep 2023 18:29:45 +0300 Subject: [PATCH] tracker tasks --- src/components/AuthBox/AuthBox.jsx | 37 ++++++++++--------- .../Common/AuthHeader/AuthHeader.jsx | 4 +- .../SliderWorkers/SliderWorkers.jsx | 8 ++-- 3 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/components/AuthBox/AuthBox.jsx b/src/components/AuthBox/AuthBox.jsx index 9485f949..1924dd00 100644 --- a/src/components/AuthBox/AuthBox.jsx +++ b/src/components/AuthBox/AuthBox.jsx @@ -12,8 +12,8 @@ import { Loader } from "@components/Common/Loader/Loader"; import ModalErrorLogin from "@components/Modal/ModalErrorLogin/ModalErrorLogin"; import ModalRegistration from "@components/Modal/ModalRegistration/ModalRegistration"; -import authHead from "assets/icons/authHead.svg" -import eyePassword from "assets/icons/passwordIcon.svg" +import authHead from "assets/icons/authHead.svg"; +import eyePassword from "assets/icons/passwordIcon.svg"; import "./authBox.scss"; @@ -28,7 +28,7 @@ export const AuthBox = ({ title }) => { const [error, setError] = useState(null); const [modalError, setModalError] = useState(false); const [modalReg, setModalReg] = useState(false); - const [showPassword, setShowPassword] = useState(false) + const [showPassword, setShowPassword] = useState(false); useEffect(() => { if (!localStorage.getItem("auth_token")) { @@ -75,7 +75,7 @@ export const AuthBox = ({ title }) => { return (

- Вход authImg + Вход authImg

{title} @@ -85,14 +85,19 @@ export const AuthBox = ({ title }) => { -
+
+ setShowPassword(!showPassword)} + className="eye" + src={eyePassword} + alt="eye" /> - setShowPassword(!showPassword)} className='eye' src={eyePassword} alt='eye' />
{error && ( @@ -115,19 +120,17 @@ export const AuthBox = ({ title }) => { > {isLoading ? : "Войти"} - - Вспомнить пароль - + Вспомнить пароль

У вас еще нет аккаунта?   { - e.preventDefault(); - setModalReg(true); - }} + onClick={(e) => { + e.preventDefault(); + setModalReg(true); + }} > Зарегистрироваться diff --git a/src/components/Common/AuthHeader/AuthHeader.jsx b/src/components/Common/AuthHeader/AuthHeader.jsx index fb201b21..57f4a333 100644 --- a/src/components/Common/AuthHeader/AuthHeader.jsx +++ b/src/components/Common/AuthHeader/AuthHeader.jsx @@ -30,7 +30,9 @@ export const AuthHeader = () => { e.preventDefault(); scrollToForm(); }} - >Кабинет разработчика + > + Кабинет разработчика +

  • Школа diff --git a/src/components/SliderWorkers/SliderWorkers.jsx b/src/components/SliderWorkers/SliderWorkers.jsx index ecc277a9..a79a82fa 100644 --- a/src/components/SliderWorkers/SliderWorkers.jsx +++ b/src/components/SliderWorkers/SliderWorkers.jsx @@ -6,11 +6,11 @@ import "slick-carousel/slick/slick.css"; import BaseButton from "@components/Common/BaseButton/BaseButton"; +import avatarMockFirst from "assets/images/mock/avatarMoсk3.png"; +import avatarMockSecond from "assets/images/mock/avatarMoсk4.png"; +import avatarMockThird from "assets/images/mock/avatarMoсk5.png"; +import avatarMockFourth from "assets/images/mock/avatarMoсk6.png"; import mockWorker from "assets/images/mock/mokPerson.png"; -import avatarMockFirst from "assets/images/mock/avatarMoсk3.png" -import avatarMockSecond from "assets/images/mock/avatarMoсk4.png" -import avatarMockThird from "assets/images/mock/avatarMoсk5.png" -import avatarMockFourth from "assets/images/mock/avatarMoсk6.png" import "./sliderWorkers.scss";