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 00000000..d3ca70b3 Binary files /dev/null and b/src/images/paymentIcon.png differ diff --git a/src/images/reports.png b/src/images/reports.png new file mode 100644 index 00000000..e10dbed6 Binary files /dev/null and b/src/images/reports.png differ diff --git a/src/images/settingIcon.png b/src/images/settingIcon.png new file mode 100644 index 00000000..42ff6d38 Binary files /dev/null and b/src/images/settingIcon.png differ diff --git a/src/images/summaryIcon.png b/src/images/summaryIcon.png new file mode 100644 index 00000000..b4a17f9f Binary files /dev/null and b/src/images/summaryIcon.png differ diff --git a/src/images/timerIcon.png b/src/images/timerIcon.png new file mode 100644 index 00000000..67300484 Binary files /dev/null and b/src/images/timerIcon.png differ diff --git a/src/pages/Profile.js b/src/pages/Profile.js index 1162c777..eacb2f30 100644 --- a/src/pages/Profile.js +++ b/src/pages/Profile.js @@ -26,7 +26,7 @@ export const Profile = () => { 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 часа
отработанных в этом месяце

+
+ +
+
+
+ +
+ +

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

+
+
+

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

+
+ +
+
+
+ +
+ +

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

+
+
+

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

+
+ +
+
+
+ +
+ +

Выплаты

+
+
+

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

+
+ +
+
+
+ +
+ +

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

+
+
+

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

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