diff --git a/src/components/AuthBox/AuthBox.js b/src/components/AuthBox/AuthBox.js
index b91ad6b4..e614b6c0 100644
--- a/src/components/AuthBox/AuthBox.js
+++ b/src/components/AuthBox/AuthBox.js
@@ -3,24 +3,20 @@ import { Link, useNavigate } from "react-router-dom";
import { useDispatch, useSelector } from "react-redux";
import { Loader } from "../Loader/Loader";
-import ErrorBoundary from "../../hoc/ErrorBoundary";
import { auth, selectAuth, setUserInfo } from "../../redux/outstaffingSlice";
import { loading } from "../../redux/loaderSlice";
import { setRole } from "../../redux/roleSlice";
import { selectIsLoading } from "../../redux/loaderSlice";
+import ModalErrorLogin from "../../components/UI/ModalErrorLogin/ModalErrorLogin";
+
import { apiRequest } from "../../api/request";
import ellipse from "../../images/ellipse.png";
import "./authBox.scss";
-import Swal from "sweetalert2";
-import withReactContent from "sweetalert2-react-content";
-
-const SweetAlert = withReactContent(Swal);
-
export const AuthBox = ({ title }) => {
const dispatch = useDispatch();
const ref = useRef();
@@ -30,15 +26,7 @@ export const AuthBox = ({ title }) => {
const isLoading = useSelector(selectIsLoading);
const [error, setError] = useState(null);
-
- const handleModalError = (error) => {
- SweetAlert.fire({
- title: "Ошибка",
- text: error,
- });
-
- setError(null);
- };
+ const [modalError, setModalError] = useState(false);
useEffect(() => {
if (!localStorage.getItem("auth_token")) {
@@ -62,6 +50,7 @@ export const AuthBox = ({ title }) => {
}).then((res) => {
if (!res.access_token) {
setError("Некорректные данные для входа");
+ setModalError(true);
dispatch(loading(false));
} else {
localStorage.setItem("auth_token", res.access_token);
@@ -104,15 +93,11 @@ export const AuthBox = ({ title }) => {
{error && (
-
- {handleModalError(error)}
- {/* setError(null)}*/}
- {/*/>*/}
-
+
)}
@@ -130,7 +115,9 @@ export const AuthBox = ({ title }) => {
{/* TODO: при клике отправлять на форму/модалку/страницу регистрации */}
diff --git a/src/components/SideBar/sidebar.scss b/src/components/SideBar/sidebar.scss
index 441a7ef4..bb6591f5 100644
--- a/src/components/SideBar/sidebar.scss
+++ b/src/components/SideBar/sidebar.scss
@@ -1,6 +1,6 @@
.auth-menu {
z-index: 99;
- position: absolute;
+ position: fixed;
top: 0;
left: 0;
width: 141px;
diff --git a/src/components/SliderWorkers/sliderWorkers.scss b/src/components/SliderWorkers/sliderWorkers.scss
index 75dc79a7..55b9af26 100644
--- a/src/components/SliderWorkers/sliderWorkers.scss
+++ b/src/components/SliderWorkers/sliderWorkers.scss
@@ -144,7 +144,6 @@
img {
margin: 0;
- width: 50%;
}
p {
diff --git a/src/components/UI/ModalErrorLogin/ModalErrorLogin.js b/src/components/UI/ModalErrorLogin/ModalErrorLogin.js
index 37aa0780..842e5d91 100644
--- a/src/components/UI/ModalErrorLogin/ModalErrorLogin.js
+++ b/src/components/UI/ModalErrorLogin/ModalErrorLogin.js
@@ -2,7 +2,7 @@ import React from "react";
import "./modalErrorLogin.scss";
-export const ModalErrorLogin = ({ active, setActive }) => {
+export const ModalErrorLogin = ({ active, setActive, title }) => {
return (
{
onClick={(e) => e.stopPropagation()}
>
Ошибка входа
-
Введены некоректные данные для входа
-