diff --git a/pages/_document.tsx b/pages/_document.tsx index 55a8602..8dc62c6 100644 --- a/pages/_document.tsx +++ b/pages/_document.tsx @@ -3,7 +3,7 @@ import { Html, Head, Main, NextScript } from "next/document"; export default function Document() { return ( - +
diff --git a/pages/index.tsx b/pages/index.tsx index 551dbdf..500c90b 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -34,6 +34,7 @@ import MobileBoards from "@/components/MobileBoards"; import connectMongo from "@/database/connectMongo"; import BoardsModel from "@/database/data"; import Spinner from "@/components/UI/Spinner"; +import Head from "next/head"; interface HomeProps { prefetchedData: { boards: Board[] }; @@ -205,140 +206,147 @@ const Home: React.FC = ({ prefetchedData = { boards: [] } }) => { }; return ( -
-
-
-
- - + <> + + Kanban webapp + +
+
+
+
+ + +
+ {/* liading spinner */} + {(isDeleting || isUpdating || isCreating) && }
- {/* liading spinner */} - {(isDeleting || isUpdating || isCreating) && } -
- {activeModal === ModalEnum.CREATE_BOARD && ( - dispatch(setActiveModal(undefined))}> - createBoard(board)} /> - - )} - - {activeModal === ModalEnum.EDIT_BOARD && ( - dispatch(setActiveModal(undefined))}> - - updateBoard({ id: activeBoard.toString(), board }) - } - /> - - )} - - {activeModal === ModalEnum.DELETE_BOARD && ( - dispatch(setActiveModal(undefined))}> - dispatch(setActiveModal(undefined))} - onConfirm={() => deleteBoard(activeBoard.toString())} - /> - - )} - - {activeModal === ModalEnum.CREATE_TASK && ( - { - dispatch(setActiveModal(undefined)); - }} - > - { - return { label: col.name, value: col.name }; + {activeModal === ModalEnum.CREATE_BOARD && ( + dispatch(setActiveModal(undefined))}> + createBoard(board)} /> + + )} + + {activeModal === ModalEnum.EDIT_BOARD && ( + dispatch(setActiveModal(undefined))}> + + updateBoard({ id: activeBoard.toString(), board }) } - )} - onCreateTask={handleAddNewTask} - /> - - )} - - {openedTask && activeModal === ModalEnum.EDIT_TASK && ( - { - dispatch(setActiveModal(undefined)); - dispatch(setOpenedTask(undefined)); - }} - > - { - return { label: col.name, value: col.name }; - } - )} - onEditTask={handleEditTask} - /> - - )} - - {openedTask && activeModal === ModalEnum.VIEW_TASK && ( - { - dispatch(setActiveModal(undefined)); - dispatch(setOpenedTask(undefined)); - }} - > - { - return { label: col.name, value: col.name }; + /> + + )} + + {activeModal === ModalEnum.DELETE_BOARD && ( + dispatch(setActiveModal(undefined))}> + dispatch(setActiveModal(undefined))} + onConfirm={() => deleteBoard(activeBoard.toString())} + /> + + )} + + {activeModal === ModalEnum.CREATE_TASK && ( + { + dispatch(setActiveModal(undefined)); + }} + > + { + return { label: col.name, value: col.name }; + } + )} + onCreateTask={handleAddNewTask} + /> + + )} + + {openedTask && activeModal === ModalEnum.EDIT_TASK && ( + { + dispatch(setActiveModal(undefined)); + dispatch(setOpenedTask(undefined)); + }} + > + dispatch(setActiveModal(ModalEnum.DELETE_TASK))} - /> - - )} - - {openedTask && activeModal === ModalEnum.DELETE_TASK && ( - dispatch(setOpenedTask(undefined))}> - { + columns={boards[activeBoard].columns.map( + (col: { name: string; tasks: Task[] }) => { + return { label: col.name, value: col.name }; + } + )} + onEditTask={handleEditTask} + /> + + )} + + {openedTask && activeModal === ModalEnum.VIEW_TASK && ( + { dispatch(setActiveModal(undefined)); dispatch(setOpenedTask(undefined)); }} - onConfirm={handleDeleteTask} - /> - - )} - - {activeModal === ModalEnum.MOBILE_MENU && ( - dispatch(setActiveModal(undefined))} - > - - - )} -
+ > + { + return { label: col.name, value: col.name }; + } + )} + onChangeTask={handleChangeTask} + handleChangeTaskStatus={handleChangeTaskStatus} + onDeleteTask={() => + dispatch(setActiveModal(ModalEnum.DELETE_TASK)) + } + /> + + )} + + {openedTask && activeModal === ModalEnum.DELETE_TASK && ( + dispatch(setOpenedTask(undefined))}> + { + dispatch(setActiveModal(undefined)); + dispatch(setOpenedTask(undefined)); + }} + onConfirm={handleDeleteTask} + /> + + )} + + {activeModal === ModalEnum.MOBILE_MENU && ( + dispatch(setActiveModal(undefined))} + > + + + )} +
+ ); };