diff --git a/src/components/Common/AuthHeader/AuthHeader.jsx b/src/components/Common/AuthHeader/AuthHeader.jsx index 57f4a333..b1e6c9bb 100644 --- a/src/components/Common/AuthHeader/AuthHeader.jsx +++ b/src/components/Common/AuthHeader/AuthHeader.jsx @@ -35,7 +35,14 @@ export const AuthHeader = () => {
  • - Школа + { + e.preventDefault(); + scrollToForm(); + }} + > + Трекер +
  • diff --git a/src/components/Common/ModalLayout/modalLayout.scss b/src/components/Common/ModalLayout/modalLayout.scss index c2826682..c3be785b 100644 --- a/src/components/Common/ModalLayout/modalLayout.scss +++ b/src/components/Common/ModalLayout/modalLayout.scss @@ -118,7 +118,11 @@ transform: scale(1); } -.createProject { +.createProject, +.createColumn, +.editProject, +.addWorker, +.editColumn { background: linear-gradient(180deg, #fff 0%, #ebebeb 37.29%); .title-project { margin-top: 20px; diff --git a/src/components/ProjectTiket/ProjectTiket.jsx b/src/components/ProjectTiket/ProjectTiket.jsx index 497677ef..34a3aae8 100644 --- a/src/components/ProjectTiket/ProjectTiket.jsx +++ b/src/components/ProjectTiket/ProjectTiket.jsx @@ -26,6 +26,7 @@ export const ProjectTiket = ({ project, index }) => { const [modalSelect, setModalSelect] = useState(false); const [modalAdd, setModalAdd] = useState(false); const [acceptModalOpen, setAcceptModalOpen] = useState(false); + const [path, setPath] = useState(""); const dispatch = useDispatch(); const { showNotification } = useNotification(); @@ -69,25 +70,29 @@ export const ProjectTiket = ({ project, index }) => { setAcceptModalOpen(false); } + function linkProject() {} + return (
    - - {project.name} + +

    {project.name}

    + +
    +

    Открытые задачи

    + + {project.columns.reduce( + (accumulator, currentValue) => + accumulator + currentValue.tasks.length, + 0 + )} + + # +
    -
    -

    Открытые задачи

    - - {project.columns.reduce( - (accumulator, currentValue) => - accumulator + currentValue.tasks.length, - 0 - )} - - # - setModalSelect(true)}> - ... - -
    + + setModalSelect(true)}> + ... + { projectId={project.id} > - + e.stopPropagation()}>
    { diff --git a/src/components/ProjectTiket/projectTiket.scss b/src/components/ProjectTiket/projectTiket.scss index bcb4e3d9..1c5b37fe 100644 --- a/src/components/ProjectTiket/projectTiket.scss +++ b/src/components/ProjectTiket/projectTiket.scss @@ -78,14 +78,14 @@ display: none; } } + } - .menu-settings { - position: absolute; - font-size: 21px; - color: #6f6f6f; - right: 0; - top: -35%; - } + .menu-settings { + position: absolute; + font-size: 21px; + color: #6f6f6f; + right: 26px; + top: 59px; } &__avatar {