This commit is contained in:
Mikola 2024-01-26 18:07:10 +03:00
parent fbc011ba91
commit 583e15ba0b
6 changed files with 72 additions and 19 deletions

View File

@ -1,6 +1,7 @@
import React, { useEffect, useRef, useState } from "react"; import React, { useEffect, useRef, useState } from "react";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { useNavigate } from "react-router"; import { useNavigate } from "react-router";
import { NavLink } from "react-router-dom";
import { loading, selectIsLoading } from "@redux/loaderSlice"; import { loading, selectIsLoading } from "@redux/loaderSlice";
import { auth, selectAuth, setUserInfo } from "@redux/outstaffingSlice"; import { auth, selectAuth, setUserInfo } from "@redux/outstaffingSlice";
@ -107,8 +108,11 @@ export const AuthBlock = ({ title, description, img, resetModal }) => {
> >
{isLoading ? <Loader /> : "Войти"} {isLoading ? <Loader /> : "Войти"}
</button> </button>
<span onClick={() => resetModal(true)}>Восстановить пароль</span> <NavLink to="/tracker-registration" className="auth__registration">
Регистрация
</NavLink>
</div> </div>
<span className="auth__form__reset" onClick={() => resetModal(true)}>Восстановить пароль</span>
</form> </form>
{img && <img src={img} alt="authImg" className="auth__img" />} {img && <img src={img} alt="authImg" className="auth__img" />}
</div> </div>

View File

@ -93,7 +93,7 @@
button { button {
background: #52b709; background: #52b709;
border-radius: 44px; border-radius: 44px;
max-width: 130px; min-width: 130px;
width: 100%; width: 100%;
border: none; border: none;
font-weight: 500; font-weight: 500;
@ -108,8 +108,14 @@
display: flex; display: flex;
column-gap: 20px; column-gap: 20px;
align-items: center; align-items: center;
}
span { @media (max-width: 900px) {
order: 2;
}
&__reset {
margin-top: 25px;
cursor: pointer; cursor: pointer;
text-decoration-line: underline; text-decoration-line: underline;
font-size: 13px; font-size: 13px;
@ -117,8 +123,21 @@
} }
} }
@media (max-width: 900px) { &__registration {
order: 2; min-width: 185px;
text-align: center;
color: #FFFFFF;
font-size: 18px;
background: #1458DD;
line-height: 32px;
font-weight: 500;
padding: 8px 12px;
border-radius: 44px;
transition: 0.3s all ease;
&:hover {
transform: scale(1.03);
color: white;
} }
} }

View File

@ -800,7 +800,7 @@ export const TicketFullScreen = () => {
/> />
) : ( ) : (
<h5 className="fullName nameFullScreen"> <h5 className="fullName nameFullScreen">
{inputsValue.title} <span>Название задачи:</span>{inputsValue.title}
</h5> </h5>
)} )}
<div className="content__description"> <div className="content__description">
@ -831,12 +831,15 @@ export const TicketFullScreen = () => {
}} }}
/> />
) : ( ) : (
<div className="ticket__description">
<span>Описание<br/>задачи: </span>
<p <p
className="fullDescription fullScreenDescription" className="fullDescription fullScreenDescription"
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: inputsValue.description __html: inputsValue.description
}} }}
/> />
</div>
)} )}
</div> </div>
{Boolean(taskFiles.length) && ( {Boolean(taskFiles.length) && (

View File

@ -2,6 +2,19 @@
background: #f5f5f5; background: #f5f5f5;
} }
.fullName {
display: flex;
align-items: center;
span {
color: #6F6F6F;
font-weight: 500;
font-size: 12px;
line-height: 17px;
display: flex;
width: 120px;
}
}
.ticket { .ticket {
border: none; border: none;
justify-content: center; justify-content: center;
@ -18,6 +31,20 @@
@media (max-width: 880px) { @media (max-width: 880px) {
flex-direction: column !important; flex-direction: column !important;
} }
&__description {
display: flex;
margin-top: 20px;
span {
display: flex;
width: 120px;
color: #6F6F6F;
font-weight: 500;
font-size: 12px;
line-height: 17px;
}
}
} }
.fullScreenWorkers { .fullScreenWorkers {

View File

@ -742,8 +742,8 @@
.exit { .exit {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
top: 10px; top: 15px;
right: 10px; right: 20px;
width: 13px; width: 13px;
height: 13px; height: 13px;
display: flex; display: flex;

View File

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