From 7f0dc9612bb4e03a370691d741bf1751af04d84d Mon Sep 17 00:00:00 2001 From: M1kola Date: Fri, 7 Jul 2023 00:46:40 +0300 Subject: [PATCH] tracker fixes --- src/assets/images/archiveIcon.png | Bin 0 -> 1475 bytes src/components/AuthBox/authBox.scss | 11 +- src/components/Common/Loader/loader.scss | 10 +- .../Common/ModalLayout/modalLayout.scss | 51 ++++++- .../Modal/Tracker/ModalTicket/ModalTicket.jsx | 6 +- .../Tracker/ModalTicket/modalTicket.scss | 27 +++- .../TicketFullScreen/TicketFullScreen.jsx | 9 +- .../Tracker/TrackerModal/TrackerModal.jsx | 128 ++++++++++-------- .../Tracker/TrackerModal/trackerModal.scss | 28 +++- .../Modal/TrackerModal/trackerModal.scss | 6 +- src/pages/ProjectTracker/ProjectTracker.js | 6 +- src/pages/Tracker/Tracker.js | 2 +- src/pages/Tracker/tracker.scss | 28 +++- src/utils/helper.js | 11 +- 14 files changed, 226 insertions(+), 97 deletions(-) create mode 100644 src/assets/images/archiveIcon.png diff --git a/src/assets/images/archiveIcon.png b/src/assets/images/archiveIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..ad94e2b4e3e68073193898b36a9e05dbc3049d1f GIT binary patch literal 1475 zcmV;!1w8tRP)6KiYwHNUREW`BBhIAuxM8A>C&Z?_TF>OJ?EA!e3GU~(|bAJ z^84NI?+*u5=G5qEPxAT=cSU6dfA?-C(%ID(FdAEq0~O(bN+c3VN9g>8fw|ZJeZDAfR|B-#$NX=<^Jb8>cxIwS zvDzQbPI@j(UUILlu4z%PtFPZK?CrMuScW_k(a~tkb>{mC@6z8X9uQ*LwNnU3rkqEQ z`UOB4s-j`u{ycfv8=a0h00m&kHyQN7-o75H`A$VN4CUdWQQseP3Aa?<62k%EI78G>nkXKO1(ZmeRiE)GefY(6Bgc(Wn-bkFK@`wAosH-TU_Riw8{? zyXUd~pm*i=Z5OI|B^HM)n#6*tHC3RgsUf6$T=&+215QEi``!7oPK;^}zQYj7-1QZ$JL!MuHD=hK1b_ILV$0$|9G zeRJ9ykI!R;Jc`9}CH^3`1;J3(>+6DtT(7=YEN@A9-}3=)>oAR8z8JM2UnFC38$^>@ zP)|>nudbmEJCsq0hGVWPSE61T7I$AX4GUroEsNvejlLfFZs6)nyqA^*v4+&*y7zVX zZFZ}V`)cspz;DyDZj=jgEr>O^76JG#cI05y-O09=EW4djurEqQl|1WqK;= zuB?2N7e9%-_C{~NR9MoqIF{WVy!XWUUk?}R;?AA>$uV^?I=;M|cX-6GRA_M_(Sp1* z2aI{=Dw-zEEscWf$U!Uj$+5xkLLyl-Pf;r`5{s*@t^zoDi`w1ErHRdE@^PPjJd{by zUoUwRoXU&D;^aW>?oiXjXflL2F+3B=tx&@I`YVetmx_Pr9`}Ag6dErOW(ts6kQ7pBQnDgrRe3?6c=2tA_?nh09a&UroXp|MHe6s?sUg+g zY7Q4ztbz-{YB*R97t~k<=UDgj7T@42BKK?2wm6on;9|NqtaVscUWFFNa#&E9CP-@? zrj?gyaqYXG6~wW#gZ8jMDot{09qyyRm&=P1cEF99Zw=4%~Xi=#O#D2A$Q9TbbBJuJwlY-^oT7RPE>kUiUGS?fTHYu{t> zuB@!`n(C@h-@zC9Im*L=t+h@Ow$?gQY^`-3hP4hZ56W7n6hxwPY}U1o9EwEe*i363 z6sU;KQO>mv4pc=$)L!e5KwWeW)@vOlFcY1F#ac%x%tb?Jt#xRjis&4qYn_JzC|-PZ d!3Y3l;D6m|zvi+m8QK5<002ovPDHLkV1fru&l>;$ literal 0 HcmV?d00001 diff --git a/src/components/AuthBox/authBox.scss b/src/components/AuthBox/authBox.scss index 739ca575..73c2f1d3 100644 --- a/src/components/AuthBox/authBox.scss +++ b/src/components/AuthBox/authBox.scss @@ -133,13 +133,14 @@ text-align: center; border: 2px solid #6aaf5c; margin-right: 1.5rem; + transition: 0.3s; &:hover { - background-image: none; - background-color: #ffffff; - border: 2px solid #6aaf5c; - color: #6aaf5c !important; - transition: 0.3s; + transform: scale(1.03); + //background-image: none; + //background-color: #ffffff; + //border: 2px solid #6aaf5c; + //color: #6aaf5c !important; .loader * { fill: #6aaf5c; diff --git a/src/components/Common/Loader/loader.scss b/src/components/Common/Loader/loader.scss index bfb8b104..980447e7 100644 --- a/src/components/Common/Loader/loader.scss +++ b/src/components/Common/Loader/loader.scss @@ -6,9 +6,9 @@ align-items: center; position: relative; - &:hover { - path { - fill: #6aaf5c; - } - } + //&:hover { + // path { + // fill: #6aaf5c; + // } + //} } diff --git a/src/components/Common/ModalLayout/modalLayout.scss b/src/components/Common/ModalLayout/modalLayout.scss index 0f9639c2..f64ff98f 100644 --- a/src/components/Common/ModalLayout/modalLayout.scss +++ b/src/components/Common/ModalLayout/modalLayout.scss @@ -15,11 +15,60 @@ position: relative; background: linear-gradient(180deg, #ffffff 0%, #ebebeb 100%); border-radius: 24px; - padding: 60px 60px 30px 60px; + padding: 20px 40px 30px 40px; display: flex; flex-direction: column; align-items: center; justify-content: center; + + .selectPerson { + align-items: start; + + &__info { + font-size: 15px; + font-weight: 300; + margin: 12px 0 20px; + } + } + + .invite__blocks { + display: flex; + column-gap: 20px; + + span { + margin-top: 8px; + font-size: 15px; + font-weight: 300; + } + + .invitePersonBlock { + display: flex; + flex-direction: column; + row-gap: 20px; + &__input { + margin: 0; + min-width: 320px; + height: 42px; + + input { + height: 42px; + } + } + + &__btn { + margin: 0 auto 0 0; + max-width: 242px; + width: 100%; + } + } + } + + .select__person { + display: flex; + flex-direction: column; + row-gap: 10px; + padding: 39px 10px 29px 10px; + } } } diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx index 640f6d46..a711a0ab 100644 --- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx +++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx @@ -363,9 +363,9 @@ export const ModalTiсket = ({
- Задача {editOpen ? ( { setInputsValue((prevValue) => ({ @@ -463,8 +463,8 @@ export const ModalTiсket = ({
- setActive(false)}> - {task.title} + setActive(false)}> +

Создатель : {task.user?.fio}

{executor ? ( diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss index a5f8c70b..8baa91cf 100644 --- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss +++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss @@ -33,6 +33,9 @@ display: flex; align-items: center; flex-direction: row; + color: #1458DD; + font-weight: 700; + font-size: 22px; &__category { margin-right: 17px; @@ -104,9 +107,9 @@ h5 { font-family: "Inter", sans-serif; - font-weight: 500; + font-weight: 600; font-style: normal; - font-size: 16px; + font-size: 19px; line-height: 24px; color: #1a1919; margin-bottom: 0; @@ -280,7 +283,7 @@ &__description { display: flex; flex-direction: column; - margin-top: 10px; + margin-top: 12px; textarea { min-height: 120px; @@ -405,6 +408,7 @@ display: flex; flex-direction: column; font-size: 14px; + margin-top: 8px; &__list { display: flex; @@ -420,13 +424,17 @@ .exit { cursor: pointer; position: absolute; - top: 35px; - right: 40px; + top: 25px; + right: 30px; + width: 13px; + height: 13px; + display: flex; + align-items: center; + justify-content: center; &:before, &:after { content: ""; - position: absolute; width: 16px; height: 2px; background: #263238; @@ -459,6 +467,7 @@ align-items: center; position: relative; margin-bottom: 5px; + margin-top: 12px; span { color: #000000; @@ -552,6 +561,7 @@ overflow: hidden; white-space: nowrap; text-overflow: ellipsis; + margin-bottom: 8px; span { margin-left: 5px; @@ -585,7 +595,6 @@ .task__info { display: flex; flex-direction: column; - row-gap: 5px; .delete { cursor: pointer; @@ -669,6 +678,10 @@ align-items: center; padding-left: 10px; + img { + width: 11px; + } + p { margin: 0 0 0 12px; } diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index b6acf4fb..a8451048 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -24,8 +24,7 @@ import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadc import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; import TrackerTaskComment from "@components/TrackerTaskComment/TrackerTaskComment"; -import archive from "assets/icons/archive.svg"; -import archive2 from "assets/icons/archive.svg"; +import archive from "assets/images/archiveIcon.png"; import arrow from "assets/icons/arrows/arrowCalendar.png"; import arrowStart from "assets/icons/arrows/arrowStart.png"; import close from "assets/icons/close.png"; @@ -412,7 +411,7 @@ export const TicketFullScreen = () => { <>
-
+
Проект : {projectInfo.name}
{
- Задача {editOpen ? ( { setInputsValue((prevValue) => ({ @@ -810,7 +809,7 @@ export const TicketFullScreen = () => {

ссылка на задачу

- arch + arch

в архив

diff --git a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx index 8a9db262..7b38a024 100644 --- a/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx +++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx @@ -53,7 +53,7 @@ export const TrackerModal = ({ const [valueColumn, setValueColumn] = useState(""); const [nameProject, setNameProject] = useState(""); const [valueTiket, setValueTiket] = useState(""); - const [descriptionTicket, setDescriptionTicket] = useState("Описание задачи"); + const [descriptionTicket, setDescriptionTicket] = useState(""); const [workers, setWorkers] = useState([]); const [selectWorkersOpen, setSelectWorkersOpen] = useState(false); const [selectedWorker, setSelectedWorker] = useState(null); @@ -271,62 +271,78 @@ export const TrackerModal = ({ // }} > {modalType === "addWorker" && ( -
-
-

Добавьте участника

- {/*
*/} - {/* setEmailWorker(e.target.value)}*/} - {/* />*/} - {/*
*/} -
setSelectWorkersOpen(!selectWorkersOpen)} - > -

- {selectedWorker - ? selectedWorker.employee.fio - : "Выберите пользователя"} -

- arrow - {Boolean(selectWorkersOpen) && ( -
- {Boolean(workers.length) ? ( - workers.map((worker) => { - if (worker === selectedWorker) { - return; - } - return ( -
{ - setSelectedWorker(worker); - }} - > -

{worker.employee.fio}

- avatar -
- ); - }) - ) : ( -
Нет пользователей
- )} + <> +
+
+

Добавьте участника

+ {/*
*/} + {/* setEmailWorker(e.target.value)}*/} + {/* />*/} + {/*
*/} +

Выберите пользователя в проекте или добавьте по e- mail

+
+
+
setSelectWorkersOpen(!selectWorkersOpen)} + > +

+ {selectedWorker + ? selectedWorker.employee.fio + : "Выберите пользователя"} +

+ arrow + {Boolean(selectWorkersOpen) && ( +
+ {Boolean(workers.length) ? ( + workers.map((worker) => { + if (worker === selectedWorker) { + return; + } + return ( +
{ + setSelectedWorker(worker); + }} + > +

{worker.employee.fio}

+ avatar +
+ ); + }) + ) : ( +
Нет пользователей
+ )} +
+ )} +
+ + Добавить +
- )} + или +
+
+ +
+ + Отправить приглашение + +
+
- - Добавить - -
+ )} {modalType === "createTiketProject" && ( <> @@ -334,6 +350,7 @@ export const TrackerModal = ({

Введите название и описание задачи

setValueTiket(e.target.value)} @@ -355,6 +372,7 @@ export const TrackerModal = ({ "blockQuote", ], removePlugins: ["BlockQuote"], + placeholder: "Описание задачи" }} onChange={(event, editor) => { const data = editor.getData(); @@ -443,6 +461,7 @@ export const TrackerModal = ({

{titleProject}

setNameProject(e.target.value)} @@ -477,6 +496,7 @@ export const TrackerModal = ({

Введите название колонки

setValueColumn(e.target.value)} diff --git a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss index fc4253af..8cea178d 100644 --- a/src/components/Modal/Tracker/TrackerModal/trackerModal.scss +++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss @@ -30,7 +30,6 @@ display: flex; align-items: center; flex-direction: column; - margin: 0 0 15px 0; row-gap: 5px; .select-priority { @@ -79,7 +78,7 @@ } .input-container { - width: 320px; + width: 100%; height: 35px; background: #ffffff; border-radius: 8px; @@ -91,7 +90,7 @@ } .ck-editor { - max-width: 320px; + width: 100%; } .ck-editor__editable.ck-rounded-corners { @@ -104,6 +103,10 @@ border-radius: 8px 8px 0 0 !important; } + .ck-placeholder { + display: block !important; + } + .ck-content { border: none !important; border-radius: 0 0 8px 8px !important; @@ -111,7 +114,7 @@ } .select__executor { - width: 320px; + width: 100%; background: white; border-radius: 8px; margin: 5px 0; @@ -215,6 +218,7 @@ cursor: pointer; position: relative; min-width: 320px; + height: 42px; width: 100%; p { @@ -237,7 +241,7 @@ position: absolute; width: 100%; padding: 9.5px 12px; - top: 35px; + top: 48px; left: 0; background: white; border-radius: 5px; @@ -286,6 +290,11 @@ margin: 0 auto; } +.addPersonBtn { + margin: 0 auto 0 0; + margin-top: 20px; +} + .modal-add.active { transform: scale(1); } @@ -293,8 +302,13 @@ .exit { cursor: pointer; position: absolute; - top: 35px; - right: 40px; + top: 15px; + right: 20px; + width: 13px; + height: 13px; + display: flex; + align-items: center; + justify-content: center; &:before, &:after { diff --git a/src/components/Modal/TrackerModal/trackerModal.scss b/src/components/Modal/TrackerModal/trackerModal.scss index 5bba0676..6917c1b2 100644 --- a/src/components/Modal/TrackerModal/trackerModal.scss +++ b/src/components/Modal/TrackerModal/trackerModal.scss @@ -153,11 +153,15 @@ position: absolute; top: 35px; right: 40px; + width: 13px; + height: 13px; + display: flex; + align-items: center; + justify-content: center; &:before, &:after { content: ""; - position: absolute; width: 16px; height: 2px; background: #263238; diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index 812905f4..86a8f0c9 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/src/pages/ProjectTracker/ProjectTracker.js @@ -34,7 +34,7 @@ import { Navigation } from "@components/Navigation/Navigation"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; -import archive from "assets/icons/archiveTracker.svg"; +import archive from "assets/images/archiveIcon.png"; import arrow from "assets/icons/arrows/arrowCalendar.png"; import arrowDown from "assets/icons/arrows/selectArrow.png"; import close from "assets/icons/close.png"; @@ -390,7 +390,7 @@ export const ProjectTracker = () => { />
{projectBoard.projectUsers?.length} - участник + {caseOfNum(projectBoard.projectUsers?.length, "persons")}
В проекте - @@ -480,7 +480,7 @@ export const ProjectTracker = () => { setSelectedExecutorOpen(!selectExecutorOpen) } > -

Выберите исполнитель

+

Выберите исполнителя

4 && number % 100 < 20 + ? 2 + : cases[number % 10 < 5 ? number % 10 : 5] + ]; + } }