Merge pull request #39 from 001elijah/dashboard

Dashboard
001elijah · Jun 27, 2023 · 5d02adc · 5d02adc
2 parents 87e2d2d + 629d46a
commit 5d02adc
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 24 deletions.
diff --git a/src/components/ColumnModalWindow/ColumnModalWindow.jsx b/src/components/ColumnModalWindow/ColumnModalWindow.jsx
@@ -21,29 +21,30 @@ export const ColumnModalWindow = ({
   const [value, setValue] = useState('');
   const theme = useSelector(selectorTheme);
 
-const updateBoard = ()=>{
-  setTimeout(()=>{dispatch(getBoardById(boardId)),0 }) 
-}
+// const updateBoard = ()=>{
+//   setTimeout(()=>{dispatch(getBoardById(boardId)),0 }) 
+// }
 
-  const handleSubmit = e => {
+  const handleSubmit = async (e) => {
     e.preventDefault();
     if (modalTitle === 'Edit column') {
       const editColumnTitle = {
         title: value,
         columnId,
         boardId,
       };
-      dispatch(editColumn(editColumnTitle));
+      await dispatch(editColumn(editColumnTitle));
     } else {
       const newColumn = {
         title: value,
         boardId,
       };
-      dispatch(addColumn(newColumn));
+     await  dispatch(addColumn(newColumn));
     }
     setValue('');
     onClick();
-    updateBoard()
+    dispatch(getBoardById(boardId))
+    // updateBoard()
   };
 
   return (

diff --git a/src/components/TasksColumnHeader/TasksColumnHeader.jsx b/src/components/TasksColumnHeader/TasksColumnHeader.jsx
@@ -6,9 +6,11 @@ import clsx from 'clsx';
 import { ColumnModalWindow } from '../ColumnModalWindow/ColumnModalWindow';
 import { selectorTheme } from 'redux/Auth/authSelectors';
 import { TaskControlButton } from 'components/TaskControlButton/TaskControlButton';
-import { delColumn } from '../../redux/Columns/ColumnOperation';
+import { removeColumn } from '../../redux/Columns/ColumnOperation';
 import s from './TasksColumnHeader.module.scss';
 import { useState } from 'react';
+
+import { getBoardById } from '../../redux/Boards/boardsOperations';
 import { TaskColumn } from '../TaskColumn/TaskColumn';
 
 export const TasksColumnHeader = ({ title, id, boardId }) => {
@@ -17,15 +19,16 @@ export const TasksColumnHeader = ({ title, id, boardId }) => {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const handleModalWindowOpen = () => setIsModalOpen(true);
   const handleModalWindowClose = () => {
+    setIsModalOpen(false);
+  };
 
-      setIsModalOpen(false);}
-
-  const deleteColumn = () => {
+  const deleteColumn = async () => {
     const delData = {
       columnId: id,
-      boardId
+      boardId,
     };
-    dispatch(delColumn(delData));
+    await dispatch(removeColumn(delData));
+    dispatch(getBoardById(boardId))
   };
 
   return (

diff --git a/src/redux/Columns/ColumnOperation.js b/src/redux/Columns/ColumnOperation.js
@@ -32,7 +32,7 @@ export const editColumn = createAsyncThunk(
     }
   },
 );
-export const delColumn = createAsyncThunk(
+export const removeColumn = createAsyncThunk(
   'column/delColumn',
   async (delData, { getState, rejectWithValue }) => {
     const { token } = getState().auth;

diff --git a/src/redux/Columns/ColumnSlice.js b/src/redux/Columns/ColumnSlice.js
@@ -1,6 +1,6 @@
 import { createSlice } from '@reduxjs/toolkit';
 
-import { addColumn, editColumn, delColumn } from './ColumnOperation';
+import { addColumn, editColumn, removeColumn } from './ColumnOperation';
 
 const boardSlice = createSlice({
   name: 'column',
@@ -15,7 +15,7 @@ const boardSlice = createSlice({
       .addCase(editColumn.fulfilled, (state, { payload }) => {
         console.log(payload);
       })
-      .addCase(delColumn.fulfilled, (state, { payload }) => {
+      .addCase(removeColumn.fulfilled, (state, { payload }) => {
         console.log(payload)})
       // .addCase(updateColumn.fulfilled, (state, { payload }) => {
       //   return {
@@ -24,7 +24,7 @@ const boardSlice = createSlice({
       //     ),
       //   };
       // })
-      // .addCase(removeColumn.fulfilled, (state, { payload }) => {
+      // .addCase(delColumn.fulfilled, (state, { payload }) => {
       //   return {
       //     state: state.items.filter(el => el.id !== payload),
       //   };

diff --git a/src/services/backendAPI.js b/src/services/backendAPI.js
@@ -67,22 +67,21 @@ export const getListOfBoardsApi = async userToken => {
 export const addColumnApi = async (dataColumn, userToken) => {
   token.set(userToken);
   const { data } = await axios.post('board/column', dataColumn);
-  console.log(data);
   return data;
 };
-export const editColumnApi = async ({ title, boardId, columnId }) => {
+export const editColumnApi = async ({ title, boardId, columnId },userToken ) => {
+  token.set(userToken);
   const { data } = await axios.patch(`/board/column/${columnId}`, {
     title,
     boardId,
   });
   return data;
 };
 
-export const removeColumnApi = async (delData) => {
-  console.log(delData.boardId, delData.columnId);
-  const boardId = delData.boardId
-  await axios.delete(`/board/column/${delData.columnId}`,  {boardId}  )
-
+export const removeColumnApi = async ({columnId, boardId}, userToken) => {
+  token.set(userToken);
+   await axios.delete(`/board/column/${columnId}`, {data:{boardId}});
+
 };
 
 //---------------------------------------------EMAIL---------------------//