diff --git a/src/KBBoard/BoardLogic.js b/src/KBBoard/BoardLogic.js index 302cccf..24bb330 100644 --- a/src/KBBoard/BoardLogic.js +++ b/src/KBBoard/BoardLogic.js @@ -11,8 +11,11 @@ import { export const useBoardLogic = (id, setError, setInfo, setCategories, setLoading, setItems) => { const navigate = useNavigate(); - const loadBoardData = useCallback(async () => { - setLoading(true); + const loadBoardData = useCallback(async (ws) => { + if (!ws){ + setLoading(true); + } + try { setError(''); const response = await loadBoardDataAPI(id); @@ -112,14 +115,16 @@ export const useBoardLogic = (id, setError, setInfo, setCategories, setLoading, }, [loadBoardData, setLoading, setError]); const editTask = useCallback(async (editedTaskId, taskTitle, taskDescription, taskPosition, taskDeadline, taskCategory, modalEditTask) => { - setLoading(true); + if(modalEditTask !== null) { + setLoading(true); + } try { if (typeof taskDeadline != "string") { taskDeadline = null } await updateTaskAPI(editedTaskId, taskTitle, taskDescription, taskPosition, taskDeadline, taskCategory); - await loadBoardData(); if(modalEditTask !== null) { + await loadBoardData(); modalEditTask({}, null)(); } } catch (err) { diff --git a/src/KBBoard/KBBoard.js b/src/KBBoard/KBBoard.js index 7096881..c69d452 100644 --- a/src/KBBoard/KBBoard.js +++ b/src/KBBoard/KBBoard.js @@ -90,7 +90,7 @@ const KBBoard = () => { }; ws.onmessage = (event) => { const message = JSON.parse(event.data); - loadBoardData(); + loadBoardData(true); }; ws.onclose = () => console.log('WebSocket соединение закрыто'); ws.onerror = (error) => console.error('Ошибка WebSocket:', error); diff --git a/src/_Shablon.js b/src/_Shablon.js index 1dc95e3..9e8f206 100644 --- a/src/_Shablon.js +++ b/src/_Shablon.js @@ -1,6 +1,8 @@ import { useState, useEffect } from 'react'; +import { useParams, useNavigate } from 'react-router-dom'; import axios from 'axios'; -import Header from './Header'; +import Header from './../Header'; +import './../css/my.css'; const Name = () => { const [user, setUser] = useState(null);