diff --git a/src/KBBoard/KBBoard.js b/src/KBBoard/KBBoard.js index c69d452..413cce5 100644 --- a/src/KBBoard/KBBoard.js +++ b/src/KBBoard/KBBoard.js @@ -1,12 +1,12 @@ -import { useState, useEffect } from 'react'; -import { useParams, useNavigate } from 'react-router-dom'; -import { useBoardLogic } from './BoardLogic'; +import {useEffect, useState} from 'react'; +import {useNavigate, useParams} from 'react-router-dom'; +import {useBoardLogic} from './BoardLogic'; import Header from './../Header'; import './../css/Board.css'; const KBBoard = () => { const navigate = useNavigate(); - const { id } = useParams(); + const {id} = useParams(); const [error, setError] = useState(''); const [loading, setLoading] = useState(false); const [info, setInfo] = useState({}); @@ -64,9 +64,11 @@ const KBBoard = () => { deleteMember, } = useBoardLogic(id, setError, setInfo, setCategories, setLoading, setItems); - function ListItem({ item }) { + function ListItem({item}) { if (!item) return null; - const user = () => { navigate('/profile/' + item.id); }; + const user = () => { + navigate('/profile/' + item.id); + }; return ( <>

-

@@ -379,11 +380,11 @@ const KBBoard = () => {

Описание: {info.description ? info.description : 'Отсутствует'}

-
+
{loading ? ( <> - + ) : isOwner ? ( <>
-
+
{categories.map((category) => ( -
handleCategoryDragStart(e, category)} - onDragLeave={handleDragLeave} - onDragEnd={handleDragEnd} - onDragOver={handleDragOver} - onDrop={(e) => handleCategoryReorder(e, category.position)} +
handleCategoryDragStart(e, category)} + onDragLeave={handleDragLeave} + onDragEnd={handleDragEnd} + onDragOver={handleDragOver} + onDrop={(e) => handleCategoryReorder(e, category.position)} >
+
{category.tasks.length > 0 ? ( category.tasks.map((task) => ( -
)} {task.assigned_users[0] !== undefined && (
Исполнители: {task.assigned_users.map((member) => ( - + ))} -
+
)} )) @@ -461,10 +465,10 @@ const KBBoard = () => {

Нет задач

)}
handleTaskReorder(e, category.tasks.length, category.position)} - onDragLeave={handleDragLeave} - onDragEnd={handleDragEnd} - onDragOver={handleDragOver} + onDrop={(e) => handleTaskReorder(e, category.tasks.length, category.position)} + onDragLeave={handleDragLeave} + onDragEnd={handleDragEnd} + onDragOver={handleDragOver} >
@@ -483,18 +487,18 @@ const KBBoard = () => {
) : ( <> - )} + )}
{memList && (

Изменение задачи

- +
{items.length > 0 ? ( items.map((item) => ( - + )) ) : (

Нет участников

@@ -511,7 +515,7 @@ const KBBoard = () => {

Новая категория

- + {

Новая задача

- + setTaskTitle(e.target.value)} required /> - + {
- setAssignedMembers(e.target.value)}> @@ -585,14 +590,14 @@ const KBBoard = () => {

Изменение доски

- + setBoardTitle(e.target.value)} required /> - + {

Изменение категории

- + {

Изменение задачи

- + setTaskTitle(e.target.value)} required /> - + { required />
-
- +
- +
@@ -689,7 +695,7 @@ const KBBoard = () => { {loading ? 'Изменение...' : 'Изменить'} - +
@@ -700,12 +706,12 @@ const KBBoard = () => {

Удаление задачи

- + -
+
)} @@ -715,7 +721,7 @@ const KBBoard = () => {

Удаление категории

- +
- ); + ); } export default KBBoard; \ No newline at end of file