diff --git a/src/App.js b/src/App.js
index 6650ee2..d5b0f71 100644
--- a/src/App.js
+++ b/src/App.js
@@ -7,7 +7,7 @@ import Profile from './Profile';
import Registration from './Registration';
import Mainpage from './Mainpage';
import KBBoardsList from './KBBoardsList';
-import KBBoard from './KBBoard';
+import KBBoard from './KBBoard/KBBoard';
import OtherProfile from './OtherProfile';
function App() {
diff --git a/src/KBBoard/BoardAPI.js b/src/KBBoard/BoardAPI.js
new file mode 100644
index 0000000..a40c181
--- /dev/null
+++ b/src/KBBoard/BoardAPI.js
@@ -0,0 +1,33 @@
+import axios from 'axios';
+
+export const loadBoardDataAPI = async (boardId) => {
+ return axios.post('/api/boards/load', { id: boardId });
+};
+
+export const createTaskAPI = async (taskData) => {
+ return axios.post('/api/boards/categories/tasks/create', taskData);
+};
+
+export const createCategoryAPI = async (categoryData) => {
+ return axios.post('/api/boards/categories/create', categoryData);
+};
+
+export const updateTaskAPI = async (updateData) => {
+ return axios.put('/api/boards/categories/tasks/update', updateData);
+};
+
+export const updateCategoryAPI = async (updateData) => {
+ return axios.put('/api/boards/categories/update', updateData);
+};
+
+export const deleteCategoryAPI = async (categoryId) => {
+ return axios.delete('/api/boards/categories/delete', {
+ data: { id: categoryId }
+ });
+};
+
+export const deleteTaskAPI = async (taskId) => {
+ return axios.delete('/api/boards/categories/tasks/delete', {
+ data: { id: taskId }
+ });
+};
\ No newline at end of file
diff --git a/src/KBBoard/BoardLogic.js b/src/KBBoard/BoardLogic.js
new file mode 100644
index 0000000..b974a3a
--- /dev/null
+++ b/src/KBBoard/BoardLogic.js
@@ -0,0 +1,159 @@
+import { useCallback } from 'react';
+import { useNavigate } from 'react-router-dom';
+import {
+ loadBoardDataAPI,
+ createTaskAPI,
+ createCategoryAPI,
+ updateTaskAPI,
+ updateCategoryAPI,
+ deleteCategoryAPI,
+ deleteTaskAPI
+} from './BoardAPI';
+
+export const useBoardLogic = (id, setError, setInfo, setCategories, setLoading) => {
+ const navigate = useNavigate();
+
+ const loadBoardData = useCallback(async () => {
+ setLoading(true);
+ try {
+ setError('');
+ const response = await loadBoardDataAPI(id);
+ setInfo(response.data);
+ setCategories(response.data.categories || []);
+ } catch (err) {
+ if (err.response?.data?.message === 'Token Error' ||
+ err.response?.data?.message === 'Invalid Token') {
+ setError('Вы не авторизованы');
+ setTimeout(() => navigate('/login'), 1000);
+ } else {
+ setError('Ошибка загрузки доски');
+ }
+ } finally {
+ setLoading(false);
+ }
+ }, [id, setError, setInfo, setCategories, setLoading, navigate]);
+
+ const createTask = useCallback(async (taskCategori, taskTitle, taskDescription, modalCrTask) => {
+ setLoading(true);
+ try {
+ const newTask = {
+ category_id: taskCategori,
+ title: taskTitle,
+ description: taskDescription
+ };
+ await createTaskAPI(newTask);
+ await loadBoardData();
+ modalCrTask(null)();
+ } catch (err) {
+ console.error('Ошибка создания задачи:', err);
+ setError('Ошибка создания задачи');
+ } finally {
+ setLoading(false);
+ }
+ }, [loadBoardData, setLoading, setError]);
+
+ const createCategory = useCallback(async (categoryTitle, modalCrCateg) => {
+ setLoading(true);
+ try {
+ const newCategory = {
+ board_id: id,
+ title: categoryTitle
+ };
+ await createCategoryAPI(newCategory);
+ await loadBoardData();
+ } catch (err) {
+ console.error('Ошибка создания категории:', err);
+ setError(err.response?.data?.message || 'Ошибка создания категории');
+ } finally {
+ modalCrCateg();
+ setLoading(false);
+ }
+ }, [id, loadBoardData, setLoading, setError]);
+
+ const editTask = useCallback(async (editedTaskId, taskTitle, taskDescription, taskCategory, modalEditTask) => {
+ setLoading(true);
+ try {
+ await updateTaskAPI({
+ id: editedTaskId,
+ update_method: 'title',
+ value: taskTitle
+ });
+ await updateTaskAPI({
+ id: editedTaskId,
+ update_method: 'description',
+ value: taskDescription
+ });
+ await updateTaskAPI({
+ id: editedTaskId,
+ update_method: 'category',
+ value: Number(taskCategory)
+ });
+ await loadBoardData();
+ modalEditTask({}, null)();
+ } catch (err) {
+ console.error('Ошибка редактирования задачи:', err);
+ setError('Ошибка редактирования задачи');
+ } finally {
+ setLoading(false);
+ }
+ }, [loadBoardData, setLoading, setError]);
+
+ const editCategory = useCallback(async (editedCategId, categoryTitle, modalEditCateg) => {
+ setLoading(true);
+ try {
+ const updateData = {
+ id: editedCategId,
+ update_method: 'title',
+ value: categoryTitle
+ };
+ await updateCategoryAPI(updateData);
+ await loadBoardData();
+ } catch (err) {
+ console.error('Ошибка редактирования категории:', err);
+ setError(err.response?.data?.message || 'Ошибка редактирования категории');
+ } finally {
+ modalEditCateg({})();
+ setLoading(false);
+ }
+ }, [loadBoardData, setLoading, setError]);
+
+ const deleteCategory = useCallback(async (categoryId, modalDelCateg, modalEditCateg) => {
+ setLoading(true);
+ try {
+ await deleteCategoryAPI(categoryId);
+ await loadBoardData();
+ modalDelCateg();
+ modalEditCateg({})();
+ } catch (err) {
+ console.error('Ошибка удаления категории:', err);
+ setError('Ошибка удаления категории');
+ } finally {
+ setLoading(false);
+ }
+ }, [loadBoardData, setLoading, setError]);
+
+ const deleteTask = useCallback(async (taskId, modalDelTask, modalEditTask) => {
+ setLoading(true);
+ try {
+ await deleteTaskAPI(taskId);
+ await loadBoardData();
+ modalDelTask();
+ modalEditTask({}, null)();
+ } catch (err) {
+ console.error('Ошибка удаления задачи:', err);
+ setError('Ошибка удаления задачи');
+ } finally {
+ setLoading(false);
+ }
+ }, [loadBoardData, setLoading, setError]);
+
+ return {
+ loadBoardData,
+ createTask,
+ createCategory,
+ editTask,
+ editCategory,
+ deleteCategory,
+ deleteTask
+ };
+};
\ No newline at end of file
diff --git a/src/KBBoard.js b/src/KBBoard/KBBoard.js
similarity index 77%
rename from src/KBBoard.js
rename to src/KBBoard/KBBoard.js
index 8eaaca3..944357f 100644
--- a/src/KBBoard.js
+++ b/src/KBBoard/KBBoard.js
@@ -1,14 +1,13 @@
-import { useState, useEffect, useCallback } from 'react';
-import { useParams, useNavigate } from 'react-router-dom';
-import axios from 'axios';
-import Header from './Header';
-import './css/Board.css';
+import { useState, useEffect } from 'react';
+import { 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 [error, setError] = useState('');
- const [loading, setLoading] = useState(false)
+ const [loading, setLoading] = useState(false);
const [info, setInfo] = useState({});
const [categories, setCategories] = useState([]);
@@ -18,40 +17,30 @@ const KBBoard = () => {
const [edCateg, setEdCateg] = useState(false);
const [delTask, setDelTask] = useState(false);
const [delCateg, setDelCateg] = useState(false);
-
+
const [categoryTitle, setCategoryTitle] = useState('');
- const [categoryPosition, setCategoryPosition] = useState(null);
const [taskTitle, setTaskTitle] = useState('');
const [taskDescription, setTaskDescription] = useState('');
- const [taskPosition, setTaskPosition] = useState(null);
const [taskCategory, setTaskCategory] = useState(null);
const [taskCategori, setTaskCategori] = useState(null);
const [editedTask, setEditedTask] = useState({});
const [editedCateg, setEditedCateg] = useState({});
+ const [taskPosition, setTaskPosition] = useState(null);
+ const [categoryPosition, setCategoryPosition] = useState(null);
+ const {
+ loadBoardData,
+ createTask,
+ createCategory,
+ editTask,
+ editCategory,
+ deleteCategory,
+ deleteTask
+ } = useBoardLogic(id, setError, setInfo, setCategories, setLoading);
-
- const loadBoardData = useCallback(async () => {
- try {
- setError('')
- const response = await axios.post('/api/boards/load', { id });
- setInfo(response.data);
- setCategories(response.data.categories);
- } catch (err) {
- if (err.response?.data?.message === 'Token Error' || err.response?.data?.message === 'Invalid Token') {
- setError('Вы не авторизованы');
- setTimeout(() => {
- navigate('/login');
- }, 1000);
- } else {
- setError('Ошибка загрузки доски');
- }
- }
- }, [id, navigate]);
useEffect(() => {
if (id) loadBoardData();
}, [id, loadBoardData]);
-
const modalCrTask = (categori) => () => {
setCrTask(!crTask);
@@ -84,82 +73,32 @@ const KBBoard = () => {
const modalDelCateg = () => {
setDelCateg(!delCateg);
}
-
-
-
- const createTask = async (e) => {
- e.preventDefault();
- setLoading(true);
- const newTask = { category_id: taskCategori, title: taskTitle, description: taskDescription };
- await axios.post('/api/boards/categories/tasks/create', newTask);
- await loadBoardData();
- modalCrTask(null)();
- setLoading(false);
- };
- const createCategory = async (e) => {
- e.preventDefault();
- setLoading(true);
- try {
- const newCategory = { board_id: id, title: categoryTitle};
- await axios.post('/api/boards/categories/create', newCategory);
- await loadBoardData();
- } catch (err) {
- setError(err.response.data.message)
- } finally {
- modalCrCateg();
- setLoading(false);
- }
- };
-
- const editTask = async (e) => {
- e.preventDefault();
- setLoading(true);
- var newTask = { id: editedTask.id, update_method: "title", value: taskTitle };
- await axios.put('/api/boards/categories/tasks/update', newTask);
- newTask = { id: editedTask.id, update_method: "description", value: taskDescription };
- await axios.put('/api/boards/categories/tasks/update', newTask);
- newTask = { id: editedTask.id, update_method: "category", value: Number(taskCategory) };
- await axios.put('/api/boards/categories/tasks/update', newTask);
- await loadBoardData();
- modalEditTask({}, null)();
- setLoading(false);
- };
- const editCategory = async (e) => {
- e.preventDefault();
- setLoading(true);
- try {
- const newCategory = { id: editedCateg.id, update_method: "title", value: categoryTitle};
- await axios.put('/api/boards/categories/update', newCategory);
- await loadBoardData();
- } catch (err) {
- setError(err.response.data.message)
- } finally {
- modalEditCateg({})();
- setLoading(false);
- }
- };
-
-
- const deleteCategory = async (e) => {
- e.preventDefault();
- setLoading(true);
- await axios.delete('/api/boards/categories/delete', { data: {id: editedCateg.id} });
- await loadBoardData();
- modalDelCateg();
- modalEditCateg({})();
- setLoading(false);
- }
- const deleteTask = async (e) => {
- e.preventDefault();
- setLoading(true);
- await axios.delete('/api/boards/categories/tasks/delete', { data: { id: editedTask.id } });
- await loadBoardData();
- modalDelTask();
- modalEditTask({},null)();
- setLoading(false);
- }
-
+ const handleCreateCategory = async (e) => {
+ e.preventDefault();
+ await createCategory(categoryTitle, modalCrCateg);
+ };
+ const handleCreateTask = async (e) => {
+ e.preventDefault();
+ await createTask(taskCategori, taskTitle, taskDescription, modalCrTask);
+ };
+ const handleEditCategory = async (e) => {
+ e.preventDefault();
+ await editCategory(editedCateg.id, categoryTitle, modalEditCateg);
+ };
+ const handleEditTask = async (e) => {
+ e.preventDefault();
+ await editTask(editedTask.id, taskTitle, taskDescription, taskCategory, modalEditTask);
+ };
+ const handleDeleteTask = async (e) => {
+ e.preventDefault();
+ await deleteTask(editedTask.id, modalDelTask, modalEditTask);
+ };
+ const handleDeleteCategory = async (e) => {
+ e.preventDefault();
+ await deleteCategory(editedCateg.id, modalDelCateg, modalEditCateg);
+ };
+
return (
@@ -228,12 +167,11 @@ const KBBoard = () => {
)}
-
{crCateg && (