diff --git a/src/components/CandidateSidebar/CandidateSidebar.jsx b/src/components/CandidateSidebar/CandidateSidebar.jsx
index 32cf2e99..b4402c38 100644
--- a/src/components/CandidateSidebar/CandidateSidebar.jsx
+++ b/src/components/CandidateSidebar/CandidateSidebar.jsx
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import { Achievement } from "../Achievement/Achievement";
-import ModalAspt from "../UI/ModalAspt/ModalAspt";
+import ModalAspirant from "../UI/ModalAspirant/ModalAspirant";
import { urlForLocal } from "../../helper";
import { LEVELS, SKILLS } from "../../constants/constants";
@@ -39,11 +39,11 @@ const CandidateSidebar = ({ candidate, setActiveSnippet, activeSnippet }) => {
return (
-
+ >
diff --git a/src/components/Common/Button/Button.jsx b/src/components/Common/Button/Button.jsx
new file mode 100644
index 00000000..760ad655
--- /dev/null
+++ b/src/components/Common/Button/Button.jsx
@@ -0,0 +1,16 @@
+import React from "react";
+
+import classes from "./button.module.scss";
+
+export const Button = ({ children, styles, ...props }) => {
+ return (
+
+ );
+};
+
+export default Button;
diff --git a/src/components/Common/Button/button.module.scss b/src/components/Common/Button/button.module.scss
new file mode 100644
index 00000000..17551290
--- /dev/null
+++ b/src/components/Common/Button/button.module.scss
@@ -0,0 +1,18 @@
+.button {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background-color: #52b709;
+ border-radius: 44px;
+ color: white;
+ font-style: normal;
+ font-family: "LabGrotesque", sans-serif;
+ border: none;
+ transition: 0.5s;
+
+ &:hover {
+ transition: 0.5s;
+ background-color: #52b709a8;
+ text-decoration: none;
+ }
+}
diff --git a/src/components/SliderWorkers/SliderWorkers.jsx b/src/components/SliderWorkers/SliderWorkers.jsx
index e7f12106..3d49679c 100644
--- a/src/components/SliderWorkers/SliderWorkers.jsx
+++ b/src/components/SliderWorkers/SliderWorkers.jsx
@@ -2,6 +2,8 @@ import React, { useState } from "react";
import Slider from "react-slick";
import { Link } from "react-router-dom";
+import Button from "../Common/Button/Button";
+
import mockWorker from "../../assets/images/mock/mokPerson.png";
import "./sliderWorkers.scss";
@@ -65,9 +67,9 @@ export const SliderWorkers = ({ title, titleInfo, subTitle }) => {
{worker.skils}
-
- Подробное резюме
-
+
);
diff --git a/src/components/SliderWorkers/sliderWorkers.scss b/src/components/SliderWorkers/sliderWorkers.scss
index 5e038a4b..5bc7f9a6 100644
--- a/src/components/SliderWorkers/sliderWorkers.scss
+++ b/src/components/SliderWorkers/sliderWorkers.scss
@@ -59,24 +59,16 @@
}
&__resume {
- display: flex;
- align-items: center;
- justify-content: center;
margin-top: 5px;
width: 177px;
height: 40px;
- background: #52b709;
- border-radius: 44px;
font-size: 14px;
line-height: 32px;
- color: white;
- border: none;
transition: 0.5s;
- &:hover {
- transition: 0.5s;
- background-color: #52b709a8;
- text-decoration: none;
+ a {
+ color: white;
+ width: 100%;
}
}
}
diff --git a/src/components/UI/FreeDevelopers/FreeDevelopers.jsx b/src/components/UI/FreeDevelopers/FreeDevelopers.jsx
index 3567d852..261568ca 100644
--- a/src/components/UI/FreeDevelopers/FreeDevelopers.jsx
+++ b/src/components/UI/FreeDevelopers/FreeDevelopers.jsx
@@ -1,12 +1,12 @@
import React from "react";
+import { Link } from "react-router-dom";
import AuthHeader from "../../AuthHeader/AuthHeader";
import SideBar from "../../SideBar/SideBar";
import { Footer } from "../../Footer/Footer";
-
-import { Link } from "react-router-dom";
import { scrollToForm } from "../../../helper";
import { ProfileBreadcrumbs } from "../../ProfileBreadcrumbs/ProfileBreadcrumbs";
+import Button from "../../Common/Button/Button";
import mockWorker from "../../../assets/images/mock/mokPerson.png";
import arrow from "../../../assets/icons/arrows/arrow_left.png";
@@ -42,9 +42,9 @@ export const FreeDevelopers = ({}) => {
-
@@ -84,14 +84,13 @@ export const FreeDevelopers = ({}) => {
-
+
Для просмотра полного резюме разработчика авторизуйтесь
-
- Войти
-
+
+ Войти
+
-
diff --git a/src/components/UI/FreeDevelopers/freeDevelopers.scss b/src/components/UI/FreeDevelopers/freeDevelopers.scss
index eedd7b30..fbe21183 100644
--- a/src/components/UI/FreeDevelopers/freeDevelopers.scss
+++ b/src/components/UI/FreeDevelopers/freeDevelopers.scss
@@ -118,7 +118,7 @@
}
}
- .logIn {
+ .login {
position: absolute;
bottom: 75px;
border: 3px solid #52b709;
@@ -140,10 +140,8 @@
}
a {
- width: 140px;
- height: 50px;
color: white;
- text-decoration: none;
+ width: 100%;
}
@media (max-width: 920px) {
@@ -156,7 +154,7 @@
text-align: center;
}
- a {
+ button {
margin-top: 15px;
height: 25px;
height: 40px;
@@ -229,17 +227,9 @@
}
}
-.button-green {
- align-items: center;
- justify-content: center;
- display: flex;
- background: #52b709;
- border-radius: 44px;
+.dev-code {
width: 202px;
height: 50px;
font-weight: 500;
font-size: 16px;
- line-height: 32px;
- color: #ffffff;
- border: none;
}
diff --git a/src/components/UI/ModalAspirant/ModalAspirant.jsx b/src/components/UI/ModalAspirant/ModalAspirant.jsx
new file mode 100644
index 00000000..089b0b11
--- /dev/null
+++ b/src/components/UI/ModalAspirant/ModalAspirant.jsx
@@ -0,0 +1,102 @@
+import React, { useState } from "react";
+
+import { Link } from "react-router-dom";
+import ModalLayout from "../ModalLayout/ModalLayout";
+
+import avatar from "../../../assets/images/mock/mokPerson.png";
+import logoTg from "../../../assets/icons/tgLogo.svg";
+import arrow from "../../../assets/icons/arrows/left-arrow.png";
+import interview from "../../../assets/images/logo/interviewLogo.svg";
+
+import "./modalAspirant.scss";
+
+export const ModalAspirant = ({ active, setActive, level }) => {
+ const [date, setDate] = useState("");
+ const [time, setTime] = useState("");
+ const [modalSend, setModalSend] = useState(false);
+
+ const send = () => {
+ if (date != "" && time != "") {
+ setModalSend(true);
+
+ setTimeout(() => {
+ setModalSend(false);
+ setActive(false);
+ }, 3200);
+ }
+ };
+
+ // TODO: Исправить стили тут, и заменить в модалках
+ return (
+
+
+
Выбранный кандидат
+
+
+
+
+ {level.spec} {level.skils}, {level.level}{" "}
+
+
+
+
+
+
+
+
Вернуться к списку
+
+
+
+
+
+
Есть вопросы?
+
+
+
Напишите нам в Телеграм. Мы с удовольствием ответим!
+
+
+
+
+
Дата собеседования
+
+ setDate(e.target.value)}
+ >
+
+
+
Время собеседования
+
+ setTime(e.target.value)}
+ >
+
+
+
Отправить
+
+ setActive(false)}>
+
+
+
+
+
Спасибо, собеседование назначено
+
+ Дата: {date}
+
+
+ Время собеседования: {time}
+
+
+
+
+ );
+};
+
+export default ModalAspirant;
diff --git a/src/components/UI/ModalAspt/modalAspt.scss b/src/components/UI/ModalAspirant/modalAspirant.scss
similarity index 90%
rename from src/components/UI/ModalAspt/modalAspt.scss
rename to src/components/UI/ModalAspirant/modalAspirant.scss
index 32e94c9d..b027e9bb 100644
--- a/src/components/UI/ModalAspt/modalAspt.scss
+++ b/src/components/UI/ModalAspirant/modalAspirant.scss
@@ -164,32 +164,32 @@
}
}
}
-
- .send {
- display: flex;
- flex-direction: column;
- align-items: center;
-
- h2 {
- text-align: center;
- margin: 25px 0 31px 0;
- }
-
- p {
- font-size: 14px;
- line-height: 17px;
- font-weight: 700;
- text-align: center;
- color: #000000;
- margin-bottom: 10px;
-
- span {
- color: #406128;
- }
- }
- }
}
.modal-aspt.active {
transform: scale(1);
}
+
+.send {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ h2 {
+ text-align: center;
+ margin: 25px 0 31px 0;
+ }
+
+ p {
+ font-size: 14px;
+ line-height: 17px;
+ font-weight: 700;
+ text-align: center;
+ color: #000000;
+ margin-bottom: 10px;
+
+ span {
+ color: #406128;
+ }
+ }
+}
diff --git a/src/components/UI/ModalAspt/ModalAspt.jsx b/src/components/UI/ModalAspt/ModalAspt.jsx
deleted file mode 100644
index f8f100f1..00000000
--- a/src/components/UI/ModalAspt/ModalAspt.jsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import React, { useState } from "react";
-
-import { Link } from "react-router-dom";
-import ModalLayout from "../ModalLayout/ModalLayout";
-
-import avatar from "../../../assets/images/mock/mokPerson.png";
-import logoTg from "../../../assets/icons/tgLogo.svg";
-import arrow from "../../../assets/icons/arrows/left-arrow.png";
-import interview from "../../../assets/images/logo/interviewLogo.svg";
-
-import "./modalAspt.scss";
-
-export const ModalAspt = ({ active, setActive, level }) => {
- const [date, setDate] = useState("");
- const [time, setTime] = useState("");
- const [modalSend, setModalSend] = useState(false);
-
- const send = () => {
- if (date != "" && time != "") {
- setModalSend(true);
-
- setTimeout(() => {
- setModalSend(false);
- setActive(false);
- }, 3200);
- }
- };
-
- return (
- setActive(false)}
- >
-
e.stopPropagation()}>
-
-
Выбранный кандидат
-
-
-
-
- {level.spec} {level.skils}, {level.level}{" "}
-
-
-
-
-
-
-
-
Вернуться к списку
-
-
-
-
-
-
Есть вопросы?
-
-
-
Напишите нам в Телеграм. Мы с удовольствием ответим!
-
-
-
-
-
Дата собеседования
-
- setDate(e.target.value)}
- >
-
-
-
Время собеседования
-
- setTime(e.target.value)}
- >
-
-
-
Отправить
-
-
setActive(false)}>
-
-
-
-
-
-
Спасибо, собеседование назначено
-
- Дата: {date}
-
-
- Время собеседования: {time}
-
-
-
-
- );
-};
-
-export default ModalAspt;
diff --git a/src/components/UI/ModalLayout/ModalLayout.jsx b/src/components/UI/ModalLayout/ModalLayout.jsx
index 40e5fbae..87add7d7 100644
--- a/src/components/UI/ModalLayout/ModalLayout.jsx
+++ b/src/components/UI/ModalLayout/ModalLayout.jsx
@@ -1,12 +1,19 @@
import React from "react";
-export const ModalLayout = ({ active, setActive, children }) => {
+import "./modalLayout.scss";
+
+export const ModalLayout = ({ active, setActive, children, styles }) => {
return (
setActive(false)}
>
-
e.stopPropagation()}>
+
e.stopPropagation()}
+ >
{children}
diff --git a/src/components/UI/ModalLayout/modalLayout.scss b/src/components/UI/ModalLayout/modalLayout.scss
new file mode 100644
index 00000000..005151b3
--- /dev/null
+++ b/src/components/UI/ModalLayout/modalLayout.scss
@@ -0,0 +1,29 @@
+.modal-layout {
+ z-index: 9;
+ height: 100%;
+ width: 100%;
+ background-color: rgba(0, 0, 0, 0.11);
+ position: fixed;
+ top: 0;
+ left: 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ transform: scale(0);
+
+ &__content {
+ position: relative;
+ background: linear-gradient(180deg, #ffffff 0%, #ebebeb 100%);
+ border-radius: 24px;
+
+ padding: 60px 60px 30px 60px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ }
+}
+
+.modal-layout.active {
+ transform: scale(1);
+}
diff --git a/src/pages/PartnerRequests/PartnerRequests.js b/src/pages/PartnerRequests/PartnerRequests.jsx
similarity index 93%
rename from src/pages/PartnerRequests/PartnerRequests.js
rename to src/pages/PartnerRequests/PartnerRequests.jsx
index 645a5ea8..1acaaaaf 100644
--- a/src/pages/PartnerRequests/PartnerRequests.js
+++ b/src/pages/PartnerRequests/PartnerRequests.jsx
@@ -5,6 +5,7 @@ import {
setPartnerRequestId,
setPartnerRequests,
} from "../../redux/outstaffingSlice";
+import { apiRequest } from "../../api/request";
import { Navigation } from "../../components/Navigation/Navigation";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader";
@@ -12,8 +13,7 @@ import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileB
import { SliderWorkers } from "../../components/SliderWorkers/SliderWorkers";
import { Loader } from "../../components/Loader/Loader";
import { Footer } from "../../components/Footer/Footer";
-
-import { apiRequest } from "../../api/request";
+import Button from "../../components/Common/Button/Button";
import cursorImg from "../../assets/icons/cursorImg.svg";
@@ -82,10 +82,12 @@ export const PartnerRequests = () => {
Оператор компании заводит заявку и указывает необходимые
параметры — количество сотрудников, стек, уровень специалиста
-
-
+
- Создать запрос
-
+
+
+ +
+ Создать запрос
+
+
)}
@@ -95,10 +97,12 @@ export const PartnerRequests = () => {
У вас еще нет запросов на сотрудников
-
-
+
- Создать запрос
-
+
+
+ +
+ Создать запрос
+
+
Инструкция: подачи заявки
diff --git a/src/pages/PartnerRequests/partnerRequests.scss b/src/pages/PartnerRequests/partnerRequests.scss
index c3d1e139..a6eca369 100644
--- a/src/pages/PartnerRequests/partnerRequests.scss
+++ b/src/pages/PartnerRequests/partnerRequests.scss
@@ -161,21 +161,19 @@
}
}
- a {
- background: #52b709;
+ button {
max-width: 188px;
- border-radius: 44px;
height: 52px;
- border: none;
- font-weight: 400;
font-size: 15px;
- line-height: 32px;
- color: #ffffff;
- display: flex;
- justify-content: center;
- align-items: center;
transition: 0.3s all ease;
+ a {
+ color: #ffffff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ }
+
span {
color: white;
font-weight: 700;
@@ -186,8 +184,6 @@
&:hover {
box-shadow: 6px 5px 20px rgb(87 98 80 / 21%);
transform: scale(1.02);
- text-decoration: none;
- color: #ffffff;
}
}
}
@@ -260,22 +256,23 @@
}
}
- a {
- background: #52b709;
+ button {
max-width: 174px;
- border-radius: 44px;
width: 100%;
height: 46px;
- border: none;
font-weight: 400;
font-size: 15px;
line-height: 32px;
- color: #ffffff;
- display: flex;
- justify-content: center;
- align-items: center;
transition: 0.3s all ease;
+ a {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: white;
+ width: 100%;
+ }
+
span {
color: white;
font-weight: 700;
@@ -286,8 +283,6 @@
&:hover {
box-shadow: 6px 5px 20px rgb(87 98 80 / 21%);
transform: scale(1.02);
- text-decoration: none;
- color: #ffffff;
}
}
}
diff --git a/src/pages/PartnerSettings/PartnerSettings.jsx b/src/pages/PartnerSettings/PartnerSettings.jsx
index 7e1cbe2e..ad255630 100644
--- a/src/pages/PartnerSettings/PartnerSettings.jsx
+++ b/src/pages/PartnerSettings/PartnerSettings.jsx
@@ -4,6 +4,7 @@ import { Footer } from "../../components/Footer/Footer";
import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader";
import { Navigation } from "../../components/Navigation/Navigation";
+import Button from "../../components/Common/Button/Button";
import kontur from "../../assets/images/logo/konturLogo.png";
import astral from "../../assets/images/logo/astralLogo.png";
@@ -39,8 +40,8 @@ export const PartnerSettings = () => {
- Отмена
- Сохранить
+ Отмена
+ Сохранить
Нажимая "Сохранить", вы соглашаетесь с Правилами обработки и
@@ -76,8 +77,8 @@ export const PartnerSettings = () => {
- Отмена
- Сохранить
+ Отмена
+ Сохранить
Нажимая "Сохранить", вы соглашаетесь с Правилами обработки и
diff --git a/src/pages/PartnerSettings/partnerSettings.scss b/src/pages/PartnerSettings/partnerSettings.scss
index 50186f38..34dd3523 100644
--- a/src/pages/PartnerSettings/partnerSettings.scss
+++ b/src/pages/PartnerSettings/partnerSettings.scss
@@ -72,7 +72,6 @@
&-cancel,
&-save {
- border-radius: 44px;
width: 151px;
height: 40px;
font-size: 14px;
@@ -83,12 +82,10 @@
color: #6f6f6f;
background: white;
border: 0.5px solid #8dc63f;
- }
- &-save {
- color: #ffffff;
- background: #52b709;
- border: none;
+ &:hover {
+ background-color: white;
+ }
}
}