Added buttons change

This commit is contained in:
MaxOvs19 2023-03-13 18:35:26 +03:00
parent b17386ba48
commit 93ebf0ed83
7 changed files with 189 additions and 110 deletions

View File

@ -1,29 +1,27 @@
import React, {useEffect, useRef, useState} from 'react' import React, { useEffect, useRef, useState } from "react";
import {Link, useNavigate} from 'react-router-dom' import { Link, useNavigate } from "react-router-dom";
import {useDispatch, useSelector} from 'react-redux' import { useDispatch, useSelector } from "react-redux";
import {Loader} from '../Loader/Loader' import { Loader } from "../Loader/Loader";
import ErrorBoundary from "../../hoc/ErrorBoundary"; import ErrorBoundary from "../../hoc/ErrorBoundary";
import {auth, selectAuth, setUserInfo} from '../../redux/outstaffingSlice' import { auth, selectAuth, setUserInfo } from "../../redux/outstaffingSlice";
import {loading} from '../../redux/loaderSlice' import { loading } from "../../redux/loaderSlice";
import {setRole} from '../../redux/roleSlice' import { setRole } from "../../redux/roleSlice";
import {selectIsLoading} from '../../redux/loaderSlice' import { selectIsLoading } from "../../redux/loaderSlice";
import {apiRequest} from "../../api/request"; import { apiRequest } from "../../api/request";
import ellipse from '../../images/ellipse.png' import ellipse from "../../images/ellipse.png";
import './authBox.scss' import "./authBox.scss";
import Swal from 'sweetalert2' import Swal from "sweetalert2";
import withReactContent from 'sweetalert2-react-content' import withReactContent from "sweetalert2-react-content";
const SweetAlert = withReactContent(Swal); const SweetAlert = withReactContent(Swal);
export const AuthBox = ({ title, altTitle, roleChangeLink }) => {
export const AuthBox = ({title, altTitle, roleChangeLink}) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const ref = useRef(); const ref = useRef();
const navigate = useNavigate(); const navigate = useNavigate();
@ -35,96 +33,79 @@ export const AuthBox = ({title, altTitle, roleChangeLink}) => {
const handleModalError = (error) => { const handleModalError = (error) => {
SweetAlert.fire({ SweetAlert.fire({
title: 'Ошибка', title: "Ошибка",
text: error text: error,
}); });
setError(null) setError(null);
}; };
useEffect(() => { useEffect(() => {
if (!localStorage.getItem('auth_token')) { if (!localStorage.getItem("auth_token")) {
dispatch(auth(false)) dispatch(auth(false));
} }
}, []); }, []);
useEffect(() => { useEffect(() => {
if (isAuth) { if (isAuth) {
navigate('/') navigate("/");
} }
}); });
const submitHandler = () => { const submitHandler = () => {
let formData = new FormData(ref.current); let formData = new FormData(ref.current);
if (!isLoading) { if (!isLoading) {
dispatch(loading(true)); dispatch(loading(true));
apiRequest('/user/login', apiRequest("/user/login", {
{ method: "POST",
method: 'POST', data: formData,
data: formData
}).then((res) => { }).then((res) => {
if (!res.access_token) { if (!res.access_token) {
setError("Некорректные данные для входа");
setError('Некорректные данные для входа'); dispatch(loading(false));
dispatch(loading(false))
} else { } else {
localStorage.setItem("auth_token", res.access_token);
localStorage.setItem('auth_token', res.access_token); localStorage.setItem("id", res.id);
localStorage.setItem('id', res.id); localStorage.setItem("cardId", res.card_id);
localStorage.setItem('cardId', res.card_id); localStorage.setItem("role_status", res.status);
localStorage.setItem('role_status', res.status);
localStorage.setItem( localStorage.setItem(
'access_token_expired_at', "access_token_expired_at",
res.access_token_expired_at res.access_token_expired_at
); );
dispatch(auth(true)); dispatch(auth(true));
dispatch(setUserInfo(res)); dispatch(setUserInfo(res));
dispatch(loading(false)); dispatch(loading(false));
dispatch(setRole('ROLE_PARTNER')) dispatch(setRole("ROLE_PARTNER"));
} }
}) });
} }
}; };
return ( return (
<div className='auth-box'> <div className="auth-box">
<h2 className='auth-box__header'> <h2 className="auth-box__header">
Войти в <span>систему</span> Войти в <span>систему</span>
</h2> </h2>
<div className='auth-box__title'> <div className="auth-box__title">
<img src={ellipse} alt=''/> <img src={ellipse} alt="" />
<span>{title}</span> <span>{title}</span>
</div> </div>
<form ref={ref} className='auth-box__form'> <form ref={ref} className="auth-box__form">
<label htmlFor='login'>Ваш логин:</label> <label htmlFor="login">Ваш логин:</label>
<input <input id="login" type="text" name="username" placeholder="Логин" />
id='login'
type='text'
name='username'
placeholder='Логин'
/>
<label htmlFor='password'>Пароль:</label> <label htmlFor="password">Пароль:</label>
<input <input
id='password' id="password"
type='password' type="password"
name='password' name="password"
placeholder='Пароль' placeholder="Пароль"
/> />
{error && ( {error && (
<div className='auth-box__form-error'> <div className="auth-box__form-error">
<ErrorBoundary> <ErrorBoundary>
{handleModalError(error)}
{
handleModalError(error)
}
{/*<SweetAlert*/} {/*<SweetAlert*/}
{/* show={!!error}*/} {/* show={!!error}*/}
{/* title='Ошибка'*/} {/* title='Ошибка'*/}
@ -135,25 +116,24 @@ export const AuthBox = ({title, altTitle, roleChangeLink}) => {
</div> </div>
)} )}
<div className='auth-box__form-buttons'> <div className="auth-box__form-buttons">
<button <button
className='auth-box__form-btn' className="auth-box__form-btn"
onClick={(e) => { onClick={(e) => {
e.preventDefault(); e.preventDefault();
submitHandler() submitHandler();
}} }}
> >
{isLoading ? <Loader/> : 'Войти'} {isLoading ? <Loader /> : "Войти"}
</button> </button>
<Link to={roleChangeLink}> <Link to={roleChangeLink}>
<button className='auth-box__form-btn--role auth-box__auth-link'> <button className="auth-box__form-btn--role auth-box__auth-link">
{altTitle} {altTitle}
</button> </button>
</Link> </Link>
</div> </div>
</form> </form>
</div> </div>
) );
}; };

View File

@ -54,7 +54,7 @@ export const SliderWorkers = ({}) => {
return ( return (
<div className="worker"> <div className="worker">
<img src={worker.avatar}></img> <img src={worker.avatar}></img>
<div> <div className="worker-description">
<p>{worker.skils}</p> <p>{worker.skils}</p>
<button className="worker__resume">Подробное резюме</button> <button className="worker__resume">Подробное резюме</button>
</div> </div>

View File

@ -115,5 +115,32 @@
margin: 0; margin: 0;
} }
} }
.slick-next,
.slick-prev {
display: none !important;
}
.worker {
flex-direction: column;
margin: 0;
align-items: center;
img {
margin: 0;
width: 50%;
}
p {
margin-top: 10px;
text-align: center;
}
.worker-description {
display: flex;
flex-direction: column;
align-items: center;
}
}
} }
} }

