From 055225d747e627831cff1faa5fe046f04061925a Mon Sep 17 00:00:00 2001 From: MaxOvs19 Date: Thu, 22 Jun 2023 19:18:41 +0300 Subject: [PATCH] Fixed buttons in tracker page --- .../Modal/Tracker/ModalTicket/ModalTicket.jsx | 20 ++++++-- .../Tracker/ModalTicket/modalTicket.scss | 18 +++++--- .../TicketFullScreen/TicketFullScreen.jsx | 19 ++++---- .../TrackerModal/TrackerModal.jsx | 46 +++++++++++-------- .../TrackerModal/trackerModal.scss | 9 ++-- src/components/ProjectTiket/ProjectTiket.jsx | 2 +- .../TrackerTaskComment/TrackerTaskComment.jsx | 17 ++++--- src/pages/ProjectTracker/ProjectTracker.js | 16 +++++-- src/pages/Tracker/Tracker.js | 2 +- src/pages/Tracker/tracker.scss | 17 ++++--- 10 files changed, 103 insertions(+), 63 deletions(-) rename src/components/Modal/{ => Tracker}/TrackerModal/TrackerModal.jsx (92%) rename src/components/Modal/{ => Tracker}/TrackerModal/trackerModal.scss (95%) diff --git a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx index cb5dd6bc..44ab28cc 100644 --- a/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx +++ b/src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx @@ -9,7 +9,7 @@ import { getCorrectRequestDate, urlForLocal } from "@utils/helper"; import { apiRequest } from "@api/request"; import BaseButton from "@components/Common/BaseButton/BaseButton"; -import TrackerModal from "@components/Modal/TrackerModal/TrackerModal"; +import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal"; import TrackerTaskComment from "@components/TrackerTaskComment/TrackerTaskComment"; import archive from "assets/icons/archive.svg"; @@ -370,10 +370,10 @@ export const ModalTiсket = ({

- + {0} Файлов

