From 3a832cc78d60ae2fe6dca82039f7e0bbd4563f02 Mon Sep 17 00:00:00 2001
From: Mikola <ko1907@mail.ru>
Date: Tue, 10 Oct 2023 14:22:43 +0300
Subject: [PATCH] tracker fix

---
 .../Tracker/TicketFullScreen/TicketFullScreen.jsx      |  6 +++---
 .../Modal/Tracker/TrackerModal/trackerModal.scss       |  2 +-
 src/pages/ProjectTracker/ProjectTracker.js             |  6 +++---
 src/pages/Tracker/Tracker.js                           | 10 +++++-----
 src/pages/Tracker/tracker.scss                         |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
index bc5162e8..fd50c8be 100644
--- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
+++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx
@@ -536,9 +536,6 @@ export const TicketFullScreen = () => {
                   ></TrackerModal>
 
                   <div className="tasks__head__persons">
-                    {projectInfo.projectUsers?.length > 3 && (
-                      <span className="countPersons">+1...</span>
-                    )}
                     <div className="projectPersons">
                       {projectInfo.projectUsers?.length &&
                         projectInfo.projectUsers.slice(0, 3).map((person) => {
@@ -555,6 +552,9 @@ export const TicketFullScreen = () => {
                           );
                         })}
                     </div>
+                    {projectInfo.projectUsers?.length > 3 && (
+                        <span className="countPersons">+1</span>
+                    )}
                     <span
                       className="addPerson"
                       onClick={() => {
diff --git a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
index 8ff8f335..76e26246 100644
--- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
+++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss
@@ -541,7 +541,7 @@
 .exit {
   cursor: pointer;
   position: absolute;
-  top: 15px;
+  top: 36px;
   right: 20px;
   width: 13px;
   height: 13px;
diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js
index e7313046..99a7ff16 100644
--- a/src/pages/ProjectTracker/ProjectTracker.js
+++ b/src/pages/ProjectTracker/ProjectTracker.js
@@ -368,9 +368,6 @@ export const ProjectTracker = () => {
                         : "tasks__head__persons noProjectUsers"
                     }
                   >
-                    {projectBoard.projectUsers?.length > 3 && (
-                      <span className="countPersons">+1...</span>
-                    )}
                     {Boolean(projectBoard.projectUsers?.length) && (
                       <div className="projectPersons">
                         {projectBoard.projectUsers.slice(0, 3).map((person) => {
@@ -388,6 +385,9 @@ export const ProjectTracker = () => {
                         })}
                       </div>
                     )}
+                    {projectBoard.projectUsers?.length > 3 && (
+                        <span className="countPersons">+1</span>
+                    )}
                     <span
                       className="addPerson"
                       onClick={() => {
diff --git a/src/pages/Tracker/Tracker.js b/src/pages/Tracker/Tracker.js
index 84b95e3a..8b99fc5e 100644
--- a/src/pages/Tracker/Tracker.js
+++ b/src/pages/Tracker/Tracker.js
@@ -70,8 +70,8 @@ export const Tracker = () => {
     apiRequest(
       `/task/get-user-tasks?user_id=${localStorage.getItem("id")}`
     ).then((el) => {
-      const allTasks = el.filter((item) => item.status !== 0);
-      const completedTasks = el.filter((item) => item.status === 0);
+      const allTasks = el ? el.filter((item) => item.status !== 0) : [];
+      const completedTasks = el ? el.filter((item) => item.status === 0) : [];
       setAllTasks(allTasks);
       setFilteredAllTasks(allTasks);
       setAllCompletedTasks(completedTasks);
@@ -178,7 +178,7 @@ export const Tracker = () => {
 
             {loader && <Loader style="green" />}
 
-            {Boolean(projects.length) &&
+            {projects && Boolean(projects.length) &&
               !loader &&
               projects.map((project, index) => {
                 return project.status !== 10 ? (
@@ -187,7 +187,7 @@ export const Tracker = () => {
                   ""
                 );
               })}
-            {(!Boolean(projects.length) ||
+            {typeof projects === "object" && (!Boolean(projects.length) ||
               !Boolean(
                 projects.filter((project) => project.status !== 10).length
               )) &&
@@ -215,7 +215,7 @@ export const Tracker = () => {
                   </div>
                 </div>
               )}
-            {Boolean(projects.length) && !loader && (
+            {projects && Boolean(projects.length) && !loader && (
               <>
                 <BaseButton
                   styles="createProjectBtn"
diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss
index 7ba44dba..857413a2 100644
--- a/src/pages/Tracker/tracker.scss
+++ b/src/pages/Tracker/tracker.scss
@@ -321,7 +321,7 @@
             .projectPersons {
               display: flex;
               position: relative;
-              left: -10px;
+              left: 5px;
               img {
                 position: relative;
                 display: flex;
@@ -358,7 +358,7 @@
               color: #252c32;
               border: 1px solid #dde2e4;
               background: white;
-              left: -6px;
+              left: -20px;
             }
 
             .addPerson {