From 44af2ee09d3b8dbfad25d49a0034f1868673e5ec Mon Sep 17 00:00:00 2001 From: MaxOvs19 Date: Thu, 16 Mar 2023 21:41:01 +0300 Subject: [PATCH 1/6] Added page settings --- src/App.js | 129 +++++++++--------- ...ersonalBackEnd.png => PersonalBackEnd.png} | Bin src/pages/PartnerSettings/PartnerSettings.js | 68 +++++++++ .../PartnerSettings/partnerSettings.scss | 74 ++++++++++ src/pages/Settings/Settings.js | 11 -- 5 files changed, 206 insertions(+), 76 deletions(-) rename src/images/{personalBackEnd.png => PersonalBackEnd.png} (100%) create mode 100644 src/pages/PartnerSettings/PartnerSettings.js create mode 100644 src/pages/PartnerSettings/partnerSettings.scss delete mode 100644 src/pages/Settings/Settings.js diff --git a/src/App.js b/src/App.js index ba98af3c..30210324 100644 --- a/src/App.js +++ b/src/App.js @@ -1,6 +1,10 @@ -import React from 'react' -import {BrowserRouter as Router, Route, Routes, Navigate} from 'react-router-dom'; - +import React from "react"; +import { + BrowserRouter as Router, + Route, + Routes, + Navigate, +} from "react-router-dom"; import AuthForPartners from "./pages/AuthForPartners/AuthForPartners"; import AuthForDevelopers from "./pages/AuthForDevelopers/AuthForDevelopers"; @@ -8,76 +12,71 @@ import Home from "./pages/Home/Home"; import Candidate from "./components/Candidate/Candidate"; import Calendar from "./components/Calendar/Calendar"; import ReportForm from "./components/ReportForm/ReportForm"; -import {ProfileCalendar} from "./components/ProfileCalendar/ProfileCalendar"; -import FormPage from './pages/FormPage/FormPage.js' -import SingleReportPage from './pages/SingleReportPage/SingleReportPage' -import {QuizPage} from './pages/quiz/QuizPage' -import {InterjacentPage} from './pages/quiz/InterjacentPage' -import {QuizTestPage} from './pages/quiz/QuizTestPage' -import {InstructionPage} from './pages/quiz/InstructionPage' -import {ResultPage} from './pages/quiz/ResultPage' -import {Profile} from './pages/Profile/Profile.js' -import {Summary} from './pages/Summary/Summary' -import {ViewReport} from './pages/ViewReport/ViewReport' -import {Tracker} from './pages/Tracker/Tracker' -import {Payouts} from './pages/Payouts/Payouts' -import {Settings} from './pages/Settings/Settings' -import {PartnerRequests} from './pages/PartnerRequests/PartnerRequests' -import {PartnerAddRequest} from './pages/PartnerAddRequest/PartnerAddRequest' -import {PartnerBid} from './pages/PartnerBid/PartnerBid' -import {PartnerPersonalInfo} from "./pages/PartnerPersonalInfo/PartnerPersonalInfo"; - -import './fonts/stylesheet.css' -import 'bootstrap/dist/css/bootstrap.min.css' - - +import { ProfileCalendar } from "./components/ProfileCalendar/ProfileCalendar"; +import FormPage from "./pages/FormPage/FormPage.js"; +import SingleReportPage from "./pages/SingleReportPage/SingleReportPage"; +import { QuizPage } from "./pages/quiz/QuizPage"; +import { InterjacentPage } from "./pages/quiz/InterjacentPage"; +import { QuizTestPage } from "./pages/quiz/QuizTestPage"; +import { InstructionPage } from "./pages/quiz/InstructionPage"; +import { ResultPage } from "./pages/quiz/ResultPage"; +import { Profile } from "./pages/Profile/Profile.js"; +import { Summary } from "./pages/Summary/Summary"; +import { ViewReport } from "./pages/ViewReport/ViewReport"; +import { Tracker } from "./pages/Tracker/Tracker"; +import { Payouts } from "./pages/Payouts/Payouts"; +import { PartnerSettings } from "./pages/PartnerSettings/PartnerSettings"; +import { PartnerRequests } from "./pages/PartnerRequests/PartnerRequests"; +import { PartnerAddRequest } from "./pages/PartnerAddRequest/PartnerAddRequest"; +import { PartnerBid } from "./pages/PartnerBid/PartnerBid"; +import { PartnerPersonalInfo } from "./pages/PartnerPersonalInfo/PartnerPersonalInfo"; +import "./fonts/stylesheet.css"; +import "bootstrap/dist/css/bootstrap.min.css"; const App = () => { return ( - <> - + <> + + + } /> + } /> - + } /> + } /> + } /> - }/> - }/> + } /> + } /> - }/> - }/> - }/> + + } /> + } /> + } /> + } /> + } /> + - }/> - }/> + + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + } /> + - - }/> - }/> - }/> - }/> - }/> - - - - }/> - }/> - }/> - }/> - }/> - }/> - }/> - }/> - }/> - }/> - }/> - }/> - - - }/> - - - - ) + } /> + + + + ); }; -export default App +export default App; diff --git a/src/images/personalBackEnd.png b/src/images/PersonalBackEnd.png similarity index 100% rename from src/images/personalBackEnd.png rename to src/images/PersonalBackEnd.png diff --git a/src/pages/PartnerSettings/PartnerSettings.js b/src/pages/PartnerSettings/PartnerSettings.js new file mode 100644 index 00000000..f26c85cb --- /dev/null +++ b/src/pages/PartnerSettings/PartnerSettings.js @@ -0,0 +1,68 @@ +import React from "react"; +import { Footer } from "../../components/Footer/Footer"; + +import { ProfileBreadcrumbs } from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs"; +import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; + +import "./partnerSettings.scss"; + +export const PartnerSettings = () => { + return ( +
+ +
+ +
+

