From 731244905f8687dbaa2e8d55333b4627a7763047 Mon Sep 17 00:00:00 2001 From: M1kola Date: Mon, 9 Jan 2023 17:47:04 +0300 Subject: [PATCH] profilePage --- src/App.js | 2 + src/components/Profile/profile.scss | 30 ++++---- src/components/Profile/summary.scss | 114 ++++++++++++++++++++++++++++ src/images/paymentIcon.png | Bin 0 -> 966 bytes src/images/reports.png | Bin 0 -> 845 bytes src/images/settingIcon.png | Bin 0 -> 836 bytes src/images/summaryIcon.png | Bin 0 -> 1403 bytes src/images/timerIcon.png | Bin 0 -> 1156 bytes src/pages/Profile.js | 2 +- src/pages/Summary.js | 96 +++++++++++++++++++++++ 10 files changed, 230 insertions(+), 14 deletions(-) create mode 100644 src/components/Profile/summary.scss create mode 100644 src/images/paymentIcon.png create mode 100644 src/images/reports.png create mode 100644 src/images/settingIcon.png create mode 100644 src/images/summaryIcon.png create mode 100644 src/images/timerIcon.png create mode 100644 src/pages/Summary.js diff --git a/src/App.js b/src/App.js index 3849ec25..bc7cda84 100644 --- a/src/App.js +++ b/src/App.js @@ -20,6 +20,7 @@ import { QuizTestPage } from './pages/quiz/QuizTestPage' import { InstructionPage } from './pages/quiz/InstructionPage' import { ResultPage } from './pages/quiz/ResultPage' import { Profile } from './pages/Profile.js' +import { Summary } from './pages/Summary' const App = () => { return ( @@ -59,6 +60,7 @@ const App = () => { component={InstructionPage} /> +
Page not found
} /> diff --git a/src/components/Profile/profile.scss b/src/components/Profile/profile.scss index aade0c87..31766b5d 100644 --- a/src/components/Profile/profile.scss +++ b/src/components/Profile/profile.scss @@ -2,15 +2,15 @@ background: #F1F1F1; height: 100%; min-height: 100vh; - - &__container { - max-width: 1160px; - padding: 0 10px; - margin: 20px auto; - position: relative; - display: flex; - flex-direction: column; - } + // + //&__container { + // max-width: 1160px; + // padding: 0 10px; + // margin: 20px auto; + // position: relative; + // display: flex; + // flex-direction: column; + //} &__content { display: flex; @@ -363,12 +363,16 @@ } } + footer { + margin-top: 70px; + } + .container { max-width: 1160px; - margin-top: 70px; + margin-top: 23px; - @media (max-width: 570px) { - margin-top: 0; - } + @media (max-width: 570px) { + margin-top: 0; + } } } diff --git a/src/components/Profile/summary.scss b/src/components/Profile/summary.scss new file mode 100644 index 00000000..794950b3 --- /dev/null +++ b/src/components/Profile/summary.scss @@ -0,0 +1,114 @@ +.summary { + background: #F1F1F1; + height: 100%; + min-height: 100vh; + + &__title { + font-weight: 700; + font-size: 22px; + line-height: 32px; + color: #000000; + span { + color: #52B709; + } + } + + &__info { + min-height: 128px; + background: white; + border-radius: 12px; + margin-top: 30px; + display: flex; + align-items: center; + padding: 0 130px 0 45px; + justify-content: space-between; + } + + &__items { + display: flex; + flex-wrap: wrap; + margin-top: 30px; + row-gap: 25px; + column-gap: 35px; + + @media (max-width: 1175px) { + justify-content: center; + } + + .item { + max-width: 353px; + width: 100%; + padding: 35px 45px 15px 30px; + background: #FFFFFF; + border-radius: 12px; + text-decoration: none; + cursor: pointer; + + @media (max-width: 1175px) { + width: 48%; + max-width: none; + } + + @media (max-width: 925px) { + width: 100%; + } + + &__about { + display: flex; + column-gap: 20px; + align-items: center; + margin-bottom: 30px; + + h3 { + color: #000000; + font-weight: 500; + font-size: 18px; + line-height: 22px; + max-width: 125px; + margin-bottom: 0; + } + } + + &__info { + display: flex; + justify-content: space-between; + align-items: center; + + p { + font-weight: 700; + font-size: 12px; + line-height: 20px; + color: #000000; + margin-bottom: 0; + + span { + color: #52B709; + font-weight: 700; + } + } + &Link { + width: 48px; + height: 48px; + background: #DDEEC6; + border-radius: 50px; + display: flex; + justify-content: center; + align-items: center; + } + } + } + } + + .container { + max-width: 1160px; + margin-top: 23px; + + @media (max-width: 570px) { + margin-top: 0; + } + } + + footer { + margin-top: 70px; + } +} diff --git a/src/images/paymentIcon.png b/src/images/paymentIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..d3ca70b32098843c32b42da46269e4cd2b45580e GIT binary patch literal 966 zcmV;%13CPOP)a8>w} zGs}0J7O^E(n5e%zUgAS*Wtc+c1-(l=6arZw-S> zwOY-gh+v9{bUJ%Qq%LVbIGV<%Q3*#Pn@VL1%<5-&=_wTyVO?)pd!;xB3+H-eRdwC^ zM_L!s>C7XNlH3Aj>61!juERd+@GzUB2+(LwV4m8@B*99-l?TkyuhV(=9a*<6v;T=A zU~aNwc$l@J=Q)@zRHX%=)0}vDdGYr4_MTwZlIyy6^Yo3yk`==sr`>MfGy(dbG4KYV z&pgAb&Q0@~Ya<2UjLd;=F1l{*c2F-rnM~#!1g~ieA+D~|X`jkMW?9`qpdQ0}Z~DwN z5ww`KJPo`K{czo17o1L~;oP}^I!t`V8${m@mksgFm=fnwZnsO|8t3Ey+$ZBU2t{VTEL_&x3ieB-f{)SIRW!rECs zGM$9J_Ut`KIj`@tjm!oKo2CPwS`{^oO7(jEVVp;wA4`NPgF)z?HX60^q>*~o_H%gj zi7Z4Kol{ZJjmL!CThnWppFyE!#5uqbvhu`{dups0rtaGshH<3pIy^{V%LhWTCqGWC ztvq~o8N+F{T2&b7iDrl0Mecl#)s73-pSF zH3=jK%It#0)Unv_dslr)hG`$lFHP0nx8QR4zus8WGv? oxH`i8*eGc^ANGB}Iv(2m0ZufN#Fv<8v;Y7A07*qoM6N<$f=JuKM*si- literal 0 HcmV?d00001 diff --git a/src/images/reports.png b/src/images/reports.png new file mode 100644 index 0000000000000000000000000000000000000000..e10dbed6a053b8fa20cda606129ee6f8d9fa327b GIT binary patch literal 845 zcmV-T1G4;yP)hW6Ryu|a})@|7ugup_$L{kkMrH*yL<1?dxH9yrkN!&c7>n~JZ5PO#8*0< z&MWdkDwV1tr%eQHDW!$-@O*u0+jjd#d3{j@A&gHPoRY77anVVUFJWmpA-XLk9oTlK zG8`$mrXcE@5``~mBHCghqwn{c__9+9Kv;5lnUcvQ{W?GYCqz&cEwVj`NT<_>`~qJP zxl1!dm9xM9R$l$NlE)v89i;o|h$?`LNtku0uUE~`iMbz?JB zVQ8u<-&?H~)$8?<|BA)ppw^JGaF0TzhdyjLedy)R4%JUiD4);YNF{{G31!0gnhM4e zUjwKP=ssH*o({dzEyZGS6CLgee@(aB{XsJZWmvJ;{UaVig^(uS$C6-Hp!c*0uoY57 zL_|bHI0&x<{iXM33Jl2`k!>tWt!b$=Ru=~EYO)jZtvpG+S zxGU&brP()t0M|@C?7VGzS_&PjWPipR3J@3*i<-KJ)z~E&>=v*oIM^zGQp8=s(<&L) zsi!?HSzZ>WgT`?202@^4xj`KQlXUN~UvU~%c}=$@knv8lDIcz3^vRMIlYOfH4NGt@ zR^Y$*2!Fy?_!ZhTM_^~q=0#Uhpp6u}TE0tkOLoknKrtsKWz4Ov!_f1}m&VxeopU XH8L1~rssF}00000NkvXXu0mjf{q%Cd literal 0 HcmV?d00001 diff --git a/src/images/settingIcon.png b/src/images/settingIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..42ff6d383ce27887cba593f42daa2779c471e374 GIT binary patch literal 836 zcmV-K1H1f*P)9dH1=)rOXa)Pdede{v;gEF#1yMJ#7T+3 zcL=zO29l?z3skzPb!jXc?AvhNPQxaoGh^zE{_(thu}#}Yx>VYeVlZ+nmHpLG+$OGHG{0#eX z@)QJd3y}>5DRyRop*5B{>s@7NMyYumtBqa7(8+cqiyoZ-s9 z1cv{##aC?+st(kqK!CrXzjz%2UDoQq;fO%dG89O~PV5B2v;T%(`4Hr2 zLU^LtnXj@A5c0w~krt?;+>Id*1kX2I>_IXRG!v2njeCklH%li)OZ$%;&nEF4yEAE~ zI)k#mF6yH)b1INC?k~-w0lB9Q$%MQzMkNVIzq}AL_37m%MkhUBjk)KVikY4cR0Zoc zW_l8kedAWax`@%~4PLI<3%{M7KQoCBj)iVUBgo-{#xpoo|zkA%n3*S9>lGibM zX>p`AIlzXSMU2jnIP$N#DB{@%Xg_6SSubYW3dC<(&4%+GB9TsGJPTbzgov&QNTrCy z=G^qRfZq){#@Cidb`K!Op$SYK3~5e!QCCnWPz|ua&jmNh_$oH(k^BRZNgc?pvCoSD O00001%&#EP)lTN48JFdth6f-h?)G$^#W*7(cdi}Tl#!#ehrPGJ#cwepuWvAW# zPPhI@(!PbC`qhdUMp3mnu3MFe0ITkc>t>ghmSkmRMUIY+d+3QcPq`82~RV*jRLnt6n|8YWx?6YrqWXp{%_hdBG(kI(sQv9zxoOUSrezP8D+%xi2L zb^pvs>r!`danaKiN?Q@8+9fcFJ z?Cz)+9E3_90_TCHNp*W{QE+Dl{U-;m|Sqr4$Iuegl>~uC{gbR2Y z1B+R|%2m>Cm@%(J8ecSv^sXjc4eqg_ju-~Hz#!uBSd8vd@vDU}5oKc1B#ac#9o0); zblrkSR71ZD#4PKu-*=gH_4Q?@I$X+O5&MA)czbu3 z?j-*60wYRHCIHSpet|1|=~t3eNxl002ov JPDHLkV1gWwnDYPt literal 0 HcmV?d00001 diff --git a/src/images/timerIcon.png b/src/images/timerIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..673004841d62fcd2f512d2990e1f73d2d18ad052 GIT binary patch literal 1156 zcmV-~1bh35P)Ke28pr)vV)WrKvzJK`kwO8XB>$>H>{v$1x-aG zRm9G4j>k^i&?fejwj9ZSW6#X-ojZ5V9VHfMG#Xv4^&_R6u2QOl`!yEg`; z1WX(8YYh7i$ObvVB$+-gYrQM*egAo*;h*8q=Gy3UIOP^#8(Dj4o9v@f1D@yaEE;H@ zY;0@<>+3XoJl1_j3;KTZG;iPYyw_3&nWgf-8kDgTzsc)V_w)!?Ty?qOdpCduI;-246Y>xbIxZCXH3~ycN?$| z*L7ZqneCmTkEX;p6ky&rMS9n28rzeL7=n1uSeg51N(>R1OH9Baytue{C-)4-MMM)qr${I*22k+_%7X?NV`9$gCz@!YC4Gu`N@eNB8Ml%g82M zm@9S!$icxuTClynEnmML^REwGxBgoN&#On1$&df9YYYOd2f6k%$$Ut8luYM>hzaJaz!x+iLpTz$lz~(ld1Mx3Cx!)O4+UD-Q%_ zQoK^(FhO?A!))KYR=tO^8q+&-H{0boC3c-2x=)y8&FH~;z5e;iOUl}t5`()$F_F13 zWHE=#bIJP{QueWkqyA~}-IXk5i_$$PnDU|sx}iPSL@pp_rnB)nCTS!%y@!doD> zvlw^(^iTSn@u}QpESAEhO%-h`{tATJY@@hQv&vFyx1pGw7q^d4WiLs79+u4y78`z= zVJLG8HHzb(FIKftYU7SW%M>psm?5M_$Eq=;`sD$cGp2k(S-^xMTYtNSI`}T#xZ7LT zXO*qafQj)n1lIym8T+w%zsiPRX<|h%7sX}EWLPAra4a^5K?IhOkx?#cWGjRIO8f## WLK;O%E5$Yd0000 { return(
-
+

Ваше резюме {openGit && - Git}

{openGit &&
setOpenGit(false)}> diff --git a/src/pages/Summary.js b/src/pages/Summary.js new file mode 100644 index 00000000..7f94b3db --- /dev/null +++ b/src/pages/Summary.js @@ -0,0 +1,96 @@ +import React from 'react'; +import {useSelector} from "react-redux"; +import {getProfileInfo} from "../redux/outstaffingSlice"; +import {ProfileHeader} from "../components/Profile/ProfileHeader"; +import {NavLink} from "react-router-dom"; +import {Footer} from "../components/Footer/Footer"; + +import reportsIcon from "../images/reports.png" +import summaryIcon from "../images/summaryIcon.png" +import timerIcon from "../images/timerIcon.png" +import paymentIcon from "../images/paymentIcon.png" +import settingIcon from "../images/settingIcon.png" +import rightArrow from "../images/arrowRight.png" + +import './../components/Profile/summary.scss' + +export const Summary = () => { + const profileInfo = useSelector(getProfileInfo) + return( +
+ +
+

Добрый день, {profileInfo.fio}

+
+
+ +

{profileInfo.fio} {profileInfo.specification}

+
+
+
+ +
+ +

Ваша отчетность

+
+
+

У вас 122 часа
отработанных в этом месяце

+
+ +
+
+
+ +
+ +

Данные и резюме

+
+
+

Ваше резюме
заполнено

+
+ +
+
+
+ +
+ +

Трекер времени

+
+
+

Сколько времени занимает
выполнение задач

+
+ +
+
+
+ +
+ +

Выплаты

+
+
+

У вас подтвержден
статус самозанятого

+
+ +
+
+
+ +
+ +

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

+
+
+

Перейдите чтобы начать
редактирование

+
+ +
+
+
+
+
+
+ ) +}