diff --git a/src/components/UI/ModalTiket/ModalTiket.js b/src/components/UI/ModalTiket/ModalTiket.js index 1f8bc842..9bdffe34 100644 --- a/src/components/UI/ModalTiket/ModalTiket.js +++ b/src/components/UI/ModalTiket/ModalTiket.js @@ -5,9 +5,9 @@ import creatorMock from "../../../images/avatarMoсkCreator.png"; import avatarMock1 from "../../../images/avatarMoсk1.png"; import avatarMock2 from "../../../images/avatarMoсk2.png"; import category from "../../../images/category.png"; -import comments from "../../../images/comments.png"; +import comments from "../../../images/commentsBoard.svg"; import watch from "../../../images/watch.png"; -import files from "../../../images/files.png"; +import files from "../../../images/filesBoard.svg"; import task from "../../../images/tasksMock.png"; import arrow from "../../../images/arrowStart.png"; @@ -88,7 +88,7 @@ export const ModalTiket = ({ active, setActive }) => { })} -
+
Добавить участников
diff --git a/src/components/UI/ModalTiket/ModalTiket.scss b/src/components/UI/ModalTiket/ModalTiket.scss index 160adeaa..a2c74a53 100644 --- a/src/components/UI/ModalTiket/ModalTiket.scss +++ b/src/components/UI/ModalTiket/ModalTiket.scss @@ -134,14 +134,26 @@ } button { + cursor: pointer; background: #8bcc60; + border-radius: 44px; width: 33px; height: 33px; + display: flex; + justify-content: center; + align-items: center; + border: none; + color: white; + font-size: 17px; } } .start { margin-top: 25px; + width: 151px; + height: 40px; + border: none; + color: white; background: #1458dd; border-radius: 44px; diff --git a/src/images/comments.png b/src/images/comments.png deleted file mode 100644 index f87be131..00000000 Binary files a/src/images/comments.png and /dev/null differ diff --git a/src/images/files.png b/src/images/files.png deleted file mode 100644 index 8f9d9567..00000000 Binary files a/src/images/files.png and /dev/null differ diff --git a/src/pages/Tracker/Tracker.js b/src/pages/Tracker/Tracker.js index c57f3ef4..b2c090d0 100644 --- a/src/pages/Tracker/Tracker.js +++ b/src/pages/Tracker/Tracker.js @@ -1,230 +1,278 @@ -import React, {useState} from 'react'; +import React, { useState } from "react"; -import {ProfileHeader} from "../../components/ProfileHeader/ProfileHeader"; -import {Footer} from '../../components/Footer/Footer' +import { ProfileHeader } from "../../components/ProfileHeader/ProfileHeader"; +import { Footer } from "../../components/Footer/Footer"; -import project from '../../images/trackerProject.svg' -import tasks from '../../images/trackerTasks.svg' -import archive from '../../images/archiveTracker.svg' -import avatarTest from '../../images/AvatarTest .png' -import selectArrow from '../../images/select.svg' -import commentsBoard from '../../images/commentsBoard.svg' -import filesBoard from '../../images/filesBoard.svg' +import project from "../../images/trackerProject.svg"; +import tasks from "../../images/trackerTasks.svg"; +import archive from "../../images/archiveTracker.svg"; +import avatarTest from "../../images/AvatarTest .png"; +import selectArrow from "../../images/select.svg"; +import commentsBoard from "../../images/commentsBoard.svg"; +import filesBoard from "../../images/filesBoard.svg"; -import './tracker.scss' +import "./tracker.scss"; +import ModalTiket from "../../components/UI/ModalTiket/ModalTiket"; export const Tracker = () => { + const [toggleTab, setToggleTab] = useState(1); + const [projects] = useState([ + { + name: "Разработка трекера", + count: 4, + }, + { + name: "Кинотеатр", + count: 4, + }, + { + name: "Проект страхование", + count: 4, + }, + ]); + const [tabTaskMok] = useState([ + { + name: "Открытые", + tasks: [ + { + task: "PR - 2245", + description: "Сверстать часть таблицы. Сверстать часть таблицы", + comments: 12, + files: 0, + avatarCreated: avatarTest, + avatarDo: avatarTest, + }, + { + task: "PR - 2245", + description: "Сверстать часть таблицы. Сверстать часть таблицы", + comments: 12, + files: 0, + avatarCreated: avatarTest, + avatarDo: avatarTest, + }, + ], + }, + { + name: "В процессе", + tasks: [ + { + task: "PR - 2245", + description: "Сверстать часть таблицы. Сверстать часть таблицы", + comments: 12, + files: 0, + avatarCreated: avatarTest, + avatarDo: avatarTest, + }, + ], + }, + { + name: "На проверке", + tasks: [ + { + task: "PR - 2245", + description: "Сверстать часть таблицы. Сверстать часть таблицы", + comments: 12, + files: 0, + avatarCreated: avatarTest, + avatarDo: avatarTest, + }, + { + task: "PR - 2245", + description: "Сверстать часть таблицы. Сверстать часть таблицы", + comments: 12, + files: 0, + avatarCreated: avatarTest, + avatarDo: avatarTest, + }, + { + task: "PR - 2245", + description: "Сверстать часть таблицы. Сверстать часть таблицы", + comments: 12, + files: 0, + avatarCreated: avatarTest, + avatarDo: avatarTest, + }, + ], + }, + { + name: "Готово", + tasks: [ + { + task: "PR - 2245", + description: "Сверстать часть таблицы. Сверстать часть таблицы", + comments: 12, + files: 0, + avatarCreated: avatarTest, + avatarDo: avatarTest, + }, + { + task: "PR - 2245", + description: "Сверстать часть таблицы. Сверстать часть таблицы", + comments: 12, + files: 0, + avatarCreated: avatarTest, + avatarDo: avatarTest, + }, + ], + }, + ]); - const [toggleTab, setToggleTab] = useState(1) - const [projects] = useState([ - { - name: 'Разработка трекера', - count: 4 - }, - { - name: 'Кинотеатр', - count: 4 - }, - { - name: 'Проект страхование', - count: 4 - } - ]) - const [tabTaskMok] = useState([ - { - name: 'Открытые', - tasks: [ - { - task: 'PR - 2245', - description: 'Сверстать часть таблицы. Сверстать часть таблицы', - comments: 12, - files: 0, - avatarCreated: avatarTest, - avatarDo: avatarTest - }, - { - task: 'PR - 2245', - description: 'Сверстать часть таблицы. Сверстать часть таблицы', - comments: 12, - files: 0, - avatarCreated: avatarTest, - avatarDo: avatarTest - } - ] - }, - { - name: 'В процессе', - tasks: [ - { - task: 'PR - 2245', - description: 'Сверстать часть таблицы. Сверстать часть таблицы', - comments: 12, - files: 0, - avatarCreated: avatarTest, - avatarDo: avatarTest - } - ] - }, - { - name: 'На проверке', - tasks: [ - { - task: 'PR - 2245', - description: 'Сверстать часть таблицы. Сверстать часть таблицы', - comments: 12, - files: 0, - avatarCreated: avatarTest, - avatarDo: avatarTest - }, - { - task: 'PR - 2245', - description: 'Сверстать часть таблицы. Сверстать часть таблицы', - comments: 12, - files: 0, - avatarCreated: avatarTest, - avatarDo: avatarTest - }, - { - task: 'PR - 2245', - description: 'Сверстать часть таблицы. Сверстать часть таблицы', - comments: 12, - files: 0, - avatarCreated: avatarTest, - avatarDo: avatarTest - } - ] - }, - { - name: 'Готово', - tasks: [ - { - task: 'PR - 2245', - description: 'Сверстать часть таблицы. Сверстать часть таблицы', - comments: 12, - files: 0, - avatarCreated: avatarTest, - avatarDo: avatarTest - }, - { - task: 'PR - 2245', - description: 'Сверстать часть таблицы. Сверстать часть таблицы', - comments: 12, - files: 0, - avatarCreated: avatarTest, - avatarDo: avatarTest - } - ] - } - ]) + const [modalActiveTicket, setModalActiveTicket] = useState(false); - const toggleTabs = (index) => { - setToggleTab(index) - } - return ( -
- -
-
-

Трекер

-
-
-
toggleTabs(1)}> - img -