Настройки акаунта

+
+
+

Вход в систему

+

Изменение логина

+
+ +
+ +

Изменение пароля

+
+ +
+ +
+ + +
+ + Нажимая "Сохранить", вы соглашаетесь с Правилами обработки и + использования персональных данных + +
+
+

Документы и отчеты

+

Изменить провадера ЭДО

+
+ +
+ +
+ + +
+ + Нажимая "Сохранить", вы соглашаетесь с Правилами обработки и + использования персональных данных + +
+
+
+
+
+
+ ); +}; + +export default PartnerSettings; diff --git a/src/pages/PartnerSettings/partnerSettings.scss b/src/pages/PartnerSettings/partnerSettings.scss new file mode 100644 index 00000000..658d463a --- /dev/null +++ b/src/pages/PartnerSettings/partnerSettings.scss @@ -0,0 +1,74 @@ +.settings { + background: #f1f1f1; + + &__page { + max-width: 1160px !important; + margin-top: 23px; + } + + &__title { + color: #5b6871; + font-size: 20px; + line-height: 24px; + } + + &__lable { + &-first, + &-second { + font-size: 15px; + line-height: 18px; + color: #000000; + } + + &-first { + margin: 39px 0 10px 0; + } + &-second { + margin: 31px 0 10px 0; + } + } + + &__input { + background: #eff2f7; + border-radius: 8px; + width: 373px; + height: 35px; + border: none; + + input { + font-size: 15px; + background: #eff2f7; + height: 100%; + margin-left: 15px; + width: 85%; + border: none; + outline: none; + } + } +} + +.partner-settings { + margin-bottom: 110px; + + &__body { + display: flex; + flex-direction: row; + justify-content: space-between; + margin-top: 27px; + } + + &__login { + } + + &__report { + } + + &__report, + &__login { + width: 500px; + height: 435px; + background: #ffffff; + border-radius: 12px; + padding: 30px 60px; + } +} diff --git a/src/pages/Settings/Settings.js b/src/pages/Settings/Settings.js deleted file mode 100644 index 32f53ae3..00000000 --- a/src/pages/Settings/Settings.js +++ /dev/null @@ -1,11 +0,0 @@ -import React from 'react'; - -import {ProfileHeader} from "../../components/ProfileHeader/ProfileHeader"; - -export const Settings = () => { - return ( -
- -
- ) -}; From 3a65009ec91141f54ad0c1b2d16cc3bbc081e39e Mon Sep 17 00:00:00 2001 From: MaxOvs19 Date: Fri, 17 Mar 2023 20:02:53 +0300 Subject: [PATCH 2/6] Finished this page --- src/images/astralLogo.png | Bin 0 -> 3092 bytes src/images/konturLogo.png | Bin 0 -> 2300 bytes src/pages/PartnerSettings/PartnerSettings.js | 40 ++++- .../PartnerSettings/partnerSettings.scss | 155 +++++++++++++++++- 4 files changed, 181 insertions(+), 14 deletions(-) create mode 100644 src/images/astralLogo.png create mode 100644 src/images/konturLogo.png diff --git a/src/images/astralLogo.png b/src/images/astralLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..6d9cecc3c6265a2e341efa022f105221e4664c73 GIT binary patch literal 3092 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 WSwrvX)&AiC0000 { @@ -22,6 +24,7 @@ export const PartnerSettings = () => {

Вход в систему

+

Изменение логина

@@ -32,11 +35,11 @@ export const PartnerSettings = () => {
-
- - +
+ +
- + Нажимая "Сохранить", вы соглашаетесь с Правилами обработки и использования персональных данных @@ -44,15 +47,36 @@ export const PartnerSettings = () => {

Документы и отчеты

Изменить провадера ЭДО

+ +
+
+ +
+
+ +
+
+ +

+ Изменение названия компании +

-
- - +
+ +
- + Нажимая "Сохранить", вы соглашаетесь с Правилами обработки и использования персональных данных diff --git a/src/pages/PartnerSettings/partnerSettings.scss b/src/pages/PartnerSettings/partnerSettings.scss index 658d463a..d55066e3 100644 --- a/src/pages/PartnerSettings/partnerSettings.scss +++ b/src/pages/PartnerSettings/partnerSettings.scss @@ -45,6 +45,69 @@ outline: none; } } + + &__agreement { + font-size: 12px; + line-height: 18px; + color: #000000; + font-weight: 300; + } + + &__buttons { + width: 87%; + display: flex; + flex-direction: row; + justify-content: space-between; + margin: 36px 0 30px 0; + + &-cancel, + &-save { + border-radius: 44px; + width: 151px; + height: 40px; + font-size: 14px; + line-height: 32px; + } + + &-cancel { + color: #6f6f6f; + background: white; + border: 0.5px solid #8dc63f; + } + + &-save { + color: #ffffff; + background: #52b709; + border: none; + } + } + + @media (max-width: 570px) { + &__input { + width: 95%; + } + + &__buttons { + margin: 15px 0 14px 0; + width: 100%; + flex-direction: column-reverse; + align-items: center; + + &-save { + margin-bottom: 15px; + } + } + } +} + +.checkbox { + &__first { + margin: 0px 0 0 20px; + } + + &__second { + margin: 0px 20px 0 0; + } } .partner-settings { @@ -57,12 +120,6 @@ margin-top: 27px; } - &__login { - } - - &__report { - } - &__report, &__login { width: 500px; @@ -71,4 +128,90 @@ border-radius: 12px; padding: 30px 60px; } + + &__logo { + display: flex; + align-items: center; + justify-content: space-between; + + div { + display: flex; + align-items: center; + + label input { + display: none; + } + + label span { + cursor: pointer; + height: 24px; + width: 24px; + border: none; + display: inline-block; + position: relative; + background: #eff1f3; + border-radius: 8px; + padding: 3px; + } + + [type="checkbox"]:checked + span:before { + content: "\2714"; + position: absolute; + top: -5px; + left: 2px; + font-size: 23px; + color: #1c1243; + font-weight: 300; + } + } + } + + &__label { + &-first, + &-second { + display: flex; + align-items: center; + } + + &-second { + flex-direction: row-reverse; + } + } + + @media (max-width: 1200px) { + margin-bottom: 15px; + + &__body { + flex-direction: column; + } + &__report { + margin-top: 50px; + } + } + + @media (max-width: 570px) { + &__report, + &__login { + width: 100%; + height: 100%; + padding: 20px 30px; + } + + &__logo { + flex-direction: column; + align-items: flex-start; + } + + &__label { + &-second, + &-first { + flex-direction: row; + } + } + .checkbox { + &__second { + margin: 0px 0 0 20px; + } + } + } } From 2bc8457af7ceb8a875b516cc2d478afb04327b93 Mon Sep 17 00:00:00 2001 From: MaxOvs19 Date: Fri, 17 Mar 2023 21:50:11 +0300 Subject: [PATCH 3/6] Added modal error --- src/components/UI/ModalErrorLogin/ModalErrorLogin.js | 9 +++++++++ src/components/UI/ModalErrorLogin/modalErrorLogin.scss | 0 2 files changed, 9 insertions(+) create mode 100644 src/components/UI/ModalErrorLogin/ModalErrorLogin.js create mode 100644 src/components/UI/ModalErrorLogin/modalErrorLogin.scss diff --git a/src/components/UI/ModalErrorLogin/ModalErrorLogin.js b/src/components/UI/ModalErrorLogin/ModalErrorLogin.js new file mode 100644 index 00000000..65a18cbd --- /dev/null +++ b/src/components/UI/ModalErrorLogin/ModalErrorLogin.js @@ -0,0 +1,9 @@ +import React from "react"; + +import "./modalErrorLogin.scss"; + +export const ModalErrorLogin = ({}) => { + return
; +}; + +export default ModalErrorLogin; diff --git a/src/components/UI/ModalErrorLogin/modalErrorLogin.scss b/src/components/UI/ModalErrorLogin/modalErrorLogin.scss new file mode 100644 index 00000000..e69de29b From 7ca123900249e894a1685eb7fb3d558ba04f8ed4 Mon Sep 17 00:00:00 2001 From: MaxOvs19 Date: Mon, 20 Mar 2023 13:05:27 +0300 Subject: [PATCH 4/6] Finish update modal error --- .../UI/ModalErrorLogin/ModalErrorLogin.js | 21 ++++- .../UI/ModalErrorLogin/modalErrorLogin.scss | 77 +++++++++++++++++++ 2 files changed, 96 insertions(+), 2 deletions(-) diff --git a/src/components/UI/ModalErrorLogin/ModalErrorLogin.js b/src/components/UI/ModalErrorLogin/ModalErrorLogin.js index 65a18cbd..37aa0780 100644 --- a/src/components/UI/ModalErrorLogin/ModalErrorLogin.js +++ b/src/components/UI/ModalErrorLogin/ModalErrorLogin.js @@ -2,8 +2,25 @@ import React from "react"; import "./modalErrorLogin.scss"; -export const ModalErrorLogin = ({}) => { - return
; +export const ModalErrorLogin = ({ active, setActive }) => { + return ( +
setActive(false)} + > +
e.stopPropagation()} + > +

Ошибка входа

+

Введены некоректные данные для входа

+ + setActive(false)}> +
+
+ ); }; export default ModalErrorLogin; diff --git a/src/components/UI/ModalErrorLogin/modalErrorLogin.scss b/src/components/UI/ModalErrorLogin/modalErrorLogin.scss index e69de29b..83bae3a1 100644 --- a/src/components/UI/ModalErrorLogin/modalErrorLogin.scss +++ b/src/components/UI/ModalErrorLogin/modalErrorLogin.scss @@ -0,0 +1,77 @@ +.modal-error { + 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; + padding: 54px 76px; + background: linear-gradient(180deg, #ffffff 0%, #ebebeb 100%); + border-radius: 40px; + display: flex; + flex-direction: column; + align-items: center; + + h2 { + font-size: 24px; + line-height: 29px; + color: #263238; + margin-bottom: 16px; + } + + p { + font-size: 12px; + line-height: 14px; + width: 176px; + text-align: center; + font-weight: 300; + margin-bottom: 30px; + } + + &-button { + color: white; + font-size: 14px; + line-height: 32px; + width: 198px; + height: 50px; + background: #52b709; + border-radius: 44px; + border: none; + } + + span { + cursor: pointer; + position: absolute; + top: 30px; + right: 36px; + + &:before, + &:after { + content: ""; + position: absolute; + width: 16px; + height: 2px; + background: #263238; + } + + &:before { + transform: rotate(45deg); + } + &:after { + transform: rotate(-45deg); + } + } + } +} + +.modal-error.active { + transform: scale(1); +} From 653af43f52c8b6d00287f699281eaf17e1c32e2c Mon Sep 17 00:00:00 2001 From: M1kola Date: Mon, 20 Mar 2023 14:00:10 +0300 Subject: [PATCH 5/6] partner treaties --- src/App.js | 2 + src/components/ProfileHeader/ProfileHeader.js | 2 +- .../PartnerPersonalInfo.js | 8 +- .../parthnerPersonalInfo.scss | 2 +- .../PartnerTreaties/Images/actTreaties.png | Bin 0 -> 458 bytes .../PartnerTreaties/Images/arrowCheck.png | Bin 0 -> 473 bytes .../PartnerTreaties/Images/arrowDown.png | Bin 0 -> 248 bytes .../PartnerTreaties/Images/avatarMok.png | Bin 0 -> 3358 bytes .../PartnerTreaties/Images/checkTreaties.png | Bin 0 -> 407 bytes src/pages/PartnerTreaties/Images/lock.svg | 4 + src/pages/PartnerTreaties/Images/lockDone.svg | 4 + .../PartnerTreaties/Images/logoAstral.png | Bin 0 -> 3184 bytes .../PartnerTreaties/Images/mainTreaties.png | Bin 0 -> 505 bytes src/pages/PartnerTreaties/PartnerTreaties.js | 356 ++++++++++++++++ .../PartnerTreaties/partnerTreaties.scss | 393 ++++++++++++++++++ src/pages/Profile/Profile.js | 2 +- src/pages/Summary/summary.scss | 1 - 17 files changed, 766 insertions(+), 8 deletions(-) create mode 100644 src/pages/PartnerTreaties/Images/actTreaties.png create mode 100644 src/pages/PartnerTreaties/Images/arrowCheck.png create mode 100644 src/pages/PartnerTreaties/Images/arrowDown.png create mode 100644 src/pages/PartnerTreaties/Images/avatarMok.png create mode 100644 src/pages/PartnerTreaties/Images/checkTreaties.png create mode 100644 src/pages/PartnerTreaties/Images/lock.svg create mode 100644 src/pages/PartnerTreaties/Images/lockDone.svg create mode 100644 src/pages/PartnerTreaties/Images/logoAstral.png create mode 100644 src/pages/PartnerTreaties/Images/mainTreaties.png create mode 100644 src/pages/PartnerTreaties/PartnerTreaties.js create mode 100644 src/pages/PartnerTreaties/partnerTreaties.scss diff --git a/src/App.js b/src/App.js index ba98af3c..92c42c04 100644 --- a/src/App.js +++ b/src/App.js @@ -26,6 +26,7 @@ import {PartnerRequests} from './pages/PartnerRequests/PartnerRequests' import {PartnerAddRequest} from './pages/PartnerAddRequest/PartnerAddRequest' import {PartnerBid} from './pages/PartnerBid/PartnerBid' import {PartnerPersonalInfo} from "./pages/PartnerPersonalInfo/PartnerPersonalInfo"; +import {PartnerTreaties} from "./pages/PartnerTreaties/PartnerTreaties"; import './fonts/stylesheet.css' import 'bootstrap/dist/css/bootstrap.min.css' @@ -71,6 +72,7 @@ const App = () => { }/> }/> }/> + }/> }/> diff --git a/src/components/ProfileHeader/ProfileHeader.js b/src/components/ProfileHeader/ProfileHeader.js index 200cb0fd..5be4cf30 100644 --- a/src/components/ProfileHeader/ProfileHeader.js +++ b/src/components/ProfileHeader/ProfileHeader.js @@ -59,7 +59,7 @@ export const ProfileHeader = () => { name: 'Трекер' }, { - path: '/payouts', + path: '/treaties', name: 'Договора' }, { diff --git a/src/pages/PartnerPersonalInfo/PartnerPersonalInfo.js b/src/pages/PartnerPersonalInfo/PartnerPersonalInfo.js index 70b43150..55867f2d 100644 --- a/src/pages/PartnerPersonalInfo/PartnerPersonalInfo.js +++ b/src/pages/PartnerPersonalInfo/PartnerPersonalInfo.js @@ -91,7 +91,7 @@ export const PartnerPersonalInfo = () => { }, ]) return ( -
+
{ {name: 'Данные моего персонала', link: '/profile/employees'}, ]} /> -

Данные персонала

-
+

Данные персонала

+
{personalInfoItems.map((item, index) => { - return + return
{item.title}

{item.title}

diff --git a/src/pages/PartnerPersonalInfo/parthnerPersonalInfo.scss b/src/pages/PartnerPersonalInfo/parthnerPersonalInfo.scss index 07aa52c3..3caf5003 100644 --- a/src/pages/PartnerPersonalInfo/parthnerPersonalInfo.scss +++ b/src/pages/PartnerPersonalInfo/parthnerPersonalInfo.scss @@ -1,4 +1,4 @@ -.infoPersonal { +.personalInfo { background: #F1F1F1; height: 100%; min-height: 100vh; diff --git a/src/pages/PartnerTreaties/Images/actTreaties.png b/src/pages/PartnerTreaties/Images/actTreaties.png new file mode 100644 index 0000000000000000000000000000000000000000..3bb6681fa779fba1a63e8fdcb2a958c89250f805 GIT binary patch literal 458 zcmV;*0X6=KP)Eoy02u6A+jFN`mnHh?8$%OFI#!h^Vm@iph98B{(p9uDQD z2=qs+eLu{Z5+?MeS~tzWhteqGbT*r0;?2PGhc-oMI+4lyC9SV@R>ZW{*5qP#C(Vpb zkEYq52j0kNlnUwGZqqE3W8z50$BP3P7>x$+>z=6ywqnI9cG{+Bq;lS^#w8{>uIoiX zanjW}MSQgm_^B5GBvJ{O6Z#GI+DB(aKPvS<0Se!o00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<)$KskYRX~P2chEj0j&YnPTAUii;MGgQ9fhBMPjvz!w3og3Jv5_VcR5ks4;k^z@Ao54U%iR#U zwwkVgeRN0Orlv{*dVzJpe?vp*x(A{-5F7jgOnaSA`wVz>XXZiL`nP!Bn65j+7Vjf7 zyJ_9*&ppQ6JU#2dxfHwgR;3MxE1|-+;u}9Z2MrKMjR*<;i2!}i)>~E$ zM6Pg0c;b%moH6WE96zcM(Sg5Ly&ruCE{NiwxE*0|Vc%DJ%5iR&5n?%6-RogL*;}F@ zD9h(uPKDuoH%#iu7n9EduH)3wMJ_*Z3d-w_8XCYgpXA@`O=}K9h!ge$HM`b`kL`xy P00000NkvXXu0mjf#yrTg literal 0 HcmV?d00001 diff --git a/src/pages/PartnerTreaties/Images/arrowDown.png b/src/pages/PartnerTreaties/Images/arrowDown.png new file mode 100644 index 0000000000000000000000000000000000000000..84e0ecad27d7eaf720727e3677c331a5c97e4e7e GIT binary patch literal 248 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 BqjvxR literal 0 HcmV?d00001 diff --git a/src/pages/PartnerTreaties/Images/lock.svg b/src/pages/PartnerTreaties/Images/lock.svg new file mode 100644 index 00000000..5e42c042 --- /dev/null +++ b/src/pages/PartnerTreaties/Images/lock.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/pages/PartnerTreaties/Images/lockDone.svg b/src/pages/PartnerTreaties/Images/lockDone.svg new file mode 100644 index 00000000..a4bb9449 --- /dev/null +++ b/src/pages/PartnerTreaties/Images/lockDone.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/pages/PartnerTreaties/Images/logoAstral.png b/src/pages/PartnerTreaties/Images/logoAstral.png new file mode 100644 index 0000000000000000000000000000000000000000..256f106e4f9862b0b622d7b265ce43f687d89f52 GIT binary patch literal 3184 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 literal 0 HcmV?d00001 diff --git a/src/pages/PartnerTreaties/PartnerTreaties.js b/src/pages/PartnerTreaties/PartnerTreaties.js new file mode 100644 index 00000000..df732be2 --- /dev/null +++ b/src/pages/PartnerTreaties/PartnerTreaties.js @@ -0,0 +1,356 @@ +import React, {useState} from 'react'; + +import {ProfileHeader} from "../../components/ProfileHeader/ProfileHeader"; +import {ProfileBreadcrumbs} from "../../components/ProfileBreadcrumbs/ProfileBreadcrumbs" +import {Footer} from "../../components/Footer/Footer"; + +import mainTabImg from "./Images/mainTreaties.png" +import actImg from "./Images/actTreaties.png" +import checkImg from "./Images/checkTreaties.png" +import arrowDown from "./Images/arrowDown.png" +import logoAstral from "./Images/logoAstral.png" +import arrowItem from "./Images/arrowCheck.png" +import lock from "./Images/lock.svg" +import lockDone from "./Images/lockDone.svg" +import avatarMok from "./Images/avatarMok.png" + +import './partnerTreaties.scss' + +export const PartnerTreaties = () => { + const [toggleTab, setToggleTab] = useState(1); + + const toggleTabs = (index) => { + setToggleTab(index); + }; + return( +
+ +
+ +

Договора и отчетность

+
+
+
toggleTabs(1)} + > + img +

Основные

+
+
toggleTabs(2)} + > + img +

Акты

+
+
toggleTabs(3)} + > + img +

Счета

+
+
+
+
+
+

Реквизиты компании

+
+ arrow +
+
+
+
+

Договор № К-1-2022
от 01.11.22

+
+

Провайдер документооборота: Астрал

+
+ arrow +
+
+ logo +
+
+
+

Бойко Кирилл Сергеевич, подписал и отправил документ

+

ООО "Зоря", документ получен

+
+
+
+ lock +

01/01/2021

+
+ to +
+ lockDone +

01/02/2021

+
+
+
+
+
+
+

Доп. соглашение
№12 от 10.05.22

+
+
+ arrow +

На выполнение работ данного сотрудника

+
+
+ avatar +
+

Макаренко Дмитрий

+ Дизайнер +
+
+
+
+
+

Доп. соглашение
№12 от 10.05.22

+
+
+ arrow +

На выполнение работ данного сотрудника

+
+
+ avatar +
+

Макаренко Дмитрий

+ Дизайнер +
+
+
+
+
+
+
+
+
+

Провайдер документооборота: Астрал

+ astral +
+
+

Реквизиты компании

+
+ arrow +
+
+
+
+
+

Акт №4 от 10.03.23

+
+
+
+ avatar +
+

+ Макаренко Дмитрий +

+ + Дизайнер + +
+
+ arrow +

к Доп. соглашению № 1

+
+
+ arrow +
+
+
+
+
+

214 500,00 руб

+

147 раб.часов ( 1200руб / час )

+
+
+

Бойко Кирилл Сергеевич, подписал и отправил документ

+

ООО "Зоря", документ получен

+
+
+
+ lock +

01/01/2021

+
+ to +
+ lockDone +

01/02/2021

+
+
+
+
+
+
+

Акт №4 от 10.03.23

+
+
+
+ avatar +
+

+ Макаренко Дмитрий +

+ + Дизайнер + +
+
+ arrow +

к Доп. соглашению № 1

+
+
+ arrow +
+
+
+
+
+

214 500,00 руб

+

147 раб.часов ( 1200руб / час )

+
+
+

Бойко Кирилл Сергеевич, подписал и отправил документ

+

ООО "Зоря", документ получен

+
+
+
+ lock +

01/01/2021

+
+ to +
+ lockDone +

01/02/2021

+
+
+
+
+
+
+
+
+

Провайдер документооборота: Астрал

+ astral +
+
+

Реквизиты компании

+
+ arrow +
+
+
+
+
+

Акт №4 от 10.03.23

+
+
+
+ avatar +
+

+ Макаренко Дмитрий +

+ + Дизайнер + +
+
+ arrow +

к Доп. соглашению № 1

+
+
+ arrow +
+
+
+
+
+

214 500,00 руб

+

147 раб.часов ( 1200руб / час )

+
+
+

Бойко Кирилл Сергеевич, подписал и отправил документ

+

ООО "Зоря", документ получен

+
+
+
+ lock +

01/01/2021

+
+ to +
+ lockDone +

01/02/2021

+
+
+
+
+
+
+

Акт №4 от 10.03.23

+
+
+
+ avatar +
+

+ Макаренко Дмитрий +

+ + Дизайнер + +
+
+ arrow +

к Доп. соглашению № 1

+
+
+ arrow +
+
+
+
+
+

214 500,00 руб

+

147 раб.часов ( 1200руб / час )

+
+
+

Бойко Кирилл Сергеевич, подписал и отправил документ

+

ООО "Зоря", документ получен

+
+
+
+ lock +

01/01/2021

+
+ to +
+ lockDone +

01/02/2021

+
+
+
+
+
+
+
+
+
+
+ ) +} diff --git a/src/pages/PartnerTreaties/partnerTreaties.scss b/src/pages/PartnerTreaties/partnerTreaties.scss new file mode 100644 index 00000000..4c203582 --- /dev/null +++ b/src/pages/PartnerTreaties/partnerTreaties.scss @@ -0,0 +1,393 @@ +.treaties { + background: #F1F1F1; + height: 100%; + min-height: 100vh; + font-family: 'LabGrotesque', sans-serif; + + &__title { + font-weight: 700; + font-size: 22px; + line-height: 32px; + color: #000000; + } + + &__tabs { + display: flex; + margin-top: 30px; + + &__head { + width: 150px; + + .tab { + display: flex; + padding: 12px 40px 15px 19px; + cursor: pointer; + align-items: center; + + p { + margin: 0 0 0 15px; + font-weight: 400; + font-size: 16px; + line-height: 32px; + color: #000000; + } + } + + .active-tab { + background: white; + border-radius: 15px 0 0 15px; + } + } + + &__content { + width: calc(100% - 150px); + + &__main { + background: #FFFFFF; + border-radius: 0 12px 12px 12px; + flex-wrap: wrap; + column-gap: 34px; + display: none; + align-items: center; + + .main__head { + display: flex; + width: 100%; + justify-content: flex-end; + padding: 14px 35px; + align-items: center; + + p { + font-weight: 500; + font-size: 15px; + line-height: 22px; + color: #000000; + margin-bottom: 0; + margin-right: 25px; + } + + .img { + width: 32px; + height: 32px; + background: #E2E5CF; + border-radius: 50px; + display: flex; + align-items: center; + justify-content: center; + + img { + height: 12px; + width: 7px; + } + } + } + + .acts { + justify-content: space-between; + align-items: center; + + .provider { + display: flex; + + img { + width: 78px; + height: 21px; + } + } + + .info { + display: flex; + align-items: center; + } + } + + .notPaid { + background: #EBEBEB; + } + + .persons { + justify-content: space-between; + } + + .item { + padding: 29px 30px; + width: 100%; + display: flex; + border-radius: 0px 0px 12px 12px; + + &__info { + display: flex; + flex-direction: column; + row-gap: 16px; + + p { + margin-bottom: 0; + } + + .number { + font-weight: 500; + font-size: 18px; + line-height: 22px; + color: #000000; + } + + .astral { + display: flex; + + .img { + width: 48px; + height: 48px; + background: #CFE0B8; + display: flex; + justify-content: center; + align-items: center; + border-radius: 50px; + } + + p { + font-weight: 400; + font-size: 12px; + line-height: 20px; + color: #000000; + max-width: 180px; + margin-right: 18px; + } + } + + p { + font-weight: 300; + font-size: 10px; + line-height: 17px; + color: #000000; + } + + .logo { + max-width: 125px; + height: 33px; + } + } + + &__person { + display: flex; + + &__date { + margin-right: 25px; + + .arrow { + margin: 14px 0; + height: 14px; + width: 125px; + } + } + + &__info { + display: flex; + + img { + width: 56px; + height: 56px; + } + + &__name { + display: flex; + flex-direction: column; + margin-left: 20px; + + p { + max-width: 95px; + font-weight: 500; + font-size: 15px; + line-height: 22px; + color: #000000; + } + + span { + font-weight: 300; + font-size: 10px; + line-height: 17px; + color: #000000; + } + } + } + + &__act { + display: flex; + align-items: center; + + .arrow { + background: #CFE0B8; + border-radius: 50px; + display: flex; + align-items: center; + justify-content: center; + min-width: 48px; + height: 48px; + margin-left: 34px; + } + + &__info { + display: flex; + flex-direction: column; + + .personArrow { + margin-top: 20px; + max-width: 125px; + } + + .moreInfo { + font-weight: 300; + font-size: 10px; + line-height: 17px; + margin-top: 14px; + } + } + + &__avatar { + display: flex; + align-items: center; + + img { + width: 42px; + height: 42px; + } + } + + &__name { + margin-left: 15px; + p { + font-weight: 500; + font-size: 14px; + line-height: 18px; + max-width: 100px; + } + + span { + display: flex; + margin-top: 13px; + font-weight: 300; + font-size: 10px; + line-height: 17px; + } + } + } + } + + &__more { + display: flex; + margin-left: 130px; + flex-direction: column; + max-width: 450px; + justify-content: end; + + p { + margin-bottom: 0; + } + + &__price { + display: flex; + } + + &__names { + display: flex; + margin-bottom: 40px; + + p { + font-weight: 500; + font-size: 15px; + line-height: 20px; + color: #000000; + max-width: 200px; + + &:nth-child(2) { + margin-left: 70px; + max-width: 170px; + } + } + } + + &__date { + display: flex; + align-items: center; + column-gap: 13px; + + p { + font-weight: 500; + font-size: 14px; + line-height: 20px; + margin-left: 10px; + } + + &__from { + display: flex; + + p { + color: #A29EB6; + } + } + + &__to { + display: flex; + + p { + color: #406128; + } + } + } + + &__price { + display: flex; + justify-content: space-between; + margin-bottom: 35px; + + p { + font-weight: 500; + font-size: 20px; + line-height: 22px; + color: #000000; + } + + .total { + color: #1458DD; + } + } + } + + .price { + justify-content: space-between; + width: 100%; + max-width: none; + + .item__more__names { + justify-content: space-between; + p { + margin-left: 0; + } + } + } + } + } + + .active__content { + display: flex; + } + + .second { + border-radius: 12px; + } + } + } + + + .container { + max-width: 1160px; + margin-top: 23px; + + @media (max-width: 570px) { + margin-top: 0; + } + } + + footer { + margin-top: 70px; + } +} diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 016aee8c..8bcbb70e 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -77,7 +77,7 @@ export const Profile = () => { description: 'Контроль времени и
выполнение задач' }, { - path: '', + path: '/treaties', img: paymentIcon, title: 'Договора и отчетность', description: 'Ключевые условия
договора' diff --git a/src/pages/Summary/summary.scss b/src/pages/Summary/summary.scss index c383d0cd..c474aaad 100644 --- a/src/pages/Summary/summary.scss +++ b/src/pages/Summary/summary.scss @@ -231,7 +231,6 @@ } &__wrapper { - max-width: 630px; display: flex; flex-wrap: wrap; column-gap: 5px; From ab93a26abf48733d50a189d465d15daebbba31f5 Mon Sep 17 00:00:00 2001 From: M1kola Date: Mon, 20 Mar 2023 14:40:24 +0300 Subject: [PATCH 6/6] fix --- src/pages/PartnerSettings/partnerSettings.scss | 3 +++ src/pages/Profile/Profile.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/PartnerSettings/partnerSettings.scss b/src/pages/PartnerSettings/partnerSettings.scss index d55066e3..e1427067 100644 --- a/src/pages/PartnerSettings/partnerSettings.scss +++ b/src/pages/PartnerSettings/partnerSettings.scss @@ -1,5 +1,8 @@ .settings { background: #f1f1f1; + height: 100%; + min-height: 100vh; + font-family: 'LabGrotesque', sans-serif; &__page { max-width: 1160px !important; diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 8bcbb70e..bd5cfb5e 100644 --- a/src/pages/Profile/Profile.js +++ b/src/pages/Profile/Profile.js @@ -83,7 +83,7 @@ export const Profile = () => { description: 'Ключевые условия
договора' }, { - path: '', + path: '/settings', img: settingIcon, title: 'Настройки аккаунта', description: 'Перейдите чтобы начать
редактирование'