From 5f4dc3a5f209d9089346a0ddebd25ffb24f3fe92 Mon Sep 17 00:00:00 2001 From: M1kola Date: Mon, 27 Mar 2023 16:03:24 +0300 Subject: [PATCH] partner catalog and no requests block --- src/App.js | 2 +- .../OutstaffingBlock/outstaffingBlock.scss | 20 ++- .../ProfileHeader/profileHeader.scss | 2 +- src/components/SliderWorkers/SliderWorkers.js | 34 ++-- src/images/cursorImg.png | Bin 0 -> 645 bytes .../AuthForDevelopers/AuthForDevelopers.js | 2 +- src/pages/AuthForPartners/AuthForPartners.js | 2 +- src/pages/Home/Home.js | 22 ++- src/pages/PartnerRequests/PartnerRequests.js | 79 ++++++--- .../PartnerRequests/partnerRequests.scss | 165 ++++++++++++++++++ src/pages/Tracker/tracker.scss | 4 +- 11 files changed, 278 insertions(+), 54 deletions(-) create mode 100644 src/images/cursorImg.png diff --git a/src/App.js b/src/App.js index 2bec9c98..3e807c38 100644 --- a/src/App.js +++ b/src/App.js @@ -62,7 +62,7 @@ const App = () => { }/> - }/> + }/> }/> }/> }/> diff --git a/src/components/OutstaffingBlock/outstaffingBlock.scss b/src/components/OutstaffingBlock/outstaffingBlock.scss index a30646d7..ad817dda 100644 --- a/src/components/OutstaffingBlock/outstaffingBlock.scss +++ b/src/components/OutstaffingBlock/outstaffingBlock.scss @@ -1,10 +1,26 @@ +.container { + max-width: 1160px !important; +} + +.catalog { + background: #F1F1F1; + height: 100%; + min-height: 100vh; + font-family: 'LabGrotesque', sans-serif; + padding-top: 24px; + + &__title { + font-weight: 700; + font-size: 22px; + line-height: 32px; + } +} + .outstaffing-block__selected .outstaffing-block__img { background-color: #52b70999; color: #f9f9f9; } .outstaffing-block { - - margin-top: 60px; display: flex; flex-direction: column; align-items: center; diff --git a/src/components/ProfileHeader/profileHeader.scss b/src/components/ProfileHeader/profileHeader.scss index 417669ec..4c218440 100644 --- a/src/components/ProfileHeader/profileHeader.scss +++ b/src/components/ProfileHeader/profileHeader.scss @@ -10,7 +10,7 @@ &__container { max-width: 1160px; - padding: 0 10px; + padding: 0 15px; margin: 0 auto; display: flex; justify-content: space-between; diff --git a/src/components/SliderWorkers/SliderWorkers.js b/src/components/SliderWorkers/SliderWorkers.js index 18b58b82..041aa55b 100644 --- a/src/components/SliderWorkers/SliderWorkers.js +++ b/src/components/SliderWorkers/SliderWorkers.js @@ -7,7 +7,7 @@ import "./sliderWorkers.scss"; import "slick-carousel/slick/slick.css"; import "slick-carousel/slick/slick-theme.css"; -export const SliderWorkers = ({}) => { +export const SliderWorkers = ({title, titleInfo, subTitle}) => { const [workers] = useState([ { avatar: mockWorker, @@ -46,11 +46,13 @@ export const SliderWorkers = ({}) => { return (
-
-

Свободные разработчики

-

для Вашей команды

-
- + {Boolean(title) ? +
+

{title}

+

{titleInfo}

+
+ : "" + } {workers.map((worker) => { return ( @@ -64,15 +66,17 @@ export const SliderWorkers = ({}) => { ); })} - -
-

Дополните свою команду опытными ИТ-специалистами

-

- Даём финансовые, юридические и кадровые гарантии, предоставляем SLA - и отвечаем за работу команды. Вам не нужно искать, оформлять или - увольнять сотрудника — все хлопоты мы берем на себя. -

-
+ {Boolean(subTitle) ? +
+

Дополните свою команду опытными ИТ-специалистами

+

+ Даём финансовые, юридические и кадровые гарантии, предоставляем SLA + и отвечаем за работу команды. Вам не нужно искать, оформлять или + увольнять сотрудника — все хлопоты мы берем на себя. +

+
+ : "" + }
); diff --git a/src/images/cursorImg.png b/src/images/cursorImg.png new file mode 100644 index 0000000000000000000000000000000000000000..51fa08321becb1108009d4d7c92f826ecaba7d12 GIT binary patch literal 645 zcmV;00($+4P)F@~-#nyf#T4H||N+JKOJm{`>v!@YS1!Gg`tOBpA?$T1Vf!9^500 zmDOi`1bD=`g#w!^tIzT5&o3WxhTyBH5+rJm*R9IiW*c&b(8Ww|y zcC6f>1oov%VAMDb5zvVW4^OIV&0=nlisSvy0V|7Pd=&}l`yw!r_K=l@F$^J4Fp2V{ z!tUk~thrE}9P!JN1TRqD+yQBoYs2e4U{&8h}Mk~;~{1R>D60!WbdY@t@A;h7+g zP)IBv_rLy_EnGyE2F0_bY*aUCg?Fi95Cw&3Sk@37c~uGS*m9bsX@!XJfBgEEs>~6Y zRK@f4PXc!IQ3xrgX3fX~g{Q&g<0nr|mSS@snd%X@$mY?3w{iCO_vz%`%vsZ_qTz+Z f { return (
- +
{ return (
- +
diff --git a/src/pages/Home/Home.js b/src/pages/Home/Home.js index 905b5543..beb60514 100644 --- a/src/pages/Home/Home.js +++ b/src/pages/Home/Home.js @@ -7,7 +7,8 @@ import {Footer} from '../../components/Footer/Footer' import {profiles, tags} from '../../redux/outstaffingSlice' -import {Header} from "../../components/Header/Header"; +import {ProfileHeader} from "../../components/ProfileHeader/ProfileHeader"; +import {ProfileBreadcrumbs} from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs" import {apiRequest} from "../../api/request"; import {Navigate} from "react-router-dom"; @@ -56,11 +57,20 @@ const Home = () => { return ( <> -
-
- - -