@@ -425,7 +425,12 @@ export const ModalTiсket = ({ ) : (
- + setDropListOpen(true)} + styles={"button-add-worker"} + > + + + Добавить исполнителя {dropListOpen && (
@@ -473,7 +478,12 @@ export const ModalTiсket = ({ )}
- + setDropListMembersOpen(true)} + styles={"button-add-worker"} + > + + + Добавить участников {dropListMembersOpen && (
diff --git a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss index b77a7253..954b1c3c 100644 --- a/src/components/Modal/Tracker/ModalTicket/modalTicket.scss +++ b/src/components/Modal/Tracker/ModalTicket/modalTicket.scss @@ -277,7 +277,7 @@ justify-content: space-between; margin-left: 20px; - button { + .button-add-file { display: flex; align-items: center; justify-content: center; @@ -332,6 +332,10 @@ cursor: pointer; margin-right: 18px; } + + &:focus-within { + border: 1px solid #0000004d; + } } } @@ -392,6 +396,7 @@ display: flex; align-items: center; position: relative; + margin-bottom: 5px; span { color: #000000; @@ -402,17 +407,12 @@ font-weight: 400; } - button { - cursor: pointer; - background: #8bcc60; - border-radius: 44px; + .button-add-worker { width: 33px; height: 33px; display: flex; justify-content: center; align-items: center; - border: none; - color: white; font-size: 17px; } } @@ -601,6 +601,10 @@ font-weight: 700; } } + + p:hover { + text-decoration: underline; + } } } } diff --git a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx index 40cd4821..5338a2f1 100644 --- a/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx +++ b/src/components/Modal/Tracker/TicketFullScreen/TicketFullScreen.jsx @@ -18,7 +18,7 @@ import { apiRequest } from "@api/request"; import BaseButton from "@components/Common/BaseButton/BaseButton"; import { Footer } from "@components/Common/Footer/Footer"; import { Loader } from "@components/Common/Loader/Loader"; -import TrackerModal from "@components/Modal/TrackerModal/TrackerModal"; +import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal"; import { Navigation } from "@components/Navigation/Navigation"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; @@ -386,10 +386,10 @@ export const TicketFullScreen = () => {

- + {0} Файлов

@@ -441,25 +441,28 @@ export const TicketFullScreen = () => {
- + Добавить исполнителя
- + + Добавить участников
diff --git a/src/components/Modal/TrackerModal/TrackerModal.jsx b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx similarity index 92% rename from src/components/Modal/TrackerModal/TrackerModal.jsx rename to src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx index da44c264..c77c53fe 100644 --- a/src/components/Modal/TrackerModal/TrackerModal.jsx +++ b/src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx @@ -1,8 +1,6 @@ import React, { useEffect, useState } from "react"; import { useDispatch, useSelector } from "react-redux"; -import { apiRequest } from "../../../api/request"; -import arrowDown from "../../../assets/icons/arrows/selectArrow.png"; import { addPersonToProject, editColumnName, @@ -16,8 +14,16 @@ import { setColumnPriority, setProject, setProjectBoardFetch, -} from "../../../redux/projectsTrackerSlice"; -import { urlForLocal } from "../../../utils/helper"; +} from "@redux/projectsTrackerSlice"; + +import { urlForLocal } from "@utils/helper"; + +import { apiRequest } from "@api/request"; + +import BaseButton from "@components/Common/BaseButton/BaseButton"; + +import arrowDown from "assets/icons/arrows/selectArrow.png"; + import "./trackerModal.scss"; export const TrackerModal = ({ @@ -266,9 +272,9 @@ export const TrackerModal = ({ )}
- + )} {modalType === "createTiketProject" && ( @@ -292,9 +298,9 @@ export const TrackerModal = ({ /> - + )} {modalType === "editProject" && ( @@ -309,9 +315,10 @@ export const TrackerModal = ({ /> - + )} {modalType === "createProject" && ( @@ -325,9 +332,9 @@ export const TrackerModal = ({ onChange={(e) => setNameProject(e.target.value)} /> - + )} @@ -343,9 +350,12 @@ export const TrackerModal = ({ - + )} {modalType === "createColumn" && ( @@ -360,9 +370,9 @@ export const TrackerModal = ({ /> - + )} {modalType === "editColumn" && ( @@ -388,9 +398,9 @@ export const TrackerModal = ({ /> - + )} diff --git a/src/components/Modal/TrackerModal/trackerModal.scss b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss similarity index 95% rename from src/components/Modal/TrackerModal/trackerModal.scss rename to src/components/Modal/Tracker/TrackerModal/trackerModal.scss index 8e73a9f1..c8f6ccc4 100644 --- a/src/components/Modal/TrackerModal/trackerModal.scss +++ b/src/components/Modal/Tracker/TrackerModal/trackerModal.scss @@ -28,6 +28,7 @@ display: flex; align-items: center; flex-direction: column; + margin: 0 0 15px 0; .input-container { width: 287px; @@ -129,13 +130,13 @@ .button-add { width: 130px; height: 37px; - background: #52b709; - border-radius: 44px; - border: none; + // background: #52b709; + // border-radius: 44px; + // border: none; font-weight: 400; font-size: 15px; line-height: 32px; - color: #ffffff; + // color: #ffffff; display: flex; align-items: center; justify-content: center; diff --git a/src/components/ProjectTiket/ProjectTiket.jsx b/src/components/ProjectTiket/ProjectTiket.jsx index 6d565cd3..9eda3bc3 100644 --- a/src/components/ProjectTiket/ProjectTiket.jsx +++ b/src/components/ProjectTiket/ProjectTiket.jsx @@ -7,7 +7,7 @@ import { deleteProject, modalToggle } from "@redux/projectsTrackerSlice"; import { apiRequest } from "@api/request"; import { ModalSelect } from "@components/Modal/ModalSelect/ModalSelect"; -import TrackerModal from "@components/Modal/TrackerModal/TrackerModal"; +import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal"; import archiveSet from "assets/icons/archive.svg"; import del from "assets/icons/delete.svg"; diff --git a/src/components/TrackerTaskComment/TrackerTaskComment.jsx b/src/components/TrackerTaskComment/TrackerTaskComment.jsx index c20fb0dd..30f487e4 100644 --- a/src/components/TrackerTaskComment/TrackerTaskComment.jsx +++ b/src/components/TrackerTaskComment/TrackerTaskComment.jsx @@ -1,12 +1,15 @@ import React, { useState } from "react"; -import { apiRequest } from "../../api/request"; -import del from "../../assets/icons/delete.svg"; -import edit from "../../assets/icons/edit.svg"; -import accept from "../../assets/images/accept.png"; -import { urlForLocal } from "../../utils/helper"; -import { getCorrectDate } from "../Calendar/calendarHelper"; -import TrackerTaskSubComment from "../TrackerTaskComment/TrackerTaskComment"; +import { urlForLocal } from "@utils/helper"; + +import { apiRequest } from "@api/request"; + +import { getCorrectDate } from "@components/Calendar/calendarHelper"; +import TrackerTaskSubComment from "@components/TrackerTaskComment/TrackerTaskComment"; + +import del from "assets/icons/delete.svg"; +import edit from "assets/icons/edit.svg"; +import accept from "assets/images/accept.png"; export const TrackerTaskComment = ({ taskId, diff --git a/src/pages/ProjectTracker/ProjectTracker.js b/src/pages/ProjectTracker/ProjectTracker.js index 658e7cf2..3219ed46 100644 --- a/src/pages/ProjectTracker/ProjectTracker.js +++ b/src/pages/ProjectTracker/ProjectTracker.js @@ -23,10 +23,11 @@ import { urlForLocal } from "@utils/helper"; import { apiRequest } from "@api/request"; +import BaseButton from "@components/Common/BaseButton/BaseButton"; 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/TrackerModal/TrackerModal"; +import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal"; import { Navigation } from "@components/Navigation/Navigation"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; @@ -298,14 +299,23 @@ export const ProjectTracker = () => {

Проект : {projectBoard.name}

- { + dispatch(modalToggle("createColumn")); + setModalAdd(true); + }} + styles={"button-add-column"} + > + + + + {/* { dispatch(modalToggle("createColumn")); setModalAdd(true); }} > + - + */}

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

diff --git a/src/pages/Tracker/Tracker.js b/src/pages/Tracker/Tracker.js index 43701068..aaf9df86 100644 --- a/src/pages/Tracker/Tracker.js +++ b/src/pages/Tracker/Tracker.js @@ -16,7 +16,7 @@ import { apiRequest } from "@api/request"; import { getCorrectDate } from "@components/Calendar/calendarHelper"; import { Footer } from "@components/Common/Footer/Footer"; import { Loader } from "@components/Common/Loader/Loader"; -import TrackerModal from "@components/Modal/TrackerModal/TrackerModal"; +import TrackerModal from "@components/Modal/Tracker/TrackerModal/TrackerModal"; import { Navigation } from "@components/Navigation/Navigation"; import { ProfileBreadcrumbs } from "@components/ProfileBreadcrumbs/ProfileBreadcrumbs"; import { ProfileHeader } from "@components/ProfileHeader/ProfileHeader"; diff --git a/src/pages/Tracker/tracker.scss b/src/pages/Tracker/tracker.scss index 7c9e2395..0523eb52 100644 --- a/src/pages/Tracker/tracker.scss +++ b/src/pages/Tracker/tracker.scss @@ -232,13 +232,11 @@ &__add { display: flex; - span { + margin: 0 15px 0 10px; + + .button-add-column { width: 33px; height: 33px; - background: #52b709; - border-radius: 44px; - color: whitesmoke; - cursor: pointer; font-size: 15px; display: flex; align-items: center; @@ -315,7 +313,7 @@ z-index: 2; display: flex; flex-direction: column; - background: linear-gradient(180deg, #FFFFFF 0%, #EBEBEB 100%); + background: linear-gradient(180deg, #ffffff 0%, #ebebeb 100%); border-radius: 40px; padding: 33px 24px 44px 34px; width: 425px; @@ -331,7 +329,7 @@ &__count { display: flex; align-items: end; - color: #1458DD; + color: #1458dd; font-size: 22px; margin-top: 10px; span { @@ -355,7 +353,7 @@ span { width: auto; height: auto; - color: #1458DD; + color: #1458dd; font-weight: 600; font-size: 18px; line-height: 22px; @@ -407,7 +405,7 @@ cursor: pointer; span { - background: #8BCC60; + background: #8bcc60; left: 0; } @@ -424,6 +422,7 @@ } &__checkBox { + margin: 0 15px 0 0; cursor: pointer; display: flex; align-items: center;