Compare commits

..

No commits in common. "ade31b767a7e367ac2c81f1414653cb79344f5f5" and "10ffb1f7f19cba377ab91f7c3417375096b7e49c" have entirely different histories.

5 changed files with 3 additions and 153 deletions

View File

@ -1,8 +1,7 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch } from "react-redux";
import { Link, useParams } from "react-router-dom"; import { Link, useParams } from "react-router-dom";
import { getProfileInfo } from "@redux/outstaffingSlice";
import { setEditReport } from "@redux/reportSlice"; import { setEditReport } from "@redux/reportSlice";
import { import {
@ -10,7 +9,6 @@ import {
getCreatedDate, getCreatedDate,
hourOfNum hourOfNum
} from "@utils/calendarHelper"; } from "@utils/calendarHelper";
import { urlForLocal } from "@utils/helper";
import { apiRequest } from "@api/request"; import { apiRequest } from "@api/request";
@ -22,9 +20,8 @@ import { Navigation } from "@components/Navigation/Navigation";
import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
import arrowSwitchDate from "assets/icons/arrows/arrowCalendar_right.png"; import arrowSwitchDate from "assets/icons/arrows/arrowViewReport.png";
import arrow from "assets/icons/arrows/left-arrow.png"; import arrow from "assets/icons/arrows/left-arrow.png";
import avatarMok from "assets/images/avatarMok.png";
import "./viewReport.scss"; import "./viewReport.scss";
@ -34,7 +31,6 @@ export const ViewReport = () => {
const [previousReportDay] = useState(new Date(params.date)); const [previousReportDay] = useState(new Date(params.date));
const [nextReportDay] = useState(new Date(params.date)); const [nextReportDay] = useState(new Date(params.date));
const profileInfo = useSelector(getProfileInfo);
const [taskText, setTaskText] = useState([]); const [taskText, setTaskText] = useState([]);
const [difficulties, setDifficulties] = useState([]); const [difficulties, setDifficulties] = useState([]);
const [tomorrowTask, setTomorrowTask] = useState([]); const [tomorrowTask, setTomorrowTask] = useState([]);
@ -144,33 +140,6 @@ export const ViewReport = () => {
<img src={arrow} alt="#" /> <img src={arrow} alt="#" />
<p>Вернуться</p> <p>Вернуться</p>
</Link> </Link>
<div className="summary__info">
<div className="summary__person">
<img
src={
profileInfo?.photo
? urlForLocal(profileInfo.photo)
: avatarMok
}
className="summary__avatar"
alt="avatar"
/>
<p className="summary__name">
{profileInfo?.fio || profileInfo?.username}{" "}
{profileInfo.specification}
</p>
<hr />
<div className="summary__direction">Front End</div>
<div className="summary__level">Middle+</div>
</div>
<div className="summary__skill">
<p>Ключевые навыки:</p>
<div>Java</div>
<div>Java</div>
<div>Solid</div>
<div>Java</div>
</div>
</div>
{localStorage.getItem("role_status") !== "18" && ( {localStorage.getItem("role_status") !== "18" && (
<div className="view-report__bar"> <div className="view-report__bar">
<Link <Link

View File

@ -4,25 +4,6 @@
flex-direction: column; flex-direction: column;
min-height: 100vh; min-height: 100vh;
.summary__skill {
color: #6f6f6f;
font-size: 14px;
font-weight: 300;
display: flex;
flex-direction: row;
align-items: center;
column-gap: 10px;
div {
font-size: 12px;
font-weight: 400;
border: #8dc63f 0.5px solid;
border-radius: 44px;
padding: 3px 20px;
}
}
.container { .container {
max-width: 1160px; max-width: 1160px;
display: flex; display: flex;
@ -87,7 +68,7 @@
background: #ffffff; background: #ffffff;
border-top-left-radius: 12px; border-top-left-radius: 12px;
border-top-right-radius: 12px; border-top-right-radius: 12px;
padding: 55px; padding: 20px 33px;
align-items: center; align-items: center;
column-gap: 20px; column-gap: 20px;
height: 72px; height: 72px;

View File

@ -1,54 +0,0 @@
import React, { useState } from "react";
import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader";
import BaseButton from "@components/Common/BaseButton/BaseButton";
import { Footer } from "@components/Common/Footer/Footer";
import { Loader } from "@components/Common/Loader/Loader";
import SideBar from "@components/SideBar/SideBar";
import ITguild from "assets/images/logo/ITguild.svg";
import "./welcomePage.scss";
export const WelcomePage = () => {
const [loader, setLoader] = useState(false);
return (
<div className="welcome-page">
<AuthHeader />
<div className="welcome-page-component">
<div className="welcome-page-component__title">
<img src={ITguild}></img>
<h1>
Добро пожаловать в <span>ITGuild</span>
</h1>
</div>
<div className="welcome-page-component__text">
<p>
Создавайте и редактируйте задачи и проекты вместе с другими
участниками
<br /> команды. Сервис для работы с IT специалистами
</p>
</div>
<div className="button-box">
{loader ? (
<Loader />
) : (
<BaseButton
onClick={() => {
setLoader(true);
}}
styles="button-box__submit"
>
Начать
</BaseButton>
)}
</div>
</div>
<SideBar />
<Footer />
</div>
);
};

View File

@ -1,44 +0,0 @@
.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;
}
}
}

View File

@ -15,7 +15,6 @@ import { RegistrationForCandidate } from "@pages/RegistrationForCandidate/Regist
import { RegistrationSetting } from "@pages/RegistrationSetting/RegistrationSetting"; import { RegistrationSetting } from "@pages/RegistrationSetting/RegistrationSetting";
import { SingleReportPage } from "@pages/SingleReportPage/SingleReportPage"; import { SingleReportPage } from "@pages/SingleReportPage/SingleReportPage";
import { TrackerIntro } from "@pages/TrackerIntro/TrackerIntro"; import { TrackerIntro } from "@pages/TrackerIntro/TrackerIntro";
import { WelcomePage } from "@pages/WelcomePage/WelcomePage";
import { FreeDevelopers } from "@components/FreeDevelopers/FreeDevelopers"; import { FreeDevelopers } from "@components/FreeDevelopers/FreeDevelopers";
@ -23,7 +22,6 @@ export const GuestPage = () => {
return ( return (
<Routes> <Routes>
<Route exact path="/auth" element={<Auth />} /> <Route exact path="/auth" element={<Auth />} />
<Route exact path="/welcome-page" element={<WelcomePage />} />
<Route path="*" element={<Navigate to="/auth" replace />} /> <Route path="*" element={<Navigate to="/auth" replace />} />
<Route exact path="/tracker-intro" element={<TrackerIntro />} /> <Route exact path="/tracker-intro" element={<TrackerIntro />} />
<Route exact path="/forms" element={<Forms />} /> <Route exact path="/forms" element={<Forms />} />