diff --git a/src/pages/ViewReport/ViewReport.jsx b/src/pages/ViewReport/ViewReport.jsx index 85329069..528b0752 100644 --- a/src/pages/ViewReport/ViewReport.jsx +++ b/src/pages/ViewReport/ViewReport.jsx @@ -1,7 +1,8 @@ import React, { useEffect, useState } from "react"; -import { useDispatch } from "react-redux"; +import { useDispatch, useSelector } from "react-redux"; import { Link, useParams } from "react-router-dom"; +import { getProfileInfo } from "@redux/outstaffingSlice"; import { setEditReport } from "@redux/reportSlice"; import { @@ -9,6 +10,7 @@ import { getCreatedDate, hourOfNum } from "@utils/calendarHelper"; +import { urlForLocal } from "@utils/helper"; import { apiRequest } from "@api/request"; @@ -20,8 +22,9 @@ import { Navigation } from "@components/Navigation/Navigation"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; -import arrowSwitchDate from "assets/icons/arrows/arrowViewReport.png"; +import arrowSwitchDate from "assets/icons/arrows/arrowCalendar_right.png"; import arrow from "assets/icons/arrows/left-arrow.png"; +import avatarMok from "assets/images/avatarMok.png"; import "./viewReport.scss"; @@ -31,6 +34,7 @@ export const ViewReport = () => { const [previousReportDay] = useState(new Date(params.date)); const [nextReportDay] = useState(new Date(params.date)); + const profileInfo = useSelector(getProfileInfo); const [taskText, setTaskText] = useState([]); const [difficulties, setDifficulties] = useState([]); const [tomorrowTask, setTomorrowTask] = useState([]); @@ -140,6 +144,33 @@ export const ViewReport = () => { #

Вернуться

+
+
+ avatar +

+ {profileInfo?.fio || profileInfo?.username}{" "} + {profileInfo.specification} +

+
+
Front End
+
Middle+
+
+
+

Ключевые навыки:

+
Java
+
Java
+
Solid
+
Java
+
+
{localStorage.getItem("role_status") !== "18" && (
{ + const [loader, setLoader] = useState(false); + + return ( +
+ + +
+
+ +

+ Добро пожаловать в ITGuild +

+
+
+

+ Создавайте и редактируйте задачи и проекты вместе с другими + участниками +
команды. Сервис для работы с IT специалистами +

+
+ +
+ {loader ? ( + + ) : ( + { + setLoader(true); + }} + styles="button-box__submit" + > + Начать + + )} +
+
+ +
+
+ ); +}; diff --git a/src/pages/WelcomePage/welcomePage.scss b/src/pages/WelcomePage/welcomePage.scss new file mode 100644 index 00000000..4aa5327d --- /dev/null +++ b/src/pages/WelcomePage/welcomePage.scss @@ -0,0 +1,44 @@ +.welcome-page { + overflow: hidden; + background-color: #f1f1f1; + min-height: 100vh; + display: flex; + flex-direction: column; + + &-component { + display: flex; + align-items: center; + flex-direction: column; + flex: 1; + + &__title { + display: flex; + flex-direction: column; + align-items: center; + font-weight: 500; + font-size: 30px; + line-height: 32px; + margin-bottom: 45px; + + img { + width: 151px; + margin: 70px 0 19px 0; + } + } + + &__text { + text-align: center; + font-weight: 400; + font-size: 16px; + line-height: 22px; + margin-bottom: 45px; + } + + .button-box__submit { + width: 174px; + height: 50px; + font-size: 18px; + font-weight: 500; + } + } +} diff --git a/src/pages/roles/GuestPage.jsx b/src/pages/roles/GuestPage.jsx index ee761bf1..2386887d 100644 --- a/src/pages/roles/GuestPage.jsx +++ b/src/pages/roles/GuestPage.jsx @@ -15,6 +15,7 @@ import { RegistrationForCandidate } from "@pages/RegistrationForCandidate/Regist import { RegistrationSetting } from "@pages/RegistrationSetting/RegistrationSetting"; import { SingleReportPage } from "@pages/SingleReportPage/SingleReportPage"; import { TrackerIntro } from "@pages/TrackerIntro/TrackerIntro"; +import { WelcomePage } from "@pages/WelcomePage/WelcomePage"; import { FreeDevelopers } from "@components/FreeDevelopers/FreeDevelopers"; @@ -22,6 +23,7 @@ export const GuestPage = () => { return ( } /> + } /> } /> } /> } />