tracker-tasks

src/pages/ProjectTracker/ProjectTracker.js

@@ -28,7 +28,6 @@ import { Footer } from "@components/Common/Footer/Footer";
 import { Loader } from "@components/Common/Loader/Loader";
 import ModalTicket from "@components/Modal/Tracker/ModalTicket/ModalTicket";
 import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal";
-// import TrackerModal from "@components/Modal/TrackerModal/TrackerModal";
 import { Navigation } from "@components/Navigation/Navigation";
 import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs";
 import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader";
@@ -44,6 +43,7 @@ import project from "assets/icons/trackerProject.svg";
 import tasks from "assets/icons/trackerTasks.svg";
 import accept from "assets/images/accept.png";
 import avatarMok from "assets/images/avatarMok.png";
+import { caseOfNum } from "@utils/helper";
 
 export const ProjectTracker = () => {
   const dispatch = useDispatch();
@@ -563,11 +563,11 @@ export const ProjectTracker = () => {
                               <div className="tasks__board__item__info">
                                 <div className="tasks__board__item__info__more">
                                   <img src={commentsBoard} alt="commentsImg" />
-                                  <span>{task.comment_count} коментариев</span>
+                                  <span>{task.comment_count} {caseOfNum(task.comment_count, 'comments')}</span>
                                 </div>
                                 <div className="tasks__board__item__info__more">
                                   <img src={filesBoard} alt="filesImg" />
-                                  <span>{task.files} файлов</span>
+                                  <span>{task.files ? task.files : 0} {caseOfNum(0, 'files')}</span>
                                 </div>
                               </div>
                             </div>

src/pages/Tracker/Tracker.js

@@ -30,6 +30,7 @@ import tasks from "assets/icons/trackerTasks.svg";
 import noProjects from "assets/images/noProjects.png";
 
 import "./tracker.scss";
+import avatarMok from "assets/images/avatarMok.png";
 
 export const Tracker = () => {
   const dispatch = useDispatch();
@@ -253,11 +254,13 @@ export const Tracker = () => {
                       <div className="task" key={task.id}>
                         <div className="task__info">
                           <h5>{task.title}</h5>
-                          <p>{task.description}</p>
+                          <p dangerouslySetInnerHTML={{ __html: task.description }} />
                         </div>
                         <div className="task__person">
                           <img
-                            src={urlForLocal(task.user.avatar)}
+                            src={
+                              task.user?.avatar ? urlForLocal(task.user.avatar) : avatarMok
+                            }
                             alt="avatar"
                           />
                           <div className="task__project">
@@ -301,11 +304,13 @@ export const Tracker = () => {
                           <div className="archive__completeTask" key={index}>
                             <div className="archive__completeTask__description">
                               <p>{task.title}</p>
-                              <p className="date">{task.description}</p>
+                              <p className="date" dangerouslySetInnerHTML={{ __html: task.description }} />
                             </div>
                             <div className="archive__completeTask__info">
                               <img
-                                src={urlForLocal(task.user.avatar)}
+                                src={
+                                  task.user?.avatar ? urlForLocal(task.user.avatar) : avatarMok
+                                }
                                 alt="avatar"
                               />
                               <div className="archive__completeTask__info__project">

src/pages/Tracker/tracker.scss

@@ -252,7 +252,6 @@
           &__persons {
             position: relative;
             display: flex;
-            cursor: pointer;
             align-items: center;
 
             .projectPersons {
@@ -302,8 +301,14 @@
               background: #00c5a8;
               color: white;
               font-size: 14px;
+              transition: all 0.15s ease;
               left: -28px;
               z-index: 2;
+              cursor: pointer;
+
+              &:hover {
+                background: #10d5bb;
+              }
             }
 
             p {
@@ -466,6 +471,8 @@
             display: flex;
             align-items: center;
             color: black;
+            max-width: 180px;
+            width: 100%;
 
             p {
               font-weight: 400;
@@ -477,6 +484,12 @@
               margin-left: 10px;
               width: 20px;
             }
+
+            &:hover {
+              p {
+                font-weight: 500;
+              }
+            }
           }
         }
 
@@ -738,12 +751,20 @@
               font-weight: 500;
               font-size: 16px;
               line-height: 24px;
-              cursor: pointer;
+              max-width: 250px;
+              overflow: hidden;
+              white-space: nowrap;
+              text-overflow: ellipsis;
             }
 
             .add {
               color: #6f6f6f;
               font-size: 19px;
+              cursor: pointer;
+
+              &:hover {
+                font-weight: 600;
+              }
             }
 
             .more {
@@ -751,6 +772,11 @@
               position: relative;
               bottom: 4px;
               font-size: 20px;
+              cursor: pointer;
+
+              &:hover {
+                font-weight: 600;
+              }
             }
 
             .done {