From d094143884c5e88e6229959b3e94cedc4f8d847c Mon Sep 17 00:00:00 2001
From: Hamoon Zamiri <hamoon.zamiri@mail.utoronto.ca>
Date: Sat, 3 Aug 2024 22:04:57 -0400
Subject: [PATCH 1/2] build: makefile run command now executes docker compose
 up first

---
 backend/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Makefile b/backend/Makefile
index 453204e..9c104c5 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,7 +1,7 @@
 build:
 	@go build -o bin/goalify
 
-run: build
+run: build up
 	@./bin/goalify
 unit:
 	@echo "Running unit tests..."

From ce53877f706915e391034d7e9f9b993b90b4b647 Mon Sep 17 00:00:00 2001
From: Hamoon Zamiri <hamoon.zamiri@mail.utoronto.ca>
Date: Sat, 3 Aug 2024 22:05:11 -0400
Subject: [PATCH 2/2] feat: add ability to delete goal categories

---
 .../src/components/goals/GoalCategoryCard.vue | 91 ++++++++++++++++++-
 frontend/src/state/goals.ts                   |  8 ++
 frontend/src/utils/api.ts                     | 14 +++
 3 files changed, 108 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/goals/GoalCategoryCard.vue b/frontend/src/components/goals/GoalCategoryCard.vue
index e559754..7f1db5a 100644
--- a/frontend/src/components/goals/GoalCategoryCard.vue
+++ b/frontend/src/components/goals/GoalCategoryCard.vue
@@ -4,9 +4,20 @@ import GoalCard from "./GoalCard.vue";
 import ModalForm from "../ModalForm.vue";
 import CreateGoalForm from "./CreateGoalForm.vue";
 import CreateGoalButton from "./CreateGoalButton.vue";
+import { Menu, MenuButton, MenuItems, MenuItem } from "@headlessui/vue";
+import { ApiClient } from "@/utils/api";
+import goalState from "@/state/goals";
 const props = defineProps<{
   goalCategory: GoalCategory;
 }>();
+
+async function handleDeleteCategory(e: MouseEvent) {
+  e.preventDefault();
+  await ApiClient.deleteCategory(props.goalCategory.id);
+
+  // remove category from state
+  goalState.deleteCategory(props.goalCategory.id);
+}
 </script>
 <template>
   <div class="flex flex-col">
@@ -14,11 +25,81 @@ const props = defineProps<{
       <span class="text-xl text-gray-200 pb-2">{{
         props.goalCategory.title
       }}</span>
-      <ModalForm
-        :FormComponent="CreateGoalForm"
-        :OpenerComponent="CreateGoalButton"
-        :formProps="{ categoryId: props.goalCategory.id }"
-      />
+      <div class="flex">
+        <ModalForm
+          :FormComponent="CreateGoalForm"
+          :OpenerComponent="CreateGoalButton"
+          :formProps="{ categoryId: props.goalCategory.id }"
+        />
+        <Menu as="div" class="relative inline-block">
+          <MenuButton class="hover:cursor-pointer">
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              fill="none"
+              viewBox="0 0 24 24"
+              stroke-width="1.5"
+              stroke="currentColor"
+              class="size-6"
+            >
+              <path
+                stroke-linecap="round"
+                stroke-linejoin="round"
+                d="M8.625 12a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0H8.25m4.125 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0H12m4.125 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0h-.375M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z"
+              />
+            </svg>
+          </MenuButton>
+          <MenuItems
+            class="absolute flex flex-col items-start w-56 bg-gray-300 p-1 rounded-md"
+          >
+            <MenuItem
+              as="button"
+              class="w-full px-2 flex justify-start gap-x-2 hover:cursor-pointer hover:bg-gray-400 rounded-md bg-gray-300 text-gray-700"
+            >
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                fill="none"
+                viewBox="0 0 24 24"
+                stroke-width="1.5"
+                stroke="currentColor"
+                class="size-5"
+              >
+                <path
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125"
+                />
+              </svg>
+              <span>Edit</span>
+            </MenuItem>
+
+            <MenuItem
+              as="div"
+              class="w-full px-2 hover:cursor-pointer hover:bg-gray-400 rounded-md bg-gray-300 text-gray-700"
+            >
+              <button
+                @click="handleDeleteCategory"
+                class="flex justify-start gap-x-2"
+              >
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                  stroke-width="1.5"
+                  stroke="currentColor"
+                  class="size-5"
+                >
+                  <path
+                    stroke-linecap="round"
+                    stroke-linejoin="round"
+                    d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0"
+                  />
+                </svg>
+                <span>Delete</span>
+              </button>
+            </MenuItem>
+          </MenuItems>
+        </Menu>
+      </div>
     </header>
     <div class="mb-4 w-full" v-for="goal in goalCategory.goals">
       <GoalCard :goal="goal" />
diff --git a/frontend/src/state/goals.ts b/frontend/src/state/goals.ts
index 1c7ef6c..6312c38 100644
--- a/frontend/src/state/goals.ts
+++ b/frontend/src/state/goals.ts
@@ -19,16 +19,24 @@ function deleteGoal(categoryId: string, goalId: string) {
   }
 }
 
+function deleteCategory(categoryId: string) {
+  goalState.categories = goalState.categories.filter(
+    (c) => c.id !== categoryId,
+  );
+}
+
 const goalState = reactive<{
   categories: GoalCategory[];
   addCategory: (category: GoalCategory) => void;
   addGoal: (categoryId: string, goal: Goal) => void;
   deleteGoal: (categoryId: string, goalId: string) => void;
+  deleteCategory: (categoryId: string) => void;
 }>({
   categories: [],
   addCategory,
   addGoal,
   deleteGoal,
+  deleteCategory,
 });
 
 export default goalState;
diff --git a/frontend/src/utils/api.ts b/frontend/src/utils/api.ts
index e5442e6..2d8a121 100644
--- a/frontend/src/utils/api.ts
+++ b/frontend/src/utils/api.ts
@@ -167,6 +167,19 @@ async function deleteGoal(goalId: string): Promise<void> {
   }
 }
 
+async function deleteCategory(categoryId: string): Promise<void> {
+  const res = await fetch(`${API_BASE}/goals/categories/${categoryId}`, {
+    method: http.MethodDelete,
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${authState.user?.access_token}`,
+    },
+  });
+  if (!res.ok) {
+    throw new Error("Failed to delete category");
+  }
+}
+
 // async function deleteGoal(goalId: string)
 
 export const ApiClient = {
@@ -177,5 +190,6 @@ export const ApiClient = {
   createGoal,
   updateGoal,
   deleteGoal,
+  deleteCategory,
   isError,
 } as const;