Проекты

-
-
toggleTabs(2)}> - img -

Задачи

-
-
toggleTabs(3)}> - img -

Архив

-
-
-
-
- {projects.map((project, index) => { - return
-

{project.name}

-
-

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

- {project.count} - + -
-
- }) - } - -
-
-
-

Проект : Разработка трекера

- + -
- avatar - avatar - avatar - avatar - +9 -
-
- Учавствую - arrow -
-
- Мои - arrow -
-
-
- {tabTaskMok.map((section, index) => { - return
= 3 ? 'tasks__board tasks__board__more' : 'tasks__board'}> -
- {section.name} -
- + - ... -
-
- {section.tasks.map((task, index) => { - return
-
-

{task.task}

- ... -
-

- {task.description} -

-
-
- commentsImg - {task.comments} коментариев -
-
- filesImg - {task.files} файлов -
-
- avatar - avatar -
-
-
- }) - } - {section.tasks.length >= 3 && - + - } -
- }) - } -
-
-
-
-
+ const toggleTabs = (index) => { + setToggleTab(index); + }; + return ( +
+ +
+
+

Трекер

+
+
+
toggleTabs(1)} + > + img +

Проекты

+
+
toggleTabs(2)} + > + img +

Задачи

+
+
toggleTabs(3)} + > + img +

Архив

+
-
+
+
+ {projects.map((project, index) => { + return ( +
+

{project.name}

+
+

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

+ {project.count} + + +
+
+ ); + })} + + +
+
+
+

Проект : Разработка трекера

+ + +
+ avatar + avatar + avatar + avatar + +9 +
+
+ Учавствую + arrow +
+
+ Мои + arrow +
+
+ + +
+ {tabTaskMok.map((section, index) => { + return ( +
= 3 + ? "tasks__board tasks__board__more" + : "tasks__board" + } + > +
+ + {section.name} + +
+ + + ... +
+
+ {section.tasks.map((task, index) => { + return ( +
setModalActiveTicket(true)} + > +
+

{task.task}

+ ... +
+

+ {task.description} +

+
+
+ commentsImg + {task.comments} коментариев +
+
+ filesImg + {task.files} файлов +
+
+ avatar + avatar +
+
+
+ ); + })} + {section.tasks.length >= 3 && ( + + + )} +
+ ); + })} +
+
+
+
- ) +
+
+ ); };