fixes #9

Merged
nik.polishuk merged 2 commits from fixes into main 2024-01-16 21:31:05 +03:00
4 changed files with 28 additions and 41 deletions

View File

@ -31,6 +31,17 @@
padding: 10px !important; padding: 10px !important;
height: 40px !important; height: 40px !important;
margin-bottom: 5px !important; margin-bottom: 5px !important;
max-width: 366px;
width: 100%;
border-radius: 8px;
border: none;
background-color: #ffffff;
font-size: 15px;
font-weight: 400;
font-style: normal;
letter-spacing: normal;
text-align: left;
outline: none;
} }
&__arrow { &__arrow {

View File

@ -1,17 +1,14 @@
import React, { useEffect, useRef, useState } from "react"; import React, { useEffect, useState } from "react";
import { useDispatch, useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { loading, selectIsLoading } from "@redux/loaderSlice"; import { selectAuth } from "@redux/outstaffingSlice";
import { auth, selectAuth, setUserInfo } from "@redux/outstaffingSlice";
import { setRole } from "@redux/roleSlice";
import { apiRequest } from "@api/request";
import AuthBlock from "@components/AuthBlock/AuthBlock"; import AuthBlock from "@components/AuthBlock/AuthBlock";
import CategoriesItem from "@components/CategoriesItem/CategoriesItem"; import CategoriesItem from "@components/CategoriesItem/CategoriesItem";
import AuthHeader from "@components/Common/AuthHeader/AuthHeader"; import AuthHeader from "@components/Common/AuthHeader/AuthHeader";
import { Footer } from "@components/Common/Footer/Footer"; import { Footer } from "@components/Common/Footer/Footer";
import ModalResetPassword from "@components/Modal/ModalResetPassword/ModalResetPassword";
import SideBar from "@components/SideBar/SideBar"; import SideBar from "@components/SideBar/SideBar";
import StepsForCandidate from "@components/StepsForCandidate/StepsForCandidate"; import StepsForCandidate from "@components/StepsForCandidate/StepsForCandidate";
@ -24,17 +21,14 @@ import FrontendImg from "assets/images/partnerProfile/PersonalFrontend.svg";
import ManageImg from "assets/images/partnerProfile/PersonalMng.svg"; import ManageImg from "assets/images/partnerProfile/PersonalMng.svg";
import SmmImg from "assets/images/partnerProfile/PersonalSMM.svg"; import SmmImg from "assets/images/partnerProfile/PersonalSMM.svg";
import TestImg from "assets/images/partnerProfile/PersonalTesters.svg"; import TestImg from "assets/images/partnerProfile/PersonalTesters.svg";
import authImg from "assets/images/partnerProfile/authCandidateFormImg.png";
import BackEndImg from "assets/images/partnerProfile/personalBackEnd.svg"; import BackEndImg from "assets/images/partnerProfile/personalBackEnd.svg";
import "./authForCandidate.scss"; import "./authForCandidate.scss";
export const AuthForCandidate = () => { export const AuthForCandidate = () => {
const isLoading = useSelector(selectIsLoading);
const ref = useRef();
const dispatch = useDispatch();
const isAuth = useSelector(selectAuth); const isAuth = useSelector(selectAuth);
let navigate = useNavigate(); let navigate = useNavigate();
const [modalResetOpen, setModalReset] = useState(false);
const getToken = localStorage.getItem("auth_token"); const getToken = localStorage.getItem("auth_token");
const [personalInfoItems] = useState([ const [personalInfoItems] = useState([
@ -113,39 +107,12 @@ export const AuthForCandidate = () => {
} }
}, [getToken]); }, [getToken]);
// const submitHandler = () => {
// let formData = new FormData(ref.current);
// if (!isLoading) {
// dispatch(loading(true));
// apiRequest("/user/login", {
// method: "POST",
// data: formData,
// }).then((res) => {
// if (!res.access_token) {
// dispatch(loading(false));
// } else {
// localStorage.setItem("auth_token", res.access_token);
// localStorage.setItem("id", res.id);
// localStorage.setItem("cardId", res.card_id);
// localStorage.setItem("role_status", res.status);
// localStorage.setItem(
// "access_token_expired_at",
// res.access_token_expired_at
// );
// dispatch(auth(true));
// dispatch(setUserInfo(res));
// dispatch(loading(false));
// dispatch(setRole("ROLE_PARTNER"));
// }
// });
// }
// };
return ( return (
<div className="auth-candidate"> <div className="auth-candidate">
<AuthHeader /> <AuthHeader />
<div className="container"> <div className="container">
<AuthBlock <AuthBlock
resetModal={setModalReset}
title="Войти, если есть доступ" title="Войти, если есть доступ"
description="Если вы получили доступ, пройдя description="Если вы получили доступ, пройдя
2 шага для входа или хотите узнать 2 шага для входа или хотите узнать
@ -178,6 +145,7 @@ export const AuthForCandidate = () => {
</div> </div>
</div> </div>
</div> </div>
<ModalResetPassword active={modalResetOpen} setActive={setModalReset} />
<SideBar /> <SideBar />
<Footer /> <Footer />
</div> </div>

View File

@ -1,4 +1,5 @@
import React from "react"; import React from "react";
import { Link } from "react-router-dom";
import { useFormValidation } from "@hooks/useFormValidation"; import { useFormValidation } from "@hooks/useFormValidation";
import { useNotification } from "@hooks/useNotification"; import { useNotification } from "@hooks/useNotification";
@ -73,9 +74,12 @@ export const RegistrationForCandidate = () => {
<p className="registrationCandidate__info__skills"> <p className="registrationCandidate__info__skills">
Java PHP Python C# React Vue.js NodeJs Golang Ruby JavaScript Java PHP Python C# React Vue.js NodeJs Golang Ruby JavaScript
</p> </p>
<div className="registrationCandidate__info__arrow"> <Link
to="/auth-candidate"
className="registrationCandidate__info__arrow"
>
<img src={arrowBtn} alt="img" /> <img src={arrowBtn} alt="img" />
</div> </Link>
</div> </div>
{/* форма регистрации */} {/* форма регистрации */}
<form <form

View File

@ -45,6 +45,7 @@
display: flex; display: flex;
padding: 33px 69px 32px 30px; padding: 33px 69px 32px 30px;
background: #ffffff; background: #ffffff;
max-height: 438px;
border-radius: 12px; border-radius: 12px;
width: 100%; width: 100%;
@ -125,6 +126,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 46%; width: 46%;
position: relative;
@media (max-width: 1072px) { @media (max-width: 1072px) {
width: 100%; width: 100%;
@ -159,6 +161,8 @@
} }
span { span {
position: absolute;
bottom: -22px;
color: red; color: red;
font-size: 12px; font-size: 12px;
} }