From e58a576be9cc8f3d3daf40fc4f949fb5436f95cc Mon Sep 17 00:00:00 2001 From: M1kola Date: Thu, 29 Jun 2023 19:18:58 +0300 Subject: [PATCH] tracker-tasks --- .../Tracker/ModalTicket/modalTicket.scss | 39 ++++++++++++++++--- .../TicketFullScreen/TicketFullScreen.jsx | 1 - .../Tracker/TrackerModal/trackerModal.scss | 22 +++++++++++ .../TrackerTaskComment/TrackerTaskComment.jsx | 7 +++- src/pages/ProjectTracker/ProjectTracker.js | 6 +-- src/pages/Tracker/Tracker.js | 13 +++++-- src/pages/Tracker/tracker.scss | 30 +++++++++++++- src/utils/helper.js | 20 ++++++++++ 8 files changed, 122 insertions(+), 16 deletions(-) diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss index 9a1e24ca..a5f8c70b 100644 --- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss +++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss @@ -78,8 +78,22 @@ font-style: normal; font-size: 16px; line-height: 24px; - max-width: 340px; + padding: 5px; outline: none; + border-radius: 8px; + border: 1px solid rgb(204, 206, 209); + } + + .ck-toolbar { + border-radius: 8px 8px 0 0 !important; + } + + .ck-content { + font-size: 14px; + min-height: 100px; + border: 1px solid rgb(204, 206, 209) !important; + border-radius: 0 0 8px 8px !important; + box-shadow: none !important; } button { @@ -228,7 +242,7 @@ margin-left: 34px; text-decoration-line: underline; font-weight: 400; - font-size: 10px; + font-size: 11px; line-height: 32px; cursor: pointer; @@ -381,9 +395,9 @@ margin-right: 18px; } - &:focus-within { - border: 1px solid #0000004d; - } + //&:focus-within { + // border: 1px solid #0000004d; + //} } } @@ -467,6 +481,11 @@ border: none; color: white; font-size: 17px; + transition: all 0.3s ease; + + &:hover { + background: #6cc933; + } } } @@ -479,6 +498,11 @@ color: white; background: #1458dd; border-radius: 44px; + transition: all 0.15s ease; + + &:hover { + background: #0255ff; + } img { margin-left: 10px; @@ -499,6 +523,11 @@ color: white; background: red; border-radius: 44px; + transition: all 0.3s ease; + + &:hover { + background: #f5693d; + } } .time { diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index a5e264f4..df7b5de2 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -8,7 +8,6 @@ import { deletePersonOnProject, getBoarderLoader, modalToggle, - setProjectBoardFetch, setToggleTab, } from "@redux/projectsTrackerSlice"; diff --git a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss index 5c28876f..e5928691 100644 --- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss +++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss @@ -94,6 +94,22 @@ max-width: 320px; } + .ck-editor__editable.ck-rounded-corners { + min-height: 100px; + font-size: 14px; + } + + .ck-toolbar { + border: none !important; + border-radius: 8px 8px 0 0 !important; + } + + .ck-content { + border: none !important; + border-radius: 0 0 8px 8px !important; + box-shadow: none !important; + } + .select__executor { width: 320px; background: white; @@ -229,6 +245,12 @@ .worker { display: flex; justify-content: space-between; + + &:hover { + p { + font-weight: 500; + } + } } } } diff --git a/src/components/TrackerTaskComment/TrackerTaskComment.jsx b/src/components/TrackerTaskComment/TrackerTaskComment.jsx index b7227a88..365af3b2 100644 --- a/src/components/TrackerTaskComment/TrackerTaskComment.jsx +++ b/src/components/TrackerTaskComment/TrackerTaskComment.jsx @@ -12,6 +12,7 @@ import TrackerTaskSubComment from "@components/TrackerTaskComment/TrackerTaskCom import del from "assets/icons/delete.svg"; import edit from "assets/icons/edit.svg"; import accept from "assets/images/accept.png"; +import avatarMok from "assets/images/avatarMok.png"; export const TrackerTaskComment = ({ taskId, @@ -84,7 +85,11 @@ export const TrackerTaskComment = ({ >
- avatar + avatar

{comment.user.fio}

diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index 134ff358..1b96ebe2 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/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 = () => {
commentsImg - {task.comment_count} коментариев + {task.comment_count} {caseOfNum(task.comment_count, 'comments')}
filesImg - {task.files} файлов + {task.files ? task.files : 0} {caseOfNum(0, 'files')}
diff --git a/src/pages/Tracker/Tracker.js b/src/pages/Tracker/Tracker.js index d99f1f5c..8d4630c0 100644 --- a/src/pages/Tracker/Tracker.js +++ b/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 = () => {
{task.title}
-

{task.description}

+

avatar
@@ -301,11 +304,13 @@ export const Tracker = () => {

{task.title}

-

{task.description}

+

avatar
diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss index 1a38bead..4a0d6db3 100644 --- a/src/pages/Tracker/tracker.scss +++ b/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 { diff --git a/src/utils/helper.js b/src/utils/helper.js index f32e202b..e421ce2b 100644 --- a/src/utils/helper.js +++ b/src/utils/helper.js @@ -61,3 +61,23 @@ export function getCorrectRequestDate(date) { const sec = String(date.getUTCSeconds()); return `${yyyy}-${mm}-${dd} ${hh}:${min}:${sec}`; } + +export function caseOfNum(number, type) { + const comments = ["коментарий", "комментария", " коментариев"]; + const files = ["файлов", "файла", "файлов"] + const cases = [2, 0, 1, 1, 1, 2]; + if (type === 'comments') { + return comments[ + number % 100 > 4 && number % 100 < 20 + ? 2 + : cases[number % 10 < 5 ? number % 10 : 5] + ]; + } + if (type === 'files') { + return files[ + number % 100 > 4 && number % 100 < 20 + ? 2 + : cases[number % 10 < 5 ? number % 10 : 5] + ]; + } +}