From a32533fdeaee626af0a0cf1ac775b61b38dc94ae Mon Sep 17 00:00:00 2001
From: Victor Batischev <office@edoldnr.ru>
Date: Tue, 30 Jan 2024 20:02:28 +0300
Subject: [PATCH] tracker add task fix

---
 .../TicketFullScreen/TicketFullScreen.jsx     |  2 +-
 .../Tracker/TrackerModal/TrackerModal.jsx     |  8 ++---
 .../Tracker/TrackerModal/trackerModal.scss    | 20 ++++++------
 src/pages/ProjectTracker/ProjectTracker.js    |  6 ++--
 src/pages/Tracker/tracker.scss                | 31 +++++++++----------
 5 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
index 7a45caee..8c1bbea2 100644
--- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
+++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
@@ -955,7 +955,7 @@ export const TicketFullScreen = () => {
               <div className="workers fullScreenWorkers">
                 <div className="workers_box task__info">
                   <p className="workers__creator">
-                    Создатель :<p>&nbsp;{taskInfo.user?.fio}</p>
+                    Создатель:<p>&nbsp;{taskInfo.user?.fio}</p>
                   </p>
 
                   {taskInfo.executor ? (
diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
index 70b82e9e..bde241ee 100644
--- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
+++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
@@ -484,7 +484,7 @@ export const TrackerModal = ({
           <div className="title-project">
             <div className="createTaskHead">
               <div className="createTaskBody__right__owner">
-                <p>Создатель : {profileInfo?.fio}</p>
+                <p>Создатель: {profileInfo?.fio}</p>
                 <img
                   src={
                     profileInfo.photo
@@ -711,11 +711,11 @@ export const TrackerModal = ({
                     }}
                   />
                 </div>
-                <BaseButton styles={"button-add"} onClick={createTiket}>
-                  Создать
-                </BaseButton>
               </div>
             </div>
+            <BaseButton styles={"button-add"} onClick={createTiket}>
+              Создать
+            </BaseButton>
           </div>
         </>
       )}
diff --git a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
index 43127e02..538dca27 100644
--- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
+++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
@@ -31,7 +31,7 @@
   align-items: center;
   flex-direction: column;
   row-gap: 8px;
-  margin-bottom: 10px;
+  padding-bottom: 10px;
 
   .select-priority {
     background-color: white;
@@ -296,7 +296,7 @@
 
   .createTaskHead {
     width: 100%;
-    padding: 30px 42px 18px;
+    padding: 5px 10px;
     display: flex;
     column-gap: 9.5px;
     align-items: center;
@@ -325,9 +325,9 @@
   }
 
   .createTaskBody {
-    padding: 13px 43px 46px 42px;
+    padding: 10px;
     display: flex;
-    column-gap: 55px;
+    column-gap: 20px;
 
     &__left {
       display: flex;
@@ -336,7 +336,8 @@
         color: #263238 !important;
         font-size: 16px;
         line-height: 19.2px;
-        margin-bottom: 25px;
+        margin-bottom: 15px;
+        margin-left: 5px;
       }
 
       .input-container {
@@ -360,8 +361,8 @@
       }
 
       .ck-editor__editable.ck-rounded-corners {
-        min-height: 110px;
-        max-height: 110px;
+        min-height: 130px;
+        max-height: 130px;
       }
     }
 
@@ -399,7 +400,7 @@
             font-weight: 300;
             line-height: 18px;
             font-size: 15px;
-            margin-bottom: 17.5px;
+            margin-bottom: 10px;
             border-radius: 8px;
             display: flex;
             flex-direction: column;
@@ -579,7 +580,6 @@
         font-weight: 300;
         line-height: 18px;
         font-size: 15px;
-        margin-bottom: 27px;
         z-index: 100;
       }
 
@@ -600,7 +600,7 @@
         line-height: 18px;
         font-size: 15px;
         position: relative;
-        margin-bottom: 22px;
+        margin: 8px 0 30px;
 
         span {
           color: #6f6f6f;
diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js
index 97983b23..3426c9aa 100644
--- a/src/pages/ProjectTracker/ProjectTracker.js
+++ b/src/pages/ProjectTracker/ProjectTracker.js
@@ -964,17 +964,17 @@ export const ProjectTracker = () => {
                                     />
                                     <span>
                                       {task.comment_count}{" "}
-                                      {caseOfNum(
+                                      {/* {caseOfNum(
                                         task.comment_count,
                                         "comments"
-                                      )}
+                                      )} */}
                                     </span>
                                   </div>
                                   <div className="tasks__board__item__info__more">
                                     <img src={filesBoard} alt="filesImg" />
                                     <span>
                                       {task.files ? task.files : 0}{" "}
-                                      {caseOfNum(0, "files")}
+                                      {/* {caseOfNum(0, "files")} */}
                                     </span>
                                   </div>
                                 </div>
diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss
index 0f119c4a..4773bba3 100644
--- a/src/pages/Tracker/tracker.scss
+++ b/src/pages/Tracker/tracker.scss
@@ -130,7 +130,7 @@
     &__content {
       width: 100%;
       background: #ffffff;
-      padding: 27px 0 29px;
+      padding: 15px 0;
       margin-bottom: 50px;
 
       &__wrapper {
@@ -705,9 +705,9 @@
         }
 
         &__container {
-          padding: 30px 25px 30px;
+          padding: 10px;
           display: flex;
-          column-gap: 25px;
+          column-gap: 15px;
           margin: 0 auto;
           overflow: auto;
           max-width: 100%;
@@ -730,9 +730,9 @@
           }
 
           @media (max-width: 900px) {
-            padding: 15px;
+            padding: 5px;
             flex-direction: column;
-            row-gap: 25px;
+            row-gap: 15px;
             transform: none;
           }
         }
@@ -744,8 +744,7 @@
             0px 1px 1px rgba(0, 0, 0, 0.06);
           border-radius: 8px;
           padding: 12px 10px 12px 8px;
-          min-width: 365px;
-          max-width: 380px;
+          width: 360px;
           display: flex;
           flex-direction: column;
           row-gap: 10px;
@@ -765,10 +764,10 @@
           .tasksContainer {
             display: flex;
             flex-direction: column;
-            row-gap: 16px;
+            row-gap: 8px;
             max-height: 750px;
             overflow: auto;
-            padding: 8px;
+            padding: 5px;
 
             &::-webkit-scrollbar {
               width: 3px;
@@ -798,7 +797,7 @@
 
           &__item {
             width: 328px;
-            padding: 4px 10px;
+            padding: 6px 10px;
             position: relative;
             box-shadow: 0px 3px 2px -2px rgba(0, 0, 0, 0.06),
               0px 5px 3px -2px rgba(0, 0, 0, 0.02);
@@ -866,7 +865,7 @@
               color: #5c6165;
               font-weight: 400;
               font-size: 14px;
-              line-height: 110%;
+              line-height: 120%;
               max-height: 100px;
               overflow: hidden;
               text-overflow: ellipsis;
@@ -877,7 +876,7 @@
 
             &__info {
               display: flex;
-              justify-content: space-between;
+              column-gap: 10px;
               align-items: center;
               pointer-events: none;
 
@@ -908,8 +907,8 @@
 
             &__priority {
               display: flex;
-              justify-content: space-between;
               align-items: center;
+              column-gap: 5px;
               margin-bottom: 8px;
 
               p {
@@ -938,8 +937,8 @@
             &__deadLine {
               display: flex;
               align-items: center;
-              justify-content: space-between;
-              margin-bottom: 10px;
+              column-gap: 5px;
+              margin-bottom: 8px;
 
               p {
                 font-weight: 500;
@@ -979,7 +978,7 @@
               flex-wrap: wrap;
               column-gap: 6px;
               row-gap: 3px;
-              margin-bottom: 5px;
+              margin: 5px 0 8px;
 
               .tagItem {
                 padding: 3px 10px;