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 00000000..3bb6681f Binary files /dev/null and b/src/pages/PartnerTreaties/Images/actTreaties.png differ diff --git a/src/pages/PartnerTreaties/Images/arrowCheck.png b/src/pages/PartnerTreaties/Images/arrowCheck.png new file mode 100644 index 00000000..73fab54b Binary files /dev/null and b/src/pages/PartnerTreaties/Images/arrowCheck.png differ diff --git a/src/pages/PartnerTreaties/Images/arrowDown.png b/src/pages/PartnerTreaties/Images/arrowDown.png new file mode 100644 index 00000000..84e0ecad Binary files /dev/null and b/src/pages/PartnerTreaties/Images/arrowDown.png differ diff --git a/src/pages/PartnerTreaties/Images/avatarMok.png b/src/pages/PartnerTreaties/Images/avatarMok.png new file mode 100644 index 00000000..3dad1696 Binary files /dev/null and b/src/pages/PartnerTreaties/Images/avatarMok.png differ diff --git a/src/pages/PartnerTreaties/Images/checkTreaties.png b/src/pages/PartnerTreaties/Images/checkTreaties.png new file mode 100644 index 00000000..1a347b86 Binary files /dev/null and b/src/pages/PartnerTreaties/Images/checkTreaties.png differ 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 00000000..256f106e Binary files /dev/null and b/src/pages/PartnerTreaties/Images/logoAstral.png differ diff --git a/src/pages/PartnerTreaties/Images/mainTreaties.png b/src/pages/PartnerTreaties/Images/mainTreaties.png new file mode 100644 index 00000000..30a62687 Binary files /dev/null and b/src/pages/PartnerTreaties/Images/mainTreaties.png differ 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;