View File

@ -11,7 +11,7 @@ import vector from "../../images/Vector_Smart_Object.png";
import vectorBlack from "../../images/Vector_Smart_Object_black.png"; import vectorBlack from "../../images/Vector_Smart_Object_black.png";
import { selectAuth } from "../../redux/outstaffingSlice"; import { selectAuth } from "../../redux/outstaffingSlice";
import { useNavigate } from "react-router-dom"; import { Link, useNavigate } from "react-router-dom";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "../../components/Footer/Footer";
import SideBar from "../../components/SideBar/SideBar"; import SideBar from "../../components/SideBar/SideBar";
import AuthHeader from "../../components/AuthHeader/AuthHeader"; import AuthHeader from "../../components/AuthHeader/AuthHeader";
@ -42,6 +42,16 @@ const AuthForDevelopers = () => {
alt="" alt=""
/> />
<div className="container"> <div className="container">
<div className="change-mode">
<Link to={"/authdev"}>
<button className="change-mode__developers">
!Для разработчика
</button>
</Link>
<Link to={"/auth"}>
<button className="change-mode__partners">Для партнёров</button>
</Link>
</div>
<div className="row"> <div className="row">
<div className="col-12 col-xl-6"> <div className="col-12 col-xl-6">
<div className="auth-developers__box"> <div className="auth-developers__box">

View File

@ -23,6 +23,32 @@
right: -224px; right: -224px;
} }
.change-mode {
display: flex;
justify-content: center;
&__partners {
width: 220px;
height: 50px;
background: #406128;
border-radius: 44px;
color: white;
font-size: 16px;
border: none;
margin-left: -40px;
}
&__developers {
width: 220px;
height: 50px;
background-color: #52b709;
border-radius: 44px;
color: white;
font-size: 16px;
border: none;
}
}
@media (max-width: 575.98px) { @media (max-width: 575.98px) {
.auth-developers__vector, .auth-developers__vector,
.auth-developers__vector-black { .auth-developers__vector-black {

View File

@ -7,7 +7,7 @@ import vector from "../../images/Vector_Smart_Object.png";
import vectorBlack from "../../images/Vector_Smart_Object_black.png"; import vectorBlack from "../../images/Vector_Smart_Object_black.png";
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { selectAuth } from "../../redux/outstaffingSlice"; import { selectAuth } from "../../redux/outstaffingSlice";
import { useNavigate } from "react-router-dom"; import { Link, useNavigate } from "react-router-dom";
import { Footer } from "../../components/Footer/Footer"; import { Footer } from "../../components/Footer/Footer";
import { AuthBox } from "../../components/AuthBox/AuthBox"; import { AuthBox } from "../../components/AuthBox/AuthBox";
@ -37,6 +37,16 @@ const AuthForPartners = () => {
<img className="auth-partners__vector" src={vector} alt="" /> <img className="auth-partners__vector" src={vector} alt="" />
<img className="auth-partners__vector-black" src={vectorBlack} alt="" /> <img className="auth-partners__vector-black" src={vectorBlack} alt="" />
<div className="container"> <div className="container">
<div className="change-mode">
<Link to={"/authdev"}>
<button className="change-mode__developers">
Для разработчика
</button>
</Link>
<Link to={"/auth"}>
<button className="change-mode__partners">Для партнёров!</button>
</Link>
</div>
<div className="row"> <div className="row">
<div className="col-12 col-xl-6"> <div className="col-12 col-xl-6">
<div className="auth-partners__box"> <div className="auth-partners__box">

View File

@ -49,6 +49,32 @@
padding-bottom: 310px; padding-bottom: 310px;
} }
.change-mode {
display: flex;
justify-content: center;
&__partners {
width: 220px;
height: 50px;
background: #406128;
border-radius: 44px;
color: white;
font-size: 16px;
border: none;
margin-left: -40px;
}
&__developers {
width: 220px;
height: 50px;
background-color: #52b709;
border-radius: 44px;
color: white;
font-size: 16px;
border: none;
}
}
@media (max-width: 575.98px) { @media (max-width: 575.98px) {
.auth-partners__info { .auth-partners__info {
max-width: 380px; max-width: 380px;