From deb2fd45334caffbd9f61c60717bad799c2d01a2 Mon Sep 17 00:00:00 2001 From: Vladiysss <139554971+Vladiysss@users.noreply.github.com> Date: Sun, 29 Mar 2026 22:42:53 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D1=83=D0=B1=D1=80=D0=B0=D0=BD=D0=BE=20?= =?UTF-8?q?=D1=81=D0=BE=D1=81=D1=82=D0=BE=D1=8F=D0=BD=D0=B8=D0=B5=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D0=B2=D0=BE=20?= =?UTF-8?q?=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B5=D1=82?= =?UTF-8?q?=D0=B0=D1=81=D0=BA=D0=B8=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D1=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/KBBoard/BoardLogic.js | 13 +++++++++---- src/KBBoard/KBBoard.js | 2 +- src/_Shablon.js | 4 +++- 3 files changed, 13 insertions(+), 6 deletions(-) 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);