Added default Project label message if none exist'

api/pkg/repositories/tasks.repositories.go

@@ -1,8 +1,6 @@
 package repositories
 
 import (
-	"errors"
-
 	"github.com/pacholoamit/GO-TASK-MGR/pkg/dto"
 	"github.com/pacholoamit/GO-TASK-MGR/pkg/models"
 	"gorm.io/gorm/clause"
@@ -13,26 +11,11 @@ type task struct{}
 var Task task
 
 func (task) CreateTask(t *dto.Task) (*dto.Task, error) {
-	var projectModel models.Project
 
 	if err := db.Create(&t).Error; err != nil {
 		return t, err
 	}
 
-	if t.ProjectID != 0 {
-
-		if err := db.Clauses(clause.Returning{}).Find(&projectModel, t.ProjectID).Error; err != nil {
-			return t, err
-		}
-
-		if projectModel.ID == 0 {
-			return t, errors.New("project does not exist")
-		}
-
-		db.Model(&projectModel).Association("Tasks").Append(&t)
-
-	}
-
 	return t, nil
 }
 

api/pkg/services/tasks.services.go

@@ -26,6 +26,13 @@ func (task) GetAllTasks() (*dto.Tasks, error) {
 
 func (task) CreateTask(t *dto.Task) (*dto.Task, error) {
 	createdTask, err := repositories.Task.CreateTask(t)
+
+	if t.ProjectID != 0 {
+		if _, err := repositories.Project.AssignTaskToProject(int(createdTask.ID), int(t.ProjectID)); err != nil {
+			return createdTask, err
+		}
+		return createdTask, err
+	}
 	if err != nil {
 		fmt.Println("Error when Creating a task:", err)
 		return createdTask, err

web/components/layout/layout-header/index.tsx

@@ -40,26 +40,10 @@ const ColorSchemeToggle = () => {
   );
 };
 
-const HomeButton = () => {
-  return (
-    <Link href="/">
-      <ActionIcon
-        size={32}
-        variant="light"
-        color={"teal"}
-        title="Navigate to home"
-      >
-        <Home size={24} />
-      </ActionIcon>
-    </Link>
-  );
-};
-
 const HeaderOptions = () => {
   return (
     <Group>
       <ColorSchemeToggle />
-      <HomeButton />
     </Group>
   );
 };

web/components/layout/layout-navbar/sections/actions.section.tsx

@@ -1,21 +1,30 @@
 import { Navbar, Title } from "@mantine/core";
+import { useRouter } from "next/router";
 import React from "react";
-import { FolderPlus, Note } from "tabler-icons-react";
+import { FolderPlus, Home, Note } from "tabler-icons-react";
 import useCreateProjectModal from "../../../../hooks/useCreateProjectModal";
 import useTaskContext from "../../../../hooks/useTaskContext";
 
 import NavbarButton from "../navbar.button";
 
 const ActionsSection: React.FC = () => {
   const { newTask } = useTaskContext();
+  const { push } = useRouter();
   const { openCreateProjectModal } = useCreateProjectModal();
 
-  const onClick = () => newTask();
+  const handleNewTask = () => newTask();
+  const handleHome = () => push("/");
   return (
     <Navbar.Section mx="-x" px="xs">
       <Title order={3}>Actions</Title>
       <NavbarButton
-        onClick={onClick}
+        onClick={handleHome}
+        icon={<Home size={16} />}
+        color={"green"}
+        label={"Home"}
+      />
+      <NavbarButton
+        onClick={handleNewTask}
         icon={<Note size={16} />}
         color={"red"}
         label={"New task"}

web/components/tasks/task-drawer/index.tsx

@@ -84,6 +84,12 @@ const TaskDrawer: React.FC = () => {
     label: project.name,
   }));
 
+  const projectLabel = `Project ${
+    !projectSelectOptions?.length
+      ? "(Create a project to assign this task)"
+      : ""
+  }`;
+
   React.useEffect(() => {
     form.setValues(currentTask ?? initialValues);
     if (mut.isError)
@@ -135,8 +141,8 @@ const TaskDrawer: React.FC = () => {
               )}
             </Group>
             <Select
-              label="Project"
-              data={projectSelectOptions || []}
+              label={projectLabel}
+              data={projectSelectOptions || [""]}
               size="md"
               variant="unstyled"
               {...form.getInputProps("projectId")}

web/hooks/useCreateOrUpdateTask.tsx

@@ -35,7 +35,7 @@ const useCreateOrUpdateTask = () => {
       // Revalidate all tasks of the assigned project from Task request
       const projectId = variables.projectId?.toString() || null;
 
-      if (!projectId) revalidate(getAllTasksEndpoint);
+      revalidate(getAllTasksEndpoint);
       revalidate(getAllTasksByProjectEndpoint(projectId as string));
     },
   });

web/hooks/useDeleteTask.tsx

@@ -18,9 +18,9 @@ const useDeleteTask = () => {
   const { mutate: revalidate } = useSWRConfig();
   return useMutation((id: string) => deleteTask(id), {
     onSuccess: (data, variables, context) => {
-      const projectId = data.projectId?.toString() || null;
-      if (!projectId) revalidate(getAllTasksEndpoint);
+      const projectId = data.projectId?.toString();
       revalidate(getAllTasksByProjectEndpoint(projectId as string));
+      revalidate(getAllTasksEndpoint);
     },
   });
 };