From 85accc31111802e0b44e5932bd140565c99e7dcc Mon Sep 17 00:00:00 2001 From: MaxOvs19 Date: Fri, 26 May 2023 19:59:42 +0300 Subject: [PATCH] Added ui btn and fixed Modals --- .../CandidateSidebar/CandidateSidebar.jsx | 6 +- src/components/Common/Button/Button.jsx | 16 +++ .../Common/Button/button.module.scss | 18 ++++ .../SliderWorkers/SliderWorkers.jsx | 8 +- .../SliderWorkers/sliderWorkers.scss | 14 +-- .../UI/FreeDevelopers/FreeDevelopers.jsx | 17 ++- .../UI/FreeDevelopers/freeDevelopers.scss | 18 +--- .../UI/ModalAspirant/ModalAspirant.jsx | 102 ++++++++++++++++++ .../modalAspirant.scss} | 48 ++++----- src/components/UI/ModalAspt/ModalAspt.jsx | 102 ------------------ src/components/UI/ModalLayout/ModalLayout.jsx | 13 ++- .../UI/ModalLayout/modalLayout.scss | 29 +++++ ...PartnerRequests.js => PartnerRequests.jsx} | 24 +++-- .../PartnerRequests/partnerRequests.scss | 39 +++---- src/pages/PartnerSettings/PartnerSettings.jsx | 9 +- .../PartnerSettings/partnerSettings.scss | 9 +- 16 files changed, 261 insertions(+), 211 deletions(-) create mode 100644 src/components/Common/Button/Button.jsx create mode 100644 src/components/Common/Button/button.module.scss create mode 100644 src/components/UI/ModalAspirant/ModalAspirant.jsx rename src/components/UI/{ModalAspt/modalAspt.scss => ModalAspirant/modalAspirant.scss} (90%) delete mode 100644 src/components/UI/ModalAspt/ModalAspt.jsx create mode 100644 src/components/UI/ModalLayout/modalLayout.scss rename src/pages/PartnerRequests/{PartnerRequests.js => PartnerRequests.jsx} (93%) 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 = ({}) => {
-
+

Для просмотра полного резюме разработчика авторизуйтесь

- - Войти - +
-