From 7cb0195f1d182856cec841d4e04775f0afdb53e7 Mon Sep 17 00:00:00 2001 From: M1kola Date: Mon, 12 Jun 2023 22:14:45 +0300 Subject: [PATCH] fix --- src/pages/ProjectTracker/ProjectTracker.js | 42 ++-------------------- src/pages/Tracker/tracker.scss | 20 ++++++++++- 2 files changed, 21 insertions(+), 41 deletions(-) diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index 2e45c84b..811287e9 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/src/pages/ProjectTracker/ProjectTracker.js @@ -74,18 +74,6 @@ export const ProjectTracker = () => { } }, [projectBoard]); - // function toggleMoreTasks(columnId) { - // setTabTaskMok((prevArray) => - // prevArray.map((elem, index) => { - // if (columnId === index) { - // return { ...elem, open: !elem.open }; - // } else { - // return elem; - // } - // }) - // ); - // } - function dragStartHandler(e, task, columnId) { startWrapperIndexTest.current = { task: task, index: columnId }; setTimeout(() => { @@ -155,7 +143,7 @@ export const ProjectTracker = () => { project_id: projectBoard.id, status: 0, }, - }).then((res) => { + }).then(() => { if (column.priority < projectBoard.columns.length) { for (let i = column.priority; i < projectBoard.columns.length; i++) { const currentColumn = { @@ -186,7 +174,7 @@ export const ProjectTracker = () => { project_id: projectBoard.id, user_id: userId }, - }).then((res) => { + }).then(() => { dispatch(deletePersonOnProject(userId)) }); } @@ -282,8 +270,6 @@ export const ProjectTracker = () => {

добавить колонку

- {/*avatar*/} - {/*avatar*/} {projectBoard.projectUsers?.length} { onDragEnter={(e) => dragEnterHandler(column.id)} onDrop={(e) => dragDropHandler(e, column.id)} className={`tasks__board ${ - column.tasks.length >= 3 ? "tasks__board__more" : "" - } ${ wrapperHover[column.id] ? "tasks__board__hover" : "" }`} >
- {/**/} {column.title}
{
)} {column.tasks.map((task, index) => { - // if (index > 2) { - // if (!column.open) { - // return; - // } - // } return (
{ filesImg {task.files} файлов
- {/*
*/} - {/* avatar*/} - {/* avatar*/} - {/*
*/}
); })} - {/*{column.tasks.length > 3 && (*/} - {/* toggleMoreTasks(column.id)}*/} - {/* >*/} - {/* {column.open ? "-" : "+"}*/} - {/* */} - {/*)}*/} ); })} diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss index da759819..0040e0f6 100644 --- a/src/pages/Tracker/tracker.scss +++ b/src/pages/Tracker/tracker.scss @@ -502,13 +502,31 @@ 0px 1px 1px rgba(0, 0, 0, 0.06); border-radius: 8px; padding: 16px 14px 16px 8px; - width: 350px; + min-width: 353px; + max-width: 353px; display: flex; flex-direction: column; row-gap: 16px; height: fit-content; position: relative; transition: all 0.3s ease; + //max-height: 500px; + //overflow-y: auto; + + &::-webkit-scrollbar { + width: 3px; + border-radius: 10px; + } + + &::-webkit-scrollbar-thumb { + background: #cbd9f9; + border-radius: 20px; + } + + &::-webkit-scrollbar-track { + background: #c5c0c6; + border-radius: 20px; + } &__hover { box-shadow: 0px 2px 10px #9cc480,