diff --git a/src/components/AuthBlock/AuthBlock.js b/src/components/AuthBlock/AuthBlock.js index 9d0cc790..1a367caa 100644 --- a/src/components/AuthBlock/AuthBlock.js +++ b/src/components/AuthBlock/AuthBlock.js @@ -1,6 +1,7 @@ import React, { useEffect, useRef, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; import { useNavigate } from "react-router"; +import { NavLink } from "react-router-dom"; import { loading, selectIsLoading } from "@redux/loaderSlice"; import { auth, selectAuth, setUserInfo } from "@redux/outstaffingSlice"; @@ -107,8 +108,13 @@ export const AuthBlock = ({ title, description, img, resetModal }) => { > {isLoading ? : "Войти"} - resetModal(true)}>Восстановить пароль + + Регистрация + + resetModal(true)}> + Восстановить пароль + {img && authImg} diff --git a/src/components/AuthBlock/authBlock.scss b/src/components/AuthBlock/authBlock.scss index 1d005e73..30131fcb 100644 --- a/src/components/AuthBlock/authBlock.scss +++ b/src/components/AuthBlock/authBlock.scss @@ -93,7 +93,7 @@ button { background: #52b709; border-radius: 44px; - max-width: 130px; + min-width: 130px; width: 100%; border: none; font-weight: 500; @@ -108,18 +108,37 @@ display: flex; column-gap: 20px; align-items: center; - - span { - cursor: pointer; - text-decoration-line: underline; - font-size: 13px; - font-weight: 500; - } } @media (max-width: 900px) { order: 2; } + + &__reset { + margin-top: 25px; + cursor: pointer; + text-decoration-line: underline; + font-size: 13px; + font-weight: 500; + } + } + + &__registration { + 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; + } } &__img { diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index 01d5c475..7cdad121 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -800,6 +800,7 @@ export const TicketFullScreen = () => { /> ) : (
+ Название задачи: {inputsValue.title}
)} @@ -831,12 +832,19 @@ export const TicketFullScreen = () => { }} /> ) : ( -

+

+ + Описание +
+ задачи:{" "} +
+

+

)} {Boolean(taskFiles.length) && ( diff --git a/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss b/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss index 37eac4c8..525dd6e9 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss +++ b/src/components/Modal/Tracker/TicketFullScreen/ticketFullScreen.scss @@ -2,6 +2,19 @@ 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 { border: none; justify-content: center; @@ -18,6 +31,20 @@ @media (max-width: 880px) { 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 { diff --git a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss index 3a306171..43127e02 100644 --- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss +++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss @@ -742,8 +742,8 @@ .exit { cursor: pointer; position: absolute; - top: 10px; - right: 10px; + top: 15px; + right: 20px; width: 13px; height: 13px; display: flex; diff --git a/src/pages/TrackerIntro/TrackerIntro.js b/src/pages/TrackerIntro/TrackerIntro.js index 023225ea..0649eff8 100644 --- a/src/pages/TrackerIntro/TrackerIntro.js +++ b/src/pages/TrackerIntro/TrackerIntro.js @@ -36,7 +36,7 @@ export const TrackerIntro = () => { компании в одном месте: проекты, задачи, цели, сотрудники, документы, переписки, отчеты

- + Начать работу