From 27103eed152110bc6aeb360d6fc651c85368dc9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Geonizeli?= Date: Sun, 10 Jul 2022 11:55:57 -0300 Subject: [PATCH] organize project page components --- .../NewProjectAction.tsx | 4 ++-- .../components/NewProjectAction/index.ts | 1 + .../components/{ => Project}/AddTask.tsx | 6 +++--- .../{ => Project}/DeleteProjectDialog.tsx | 4 ++-- .../components/{ => Project}/Project.tsx | 19 +++++-------------- .../{ => Project}/ProjectOptions.tsx | 0 .../{ => Project}/RenameProjectDialog.tsx | 4 ++-- .../components/{ => Project}/TasksList.tsx | 4 ++-- .../{ => Project}/TasksListItem.tsx | 0 .../Projects/components/Project/index.ts | 1 + 10 files changed, 18 insertions(+), 25 deletions(-) rename client/src/pages/Projects/components/{ => NewProjectAction}/NewProjectAction.tsx (95%) create mode 100644 client/src/pages/Projects/components/NewProjectAction/index.ts rename client/src/pages/Projects/components/{ => Project}/AddTask.tsx (92%) rename client/src/pages/Projects/components/{ => Project}/DeleteProjectDialog.tsx (91%) rename client/src/pages/Projects/components/{ => Project}/Project.tsx (73%) rename client/src/pages/Projects/components/{ => Project}/ProjectOptions.tsx (100%) rename client/src/pages/Projects/components/{ => Project}/RenameProjectDialog.tsx (94%) rename client/src/pages/Projects/components/{ => Project}/TasksList.tsx (90%) rename client/src/pages/Projects/components/{ => Project}/TasksListItem.tsx (100%) create mode 100644 client/src/pages/Projects/components/Project/index.ts diff --git a/client/src/pages/Projects/components/NewProjectAction.tsx b/client/src/pages/Projects/components/NewProjectAction/NewProjectAction.tsx similarity index 95% rename from client/src/pages/Projects/components/NewProjectAction.tsx rename to client/src/pages/Projects/components/NewProjectAction/NewProjectAction.tsx index 6cfbf9f..bded199 100644 --- a/client/src/pages/Projects/components/NewProjectAction.tsx +++ b/client/src/pages/Projects/components/NewProjectAction/NewProjectAction.tsx @@ -10,8 +10,8 @@ import { import { useState } from "react"; import { SubmitHandler, useForm } from "react-hook-form"; import { KeyedMutator } from "swr"; -import { useAuth } from "../../../hooks/useAuth"; -import { APIProjectList } from "../Projects"; +import { useAuth } from "../../../../hooks/useAuth"; +import { APIProjectList } from "../../Projects"; type NewProjectForm = { name: string; diff --git a/client/src/pages/Projects/components/NewProjectAction/index.ts b/client/src/pages/Projects/components/NewProjectAction/index.ts new file mode 100644 index 0000000..66c9bb4 --- /dev/null +++ b/client/src/pages/Projects/components/NewProjectAction/index.ts @@ -0,0 +1 @@ +export * from "./NewProjectAction"; diff --git a/client/src/pages/Projects/components/AddTask.tsx b/client/src/pages/Projects/components/Project/AddTask.tsx similarity index 92% rename from client/src/pages/Projects/components/AddTask.tsx rename to client/src/pages/Projects/components/Project/AddTask.tsx index a4434e5..f484859 100644 --- a/client/src/pages/Projects/components/AddTask.tsx +++ b/client/src/pages/Projects/components/Project/AddTask.tsx @@ -2,8 +2,8 @@ import AddTaskIcon from "@mui/icons-material/AddTask"; import { Box, Button, TextField, Toolbar } from "@mui/material"; import { useState } from "react"; import { SubmitHandler, useForm } from "react-hook-form"; -import { useAuth } from "../../../hooks/useAuth"; -import { useProject } from "../../../hooks/useProject"; +import { useAuth } from "../../../../hooks/useAuth"; +import { useProject } from "../../../../hooks/useProject"; type NewTaskForm = { description: string; @@ -12,8 +12,8 @@ type NewTaskForm = { export const AddTask = () => { const [isLoading, setIsLoading] = useState(false); const { apiClient } = useAuth(); - const { register, handleSubmit, reset } = useForm(); const { tasksMutate, project } = useProject(); + const { register, handleSubmit, reset } = useForm(); const onSubmit: SubmitHandler = (data) => { setIsLoading(true); diff --git a/client/src/pages/Projects/components/DeleteProjectDialog.tsx b/client/src/pages/Projects/components/Project/DeleteProjectDialog.tsx similarity index 91% rename from client/src/pages/Projects/components/DeleteProjectDialog.tsx rename to client/src/pages/Projects/components/Project/DeleteProjectDialog.tsx index 449d290..752e49f 100644 --- a/client/src/pages/Projects/components/DeleteProjectDialog.tsx +++ b/client/src/pages/Projects/components/Project/DeleteProjectDialog.tsx @@ -7,8 +7,8 @@ import { DialogTitle } from "@mui/material"; import { SetStateAction, useState } from "react"; -import { useAuth } from "../../../hooks/useAuth"; -import { useProject } from "../../../hooks/useProject"; +import { useAuth } from "../../../../hooks/useAuth"; +import { useProject } from "../../../../hooks/useProject"; export type DeleteProjectDialogProps = { open: boolean; diff --git a/client/src/pages/Projects/components/Project.tsx b/client/src/pages/Projects/components/Project/Project.tsx similarity index 73% rename from client/src/pages/Projects/components/Project.tsx rename to client/src/pages/Projects/components/Project/Project.tsx index 1804269..b2a36c8 100644 --- a/client/src/pages/Projects/components/Project.tsx +++ b/client/src/pages/Projects/components/Project/Project.tsx @@ -1,15 +1,11 @@ -import { Add } from "@mui/icons-material"; import { - Card, - CardActions, - CardContent, - CardHeader, - IconButton, + Card, CardContent, + CardHeader } from "@mui/material"; import useSWR from "swr"; -import { useAuth } from "../../../hooks/useAuth"; -import { ProjectProvider } from "../../../providers/ProjectProvider"; -import { createSWRFetcher } from "../../../utils/swrFetcher"; +import { useAuth } from "../../../../hooks/useAuth"; +import { ProjectProvider } from "../../../../providers/ProjectProvider"; +import { createSWRFetcher } from "../../../../utils/swrFetcher"; import { AddTask } from "./AddTask"; import { ProjectOptions } from "./ProjectOptions"; import { TaskListProps, TasksList } from "./TasksList"; @@ -49,11 +45,6 @@ export const Project = (props: ProjectProps) => { - - - - - ); diff --git a/client/src/pages/Projects/components/ProjectOptions.tsx b/client/src/pages/Projects/components/Project/ProjectOptions.tsx similarity index 100% rename from client/src/pages/Projects/components/ProjectOptions.tsx rename to client/src/pages/Projects/components/Project/ProjectOptions.tsx diff --git a/client/src/pages/Projects/components/RenameProjectDialog.tsx b/client/src/pages/Projects/components/Project/RenameProjectDialog.tsx similarity index 94% rename from client/src/pages/Projects/components/RenameProjectDialog.tsx rename to client/src/pages/Projects/components/Project/RenameProjectDialog.tsx index ae07dcc..7f611c7 100644 --- a/client/src/pages/Projects/components/RenameProjectDialog.tsx +++ b/client/src/pages/Projects/components/Project/RenameProjectDialog.tsx @@ -8,8 +8,8 @@ import { } from "@mui/material"; import { SetStateAction, useState } from "react"; import { SubmitHandler, useForm } from "react-hook-form"; -import { useAuth } from "../../../hooks/useAuth"; -import { useProject } from "../../../hooks/useProject"; +import { useAuth } from "../../../../hooks/useAuth"; +import { useProject } from "../../../../hooks/useProject"; type RenameProjectForm = { name: string; diff --git a/client/src/pages/Projects/components/TasksList.tsx b/client/src/pages/Projects/components/Project/TasksList.tsx similarity index 90% rename from client/src/pages/Projects/components/TasksList.tsx rename to client/src/pages/Projects/components/Project/TasksList.tsx index c7abe82..25966e2 100644 --- a/client/src/pages/Projects/components/TasksList.tsx +++ b/client/src/pages/Projects/components/Project/TasksList.tsx @@ -1,6 +1,6 @@ import { List, ListSubheader } from "@mui/material"; -import { useAuth } from "../../../hooks/useAuth"; -import { useProject } from "../../../hooks/useProject"; +import { useAuth } from "../../../../hooks/useAuth"; +import { useProject } from "../../../../hooks/useProject"; import { Task, TasksListItem } from "./TasksListItem"; export type TaskListProps = { diff --git a/client/src/pages/Projects/components/TasksListItem.tsx b/client/src/pages/Projects/components/Project/TasksListItem.tsx similarity index 100% rename from client/src/pages/Projects/components/TasksListItem.tsx rename to client/src/pages/Projects/components/Project/TasksListItem.tsx diff --git a/client/src/pages/Projects/components/Project/index.ts b/client/src/pages/Projects/components/Project/index.ts new file mode 100644 index 0000000..460cb87 --- /dev/null +++ b/client/src/pages/Projects/components/Project/index.ts @@ -0,0 +1 @@ +export * from './Project' \ No newline at end of file