Merge pull request 'trackerTask' (#10) from trackerTask into main

Reviewed-on: #10

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 ? <Loader /> : "Войти"}
           </button>
-          <span onClick={() => resetModal(true)}>Восстановить пароль</span>
+          <NavLink to="/tracker-registration" className="auth__registration">
+            Регистрация
+          </NavLink>
         </div>
+        <span className="auth__form__reset" onClick={() => resetModal(true)}>
+          Восстановить пароль
+        </span>
       </form>
       {img && <img src={img} alt="authImg" className="auth__img" />}
     </div>

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,8 +108,14 @@
       display: flex;
       column-gap: 20px;
       align-items: center;
+    }
 
-      span {
+    @media (max-width: 900px) {
+      order: 2;
+    }
+
+    &__reset {
+      margin-top: 25px;
       cursor: pointer;
       text-decoration-line: underline;
       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;
     }
   }
 

src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx

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

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 {

src/components/Modal/Tracker/TrackerModal/trackerModal.scss

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

src/pages/TrackerIntro/TrackerIntro.js

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