apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tracker landing redirect

Browse Source
This commit is contained in:
Victor Batischev 2024-03-19 11:51:27 +03:00
parent 882bdfcc24
commit 3013dd1bd2
8 changed files with 11 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/Modal/Tracker/ModalTicket/modalTicket.scss
View File

@ -982,7 +982,7 @@
position: relative;
row-gap: 10px;
padding: 10px 40px 0px 20px;
padding: 10px 20px 0px 20px;
border-radius: 10px;
margin-bottom: 10px;
@ -1113,7 +1113,7 @@
&-priority {
position: relative;
padding: 10px 40px 0 20px;
padding: 10px 20px 0 20px;
border-radius: 10px;
margin-bottom: 10px;
.priority {
@ -1173,7 +1173,7 @@
}
&-bottom {
padding: 0px 90px 10px 35px;
padding: 0px 30px 10px 20px;
font-weight: 400;
font-size: 14px;
line-height: 32px;

8
src/components/ProfileCalendar/ProfileCalendarComponent.jsx
View File

@ -286,15 +286,15 @@ export const ProfileCalendarComponent = React.memo(
? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
: `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
: activePeriod
? "Выберите диапазон на календаре"
: "Выбрать диапазон"}
? "Выберите диапазон на календаре"
: "Выбрать диапазон"}
</span>
<span>
{totalRangeHours
? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
: endDate
? "0 часов"
: ""}
? "0 часов"
: ""}
</span>
{endDate && (
<BaseButton

4
src/pages/PartnerRequests/partnerRequests.scss
View File

@ -265,7 +265,7 @@
height: 46px;
font-weight: 400;
font-size: 15px;
line-height: 32px;
line-height: 20px;
transition: 0.3s all ease;
a {
@ -280,7 +280,7 @@
color: white;
font-weight: 700;
font-size: 20px;
margin-right: 8px;
margin-left: 8px;
}
&:hover {

2
src/pages/Profile/Profile.jsx
View File

@ -64,7 +64,7 @@ export const Profile = () => {
img: reportsIcon,
title: "Мои вакансии",
description:
"<span>У вас 2 вакансии<br/></span>открытые от лица компании"
"<span>Ваши открытые вакансии, которыми вы можете управлять"
},
{
path: "profile/employees",

40
src/pages/TrackerAuth/TrackerAuth.jsx
View File

@ -1,40 +0,0 @@
import React, { useState } from "react";
import AuthBlock from "@components/AuthBlock/AuthBlock";
import { AuthHeader } from "@components/Common/AuthHeader/AuthHeader";
import { Footer } from "@components/Common/Footer/Footer";
import ModalResetPassword from "@components/Modal/ModalResetPassword/ModalResetPassword";
import SideBar from "@components/SideBar/SideBar";
import arrowInfo from "assets/icons/trackerIntroInfo.svg";
import trackerAuthImg from "assets/images/trackerAuthImg.png";
import "./trackerAuth.scss";
export const TrackerAuth = () => {
const [modalResetOpen, setModalReset] = useState(false);
return (
<div className="tracker-auth">
<AuthHeader />
<SideBar />
<div className="tracker-auth__content">
<div className="container">
<h1 className="tracker-auth__title">
Войдите в свое{" "}
<span>
рабочее пространство
<img src={arrowInfo} alt="arrow" />
</span>
</h1>
<AuthBlock
description="Создавайте и редактируйте задачи и проекты вместе с другими участниками команды."
img={trackerAuthImg}
resetModal={setModalReset}
/>
</div>
<ModalResetPassword active={modalResetOpen} setActive={setModalReset} />
</div>
<Footer />
</div>
);
};

58
src/pages/TrackerAuth/trackerAuth.scss
View File

@ -1,58 +0,0 @@
.tracker-auth {
display: flex;
flex-direction: column;
min-height: 100vh;
background-color: #f1f1f1;
&__content {
display: flex;
flex-direction: column;
flex: 1;
color: #000000;
padding: 50px 0 0;
@media (max-width: 1375px) {
padding-top: 100px;
}
@media (max-width: 1000px) {
background-color: white;
}
.container {
padding-bottom: 30px;
}
}
&__title {
font-size: 30px;
font-weight: 500;
margin-bottom: 46px;
color: #000000;
span {
color: #52b709;
position: relative;
img {
position: absolute;
bottom: -15px;
right: 10px;
max-width: 300px;
@media (max-width: 600px) {
max-width: 257px;
right: 0;
}
@media (max-width: 483px) {
max-width: 160px;
left: -175px;
}
}
}
@media (max-width: 600px) {
font-size: 24px;
margin-bottom: 25px;
}
}
}

2
src/pages/TrackerIntro/TrackerIntro.jsx
View File

@ -36,7 +36,7 @@ export const TrackerIntro = () => {
компании в одном месте: проекты, задачи, цели, сотрудники,
документы, переписки, отчеты
</p>
<NavLink to="/tracker-auth" className="tracker-intro__btn">
<NavLink to="/auth" className="tracker-intro__btn">
Начать работу
</NavLink>
</div>

2
src/pages/roles/GuestPage.jsx
View File

@ -14,7 +14,6 @@ import { ProfileCandidate } from "@pages/ProfileCandidate/ProfileCandidate";
import { RegistrationForCandidate } from "@pages/RegistrationForCandidate/RegistrationForCandidate";
import { RegistrationSetting } from "@pages/RegistrationSetting/RegistrationSetting";
import { SingleReportPage } from "@pages/SingleReportPage/SingleReportPage";
import { TrackerAuth } from "@pages/TrackerAuth/TrackerAuth";
import { TrackerIntro } from "@pages/TrackerIntro/TrackerIntro";
import { TrackerRegistration } from "@pages/TrackerRegistration/TrackerRegistration";
@ -26,7 +25,6 @@ export const GuestPage = () => {
<Route exact path="/auth" element={<Auth />} />
<Route path="*" element={<Navigate to="/auth" replace />} />
<Route exact path="/tracker-intro" element={<TrackerIntro />} />
<Route exact path="/tracker-auth" element={<TrackerAuth />} />
<Route exact path="/forms" element={<Forms />} />
<Route
exact