From f42a4d88c114b39ad78be3da69c1b2ae646dd5a2 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 00:40:26 +0900
Subject: [PATCH 001/180] =?UTF-8?q?=EC=8A=B9=EC=9D=B8=20=EB=8C=80=EA=B8=B0?=
 =?UTF-8?q?=20=EC=A4=91=EC=9D=B8=20=EC=9A=94=EC=B2=AD=20=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20API=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue   |  4 +-
 .../requested/RequestedFilterBar.vue          |  2 +-
 src/components/requested/RequestedList.vue    | 41 ++++++++++++++++---
 .../requested/RequestedListCard.vue           |  3 +-
 src/types/manager.ts                          | 10 +++++
 5 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index b91f588a..6b558595 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -39,7 +39,7 @@ const onPageChange = (value: number) => {
   params.page = value
 }
 
-const fetchRequestList = async () => {
+const fetchMyRequestList = async () => {
   const { parseRequestParams } = useParseParams()
   const parsedParams = parseRequestParams(params)
   const response = await axiosInstance.get('/api/tasks/requests', {
@@ -53,7 +53,7 @@ const fetchRequestList = async () => {
 
 const { data } = useQuery<MyRequestResponse>({
   queryKey: ['myRequest', params],
-  queryFn: fetchRequestList
+  queryFn: fetchMyRequestList
 })
 
 watch(
diff --git a/src/components/requested/RequestedFilterBar.vue b/src/components/requested/RequestedFilterBar.vue
index 7c28ce9e..0539f796 100644
--- a/src/components/requested/RequestedFilterBar.vue
+++ b/src/components/requested/RequestedFilterBar.vue
@@ -16,7 +16,7 @@
       :value="store.params.title"
       @update:value="onParamsChange.onTitleChange" />
     <FilterInput
-      title="처리자"
+      title="요청자"
       :value="store.params.nickName"
       @update:value="onParamsChange.onNickNameChange" />
     <FilterDropdown
diff --git a/src/components/requested/RequestedList.vue b/src/components/requested/RequestedList.vue
index b81109f2..43f52a12 100644
--- a/src/components/requested/RequestedList.vue
+++ b/src/components/requested/RequestedList.vue
@@ -6,15 +6,16 @@
 
     <template #listCards>
       <RequestedListCard
-        v-for="info in DUMMY_REQUESTED_LIST_DATA"
+        v-for="info in data?.content"
         :key="info.taskId"
         :info="info" />
+      <NoContent v-if="data?.content.length === 0" />
     </template>
 
     <template #pagination>
       <ListPagination
-        :page-number="params.page"
-        :total-page="DUMMY_TOTAL_PAGE"
+        :page-number="params.page + 1"
+        :total-page="totalPage"
         @update:page-number="onPageChange" />
     </template>
   </ListContainer>
@@ -24,15 +25,43 @@
 import ListPagination from '../lists/ListPagination.vue'
 import ListContainer from '../lists/ListContainer.vue'
 import RequestedListBar from './RequestedListBar.vue'
-import { DUMMY_REQUESTED_LIST_DATA } from '@/datas/dummy'
 import RequestedListCard from './RequestedListCard.vue'
 import { useRequestParamsStore } from '@/stores/params'
+import { useParseParams } from '../hooks/useParseParams'
+import axiosInstance from '@/utils/axios'
+import { useQuery } from '@tanstack/vue-query'
+import { ref, watch } from 'vue'
+import type { RequestedResponse } from '@/types/manager'
+import NoContent from '../lists/NoContent.vue'
 
 const { params } = useRequestParamsStore()
-const DUMMY_TOTAL_PAGE = 18
 const onPageChange = (value: number) => {
   params.page = value
 }
 
-// Data Handling
+const fetchRequestedList = async () => {
+  const { parseRequestParams } = useParseParams()
+  const parsedParams = parseRequestParams(params)
+  const response = await axiosInstance.get('/api/tasks/requests/pending', {
+    headers: {
+      Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}`
+    },
+    params: parsedParams
+  })
+  return response.data
+}
+
+const { data } = useQuery<RequestedResponse>({
+  queryKey: ['requested', params],
+  queryFn: fetchRequestedList
+})
+
+watch(
+  data,
+  () => {
+    if (data.value?.totalPages) totalPage.value = data.value.totalPages
+  },
+  { once: true }
+)
+const totalPage = ref(0)
 </script>
diff --git a/src/components/requested/RequestedListCard.vue b/src/components/requested/RequestedListCard.vue
index 889e0a96..6782eb0e 100644
--- a/src/components/requested/RequestedListCard.vue
+++ b/src/components/requested/RequestedListCard.vue
@@ -24,10 +24,11 @@ import type { ListCardProps } from '@/types/common'
 import ListCardTab from '../lists/ListCardTab.vue'
 import type { RequestedListData } from '@/types/manager'
 import { useRouter } from 'vue-router'
+import { formatDate } from '@/utils/date'
 
 const { info } = defineProps<{ info: RequestedListData }>()
 const requestedTabList: ListCardProps[] = [
-  { content: info.requestedAt, width: 80 },
+  { content: formatDate(info.requestedAt), width: 80 },
   { content: info.mainCategoryName, width: 80 },
   { content: info.categoryName, width: 80 },
   { content: info.title },
diff --git a/src/types/manager.ts b/src/types/manager.ts
index 0f398bd4..38b5daa2 100644
--- a/src/types/manager.ts
+++ b/src/types/manager.ts
@@ -120,3 +120,13 @@ export interface DraggableEvent {
     newIndex: number
   }
 }
+
+export interface RequestedResponse {
+  content: RequestedListData[]
+  totalElements: number
+  totalPages: number
+  pageNumber: number
+  pageSize: number
+  isFirst: boolean
+  isLast: boolean
+}

From 1055c33b4d73175b4d0718c1e15d26ab4bcb0c62 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 00:56:14 +0900
Subject: [PATCH 002/180] =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=9A=94=EC=B2=AD?=
 =?UTF-8?q?=20=EA=B8=B0=EB=A1=9D=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=20API=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue   | 22 +++++++-----
 .../request-history/RequestHistoryList.vue    | 34 +++++++++++++++----
 .../RequestHistoryListCard.vue                |  5 +--
 src/components/requested/RequestedList.vue    | 15 +++-----
 src/types/manager.ts                          | 10 ++++++
 5 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index 6b558595..4d02af29 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -15,7 +15,7 @@
     <template #pagination>
       <ListPagination
         :page-number="params.page + 1"
-        :total-page="totalPage"
+        :total-page="totalPage || 0"
         @update:page-number="onPageChange" />
     </template>
   </ListContainer>
@@ -33,6 +33,15 @@ import ListPagination from '../lists/ListPagination.vue'
 import NoContent from '../lists/NoContent.vue'
 import MyRequestListBar from './MyRequestListBar.vue'
 import MyRequestListCard from './MyRequestListCard.vue'
+import ListPagination from '../lists/ListPagination.vue'
+import ListContainer from '../lists/ListContainer.vue'
+import { useRequestParamsStore } from '@/stores/params'
+import axiosInstance from '@/utils/axios'
+import { useQuery } from '@tanstack/vue-query'
+import { useParseParams } from '../hooks/useParseParams'
+import type { MyRequestResponse } from '@/types/user'
+import { computed } from 'vue'
+import NoContent from '../lists/NoContent.vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {
@@ -56,12 +65,7 @@ const { data } = useQuery<MyRequestResponse>({
   queryFn: fetchMyRequestList
 })
 
-watch(
-  data,
-  () => {
-    if (data.value?.totalPages) totalPage.value = data.value.totalPages
-  },
-  { once: true }
-)
-const totalPage = ref(0)
+const totalPage = computed(() => {
+  return data.value?.totalPages
+})
 </script>
diff --git a/src/components/request-history/RequestHistoryList.vue b/src/components/request-history/RequestHistoryList.vue
index 67c2f0a8..1eee4df0 100644
--- a/src/components/request-history/RequestHistoryList.vue
+++ b/src/components/request-history/RequestHistoryList.vue
@@ -6,15 +6,15 @@
 
     <template #listCards>
       <RequestHistoryListCard
-        v-for="info in DUMMY_REQUEST_HISTORY_LIST_DATA"
+        v-for="info in data?.content"
         :key="info.taskId"
         :info="info" />
     </template>
 
     <template #pagination>
       <ListPagination
-        :page-number="params.page"
-        :total-page="DUMMY_TOTAL_PAGE"
+        :page-number="params.page + 1"
+        :total-page="totalPage || 0"
         @update:page-number="onPageChange" />
     </template>
   </ListContainer>
@@ -23,16 +23,38 @@
 <script setup lang="ts">
 import ListPagination from '../lists/ListPagination.vue'
 import ListContainer from '../lists/ListContainer.vue'
-import { DUMMY_REQUEST_HISTORY_LIST_DATA } from '@/datas/dummy'
 import { useRequestParamsStore } from '@/stores/params'
 import RequestHistoryListBar from './RequestHistoryListBar.vue'
 import RequestHistoryListCard from './RequestHistoryListCard.vue'
+import { useParseParams } from '../hooks/useParseParams'
+import axiosInstance from '@/utils/axios'
+import { useQuery } from '@tanstack/vue-query'
+import { computed } from 'vue'
+import type { RequestHistoryResponse } from '@/types/manager'
 
 const { params } = useRequestParamsStore()
-const DUMMY_TOTAL_PAGE = 18
 const onPageChange = (value: number) => {
   params.page = value
 }
 
-// Data Handling
+const fetchRequestHistoryList = async () => {
+  const { parseRequestParams } = useParseParams()
+  const parsedParams = parseRequestParams(params)
+  const response = await axiosInstance.get('/api/tasks', {
+    headers: {
+      Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}`
+    },
+    params: parsedParams
+  })
+  return response.data
+}
+
+const { data } = useQuery<RequestHistoryResponse>({
+  queryKey: ['requestHistory', params],
+  queryFn: fetchRequestHistoryList
+})
+
+const totalPage = computed(() => {
+  return data.value?.totalPages
+})
 </script>
diff --git a/src/components/request-history/RequestHistoryListCard.vue b/src/components/request-history/RequestHistoryListCard.vue
index e13bd529..e2f2bc87 100644
--- a/src/components/request-history/RequestHistoryListCard.vue
+++ b/src/components/request-history/RequestHistoryListCard.vue
@@ -15,17 +15,18 @@
 import type { ListCardProps } from '@/types/common'
 import ListCardTab from '../lists/ListCardTab.vue'
 import type { RequestHistoryListData } from '@/types/manager'
+import { formatDate } from '@/utils/date'
 
 const { info } = defineProps<{ info: RequestHistoryListData }>()
 const myRequestTabList: ListCardProps[] = [
   { content: info.taskCode, width: 120, isTextXs: true },
-  { content: info.requestedAt, width: 80 },
+  { content: formatDate(info.requestedAt), width: 80 },
   { content: info.mainCategoryName, width: 80 },
   { content: info.categoryName, width: 80 },
   { content: info.title },
   { content: info.requesterName, width: 120, profileImg: info.requesterImg },
   { content: info.processorName, width: 120, profileImg: info.processorImg },
   { content: info.taskStatus, width: 64, isStatus: true },
-  { content: info.finishedAt, width: 80 }
+  { content: info.finishedAt ? formatDate(info.finishedAt) : '', width: 80 }
 ]
 </script>
diff --git a/src/components/requested/RequestedList.vue b/src/components/requested/RequestedList.vue
index 43f52a12..63766955 100644
--- a/src/components/requested/RequestedList.vue
+++ b/src/components/requested/RequestedList.vue
@@ -15,7 +15,7 @@
     <template #pagination>
       <ListPagination
         :page-number="params.page + 1"
-        :total-page="totalPage"
+        :total-page="totalPage || 0"
         @update:page-number="onPageChange" />
     </template>
   </ListContainer>
@@ -30,7 +30,7 @@ import { useRequestParamsStore } from '@/stores/params'
 import { useParseParams } from '../hooks/useParseParams'
 import axiosInstance from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
-import { ref, watch } from 'vue'
+import { computed } from 'vue'
 import type { RequestedResponse } from '@/types/manager'
 import NoContent from '../lists/NoContent.vue'
 
@@ -56,12 +56,7 @@ const { data } = useQuery<RequestedResponse>({
   queryFn: fetchRequestedList
 })
 
-watch(
-  data,
-  () => {
-    if (data.value?.totalPages) totalPage.value = data.value.totalPages
-  },
-  { once: true }
-)
-const totalPage = ref(0)
+const totalPage = computed(() => {
+  return data.value?.totalPages
+})
 </script>
diff --git a/src/types/manager.ts b/src/types/manager.ts
index 38b5daa2..24a61661 100644
--- a/src/types/manager.ts
+++ b/src/types/manager.ts
@@ -130,3 +130,13 @@ export interface RequestedResponse {
   isFirst: boolean
   isLast: boolean
 }
+
+export interface RequestHistoryResponse {
+  content: RequestHistoryListData[]
+  totalElements: number
+  totalPages: number
+  pageNumber: number
+  pageSize: number
+  isFirst: boolean
+  isLast: boolean
+}

From 1a78397e41b225e8939f3ddfdc2d989037e566d0 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 01:03:46 +0900
Subject: [PATCH 003/180] =?UTF-8?q?=EB=82=B4=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20API=20=EC=97=B0?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-task/MyTaskList.vue         |  36 +-
 src/components/my-task/MyTaskListCard.vue     |   5 +-
 .../request-history/RequestHistoryList.vue    |   2 +
 src/datas/dummy.ts                            | 712 +-----------------
 src/types/manager.ts                          |  10 +
 5 files changed, 46 insertions(+), 719 deletions(-)

diff --git a/src/components/my-task/MyTaskList.vue b/src/components/my-task/MyTaskList.vue
index 533fd104..40dc1f21 100644
--- a/src/components/my-task/MyTaskList.vue
+++ b/src/components/my-task/MyTaskList.vue
@@ -6,15 +6,16 @@
 
     <template #listCards>
       <MyTaskListCard
-        v-for="info in DUMMY_MY_TASK_LIST_DATA"
+        v-for="info in data?.content"
         :key="info.taskId"
         :info="info" />
+      <NoContent v-if="data?.content.length === 0" />
     </template>
 
     <template #pagination>
       <ListPagination
-        :page-number="params.page"
-        :total-page="DUMMY_TOTAL_PAGE"
+        :page-number="params.page + 1"
+        :total-page="totalPage || 0"
         @update:page-number="onPageChange" />
     </template>
   </ListContainer>
@@ -23,16 +24,39 @@
 <script setup lang="ts">
 import ListPagination from '../lists/ListPagination.vue'
 import ListContainer from '../lists/ListContainer.vue'
-import { DUMMY_MY_TASK_LIST_DATA } from '@/datas/dummy'
 import { useRequestParamsStore } from '@/stores/params'
 import MyTaskListCard from './MyTaskListCard.vue'
 import MyTaskListBar from './MyTaskListBar.vue'
+import { useParseParams } from '../hooks/useParseParams'
+import axiosInstance from '@/utils/axios'
+import type { MyTaskResponse } from '@/types/manager'
+import { useQuery } from '@tanstack/vue-query'
+import { computed } from 'vue'
+import NoContent from '../lists/NoContent.vue'
 
 const { params } = useRequestParamsStore()
-const DUMMY_TOTAL_PAGE = 18
 const onPageChange = (value: number) => {
   params.page = value
 }
 
-// Data Handling
+const fetchMyTaskList = async () => {
+  const { parseRequestParams } = useParseParams()
+  const parsedParams = parseRequestParams(params)
+  const response = await axiosInstance.get('/api/tasks/assigned', {
+    headers: {
+      Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}`
+    },
+    params: parsedParams
+  })
+  return response.data
+}
+
+const { data } = useQuery<MyTaskResponse>({
+  queryKey: ['myTask', params],
+  queryFn: fetchMyTaskList
+})
+
+const totalPage = computed(() => {
+  return data.value?.totalPages
+})
 </script>
diff --git a/src/components/my-task/MyTaskListCard.vue b/src/components/my-task/MyTaskListCard.vue
index 109b304d..1130aaed 100644
--- a/src/components/my-task/MyTaskListCard.vue
+++ b/src/components/my-task/MyTaskListCard.vue
@@ -15,16 +15,17 @@
 import type { ListCardProps } from '@/types/common'
 import ListCardTab from '../lists/ListCardTab.vue'
 import type { MyTaskListData } from '@/types/manager'
+import { formatDate } from '@/utils/date'
 
 const { info } = defineProps<{ info: MyTaskListData }>()
 const myRequestTabList: ListCardProps[] = [
   { content: info.taskCode, width: 120, isTextXs: true },
-  { content: info.requestedAt, width: 80 },
+  { content: formatDate(info.requestedAt), width: 80 },
   { content: info.mainCategoryName, width: 80 },
   { content: info.categoryName, width: 80 },
   { content: info.title },
   { content: info.requesterName, width: 120, profileImg: info.requesterImg },
   { content: info.taskStatus, width: 64, isStatus: true },
-  { content: info.finishedAt, width: 80 }
+  { content: info.finishedAt ? formatDate(info.finishedAt) : '', width: 80 }
 ]
 </script>
diff --git a/src/components/request-history/RequestHistoryList.vue b/src/components/request-history/RequestHistoryList.vue
index 1eee4df0..1f5d0281 100644
--- a/src/components/request-history/RequestHistoryList.vue
+++ b/src/components/request-history/RequestHistoryList.vue
@@ -9,6 +9,7 @@
         v-for="info in data?.content"
         :key="info.taskId"
         :info="info" />
+      <NoContent v-if="data?.content.length === 0" />
     </template>
 
     <template #pagination>
@@ -31,6 +32,7 @@ import axiosInstance from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
 import type { RequestHistoryResponse } from '@/types/manager'
+import NoContent from '../lists/NoContent.vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {
diff --git a/src/datas/dummy.ts b/src/datas/dummy.ts
index c970246c..c95ad50a 100644
--- a/src/datas/dummy.ts
+++ b/src/datas/dummy.ts
@@ -1,472 +1,5 @@
 import type { LogsListData, MemberManagementListData } from '@/types/admin'
-import type {
-  MyTaskListData,
-  RequestedListData,
-  RequestHistoryListData,
-  TaskCardList
-} from '@/types/manager'
-
-export const DUMMY_REQUESTED_LIST_DATA: RequestedListData[] = [
-  {
-    taskId: 1,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 2,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 3,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 4,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 5,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 6,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 7,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 8,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 9,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 10,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 11,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 12,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 13,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 14,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 15,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 16,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 17,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 18,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 19,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  },
-  {
-    taskId: 20,
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world'
-  }
-]
-
-export const DUMMY_REQUEST_HISTORY_LIST_DATA: RequestHistoryListData[] = [
-  {
-    taskId: 1,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorName: '',
-    taskStatus: '요청',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 2,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '진행 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 3,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '검토 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 4,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '완료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 5,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '종료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 6,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorName: '',
-    taskStatus: '요청',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 7,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '진행 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 8,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '검토 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 9,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '완료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 10,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '종료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 11,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorName: '',
-    taskStatus: '요청',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 12,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '진행 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 13,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '검토 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 14,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '완료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 15,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '종료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 16,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorName: '',
-    taskStatus: '요청',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 17,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '진행 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 18,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '검토 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 19,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '완료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 20,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    processorImg: 'https://picsum.photos/24/24',
-    processorName: 'Tony.tsx',
-    taskStatus: '종료',
-    finishedAt: '2025.01.11'
-  }
-]
+import type { TaskCardList } from '@/types/manager'
 
 export const DUMMY_TASK_CARD_LIST: TaskCardList = {
   tasksInProgress: [
@@ -675,249 +208,6 @@ export const DUMMY_TASK_CARD_LIST: TaskCardList = {
   isLast: true
 }
 
-export const DUMMY_MY_TASK_LIST_DATA: MyTaskListData[] = [
-  {
-    taskId: 1,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    taskStatus: '요청',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 2,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '진행 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 3,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '검토 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 4,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '완료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 5,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '종료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 6,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    taskStatus: '요청',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 7,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '진행 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 8,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '검토 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 9,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '완료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 10,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '종료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 11,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    taskStatus: '요청',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 12,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '진행 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 13,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '검토 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 14,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '완료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 15,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '종료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 16,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Hello.world',
-    taskStatus: '요청',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 17,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '진행 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 18,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '검토 중',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 19,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '완료',
-    finishedAt: '2025.01.11'
-  },
-  {
-    taskId: 20,
-    taskCode: 'asfawnwakngla',
-    requestedAt: '2025.01.01',
-    mainCategoryName: 'VM',
-    categoryName: '생성',
-    title: 'VM 생성 부탁드립니다',
-    requesterImg: 'https://picsum.photos/24/24',
-    requesterName: 'Tony.tsx',
-    taskStatus: '종료',
-    finishedAt: '2025.01.11'
-  }
-]
-
 export const DUMMY_MEMBER_MANAGEMENT_LIST_DATA: MemberManagementListData[] = [
   {
     memberId: 1,
diff --git a/src/types/manager.ts b/src/types/manager.ts
index 24a61661..b6147a71 100644
--- a/src/types/manager.ts
+++ b/src/types/manager.ts
@@ -140,3 +140,13 @@ export interface RequestHistoryResponse {
   isFirst: boolean
   isLast: boolean
 }
+
+export interface MyTaskResponse {
+  content: MyTaskListData[]
+  totalElements: number
+  totalPages: number
+  pageNumber: number
+  pageSize: number
+  isFirst: boolean
+  isLast: boolean
+}

From 5927f99c4b8f2d790d3e7a9d1b76a63e1efd4558 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 3 Feb 2025 00:35:25 +0900
Subject: [PATCH 004/180] =?UTF-8?q?:bug:=20[fix]=20=EC=83=81=ED=83=9C?=
 =?UTF-8?q?=EA=B0=92=20ENUM=20=EA=B0=92=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constants/common.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/constants/common.ts b/src/constants/common.ts
index 9cc62cd5..7253c5a2 100644
--- a/src/constants/common.ts
+++ b/src/constants/common.ts
@@ -9,7 +9,7 @@ export const TERM_LIST = [
 export const TASK_STATUS_LIST = [
   { value: 'REQUESTED', content: '요청' },
   { value: 'IN_PROGRESS', content: '진행 중' },
-  { value: 'IN_REVIEWING', content: '검토 중' },
+  { value: 'PENDING_COMPLETED', content: '검토 중' },
   { value: 'COMPLETED', content: '완료' },
   { value: 'TERMINATED', content: '종료' }
 ]

From 310f5dccc9e77031e2a1f45a5928c8ff582d8098 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 14:45:53 +0900
Subject: [PATCH 005/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20API=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.ts         | 20 ++++++++++++++++++++
 src/views/LoginView.vue |  4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 src/api/auth.ts

diff --git a/src/api/auth.ts b/src/api/auth.ts
new file mode 100644
index 00000000..d97a9443
--- /dev/null
+++ b/src/api/auth.ts
@@ -0,0 +1,20 @@
+import axiosInstance from '@/utils/axios'
+
+export const postLogin = async (nickname: string, password: string) => {
+  const body = {
+    nickname: nickname,
+    password: password
+  }
+  const sessionIdValue = '123'
+  try {
+    const response = await axiosInstance.post('/api/auths/login', body, {
+      headers: {
+        sessionId: sessionIdValue
+      }
+    })
+    return response.data
+  } catch (error) {
+    console.error('로그인 오류:', error)
+    throw error
+  }
+}
diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index 0566f00e..49070bb4 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -46,11 +46,13 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
+import { postLogin } from '@/api/auth'
 
 const nickname = ref('')
 const password = ref('')
 
 const handleLogin = async () => {
-  // 로그인 API 필요
+  const res = postLogin(nickname.value, password.value)
+  console.log('요청확인:', res)
 }
 </script>

From 3e6e037b53650f2b3b1a660120a9725d4ea7295c Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 17:18:41 +0900
Subject: [PATCH 006/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20=EC=95=A1?=
 =?UTF-8?q?=EC=84=B8=EC=8A=A4=20=ED=86=A0=ED=81=B0=20=EC=BF=A0=ED=82=A4?=
 =?UTF-8?q?=EC=97=90=20=EC=A0=80=EC=9E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/api/auth.ts b/src/api/auth.ts
index d97a9443..3447d4d0 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -1,4 +1,5 @@
 import axiosInstance from '@/utils/axios'
+import Cookies from 'js-cookie'
 
 export const postLogin = async (nickname: string, password: string) => {
   const body = {
@@ -12,6 +13,12 @@ export const postLogin = async (nickname: string, password: string) => {
         sessionId: sessionIdValue
       }
     })
+
+    Cookies.set('accessToken', response.data.accessToken, {
+      path: '/',
+      sameSite: 'strict'
+    })
+
     return response.data
   } catch (error) {
     console.error('로그인 오류:', error)

From 53ae8e808987cf752b42b8d680f650c8c9abf82d Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 17:18:56 +0900
Subject: [PATCH 007/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EC=8B=9C=20=EA=B0=81=20=EC=97=AD=ED=95=A0?=
 =?UTF-8?q?=EB=A7=88=EB=8B=A4=20=EA=B2=BD=EB=A1=9C=20=EC=A7=80=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/LoginView.vue | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index 49070bb4..caf6bfaa 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -46,13 +46,36 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
+import { useRouter } from 'vue-router'
 import { postLogin } from '@/api/auth'
 
+const router = useRouter()
+
 const nickname = ref('')
 const password = ref('')
 
 const handleLogin = async () => {
-  const res = postLogin(nickname.value, password.value)
-  console.log('요청확인:', res)
+  try {
+    const res = await postLogin(nickname.value, password.value)
+
+    if (res) {
+      switch (res.memberInfo.memberRole) {
+        case 'ROLE_ADMIN':
+          router.push('/member-management')
+          break
+        case 'ROLE_MANAGER':
+          router.push('my-request')
+          break
+        case 'ROLE_USER':
+          router.push('/my-request')
+          break
+        default:
+          router.push('/')
+      }
+    }
+  } catch (error) {
+    // 로그인 실패 시 에러 처리
+    console.error('로그인 실패:', error)
+  }
 }
 </script>

From 05265350f02bebf58f093d69b95a7d5184696a8f Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 19:52:03 +0900
Subject: [PATCH 008/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20Pinia=20?=
 =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=A0=95=EB=B3=B4=20=EC=A0=80=EC=9E=A5?=
 =?UTF-8?q?=ED=95=98=EC=97=AC=20=EC=83=81=ED=83=9C=EA=B4=80=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/member.ts | 61 ++++++++++++++++++++++++++++++++++++++++++++
 src/types/auth.ts    |  9 +++++++
 2 files changed, 70 insertions(+)
 create mode 100644 src/stores/member.ts

diff --git a/src/stores/member.ts b/src/stores/member.ts
new file mode 100644
index 00000000..72646809
--- /dev/null
+++ b/src/stores/member.ts
@@ -0,0 +1,61 @@
+// stores/memberStore.ts
+import { defineStore } from 'pinia'
+import axiosInstance from '@/utils/axios'
+import { ref } from 'vue'
+import type { User } from '@/types/auth'
+import Cookies from 'js-cookie'
+
+export const useMemberStore = defineStore('memberInfo', () => {
+  const info = ref<User>({
+    memberId: 0,
+    memberName: '',
+    nickname: '',
+    imageUrl: '',
+    memberRole: '',
+    memberStatus: ''
+  })
+
+  // API 호출 후 회원 정보 업데이트
+  async function updateMemberInfoWithToken() {
+    try {
+      const accessToken = Cookies.get('accessToken')
+
+      if (!accessToken) {
+        console.error('Access token is missing')
+        return
+      }
+
+      const response = await axiosInstance.get('/api/members/info', {
+        headers: {
+          Authorization: `Bearer ${accessToken}`
+        }
+      })
+
+      // 받은 데이터로 상태 업데이트
+      console.log('API Response:', response.data)
+      updateMemberInfo(response.data)
+    } catch (error) {
+      console.error('Error fetching member info:', error)
+    }
+  }
+
+  // 상태 업데이트 함수
+  function updateMemberInfo(responseData: any) {
+    info.value = {
+      memberId: 0,
+      memberName: responseData.name || '',
+      nickname: responseData.nicknanme || '',
+      imageUrl: responseData.profileImageUrl || '',
+      memberRole: responseData.role || '',
+      memberStatus: ''
+    }
+
+    console.log('Updated member info:', info.value)
+  }
+
+  return {
+    info,
+    updateMemberInfo,
+    updateMemberInfoWithToken
+  }
+})
diff --git a/src/types/auth.ts b/src/types/auth.ts
index 8c5c5b14..2af35891 100644
--- a/src/types/auth.ts
+++ b/src/types/auth.ts
@@ -4,3 +4,12 @@ export interface UserTypes {
   created_at: string
   updated_at: string
 }
+
+export interface User {
+  memberId: number
+  memberName: string
+  nickname: string
+  imageUrl: string
+  memberRole: string
+  memberStatus: string
+}

From 6297ee9677507876bd772aa2eeae611529771300 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 19:52:34 +0900
Subject: [PATCH 009/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20Pinia?=
 =?UTF-8?q?=EC=97=90=20=EC=A0=80=EC=9E=A5=EB=90=9C=20=ED=9A=8C=EC=9B=90?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20Top,=20Side=EC=97=90=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SideBar.vue | 24 +++++++++++++++++-------
 src/components/TopBar.vue  | 23 +++++++++++++++++++----
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue
index fe08f51f..5641e806 100644
--- a/src/components/SideBar.vue
+++ b/src/components/SideBar.vue
@@ -39,8 +39,14 @@
 
       <div class="flex w-full justify-between px-6 py-4 bg-white">
         <div class="flex w-full items-center gap-3">
-          <!-- 프로필 사진 API 필요 -->
-          <div class="w-10 h-10 rounded-full bg-background-1" />
+          <img
+            v-if="info?.imageUrl"
+            class="rounded-[50%] w-10 h-10"
+            :src="info.imageUrl"
+            alt="프로필 이미지" />
+          <div
+            v-else
+            class="w-10 h-10 rounded-full bg-background-1" />
           <div class="flex flex-col gap-1">
             <p class="text-xs text-body font-bold">{{ name }}</p>
             <p class="text-sm text-black">{{ nickname }}</p>
@@ -61,17 +67,21 @@
 
 <script setup lang="ts">
 import { useRoute } from 'vue-router'
-import { computed, ref } from 'vue'
+import { computed } from 'vue'
 import CommonIcons from './common/CommonIcons.vue'
 import { hamburgerIcon } from '@/constants/iconPath'
 import { SIDE_USER_MENU, SIDE_MANAGER_MENU, SIDE_ADMIN_MENU } from '@/constants/menu'
+import { useMemberStore } from '@/stores/member'
+import { storeToRefs } from 'pinia'
+
+const memberStore = useMemberStore()
+const { info } = storeToRefs(memberStore)
 
 const route = useRoute()
 
-// 회원 역할, 닉네임 필요
-const role = ref('manager')
-const name = ref('백지연')
-const nickname = ref('Chloe.yeon')
+const role = computed(() => info.value.memberRole)
+const name = computed(() => info.value.memberName)
+const nickname = computed(() => info.value.nickname)
 
 const filteredMenu = computed(() => {
   return role.value === 'user'
diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
index 07cd95cb..28b9dce8 100644
--- a/src/components/TopBar.vue
+++ b/src/components/TopBar.vue
@@ -14,8 +14,14 @@
         v-show="isLogined"
         class="flex items-center gap-6">
         <NotificationIcon :new-notification="12" />
-        <!-- 프로필 사진 API 필요 -->
-        <div class="rounded-[50%] bg-zinc-100 p-5" />
+        <img
+          v-if="info?.imageUrl"
+          class="rounded-[50%] w-10 h-10"
+          :src="info.imageUrl"
+          alt="프로필 이미지" />
+        <div
+          v-else
+          class="rounded-[50%] bg-zinc-100 p-5" />
       </div>
     </div>
   </div>
@@ -25,13 +31,22 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import CommonIcons from './common/CommonIcons.vue'
 import SideBar from './SideBar.vue'
 import { hamburgerIcon } from '../constants/iconPath'
 import NotificationIcon from './icons/NotificationIcon.vue'
+import { storeToRefs } from 'pinia'
+import { useMemberStore } from '@/stores/member'
+
+const memberStore = useMemberStore()
+const { info } = storeToRefs(memberStore)
+
+onMounted(async () => {
+  await memberStore.updateMemberInfoWithToken()
+  console.log('Updated info after API call:', info.value)
+})
 
-// 로그인 정보 필요
 const isSideOpen = ref(false)
 const isLogined = ref(true)
 

From af0c26278a9fb548416880c3811abd181db13faa Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 20:41:18 +0900
Subject: [PATCH 010/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20=EB=B9=84?=
 =?UTF-8?q?=EB=B0=80=EB=B2=88=ED=98=B8=20=EC=9E=AC=EC=84=A4=EC=A0=95=20API?=
 =?UTF-8?q?=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.ts        | 20 ++++++++++++++++++++
 src/views/PwChange.vue |  4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/api/auth.ts b/src/api/auth.ts
index 3447d4d0..c0ddf40b 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -25,3 +25,23 @@ export const postLogin = async (nickname: string, password: string) => {
     throw error
   }
 }
+
+export const patchPassword = async (password: string) => {
+  const accessToken = Cookies.get('accessToken')
+
+  if (!accessToken) {
+    console.error('Access token is missing')
+    return
+  }
+
+  try {
+    const response = await axiosInstance.patch('/api/members/password', password, {
+      headers: {
+        Authorization: `Bearer ${accessToken}`
+      }
+    })
+    return response.data
+  } catch (error) {
+    console.log('api error:', error)
+  }
+}
diff --git a/src/views/PwChange.vue b/src/views/PwChange.vue
index 2c85c0dc..889f5454 100644
--- a/src/views/PwChange.vue
+++ b/src/views/PwChange.vue
@@ -49,6 +49,7 @@
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import ModalView from '../components/ModalView.vue'
+import { patchPassword } from '@/api/auth'
 
 const newPw = ref('')
 const checkPw = ref('')
@@ -61,9 +62,10 @@ const toggleModal = () => {
 
 const handleChange = () => {
   if (newPw.value === checkPw.value) {
+    const response = patchPassword(newPw.value)
+    console.log(response)
     console.log('비밀번호 변경 성공!')
     toggleModal()
-    // 비밀번호 재설정 API 호출 필요
   } else {
     alert('비밀번호가 일치하지 않습니다.')
   }

From ba6f6d22485b223296bfda6c773e712ae138cdcc Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 20:42:52 +0900
Subject: [PATCH 011/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TopBar.vue | 1 -
 src/stores/member.ts      | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
index 28b9dce8..f39df6e6 100644
--- a/src/components/TopBar.vue
+++ b/src/components/TopBar.vue
@@ -44,7 +44,6 @@ const { info } = storeToRefs(memberStore)
 
 onMounted(async () => {
   await memberStore.updateMemberInfoWithToken()
-  console.log('Updated info after API call:', info.value)
 })
 
 const isSideOpen = ref(false)
diff --git a/src/stores/member.ts b/src/stores/member.ts
index 72646809..099d757c 100644
--- a/src/stores/member.ts
+++ b/src/stores/member.ts
@@ -1,4 +1,3 @@
-// stores/memberStore.ts
 import { defineStore } from 'pinia'
 import axiosInstance from '@/utils/axios'
 import { ref } from 'vue'
@@ -15,13 +14,12 @@ export const useMemberStore = defineStore('memberInfo', () => {
     memberStatus: ''
   })
 
-  // API 호출 후 회원 정보 업데이트
   async function updateMemberInfoWithToken() {
     try {
       const accessToken = Cookies.get('accessToken')
 
       if (!accessToken) {
-        console.error('Access token is missing')
+        console.error('Access token error')
         return
       }
 
@@ -31,15 +29,13 @@ export const useMemberStore = defineStore('memberInfo', () => {
         }
       })
 
-      // 받은 데이터로 상태 업데이트
       console.log('API Response:', response.data)
       updateMemberInfo(response.data)
     } catch (error) {
-      console.error('Error fetching member info:', error)
+      console.error('updata error:', error)
     }
   }
 
-  // 상태 업데이트 함수
   function updateMemberInfo(responseData: any) {
     info.value = {
       memberId: 0,

From fa97a002979b8b9c23a52496f2a1e95d41b74cb9 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 1 Feb 2025 20:03:17 +0900
Subject: [PATCH 012/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20prop?=
 =?UTF-8?q?=EB=8C=80=EC=8B=A0=20=EC=A7=81=EC=A0=91=20=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=A4=EA=B8=B0,=20=ED=8C=8C=EC=9D=BC=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=EA=B0=92=20=EB=B0=B0=EC=97=B4=EB=A1=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 25 ++++++++-------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 1374053b..42a6e266 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -36,10 +36,10 @@
 </template>
 
 <script lang="ts" setup>
-import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
-import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { onMounted, ref, watch } from 'vue'
+import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
+import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
+import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import ModalView from '../ModalView.vue'
@@ -86,17 +86,9 @@ const handleCancel = () => {
 }
 
 const handleSubmit = async () => {
-  if (!category1.value || !category2.value) {
-    isInvalidate.value = 'category'
-    console.log(isInvalidate.value, '변경됨')
-    return
-  } else if (!title.value) {
-    isInvalidate.value = 'input'
-    return
-  }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value.id,
+    categoryId: 1,
     title: title.value,
     description: description.value
   }
@@ -105,14 +97,15 @@ const handleSubmit = async () => {
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
 
   formData.append('taskInfo', newBlob)
-
   if (file.value && file.value.length > 0) {
-    file.value.forEach(f => formData.append('attachment', f))
+    file.value.forEach(f => {
+      formData.append('attachment', f)
+    })
   }
+  console.log(Object.fromEntries(formData), '응답')
+  console.log(file.value, '파일 현황 응답')
   try {
     const res = await postTaskRequest(formData)
-    isModalVisible.value = true
-    console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
   }

From 62ca2e720e550153bca182d948ff8e0b080a2a79 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 02:19:43 +0900
Subject: [PATCH 013/180] =?UTF-8?q?:recycle:=20[refactor]=20:=201,2?=
 =?UTF-8?q?=EC=B0=A8=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=84=A0=EC=96=B8=20=EB=B0=8F=20=EC=9C=84=EC=B9=98?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/common.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/types/common.ts b/src/types/common.ts
index 3cb18d94..80574efa 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -93,10 +93,9 @@ export interface SubCategoryTypes {
 }
 
 export interface CategoryDropdownProps {
+  placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: MainCategoryTypes | SubCategoryTypes | null
+  modelValue: string
   isLabel?: boolean
-  isDisabled?: boolean
-  isInvalidate?: string
 }

From 7608c6be8b58a1ecd4cc131bc93d7cb821dff7cb Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:07:11 +0900
Subject: [PATCH 014/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=EC=9A=A9=20=EB=93=9C=EB=A1=AD?=
 =?UTF-8?q?=EB=8B=A4=EC=9A=B4=20=EA=B0=9C=EB=B3=84=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/CategoryDropDown.vue | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 7f377299..609ebdae 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -7,18 +7,13 @@
         class="text-red-1">
         *
       </p>
-      <p
-        v-if="isInvalidateState === 'category'"
-        class="text-red-1">
-        카테고리를 선택해주세요
-      </p>
     </div>
     <div class="relative flex text-base">
       <div
         class="flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black"
         @click="toggleDropdown">
         <p :class="{ 'text-disabled': !modelValue?.name }">
-          {{ modelValue?.name ?? labelName + '를 선택해주세요' }}
+          {{ modelValue?.name ?? placeholderText }}
         </p>
         <CommonIcons
           :name="dropdownIcon"
@@ -42,14 +37,11 @@
 <script lang="ts" setup>
 import { dropdownIcon } from '@/constants/iconPath'
 import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { computed, ref } from 'vue'
+import { ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
+const { placeholderText, options, labelName, modelValue, isLabel, isDisabled } =
   defineProps<CategoryDropdownProps>()
-
-const isInvalidateState = computed(() => isInvalidate)
-
 const emit = defineEmits(['update:modelValue'])
 const dropdownOpen = ref(false)
 

From bc4463357da86cb995c322140124c5f214d49f2d Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:11:02 +0900
Subject: [PATCH 015/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=9D=EC=84=B1=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 33 ++++++++++++++++-----
 src/types/common.ts                         |  3 +-
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 42a6e266..00022d80 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -4,13 +4,13 @@
       v-model="category1"
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
-      :isInvalidate="isInvalidate"
+      :placeholderText="'1차 카테고리를 선택해주세요'"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
-      :is-invalidate="isInvalidate"
+      :placeholderText="'2차 카테고리를 선택해주세요'"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
@@ -36,13 +36,13 @@
 </template>
 
 <script lang="ts" setup>
+import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
 import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
-import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
-import { ref } from 'vue'
+import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
+import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
-import ModalView from '../ModalView.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
 import RequestTaskFileInput from './RequestTaskFileInput.vue'
 import RequestTaskInput from './RequestTaskInput.vue'
@@ -74,6 +74,23 @@ watch(category1, async newValue => {
   )
 })
 
+const mainCategoryArr = ref<MainCategoryTypes[]>([])
+const subCategoryArr = ref<SubCategoryTypes[]>([])
+const afterSubCategoryArr = ref<SubCategoryTypes[]>([])
+
+onMounted(async () => {
+  mainCategoryArr.value = await getMainCategory()
+  subCategoryArr.value = await getSubCategory()
+  afterSubCategoryArr.value = await getSubCategory()
+})
+
+watch(category1, async newValue => {
+  category2.value = null
+  afterSubCategoryArr.value = subCategoryArr.value.filter(
+    subCategory => subCategory.mainCategoryId === newValue?.id
+  )
+})
+
 const router = useRouter()
 
 const handleCancel = () => {
@@ -88,7 +105,7 @@ const handleCancel = () => {
 const handleSubmit = async () => {
   const formData = new FormData()
   const taskInfo = {
-    categoryId: 1,
+    categoryId: category2.value?.id,
     title: title.value,
     description: description.value
   }
@@ -97,15 +114,15 @@ const handleSubmit = async () => {
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
 
   formData.append('taskInfo', newBlob)
+
   if (file.value && file.value.length > 0) {
     file.value.forEach(f => {
       formData.append('attachment', f)
     })
   }
-  console.log(Object.fromEntries(formData), '응답')
-  console.log(file.value, '파일 현황 응답')
   try {
     const res = await postTaskRequest(formData)
+    console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
   }
diff --git a/src/types/common.ts b/src/types/common.ts
index 80574efa..ca389d58 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -96,6 +96,7 @@ export interface CategoryDropdownProps {
   placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: string
+  modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
+  isDisabled?: boolean
 }

From 28439a2b74498e130099f673d98cd089b45daaac Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 11:51:43 +0900
Subject: [PATCH 016/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EB=88=84=EB=9D=BD=EC=8B=9C=20=EA=B2=BD=EA=B3=A0=20?=
 =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request-task/CategoryDropDown.vue         | 12 +++++--
 src/components/request-task/RequestTask.vue   | 32 +++++++------------
 src/types/common.ts                           |  1 +
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 609ebdae..8ab78003 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -7,6 +7,11 @@
         class="text-red-1">
         *
       </p>
+      <p
+        v-if="isInvalidateState === 'category'"
+        class="text-red-1">
+        카테고리를 선택해주세요
+      </p>
     </div>
     <div class="relative flex text-base">
       <div
@@ -37,11 +42,14 @@
 <script lang="ts" setup>
 import { dropdownIcon } from '@/constants/iconPath'
 import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { placeholderText, options, labelName, modelValue, isLabel, isDisabled } =
+const { placeholderText, options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
   defineProps<CategoryDropdownProps>()
+
+const isInvalidateState = computed(() => isInvalidate)
+
 const emit = defineEmits(['update:modelValue'])
 const dropdownOpen = ref(false)
 
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 00022d80..be2a096d 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -5,16 +5,18 @@
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
       :placeholderText="'1차 카테고리를 선택해주세요'"
+      :isInvalidate="isInvalidate"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
       :placeholderText="'2차 카테고리를 선택해주세요'"
+      :is-invalidate="isInvalidate"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
-      :placeholderText="'제목을 입력해주세요'"
+      :placeholderText="TITLE_PLACEHOLDER"
       :label-name="'제목'"
       :is-invalidate="isInvalidate" />
     <RequestTaskTextArea
@@ -55,24 +57,6 @@ const title = ref('')
 const description = ref('')
 const file = ref(null as File[] | null)
 const isInvalidate = ref('')
-const isModalVisible = ref(false)
-
-const mainCategoryArr = ref<MainCategoryTypes[]>([])
-const subCategoryArr = ref<SubCategoryTypes[]>([])
-const afterSubCategoryArr = ref<SubCategoryTypes[]>([])
-
-onMounted(async () => {
-  mainCategoryArr.value = await getMainCategory()
-  subCategoryArr.value = await getSubCategory()
-  afterSubCategoryArr.value = await getSubCategory()
-})
-
-watch(category1, async newValue => {
-  category2.value = null
-  afterSubCategoryArr.value = subCategoryArr.value.filter(
-    subCategory => subCategory.mainCategoryId === newValue?.id
-  )
-})
 
 const mainCategoryArr = ref<MainCategoryTypes[]>([])
 const subCategoryArr = ref<SubCategoryTypes[]>([])
@@ -103,9 +87,17 @@ const handleCancel = () => {
 }
 
 const handleSubmit = async () => {
+  if (!category1.value || !category2.value) {
+    isInvalidate.value = 'category'
+    console.log(isInvalidate.value, '변경됨')
+    return
+  } else if (!title.value) {
+    isInvalidate.value = 'input'
+    return
+  }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value?.id,
+    categoryId: category2.value.id,
     title: title.value,
     description: description.value
   }
diff --git a/src/types/common.ts b/src/types/common.ts
index ca389d58..fd067149 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -99,4 +99,5 @@ export interface CategoryDropdownProps {
   modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
   isDisabled?: boolean
+  isInvalidate?: string
 }

From 63168c42130cc50e325db14aeb1aba59a5b6e630 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:03:33 +0900
Subject: [PATCH 017/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=99=84=EB=A3=8C=20=ED=9B=84=20=EB=AA=A8=EB=8B=AC?=
 =?UTF-8?q?=20=EB=B0=8F=20=EB=9D=BC=EC=9A=B0=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index be2a096d..6df4ba00 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -45,6 +45,7 @@ import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
+import ModalView from '../ModalView.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
 import RequestTaskFileInput from './RequestTaskFileInput.vue'
 import RequestTaskInput from './RequestTaskInput.vue'
@@ -57,6 +58,7 @@ const title = ref('')
 const description = ref('')
 const file = ref(null as File[] | null)
 const isInvalidate = ref('')
+const isModalVisible = ref(false)
 
 const mainCategoryArr = ref<MainCategoryTypes[]>([])
 const subCategoryArr = ref<SubCategoryTypes[]>([])
@@ -114,6 +116,7 @@ const handleSubmit = async () => {
   }
   try {
     const res = await postTaskRequest(formData)
+    isModalVisible.value = true
     console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)

From 81ccca90b9ce55a88d2a6d58b2f78293d464af46 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:09:51 +0900
Subject: [PATCH 018/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20axios=20in?=
 =?UTF-8?q?stance=20=EA=B0=9D=EC=B2=B4=20=EB=B6=84=EB=A6=AC=ED=95=B4?=
 =?UTF-8?q?=EC=84=9C=20import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index 4d02af29..c310c969 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -33,15 +33,6 @@ import ListPagination from '../lists/ListPagination.vue'
 import NoContent from '../lists/NoContent.vue'
 import MyRequestListBar from './MyRequestListBar.vue'
 import MyRequestListCard from './MyRequestListCard.vue'
-import ListPagination from '../lists/ListPagination.vue'
-import ListContainer from '../lists/ListContainer.vue'
-import { useRequestParamsStore } from '@/stores/params'
-import axiosInstance from '@/utils/axios'
-import { useQuery } from '@tanstack/vue-query'
-import { useParseParams } from '../hooks/useParseParams'
-import type { MyRequestResponse } from '@/types/user'
-import { computed } from 'vue'
-import NoContent from '../lists/NoContent.vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {

From 1429843a1e14a71d503dc694403d6acf0ba81e50 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:18:58 +0900
Subject: [PATCH 019/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EB=93=9C=EB=A1=AD=EB=8B=A4?=
 =?UTF-8?q?=EC=9A=B4=20placeholder=EC=97=86=EC=9D=B4,=20input=20placeholde?=
 =?UTF-8?q?r=20=EC=83=81=EC=88=98=ED=99=94=20=EC=B7=A8=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/CategoryDropDown.vue | 4 ++--
 src/components/request-task/RequestTask.vue      | 9 ++-------
 src/types/common.ts                              | 1 -
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 8ab78003..7f377299 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -18,7 +18,7 @@
         class="flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black"
         @click="toggleDropdown">
         <p :class="{ 'text-disabled': !modelValue?.name }">
-          {{ modelValue?.name ?? placeholderText }}
+          {{ modelValue?.name ?? labelName + '를 선택해주세요' }}
         </p>
         <CommonIcons
           :name="dropdownIcon"
@@ -45,7 +45,7 @@ import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from
 import { computed, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { placeholderText, options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
+const { options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
   defineProps<CategoryDropdownProps>()
 
 const isInvalidateState = computed(() => isInvalidate)
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 6df4ba00..1374053b 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -4,19 +4,17 @@
       v-model="category1"
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
-      :placeholderText="'1차 카테고리를 선택해주세요'"
       :isInvalidate="isInvalidate"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
-      :placeholderText="'2차 카테고리를 선택해주세요'"
       :is-invalidate="isInvalidate"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
-      :placeholderText="TITLE_PLACEHOLDER"
+      :placeholderText="'제목을 입력해주세요'"
       :label-name="'제목'"
       :is-invalidate="isInvalidate" />
     <RequestTaskTextArea
@@ -40,7 +38,6 @@
 <script lang="ts" setup>
 import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
-import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
 import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
@@ -110,9 +107,7 @@ const handleSubmit = async () => {
   formData.append('taskInfo', newBlob)
 
   if (file.value && file.value.length > 0) {
-    file.value.forEach(f => {
-      formData.append('attachment', f)
-    })
+    file.value.forEach(f => formData.append('attachment', f))
   }
   try {
     const res = await postTaskRequest(formData)
diff --git a/src/types/common.ts b/src/types/common.ts
index fd067149..3cb18d94 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -93,7 +93,6 @@ export interface SubCategoryTypes {
 }
 
 export interface CategoryDropdownProps {
-  placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
   modelValue: MainCategoryTypes | SubCategoryTypes | null

From 6e4411aceda74a7a087d597df98c11edcb25c441 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 20:56:59 +0900
Subject: [PATCH 020/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20a?=
 =?UTF-8?q?xios=20=EC=9D=B8=EC=8A=A4=ED=84=B4=EC=8A=A4=20=EC=9D=B4?=
 =?UTF-8?q?=EC=8A=88=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.ts      | 2 +-
 src/stores/member.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/auth.ts b/src/api/auth.ts
index c0ddf40b..a5baf222 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -1,4 +1,4 @@
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import Cookies from 'js-cookie'
 
 export const postLogin = async (nickname: string, password: string) => {
diff --git a/src/stores/member.ts b/src/stores/member.ts
index 099d757c..97039ee9 100644
--- a/src/stores/member.ts
+++ b/src/stores/member.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import { ref } from 'vue'
 import type { User } from '@/types/auth'
 import Cookies from 'js-cookie'

From c9e99473ba7d47befb65150df059e093e370d2eb Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 02:19:43 +0900
Subject: [PATCH 021/180] =?UTF-8?q?:recycle:=20[refactor]=20:=201,2?=
 =?UTF-8?q?=EC=B0=A8=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=84=A0=EC=96=B8=20=EB=B0=8F=20=EC=9C=84=EC=B9=98?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/common.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/types/common.ts b/src/types/common.ts
index 3cb18d94..80574efa 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -93,10 +93,9 @@ export interface SubCategoryTypes {
 }
 
 export interface CategoryDropdownProps {
+  placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: MainCategoryTypes | SubCategoryTypes | null
+  modelValue: string
   isLabel?: boolean
-  isDisabled?: boolean
-  isInvalidate?: string
 }

From 4c58d7d14919e29fbc8401dadde1b7ac0496054f Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:11:02 +0900
Subject: [PATCH 022/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=9D=EC=84=B1=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 26 +++++++++++++++++----
 src/types/common.ts                         |  3 ++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 1374053b..1e44ce14 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -4,13 +4,13 @@
       v-model="category1"
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
-      :isInvalidate="isInvalidate"
+      :placeholderText="'1차 카테고리를 선택해주세요'"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
-      :is-invalidate="isInvalidate"
+      :placeholderText="'2차 카테고리를 선택해주세요'"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
@@ -38,11 +38,11 @@
 <script lang="ts" setup>
 import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
+import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
 import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
-import ModalView from '../ModalView.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
 import RequestTaskFileInput from './RequestTaskFileInput.vue'
 import RequestTaskInput from './RequestTaskInput.vue'
@@ -74,6 +74,23 @@ watch(category1, async newValue => {
   )
 })
 
+const mainCategoryArr = ref<MainCategoryTypes[]>([])
+const subCategoryArr = ref<SubCategoryTypes[]>([])
+const afterSubCategoryArr = ref<SubCategoryTypes[]>([])
+
+onMounted(async () => {
+  mainCategoryArr.value = await getMainCategory()
+  subCategoryArr.value = await getSubCategory()
+  afterSubCategoryArr.value = await getSubCategory()
+})
+
+watch(category1, async newValue => {
+  category2.value = null
+  afterSubCategoryArr.value = subCategoryArr.value.filter(
+    subCategory => subCategory.mainCategoryId === newValue?.id
+  )
+})
+
 const router = useRouter()
 
 const handleCancel = () => {
@@ -96,7 +113,7 @@ const handleSubmit = async () => {
   }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value.id,
+    categoryId: category2.value?.id,
     title: title.value,
     description: description.value
   }
@@ -111,7 +128,6 @@ const handleSubmit = async () => {
   }
   try {
     const res = await postTaskRequest(formData)
-    isModalVisible.value = true
     console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
diff --git a/src/types/common.ts b/src/types/common.ts
index 80574efa..ca389d58 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -96,6 +96,7 @@ export interface CategoryDropdownProps {
   placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: string
+  modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
+  isDisabled?: boolean
 }

From 70d2fd876ec442c0cd5f9962349e70c80b6317de Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 02:19:43 +0900
Subject: [PATCH 023/180] =?UTF-8?q?:recycle:=20[refactor]=20:=201,2?=
 =?UTF-8?q?=EC=B0=A8=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=84=A0=EC=96=B8=20=EB=B0=8F=20=EC=9C=84=EC=B9=98?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/common.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/types/common.ts b/src/types/common.ts
index ca389d58..80574efa 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -96,7 +96,6 @@ export interface CategoryDropdownProps {
   placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: MainCategoryTypes | SubCategoryTypes | null
+  modelValue: string
   isLabel?: boolean
-  isDisabled?: boolean
 }

From f520926cd3447d67e22bb2f576dfb07b8c28243b Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:11:02 +0900
Subject: [PATCH 024/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=9D=EC=84=B1=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/common.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/types/common.ts b/src/types/common.ts
index 80574efa..ca389d58 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -96,6 +96,7 @@ export interface CategoryDropdownProps {
   placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: string
+  modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
+  isDisabled?: boolean
 }

From df2f3cc51ce972491595f48a8cd29a7721f0c3d5 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 21:08:37 +0900
Subject: [PATCH 025/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=EC=97=AD=ED=95=A0=20=EB=B3=80=EC=88=98=EC=97=90=20=EB=94=B0?=
 =?UTF-8?q?=EB=A5=B8=20=EA=B0=92=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SideBar.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue
index 5641e806..80a1dc20 100644
--- a/src/components/SideBar.vue
+++ b/src/components/SideBar.vue
@@ -84,9 +84,9 @@ const name = computed(() => info.value.memberName)
 const nickname = computed(() => info.value.nickname)
 
 const filteredMenu = computed(() => {
-  return role.value === 'user'
+  return role.value === 'ROLE_USER'
     ? SIDE_USER_MENU
-    : role.value === 'manager'
+    : role.value === 'ROLE_MANAGER'
       ? SIDE_MANAGER_MENU
       : SIDE_ADMIN_MENU
 })

From 9d27c4ae1f3a098be78ea1a876b07a0301f9a1d8 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 23:39:33 +0900
Subject: [PATCH 026/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?=
 =?UTF-8?q?=EA=B0=92=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/member.ts | 2 --
 src/types/auth.ts    | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/stores/member.ts b/src/stores/member.ts
index 97039ee9..07eeb21a 100644
--- a/src/stores/member.ts
+++ b/src/stores/member.ts
@@ -6,7 +6,6 @@ import Cookies from 'js-cookie'
 
 export const useMemberStore = defineStore('memberInfo', () => {
   const info = ref<User>({
-    memberId: 0,
     memberName: '',
     nickname: '',
     imageUrl: '',
@@ -38,7 +37,6 @@ export const useMemberStore = defineStore('memberInfo', () => {
 
   function updateMemberInfo(responseData: any) {
     info.value = {
-      memberId: 0,
       memberName: responseData.name || '',
       nickname: responseData.nicknanme || '',
       imageUrl: responseData.profileImageUrl || '',
diff --git a/src/types/auth.ts b/src/types/auth.ts
index 2af35891..276cf384 100644
--- a/src/types/auth.ts
+++ b/src/types/auth.ts
@@ -6,7 +6,6 @@ export interface UserTypes {
 }
 
 export interface User {
-  memberId: number
   memberName: string
   nickname: string
   imageUrl: string

From 46efe46302e75c3c0d52e960677440b0649eab1e Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 23:44:36 +0900
Subject: [PATCH 027/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=ED=86=A0=ED=81=B0=20axios=ED=8C=8C=EC=9D=BC=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=20=EC=B2=98=EB=A6=AC=EB=90=98=EB=AF=80=EB=A1=9C=20=EB=B6=88?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=98=EC=97=AC=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/member.ts | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/stores/member.ts b/src/stores/member.ts
index 07eeb21a..ab586039 100644
--- a/src/stores/member.ts
+++ b/src/stores/member.ts
@@ -15,18 +15,7 @@ export const useMemberStore = defineStore('memberInfo', () => {
 
   async function updateMemberInfoWithToken() {
     try {
-      const accessToken = Cookies.get('accessToken')
-
-      if (!accessToken) {
-        console.error('Access token error')
-        return
-      }
-
-      const response = await axiosInstance.get('/api/members/info', {
-        headers: {
-          Authorization: `Bearer ${accessToken}`
-        }
-      })
+      const response = await axiosInstance.get('/api/members/info')
 
       console.log('API Response:', response.data)
       updateMemberInfo(response.data)

From a17f72cadbb0382d1b36a51d976056ef37fee97e Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 23:51:56 +0900
Subject: [PATCH 028/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=98=88=EC=99=B8?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.ts | 52 ++++++++++++++++++++-----------------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/src/api/auth.ts b/src/api/auth.ts
index a5baf222..89412849 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -7,41 +7,31 @@ export const postLogin = async (nickname: string, password: string) => {
     password: password
   }
   const sessionIdValue = '123'
-  try {
-    const response = await axiosInstance.post('/api/auths/login', body, {
-      headers: {
-        sessionId: sessionIdValue
-      }
-    })
-
-    Cookies.set('accessToken', response.data.accessToken, {
-      path: '/',
-      sameSite: 'strict'
-    })
-
-    return response.data
-  } catch (error) {
-    console.error('로그인 오류:', error)
-    throw error
-  }
+
+  const response = await axiosInstance.post('/api/auths/login', body, {
+    headers: {
+      sessionId: sessionIdValue
+    }
+  })
+
+  Cookies.set('accessToken', response.data.accessToken, {
+    path: '/',
+    sameSite: 'strict'
+  })
+
+  return response.data
 }
 
 export const patchPassword = async (password: string) => {
   const accessToken = Cookies.get('accessToken')
 
-  if (!accessToken) {
-    console.error('Access token is missing')
-    return
-  }
+  if (!accessToken) return
 
-  try {
-    const response = await axiosInstance.patch('/api/members/password', password, {
-      headers: {
-        Authorization: `Bearer ${accessToken}`
-      }
-    })
-    return response.data
-  } catch (error) {
-    console.log('api error:', error)
-  }
+  const response = await axiosInstance.patch('/api/members/password', password, {
+    headers: {
+      Authorization: `Bearer ${accessToken}`
+    }
+  })
+
+  return response.data
 }

From 488d8a273bf6f1cdb8c636c9dba07fd05b436149 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Mon, 3 Feb 2025 00:14:44 +0900
Subject: [PATCH 029/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20r?=
 =?UTF-8?q?equest=20body=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=84=A0=EC=96=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.ts         | 17 ++++-------------
 src/types/auth.ts       |  5 +++++
 src/views/LoginView.vue |  7 ++++++-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/api/auth.ts b/src/api/auth.ts
index 89412849..bafbad6c 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -1,24 +1,15 @@
 import { axiosInstance } from '@/utils/axios'
 import Cookies from 'js-cookie'
+import type { loginDataTypes } from '@/types/auth'
 
-export const postLogin = async (nickname: string, password: string) => {
-  const body = {
-    nickname: nickname,
-    password: password
-  }
-  const sessionIdValue = '123'
-
-  const response = await axiosInstance.post('/api/auths/login', body, {
-    headers: {
-      sessionId: sessionIdValue
-    }
+export const postLogin = async (loginData: loginDataTypes, sessionId: string) => {
+  const response = await axiosInstance.post('/api/auths/login', loginData, {
+    headers: { sessionId: sessionId }
   })
-
   Cookies.set('accessToken', response.data.accessToken, {
     path: '/',
     sameSite: 'strict'
   })
-
   return response.data
 }
 
diff --git a/src/types/auth.ts b/src/types/auth.ts
index 276cf384..6a1bd51a 100644
--- a/src/types/auth.ts
+++ b/src/types/auth.ts
@@ -12,3 +12,8 @@ export interface User {
   memberRole: string
   memberStatus: string
 }
+
+export interface loginDataTypes {
+  nickname: string
+  password: string
+}
diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index caf6bfaa..1dd39baf 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -56,7 +56,12 @@ const password = ref('')
 
 const handleLogin = async () => {
   try {
-    const res = await postLogin(nickname.value, password.value)
+    const loginData = {
+      nickname: nickname.value,
+      password: password.value
+    }
+    const sessionId = '000'
+    const res = await postLogin(loginData, sessionId)
 
     if (res) {
       switch (res.memberInfo.memberRole) {

From bf93f0f57184d4e3ed3f5522d7a5798720bb4b39 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Mon, 3 Feb 2025 00:14:56 +0900
Subject: [PATCH 030/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=20=EC=BD=94=EB=93=9C=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/member.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/stores/member.ts b/src/stores/member.ts
index ab586039..e1faef45 100644
--- a/src/stores/member.ts
+++ b/src/stores/member.ts
@@ -2,7 +2,6 @@ import { defineStore } from 'pinia'
 import { axiosInstance } from '@/utils/axios'
 import { ref } from 'vue'
 import type { User } from '@/types/auth'
-import Cookies from 'js-cookie'
 
 export const useMemberStore = defineStore('memberInfo', () => {
   const info = ref<User>({

From 2bdf95639cd1cfcc97616d658adbca128f72436e Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 3 Feb 2025 09:32:49 +0900
Subject: [PATCH 031/180] =?UTF-8?q?:bug:=20[fix]=20=EB=B9=8C=EB=93=9C=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-task/MyTaskList.vue                 | 2 +-
 src/components/request-history/RequestHistoryList.vue | 2 +-
 src/components/requested/RequestedList.vue            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/my-task/MyTaskList.vue b/src/components/my-task/MyTaskList.vue
index 40dc1f21..d470a1e4 100644
--- a/src/components/my-task/MyTaskList.vue
+++ b/src/components/my-task/MyTaskList.vue
@@ -28,7 +28,7 @@ import { useRequestParamsStore } from '@/stores/params'
 import MyTaskListCard from './MyTaskListCard.vue'
 import MyTaskListBar from './MyTaskListBar.vue'
 import { useParseParams } from '../hooks/useParseParams'
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import type { MyTaskResponse } from '@/types/manager'
 import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
diff --git a/src/components/request-history/RequestHistoryList.vue b/src/components/request-history/RequestHistoryList.vue
index 1f5d0281..2399d44e 100644
--- a/src/components/request-history/RequestHistoryList.vue
+++ b/src/components/request-history/RequestHistoryList.vue
@@ -28,7 +28,7 @@ import { useRequestParamsStore } from '@/stores/params'
 import RequestHistoryListBar from './RequestHistoryListBar.vue'
 import RequestHistoryListCard from './RequestHistoryListCard.vue'
 import { useParseParams } from '../hooks/useParseParams'
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
 import type { RequestHistoryResponse } from '@/types/manager'
diff --git a/src/components/requested/RequestedList.vue b/src/components/requested/RequestedList.vue
index 63766955..b5b25eab 100644
--- a/src/components/requested/RequestedList.vue
+++ b/src/components/requested/RequestedList.vue
@@ -28,7 +28,7 @@ import RequestedListBar from './RequestedListBar.vue'
 import RequestedListCard from './RequestedListCard.vue'
 import { useRequestParamsStore } from '@/stores/params'
 import { useParseParams } from '../hooks/useParseParams'
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
 import type { RequestedResponse } from '@/types/manager'

From 993371829fc21cda64d28a67bfd020cef0ce741d Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Mon, 3 Feb 2025 13:37:04 +0900
Subject: [PATCH 032/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=EC=BD=94=EB=93=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue |  2 +-
 src/components/request-task/RequestTask.vue | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index c310c969..78d4b07e 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -26,7 +26,7 @@ import { useRequestParamsStore } from '@/stores/params'
 import type { MyRequestResponse } from '@/types/user'
 import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { useParseParams } from '../hooks/useParseParams'
 import ListContainer from '../lists/ListContainer.vue'
 import ListPagination from '../lists/ListPagination.vue'
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 1e44ce14..2131767b 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -73,24 +73,6 @@ watch(category1, async newValue => {
     subCategory => subCategory.mainCategoryId === newValue?.id
   )
 })
-
-const mainCategoryArr = ref<MainCategoryTypes[]>([])
-const subCategoryArr = ref<SubCategoryTypes[]>([])
-const afterSubCategoryArr = ref<SubCategoryTypes[]>([])
-
-onMounted(async () => {
-  mainCategoryArr.value = await getMainCategory()
-  subCategoryArr.value = await getSubCategory()
-  afterSubCategoryArr.value = await getSubCategory()
-})
-
-watch(category1, async newValue => {
-  category2.value = null
-  afterSubCategoryArr.value = subCategoryArr.value.filter(
-    subCategory => subCategory.mainCategoryId === newValue?.id
-  )
-})
-
 const router = useRouter()
 
 const handleCancel = () => {

From 441a2366fd27f2ed2a51f512901f92e9d59b369c Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Mon, 3 Feb 2025 15:40:54 +0900
Subject: [PATCH 033/180] =?UTF-8?q?=F0=9F=92=84=20[design]=20:=20=EC=95=8C?=
 =?UTF-8?q?=EB=A6=BC=20=EB=AA=A8=EB=8B=AC=20UI=20=EC=A0=9C=EC=9E=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NotificationModal.vue | 77 ++++++++++++++++++++++++++++
 src/components/TopBar.vue            | 15 +++++-
 2 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 src/components/NotificationModal.vue

diff --git a/src/components/NotificationModal.vue b/src/components/NotificationModal.vue
new file mode 100644
index 00000000..fcfb894e
--- /dev/null
+++ b/src/components/NotificationModal.vue
@@ -0,0 +1,77 @@
+<template>
+  <div
+    v-if="isOpen"
+    class="fixed inset-0 flex z-50 justify-center"
+    @click.self="closeModal">
+    <div
+      class="flex relative w-[1200px] h-[72px] bg-opacity-15"
+      @click.self="closeModal">
+      <div
+        class="absolute right-6 top-[72px] h-60 w-80 bg-white rounded-lg shadow-[0_3px_10px_rgb(0,0,0,0.2)]">
+        <div class="flex relative px-4 pt-3 pb-2 border-b border-border-2">
+          <p class="text-body font-bold text-xs">알림</p>
+          <div class="absolute right-4">
+            <div class="flex items-center">
+              <CommonIcons
+                :name="smallCheckIcon"
+                class="w-2.5 h-1.5 mr-1 fill-primary1" />
+              <p class="font-bold text-primary1 text-xs">모두 읽음</p>
+              <CommonIcons
+                :name="closeIcon"
+                class="ml-2"
+                @click="closeModal" />
+            </div>
+          </div>
+        </div>
+        <div class="max-h-[186px] flex flex-col h-full overflow-y-auto">
+          <div class="overflow-y-scroll flex"></div>
+          <div :class="['flex flex-col border-b py-3 px-4', { 'bg-primary2': isCheck }]">
+            <p class="text-xs text-body font-bold">{{ title }}</p>
+            <div class="flex text-xs pt-2">
+              <span class="text-black">
+                <span class="text-primary1 font-bold">"{{ taskTitle }}"</span>
+                &nbsp;요청이&nbsp;
+                <span class="text-primary1 font-bold">{{ message }}</span>
+                &nbsp;상태로 변경 되었습니다
+              </span>
+            </div>
+          </div>
+          <div :class="['flex flex-col border-b py-3 px-4', { 'bg-primary2': !isCheck }]">
+            <p class="text-xs text-body font-bold">{{ title }}</p>
+            <div class="flex text-xs pt-2">
+              <span class="text-black">
+                <span class="text-primary1 font-bold">"{{ taskTitle }}"</span>
+                &nbsp;요청이&nbsp;
+                <span class="text-primary1 font-bold">{{ message }}</span>
+                &nbsp;상태로 변경 되었습니다
+              </span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import CommonIcons from './common/CommonIcons.vue'
+import { smallCheckIcon, closeIcon } from '@/constants/iconPath'
+const props = defineProps<{
+  isOpen: boolean
+}>()
+
+const title = ref('작업 상태 변경 알림')
+const taskTitle = ref('VM 생성 요청')
+const message = ref('진행 중')
+const isCheck = ref(true)
+
+const emit = defineEmits<{
+  (e: 'close'): void
+  (e: 'click'): void
+}>()
+
+const closeModal = () => {
+  emit('close')
+}
+</script>
diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
index f39df6e6..84a61357 100644
--- a/src/components/TopBar.vue
+++ b/src/components/TopBar.vue
@@ -1,4 +1,7 @@
 <template>
+  <NotificationModal
+    :isOpen="isModalVisible"
+    @close="toggleModal" />
   <div class="fixed w-full bg-white text-black py-2 border-b border-border-1">
     <div
       class="max-w-[1200px] min-w-[1024px] mx-auto px-6 flex w-full justify-between items-center">
@@ -13,7 +16,9 @@
       <div
         v-show="isLogined"
         class="flex items-center gap-6">
-        <NotificationIcon :new-notification="12" />
+        <div @click="toggleModal">
+          <NotificationIcon :new-notification="12" />
+        </div>
         <img
           v-if="info?.imageUrl"
           class="rounded-[50%] w-10 h-10"
@@ -38,6 +43,7 @@ import { hamburgerIcon } from '../constants/iconPath'
 import NotificationIcon from './icons/NotificationIcon.vue'
 import { storeToRefs } from 'pinia'
 import { useMemberStore } from '@/stores/member'
+import NotificationModal from './NotificationModal.vue'
 
 const memberStore = useMemberStore()
 const { info } = storeToRefs(memberStore)
@@ -49,6 +55,13 @@ onMounted(async () => {
 const isSideOpen = ref(false)
 const isLogined = ref(true)
 
+const isModalVisible = ref(false)
+
+const toggleModal = () => {
+  isModalVisible.value = !isModalVisible.value
+  console.log(isModalVisible.value)
+}
+
 const onCloseSide = () => {
   isSideOpen.value = false
 }

From 276954ef85c37edbce0a8c1844cf0aebca0da6a3 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Mon, 3 Feb 2025 15:53:38 +0900
Subject: [PATCH 034/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NotificationModal.vue | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/components/NotificationModal.vue b/src/components/NotificationModal.vue
index fcfb894e..175b3803 100644
--- a/src/components/NotificationModal.vue
+++ b/src/components/NotificationModal.vue
@@ -12,20 +12,22 @@
           <p class="text-body font-bold text-xs">알림</p>
           <div class="absolute right-4">
             <div class="flex items-center">
-              <CommonIcons
-                :name="smallCheckIcon"
-                class="w-2.5 h-1.5 mr-1 fill-primary1" />
-              <p class="font-bold text-primary1 text-xs">모두 읽음</p>
+              <button class="flex items-center">
+                <CommonIcons
+                  :name="smallCheckIcon"
+                  class="w-2.5 h-1.5 mr-1 fill-primary1" />
+                <p class="font-bold text-primary1 text-xs">모두 읽음</p>
+              </button>
               <CommonIcons
                 :name="closeIcon"
-                class="ml-2"
+                class="ml-2 cursor-pointer"
                 @click="closeModal" />
             </div>
           </div>
         </div>
         <div class="max-h-[186px] flex flex-col h-full overflow-y-auto">
           <div class="overflow-y-scroll flex"></div>
-          <div :class="['flex flex-col border-b py-3 px-4', { 'bg-primary2': isCheck }]">
+          <button :class="['flex flex-col border-b py-3 px-4', { 'bg-primary2': isCheck }]">
             <p class="text-xs text-body font-bold">{{ title }}</p>
             <div class="flex text-xs pt-2">
               <span class="text-black">
@@ -35,8 +37,8 @@
                 &nbsp;상태로 변경 되었습니다
               </span>
             </div>
-          </div>
-          <div :class="['flex flex-col border-b py-3 px-4', { 'bg-primary2': !isCheck }]">
+          </button>
+          <button :class="['flex flex-col border-b py-3 px-4', { 'bg-primary2': !isCheck }]">
             <p class="text-xs text-body font-bold">{{ title }}</p>
             <div class="flex text-xs pt-2">
               <span class="text-black">
@@ -46,7 +48,7 @@
                 &nbsp;상태로 변경 되었습니다
               </span>
             </div>
-          </div>
+          </button>
         </div>
       </div>
     </div>
@@ -68,7 +70,6 @@ const isCheck = ref(true)
 
 const emit = defineEmits<{
   (e: 'close'): void
-  (e: 'click'): void
 }>()
 
 const closeModal = () => {

From 403cbb927fa7516d0109603072c55a96926a000f Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Mon, 3 Feb 2025 16:48:05 +0900
Subject: [PATCH 035/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20T?=
 =?UTF-8?q?opBar=20=EA=B4=80=EB=A0=A8=20=EC=BB=B4=ED=8F=AC=EB=84=8C?=
 =?UTF-8?q?=ED=8A=B8=20=ED=8F=B4=EB=8D=94=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                          |  2 +-
 src/components/NotificationModal.vue | 78 -----------------------
 src/components/SideBar.vue           | 93 ----------------------------
 src/components/TopBar.vue            | 68 --------------------
 4 files changed, 1 insertion(+), 240 deletions(-)
 delete mode 100644 src/components/NotificationModal.vue
 delete mode 100644 src/components/SideBar.vue
 delete mode 100644 src/components/TopBar.vue

diff --git a/src/App.vue b/src/App.vue
index 3b1cafb7..e1ac0e3c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import TopBar from './components/TopBar.vue'
+import TopBar from './components/top-bar/TopBar.vue'
 import TheView from './layout/TheView.vue'
 </script>
 
diff --git a/src/components/NotificationModal.vue b/src/components/NotificationModal.vue
deleted file mode 100644
index 175b3803..00000000
--- a/src/components/NotificationModal.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div
-    v-if="isOpen"
-    class="fixed inset-0 flex z-50 justify-center"
-    @click.self="closeModal">
-    <div
-      class="flex relative w-[1200px] h-[72px] bg-opacity-15"
-      @click.self="closeModal">
-      <div
-        class="absolute right-6 top-[72px] h-60 w-80 bg-white rounded-lg shadow-[0_3px_10px_rgb(0,0,0,0.2)]">
-        <div class="flex relative px-4 pt-3 pb-2 border-b border-border-2">
-          <p class="text-body font-bold text-xs">알림</p>
-          <div class="absolute right-4">
-            <div class="flex items-center">
-              <button class="flex items-center">
-                <CommonIcons
-                  :name="smallCheckIcon"
-                  class="w-2.5 h-1.5 mr-1 fill-primary1" />
-                <p class="font-bold text-primary1 text-xs">모두 읽음</p>
-              </button>
-              <CommonIcons
-                :name="closeIcon"
-                class="ml-2 cursor-pointer"
-                @click="closeModal" />
-            </div>
-          </div>
-        </div>
-        <div class="max-h-[186px] flex flex-col h-full overflow-y-auto">
-          <div class="overflow-y-scroll flex"></div>
-          <button :class="['flex flex-col border-b py-3 px-4', { 'bg-primary2': isCheck }]">
-            <p class="text-xs text-body font-bold">{{ title }}</p>
-            <div class="flex text-xs pt-2">
-              <span class="text-black">
-                <span class="text-primary1 font-bold">"{{ taskTitle }}"</span>
-                &nbsp;요청이&nbsp;
-                <span class="text-primary1 font-bold">{{ message }}</span>
-                &nbsp;상태로 변경 되었습니다
-              </span>
-            </div>
-          </button>
-          <button :class="['flex flex-col border-b py-3 px-4', { 'bg-primary2': !isCheck }]">
-            <p class="text-xs text-body font-bold">{{ title }}</p>
-            <div class="flex text-xs pt-2">
-              <span class="text-black">
-                <span class="text-primary1 font-bold">"{{ taskTitle }}"</span>
-                &nbsp;요청이&nbsp;
-                <span class="text-primary1 font-bold">{{ message }}</span>
-                &nbsp;상태로 변경 되었습니다
-              </span>
-            </div>
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue'
-import CommonIcons from './common/CommonIcons.vue'
-import { smallCheckIcon, closeIcon } from '@/constants/iconPath'
-const props = defineProps<{
-  isOpen: boolean
-}>()
-
-const title = ref('작업 상태 변경 알림')
-const taskTitle = ref('VM 생성 요청')
-const message = ref('진행 중')
-const isCheck = ref(true)
-
-const emit = defineEmits<{
-  (e: 'close'): void
-}>()
-
-const closeModal = () => {
-  emit('close')
-}
-</script>
diff --git a/src/components/SideBar.vue b/src/components/SideBar.vue
deleted file mode 100644
index 80a1dc20..00000000
--- a/src/components/SideBar.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-  <div
-    class="fixed inset-0 bg-black bg-opacity-15 flex items-center z-50"
-    @click.self="$emit('close')">
-    <div class="flex flex-col relative w-80 bg-white h-screen shadow-custom py-2">
-      <div class="flex flex-col gap-12 flex-1 overflow-hidden">
-        <div class="flex justify-between items-center px-6">
-          <CommonIcons
-            @click="$emit('close')"
-            class="cursor-pointer"
-            :name="hamburgerIcon" />
-          <img src="/MainLogo.svg" />
-        </div>
-        <div class="flex-1 overflow-y-auto flex flex-col gap-6">
-          <div
-            v-for="menuGroup in filteredMenu"
-            :key="menuGroup.groupId">
-            <span class="flex text-xs text-disabled font-bold px-6 py-2">
-              {{ menuGroup.groupTitle }}
-            </span>
-            <div
-              v-for="menuItem in menuGroup.items"
-              :key="menuItem.menuId">
-              <RouterLink
-                :to="menuItem.link"
-                class="flex items-center text-black w-full h-[52px] hover:bg-background-2"
-                :class="
-                  menuItem.link === route.path
-                    ? 'px-4 border-l-8 border-primary1 font-bold'
-                    : 'px-6'
-                "
-                @click="$emit('close')">
-                {{ menuItem.content }}
-              </RouterLink>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="flex w-full justify-between px-6 py-4 bg-white">
-        <div class="flex w-full items-center gap-3">
-          <img
-            v-if="info?.imageUrl"
-            class="rounded-[50%] w-10 h-10"
-            :src="info.imageUrl"
-            alt="프로필 이미지" />
-          <div
-            v-else
-            class="w-10 h-10 rounded-full bg-background-1" />
-          <div class="flex flex-col gap-1">
-            <p class="text-xs text-body font-bold">{{ name }}</p>
-            <p class="text-sm text-black">{{ nickname }}</p>
-          </div>
-        </div>
-        <div class="flex items-end whitespace-nowrap">
-          <RouterLink
-            to="/edit-information"
-            class="text-primary1 text-sm font-bold"
-            @click="$emit('close')">
-            내 정보 수정
-          </RouterLink>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useRoute } from 'vue-router'
-import { computed } from 'vue'
-import CommonIcons from './common/CommonIcons.vue'
-import { hamburgerIcon } from '@/constants/iconPath'
-import { SIDE_USER_MENU, SIDE_MANAGER_MENU, SIDE_ADMIN_MENU } from '@/constants/menu'
-import { useMemberStore } from '@/stores/member'
-import { storeToRefs } from 'pinia'
-
-const memberStore = useMemberStore()
-const { info } = storeToRefs(memberStore)
-
-const route = useRoute()
-
-const role = computed(() => info.value.memberRole)
-const name = computed(() => info.value.memberName)
-const nickname = computed(() => info.value.nickname)
-
-const filteredMenu = computed(() => {
-  return role.value === 'ROLE_USER'
-    ? SIDE_USER_MENU
-    : role.value === 'ROLE_MANAGER'
-      ? SIDE_MANAGER_MENU
-      : SIDE_ADMIN_MENU
-})
-</script>
diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
deleted file mode 100644
index 84a61357..00000000
--- a/src/components/TopBar.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <NotificationModal
-    :isOpen="isModalVisible"
-    @close="toggleModal" />
-  <div class="fixed w-full bg-white text-black py-2 border-b border-border-1">
-    <div
-      class="max-w-[1200px] min-w-[1024px] mx-auto px-6 flex w-full justify-between items-center">
-      <div class="flex justify-center items-center gap-6 h-full">
-        <button
-          v-show="isLogined"
-          @click="isSideOpen = true">
-          <CommonIcons :name="hamburgerIcon" />
-        </button>
-        <img src="/MainLogo.svg" />
-      </div>
-      <div
-        v-show="isLogined"
-        class="flex items-center gap-6">
-        <div @click="toggleModal">
-          <NotificationIcon :new-notification="12" />
-        </div>
-        <img
-          v-if="info?.imageUrl"
-          class="rounded-[50%] w-10 h-10"
-          :src="info.imageUrl"
-          alt="프로필 이미지" />
-        <div
-          v-else
-          class="rounded-[50%] bg-zinc-100 p-5" />
-      </div>
-    </div>
-  </div>
-  <SideBar
-    v-if="isSideOpen"
-    @close="onCloseSide" />
-</template>
-
-<script setup lang="ts">
-import { ref, onMounted } from 'vue'
-import CommonIcons from './common/CommonIcons.vue'
-import SideBar from './SideBar.vue'
-import { hamburgerIcon } from '../constants/iconPath'
-import NotificationIcon from './icons/NotificationIcon.vue'
-import { storeToRefs } from 'pinia'
-import { useMemberStore } from '@/stores/member'
-import NotificationModal from './NotificationModal.vue'
-
-const memberStore = useMemberStore()
-const { info } = storeToRefs(memberStore)
-
-onMounted(async () => {
-  await memberStore.updateMemberInfoWithToken()
-})
-
-const isSideOpen = ref(false)
-const isLogined = ref(true)
-
-const isModalVisible = ref(false)
-
-const toggleModal = () => {
-  isModalVisible.value = !isModalVisible.value
-  console.log(isModalVisible.value)
-}
-
-const onCloseSide = () => {
-  isSideOpen.value = false
-}
-</script>

From 91988edbc5b9ee25989263fc0f46aa313dc61b95 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Mon, 3 Feb 2025 16:49:00 +0900
Subject: [PATCH 036/180] =?UTF-8?q?=F0=9F=92=84=20[design]=20:=20=EC=95=8C?=
 =?UTF-8?q?=EB=A6=BC=20=EB=AA=A8=EB=8B=AC=20=EB=94=94=EC=9E=90=EC=9D=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/top-bar/NotificationModal.vue | 78 ++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 src/components/top-bar/NotificationModal.vue

diff --git a/src/components/top-bar/NotificationModal.vue b/src/components/top-bar/NotificationModal.vue
new file mode 100644
index 00000000..70378eca
--- /dev/null
+++ b/src/components/top-bar/NotificationModal.vue
@@ -0,0 +1,78 @@
+<template>
+  <div
+    v-if="isOpen"
+    class="fixed inset-0 flex z-50 justify-center"
+    @click.self="closeModal">
+    <div
+      class="flex relative w-[1200px] h-[72px] bg-opacity-15"
+      @click.self="closeModal">
+      <div
+        class="absolute right-6 top-[72px] h-60 w-80 bg-white rounded-lg shadow-[0_3px_10px_rgb(0,0,0,0.2)]">
+        <div class="flex relative px-4 pt-3 pb-2 border-b border-border-2">
+          <p class="text-body font-bold text-xs">알림</p>
+          <div class="absolute right-4">
+            <div class="flex items-center">
+              <button class="flex items-center">
+                <CommonIcons
+                  :name="smallCheckIcon"
+                  class="w-2.5 h-1.5 mr-1 fill-primary1" />
+                <p class="font-bold text-primary1 text-xs">모두 읽음</p>
+              </button>
+              <CommonIcons
+                :name="closeIcon"
+                class="ml-2 cursor-pointer"
+                @click="closeModal" />
+            </div>
+          </div>
+        </div>
+        <div class="max-h-[186px] flex flex-col h-full overflow-y-auto">
+          <div class="overflow-y-scroll flex"></div>
+          <button :class="['flex flex-col border-b py-3 px-4', { 'bg-primary2': isCheck }]">
+            <p class="text-xs text-body font-bold">{{ title }}</p>
+            <div class="flex text-xs pt-2">
+              <span class="text-black">
+                <span class="text-primary1 font-bold">"{{ taskTitle }}"</span>
+                &nbsp;요청이&nbsp;
+                <span class="text-primary1 font-bold">{{ message }}</span>
+                &nbsp;상태로 변경 되었습니다
+              </span>
+            </div>
+          </button>
+          <button :class="['flex flex-col border-b py-3 px-4', { 'bg-primary2': !isCheck }]">
+            <p class="text-xs text-body font-bold">{{ title }}</p>
+            <div class="flex text-xs pt-2">
+              <span class="text-black">
+                <span class="text-primary1 font-bold">"{{ taskTitle }}"</span>
+                &nbsp;요청이&nbsp;
+                <span class="text-primary1 font-bold">{{ message }}</span>
+                &nbsp;상태로 변경 되었습니다
+              </span>
+            </div>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import CommonIcons from '../common/CommonIcons.vue'
+import { smallCheckIcon, closeIcon } from '@/constants/iconPath'
+const props = defineProps<{
+  isOpen: boolean
+}>()
+
+const title = ref('작업 상태 변경 알림')
+const taskTitle = ref('VM 생성 요청')
+const message = ref('진행 중')
+const isCheck = ref(true)
+
+const emit = defineEmits<{
+  (e: 'close'): void
+}>()
+
+const closeModal = () => {
+  emit('close')
+}
+</script>

From 5587b341fc9e91c887a81807e135129866b8924f Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Mon, 3 Feb 2025 16:49:14 +0900
Subject: [PATCH 037/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20=ED=94=84?=
 =?UTF-8?q?=EB=A1=9C=ED=95=84=20=EB=AA=A8=EB=8B=AC=20=EC=A0=9C=EC=9E=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/top-bar/ProfileModal.vue | 67 +++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 src/components/top-bar/ProfileModal.vue

diff --git a/src/components/top-bar/ProfileModal.vue b/src/components/top-bar/ProfileModal.vue
new file mode 100644
index 00000000..766e11cc
--- /dev/null
+++ b/src/components/top-bar/ProfileModal.vue
@@ -0,0 +1,67 @@
+<template>
+  <div
+    v-if="isOpen"
+    class="fixed inset-0 flex z-50 justify-center"
+    @click.self="closeModal">
+    <div
+      class="flex relative w-[1200px] h-[72px] bg-opacity-15"
+      @click.self="closeModal">
+      <div
+        class="absolute w-60 bg-white right-6 top-[72px] rounded-lg shadow-[0_3px_10px_rgb(0,0,0,0.2)]">
+        <div
+          class="flex items-center justify-center relative px-6 py-8 border-b bg-primary2 border-border-2">
+          <div class="flex flex-col items-center justify-center">
+            <div class="w-24 h-24 bg-background-1 rounded-full mb-6"></div>
+            <div>
+              <div class="flex flex-col justify-center items-center w-[172px]">
+                <p class="text-xs text-body font-bold">{{ name }}</p>
+                <p class="text-black">{{ nickname }}</p>
+              </div>
+            </div>
+          </div>
+        </div>
+        <button
+          @click="handleEdit"
+          type="button"
+          class="flex w-full py-4 px-6 text-sm text-black font-bold border-b border-border-2">
+          내 정보 수정
+        </button>
+        <button
+          @click="handleLogout"
+          type="button"
+          class="flex w-full py-4 px-6 text-sm text-red-1 font-bold">
+          로그아웃
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useRouter } from 'vue-router'
+
+const router = useRouter()
+
+const props = defineProps<{
+  isOpen: boolean
+}>()
+
+const name = ref('벡지연')
+const nickname = ref('Chloe.yeon')
+
+const emit = defineEmits<{
+  (e: 'close'): void
+}>()
+
+const closeModal = () => {
+  emit('close')
+}
+const handleEdit = () => {
+  router.push('/edit-information')
+  emit('close')
+}
+const handleLogout = () => {
+  // 로그아웃 API 추가 필요
+}
+</script>

From 9321c291150d66d27f016348dde04d577120330f Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Mon, 3 Feb 2025 16:49:32 +0900
Subject: [PATCH 038/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=9C=84=EC=B9=98=20=EC=9E=AC=EC=A0=95?=
 =?UTF-8?q?=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/top-bar/SideBar.vue | 93 ++++++++++++++++++++++++++++++
 src/components/top-bar/TopBar.vue  | 82 ++++++++++++++++++++++++++
 2 files changed, 175 insertions(+)
 create mode 100644 src/components/top-bar/SideBar.vue
 create mode 100644 src/components/top-bar/TopBar.vue

diff --git a/src/components/top-bar/SideBar.vue b/src/components/top-bar/SideBar.vue
new file mode 100644
index 00000000..7ba44dde
--- /dev/null
+++ b/src/components/top-bar/SideBar.vue
@@ -0,0 +1,93 @@
+<template>
+  <div
+    class="fixed inset-0 bg-black bg-opacity-15 flex items-center z-50"
+    @click.self="$emit('close')">
+    <div class="flex flex-col relative w-80 bg-white h-screen shadow-custom py-2">
+      <div class="flex flex-col gap-12 flex-1 overflow-hidden">
+        <div class="flex justify-between items-center px-6">
+          <CommonIcons
+            @click="$emit('close')"
+            class="cursor-pointer"
+            :name="hamburgerIcon" />
+          <img src="/MainLogo.svg" />
+        </div>
+        <div class="flex-1 overflow-y-auto flex flex-col gap-6">
+          <div
+            v-for="menuGroup in filteredMenu"
+            :key="menuGroup.groupId">
+            <span class="flex text-xs text-disabled font-bold px-6 py-2">
+              {{ menuGroup.groupTitle }}
+            </span>
+            <div
+              v-for="menuItem in menuGroup.items"
+              :key="menuItem.menuId">
+              <RouterLink
+                :to="menuItem.link"
+                class="flex items-center text-black w-full h-[52px] hover:bg-background-2"
+                :class="
+                  menuItem.link === route.path
+                    ? 'px-4 border-l-8 border-primary1 font-bold'
+                    : 'px-6'
+                "
+                @click="$emit('close')">
+                {{ menuItem.content }}
+              </RouterLink>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="flex w-full justify-between px-6 py-4 bg-white">
+        <div class="flex w-full items-center gap-3">
+          <img
+            v-if="info?.imageUrl"
+            class="rounded-[50%] w-10 h-10"
+            :src="info.imageUrl"
+            alt="프로필 이미지" />
+          <div
+            v-else
+            class="w-10 h-10 rounded-full bg-background-1" />
+          <div class="flex flex-col gap-1">
+            <p class="text-xs text-body font-bold">{{ name }}</p>
+            <p class="text-sm text-black">{{ nickname }}</p>
+          </div>
+        </div>
+        <div class="flex items-end whitespace-nowrap">
+          <RouterLink
+            to="/edit-information"
+            class="text-primary1 text-sm font-bold"
+            @click="$emit('close')">
+            내 정보 수정
+          </RouterLink>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useRoute } from 'vue-router'
+import { computed } from 'vue'
+import CommonIcons from '../common/CommonIcons.vue'
+import { hamburgerIcon } from '@/constants/iconPath'
+import { SIDE_USER_MENU, SIDE_MANAGER_MENU, SIDE_ADMIN_MENU } from '@/constants/menu'
+import { useMemberStore } from '@/stores/member'
+import { storeToRefs } from 'pinia'
+
+const memberStore = useMemberStore()
+const { info } = storeToRefs(memberStore)
+
+const route = useRoute()
+
+const role = computed(() => info.value.memberRole)
+const name = computed(() => info.value.memberName)
+const nickname = computed(() => info.value.nickname)
+
+const filteredMenu = computed(() => {
+  return role.value === 'ROLE_USER'
+    ? SIDE_USER_MENU
+    : role.value === 'ROLE_MANAGER'
+      ? SIDE_MANAGER_MENU
+      : SIDE_ADMIN_MENU
+})
+</script>
diff --git a/src/components/top-bar/TopBar.vue b/src/components/top-bar/TopBar.vue
new file mode 100644
index 00000000..11db57a2
--- /dev/null
+++ b/src/components/top-bar/TopBar.vue
@@ -0,0 +1,82 @@
+<template>
+  <NotificationModal
+    :isOpen="isNotifiVisible"
+    @close="toggleNotifi" />
+  <ProfileModal
+    :isOpen="isProfileVisible"
+    @close="toggleProfile" />
+  <div class="fixed w-full bg-white text-black py-2 border-b border-border-1">
+    <div
+      class="max-w-[1200px] min-w-[1024px] mx-auto px-6 flex w-full justify-between items-center">
+      <div class="flex justify-center items-center gap-6 h-full">
+        <button
+          type="button"
+          v-show="isLogined"
+          @click="isSideOpen = true">
+          <CommonIcons :name="hamburgerIcon" />
+        </button>
+        <img src="/MainLogo.svg" />
+      </div>
+      <div
+        v-show="isLogined"
+        class="flex items-center gap-6">
+        <button
+          type="button"
+          @click="toggleNotifi">
+          <NotificationIcon :new-notification="12" />
+        </button>
+        <button
+          type="button"
+          @click="toggleProfile">
+          <img
+            v-if="info?.imageUrl"
+            class="rounded-[50%] w-10 h-10"
+            :src="info.imageUrl"
+            alt="프로필 이미지" />
+          <div
+            v-else
+            class="rounded-[50%] bg-zinc-100 p-5" />
+        </button>
+      </div>
+    </div>
+  </div>
+  <SideBar
+    v-if="isSideOpen"
+    @close="onCloseSide" />
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import CommonIcons from '../common/CommonIcons.vue'
+import SideBar from './SideBar.vue'
+import { hamburgerIcon } from '../../constants/iconPath'
+import NotificationIcon from '../icons/NotificationIcon.vue'
+import { storeToRefs } from 'pinia'
+import { useMemberStore } from '@/stores/member'
+import NotificationModal from './NotificationModal.vue'
+import ProfileModal from './ProfileModal.vue'
+
+const memberStore = useMemberStore()
+const { info } = storeToRefs(memberStore)
+
+onMounted(async () => {
+  await memberStore.updateMemberInfoWithToken()
+})
+
+const isSideOpen = ref(false)
+const isLogined = ref(true)
+
+const isNotifiVisible = ref(false)
+const isProfileVisible = ref(false)
+
+const toggleNotifi = () => {
+  isNotifiVisible.value = !isNotifiVisible.value
+}
+const toggleProfile = () => {
+  isProfileVisible.value = !isProfileVisible.value
+}
+
+const onCloseSide = () => {
+  isSideOpen.value = false
+}
+</script>

From 3b073878e7271e7f9ee05ce74ef051ce7afede82 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 19:24:24 +0900
Subject: [PATCH 039/180] =?UTF-8?q?:sparkles:=20[feat]=20:=201=EC=B0=A8=20?=
 =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80=20API?=
 =?UTF-8?q?=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request-task/RequestTaskInput.vue         | 17 ++--
 .../task-management/CategoryAdd.vue           | 81 ++++++++++++++-----
 src/constants/admin.ts                        |  6 +-
 src/types/common.ts                           |  2 -
 4 files changed, 72 insertions(+), 34 deletions(-)

diff --git a/src/components/request-task/RequestTaskInput.vue b/src/components/request-task/RequestTaskInput.vue
index df55151e..08949f94 100644
--- a/src/components/request-task/RequestTaskInput.vue
+++ b/src/components/request-task/RequestTaskInput.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="relative">
     <div class="text-xs flex gap-x-1 mb-2">
       <p class="text-body font-bold">{{ labelName }}</p>
       <p
@@ -7,11 +7,6 @@
         class="text-red-1">
         *
       </p>
-      <p
-        v-if="isInvalidateState === 'input'"
-        class="text-red-1">
-        {{ labelName }}을 입력해주세요
-      </p>
     </div>
     <input
       class="w-full h-11 border border-border-1 px-4 focus:outline-none text-black"
@@ -19,6 +14,16 @@
       :disabled="isEdit"
       @input="updateValue(($event.target as HTMLInputElement).value)"
       :placeholder="placeholderText" />
+    <p
+      v-if="isInvalidateState === 'input'"
+      class="text-red-1 text-xs absolute top-[calc(100%+4px)]">
+      {{ labelName }}을 입력해주세요
+    </p>
+    <p
+      v-if="isInvalidateState === 'code'"
+      class="text-red-1 text-xs absolute top-[calc(100%+4px)]">
+      사용할 수 없는 고유코드입니다.
+    </p>
   </div>
 </template>
 
diff --git a/src/components/task-management/CategoryAdd.vue b/src/components/task-management/CategoryAdd.vue
index 22686e00..e7f7e22f 100644
--- a/src/components/task-management/CategoryAdd.vue
+++ b/src/components/task-management/CategoryAdd.vue
@@ -1,51 +1,59 @@
 <template>
   <div class="w-full flex flex-col gap-y-6">
     <ModalView
-      :isOpen="isAddModalVisible"
-      :type="'successType'"
+      :is-open="isModalVisible.add"
+      type="successType"
       @close="handleAddModal">
       <template #header>카테고리가 등록되었습니다</template>
     </ModalView>
     <ModalView
-      :isOpen="isCancelModalVisible"
-      :type="'warningType'"
+      :is-open="isModalVisible.cancel"
+      type="warningType"
       @close="handleCancelModal"
       @click="handleGoBack">
       <template #header>생성을 취소 하시겠습니까?</template>
       <template #body>작성하신 내용은 사라집니다</template>
     </ModalView>
+    <ModalView
+      :is-open="isModalVisible.fail"
+      type="failType"
+      @close="handleFailModal">
+      <template #header>카테고리 정보를 확인해주세요</template>
+    </ModalView>
     <!-- 카테고리 목록 API 필요, 임시로 역할로 설정 -->
     <RequestTaskDropdown
       v-model="categoryForm.firstCategory"
       :options="RoleKeys"
-      :label-name="'1차 카테고리'"
-      :placeholderText="'1차 카테고리를 선택해주세요'"
+      label-name="1차 카테고리"
+      placeholder-text="1차 카테고리를 선택해주세요"
       v-if="props.categoryStep == '2'" />
     <RequestTaskInput
       v-model="categoryForm.name"
-      :placeholderText="'카테고리명을 입력해주세요'"
-      :labelName="`${props.categoryStep}차 카테고리명`" />
+      placeholder-text="카테고리명을 입력해주세요"
+      :label-name="`${props.categoryStep}차 카테고리명`" />
     <RequestTaskInput
       v-model="categoryForm.code"
-      :placeholderText="'카테고리의 고유코드를 입력해주세요'"
-      :labelName="'고유코드 (대문자 영어 2글자까지)'" />
+      placeholder-text="카테고리의 고유코드를 입력해주세요"
+      label-name="고유코드 (대문자 영어 2글자까지)"
+      :is-invalidate="isCodeInvalidate" />
 
     <FormButtonContainer
-      :handleCancel="handleCancel"
-      :handleSubmit="handleSubmit"
-      cancelText="취소"
-      submitText="생성" />
+      :handle-cancel="handleCancel"
+      :handle-submit="handleSubmit"
+      cancel-text="취소"
+      submit-text="생성" />
   </div>
 </template>
 
 <script lang="ts" setup>
 import { CATEGORY_FIRST_ADD, CATEGORY_SECOND_ADD, RoleKeys } from '@/constants/admin'
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import ModalView from '../ModalView.vue'
 import RequestTaskDropdown from '../request-task/RequestTaskDropdown.vue'
 import RequestTaskInput from '../request-task/RequestTaskInput.vue'
+import { axiosInstance } from '@/utils/axios'
 
 const router = useRouter()
 
@@ -53,17 +61,19 @@ const props = defineProps<{
   categoryStep: string
 }>()
 
-const isAddModalVisible = ref(false)
-const isCancelModalVisible = ref(false)
+const isModalVisible = ref({ add: false, cancel: false, fail: false })
 
 const categoryForm = ref(props.categoryStep == '1' ? CATEGORY_FIRST_ADD : CATEGORY_SECOND_ADD)
 
 const handleAddModal = () => {
-  isAddModalVisible.value = false
+  isModalVisible.value.add = false
   handleGoBack()
 }
 const handleCancelModal = () => {
-  isCancelModalVisible.value = !isCancelModalVisible.value
+  isModalVisible.value.cancel = !isModalVisible.value.cancel
+}
+const handleFailModal = () => {
+  isModalVisible.value.fail = !isModalVisible.value.fail
 }
 
 const handleCancel = () => {
@@ -74,8 +84,35 @@ const handleGoBack = () => {
   router.push('/task-management')
 }
 
-const handleSubmit = () => {
-  console.log(categoryForm.value)
-  isAddModalVisible.value = true
+const handleSubmit = async () => {
+  if (
+    isCodeInvalidate.value ||
+    categoryForm.value.name.length === 0 ||
+    categoryForm.value.code.length === 0
+  ) {
+    handleFailModal()
+    return
+  }
+
+  try {
+    const response = await axiosInstance.post(
+      '/api/managements/main-category',
+      categoryForm.value,
+      {
+        headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
+      }
+    )
+    isModalVisible.value.add = true
+  } catch {
+    handleFailModal()
+  }
 }
+
+const isCodeInvalidate = computed(() => {
+  const code = categoryForm.value.code
+  if (code.length === 0) return ''
+
+  const isInvalidate = !/^[A-Z]{1,2}$/.test(code)
+  return isInvalidate ? 'code' : ''
+})
 </script>
diff --git a/src/constants/admin.ts b/src/constants/admin.ts
index 15fef027..cde5b529 100644
--- a/src/constants/admin.ts
+++ b/src/constants/admin.ts
@@ -38,15 +38,13 @@ import type { RoleTypes, RoleTypesEnum, UserRegistrationProps } from '@/types/ad
 
 export const CATEGORY_FIRST_ADD: MainCategoryTypes = {
   name: '',
-  code: '',
-  id: 0
+  code: ''
 }
 
 export const CATEGORY_SECOND_ADD: SubCategoryTypes = {
   name: '',
   mainCategoryId: 0,
-  code: '',
-  id: 0
+  code: ''
 }
 
 export const INITIAL_USER_REGISTRATION: UserRegistrationProps = {
diff --git a/src/types/common.ts b/src/types/common.ts
index ca389d58..9e4e17e3 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -80,13 +80,11 @@ export interface LabelDataTypes {
 }
 
 export interface MainCategoryTypes {
-  id: number
   name: string
   code: string
 }
 
 export interface SubCategoryTypes {
-  id: number
   mainCategoryId: number
   name: string
   code: string

From a7f52046b978a61beed4b24aae00908c897c78d8 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 19:58:46 +0900
Subject: [PATCH 040/180] =?UTF-8?q?:sparkles:=20[feat]=20:=202=EC=B0=A8=20?=
 =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80=20API?=
 =?UTF-8?q?=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-management/CategoryAdd.vue           | 46 ++++++++++++-------
 src/constants/admin.ts                        | 10 +---
 src/types/common.ts                           | 14 ++----
 3 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/src/components/task-management/CategoryAdd.vue b/src/components/task-management/CategoryAdd.vue
index e7f7e22f..f96c4c2e 100644
--- a/src/components/task-management/CategoryAdd.vue
+++ b/src/components/task-management/CategoryAdd.vue
@@ -22,15 +22,15 @@
     </ModalView>
     <!-- 카테고리 목록 API 필요, 임시로 역할로 설정 -->
     <RequestTaskDropdown
-      v-model="categoryForm.firstCategory"
-      :options="RoleKeys"
+      v-model="mainCategory"
+      :options="categoryOptions.map(el => el.name)"
       label-name="1차 카테고리"
       placeholder-text="1차 카테고리를 선택해주세요"
-      v-if="props.categoryStep == '2'" />
+      v-if="categoryStep == '2'" />
     <RequestTaskInput
       v-model="categoryForm.name"
       placeholder-text="카테고리명을 입력해주세요"
-      :label-name="`${props.categoryStep}차 카테고리명`" />
+      :label-name="`${categoryStep}차 카테고리명`" />
     <RequestTaskInput
       v-model="categoryForm.code"
       placeholder-text="카테고리의 고유코드를 입력해주세요"
@@ -46,24 +46,26 @@
 </template>
 
 <script lang="ts" setup>
-import { CATEGORY_FIRST_ADD, CATEGORY_SECOND_ADD, RoleKeys } from '@/constants/admin'
-import { computed, ref } from 'vue'
+import { CATEGORY_FORM } from '@/constants/admin'
+import { computed, onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import ModalView from '../ModalView.vue'
 import RequestTaskDropdown from '../request-task/RequestTaskDropdown.vue'
 import RequestTaskInput from '../request-task/RequestTaskInput.vue'
 import { axiosInstance } from '@/utils/axios'
+import { getMainCategory } from '@/api/common'
+import type { Category, CategoryForm } from '@/types/common'
 
 const router = useRouter()
 
-const props = defineProps<{
+const { categoryStep } = defineProps<{
   categoryStep: string
 }>()
 
 const isModalVisible = ref({ add: false, cancel: false, fail: false })
 
-const categoryForm = ref(props.categoryStep == '1' ? CATEGORY_FIRST_ADD : CATEGORY_SECOND_ADD)
+const categoryForm = ref<CategoryForm>(CATEGORY_FORM)
 
 const handleAddModal = () => {
   isModalVisible.value.add = false
@@ -88,20 +90,19 @@ const handleSubmit = async () => {
   if (
     isCodeInvalidate.value ||
     categoryForm.value.name.length === 0 ||
-    categoryForm.value.code.length === 0
+    categoryForm.value.code.length === 0 ||
+    (categoryStep === '2' && categoryForm.value.mainCategoryId === undefined)
   ) {
     handleFailModal()
     return
   }
 
   try {
-    const response = await axiosInstance.post(
-      '/api/managements/main-category',
-      categoryForm.value,
-      {
-        headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
-      }
-    )
+    const requestUrl =
+      categoryStep === '1' ? '/api/managements/main-category' : '/api/managements/sub-category'
+    await axiosInstance.post(requestUrl, categoryForm.value, {
+      headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
+    })
     isModalVisible.value.add = true
   } catch {
     handleFailModal()
@@ -115,4 +116,17 @@ const isCodeInvalidate = computed(() => {
   const isInvalidate = !/^[A-Z]{1,2}$/.test(code)
   return isInvalidate ? 'code' : ''
 })
+
+const mainCategory = ref('')
+const categoryOptions = ref<Category[]>([])
+onMounted(async () => {
+  categoryOptions.value = await getMainCategory()
+  if (categoryStep === '2')
+    categoryForm.value = { ...categoryForm.value, mainCategoryId: undefined }
+})
+watch(mainCategory, () => {
+  categoryForm.value.mainCategoryId = categoryOptions.value.find(
+    el => el.name === mainCategory.value
+  )?.id
+})
 </script>
diff --git a/src/constants/admin.ts b/src/constants/admin.ts
index cde5b529..44c1e4be 100644
--- a/src/constants/admin.ts
+++ b/src/constants/admin.ts
@@ -1,4 +1,4 @@
-import type { ListBarTabProps, MainCategoryTypes, Option, SubCategoryTypes } from '@/types/common'
+import type { CategoryForm, ListBarTabProps, Option } from '@/types/common'
 
 export const MEMBER_MANAGEMENT_LIST_BAR_TAB: ListBarTabProps[] = [
   { content: '이름', width: 60 },
@@ -36,17 +36,11 @@ export const LOGS_LIST_BAR_TAB: ListBarTabProps[] = [
 
 import type { RoleTypes, RoleTypesEnum, UserRegistrationProps } from '@/types/admin'
 
-export const CATEGORY_FIRST_ADD: MainCategoryTypes = {
+export const CATEGORY_FORM: CategoryForm = {
   name: '',
   code: ''
 }
 
-export const CATEGORY_SECOND_ADD: SubCategoryTypes = {
-  name: '',
-  mainCategoryId: 0,
-  code: ''
-}
-
 export const INITIAL_USER_REGISTRATION: UserRegistrationProps = {
   name: '',
   email: '',
diff --git a/src/types/common.ts b/src/types/common.ts
index 9e4e17e3..36e481ee 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -79,22 +79,16 @@ export interface LabelDataTypes {
   labelColor: string
 }
 
-export interface MainCategoryTypes {
-  name: string
-  code: string
-}
-
-export interface SubCategoryTypes {
-  mainCategoryId: number
+export interface CategoryForm {
   name: string
   code: string
+  mainCategoryId?: number
 }
 
 export interface CategoryDropdownProps {
-  placeholderText: string
-  options: MainCategoryTypes[] | SubCategoryTypes[]
+  options: CategoryForm
   labelName: string
-  modelValue: MainCategoryTypes | SubCategoryTypes | null
+  modelValue?: CategoryForm
   isLabel?: boolean
   isDisabled?: boolean
 }

From 7b3a47b90a2e4d3102668eec94e1123c77a7eef0 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 00:56:14 +0900
Subject: [PATCH 041/180] =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=9A=94=EC=B2=AD?=
 =?UTF-8?q?=20=EA=B8=B0=EB=A1=9D=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=20API=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue           |  2 +-
 src/components/request-history/RequestHistoryList.vue |  3 +--
 src/types/manager.ts                                  | 10 ----------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index 78d4b07e..849a36eb 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -26,13 +26,13 @@ import { useRequestParamsStore } from '@/stores/params'
 import type { MyRequestResponse } from '@/types/user'
 import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
-import { computed, ref, watch } from 'vue'
 import { useParseParams } from '../hooks/useParseParams'
 import ListContainer from '../lists/ListContainer.vue'
 import ListPagination from '../lists/ListPagination.vue'
 import NoContent from '../lists/NoContent.vue'
 import MyRequestListBar from './MyRequestListBar.vue'
 import MyRequestListCard from './MyRequestListCard.vue'
+import { computed } from 'vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {
diff --git a/src/components/request-history/RequestHistoryList.vue b/src/components/request-history/RequestHistoryList.vue
index 2399d44e..d1fcc5ed 100644
--- a/src/components/request-history/RequestHistoryList.vue
+++ b/src/components/request-history/RequestHistoryList.vue
@@ -28,11 +28,10 @@ import { useRequestParamsStore } from '@/stores/params'
 import RequestHistoryListBar from './RequestHistoryListBar.vue'
 import RequestHistoryListCard from './RequestHistoryListCard.vue'
 import { useParseParams } from '../hooks/useParseParams'
-import { axiosInstance } from '@/utils/axios'
+import axiosInstance from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
 import type { RequestHistoryResponse } from '@/types/manager'
-import NoContent from '../lists/NoContent.vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {
diff --git a/src/types/manager.ts b/src/types/manager.ts
index b6147a71..24a61661 100644
--- a/src/types/manager.ts
+++ b/src/types/manager.ts
@@ -140,13 +140,3 @@ export interface RequestHistoryResponse {
   isFirst: boolean
   isLast: boolean
 }
-
-export interface MyTaskResponse {
-  content: MyTaskListData[]
-  totalElements: number
-  totalPages: number
-  pageNumber: number
-  pageSize: number
-  isFirst: boolean
-  isLast: boolean
-}

From 2c4e0788f6d3278aa16a45f83f36ef0dd42ff986 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 1 Feb 2025 20:03:17 +0900
Subject: [PATCH 042/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20prop?=
 =?UTF-8?q?=EB=8C=80=EC=8B=A0=20=EC=A7=81=EC=A0=91=20=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=A4=EA=B8=B0,=20=ED=8C=8C=EC=9D=BC=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=EA=B0=92=20=EB=B0=B0=EC=97=B4=EB=A1=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue   | 23 +++++++------------
 .../task-management/CategoryAdd.vue           |  3 ---
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 2131767b..e6bbc38c 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -36,11 +36,10 @@
 </template>
 
 <script lang="ts" setup>
-import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
 import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
-import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { onMounted, ref, watch } from 'vue'
+import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
+import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
@@ -85,17 +84,9 @@ const handleCancel = () => {
 }
 
 const handleSubmit = async () => {
-  if (!category1.value || !category2.value) {
-    isInvalidate.value = 'category'
-    console.log(isInvalidate.value, '변경됨')
-    return
-  } else if (!title.value) {
-    isInvalidate.value = 'input'
-    return
-  }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value?.id,
+    categoryId: 1,
     title: title.value,
     description: description.value
   }
@@ -104,13 +95,15 @@ const handleSubmit = async () => {
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
 
   formData.append('taskInfo', newBlob)
-
   if (file.value && file.value.length > 0) {
-    file.value.forEach(f => formData.append('attachment', f))
+    file.value.forEach(f => {
+      formData.append('attachment', f)
+    })
   }
+  console.log(Object.fromEntries(formData), '응답')
+  console.log(file.value, '파일 현황 응답')
   try {
     const res = await postTaskRequest(formData)
-    console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
   }
diff --git a/src/components/task-management/CategoryAdd.vue b/src/components/task-management/CategoryAdd.vue
index f96c4c2e..aa840288 100644
--- a/src/components/task-management/CategoryAdd.vue
+++ b/src/components/task-management/CategoryAdd.vue
@@ -53,9 +53,6 @@ import FormButtonContainer from '../common/FormButtonContainer.vue'
 import ModalView from '../ModalView.vue'
 import RequestTaskDropdown from '../request-task/RequestTaskDropdown.vue'
 import RequestTaskInput from '../request-task/RequestTaskInput.vue'
-import { axiosInstance } from '@/utils/axios'
-import { getMainCategory } from '@/api/common'
-import type { Category, CategoryForm } from '@/types/common'
 
 const router = useRouter()
 

From 184ead35859439e7ecc7c0b33e8436dff68bef85 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 02:19:43 +0900
Subject: [PATCH 043/180] =?UTF-8?q?:recycle:=20[refactor]=20:=201,2?=
 =?UTF-8?q?=EC=B0=A8=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=84=A0=EC=96=B8=20=EB=B0=8F=20=EC=9C=84=EC=B9=98?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constants/admin.ts | 14 +++++++++++---
 src/types/common.ts    | 17 ++++++++++++-----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/constants/admin.ts b/src/constants/admin.ts
index 44c1e4be..15fef027 100644
--- a/src/constants/admin.ts
+++ b/src/constants/admin.ts
@@ -1,4 +1,4 @@
-import type { CategoryForm, ListBarTabProps, Option } from '@/types/common'
+import type { ListBarTabProps, MainCategoryTypes, Option, SubCategoryTypes } from '@/types/common'
 
 export const MEMBER_MANAGEMENT_LIST_BAR_TAB: ListBarTabProps[] = [
   { content: '이름', width: 60 },
@@ -36,9 +36,17 @@ export const LOGS_LIST_BAR_TAB: ListBarTabProps[] = [
 
 import type { RoleTypes, RoleTypesEnum, UserRegistrationProps } from '@/types/admin'
 
-export const CATEGORY_FORM: CategoryForm = {
+export const CATEGORY_FIRST_ADD: MainCategoryTypes = {
   name: '',
-  code: ''
+  code: '',
+  id: 0
+}
+
+export const CATEGORY_SECOND_ADD: SubCategoryTypes = {
+  name: '',
+  mainCategoryId: 0,
+  code: '',
+  id: 0
 }
 
 export const INITIAL_USER_REGISTRATION: UserRegistrationProps = {
diff --git a/src/types/common.ts b/src/types/common.ts
index 36e481ee..80574efa 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -79,16 +79,23 @@ export interface LabelDataTypes {
   labelColor: string
 }
 
-export interface CategoryForm {
+export interface MainCategoryTypes {
+  id: number
+  name: string
+  code: string
+}
+
+export interface SubCategoryTypes {
+  id: number
+  mainCategoryId: number
   name: string
   code: string
-  mainCategoryId?: number
 }
 
 export interface CategoryDropdownProps {
-  options: CategoryForm
+  placeholderText: string
+  options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue?: CategoryForm
+  modelValue: string
   isLabel?: boolean
-  isDisabled?: boolean
 }

From 5fc53356f448eeb6152ecea25bdb00ef3ff360d1 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:07:11 +0900
Subject: [PATCH 044/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=EC=9A=A9=20=EB=93=9C=EB=A1=AD?=
 =?UTF-8?q?=EB=8B=A4=EC=9A=B4=20=EA=B0=9C=EB=B3=84=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/CategoryDropDown.vue | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 7f377299..609ebdae 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -7,18 +7,13 @@
         class="text-red-1">
         *
       </p>
-      <p
-        v-if="isInvalidateState === 'category'"
-        class="text-red-1">
-        카테고리를 선택해주세요
-      </p>
     </div>
     <div class="relative flex text-base">
       <div
         class="flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black"
         @click="toggleDropdown">
         <p :class="{ 'text-disabled': !modelValue?.name }">
-          {{ modelValue?.name ?? labelName + '를 선택해주세요' }}
+          {{ modelValue?.name ?? placeholderText }}
         </p>
         <CommonIcons
           :name="dropdownIcon"
@@ -42,14 +37,11 @@
 <script lang="ts" setup>
 import { dropdownIcon } from '@/constants/iconPath'
 import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { computed, ref } from 'vue'
+import { ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
+const { placeholderText, options, labelName, modelValue, isLabel, isDisabled } =
   defineProps<CategoryDropdownProps>()
-
-const isInvalidateState = computed(() => isInvalidate)
-
 const emit = defineEmits(['update:modelValue'])
 const dropdownOpen = ref(false)
 

From 9def193c294ee110a3be56a29cb9612e0a57b5a1 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:11:02 +0900
Subject: [PATCH 045/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=9D=EC=84=B1=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 11 ++++++-----
 src/types/common.ts                         |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index e6bbc38c..75de7462 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -36,10 +36,11 @@
 </template>
 
 <script lang="ts" setup>
+import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
 import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
-import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
-import { ref } from 'vue'
+import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
+import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
@@ -86,7 +87,7 @@ const handleCancel = () => {
 const handleSubmit = async () => {
   const formData = new FormData()
   const taskInfo = {
-    categoryId: 1,
+    categoryId: category2.value?.id,
     title: title.value,
     description: description.value
   }
@@ -95,15 +96,15 @@ const handleSubmit = async () => {
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
 
   formData.append('taskInfo', newBlob)
+
   if (file.value && file.value.length > 0) {
     file.value.forEach(f => {
       formData.append('attachment', f)
     })
   }
-  console.log(Object.fromEntries(formData), '응답')
-  console.log(file.value, '파일 현황 응답')
   try {
     const res = await postTaskRequest(formData)
+    console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
   }
diff --git a/src/types/common.ts b/src/types/common.ts
index 80574efa..ca389d58 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -96,6 +96,7 @@ export interface CategoryDropdownProps {
   placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: string
+  modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
+  isDisabled?: boolean
 }

From f6775720847a007a48681714d0ba4ac97e31d2e0 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 11:51:43 +0900
Subject: [PATCH 046/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EB=88=84=EB=9D=BD=EC=8B=9C=20=EA=B2=BD=EA=B3=A0=20?=
 =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/CategoryDropDown.vue | 12 ++++++++++--
 src/components/request-task/RequestTask.vue      | 15 ++++++++++++---
 src/components/request-task/RequestTaskInput.vue |  5 +++++
 src/types/common.ts                              |  1 +
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 609ebdae..8ab78003 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -7,6 +7,11 @@
         class="text-red-1">
         *
       </p>
+      <p
+        v-if="isInvalidateState === 'category'"
+        class="text-red-1">
+        카테고리를 선택해주세요
+      </p>
     </div>
     <div class="relative flex text-base">
       <div
@@ -37,11 +42,14 @@
 <script lang="ts" setup>
 import { dropdownIcon } from '@/constants/iconPath'
 import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { placeholderText, options, labelName, modelValue, isLabel, isDisabled } =
+const { placeholderText, options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
   defineProps<CategoryDropdownProps>()
+
+const isInvalidateState = computed(() => isInvalidate)
+
 const emit = defineEmits(['update:modelValue'])
 const dropdownOpen = ref(false)
 
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 75de7462..5df97d79 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -5,16 +5,18 @@
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
       :placeholderText="'1차 카테고리를 선택해주세요'"
+      :isInvalidate="isInvalidate"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
       :placeholderText="'2차 카테고리를 선택해주세요'"
+      :is-invalidate="isInvalidate"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
-      :placeholderText="'제목을 입력해주세요'"
+      :placeholderText="TITLE_PLACEHOLDER"
       :label-name="'제목'"
       :is-invalidate="isInvalidate" />
     <RequestTaskTextArea
@@ -55,7 +57,6 @@ const title = ref('')
 const description = ref('')
 const file = ref(null as File[] | null)
 const isInvalidate = ref('')
-const isModalVisible = ref(false)
 
 const mainCategoryArr = ref<MainCategoryTypes[]>([])
 const subCategoryArr = ref<SubCategoryTypes[]>([])
@@ -85,9 +86,17 @@ const handleCancel = () => {
 }
 
 const handleSubmit = async () => {
+  if (!category1.value || !category2.value) {
+    isInvalidate.value = 'category'
+    console.log(isInvalidate.value, '변경됨')
+    return
+  } else if (!title.value) {
+    isInvalidate.value = 'input'
+    return
+  }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value?.id,
+    categoryId: category2.value.id,
     title: title.value,
     description: description.value
   }
diff --git a/src/components/request-task/RequestTaskInput.vue b/src/components/request-task/RequestTaskInput.vue
index 08949f94..5a411979 100644
--- a/src/components/request-task/RequestTaskInput.vue
+++ b/src/components/request-task/RequestTaskInput.vue
@@ -7,6 +7,11 @@
         class="text-red-1">
         *
       </p>
+      <p
+        v-if="isInvalidateState === 'input'"
+        class="text-red-1">
+        {{ labelName }}을 입력해주세요
+      </p>
     </div>
     <input
       class="w-full h-11 border border-border-1 px-4 focus:outline-none text-black"
diff --git a/src/types/common.ts b/src/types/common.ts
index ca389d58..fd067149 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -99,4 +99,5 @@ export interface CategoryDropdownProps {
   modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
   isDisabled?: boolean
+  isInvalidate?: string
 }

From 58d897867b6ee185f9682b58d81ebb6f83e1324c Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:03:33 +0900
Subject: [PATCH 047/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=99=84=EB=A3=8C=20=ED=9B=84=20=EB=AA=A8=EB=8B=AC?=
 =?UTF-8?q?=20=EB=B0=8F=20=EB=9D=BC=EC=9A=B0=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 5df97d79..979b1f7e 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -45,6 +45,7 @@ import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
+import ModalView from '../ModalView.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
 import RequestTaskFileInput from './RequestTaskFileInput.vue'
 import RequestTaskInput from './RequestTaskInput.vue'
@@ -57,6 +58,7 @@ const title = ref('')
 const description = ref('')
 const file = ref(null as File[] | null)
 const isInvalidate = ref('')
+const isModalVisible = ref(false)
 
 const mainCategoryArr = ref<MainCategoryTypes[]>([])
 const subCategoryArr = ref<SubCategoryTypes[]>([])
@@ -113,6 +115,7 @@ const handleSubmit = async () => {
   }
   try {
     const res = await postTaskRequest(formData)
+    isModalVisible.value = true
     console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)

From 7b833bb17103b95a16cde9c770544b08fcb6407f Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:09:51 +0900
Subject: [PATCH 048/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20axios=20in?=
 =?UTF-8?q?stance=20=EA=B0=9D=EC=B2=B4=20=EB=B6=84=EB=A6=AC=ED=95=B4?=
 =?UTF-8?q?=EC=84=9C=20import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index 849a36eb..c310c969 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -26,13 +26,13 @@ import { useRequestParamsStore } from '@/stores/params'
 import type { MyRequestResponse } from '@/types/user'
 import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
+import { ref, watch } from 'vue'
 import { useParseParams } from '../hooks/useParseParams'
 import ListContainer from '../lists/ListContainer.vue'
 import ListPagination from '../lists/ListPagination.vue'
 import NoContent from '../lists/NoContent.vue'
 import MyRequestListBar from './MyRequestListBar.vue'
 import MyRequestListCard from './MyRequestListCard.vue'
-import { computed } from 'vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {

From e11d7f504b1d79bc6bc8e71b4433562dfde853ac Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:18:58 +0900
Subject: [PATCH 049/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EB=93=9C=EB=A1=AD=EB=8B=A4?=
 =?UTF-8?q?=EC=9A=B4=20placeholder=EC=97=86=EC=9D=B4,=20input=20placeholde?=
 =?UTF-8?q?r=20=EC=83=81=EC=88=98=ED=99=94=20=EC=B7=A8=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/CategoryDropDown.vue | 4 ++--
 src/components/request-task/RequestTask.vue      | 9 ++-------
 src/types/common.ts                              | 1 -
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 8ab78003..7f377299 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -18,7 +18,7 @@
         class="flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black"
         @click="toggleDropdown">
         <p :class="{ 'text-disabled': !modelValue?.name }">
-          {{ modelValue?.name ?? placeholderText }}
+          {{ modelValue?.name ?? labelName + '를 선택해주세요' }}
         </p>
         <CommonIcons
           :name="dropdownIcon"
@@ -45,7 +45,7 @@ import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from
 import { computed, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { placeholderText, options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
+const { options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
   defineProps<CategoryDropdownProps>()
 
 const isInvalidateState = computed(() => isInvalidate)
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 979b1f7e..ae084067 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -4,19 +4,17 @@
       v-model="category1"
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
-      :placeholderText="'1차 카테고리를 선택해주세요'"
       :isInvalidate="isInvalidate"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
-      :placeholderText="'2차 카테고리를 선택해주세요'"
       :is-invalidate="isInvalidate"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
-      :placeholderText="TITLE_PLACEHOLDER"
+      :placeholderText="'제목을 입력해주세요'"
       :label-name="'제목'"
       :is-invalidate="isInvalidate" />
     <RequestTaskTextArea
@@ -40,7 +38,6 @@
 <script lang="ts" setup>
 import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
-import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
 import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
@@ -109,9 +106,7 @@ const handleSubmit = async () => {
   formData.append('taskInfo', newBlob)
 
   if (file.value && file.value.length > 0) {
-    file.value.forEach(f => {
-      formData.append('attachment', f)
-    })
+    file.value.forEach(f => formData.append('attachment', f))
   }
   try {
     const res = await postTaskRequest(formData)
diff --git a/src/types/common.ts b/src/types/common.ts
index fd067149..3cb18d94 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -93,7 +93,6 @@ export interface SubCategoryTypes {
 }
 
 export interface CategoryDropdownProps {
-  placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
   modelValue: MainCategoryTypes | SubCategoryTypes | null

From 4ed21602f5e01d0694dca5086210f2a16bf71739 Mon Sep 17 00:00:00 2001
From: Choi hyoseong <105284587+hyoseong-Choi@users.noreply.github.com>
Date: Mon, 3 Feb 2025 12:19:57 +0900
Subject: [PATCH 050/180] =?UTF-8?q?CLAP-234=20CI/CD=20=EC=8A=A4=ED=81=AC?=
 =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EB=B6=84=EB=A6=AC=20(#74)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* :construction_worker: [cicd] : CI/CD 스크립트 분리
---
 .github/workflows/{cicd.yml => CD.yml} | 118 ++++++++++++-------------
 .github/workflows/CI.yml               |  33 +++++++
 2 files changed, 90 insertions(+), 61 deletions(-)
 rename .github/workflows/{cicd.yml => CD.yml} (87%)
 create mode 100644 .github/workflows/CI.yml

diff --git a/.github/workflows/cicd.yml b/.github/workflows/CD.yml
similarity index 87%
rename from .github/workflows/cicd.yml
rename to .github/workflows/CD.yml
index 88129bed..619d7d6f 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/CD.yml
@@ -1,61 +1,57 @@
-# github repository actions 페이지에 나타날 이름
-name: CI/CD for front using github actions
-
-# event trigger
-# develop 브랜치에 pull_request가 닫히거나 푸시했을때 실행
-on:
-  pull_request:
-    types: [closed]
-    branches: [ "develop" ]
-  push:
-    branches: [ "develop" ]
-
-
-permissions:
-  contents: read
-
-jobs:
-  front-cicd:
-    runs-on: ubuntu-latest
-    steps:
-      # 저장소 코드를 체크아웃합니다. (PR 올린 코드를 가져오는 행위)
-      - uses: actions/checkout@v4
-
-      # Node.js 환경 설정
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22 # 지정된 Node.js 버전 사용
-          cache: npm # setup-node 의 캐시 기능을 사용함
-          cache-dependency-path: package-lock.json # 캐시 기능을 사용할 때 캐시의 기준이 될 파일을 지정
-
-      - name: Install Dependencies
-        run: npm install
-
-      - name: Build with npm
-        run: npm run build || exit 0  # exit 0를 추가하여 경고성 오류 무시
-
-      - name: Create nginx.conf
-        run: touch ./nginx.conf
-      - run: echo "${{ secrets.NGINX_CONF }}" > ./nginx.conf
-
-      ## docker build & push to production
-      - name: Docker build & push
-        run: |
-          docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-          docker build -t ${{ secrets.DOCKER_FRONT_REPO }} .
-          docker push ${{ secrets.DOCKER_FRONT_REPO }}
-
-      ## deploy
-      - name: Deploy
-        uses: appleboy/ssh-action@master
-        id: deploy
-        with:
-          host: ${{ secrets.FRONT_HOST }}
-          username: ${{ secrets.FRONT_HOST_USERNAME }}
-          key: ${{ secrets.FRONT_HOST_KEY }}
-          port: ${{ secrets.FRONT_HOST_PORT }}
-          script: |
-            docker rm -f taskflow-front
-            docker image rm ${{ secrets.DOCKER_FRONT_REPO }} -f
-            docker run --name taskflow-front -d -p 80:80 --restart on-failure ${{ secrets.DOCKER_FRONT_REPO }}
+# github repository actions 페이지에 나타날 이름
+name: CD for front using github actions
+
+# event trigger
+# develop 브랜치에 pull_request가 닫히거나 푸시했을때 실행
+on:
+  push:
+    branches: [ "develop" ]
+
+permissions:
+  contents: read
+
+jobs:
+  front-cicd:
+    runs-on: ubuntu-latest
+    steps:
+      # 저장소 코드를 체크아웃합니다. (PR 올린 코드를 가져오는 행위)
+      - uses: actions/checkout@v4
+
+      # Node.js 환경 설정
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22 # 지정된 Node.js 버전 사용
+          cache: npm # setup-node 의 캐시 기능을 사용함
+          cache-dependency-path: package-lock.json # 캐시 기능을 사용할 때 캐시의 기준이 될 파일을 지정
+
+      - name: Install Dependencies
+        run: npm install
+
+      - name: Build with npm
+        run: npm run build-only
+
+      - name: Create nginx.conf
+        run: touch ./nginx.conf
+      - run: echo "${{ secrets.NGINX_CONF }}" > ./nginx.conf
+
+      ## docker build & push to production
+      - name: Docker build & push
+        run: |
+          docker login clap.kr-central-2.kcr.dev -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -t ${{ secrets.DOCKER_FRONT_REPO }} .
+          docker push ${{ secrets.DOCKER_FRONT_REPO }}
+
+      ## deploy
+      - name: Deploy
+        uses: appleboy/ssh-action@master
+        id: deploy
+        with:
+          host: ${{ secrets.FRONT_HOST }}
+          username: ${{ secrets.FRONT_HOST_USERNAME }}
+          key: ${{ secrets.FRONT_HOST_KEY }}
+          port: ${{ secrets.FRONT_HOST_PORT }}
+          script: |
+            docker rm -f taskflow-front
+            docker image rm ${{ secrets.DOCKER_FRONT_REPO }} -f
+            docker run --name taskflow-front -d -p 80:80 --restart on-failure ${{ secrets.DOCKER_FRONT_REPO }}
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
new file mode 100644
index 00000000..d68ac831
--- /dev/null
+++ b/.github/workflows/CI.yml
@@ -0,0 +1,33 @@
+# github repository actions 페이지에 나타날 이름
+name: CI for front using github actions
+
+# event trigger
+# develop 브랜치에 pull_request가 닫히거나 푸시했을때 실행
+on:
+  pull_request:
+    types: [ opened, synchronize ]
+    branches: [ "develop" ]
+
+permissions:
+  contents: read
+
+jobs:
+  front-cicd:
+    runs-on: ubuntu-latest
+    steps:
+      # 저장소 코드를 체크아웃합니다. (PR 올린 코드를 가져오는 행위)
+      - uses: actions/checkout@v4
+
+      # Node.js 환경 설정
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22 # 지정된 Node.js 버전 사용
+          cache: npm # setup-node 의 캐시 기능을 사용함
+          cache-dependency-path: package-lock.json # 캐시 기능을 사용할 때 캐시의 기준이 될 파일을 지정
+
+      - name: Install Dependencies
+        run: npm install
+
+      - name: Build with npm
+        run: npm run build-only
\ No newline at end of file

From 355825b41537f0ea058559e07362634c096679e0 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 1 Feb 2025 20:03:17 +0900
Subject: [PATCH 051/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20prop?=
 =?UTF-8?q?=EB=8C=80=EC=8B=A0=20=EC=A7=81=EC=A0=91=20=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=A4=EA=B8=B0,=20=ED=8C=8C=EC=9D=BC=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=EA=B0=92=20=EB=B0=B0=EC=97=B4=EB=A1=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 25 ++++++++-------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index ae084067..7a61126f 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -36,10 +36,10 @@
 </template>
 
 <script lang="ts" setup>
-import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
-import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { onMounted, ref, watch } from 'vue'
+import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
+import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
+import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import ModalView from '../ModalView.vue'
@@ -85,17 +85,9 @@ const handleCancel = () => {
 }
 
 const handleSubmit = async () => {
-  if (!category1.value || !category2.value) {
-    isInvalidate.value = 'category'
-    console.log(isInvalidate.value, '변경됨')
-    return
-  } else if (!title.value) {
-    isInvalidate.value = 'input'
-    return
-  }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value.id,
+    categoryId: 1,
     title: title.value,
     description: description.value
   }
@@ -104,14 +96,15 @@ const handleSubmit = async () => {
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
 
   formData.append('taskInfo', newBlob)
-
   if (file.value && file.value.length > 0) {
-    file.value.forEach(f => formData.append('attachment', f))
+    file.value.forEach(f => {
+      formData.append('attachment', f)
+    })
   }
+  console.log(Object.fromEntries(formData), '응답')
+  console.log(file.value, '파일 현황 응답')
   try {
     const res = await postTaskRequest(formData)
-    isModalVisible.value = true
-    console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
   }

From c764eb3e5a09db0dc77af3ff1addd1fdcad95023 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:11:02 +0900
Subject: [PATCH 052/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=9D=EC=84=B1=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 34 ++++++++++++++++-----
 src/types/common.ts                         |  1 -
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 7a61126f..00022d80 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -4,13 +4,13 @@
       v-model="category1"
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
-      :isInvalidate="isInvalidate"
+      :placeholderText="'1차 카테고리를 선택해주세요'"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
-      :is-invalidate="isInvalidate"
+      :placeholderText="'2차 카테고리를 선택해주세요'"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
@@ -36,13 +36,13 @@
 </template>
 
 <script lang="ts" setup>
+import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
 import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
-import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
-import { ref } from 'vue'
+import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
+import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
-import ModalView from '../ModalView.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
 import RequestTaskFileInput from './RequestTaskFileInput.vue'
 import RequestTaskInput from './RequestTaskInput.vue'
@@ -73,6 +73,24 @@ watch(category1, async newValue => {
     subCategory => subCategory.mainCategoryId === newValue?.id
   )
 })
+
+const mainCategoryArr = ref<MainCategoryTypes[]>([])
+const subCategoryArr = ref<SubCategoryTypes[]>([])
+const afterSubCategoryArr = ref<SubCategoryTypes[]>([])
+
+onMounted(async () => {
+  mainCategoryArr.value = await getMainCategory()
+  subCategoryArr.value = await getSubCategory()
+  afterSubCategoryArr.value = await getSubCategory()
+})
+
+watch(category1, async newValue => {
+  category2.value = null
+  afterSubCategoryArr.value = subCategoryArr.value.filter(
+    subCategory => subCategory.mainCategoryId === newValue?.id
+  )
+})
+
 const router = useRouter()
 
 const handleCancel = () => {
@@ -87,7 +105,7 @@ const handleCancel = () => {
 const handleSubmit = async () => {
   const formData = new FormData()
   const taskInfo = {
-    categoryId: 1,
+    categoryId: category2.value?.id,
     title: title.value,
     description: description.value
   }
@@ -96,15 +114,15 @@ const handleSubmit = async () => {
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
 
   formData.append('taskInfo', newBlob)
+
   if (file.value && file.value.length > 0) {
     file.value.forEach(f => {
       formData.append('attachment', f)
     })
   }
-  console.log(Object.fromEntries(formData), '응답')
-  console.log(file.value, '파일 현황 응답')
   try {
     const res = await postTaskRequest(formData)
+    console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
   }
diff --git a/src/types/common.ts b/src/types/common.ts
index 3cb18d94..5ff72b32 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -98,5 +98,4 @@ export interface CategoryDropdownProps {
   modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
   isDisabled?: boolean
-  isInvalidate?: string
 }

From 581450bfe92139a6053313e69e1616c1ae53b0d6 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:18:58 +0900
Subject: [PATCH 053/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EB=93=9C=EB=A1=AD=EB=8B=A4?=
 =?UTF-8?q?=EC=9A=B4=20placeholder=EC=97=86=EC=9D=B4,=20input=20placeholde?=
 =?UTF-8?q?r=20=EC=83=81=EC=88=98=ED=99=94=20=EC=B7=A8=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 00022d80..566e7427 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -4,13 +4,13 @@
       v-model="category1"
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
-      :placeholderText="'1차 카테고리를 선택해주세요'"
+      :isInvalidate="isInvalidate"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
-      :placeholderText="'2차 카테고리를 선택해주세요'"
+      :is-invalidate="isInvalidate"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
@@ -38,7 +38,6 @@
 <script lang="ts" setup>
 import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
-import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
 import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
@@ -116,9 +115,7 @@ const handleSubmit = async () => {
   formData.append('taskInfo', newBlob)
 
   if (file.value && file.value.length > 0) {
-    file.value.forEach(f => {
-      formData.append('attachment', f)
-    })
+    file.value.forEach(f => formData.append('attachment', f))
   }
   try {
     const res = await postTaskRequest(formData)

From cab1103d2dc4f0ec433ede122c8041260d23671e Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Mon, 3 Feb 2025 13:37:04 +0900
Subject: [PATCH 054/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=EC=BD=94=EB=93=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue |  2 +-
 src/components/request-task/RequestTask.vue | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index c310c969..78d4b07e 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -26,7 +26,7 @@ import { useRequestParamsStore } from '@/stores/params'
 import type { MyRequestResponse } from '@/types/user'
 import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { useParseParams } from '../hooks/useParseParams'
 import ListContainer from '../lists/ListContainer.vue'
 import ListPagination from '../lists/ListPagination.vue'
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 566e7427..f6e56e6a 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -72,24 +72,6 @@ watch(category1, async newValue => {
     subCategory => subCategory.mainCategoryId === newValue?.id
   )
 })
-
-const mainCategoryArr = ref<MainCategoryTypes[]>([])
-const subCategoryArr = ref<SubCategoryTypes[]>([])
-const afterSubCategoryArr = ref<SubCategoryTypes[]>([])
-
-onMounted(async () => {
-  mainCategoryArr.value = await getMainCategory()
-  subCategoryArr.value = await getSubCategory()
-  afterSubCategoryArr.value = await getSubCategory()
-})
-
-watch(category1, async newValue => {
-  category2.value = null
-  afterSubCategoryArr.value = subCategoryArr.value.filter(
-    subCategory => subCategory.mainCategoryId === newValue?.id
-  )
-})
-
 const router = useRouter()
 
 const handleCancel = () => {

From e86bfd4c169dc8cabe0672c546a7cfd11c9ad898 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 1 Feb 2025 21:14:05 +0900
Subject: [PATCH 055/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20division?=
 =?UTF-8?q?=20->=20label=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                              |  6 ++
 .../task-management/ColorSelectModal.vue      |  4 +-
 ...sionManagement.vue => LabelManagement.vue} | 18 +++---
 ...gementLine.vue => LabelManagementLine.vue} | 60 +++++++++----------
 src/types/admin.ts                            | 10 ++--
 src/types/common.ts                           | 31 +---------
 6 files changed, 53 insertions(+), 76 deletions(-)
 create mode 100644 src/api/admin.ts
 rename src/components/task-management/{DivisionManagement.vue => LabelManagement.vue} (84%)
 rename src/components/task-management/{DivisionManagementLine.vue => LabelManagementLine.vue} (54%)

diff --git a/src/api/admin.ts b/src/api/admin.ts
new file mode 100644
index 00000000..724a89b1
--- /dev/null
+++ b/src/api/admin.ts
@@ -0,0 +1,6 @@
+import { axiosInstance } from '@/utils/axios'
+
+export const getDivisionsAdmin = async () => {
+  const response = await axiosInstance.get('/api/managements/labels')
+  return response.data
+}
diff --git a/src/components/task-management/ColorSelectModal.vue b/src/components/task-management/ColorSelectModal.vue
index 96a189f9..8534e05c 100644
--- a/src/components/task-management/ColorSelectModal.vue
+++ b/src/components/task-management/ColorSelectModal.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="isOpen && devisionId === selectedDivisionId"
+    v-if="isOpen && labelId === selectedLabelId"
     class="absolute top-7 left-3 w-[176px] h-[120px] p-4 flex flex-col z-50 shadow-custom rounded-lg bg-white gap-4"
     @click.self="closeModal">
     <div class="flex w-full justify-between">
@@ -39,7 +39,7 @@ const closeModal = () => {
 }
 
 const updateColor = (color: string) => {
-  console.log(props.devisionId, '로 색상 변경 로직', color)
+  console.log(props.labelId, '로 색상 변경 로직', color)
   emit('close')
 }
 </script>
diff --git a/src/components/task-management/DivisionManagement.vue b/src/components/task-management/LabelManagement.vue
similarity index 84%
rename from src/components/task-management/DivisionManagement.vue
rename to src/components/task-management/LabelManagement.vue
index 7aaeb2c3..edde2736 100644
--- a/src/components/task-management/DivisionManagement.vue
+++ b/src/components/task-management/LabelManagement.vue
@@ -8,7 +8,7 @@
       </div>
     </div>
     <div class="flex w-full">
-      <DivisionManagementLine :divisionData="divisionData" />
+      <LabelManagementLine :label-data="labelData" />
     </div>
     <div
       v-if="!isAdd"
@@ -31,8 +31,8 @@
         <ColorSelectModal
           v-if="isColorModalVisible"
           :is-open="isColorModalVisible"
-          :devisionId="0"
-          :selectedDivisionId="0"
+          :label-id="0"
+          :selected-label-id="0"
           @close="closeColor" />
         <input
           type="text"
@@ -59,17 +59,21 @@
 </template>
 
 <script setup lang="ts">
+import { getDivisionsAdmin } from '@/api/admin'
 import { plusIcon } from '@/constants/iconPath'
 import { mockDivisionData } from '@/datas/taskmanagement'
-import type { DivisionDataTypes, NewDevisonTypes } from '@/types/admin'
+import type { LabelDataTypes, NewLabelTypes } from '@/types/admin'
 import { getColor } from '@/utils/color'
 import { ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 import ColorSelectModal from './ColorSelectModal.vue'
-import DivisionManagementLine from './DivisionManagementLine.vue' /* PartiallyEnd: #3632/scriptSetup.vue */
+import LabelManagementLine from './LabelManagementLine.vue'
 
-const divisionData = ref<DivisionDataTypes[]>(mockDivisionData)
-const newDivision = ref<NewDevisonTypes>({
+const Divisions = await getDivisionsAdmin()
+console.log(Divisions)
+
+const labelData = ref<LabelDataTypes[]>(mockDivisionData)
+const newDivision = ref<NewLabelTypes>({
   divisionName: '새로운 구분',
   divisionColor: 'red'
 })
diff --git a/src/components/task-management/DivisionManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
similarity index 54%
rename from src/components/task-management/DivisionManagementLine.vue
rename to src/components/task-management/LabelManagementLine.vue
index 84004ec8..564a835a 100644
--- a/src/components/task-management/DivisionManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -1,56 +1,50 @@
 <template>
   <div class="w-full">
     <div
-      v-for="division in divisionData"
-      :key="division.divisionId"
+      v-for="label in labelData"
+      :key="label.labelId"
       class="flex w-full flex-col">
       <div class="category-management-line justify-between bg-white">
         <div class="flex gap-7 items-center pl-3 relative">
           <div
             :style="{
-              borderColor: getColor(division.divisionColor)?.borderColor,
-              backgroundColor: getColor(division.divisionColor)?.fillColor
+              borderColor: getColor(label.labelColor)?.borderColor,
+              backgroundColor: getColor(label.labelColor)?.fillColor
             }"
             class="w-4 h-4 rounded-full border-2 cursor-pointer pr-3"
-            @click="isEdit && clickColor(division.divisionId)"></div>
+            @click="isEdit && clickColor(label.labelId)"></div>
           <ColorSelectModal
-            v-if="isColorModalVisible && editValue.divisionId === division.divisionId"
+            v-if="isColorModalVisible && editValue.labelId === label.labelId"
             :is-open="isColorModalVisible"
-            :devisionId="division.divisionId"
-            :selectedDivisionId="selectedDivisionId"
+            :label-id="label.labelId"
+            :selectedLabelId="selectedLabelId"
             @close="closeColor" />
           <input
-            v-if="isEdit && editValue.divisionId === division.divisionId"
-            v-model="editValue.divisionName"
+            v-if="isEdit && editValue.labelId === label.labelId"
+            v-model="editValue.labelName"
             type="text"
             placeholder="새로운 구분명을 입력"
             class="w-full flex focus:outline-none" />
           <p
             v-else
             class="text-black">
-            {{ division.divisionName }}
+            {{ labelData[0].labelName }}
           </p>
         </div>
         <div class="flex gap-2 text-xs font-bold">
           <button
-            @click="
-              isEdit && editValue.divisionId === division.divisionId
-                ? finishEdit()
-                : startEdit(division)
-            "
+            @click="isEdit && editValue.labelId === label.labelId ? finishEdit() : startEdit(label)"
             class="text-primary1 w-[21px]">
-            {{ isEdit && editValue.divisionId === division.divisionId ? '확인' : '수정' }}
+            {{ isEdit && editValue.labelId === label.labelId ? '확인' : '수정' }}
           </button>
           <button
-            @click="
-              isEdit && editValue.divisionId === division.divisionId ? cancelEdit() : handleDelete()
-            "
+            @click="isEdit && editValue.labelId === label.labelId ? cancelEdit() : handleDelete()"
             :class="
-              isEdit && editValue.divisionId === division.divisionId
+              isEdit && editValue.labelId === label.labelId
                 ? 'text-disabled w-[21px]'
                 : 'text-red-1 w-[21px]'
             ">
-            {{ isEdit && editValue.divisionId === division.divisionId ? '취소' : '삭제' }}
+            {{ isEdit && editValue.labelId === label.labelId ? '취소' : '삭제' }}
           </button>
         </div>
       </div>
@@ -66,22 +60,22 @@
 </template>
 
 <script setup lang="ts">
-import type { DivisionDataTypes } from '@/types/admin'
+import type { LabelDataTypes } from '@/types/admin'
 import { getColor } from '@/utils/color'
 import { defineProps, ref } from 'vue'
 import ModalView from '../ModalView.vue'
 import ColorSelectModal from './ColorSelectModal.vue'
 
-const { divisionData } = defineProps<{ divisionData: DivisionDataTypes[] }>()
+const { labelData } = defineProps<{ labelData: LabelDataTypes[] }>()
 
 const isModalVisible = ref(false)
 const isEdit = ref(false)
 const isColorModalVisible = ref(false)
-const selectedDivisionId = ref<number | null>(null)
-const editValue = ref<DivisionDataTypes>({
-  divisionName: '',
-  divisionColor: '',
-  divisionId: 9999
+const selectedLabelId = ref<number | null>(null)
+const editValue = ref<LabelDataTypes>({
+  labelName: '',
+  labelColor: '',
+  labelId: 9999
 })
 
 const handleCancel = () => {
@@ -92,18 +86,18 @@ const handleDelete = () => {
   isModalVisible.value = true
 }
 
-const clickColor = (divisionId: number) => {
+const clickColor = (labelId: number) => {
   isColorModalVisible.value = true
-  selectedDivisionId.value = divisionId
+  selectedLabelId.value = labelId
 }
 
 const closeColor = () => {
   isColorModalVisible.value = false
 }
 
-const startEdit = (division: DivisionDataTypes) => {
+const startEdit = (label: LabelDataTypes) => {
   isEdit.value = true
-  editValue.value = division
+  editValue.value = label
 }
 
 const finishEdit = () => {
diff --git a/src/types/admin.ts b/src/types/admin.ts
index f266f587..11262134 100644
--- a/src/types/admin.ts
+++ b/src/types/admin.ts
@@ -53,13 +53,13 @@ export interface CategoryAllData {
   categories: categoriesTypes[]
 }
 
-export interface DivisionDataTypes {
-  divisionId: number
-  divisionName: string
-  divisionColor: string
+export interface LabelDataTypes {
+  labelId: number
+  labelName: string
+  labelColor: string
 }
 
-export interface NewDevisonTypes {
+export interface NewLabelTypes {
   divisionName: string
   divisionColor: string
 }
diff --git a/src/types/common.ts b/src/types/common.ts
index 5ff72b32..9f823c0e 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -68,34 +68,7 @@ export interface FormCheckboxProps {
 }
 
 export interface ColorSelectProps {
-  devisionId: number
-  selectedDivisionId: number | null
-  isOpen: boolean
-}
-
-export interface LabelDataTypes {
   labelId: number
-  labelName: string
-  labelColor: string
-}
-
-export interface MainCategoryTypes {
-  id: number
-  name: string
-  code: string
-}
-
-export interface SubCategoryTypes {
-  id: number
-  mainCategoryId: number
-  name: string
-  code: string
-}
-
-export interface CategoryDropdownProps {
-  options: MainCategoryTypes[] | SubCategoryTypes[]
-  labelName: string
-  modelValue: MainCategoryTypes | SubCategoryTypes | null
-  isLabel?: boolean
-  isDisabled?: boolean
+  selectedLabelId: number | null
+  isOpen: boolean
 }

From decc4582db538d144f461f05fab25de583ef1a37 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 13:58:03 +0900
Subject: [PATCH 056/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EB=9D=BC?=
 =?UTF-8?q?=EB=B2=A8=20=ED=83=80=EC=9E=85=20=EC=B6=94=EA=B0=80,=20division?=
 =?UTF-8?q?=20->=20label=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/common.ts              | 6 ++++++
 src/views/TaskManagementView.vue | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/types/common.ts b/src/types/common.ts
index 9f823c0e..5a90d063 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -72,3 +72,9 @@ export interface ColorSelectProps {
   selectedLabelId: number | null
   isOpen: boolean
 }
+
+export interface LabelDataTypes {
+  labelId: number
+  labelName: string
+  labelColor: string
+}
diff --git a/src/views/TaskManagementView.vue b/src/views/TaskManagementView.vue
index fc06e854..222e25d4 100644
--- a/src/views/TaskManagementView.vue
+++ b/src/views/TaskManagementView.vue
@@ -10,12 +10,12 @@
       <div class="w-full h-[1px] bg-border-2"></div>
     </div>
     <p class="text-xl text-black">구분</p>
-    <DivisionManagement />
+    <LabelManagement />
   </div>
 </template>
 
 <script setup lang="ts">
 import CategoryManagement from '@/components/task-management/CategoryManagement.vue'
-import DivisionManagement from '@/components/task-management/DivisionManagement.vue'
+import LabelManagement from '@/components/task-management/LabelManagement.vue'
 import TitleBar from '@/components/TitleBar.vue'
 </script>

From cb90570b40da290209b3268492ebef557c8c574c Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 14:18:16 +0900
Subject: [PATCH 057/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EA=B5=AC=EB=B6=84=EB=AA=A9=EB=A1=9D=20get?=
 =?UTF-8?q?=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                              |  2 +-
 .../task-management/LabelManagement.vue       | 35 ++++++++++---------
 .../task-management/LabelManagementLine.vue   |  2 +-
 src/datas/taskmanagement.ts                   | 20 +----------
 src/types/admin.ts                            |  4 +--
 src/types/common.ts                           | 22 ++++++++++++
 src/views/TaskManagementView.vue              |  1 -
 7 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/src/api/admin.ts b/src/api/admin.ts
index 724a89b1..ee143eac 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -1,6 +1,6 @@
 import { axiosInstance } from '@/utils/axios'
 
-export const getDivisionsAdmin = async () => {
+export const getLabelsAdmin = async () => {
   const response = await axiosInstance.get('/api/managements/labels')
   return response.data
 }
diff --git a/src/components/task-management/LabelManagement.vue b/src/components/task-management/LabelManagement.vue
index edde2736..af518dc2 100644
--- a/src/components/task-management/LabelManagement.vue
+++ b/src/components/task-management/LabelManagement.vue
@@ -23,8 +23,8 @@
       <div class="flex w-full gap-7 items-center pl-3 relative">
         <div
           :style="{
-            borderColor: getColor(newDivision.divisionColor)?.borderColor,
-            backgroundColor: getColor(newDivision.divisionColor)?.fillColor
+            borderColor: getColor(newLabel.labelColor)?.borderColor,
+            backgroundColor: getColor(newLabel.labelColor)?.fillColor
           }"
           class="w-4 h-4 rounded-full border-2 cursor-pointer pr-3"
           @click="clickColor"></div>
@@ -41,12 +41,12 @@
       </div>
       <div class="flex gap-2 text-xs font-bold">
         <button
-          @click="addNewDivision"
+          @click="addNewLabel"
           class="text-primary1 w-[21px]">
           확인
         </button>
         <button
-          @click="cancelAddDivision"
+          @click="cancelAddLabel"
           class="text-disabled w-[21px]">
           취소
         </button>
@@ -59,33 +59,36 @@
 </template>
 
 <script setup lang="ts">
-import { getDivisionsAdmin } from '@/api/admin'
+import { getLabelsAdmin } from '@/api/admin'
 import { plusIcon } from '@/constants/iconPath'
-import { mockDivisionData } from '@/datas/taskmanagement'
 import type { LabelDataTypes, NewLabelTypes } from '@/types/admin'
 import { getColor } from '@/utils/color'
-import { ref } from 'vue'
+import { onMounted, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 import ColorSelectModal from './ColorSelectModal.vue'
 import LabelManagementLine from './LabelManagementLine.vue'
 
-const Divisions = await getDivisionsAdmin()
-console.log(Divisions)
+onMounted(async () => {
+  const Labels = await getLabelsAdmin()
+  labelData.value = Labels
+  console.log(Labels)
+})
+
+const labelData = ref<LabelDataTypes[]>([])
 
-const labelData = ref<LabelDataTypes[]>(mockDivisionData)
-const newDivision = ref<NewLabelTypes>({
-  divisionName: '새로운 구분',
-  divisionColor: 'red'
+const newLabel = ref<NewLabelTypes>({
+  labelName: '새로운 구분',
+  labelColor: 'RED'
 })
 const isColorModalVisible = ref(false)
 const isAdd = ref(false)
 
-const addNewDivision = () => {
-  console.log(newDivision, '추가로직')
+const addNewLabel = () => {
+  console.log(newLabel, '추가로직')
   isAdd.value = false
 }
 
-const cancelAddDivision = () => {
+const cancelAddLabel = () => {
   isAdd.value = false
 }
 
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index 564a835a..1fec54db 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -28,7 +28,7 @@
           <p
             v-else
             class="text-black">
-            {{ labelData[0].labelName }}
+            {{ label.labelName }}
           </p>
         </div>
         <div class="flex gap-2 text-xs font-bold">
diff --git a/src/datas/taskmanagement.ts b/src/datas/taskmanagement.ts
index 25aa679e..822c2eab 100644
--- a/src/datas/taskmanagement.ts
+++ b/src/datas/taskmanagement.ts
@@ -1,4 +1,4 @@
-import type { CategoryAllData, DivisionDataTypes } from '@/types/admin'
+import type { CategoryAllData } from '@/types/admin'
 
 export const mockCategoryAllData: CategoryAllData = {
   categories: [
@@ -48,21 +48,3 @@ export const mockCategoryAllData: CategoryAllData = {
     }
   ]
 }
-
-export const mockDivisionData: DivisionDataTypes[] = [
-  {
-    divisionId: 1,
-    divisionName: 'Development',
-    divisionColor: 'red'
-  },
-  {
-    divisionId: 2,
-    divisionName: 'Marketing',
-    divisionColor: 'orange'
-  },
-  {
-    divisionId: 3,
-    divisionName: 'Sales',
-    divisionColor: ''
-  }
-]
diff --git a/src/types/admin.ts b/src/types/admin.ts
index 11262134..d27418c6 100644
--- a/src/types/admin.ts
+++ b/src/types/admin.ts
@@ -60,6 +60,6 @@ export interface LabelDataTypes {
 }
 
 export interface NewLabelTypes {
-  divisionName: string
-  divisionColor: string
+  labelName: string
+  labelColor: string
 }
diff --git a/src/types/common.ts b/src/types/common.ts
index 5a90d063..1d2a8435 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -73,6 +73,28 @@ export interface ColorSelectProps {
   isOpen: boolean
 }
 
+export interface MainCategoryTypes {
+  id: number
+  name: string
+  code: string
+}
+
+export interface SubCategoryTypes {
+  id: number
+  mainCategoryId: number
+  name: string
+  code: string
+}
+
+export interface CategoryDropdownProps {
+  options: MainCategoryTypes[] | SubCategoryTypes[]
+  labelName: string
+  modelValue: MainCategoryTypes | SubCategoryTypes | null
+  isLabel?: boolean
+  isDisabled?: boolean
+  isInvalidate?: string
+}
+
 export interface LabelDataTypes {
   labelId: number
   labelName: string
diff --git a/src/views/TaskManagementView.vue b/src/views/TaskManagementView.vue
index 222e25d4..3a1fc58a 100644
--- a/src/views/TaskManagementView.vue
+++ b/src/views/TaskManagementView.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="task-management-view">
     <TitleBar title="작업 관리" />
-
     <div class="flex flex-col gap-8">
       <div class="flex flex-col gap-6">
         <p class="text-xl text-black">카테고리</p>

From 040efeed7106d341674df2e8849510ad169c7377 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 14:45:41 +0900
Subject: [PATCH 058/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EB=AA=A8?=
 =?UTF-8?q?=EB=8B=AC=20=EB=B0=8F=20=EC=83=81=ED=83=9C=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=ED=95=A8=EC=88=98=20=ED=95=98=EB=82=98=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                              |  5 +++
 .../task-management/LabelManagementLine.vue   | 36 +++++++++----------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/api/admin.ts b/src/api/admin.ts
index ee143eac..f8e075f6 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -4,3 +4,8 @@ export const getLabelsAdmin = async () => {
   const response = await axiosInstance.get('/api/managements/labels')
   return response.data
 }
+
+export const deleteLabelAdmin = async (id: string) => {
+  const response = await axiosInstance.delete(`/api/managements/labels/${id}`)
+  return response.data
+}
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index 1fec54db..f4068134 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -18,7 +18,7 @@
             :is-open="isColorModalVisible"
             :label-id="label.labelId"
             :selectedLabelId="selectedLabelId"
-            @close="closeColor" />
+            @close="handleColorModal" />
           <input
             v-if="isEdit && editValue.labelId === label.labelId"
             v-model="editValue.labelName"
@@ -38,7 +38,9 @@
             {{ isEdit && editValue.labelId === label.labelId ? '확인' : '수정' }}
           </button>
           <button
-            @click="isEdit && editValue.labelId === label.labelId ? cancelEdit() : handleDelete()"
+            @click="
+              isEdit && editValue.labelId === label.labelId ? handleEdit() : handleDeleteModal()
+            "
             :class="
               isEdit && editValue.labelId === label.labelId
                 ? 'text-disabled w-[21px]'
@@ -51,7 +53,7 @@
       <ModalView
         type="warningType"
         :is-open="isModalVisible"
-        @close="handleCancel">
+        @close="handleDeleteModal">
         <template #header>구분을 삭제 하시겠습니까?</template>
         <template #body>삭제된 구분은 복구할 수 없습니다</template>
       </ModalView>
@@ -69,8 +71,8 @@ import ColorSelectModal from './ColorSelectModal.vue'
 const { labelData } = defineProps<{ labelData: LabelDataTypes[] }>()
 
 const isModalVisible = ref(false)
-const isEdit = ref(false)
 const isColorModalVisible = ref(false)
+const isEdit = ref(false)
 const selectedLabelId = ref<number | null>(null)
 const editValue = ref<LabelDataTypes>({
   labelName: '',
@@ -78,33 +80,29 @@ const editValue = ref<LabelDataTypes>({
   labelId: 9999
 })
 
-const handleCancel = () => {
-  isModalVisible.value = false
+const handleDeleteModal = () => {
+  isModalVisible.value = !isModalVisible.value
 }
 
-const handleDelete = () => {
-  isModalVisible.value = true
+const handleColorModal = () => {
+  isColorModalVisible.value = !isColorModalVisible.value
 }
 
-const clickColor = (labelId: number) => {
-  isColorModalVisible.value = true
-  selectedLabelId.value = labelId
+const handleEdit = () => {
+  isEdit.value = !isEdit.value
 }
 
-const closeColor = () => {
-  isColorModalVisible.value = false
+const clickColor = (labelId: number) => {
+  handleColorModal()
+  selectedLabelId.value = labelId
 }
 
 const startEdit = (label: LabelDataTypes) => {
-  isEdit.value = true
+  handleEdit()
   editValue.value = label
 }
 
 const finishEdit = () => {
-  isEdit.value = false
-}
-
-const cancelEdit = () => {
-  isEdit.value = false
+  handleEdit()
 }
 </script>

From 1863dc8f7d6b57fd841be494b4f1cd36c457a0b0 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 14:59:57 +0900
Subject: [PATCH 059/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EA=B5=AC?=
 =?UTF-8?q?=EB=B6=84=20=EC=82=AD=EC=A0=9C=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                              |  4 ++--
 .../task-management/LabelManagementLine.vue   | 21 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/api/admin.ts b/src/api/admin.ts
index f8e075f6..c3d4d687 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -5,7 +5,7 @@ export const getLabelsAdmin = async () => {
   return response.data
 }
 
-export const deleteLabelAdmin = async (id: string) => {
-  const response = await axiosInstance.delete(`/api/managements/labels/${id}`)
+export const deleteLabelAdmin = async (id: number) => {
+  const response = await axiosInstance.delete(`/api/management/labels/${id}`)
   return response.data
 }
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index f4068134..e5e2931d 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -53,7 +53,8 @@
       <ModalView
         type="warningType"
         :is-open="isModalVisible"
-        @close="handleDeleteModal">
+        @close="handleDeleteModal"
+        @click="deleteLabel(label.labelId)">
         <template #header>구분을 삭제 하시겠습니까?</template>
         <template #body>삭제된 구분은 복구할 수 없습니다</template>
       </ModalView>
@@ -62,6 +63,7 @@
 </template>
 
 <script setup lang="ts">
+import { deleteLabelAdmin } from '@/api/admin'
 import type { LabelDataTypes } from '@/types/admin'
 import { getColor } from '@/utils/color'
 import { defineProps, ref } from 'vue'
@@ -80,16 +82,17 @@ const editValue = ref<LabelDataTypes>({
   labelId: 9999
 })
 
-const handleDeleteModal = () => {
-  isModalVisible.value = !isModalVisible.value
-}
+const handleDeleteModal = () => (isModalVisible.value = !isModalVisible.value)
 
-const handleColorModal = () => {
-  isColorModalVisible.value = !isColorModalVisible.value
-}
+const handleColorModal = () => (isColorModalVisible.value = !isColorModalVisible.value)
+
+const handleEdit = () => (isEdit.value = !isEdit.value)
 
-const handleEdit = () => {
-  isEdit.value = !isEdit.value
+const deleteLabel = async (id: number) => {
+  console.log('삭제중')
+  const res = await deleteLabelAdmin(id)
+  console.log(res)
+  handleDeleteModal()
 }
 
 const clickColor = (labelId: number) => {

From 3afbbc678046d4797a35d6505e73956961b968b4 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 16:11:19 +0900
Subject: [PATCH 060/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EA=B5=AC?=
 =?UTF-8?q?=EB=B6=84=20=EC=B6=94=EA=B0=80=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                                       | 6 ++++++
 src/components/task-management/LabelManagementLine.vue | 7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/api/admin.ts b/src/api/admin.ts
index c3d4d687..935fde83 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -1,3 +1,4 @@
+import type { NewLabelTypes } from '@/types/admin'
 import { axiosInstance } from '@/utils/axios'
 
 export const getLabelsAdmin = async () => {
@@ -9,3 +10,8 @@ export const deleteLabelAdmin = async (id: number) => {
   const response = await axiosInstance.delete(`/api/management/labels/${id}`)
   return response.data
 }
+
+export const postAddLabelAdmin = async (newLabel: NewLabelTypes) => {
+  const response = await axiosInstance.post('/api/management/labels', newLabel)
+  return response.data
+}
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index e5e2931d..238c93ed 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -18,6 +18,7 @@
             :is-open="isColorModalVisible"
             :label-id="label.labelId"
             :selectedLabelId="selectedLabelId"
+            :new-label="editValue"
             @close="handleColorModal" />
           <input
             v-if="isEdit && editValue.labelId === label.labelId"
@@ -79,7 +80,7 @@ const selectedLabelId = ref<number | null>(null)
 const editValue = ref<LabelDataTypes>({
   labelName: '',
   labelColor: '',
-  labelId: 9999
+  labelId: 0
 })
 
 const handleDeleteModal = () => (isModalVisible.value = !isModalVisible.value)
@@ -89,9 +90,7 @@ const handleColorModal = () => (isColorModalVisible.value = !isColorModalVisible
 const handleEdit = () => (isEdit.value = !isEdit.value)
 
 const deleteLabel = async (id: number) => {
-  console.log('삭제중')
-  const res = await deleteLabelAdmin(id)
-  console.log(res)
+  deleteLabelAdmin(id)
   handleDeleteModal()
 }
 

From 5fa9df87b9314d8f1c73112e2feeccb2c19b72be Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 17:01:38 +0900
Subject: [PATCH 061/180] =?UTF-8?q?:bug:=20[fix]=20:=20=EA=B5=AC=EB=B6=84?=
 =?UTF-8?q?=20=EC=82=AD=EC=A0=9C=20=EB=A7=88=EC=A7=80=EB=A7=89=20=EA=B0=92?=
 =?UTF-8?q?=EC=9D=B4=20=EB=90=98=EB=8A=94=20=EC=97=90=EB=9F=AC=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-management/LabelManagement.vue       | 46 +++++++++----------
 .../task-management/LabelManagementLine.vue   | 37 ++++++++-------
 2 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/components/task-management/LabelManagement.vue b/src/components/task-management/LabelManagement.vue
index af518dc2..480a58e0 100644
--- a/src/components/task-management/LabelManagement.vue
+++ b/src/components/task-management/LabelManagement.vue
@@ -27,14 +27,14 @@
             backgroundColor: getColor(newLabel.labelColor)?.fillColor
           }"
           class="w-4 h-4 rounded-full border-2 cursor-pointer pr-3"
-          @click="clickColor"></div>
+          @click="handleColor"></div>
         <ColorSelectModal
-          v-if="isColorModalVisible"
-          :is-open="isColorModalVisible"
-          :label-id="0"
-          :selected-label-id="0"
-          @close="closeColor" />
+          :is-open="isColorVisible"
+          :newLabel
+          @close="handleColor"
+          @updateColor="updateLabelColor" />
         <input
+          v-model="newLabel.labelName"
           type="text"
           placeholder="새로운 구분명을 입력"
           class="w-full flex focus:outline-none" />
@@ -46,22 +46,20 @@
           확인
         </button>
         <button
-          @click="cancelAddLabel"
+          @click="handleAdd"
           class="text-disabled w-[21px]">
           취소
         </button>
       </div>
     </div>
-    <div class="mt-4">
-      <CategoryList />
-    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { getLabelsAdmin } from '@/api/admin'
+import { getLabelsAdmin, postAddLabelAdmin } from '@/api/admin'
 import { plusIcon } from '@/constants/iconPath'
 import type { LabelDataTypes, NewLabelTypes } from '@/types/admin'
+import type { LabelColorTypes } from '@/types/common'
 import { getColor } from '@/utils/color'
 import { onMounted, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
@@ -71,32 +69,34 @@ import LabelManagementLine from './LabelManagementLine.vue'
 onMounted(async () => {
   const Labels = await getLabelsAdmin()
   labelData.value = Labels
-  console.log(Labels)
 })
 
 const labelData = ref<LabelDataTypes[]>([])
 
 const newLabel = ref<NewLabelTypes>({
-  labelName: '새로운 구분',
+  labelName: '',
   labelColor: 'RED'
 })
-const isColorModalVisible = ref(false)
+
+const isColorVisible = ref(false)
 const isAdd = ref(false)
 
-const addNewLabel = () => {
-  console.log(newLabel, '추가로직')
-  isAdd.value = false
+const handleAdd = () => {
+  isAdd.value = !isAdd.value
 }
 
-const cancelAddLabel = () => {
-  isAdd.value = false
+const handleColor = () => {
+  isColorVisible.value = !isColorVisible.value
 }
 
-const closeColor = () => {
-  isColorModalVisible.value = false
+const updateLabelColor = (color: LabelColorTypes) => {
+  newLabel.value.labelColor = color.colorEnum
 }
 
-const clickColor = () => {
-  isColorModalVisible.value = true
+const addNewLabel = () => {
+  if (newLabel.value.labelName !== '') {
+    postAddLabelAdmin(newLabel.value)
+    handleAdd()
+  }
 }
 </script>
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index 238c93ed..02c7afcb 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -15,15 +15,12 @@
             @click="isEdit && clickColor(label.labelId)"></div>
           <ColorSelectModal
             v-if="isColorModalVisible && editValue.labelId === label.labelId"
-            :is-open="isColorModalVisible"
-            :label-id="label.labelId"
-            :selectedLabelId="selectedLabelId"
+            :is-open="isColorModalVisible && editValue.labelId === label.labelId"
             :new-label="editValue"
             @close="handleColorModal" />
           <input
             v-if="isEdit && editValue.labelId === label.labelId"
             v-model="editValue.labelName"
-            type="text"
             placeholder="새로운 구분명을 입력"
             class="w-full flex focus:outline-none" />
           <p
@@ -40,7 +37,9 @@
           </button>
           <button
             @click="
-              isEdit && editValue.labelId === label.labelId ? handleEdit() : handleDeleteModal()
+              isEdit && editValue.labelId === label.labelId
+                ? handleEdit()
+                : handleDeleteModal(label.labelId)
             "
             :class="
               isEdit && editValue.labelId === label.labelId
@@ -51,15 +50,15 @@
           </button>
         </div>
       </div>
-      <ModalView
-        type="warningType"
-        :is-open="isModalVisible"
-        @close="handleDeleteModal"
-        @click="deleteLabel(label.labelId)">
-        <template #header>구분을 삭제 하시겠습니까?</template>
-        <template #body>삭제된 구분은 복구할 수 없습니다</template>
-      </ModalView>
     </div>
+    <ModalView
+      type="warningType"
+      :is-open="isModalVisible"
+      @close="handleDeleteModal(null)"
+      @click="deleteLabel(selectedLabelId || 0)">
+      <template #header>{{ selectedLabelId }}구분을 삭제 하시겠습니까?</template>
+      <template #body>삭제된 구분은 복구할 수 없습니다</template>
+    </ModalView>
   </div>
 </template>
 
@@ -77,21 +76,25 @@ const isModalVisible = ref(false)
 const isColorModalVisible = ref(false)
 const isEdit = ref(false)
 const selectedLabelId = ref<number | null>(null)
+
 const editValue = ref<LabelDataTypes>({
   labelName: '',
   labelColor: '',
   labelId: 0
 })
 
-const handleDeleteModal = () => (isModalVisible.value = !isModalVisible.value)
+const handleDeleteModal = (labelId: number | null) => {
+  isModalVisible.value = !isModalVisible.value
+  selectedLabelId.value = labelId
+}
 
 const handleColorModal = () => (isColorModalVisible.value = !isColorModalVisible.value)
 
 const handleEdit = () => (isEdit.value = !isEdit.value)
 
-const deleteLabel = async (id: number) => {
-  deleteLabelAdmin(id)
-  handleDeleteModal()
+const deleteLabel = async (labelId: number) => {
+  deleteLabelAdmin(labelId)
+  handleDeleteModal(0)
 }
 
 const clickColor = (labelId: number) => {

From 49693d131fbbcc8674adfdfb25c14409c0603f27 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 17:02:22 +0900
Subject: [PATCH 062/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=83=89?=
 =?UTF-8?q?=EC=83=81=20=ED=83=80=EC=9E=85=EC=97=90=20enum=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=B6=94=EA=B0=80=EB=A5=BC=20=ED=86=B5=ED=95=9C=20?=
 =?UTF-8?q?=EC=83=89=EA=B9=94=20=EB=B3=80=EA=B2=BD=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-management/ColorSelectModal.vue         | 13 +++++++------
 src/constants/common.ts                          | 16 ++++++++--------
 src/types/common.ts                              | 11 ++++++++---
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/components/task-management/ColorSelectModal.vue b/src/components/task-management/ColorSelectModal.vue
index 8534e05c..1679d10a 100644
--- a/src/components/task-management/ColorSelectModal.vue
+++ b/src/components/task-management/ColorSelectModal.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="isOpen && labelId === selectedLabelId"
+    v-if="isOpen"
     class="absolute top-7 left-3 w-[176px] h-[120px] p-4 flex flex-col z-50 shadow-custom rounded-lg bg-white gap-4"
     @click.self="closeModal">
     <div class="flex w-full justify-between">
@@ -16,7 +16,7 @@
         :key="color.fillColor"
         :style="{ borderColor: color.borderColor, backgroundColor: color.fillColor }"
         class="w-6 h-6 rounded-full border-[3px] cursor-pointer"
-        @click="updateColor(color.fillColor)"></div>
+        @click="updateColor(color)"></div>
     </div>
   </div>
 </template>
@@ -24,22 +24,23 @@
 <script setup lang="ts">
 import { COLOR_LIST } from '@/constants/common'
 import { closeIcon } from '@/constants/iconPath'
-import type { ColorSelectProps } from '@/types/common'
+import type { ColorSelectProps, LabelColorTypes } from '@/types/common'
 import { defineEmits, defineProps } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const props = defineProps<ColorSelectProps>()
+const { isOpen } = defineProps<ColorSelectProps>()
 
 const emit = defineEmits<{
   (e: 'close'): void
+  (e: 'updateColor', color: LabelColorTypes): void
 }>()
 
 const closeModal = () => {
   emit('close')
 }
 
-const updateColor = (color: string) => {
-  console.log(props.labelId, '로 색상 변경 로직', color)
+const updateColor = (color: LabelColorTypes) => {
+  emit('updateColor', color)
   emit('close')
 }
 </script>
diff --git a/src/constants/common.ts b/src/constants/common.ts
index 7253c5a2..07c8ee5b 100644
--- a/src/constants/common.ts
+++ b/src/constants/common.ts
@@ -27,12 +27,12 @@ export const ROLE_LIST = [
 ]
 
 export const COLOR_LIST = [
-  { borderColor: '#DC2626', fillColor: '#FEF2F2' },
-  { borderColor: '#FB923C', fillColor: '#FFF7ED' },
-  { borderColor: '#FACC15', fillColor: '#FEFCE8' },
-  { borderColor: '#22C55E', fillColor: '#F0FDF4' },
-  { borderColor: '#3B82F6', fillColor: '#EFF6FF' },
-  { borderColor: '#6366F1', fillColor: '#EEF2FF' },
-  { borderColor: '#8B5CF6', fillColor: '#F5F3FF' },
-  { borderColor: '#A1A1AA', fillColor: '#F4F4F5' }
+  { borderColor: '#DC2626', fillColor: '#FEF2F2', colorEnum: 'RED' },
+  { borderColor: '#FB923C', fillColor: '#FFF7ED', colorEnum: 'ORANGE' },
+  { borderColor: '#FACC15', fillColor: '#FEFCE8', colorEnum: 'YELLOW' },
+  { borderColor: '#22C55E', fillColor: '#F0FDF4', colorEnum: 'GREEN' },
+  { borderColor: '#3B82F6', fillColor: '#EFF6FF', colorEnum: 'BLUE' },
+  { borderColor: '#6366F1', fillColor: '#EEF2FF', colorEnum: 'INDIGO' },
+  { borderColor: '#8B5CF6', fillColor: '#F5F3FF', colorEnum: 'PURPLE' },
+  { borderColor: '#A1A1AA', fillColor: '#F4F4F5', colorEnum: 'GREY' }
 ]
diff --git a/src/types/common.ts b/src/types/common.ts
index 1d2a8435..566155d0 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -68,9 +68,8 @@ export interface FormCheckboxProps {
 }
 
 export interface ColorSelectProps {
-  labelId: number
-  selectedLabelId: number | null
   isOpen: boolean
+  newLabel: LabelDataTypes
 }
 
 export interface MainCategoryTypes {
@@ -96,7 +95,13 @@ export interface CategoryDropdownProps {
 }
 
 export interface LabelDataTypes {
-  labelId: number
+  labelId?: number
   labelName: string
   labelColor: string
 }
+
+export interface LabelColorTypes {
+  borderColor: string
+  fillColor: string
+  colorEnum: string
+}

From 14164a295b25329d28d91770909edcb5e0610d83 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 17:17:19 +0900
Subject: [PATCH 063/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EA=B5=AC?=
 =?UTF-8?q?=EB=B6=84=20=EC=88=98=EC=A0=95=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                                       | 10 +++++++++-
 src/components/task-management/LabelManagementLine.vue |  9 ++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/api/admin.ts b/src/api/admin.ts
index 935fde83..b08aaf88 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -1,4 +1,4 @@
-import type { NewLabelTypes } from '@/types/admin'
+import type { LabelDataTypes, NewLabelTypes } from '@/types/admin'
 import { axiosInstance } from '@/utils/axios'
 
 export const getLabelsAdmin = async () => {
@@ -15,3 +15,11 @@ export const postAddLabelAdmin = async (newLabel: NewLabelTypes) => {
   const response = await axiosInstance.post('/api/management/labels', newLabel)
   return response.data
 }
+
+export const patchLabelAdmin = async (editLabel: LabelDataTypes) => {
+  const response = await axiosInstance.patch(`/api/management/labels/${editLabel.labelId}`, {
+    labelName: editLabel.labelName,
+    labelColor: editLabel.labelColor
+  })
+  return response.data
+}
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index 02c7afcb..fb4c3d97 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -17,6 +17,7 @@
             v-if="isColorModalVisible && editValue.labelId === label.labelId"
             :is-open="isColorModalVisible && editValue.labelId === label.labelId"
             :new-label="editValue"
+            @update-color="updateLabelColor"
             @close="handleColorModal" />
           <input
             v-if="isEdit && editValue.labelId === label.labelId"
@@ -63,8 +64,9 @@
 </template>
 
 <script setup lang="ts">
-import { deleteLabelAdmin } from '@/api/admin'
+import { deleteLabelAdmin, patchLabelAdmin } from '@/api/admin'
 import type { LabelDataTypes } from '@/types/admin'
+import type { LabelColorTypes } from '@/types/common'
 import { getColor } from '@/utils/color'
 import { defineProps, ref } from 'vue'
 import ModalView from '../ModalView.vue'
@@ -107,7 +109,12 @@ const startEdit = (label: LabelDataTypes) => {
   editValue.value = label
 }
 
+const updateLabelColor = (color: LabelColorTypes) => {
+  editValue.value.labelColor = color.colorEnum
+}
+
 const finishEdit = () => {
   handleEdit()
+  patchLabelAdmin(editValue.value)
 }
 </script>

From 5eb6c51e2a01e5a54e411f6b184de7ff910b22b6 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 21:12:18 +0900
Subject: [PATCH 064/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=82=AD=EC=A0=9C=20=EC=A6=89=EA=B0=81=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-management/LabelManagement.vue       | 107 +++++++++---------
 .../task-management/LabelManagementLine.vue   |   8 +-
 2 files changed, 62 insertions(+), 53 deletions(-)

diff --git a/src/components/task-management/LabelManagement.vue b/src/components/task-management/LabelManagement.vue
index 480a58e0..5caabede 100644
--- a/src/components/task-management/LabelManagement.vue
+++ b/src/components/task-management/LabelManagement.vue
@@ -7,49 +7,51 @@
         <p>구분명</p>
       </div>
     </div>
-    <div class="flex w-full">
-      <LabelManagementLine :label-data="labelData" />
-    </div>
-    <div
-      v-if="!isAdd"
-      class="text-xs text-disabled gap-1 category-management-line justify-center cursor-pointer bg-white"
-      @click="isAdd = true">
-      <CommonIcons :name="plusIcon" />
-      <p>새 구분 추가</p>
-    </div>
-    <div
-      v-else
-      class="category-management-line justify-between bg-white">
-      <div class="flex w-full gap-7 items-center pl-3 relative">
-        <div
-          :style="{
-            borderColor: getColor(newLabel.labelColor)?.borderColor,
-            backgroundColor: getColor(newLabel.labelColor)?.fillColor
-          }"
-          class="w-4 h-4 rounded-full border-2 cursor-pointer pr-3"
-          @click="handleColor"></div>
-        <ColorSelectModal
-          :is-open="isColorVisible"
-          :newLabel
-          @close="handleColor"
-          @updateColor="updateLabelColor" />
-        <input
-          v-model="newLabel.labelName"
-          type="text"
-          placeholder="새로운 구분명을 입력"
-          class="w-full flex focus:outline-none" />
+    <div class="flex flex-col w-full max-h-44 overflow-y-auto">
+      <LabelManagementLine
+        :label-data="labelData"
+        @updateLabels="fetchLabels" />
+      <div
+        v-if="!isAdd"
+        class="w-full h-11 text-xs shrink-0 text-disabled gap-1 category-management-line justify-center cursor-pointer bg-white"
+        @click="isAdd = true">
+        <CommonIcons :name="plusIcon" />
+        새 구분 추가
       </div>
-      <div class="flex gap-2 text-xs font-bold">
-        <button
-          @click="addNewLabel"
-          class="text-primary1 w-[21px]">
-          확인
-        </button>
-        <button
-          @click="handleAdd"
-          class="text-disabled w-[21px]">
-          취소
-        </button>
+      <div
+        v-else
+        class="category-management-line justify-between bg-white shrink-0">
+        <div class="flex w-full gap-7 items-center pl-3 relative">
+          <div
+            :style="{
+              borderColor: getColor(newLabel.labelColor)?.borderColor,
+              backgroundColor: getColor(newLabel.labelColor)?.fillColor
+            }"
+            class="w-4 h-4 rounded-full border-2 cursor-pointer pr-3"
+            @click="handleColor"></div>
+          <ColorSelectModal
+            :is-open="isColorVisible"
+            :newLabel
+            @close="handleColor"
+            @updateColor="updateLabelColor" />
+          <input
+            v-model="newLabel.labelName"
+            type="text"
+            placeholder="새로운 구분명을 입력"
+            class="w-full flex focus:outline-none" />
+        </div>
+        <div class="flex gap-2 text-xs font-bold">
+          <button
+            @click="addNewLabel"
+            class="text-primary1 w-[21px]">
+            확인
+          </button>
+          <button
+            @click="handleAdd"
+            class="text-disabled w-[21px]">
+            취소
+          </button>
+        </div>
       </div>
     </div>
   </div>
@@ -66,21 +68,22 @@ import CommonIcons from '../common/CommonIcons.vue'
 import ColorSelectModal from './ColorSelectModal.vue'
 import LabelManagementLine from './LabelManagementLine.vue'
 
-onMounted(async () => {
-  const Labels = await getLabelsAdmin()
-  labelData.value = Labels
-})
-
 const labelData = ref<LabelDataTypes[]>([])
-
 const newLabel = ref<NewLabelTypes>({
   labelName: '',
   labelColor: 'RED'
 })
-
 const isColorVisible = ref(false)
 const isAdd = ref(false)
 
+const fetchLabels = async () => {
+  labelData.value = await getLabelsAdmin()
+}
+
+onMounted(async () => {
+  fetchLabels()
+})
+
 const handleAdd = () => {
   isAdd.value = !isAdd.value
 }
@@ -93,10 +96,12 @@ const updateLabelColor = (color: LabelColorTypes) => {
   newLabel.value.labelColor = color.colorEnum
 }
 
-const addNewLabel = () => {
+const addNewLabel = async () => {
   if (newLabel.value.labelName !== '') {
-    postAddLabelAdmin(newLabel.value)
+    await postAddLabelAdmin(newLabel.value)
+    newLabel.value.labelName = ''
     handleAdd()
+    fetchLabels()
   }
 }
 </script>
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index fb4c3d97..3d3517b7 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -57,7 +57,7 @@
       :is-open="isModalVisible"
       @close="handleDeleteModal(null)"
       @click="deleteLabel(selectedLabelId || 0)">
-      <template #header>{{ selectedLabelId }}구분을 삭제 하시겠습니까?</template>
+      <template #header>구분을 삭제 하시겠습니까?</template>
       <template #body>삭제된 구분은 복구할 수 없습니다</template>
     </ModalView>
   </div>
@@ -85,6 +85,8 @@ const editValue = ref<LabelDataTypes>({
   labelId: 0
 })
 
+const emit = defineEmits(['updateLabels'])
+
 const handleDeleteModal = (labelId: number | null) => {
   isModalVisible.value = !isModalVisible.value
   selectedLabelId.value = labelId
@@ -95,7 +97,8 @@ const handleColorModal = () => (isColorModalVisible.value = !isColorModalVisible
 const handleEdit = () => (isEdit.value = !isEdit.value)
 
 const deleteLabel = async (labelId: number) => {
-  deleteLabelAdmin(labelId)
+  await deleteLabelAdmin(labelId)
+  emit('updateLabels')
   handleDeleteModal(0)
 }
 
@@ -116,5 +119,6 @@ const updateLabelColor = (color: LabelColorTypes) => {
 const finishEdit = () => {
   handleEdit()
   patchLabelAdmin(editValue.value)
+  emit('updateLabels')
 }
 </script>

From d175bebd5d1809e288630dbad047db75e26adcec Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 21:40:51 +0900
Subject: [PATCH 065/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20axios=20?=
 =?UTF-8?q?=EC=9D=B8=EC=8A=A4=ED=84=B4=EC=8A=A4=20=EB=B6=88=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=20=EC=BD=98=EC=86=94=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/axios.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/axios.ts b/src/utils/axios.ts
index ae769d70..2531c53c 100644
--- a/src/utils/axios.ts
+++ b/src/utils/axios.ts
@@ -11,7 +11,6 @@ const setInterceptors = (instance: AxiosInstance) => {
         if (token) {
           config.headers.Authorization = `Bearer ${token}`
         }
-        console.log(token, '으로 요청 중')
       }
       return config
     },

From c821f0f0b4509daacfca3179b3b031c3260c4a39 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 00:56:14 +0900
Subject: [PATCH 066/180] =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=9A=94=EC=B2=AD?=
 =?UTF-8?q?=20=EA=B8=B0=EB=A1=9D=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=20API=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index 78d4b07e..a95ea458 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -33,6 +33,15 @@ import ListPagination from '../lists/ListPagination.vue'
 import NoContent from '../lists/NoContent.vue'
 import MyRequestListBar from './MyRequestListBar.vue'
 import MyRequestListCard from './MyRequestListCard.vue'
+import ListPagination from '../lists/ListPagination.vue'
+import ListContainer from '../lists/ListContainer.vue'
+import { useRequestParamsStore } from '@/stores/params'
+import axiosInstance from '@/utils/axios'
+import { useQuery } from '@tanstack/vue-query'
+import { useParseParams } from '../hooks/useParseParams'
+import type { MyRequestResponse } from '@/types/user'
+import { computed } from 'vue'
+import NoContent from '../lists/NoContent.vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {

From 165ffc5fad4b03e3b73bed7c6f3328bd5699b410 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 1 Feb 2025 17:55:52 +0900
Subject: [PATCH 067/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=ED=8F=BC?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=9A=94=EC=B2=AD=20api=20?=
 =?UTF-8?q?=ED=98=95=EC=8B=9D=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/axios.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/axios.ts b/src/utils/axios.ts
index 2531c53c..ae769d70 100644
--- a/src/utils/axios.ts
+++ b/src/utils/axios.ts
@@ -11,6 +11,7 @@ const setInterceptors = (instance: AxiosInstance) => {
         if (token) {
           config.headers.Authorization = `Bearer ${token}`
         }
+        console.log(token, '으로 요청 중')
       }
       return config
     },

From 74598f8b5ab6ed607f14ff3b0ac144a0530e6cef Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 1 Feb 2025 20:03:17 +0900
Subject: [PATCH 068/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20prop?=
 =?UTF-8?q?=EB=8C=80=EC=8B=A0=20=EC=A7=81=EC=A0=91=20=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=A4=EA=B8=B0,=20=ED=8C=8C=EC=9D=BC=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=EA=B0=92=20=EB=B0=B0=EC=97=B4=EB=A1=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 23 +++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index f6e56e6a..4c990021 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -36,10 +36,10 @@
 </template>
 
 <script lang="ts" setup>
-import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
-import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { onMounted, ref, watch } from 'vue'
+import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
+import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
+import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
@@ -86,7 +86,7 @@ const handleCancel = () => {
 const handleSubmit = async () => {
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value?.id,
+    categoryId: 1,
     title: title.value,
     description: description.value
   }
@@ -95,6 +95,7 @@ const handleSubmit = async () => {
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
 
   formData.append('taskInfo', newBlob)
+<<<<<<< HEAD
 
   if (file.value && file.value.length > 0) {
     file.value.forEach(f => formData.append('attachment', f))
@@ -105,5 +106,19 @@ const handleSubmit = async () => {
   } catch (error) {
     console.error('요청 실패:', error)
   }
+=======
+  if (file.value && file.value.length > 0) {
+    file.value.forEach(f => {
+      formData.append('attachment', f)
+    })
+  }
+  console.log(Object.fromEntries(formData), '응답')
+  console.log(file.value, '파일 현황 응답')
+  try {
+    const res = await postTaskRequest(formData)
+  } catch (error) {
+    console.error('요청 실패:', error)
+  }
+>>>>>>> 61df8a1 (:recycle: [refactor] : prop대신 직접 가져오기, 파일 초기값 배열로)
 }
 </script>

From c92bafa2ba440fb1c22423e8fc6ce8626a91c958 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 02:19:43 +0900
Subject: [PATCH 069/180] =?UTF-8?q?:recycle:=20[refactor]=20:=201,2?=
 =?UTF-8?q?=EC=B0=A8=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=84=A0=EC=96=B8=20=EB=B0=8F=20=EC=9C=84=EC=B9=98?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/common.ts | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/types/common.ts b/src/types/common.ts
index 566155d0..b316789b 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -105,3 +105,30 @@ export interface LabelColorTypes {
   fillColor: string
   colorEnum: string
 }
+
+export interface LabelDataTypes {
+  labelId: number
+  labelName: string
+  labelColor: string
+}
+
+export interface MainCategoryTypes {
+  id: number
+  name: string
+  code: string
+}
+
+export interface SubCategoryTypes {
+  id: number
+  mainCategoryId: number
+  name: string
+  code: string
+}
+
+export interface CategoryDropdownProps {
+  placeholderText: string
+  options: MainCategoryTypes[] | SubCategoryTypes[]
+  labelName: string
+  modelValue: string
+  isLabel?: boolean
+}

From 4f9f5ef011ace3f3511f0d7334568cc77e41b899 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:07:11 +0900
Subject: [PATCH 070/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=EC=9A=A9=20=EB=93=9C=EB=A1=AD?=
 =?UTF-8?q?=EB=8B=A4=EC=9A=B4=20=EA=B0=9C=EB=B3=84=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/CategoryDropDown.vue | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 7f377299..609ebdae 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -7,18 +7,13 @@
         class="text-red-1">
         *
       </p>
-      <p
-        v-if="isInvalidateState === 'category'"
-        class="text-red-1">
-        카테고리를 선택해주세요
-      </p>
     </div>
     <div class="relative flex text-base">
       <div
         class="flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black"
         @click="toggleDropdown">
         <p :class="{ 'text-disabled': !modelValue?.name }">
-          {{ modelValue?.name ?? labelName + '를 선택해주세요' }}
+          {{ modelValue?.name ?? placeholderText }}
         </p>
         <CommonIcons
           :name="dropdownIcon"
@@ -42,14 +37,11 @@
 <script lang="ts" setup>
 import { dropdownIcon } from '@/constants/iconPath'
 import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { computed, ref } from 'vue'
+import { ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
+const { placeholderText, options, labelName, modelValue, isLabel, isDisabled } =
   defineProps<CategoryDropdownProps>()
-
-const isInvalidateState = computed(() => isInvalidate)
-
 const emit = defineEmits(['update:modelValue'])
 const dropdownOpen = ref(false)
 

From ed8a3c82c0427475ad980b853ef9f3ffb35233e6 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:11:02 +0900
Subject: [PATCH 071/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=9D=EC=84=B1=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 27 ++++++---------------
 src/types/common.ts                         |  3 ++-
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 4c990021..b6c8bbd5 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -4,13 +4,13 @@
       v-model="category1"
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
-      :isInvalidate="isInvalidate"
+      :placeholderText="'1차 카테고리를 선택해주세요'"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
-      :is-invalidate="isInvalidate"
+      :placeholderText="'2차 카테고리를 선택해주세요'"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
@@ -36,10 +36,11 @@
 </template>
 
 <script lang="ts" setup>
+import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
 import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
-import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
-import { ref } from 'vue'
+import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
+import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
@@ -86,7 +87,7 @@ const handleCancel = () => {
 const handleSubmit = async () => {
   const formData = new FormData()
   const taskInfo = {
-    categoryId: 1,
+    categoryId: category2.value?.id,
     title: title.value,
     description: description.value
   }
@@ -95,30 +96,16 @@ const handleSubmit = async () => {
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
 
   formData.append('taskInfo', newBlob)
-<<<<<<< HEAD
-
-  if (file.value && file.value.length > 0) {
-    file.value.forEach(f => formData.append('attachment', f))
-  }
-  try {
-    const res = await postTaskRequest(formData)
-    console.error('요청 성공:', res)
-  } catch (error) {
-    console.error('요청 실패:', error)
-  }
-=======
   if (file.value && file.value.length > 0) {
     file.value.forEach(f => {
       formData.append('attachment', f)
     })
   }
-  console.log(Object.fromEntries(formData), '응답')
-  console.log(file.value, '파일 현황 응답')
   try {
     const res = await postTaskRequest(formData)
+    console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
   }
->>>>>>> 61df8a1 (:recycle: [refactor] : prop대신 직접 가져오기, 파일 초기값 배열로)
 }
 </script>
diff --git a/src/types/common.ts b/src/types/common.ts
index b316789b..b74a73f8 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -129,6 +129,7 @@ export interface CategoryDropdownProps {
   placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: string
+  modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
+  isDisabled?: boolean
 }

From 2745ffdac15895087b73f619b806ca4bdd0eb8d8 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 11:51:43 +0900
Subject: [PATCH 072/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EB=88=84=EB=9D=BD=EC=8B=9C=20=EA=B2=BD=EA=B3=A0=20?=
 =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/CategoryDropDown.vue | 12 ++++++++++--
 src/components/request-task/RequestTask.vue      | 15 ++++++++++++---
 src/types/common.ts                              |  1 +
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 609ebdae..8ab78003 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -7,6 +7,11 @@
         class="text-red-1">
         *
       </p>
+      <p
+        v-if="isInvalidateState === 'category'"
+        class="text-red-1">
+        카테고리를 선택해주세요
+      </p>
     </div>
     <div class="relative flex text-base">
       <div
@@ -37,11 +42,14 @@
 <script lang="ts" setup>
 import { dropdownIcon } from '@/constants/iconPath'
 import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { placeholderText, options, labelName, modelValue, isLabel, isDisabled } =
+const { placeholderText, options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
   defineProps<CategoryDropdownProps>()
+
+const isInvalidateState = computed(() => isInvalidate)
+
 const emit = defineEmits(['update:modelValue'])
 const dropdownOpen = ref(false)
 
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index b6c8bbd5..22fddf5f 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -5,16 +5,18 @@
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
       :placeholderText="'1차 카테고리를 선택해주세요'"
+      :isInvalidate="isInvalidate"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
       :placeholderText="'2차 카테고리를 선택해주세요'"
+      :is-invalidate="isInvalidate"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
-      :placeholderText="'제목을 입력해주세요'"
+      :placeholderText="TITLE_PLACEHOLDER"
       :label-name="'제목'"
       :is-invalidate="isInvalidate" />
     <RequestTaskTextArea
@@ -55,7 +57,6 @@ const title = ref('')
 const description = ref('')
 const file = ref(null as File[] | null)
 const isInvalidate = ref('')
-const isModalVisible = ref(false)
 
 const mainCategoryArr = ref<MainCategoryTypes[]>([])
 const subCategoryArr = ref<SubCategoryTypes[]>([])
@@ -85,9 +86,17 @@ const handleCancel = () => {
 }
 
 const handleSubmit = async () => {
+  if (!category1.value || !category2.value) {
+    isInvalidate.value = 'category'
+    console.log(isInvalidate.value, '변경됨')
+    return
+  } else if (!title.value) {
+    isInvalidate.value = 'input'
+    return
+  }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value?.id,
+    categoryId: category2.value.id,
     title: title.value,
     description: description.value
   }
diff --git a/src/types/common.ts b/src/types/common.ts
index b74a73f8..98346976 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -132,4 +132,5 @@ export interface CategoryDropdownProps {
   modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
   isDisabled?: boolean
+  isInvalidate?: string
 }

From b9ef1b0ff596192094bd90c0703827fca8ddc78f Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:03:33 +0900
Subject: [PATCH 073/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=99=84=EB=A3=8C=20=ED=9B=84=20=EB=AA=A8=EB=8B=AC?=
 =?UTF-8?q?=20=EB=B0=8F=20=EB=9D=BC=EC=9A=B0=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 22fddf5f..397725e8 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -45,6 +45,7 @@ import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
+import ModalView from '../ModalView.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
 import RequestTaskFileInput from './RequestTaskFileInput.vue'
 import RequestTaskInput from './RequestTaskInput.vue'
@@ -57,6 +58,7 @@ const title = ref('')
 const description = ref('')
 const file = ref(null as File[] | null)
 const isInvalidate = ref('')
+const isModalVisible = ref(false)
 
 const mainCategoryArr = ref<MainCategoryTypes[]>([])
 const subCategoryArr = ref<SubCategoryTypes[]>([])
@@ -112,6 +114,7 @@ const handleSubmit = async () => {
   }
   try {
     const res = await postTaskRequest(formData)
+    isModalVisible.value = true
     console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)

From 989bb7a7dae1c4aa758cf4c320fd2b140544c53b Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:09:51 +0900
Subject: [PATCH 074/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20axios=20in?=
 =?UTF-8?q?stance=20=EA=B0=9D=EC=B2=B4=20=EB=B6=84=EB=A6=AC=ED=95=B4?=
 =?UTF-8?q?=EC=84=9C=20import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index a95ea458..c310c969 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -26,22 +26,13 @@ import { useRequestParamsStore } from '@/stores/params'
 import type { MyRequestResponse } from '@/types/user'
 import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
-import { computed, ref, watch } from 'vue'
+import { ref, watch } from 'vue'
 import { useParseParams } from '../hooks/useParseParams'
 import ListContainer from '../lists/ListContainer.vue'
 import ListPagination from '../lists/ListPagination.vue'
 import NoContent from '../lists/NoContent.vue'
 import MyRequestListBar from './MyRequestListBar.vue'
 import MyRequestListCard from './MyRequestListCard.vue'
-import ListPagination from '../lists/ListPagination.vue'
-import ListContainer from '../lists/ListContainer.vue'
-import { useRequestParamsStore } from '@/stores/params'
-import axiosInstance from '@/utils/axios'
-import { useQuery } from '@tanstack/vue-query'
-import { useParseParams } from '../hooks/useParseParams'
-import type { MyRequestResponse } from '@/types/user'
-import { computed } from 'vue'
-import NoContent from '../lists/NoContent.vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {

From 7640af734d23d918abcc0dbb509b7740c059a791 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:18:58 +0900
Subject: [PATCH 075/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EB=93=9C=EB=A1=AD=EB=8B=A4?=
 =?UTF-8?q?=EC=9A=B4=20placeholder=EC=97=86=EC=9D=B4,=20input=20placeholde?=
 =?UTF-8?q?r=20=EC=83=81=EC=88=98=ED=99=94=20=EC=B7=A8=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/CategoryDropDown.vue | 4 ++--
 src/components/request-task/RequestTask.vue      | 9 ++-------
 src/types/common.ts                              | 1 -
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 8ab78003..7f377299 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -18,7 +18,7 @@
         class="flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black"
         @click="toggleDropdown">
         <p :class="{ 'text-disabled': !modelValue?.name }">
-          {{ modelValue?.name ?? placeholderText }}
+          {{ modelValue?.name ?? labelName + '를 선택해주세요' }}
         </p>
         <CommonIcons
           :name="dropdownIcon"
@@ -45,7 +45,7 @@ import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from
 import { computed, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { placeholderText, options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
+const { options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
   defineProps<CategoryDropdownProps>()
 
 const isInvalidateState = computed(() => isInvalidate)
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 397725e8..6c5b942a 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -4,19 +4,17 @@
       v-model="category1"
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
-      :placeholderText="'1차 카테고리를 선택해주세요'"
       :isInvalidate="isInvalidate"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
-      :placeholderText="'2차 카테고리를 선택해주세요'"
       :is-invalidate="isInvalidate"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
-      :placeholderText="TITLE_PLACEHOLDER"
+      :placeholderText="'제목을 입력해주세요'"
       :label-name="'제목'"
       :is-invalidate="isInvalidate" />
     <RequestTaskTextArea
@@ -40,7 +38,6 @@
 <script lang="ts" setup>
 import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
-import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
 import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
@@ -108,9 +105,7 @@ const handleSubmit = async () => {
 
   formData.append('taskInfo', newBlob)
   if (file.value && file.value.length > 0) {
-    file.value.forEach(f => {
-      formData.append('attachment', f)
-    })
+    file.value.forEach(f => formData.append('attachment', f))
   }
   try {
     const res = await postTaskRequest(formData)
diff --git a/src/types/common.ts b/src/types/common.ts
index 98346976..1c911b87 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -126,7 +126,6 @@ export interface SubCategoryTypes {
 }
 
 export interface CategoryDropdownProps {
-  placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
   modelValue: MainCategoryTypes | SubCategoryTypes | null

From b7a4689aea6178c5bc3cbba2b1e707d1bafdd35c Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 01:22:48 +0900
Subject: [PATCH 076/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20test=20api?=
 =?UTF-8?q?=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/test.ts | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 src/api/test.ts

diff --git a/src/api/test.ts b/src/api/test.ts
deleted file mode 100644
index bb6f3d0b..00000000
--- a/src/api/test.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { axiosInstance } from '../utils/axios'
-
-export const getNotifications = async () => {
-  const response = await axiosInstance.get('/api/notifications?page=0&size=5')
-  return response.data
-}
-
-export const postLogin = async (nickname: string, password: string) => {
-  const response = await axiosInstance.post('/api/auths/login', { nickname, password })
-  return response.data
-}
-
-export const patchReadNotification = async (notificationId: number) => {
-  const response = await axiosInstance.patch(`/api/notification/${notificationId}`)
-  return response.data
-}

From 2bfed9d061747e68ef9c54897ad354cc8e69e832 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 01:41:08 +0900
Subject: [PATCH 077/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20scrollbar-?=
 =?UTF-8?q?hide=20=EB=AF=B8=EC=A0=81=EC=9A=A9=20=EB=B6=80=EB=B6=84=20?=
 =?UTF-8?q?=EC=9E=AC=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tailwind.config.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tailwind.config.js b/tailwind.config.js
index 1c82d585..1d44248d 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,4 +1,6 @@
 /** @type {import('tailwindcss').Config} */
+import scrollbarHide from 'tailwind-scrollbar-hide'
+
 export default {
   content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}'],
   safelist: [
@@ -77,5 +79,5 @@ export default {
       }
     }
   },
-  plugins: [import('tailwind-scrollbar-hide')]
+  plugins: [scrollbarHide]
 }

From 9d4e1170e81f1f62de1988936ac6d2b4133e8d77 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 01:41:34 +0900
Subject: [PATCH 078/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=20=EA=B4=80=EB=A6=AC=20=EC=B9=B4=ED=85=8C=EA=B3=A0?=
 =?UTF-8?q?=EB=A6=AC=20=EC=A0=84=EC=B2=B4=20=EC=A1=B0=ED=9A=8C=20=EC=97=B0?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.ts                               |  5 +++++
 .../task-management/CategoryManagement.vue      | 17 ++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/api/common.ts b/src/api/common.ts
index a0d4fd4e..ade690e6 100644
--- a/src/api/common.ts
+++ b/src/api/common.ts
@@ -9,3 +9,8 @@ export const getSubCategory = async () => {
   const response = await axiosInstance.get('/api/sub-category')
   return response.data
 }
+
+export const getAllCategory = async () => {
+  const response = await axiosInstance.get('/api/category')
+  return response.data
+}
diff --git a/src/components/task-management/CategoryManagement.vue b/src/components/task-management/CategoryManagement.vue
index 9a4c5d73..17eec4cc 100644
--- a/src/components/task-management/CategoryManagement.vue
+++ b/src/components/task-management/CategoryManagement.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="flex flex-col w-full min-h-[480px] border border-border-1 rounded-lg bg-background-1">
+  <div
+    class="flex flex-col w-full min-h-[480px] max-h-[480px] border border-border-1 rounded-lg bg-background-1 overflow-y-auto scrollbar-hide">
     <div class="flex w-full">
       <div class="task-management-title rounded-tl-lg">
         <p>고유코드</p>
@@ -12,12 +13,12 @@
       </div>
     </div>
     <div class="flex w-full">
-      <CategoryLine :categories="mockCategoryAllData.categories" />
+      <CategoryLine :categories="data" />
       <div class="bg-border-1 w-0.5"></div>
-      <CategoryLineSub :categories="mockCategoryAllData.categories" />
+      <CategoryLineSub :categories="data" />
     </div>
     <div
-      class="text-xs text-disabled font-bold gap-1 category-management-line justify-center cursor-pointer bg-white"
+      class="text-xs text-disabled font-bold gap-1 shrink-0 category-management-line justify-center cursor-pointer bg-white"
       @click="MovetoAddCategory">
       <CommonIcons :name="plusIcon" />
       <p>새 1차 카테고리 추가</p>
@@ -29,8 +30,9 @@
 </template>
 
 <script setup lang="ts">
+import { getAllCategory } from '@/api/common'
 import { plusIcon } from '@/constants/iconPath'
-import { mockCategoryAllData } from '@/datas/taskmanagement'
+import { useQuery } from '@tanstack/vue-query'
 import { useRouter } from 'vue-router'
 import CommonIcons from '../common/CommonIcons.vue'
 import CategoryLine from './CategoryLine.vue'
@@ -38,6 +40,11 @@ import CategoryLineSub from './CategoryLineSub.vue'
 
 const router = useRouter()
 
+const { data } = useQuery({
+  queryKey: ['category'],
+  queryFn: getAllCategory
+})
+
 const MovetoAddCategory = () => {
   router.push('/category-first')
 }

From d43c391bf518e151a6d4dc3dc60dc302aefce58c Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 02:33:17 +0900
Subject: [PATCH 079/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EB=B6=88?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=20mock=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/datas/taskmanagement.ts | 50 -------------------------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 src/datas/taskmanagement.ts

diff --git a/src/datas/taskmanagement.ts b/src/datas/taskmanagement.ts
deleted file mode 100644
index 822c2eab..00000000
--- a/src/datas/taskmanagement.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import type { CategoryAllData } from '@/types/admin'
-
-export const mockCategoryAllData: CategoryAllData = {
-  categories: [
-    {
-      id: 1,
-      name: 'VM',
-      code: 'VM001',
-      subCategory: [
-        {
-          id: 1,
-          mainCategoryId: 1,
-          name: 'VM 생성',
-          code: 'VM_CR'
-        },
-        {
-          id: 2,
-          mainCategoryId: 1,
-          name: 'VM 수정',
-          code: 'VM_UD'
-        },
-        {
-          id: 3,
-          mainCategoryId: 1,
-          name: 'VM 삭제',
-          code: 'VM_DE'
-        }
-      ]
-    },
-    {
-      id: 2,
-      name: 'NFS',
-      code: 'NFS001',
-      subCategory: [
-        {
-          id: 4,
-          mainCategoryId: 2,
-          name: 'NFS 생성',
-          code: 'NFS_CR'
-        },
-        {
-          id: 5,
-          mainCategoryId: 2,
-          name: 'NFS 수정',
-          code: 'NFS_UD'
-        }
-      ]
-    }
-  ]
-}

From fe77efa99b50d24455f2d334a7c48ce005f15b47 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 02:33:32 +0900
Subject: [PATCH 080/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=82=AD=EC=A0=9C=20api=20?=
 =?UTF-8?q?=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                              |  5 +++
 .../task-management/CategoryLine.vue          | 24 ++++++++++----
 .../task-management/CategoryLineSub.vue       | 32 ++++++++++++-------
 3 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/src/api/admin.ts b/src/api/admin.ts
index b08aaf88..5a952967 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -23,3 +23,8 @@ export const patchLabelAdmin = async (editLabel: LabelDataTypes) => {
   })
   return response.data
 }
+
+export const deleteCategoryAdmin = async (id: number) => {
+  const response = await axiosInstance.delete(`/api/managements/categories/${id}`)
+  return response.data
+}
diff --git a/src/components/task-management/CategoryLine.vue b/src/components/task-management/CategoryLine.vue
index c2457361..c2a2fe4e 100644
--- a/src/components/task-management/CategoryLine.vue
+++ b/src/components/task-management/CategoryLine.vue
@@ -22,7 +22,7 @@
               수정
             </button>
             <button
-              @click="handleDelete(main.id)"
+              @click="openModal(main.id)"
               class="text-red-1">
               삭제
             </button>
@@ -36,7 +36,8 @@
     <ModalView
       type="warningType"
       :is-open="isModalVisible"
-      @close="handleCancel()">
+      @click="handleDelete(selectedCategoryId)"
+      @close="handleModal">
       <template #header>카테고리를 삭제 하시겠습니까?</template>
       <template #body>삭제된 카테고리는 복구할 수 없습니다</template>
     </ModalView>
@@ -44,6 +45,7 @@
 </template>
 
 <script setup lang="ts">
+import { deleteCategoryAdmin } from '@/api/admin'
 import type { CategoryAllData } from '@/types/admin'
 import { defineProps, ref } from 'vue'
 import { useRouter } from 'vue-router'
@@ -53,13 +55,21 @@ const { categories } = defineProps<CategoryAllData>()
 const router = useRouter()
 
 const isModalVisible = ref(false)
+const selectedCategoryId = ref<number | null>(null)
 
-const handleCancel = () => {
-  isModalVisible.value = false
+const handleModal = () => {
+  isModalVisible.value = !isModalVisible.value
 }
 
-const handleDelete = (id: number) => {
-  isModalVisible.value = true
-  console.log(id, '삭제로직')
+const openModal = (id: number) => {
+  selectedCategoryId.value = id
+  handleModal()
+}
+
+const handleDelete = async (id: number | null) => {
+  if (id !== null) {
+    await deleteCategoryAdmin(id)
+    handleModal()
+  }
 }
 </script>
diff --git a/src/components/task-management/CategoryLineSub.vue b/src/components/task-management/CategoryLineSub.vue
index 747947bc..cf8910d9 100644
--- a/src/components/task-management/CategoryLineSub.vue
+++ b/src/components/task-management/CategoryLineSub.vue
@@ -20,12 +20,20 @@
               수정
             </button>
             <button
-              @click="handleDelete"
+              @click="openModal(sub.id)"
               class="text-red-1">
               삭제
             </button>
           </div>
         </div>
+        <ModalView
+          type="warningType"
+          :is-open="isModalVisible && selectedId === sub.id"
+          @click="deleteCategory(sub.id)"
+          @close="closeModal">
+          <template #header>카테고리를 삭제 하시겠습니까?</template>
+          <template #body>삭제된 카테고리는 복구할 수 없습니다</template>
+        </ModalView>
       </div>
       <div
         class="category-management-line gap-1 justify-center cursor-pointer bg-white"
@@ -35,16 +43,10 @@
       </div>
     </div>
   </div>
-  <ModalView
-    type="warningType"
-    :is-open="isModalVisible"
-    @close="handleCancel()">
-    <template #header>카테고리를 삭제 하시겠습니까?</template>
-    <template #body>삭제된 카테고리는 복구할 수 없습니다</template>
-  </ModalView>
 </template>
 
 <script setup lang="ts">
+import { deleteCategoryAdmin } from '@/api/admin'
 import { plusIcon } from '@/constants/iconPath'
 import type { CategoryAllData } from '@/types/admin'
 import { defineProps, ref } from 'vue'
@@ -56,13 +58,21 @@ const { categories } = defineProps<CategoryAllData>()
 const router = useRouter()
 
 const isModalVisible = ref(false)
+const selectedId = ref<number | null>(null)
 
-const handleCancel = () => {
+const openModal = (id: number) => {
+  selectedId.value = id
+  isModalVisible.value = true
+}
+
+const closeModal = () => {
   isModalVisible.value = false
+  selectedId.value = null
 }
 
-const handleDelete = () => {
-  isModalVisible.value = true
+const deleteCategory = async (id: number) => {
+  await deleteCategoryAdmin(id)
+  closeModal()
 }
 
 const MovetoAddSubCategory = () => {

From e7323ee5a3a3af07cc47098e94177d1a4b57f262 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 09:50:38 +0900
Subject: [PATCH 081/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=ED=9B=84=20=EC=B5=9C=EC=8B=A0=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-management/LabelManagementLine.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index 3d3517b7..d954c18d 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -116,9 +116,9 @@ const updateLabelColor = (color: LabelColorTypes) => {
   editValue.value.labelColor = color.colorEnum
 }
 
-const finishEdit = () => {
+const finishEdit = async () => {
   handleEdit()
-  patchLabelAdmin(editValue.value)
+  await patchLabelAdmin(editValue.value)
   emit('updateLabels')
 }
 </script>

From 06b1e42c7922bc771105f9642153195fd3c6852e Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 11:50:44 +0900
Subject: [PATCH 082/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=82=AD=EC=A0=9C=20=ED=9B=84=20?=
 =?UTF-8?q?=EC=B5=9C=EC=8B=A0=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-management/CategoryLineSub.vue | 3 +++
 src/components/task-management/LabelManagement.vue | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/task-management/CategoryLineSub.vue b/src/components/task-management/CategoryLineSub.vue
index cf8910d9..c121ff91 100644
--- a/src/components/task-management/CategoryLineSub.vue
+++ b/src/components/task-management/CategoryLineSub.vue
@@ -49,6 +49,7 @@
 import { deleteCategoryAdmin } from '@/api/admin'
 import { plusIcon } from '@/constants/iconPath'
 import type { CategoryAllData } from '@/types/admin'
+import { useQueryClient } from '@tanstack/vue-query'
 import { defineProps, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import ModalView from '../ModalView.vue'
@@ -59,6 +60,7 @@ const router = useRouter()
 
 const isModalVisible = ref(false)
 const selectedId = ref<number | null>(null)
+const queryClient = useQueryClient()
 
 const openModal = (id: number) => {
   selectedId.value = id
@@ -72,6 +74,7 @@ const closeModal = () => {
 
 const deleteCategory = async (id: number) => {
   await deleteCategoryAdmin(id)
+  queryClient.invalidateQueries({ queryKey: ['category'] })
   closeModal()
 }
 
diff --git a/src/components/task-management/LabelManagement.vue b/src/components/task-management/LabelManagement.vue
index 5caabede..e5921789 100644
--- a/src/components/task-management/LabelManagement.vue
+++ b/src/components/task-management/LabelManagement.vue
@@ -7,7 +7,7 @@
         <p>구분명</p>
       </div>
     </div>
-    <div class="flex flex-col w-full max-h-44 overflow-y-auto">
+    <div class="flex flex-col w-full max-h-[210px] overflow-y-auto">
       <LabelManagementLine
         :label-data="labelData"
         @updateLabels="fetchLabels" />

From ccbc3faf24356c8397c731120e2206d274e72a98 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 13:43:20 +0900
Subject: [PATCH 083/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EA=B5=AC?=
 =?UTF-8?q?=EB=B6=84=20=EC=83=89=EC=83=81=20=EB=B3=B4=EC=97=AC=EC=A7=80?=
 =?UTF-8?q?=EB=8A=94=20=EB=B2=94=EC=9C=84=20=EC=A6=9D=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-management/ColorSelectModal.vue | 2 +-
 src/components/task-management/LabelManagement.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/task-management/ColorSelectModal.vue b/src/components/task-management/ColorSelectModal.vue
index 1679d10a..814d57c9 100644
--- a/src/components/task-management/ColorSelectModal.vue
+++ b/src/components/task-management/ColorSelectModal.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     v-if="isOpen"
-    class="absolute top-7 left-3 w-[176px] h-[120px] p-4 flex flex-col z-50 shadow-custom rounded-lg bg-white gap-4"
+    class="absolute top-7 left-3 w-[176px] h-[120px] p-4 flex flex-col !z-50 shadow-custom rounded-lg bg-white gap-4 import"
     @click.self="closeModal">
     <div class="flex w-full justify-between">
       <p class="text-xs font-bold text-body">색상 선택</p>
diff --git a/src/components/task-management/LabelManagement.vue b/src/components/task-management/LabelManagement.vue
index e5921789..771f512d 100644
--- a/src/components/task-management/LabelManagement.vue
+++ b/src/components/task-management/LabelManagement.vue
@@ -7,7 +7,7 @@
         <p>구분명</p>
       </div>
     </div>
-    <div class="flex flex-col w-full max-h-[210px] overflow-y-auto">
+    <div class="flex flex-col w-full shrink-0 overflow-y-auto pb-8">
       <LabelManagementLine
         :label-data="labelData"
         @updateLabels="fetchLabels" />

From b3f94c0a2d0a1df98407e20d1d74b92803469fd8 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 14:05:27 +0900
Subject: [PATCH 084/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EB=82=B4=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EB=88=8C=EB=A0=80=EC=9D=84=20=EB=95=8C=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=EC=A0=95=EB=B3=B4=20+=20isManager=20pinia?=
 =?UTF-8?q?=ED=86=B5=ED=95=B4=20=EA=B0=80=EC=A0=B8=EC=98=A4=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../my-request/MyRequestListCard.vue          | 16 +++++-
 src/components/task-detail/TaskDetail.vue     | 50 +++++++++++--------
 .../task-detail/TaskDetailTopBar.vue          |  2 +-
 src/types/user.ts                             |  2 +-
 4 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/src/components/my-request/MyRequestListCard.vue b/src/components/my-request/MyRequestListCard.vue
index 2f277aaf..9d838b34 100644
--- a/src/components/my-request/MyRequestListCard.vue
+++ b/src/components/my-request/MyRequestListCard.vue
@@ -2,6 +2,7 @@
   <div class="list-card">
     <ListCardTab
       v-for="tab in myRequestTabList"
+      @click="handleModal(info.taskId)"
       :key="tab.content"
       :content="tab.content"
       :width="tab.width"
@@ -9,15 +10,28 @@
       :profile-img="tab.profileImg"
       :is-status="tab.isStatus" />
   </div>
+  <TaskDetail
+    v-if="selectedID"
+    :is-approved="info.taskStatus !== 'REQUESTED'"
+    :selected-id="selectedID"
+    :close-task-detail="() => handleModal(null)" />
 </template>
 
 <script setup lang="ts">
 import type { ListCardProps } from '@/types/common'
-import ListCardTab from '../lists/ListCardTab.vue'
 import type { MyRequestListData } from '@/types/user'
 import { formatDate } from '@/utils/date'
+import { ref } from 'vue'
+import ListCardTab from '../lists/ListCardTab.vue'
+import TaskDetail from '../task-detail/TaskDetail.vue'
 
 const { info } = defineProps<{ info: MyRequestListData }>()
+const selectedID = ref<number | null>(null)
+
+const handleModal = (id: number | null) => {
+  selectedID.value = id
+}
+
 const myRequestTabList: ListCardProps[] = [
   { content: info.taskCode, width: 120, isTextXs: true },
   { content: formatDate(info.requestedAt), width: 80 },
diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue
index edce187f..1f998439 100644
--- a/src/components/task-detail/TaskDetail.vue
+++ b/src/components/task-detail/TaskDetail.vue
@@ -1,36 +1,46 @@
 <template>
-  <div
-    class="flex flex-col overflow-y-auto rounded-lg w-full max-w-[1200px] min-w-[1024px] bg-white p-6">
-    <TaskDetailTopBar
-      :is-manager="isManager"
-      :is-approved="isApproved"
-      :close-task-detail="closeTaskDetail" />
-    <div class="w-full flex gap-6">
-      <div class="w-full h-[718px] flex flex-col gap-y-8 overflow-y-auto scrollbar-hide">
-        <TaskDetailLeft :task-detail="DUMMY_TASK_DETAIL" />
-        <div class="w-full border-border-1 border"></div>
-        <TaskDetailHistory
-          :history="DUMMY_TASK_DETAIL_HISTORY"
-          :is-approved="false"
-          :is-manager="false" />
+  <div class="fixed inset-0 bg-black bg-opacity-15 flex justify-center items-center z-50">
+    <div
+      class="flex flex-col overflow-y-auto rounded-lg w-full max-w-[1200px] min-w-[1024px] bg-white p-6">
+      {{ selectedId }} 요청 번호
+      <TaskDetailTopBar
+        :is-manager="role === 'ROLE_MANAGER'"
+        :is-approved="isApproved"
+        :close-task-detail="closeTaskDetail" />
+      <div class="w-full flex gap-6">
+        <div class="w-full h-[718px] flex flex-col gap-y-8 overflow-y-auto scrollbar-hide">
+          <TaskDetailLeft :task-detail="DUMMY_TASK_DETAIL" />
+          <div class="w-full border-border-1 border"></div>
+          <TaskDetailHistory
+            :history="DUMMY_TASK_DETAIL_HISTORY"
+            :is-approved="false"
+            :is-manager="false" />
+        </div>
+        <div class="w-[1px] bg-border-1"></div>
+        <TaskDetailRight
+          :task-detail="DUMMY_TASK_DETAIL"
+          :is-manager="true" />
       </div>
-      <div class="w-[1px] bg-border-1"></div>
-      <TaskDetailRight
-        :task-detail="DUMMY_TASK_DETAIL"
-        :is-manager="true" />
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
 import * as taskDetailData from '@/datas/taskdetail'
+import { useMemberStore } from '@/stores/member'
 import type { TaskDetailProps } from '@/types/user'
+import { storeToRefs } from 'pinia'
+import { computed } from 'vue'
 import TaskDetailHistory from './TaskDetailHistory.vue'
 import TaskDetailLeft from './TaskDetailLeft.vue'
 import TaskDetailRight from './TaskDetailRight.vue'
 import TaskDetailTopBar from './TaskDetailTopBar.vue'
 
-const { DUMMY_TASK_DETAIL_HISTORY, DUMMY_TASK_DETAIL } = taskDetailData
+const memberStore = useMemberStore()
+const { info } = storeToRefs(memberStore)
+const role = computed(() => info.value.memberRole)
+console.log(role.value, '역할')
 
-const { isManager, isApproved, closeTaskDetail } = defineProps<TaskDetailProps>()
+const { DUMMY_TASK_DETAIL_HISTORY, DUMMY_TASK_DETAIL } = taskDetailData
+const { isApproved, closeTaskDetail, selectedId } = defineProps<TaskDetailProps>()
 </script>
diff --git a/src/components/task-detail/TaskDetailTopBar.vue b/src/components/task-detail/TaskDetailTopBar.vue
index 27327e3e..78570883 100644
--- a/src/components/task-detail/TaskDetailTopBar.vue
+++ b/src/components/task-detail/TaskDetailTopBar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="w-full flex justify-between items-center">
+  <div class="w-full flex justify-between items-center bg-white">
     <div class="flex gap-4 text-sm font-bold pb-6">
       <div
         v-if="!isManager && isApproved"
diff --git a/src/types/user.ts b/src/types/user.ts
index b77be02e..cabf8366 100644
--- a/src/types/user.ts
+++ b/src/types/user.ts
@@ -97,8 +97,8 @@ export interface TaskDetailHistoryProps {
 }
 
 export interface TaskDetailProps {
-  isManager: boolean
   isApproved: boolean
+  selectedId: number
   closeTaskDetail: () => void
 }
 export interface ManagerInfoTypes {

From 0f3e93556340529e3a706aefac0ad41c7fbecccb Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 14:53:37 +0900
Subject: [PATCH 085/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=81=EC=84=B8=EC=A0=95=EB=B3=B4=20=EA=B0=80?=
 =?UTF-8?q?=EC=A0=B8=EC=98=A4=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.ts                               |  5 +++
 src/components/task-detail/TaskDetail.vue     | 35 +++++++++----------
 src/components/task-detail/TaskDetailLeft.vue | 16 ++++-----
 .../task-detail/TaskDetailRight.vue           | 34 ++++++++++--------
 .../task-detail/TaskDetailTopBar.vue          | 10 ++++--
 src/types/manager.ts                          |  1 -
 src/types/user.ts                             |  1 -
 7 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/src/api/user.ts b/src/api/user.ts
index 86bbbbf4..582284e0 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -4,3 +4,8 @@ export const postTaskRequest = async (formdata: FormData) => {
   const response = await formDataAxiosInstance.post('/api/tasks', formdata)
   return response.data
 }
+
+export const getTaskDetailUser = async (id: number) => {
+  const response = await formDataAxiosInstance.get(`/api/tasks/${id}/requests/details`)
+  return response.data
+}
diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue
index 1f998439..676f1646 100644
--- a/src/components/task-detail/TaskDetail.vue
+++ b/src/components/task-detail/TaskDetail.vue
@@ -4,43 +4,42 @@
       class="flex flex-col overflow-y-auto rounded-lg w-full max-w-[1200px] min-w-[1024px] bg-white p-6">
       {{ selectedId }} 요청 번호
       <TaskDetailTopBar
-        :is-manager="role === 'ROLE_MANAGER'"
         :is-approved="isApproved"
         :close-task-detail="closeTaskDetail" />
-      <div class="w-full flex gap-6">
+      <div
+        class="w-full flex gap-6"
+        v-if="data">
         <div class="w-full h-[718px] flex flex-col gap-y-8 overflow-y-auto scrollbar-hide">
-          <TaskDetailLeft :task-detail="DUMMY_TASK_DETAIL" />
+          <TaskDetailLeft :data="data" />
           <div class="w-full border-border-1 border"></div>
           <TaskDetailHistory
             :history="DUMMY_TASK_DETAIL_HISTORY"
-            :is-approved="false"
-            :is-manager="false" />
+            :is-approved="false" />
         </div>
         <div class="w-[1px] bg-border-1"></div>
-        <TaskDetailRight
-          :task-detail="DUMMY_TASK_DETAIL"
-          :is-manager="true" />
+        <TaskDetailRight :data />
       </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
+import { getTaskDetailUser } from '@/api/user'
 import * as taskDetailData from '@/datas/taskdetail'
-import { useMemberStore } from '@/stores/member'
-import type { TaskDetailProps } from '@/types/user'
-import { storeToRefs } from 'pinia'
-import { computed } from 'vue'
+import type { TaskDetailDatas, TaskDetailProps } from '@/types/user'
+import { useQuery } from '@tanstack/vue-query'
 import TaskDetailHistory from './TaskDetailHistory.vue'
 import TaskDetailLeft from './TaskDetailLeft.vue'
 import TaskDetailRight from './TaskDetailRight.vue'
 import TaskDetailTopBar from './TaskDetailTopBar.vue'
 
-const memberStore = useMemberStore()
-const { info } = storeToRefs(memberStore)
-const role = computed(() => info.value.memberRole)
-console.log(role.value, '역할')
-
-const { DUMMY_TASK_DETAIL_HISTORY, DUMMY_TASK_DETAIL } = taskDetailData
+const { DUMMY_TASK_DETAIL_HISTORY } = taskDetailData
 const { isApproved, closeTaskDetail, selectedId } = defineProps<TaskDetailProps>()
+
+const { data } = useQuery<TaskDetailDatas>({
+  queryKey: ['taskDetailUser', selectedId],
+  queryFn: () => getTaskDetailUser(selectedId)
+})
+
+console.log(data, 'data')
 </script>
diff --git a/src/components/task-detail/TaskDetailLeft.vue b/src/components/task-detail/TaskDetailLeft.vue
index b1a7b60e..5cbe6c0e 100644
--- a/src/components/task-detail/TaskDetailLeft.vue
+++ b/src/components/task-detail/TaskDetailLeft.vue
@@ -2,23 +2,23 @@
   <div class="flex-grow flex flex-col gap-6">
     <div>
       <p class="task-detail">1차 카테고리</p>
-      <p>{{ taskDetail.mainCategoryName }}</p>
+      <p>{{ data.mainCategoryName }}</p>
     </div>
     <div>
       <p class="task-detail">2차 카테고리</p>
-      <p>{{ taskDetail.categoryName }}</p>
+      <p>{{ data.categoryName }}</p>
     </div>
     <div>
       <p class="task-detail">제목</p>
-      <p>{{ taskDetail.title }}</p>
+      <p>{{ data.title }}</p>
     </div>
     <div>
       <p class="task-detail">부가 설명</p>
-      <p class="px-6 py-4 bg-primary2 rounded-lg font-normal">{{ taskDetail.description }}</p>
+      <p class="px-6 py-4 bg-primary2 rounded-lg font-normal">{{ data.description }}</p>
     </div>
     <div>
       <p class="task-detail">첨부 파일</p>
-      <TaskDetailFiles :files="taskDetail.attachmentResponse" />
+      <TaskDetailFiles :files="data.attachmentResponse" />
     </div>
   </div>
 </template>
@@ -26,7 +26,7 @@
 <script setup lang="ts">
 import type { TaskDetailDatas } from '@/types/user'
 import TaskDetailFiles from './TaskDetailFiles.vue'
-const { taskDetail } = defineProps<{ taskDetail: TaskDetailDatas }>()
+const { data } = defineProps<{
+  data: TaskDetailDatas
+}>()
 </script>
-
-<style scoped></style>
diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index a61e60f3..1870a782 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -2,30 +2,30 @@
   <div class="w-60 flex flex-col gap-y-6 pb-6 text-black">
     <div>
       <p class="task-detail">ID</p>
-      <p class="text-sm text-black">{{ taskDetail.taskId || '-' }}</p>
+      <p class="text-sm text-black">{{ data.taskId || '-' }}</p>
     </div>
     <div>
       <p class="task-detail">요청일</p>
-      <p class="text-sm text-black">{{ formatDate(taskDetail.requestedAt) }}</p>
+      <p class="text-sm text-black">{{ formatDate(data.requestedAt) }}</p>
     </div>
     <div>
       <p class="task-detail">종료일</p>
-      <p class="text-sm text-black">{{ formatDate(taskDetail.finishedAt) || '-' }}</p>
+      <p class="text-sm text-black">{{ formatDate(data.finishedAt) || '-' }}</p>
     </div>
     <div>
       <p class="task-detail">상태</p>
       <div class="w-fit">
-        <TaskStatus :status="taskDetail.taskStatus" />
+        <TaskStatus :status="data.taskStatus" />
       </div>
     </div>
     <div>
       <p class="task-detail">요청자</p>
       <div class="flex gap-2">
         <img
-          :src="taskDetail.requesterImageUrl"
+          :src="data.requesterImageUrl"
           class="rounded-full overflow-hidden w-5 h-5"
           alt="requesterImg" />
-        <p class="text-sm text-black">{{ taskDetail.requesterNickName }}</p>
+        <p class="text-sm text-black">{{ data.requesterNickName }}</p>
       </div>
     </div>
     <div>
@@ -40,17 +40,17 @@
         v-else
         class="flex gap-2">
         <img
-          v-if="taskDetail.processorImageUrl"
-          :src="taskDetail.processorImageUrl"
+          v-if="data.processorImageUrl"
+          :src="data.processorImageUrl"
           class="rounded-full overflow-hidden w-5 h-5"
           alt="processorImg" />
-        <p class="text-sm text-black">{{ taskDetail.processorNickName || '-' }}</p>
+        <p class="text-sm text-black">{{ data.processorNickName || '-' }}</p>
       </div>
     </div>
     <div v-if="isManager">
       <p class="task-detail">마감기한</p>
       <div class="w-full flex justify-between items-center">
-        <p class="text-sm text-black">{{ taskDetail.dueDate || '-' }}까지</p>
+        <p class="text-sm text-black">{{ data.dueDate || '-' }}까지</p>
         <p class="text-primary1 text-xs font-bold">변경</p>
       </div>
       <p class="text-red-1 text-xs font-bold">3일 전</p>
@@ -60,21 +60,27 @@
       <TaskDetailLabelDropdown
         v-model="labeling"
         :options="DUMMY_TASK_LABELS"
-        :processor="taskDetail.labelName" />
+        :processor="data.labelName" />
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
 import { DUMMY_PROCESSOR, DUMMY_REQUEST_PROCESSORS, DUMMY_TASK_LABELS } from '@/datas/taskdetail'
-import type { TaskDetailRightProps } from '@/types/user'
+import { useMemberStore } from '@/stores/member'
+import type { TaskDetailDatas } from '@/types/user'
 import { formatDate } from '@/utils/date'
-import { defineProps, ref } from 'vue'
+import { storeToRefs } from 'pinia'
+import { computed, defineProps, ref } from 'vue'
 import TaskStatus from '../TaskStatus.vue'
 import TaskDetailDropdown from './TaskDetailDropdown.vue'
 import TaskDetailLabelDropdown from './TaskDetailLabelDropdown.vue'
 
-const { taskDetail, isManager } = defineProps<TaskDetailRightProps>()
+const memberStore = useMemberStore()
+const { info } = storeToRefs(memberStore)
+const isManager = computed(() => info.value.memberRole === 'ROLE_MANAGER')
+
+const { data } = defineProps<{ data: TaskDetailDatas }>()
 
 const processor = ref(DUMMY_PROCESSOR.nickName)
 const labeling = ref(DUMMY_TASK_LABELS[0].labelName)
diff --git a/src/components/task-detail/TaskDetailTopBar.vue b/src/components/task-detail/TaskDetailTopBar.vue
index 78570883..d1c3cbf5 100644
--- a/src/components/task-detail/TaskDetailTopBar.vue
+++ b/src/components/task-detail/TaskDetailTopBar.vue
@@ -51,11 +51,17 @@
 
 <script setup lang="ts">
 import { cancelIcon, closeIcon, modificationIcon, reRequestIcon } from '@/constants/iconPath'
+import { useMemberStore } from '@/stores/member'
 import type { TaskDetailTopBarProps } from '@/types/manager'
-import { ref } from 'vue'
+import { storeToRefs } from 'pinia'
+import { computed, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 import ModalView from '../ModalView.vue'
 
+const memberStore = useMemberStore()
+const { info } = storeToRefs(memberStore)
+const isManager = computed(() => info.value.memberRole === 'ROLE_MANAGER')
+
 const isModalOpen = ref({
   cancel: false,
   approve: false
@@ -73,7 +79,7 @@ const ApproveTask = () => {
   toggleModal('approve')
 }
 
-const { isManager, isApproved, closeTaskDetail } = defineProps<TaskDetailTopBarProps>()
+const { isApproved, closeTaskDetail } = defineProps<TaskDetailTopBarProps>()
 </script>
 
 <style scoped></style>
diff --git a/src/types/manager.ts b/src/types/manager.ts
index 24a61661..854e752c 100644
--- a/src/types/manager.ts
+++ b/src/types/manager.ts
@@ -100,7 +100,6 @@ export interface MyTaskDetailDatas {
 }
 
 export interface TaskDetailTopBarProps {
-  isManager: boolean
   isApproved: boolean
   closeTaskDetail: () => void
 }
diff --git a/src/types/user.ts b/src/types/user.ts
index cabf8366..6e852f7f 100644
--- a/src/types/user.ts
+++ b/src/types/user.ts
@@ -115,7 +115,6 @@ export interface TaskDetailDropdownProps {
 
 export interface TaskDetailRightProps {
   taskDetail: TaskDetailDatas
-  isManager: boolean
 }
 
 export interface TaskDetailLabelDropdownProps {

From 4b8c716ac91b96ea06dc1942fba8572bdfbcc47f Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 15:20:11 +0900
Subject: [PATCH 086/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=9E=90=EC=9D=98=20=EA=B6=8C=ED=95=9C=EC=97=90=20?=
 =?UTF-8?q?=EB=A7=9E=EB=8A=94=20=EB=B3=B4=EC=97=AC=EC=A3=BC=EA=B8=B0,=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=8B=A4=EC=9A=B4,=20=EC=9A=A9=ED=96=98?=
 =?UTF-8?q?=20=ED=91=9C=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetail.vue      |  3 ---
 src/components/task-detail/TaskDetailFiles.vue | 11 ++++++++---
 src/components/task-detail/TaskDetailLeft.vue  |  2 +-
 src/components/task-detail/TaskDetailRight.vue | 14 +++++++-------
 src/types/user.ts                              |  2 +-
 src/utils/date.ts                              |  3 ++-
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue
index 676f1646..2b6039e6 100644
--- a/src/components/task-detail/TaskDetail.vue
+++ b/src/components/task-detail/TaskDetail.vue
@@ -2,7 +2,6 @@
   <div class="fixed inset-0 bg-black bg-opacity-15 flex justify-center items-center z-50">
     <div
       class="flex flex-col overflow-y-auto rounded-lg w-full max-w-[1200px] min-w-[1024px] bg-white p-6">
-      {{ selectedId }} 요청 번호
       <TaskDetailTopBar
         :is-approved="isApproved"
         :close-task-detail="closeTaskDetail" />
@@ -40,6 +39,4 @@ const { data } = useQuery<TaskDetailDatas>({
   queryKey: ['taskDetailUser', selectedId],
   queryFn: () => getTaskDetailUser(selectedId)
 })
-
-console.log(data, 'data')
 </script>
diff --git a/src/components/task-detail/TaskDetailFiles.vue b/src/components/task-detail/TaskDetailFiles.vue
index bbc8959d..480b9eb1 100644
--- a/src/components/task-detail/TaskDetailFiles.vue
+++ b/src/components/task-detail/TaskDetailFiles.vue
@@ -18,7 +18,7 @@
         class="flex w-full justify-between items-center h-8 text-xs border-b border-b-border-2 text-black px-4 shrink-0">
         <p class="flex truncate mr-3">{{ file.fileName }}</p>
         <div class="flex gap-6">
-          <p class="w-[60px]">{{ formatFileSize(Number(file.fileSize)) }}</p>
+          <p class="w-[60px]">{{ file.fileSize }}</p>
           <p class="w-36">{{ new Date().toLocaleString() }}</p>
           <div class="w-10 flex items-center justify-center cursor-pointer">
             <CommonIcons
@@ -35,11 +35,16 @@
 <script lang="ts" setup>
 import { downloadIcon } from '@/constants/iconPath'
 import type { AttachmentResponse } from '@/types/user'
-import { formatFileSize } from '@/utils/unit'
 import CommonIcons from '../common/CommonIcons.vue'
 
 const { files } = defineProps<{ files: AttachmentResponse[] }>()
+
 const downloadFile = (file: AttachmentResponse) => {
-  console.log('향후 파일 다운 로직 추가', file)
+  const link = document.createElement('a')
+  link.href = file.fileUrl
+  link.download = file.fileName
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
 }
 </script>
diff --git a/src/components/task-detail/TaskDetailLeft.vue b/src/components/task-detail/TaskDetailLeft.vue
index 5cbe6c0e..0f466524 100644
--- a/src/components/task-detail/TaskDetailLeft.vue
+++ b/src/components/task-detail/TaskDetailLeft.vue
@@ -18,7 +18,7 @@
     </div>
     <div>
       <p class="task-detail">첨부 파일</p>
-      <TaskDetailFiles :files="data.attachmentResponse" />
+      <TaskDetailFiles :files="data.attachmentResponses" />
     </div>
   </div>
 </template>
diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index 1870a782..614db82f 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -10,7 +10,9 @@
     </div>
     <div>
       <p class="task-detail">종료일</p>
-      <p class="text-sm text-black">{{ formatDate(data.finishedAt) || '-' }}</p>
+      <p class="text-sm text-black">
+        {{ formatDate(data.finishedAt) || '-' }}
+      </p>
     </div>
     <div>
       <p class="task-detail">상태</p>
@@ -22,7 +24,7 @@
       <p class="task-detail">요청자</p>
       <div class="flex gap-2">
         <img
-          :src="data.requesterImageUrl"
+          :src="data.requesterImageUrl || '/images/mockProfile.jpg'"
           class="rounded-full overflow-hidden w-5 h-5"
           alt="requesterImg" />
         <p class="text-sm text-black">{{ data.requesterNickName }}</p>
@@ -30,7 +32,7 @@
     </div>
     <div>
       <p class="task-detail">처리자</p>
-      <div v-if="isManager">
+      <div v-if="isManager && data.processorNickName">
         <TaskDetailDropdown
           v-model="processor"
           :options="DUMMY_REQUEST_PROCESSORS"
@@ -47,7 +49,7 @@
         <p class="text-sm text-black">{{ data.processorNickName || '-' }}</p>
       </div>
     </div>
-    <div v-if="isManager">
+    <div v-if="isManager && data.dueDate">
       <p class="task-detail">마감기한</p>
       <div class="w-full flex justify-between items-center">
         <p class="text-sm text-black">{{ data.dueDate || '-' }}까지</p>
@@ -55,7 +57,7 @@
       </div>
       <p class="text-red-1 text-xs font-bold">3일 전</p>
     </div>
-    <div v-if="isManager">
+    <div v-if="isManager && data.labelName">
       <p class="task-detail">구분</p>
       <TaskDetailLabelDropdown
         v-model="labeling"
@@ -79,11 +81,9 @@ import TaskDetailLabelDropdown from './TaskDetailLabelDropdown.vue'
 const memberStore = useMemberStore()
 const { info } = storeToRefs(memberStore)
 const isManager = computed(() => info.value.memberRole === 'ROLE_MANAGER')
-
 const { data } = defineProps<{ data: TaskDetailDatas }>()
 
 const processor = ref(DUMMY_PROCESSOR.nickName)
 const labeling = ref(DUMMY_TASK_LABELS[0].labelName)
 </script>
 
-<script setup lang="ts"></script>
diff --git a/src/types/user.ts b/src/types/user.ts
index 6e852f7f..97688607 100644
--- a/src/types/user.ts
+++ b/src/types/user.ts
@@ -61,7 +61,7 @@ export interface TaskDetailDatas {
   categoryName: string
   title: string
   description: string
-  attachmentResponse: AttachmentResponse[]
+  attachmentResponses: AttachmentResponse[]
   dueDate?: string
   labelName?: string
 }
diff --git a/src/utils/date.ts b/src/utils/date.ts
index a8aabe8b..ea13a64d 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -1,4 +1,5 @@
-export const formatDate = (dateString: string) => {
+export const formatDate = (dateString: string | null) => {
+  if (dateString === null) return null
   const date = new Date(dateString)
 
   const year = date.getFullYear()

From 8d1b849bb209109ea11d04d0f1516f4807364e14 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 15:22:15 +0900
Subject: [PATCH 087/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=9E=90=EC=9D=98=20=EA=B6=8C=ED=95=9C=EC=97=90=20?=
 =?UTF-8?q?=EB=A7=9E=EB=8A=94=20top=20bar=20+=20icon=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailTopBar.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/task-detail/TaskDetailTopBar.vue b/src/components/task-detail/TaskDetailTopBar.vue
index d1c3cbf5..f92730d7 100644
--- a/src/components/task-detail/TaskDetailTopBar.vue
+++ b/src/components/task-detail/TaskDetailTopBar.vue
@@ -17,7 +17,7 @@
         @click="ApproveTask"
         v-if="isManager && !isApproved"
         class="flex gap-1 items-center cursor-pointer">
-        <CommonIcons :name="modificationIcon" />
+        <CommonIcons :name="approveIcon" />
         <p class="text-primary1">요청 승인</p>
       </div>
       <div
@@ -50,7 +50,7 @@
 </template>
 
 <script setup lang="ts">
-import { cancelIcon, closeIcon, modificationIcon, reRequestIcon } from '@/constants/iconPath'
+import { approveIcon, cancelIcon, closeIcon, modificationIcon, reRequestIcon } from '@/constants/iconPath'
 import { useMemberStore } from '@/stores/member'
 import type { TaskDetailTopBarProps } from '@/types/manager'
 import { storeToRefs } from 'pinia'

From 185bf24d4723d36eec2d2ee6811f393016f81031 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 15:31:15 +0900
Subject: [PATCH 088/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=EA=B0=80=20=EC=95=84=EB=8B=8C=20=EB=8B=B4?=
 =?UTF-8?q?=EB=8B=B9=EC=9E=90=EC=9D=98=20=EA=B2=BD=EC=9A=B0=20=EB=B3=B4?=
 =?UTF-8?q?=EC=9D=B4=EB=8A=94=20=EC=9E=A5=EB=A9=B4=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailRight.vue | 10 +++++-----
 src/utils/date.ts                              |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index 614db82f..6a29766f 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -11,7 +11,7 @@
     <div>
       <p class="task-detail">종료일</p>
       <p class="text-sm text-black">
-        {{ formatDate(data.finishedAt) || '-' }}
+        {{ (data.finishedAt && formatDate(data.finishedAt)) || '-' }}
       </p>
     </div>
     <div>
@@ -42,8 +42,7 @@
         v-else
         class="flex gap-2">
         <img
-          v-if="data.processorImageUrl"
-          :src="data.processorImageUrl"
+          :src="data.processorImageUrl || '/images/mockProfile.jpg'"
           class="rounded-full overflow-hidden w-5 h-5"
           alt="processorImg" />
         <p class="text-sm text-black">{{ data.processorNickName || '-' }}</p>
@@ -80,10 +79,11 @@ import TaskDetailLabelDropdown from './TaskDetailLabelDropdown.vue'
 
 const memberStore = useMemberStore()
 const { info } = storeToRefs(memberStore)
-const isManager = computed(() => info.value.memberRole === 'ROLE_MANAGER')
+const isManager = computed(() => info.value.memberName === data.processorNickName)
+
 const { data } = defineProps<{ data: TaskDetailDatas }>()
+console.log(data, '가져온 데이터')
 
 const processor = ref(DUMMY_PROCESSOR.nickName)
 const labeling = ref(DUMMY_TASK_LABELS[0].labelName)
 </script>
-
diff --git a/src/utils/date.ts b/src/utils/date.ts
index ea13a64d..a8aabe8b 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -1,5 +1,4 @@
-export const formatDate = (dateString: string | null) => {
-  if (dateString === null) return null
+export const formatDate = (dateString: string) => {
   const date = new Date(dateString)
 
   const year = date.getFullYear()

From afef79f2b60b1e30b29a25c989b6605c39841955 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 16:04:33 +0900
Subject: [PATCH 089/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=ED=83=80=EC=9E=85=20=ED=86=B5?=
 =?UTF-8?q?=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request-task/CategoryDropDown.vue         |  4 +--
 src/components/request-task/RequestTask.vue   | 12 ++++-----
 src/constants/admin.ts                        |  6 ++---
 src/types/admin.ts                            | 11 ++------
 src/types/common.ts                           | 26 +++++++------------
 5 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 7f377299..030e3e62 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -41,7 +41,7 @@
 
 <script lang="ts" setup>
 import { dropdownIcon } from '@/constants/iconPath'
-import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from '@/types/common'
+import type { Category, CategoryDropdownProps } from '@/types/common'
 import { computed, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
@@ -58,7 +58,7 @@ const toggleDropdown = () => {
   dropdownOpen.value = !dropdownOpen.value
 }
 
-const selectOption = (option: MainCategoryTypes | SubCategoryTypes) => {
+const selectOption = (option: Category) => {
   emit('update:modelValue', option)
   dropdownOpen.value = false
 }
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 6c5b942a..1b9a4570 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -38,7 +38,7 @@
 <script lang="ts" setup>
 import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
-import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
+import type { Category, SubCategory } from '@/types/common'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
@@ -48,8 +48,8 @@ import RequestTaskFileInput from './RequestTaskFileInput.vue'
 import RequestTaskInput from './RequestTaskInput.vue'
 import RequestTaskTextArea from './RequestTaskTextArea.vue'
 
-const category1 = ref<MainCategoryTypes | null>(null)
-const category2 = ref<MainCategoryTypes | null>(null)
+const category1 = ref<Category | null>(null)
+const category2 = ref<Category | null>(null)
 
 const title = ref('')
 const description = ref('')
@@ -57,9 +57,9 @@ const file = ref(null as File[] | null)
 const isInvalidate = ref('')
 const isModalVisible = ref(false)
 
-const mainCategoryArr = ref<MainCategoryTypes[]>([])
-const subCategoryArr = ref<SubCategoryTypes[]>([])
-const afterSubCategoryArr = ref<SubCategoryTypes[]>([])
+const mainCategoryArr = ref<Category[]>([])
+const subCategoryArr = ref<SubCategory[]>([])
+const afterSubCategoryArr = ref<SubCategory[]>([])
 
 onMounted(async () => {
   mainCategoryArr.value = await getMainCategory()
diff --git a/src/constants/admin.ts b/src/constants/admin.ts
index 15fef027..4a848952 100644
--- a/src/constants/admin.ts
+++ b/src/constants/admin.ts
@@ -1,4 +1,4 @@
-import type { ListBarTabProps, MainCategoryTypes, Option, SubCategoryTypes } from '@/types/common'
+import type { Category, ListBarTabProps, Option, SubCategory } from '@/types/common'
 
 export const MEMBER_MANAGEMENT_LIST_BAR_TAB: ListBarTabProps[] = [
   { content: '이름', width: 60 },
@@ -36,13 +36,13 @@ export const LOGS_LIST_BAR_TAB: ListBarTabProps[] = [
 
 import type { RoleTypes, RoleTypesEnum, UserRegistrationProps } from '@/types/admin'
 
-export const CATEGORY_FIRST_ADD: MainCategoryTypes = {
+export const CATEGORY_FIRST_ADD: Category = {
   name: '',
   code: '',
   id: 0
 }
 
-export const CATEGORY_SECOND_ADD: SubCategoryTypes = {
+export const CATEGORY_SECOND_ADD: SubCategory = {
   name: '',
   mainCategoryId: 0,
   code: '',
diff --git a/src/types/admin.ts b/src/types/admin.ts
index d27418c6..08589211 100644
--- a/src/types/admin.ts
+++ b/src/types/admin.ts
@@ -1,4 +1,4 @@
-import type { Role, SubCategoryTypes } from './common'
+import type { Category, Role } from './common'
 
 export interface MemberManagementListData {
   memberId: number
@@ -42,15 +42,8 @@ export interface CategoryLineProps {
   mainCategoryId?: string
 }
 
-export interface categoriesTypes {
-  id: number
-  name: string
-  code: string
-  subCategory: SubCategoryTypes[]
-}
-
 export interface CategoryAllData {
-  categories: categoriesTypes[]
+  categories: Category[]
 }
 
 export interface LabelDataTypes {
diff --git a/src/types/common.ts b/src/types/common.ts
index 1c911b87..45b715d1 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -16,7 +16,14 @@ export interface Category {
   id: number
   name: string
   code: string
-  subCategory?: { id: number; mainCategoryId: number; name: string; code: string }[]
+  subCategory?: SubCategory[]
+}
+
+export interface SubCategory {
+  id: number
+  mainCategoryId: number
+  name: string
+  code: string
 }
 
 export interface FilterCategoryProps {
@@ -72,23 +79,10 @@ export interface ColorSelectProps {
   newLabel: LabelDataTypes
 }
 
-export interface MainCategoryTypes {
-  id: number
-  name: string
-  code: string
-}
-
-export interface SubCategoryTypes {
-  id: number
-  mainCategoryId: number
-  name: string
-  code: string
-}
-
 export interface CategoryDropdownProps {
-  options: MainCategoryTypes[] | SubCategoryTypes[]
+  options: Category[] | SubCategory[]
   labelName: string
-  modelValue: MainCategoryTypes | SubCategoryTypes | null
+  modelValue: Category | SubCategory | null
   isLabel?: boolean
   isDisabled?: boolean
   isInvalidate?: string

From 7655194ec0108a8c5228bb012cf1eb9936b08d3c Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 16:33:54 +0900
Subject: [PATCH 090/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?=EC=A7=80=EB=82=9C=20=ED=94=BC=EB=93=9C=EB=B0=B1=20=EB=82=B4?=
 =?UTF-8?q?=EC=9A=A9=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TaskStatus.vue                 |  2 --
 src/components/task-detail/TaskDetail.vue     |  2 +-
 .../task-detail/TaskDetailRight.vue           |  9 +++--
 src/components/task-detail/TaskStatusList.vue | 34 +++++++++++++++++++
 .../task-management/CategoryLine.vue          |  2 +-
 src/constants/common.ts                       |  5 +--
 src/types/common.ts                           | 29 ++--------------
 7 files changed, 49 insertions(+), 34 deletions(-)
 create mode 100644 src/components/task-detail/TaskStatusList.vue

diff --git a/src/components/TaskStatus.vue b/src/components/TaskStatus.vue
index 582228bb..5041dbbe 100644
--- a/src/components/TaskStatus.vue
+++ b/src/components/TaskStatus.vue
@@ -28,5 +28,3 @@ const bgColor = computed(() => {
   return isActive ? `bg-${statusAsColor(status)}-1` : `bg-${statusAsColor(status)}-2`
 })
 </script>
-
-<style scoped></style>
diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue
index 2b6039e6..90b4cb43 100644
--- a/src/components/task-detail/TaskDetail.vue
+++ b/src/components/task-detail/TaskDetail.vue
@@ -10,7 +10,7 @@
         v-if="data">
         <div class="w-full h-[718px] flex flex-col gap-y-8 overflow-y-auto scrollbar-hide">
           <TaskDetailLeft :data="data" />
-          <div class="w-full border-border-1 border"></div>
+          <div class="w-full border-[0.5px] border-border-1"></div>
           <TaskDetailHistory
             :history="DUMMY_TASK_DETAIL_HISTORY"
             :is-approved="false" />
diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index 6a29766f..8475afbf 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="w-60 flex flex-col gap-y-6 pb-6 text-black">
+  <div class="min-w-60 flex flex-col gap-y-6 pb-6 text-black">
     <div>
       <p class="task-detail">ID</p>
       <p class="text-sm text-black">{{ data.taskId || '-' }}</p>
@@ -16,9 +16,12 @@
     </div>
     <div>
       <p class="task-detail">상태</p>
-      <div class="w-fit">
+      <div v-if="data.taskStatus === 'REQUESTED'" class="w-fit">
         <TaskStatus :status="data.taskStatus" />
       </div>
+      <div v-else>
+        <TaskStatusList :status="data.taskStatus" />
+      </div>
     </div>
     <div>
       <p class="task-detail">요청자</p>
@@ -42,6 +45,7 @@
         v-else
         class="flex gap-2">
         <img
+          v-if="data.processorNickName"
           :src="data.processorImageUrl || '/images/mockProfile.jpg'"
           class="rounded-full overflow-hidden w-5 h-5"
           alt="processorImg" />
@@ -76,6 +80,7 @@ import { computed, defineProps, ref } from 'vue'
 import TaskStatus from '../TaskStatus.vue'
 import TaskDetailDropdown from './TaskDetailDropdown.vue'
 import TaskDetailLabelDropdown from './TaskDetailLabelDropdown.vue'
+import TaskStatusList from './TaskStatusList.vue'
 
 const memberStore = useMemberStore()
 const { info } = storeToRefs(memberStore)
diff --git a/src/components/task-detail/TaskStatusList.vue b/src/components/task-detail/TaskStatusList.vue
new file mode 100644
index 00000000..6b7edcad
--- /dev/null
+++ b/src/components/task-detail/TaskStatusList.vue
@@ -0,0 +1,34 @@
+<template>
+  <div class="flex flex-wrap items-center gap-2.5">
+    <div
+      v-for="status in TASK_STATUS_LIST"
+      :key="status.content"
+      class="flex px-3 py-1 rounded-[45px]"
+      :class="bgColor(status.value)">
+      <span
+        class="text-[11px] font-bold"
+        :class="textColor(status.value)">
+        {{ status.content }}
+      </span>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { TASK_STATUS_LIST } from '@/constants/common'
+import type { Status } from '@/types/common'
+import { statusAsColor } from '@/utils/statusAsColor'
+
+const { status } = defineProps<{
+  status: Status
+}>()
+
+const textColor = (taskStatus: Status) => {
+  return status === taskStatus ? 'text-white' : `text-${statusAsColor(taskStatus)}-1`
+}
+const bgColor = (taskStatus: Status) => {
+  return status === taskStatus
+    ? `bg-${statusAsColor(taskStatus)}-1`
+    : `bg-${statusAsColor(taskStatus)}-2`
+}
+</script>
diff --git a/src/components/task-management/CategoryLine.vue b/src/components/task-management/CategoryLine.vue
index c2a2fe4e..f1a5669a 100644
--- a/src/components/task-management/CategoryLine.vue
+++ b/src/components/task-management/CategoryLine.vue
@@ -5,7 +5,7 @@
       :key="main.id"
       class="flex w-full flex-col">
       <div
-        v-for="(sub, index) in main.subCategory.length + 1"
+        v-for="(sub, index) in (main.subCategory?.length || 0) + 1"
         :key="sub"
         class="category-management-line w-full justify-between bg-white">
         <template v-if="index === 0">
diff --git a/src/constants/common.ts b/src/constants/common.ts
index 07c8ee5b..5b8f0806 100644
--- a/src/constants/common.ts
+++ b/src/constants/common.ts
@@ -1,3 +1,5 @@
+import type { TaskStatusListTypes } from '@/types/common'
+
 export const TERM_LIST = [
   { value: '', content: '전체' },
   { value: '1', content: '1시간 이내' },
@@ -6,8 +8,7 @@ export const TERM_LIST = [
   { value: '730', content: '1개월 이내' },
   { value: '2190', content: '3개월 이내' }
 ]
-export const TASK_STATUS_LIST = [
-  { value: 'REQUESTED', content: '요청' },
+export const TASK_STATUS_LIST: TaskStatusListTypes[] = [
   { value: 'IN_PROGRESS', content: '진행 중' },
   { value: 'PENDING_COMPLETED', content: '검토 중' },
   { value: 'COMPLETED', content: '완료' },
diff --git a/src/types/common.ts b/src/types/common.ts
index 45b715d1..6a4ecc51 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -100,30 +100,7 @@ export interface LabelColorTypes {
   colorEnum: string
 }
 
-export interface LabelDataTypes {
-  labelId: number
-  labelName: string
-  labelColor: string
-}
-
-export interface MainCategoryTypes {
-  id: number
-  name: string
-  code: string
-}
-
-export interface SubCategoryTypes {
-  id: number
-  mainCategoryId: number
-  name: string
-  code: string
-}
-
-export interface CategoryDropdownProps {
-  options: MainCategoryTypes[] | SubCategoryTypes[]
-  labelName: string
-  modelValue: MainCategoryTypes | SubCategoryTypes | null
-  isLabel?: boolean
-  isDisabled?: boolean
-  isInvalidate?: string
+export interface TaskStatusListTypes {
+  value: Status
+  content: string
 }

From e5f97026a799094a4f7b1064a85a8067db0e72bd Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 16:51:31 +0900
Subject: [PATCH 091/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EB=8B=B4?=
 =?UTF-8?q?=EB=8B=B9=EC=9E=90=EC=9A=A9=20api=20get=20=EC=97=B0=EA=B2=B0=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=EC=8A=B9=EC=9D=B8=20=EC=8B=9C=20=EC=8A=B9?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B2=BD=EB=A1=9C=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.ts                               |  5 +++++
 src/components/task-detail/TaskDetail.vue     |  7 ++++---
 .../task-detail/TaskDetailTopBar.vue          | 20 ++++++++++---------
 src/types/manager.ts                          |  1 +
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/api/user.ts b/src/api/user.ts
index 582284e0..28ca9ccf 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -9,3 +9,8 @@ export const getTaskDetailUser = async (id: number) => {
   const response = await formDataAxiosInstance.get(`/api/tasks/${id}/requests/details`)
   return response.data
 }
+
+export const getTaskDetailManager = async (id: number) => {
+  const response = await formDataAxiosInstance.get(`/api/tasks/${id}/details`)
+  return response.data
+}
diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue
index 90b4cb43..531a2dc2 100644
--- a/src/components/task-detail/TaskDetail.vue
+++ b/src/components/task-detail/TaskDetail.vue
@@ -4,7 +4,8 @@
       class="flex flex-col overflow-y-auto rounded-lg w-full max-w-[1200px] min-w-[1024px] bg-white p-6">
       <TaskDetailTopBar
         :is-approved="isApproved"
-        :close-task-detail="closeTaskDetail" />
+        :close-task-detail="closeTaskDetail"
+        :id="data?.taskId || 0" />
       <div
         class="w-full flex gap-6"
         v-if="data">
@@ -23,7 +24,7 @@
 </template>
 
 <script setup lang="ts">
-import { getTaskDetailUser } from '@/api/user'
+import { getTaskDetailManager } from '@/api/user'
 import * as taskDetailData from '@/datas/taskdetail'
 import type { TaskDetailDatas, TaskDetailProps } from '@/types/user'
 import { useQuery } from '@tanstack/vue-query'
@@ -37,6 +38,6 @@ const { isApproved, closeTaskDetail, selectedId } = defineProps<TaskDetailProps>
 
 const { data } = useQuery<TaskDetailDatas>({
   queryKey: ['taskDetailUser', selectedId],
-  queryFn: () => getTaskDetailUser(selectedId)
+  queryFn: () => getTaskDetailManager(selectedId)
 })
 </script>
diff --git a/src/components/task-detail/TaskDetailTopBar.vue b/src/components/task-detail/TaskDetailTopBar.vue
index f92730d7..3674414d 100644
--- a/src/components/task-detail/TaskDetailTopBar.vue
+++ b/src/components/task-detail/TaskDetailTopBar.vue
@@ -32,13 +32,6 @@
       :name="closeIcon"
       @click="closeTaskDetail"
       class="cursor-pointer" />
-    <ModalView
-      type="successType"
-      :is-open="isModalOpen.approve"
-      @click="ApproveTask"
-      @close="ApproveTask">
-      <template #header>작업이 승인되었습니다.</template>
-    </ModalView>
     <ModalView
       type="inputType"
       :is-open="isModalOpen.cancel"
@@ -50,15 +43,23 @@
 </template>
 
 <script setup lang="ts">
-import { approveIcon, cancelIcon, closeIcon, modificationIcon, reRequestIcon } from '@/constants/iconPath'
+import {
+  approveIcon,
+  cancelIcon,
+  closeIcon,
+  modificationIcon,
+  reRequestIcon
+} from '@/constants/iconPath'
 import { useMemberStore } from '@/stores/member'
 import type { TaskDetailTopBarProps } from '@/types/manager'
 import { storeToRefs } from 'pinia'
 import { computed, ref } from 'vue'
+import { useRouter } from 'vue-router'
 import CommonIcons from '../common/CommonIcons.vue'
 import ModalView from '../ModalView.vue'
 
 const memberStore = useMemberStore()
+const router = useRouter()
 const { info } = storeToRefs(memberStore)
 const isManager = computed(() => info.value.memberRole === 'ROLE_MANAGER')
 
@@ -77,9 +78,10 @@ const cancelTask = () => {
 
 const ApproveTask = () => {
   toggleModal('approve')
+  router.push(`/request-approve/${id}`)
 }
 
-const { isApproved, closeTaskDetail } = defineProps<TaskDetailTopBarProps>()
+const { isApproved, closeTaskDetail, id } = defineProps<TaskDetailTopBarProps>()
 </script>
 
 <style scoped></style>
diff --git a/src/types/manager.ts b/src/types/manager.ts
index 854e752c..cee2eac5 100644
--- a/src/types/manager.ts
+++ b/src/types/manager.ts
@@ -102,6 +102,7 @@ export interface MyTaskDetailDatas {
 export interface TaskDetailTopBarProps {
   isApproved: boolean
   closeTaskDetail: () => void
+  id: number
 }
 
 export interface DraggableEvent {

From e4360e98bdef8edc87b0d8e8838a2ae542dd5ca4 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 16:52:09 +0900
Subject: [PATCH 092/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=ED=8F=AC=EB=A7=A4=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-task/MyTaskFilterBar.vue       | 2 +-
 src/components/requested/RequestedFilterBar.vue  | 2 +-
 src/components/task-board/TaskBoardFilterBar.vue | 2 +-
 src/components/task-detail/TaskDetailRight.vue   | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/my-task/MyTaskFilterBar.vue b/src/components/my-task/MyTaskFilterBar.vue
index 9410997d..f55d6a49 100644
--- a/src/components/my-task/MyTaskFilterBar.vue
+++ b/src/components/my-task/MyTaskFilterBar.vue
@@ -41,7 +41,7 @@ import { useRequestParamsStore } from '@/stores/params'
 import { PAGE_SIZE_LIST, TASK_STATUS_LIST, TERM_LIST } from '@/constants/common'
 import { useRequestParamsChange } from '../hooks/useRequestParamsChange'
 import { useQuery } from '@tanstack/vue-query'
-import {axiosInstance} from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 
 const store = useRequestParamsStore()
 store.$reset()
diff --git a/src/components/requested/RequestedFilterBar.vue b/src/components/requested/RequestedFilterBar.vue
index 0539f796..6fbd6a13 100644
--- a/src/components/requested/RequestedFilterBar.vue
+++ b/src/components/requested/RequestedFilterBar.vue
@@ -35,7 +35,7 @@ import { PAGE_SIZE_LIST, TERM_LIST } from '@/constants/common'
 import { useRequestParamsStore } from '@/stores/params'
 import { useRequestParamsChange } from '../hooks/useRequestParamsChange'
 import { useQuery } from '@tanstack/vue-query'
-import {axiosInstance} from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 
 const store = useRequestParamsStore()
 store.$reset()
diff --git a/src/components/task-board/TaskBoardFilterBar.vue b/src/components/task-board/TaskBoardFilterBar.vue
index d9c2f338..b19ab197 100644
--- a/src/components/task-board/TaskBoardFilterBar.vue
+++ b/src/components/task-board/TaskBoardFilterBar.vue
@@ -29,7 +29,7 @@ import FilterInput from '../filters/FilterInput.vue'
 import { DUMMY_DIVISION_LIST } from '@/datas/dummy'
 import { useTaskBoardParamsStore } from '@/stores/params'
 import { useQuery } from '@tanstack/vue-query'
-import {axiosInstance} from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 
 const { params } = useTaskBoardParamsStore()
 
diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index 8475afbf..66c6c2ef 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -16,7 +16,9 @@
     </div>
     <div>
       <p class="task-detail">상태</p>
-      <div v-if="data.taskStatus === 'REQUESTED'" class="w-fit">
+      <div
+        v-if="data.taskStatus === 'REQUESTED'"
+        class="w-fit">
         <TaskStatus :status="data.taskStatus" />
       </div>
       <div v-else>

From 1ae95ef60c92f65a112b5335ee479401f0fa38b7 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 19:24:24 +0900
Subject: [PATCH 093/180] =?UTF-8?q?:sparkles:=20[feat]=20:=201=EC=B0=A8=20?=
 =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80=20API?=
 =?UTF-8?q?=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request-task/RequestTaskInput.vue         |  5 ---
 .../task-management/CategoryAdd.vue           | 41 +++++++------------
 src/components/top-bar/SideBar.vue            |  7 ++--
 src/constants/admin.ts                        |  6 +--
 src/types/common.ts                           | 18 +++++++-
 5 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/src/components/request-task/RequestTaskInput.vue b/src/components/request-task/RequestTaskInput.vue
index 5a411979..08949f94 100644
--- a/src/components/request-task/RequestTaskInput.vue
+++ b/src/components/request-task/RequestTaskInput.vue
@@ -7,11 +7,6 @@
         class="text-red-1">
         *
       </p>
-      <p
-        v-if="isInvalidateState === 'input'"
-        class="text-red-1">
-        {{ labelName }}을 입력해주세요
-      </p>
     </div>
     <input
       class="w-full h-11 border border-border-1 px-4 focus:outline-none text-black"
diff --git a/src/components/task-management/CategoryAdd.vue b/src/components/task-management/CategoryAdd.vue
index aa840288..fc05ddc5 100644
--- a/src/components/task-management/CategoryAdd.vue
+++ b/src/components/task-management/CategoryAdd.vue
@@ -22,15 +22,15 @@
     </ModalView>
     <!-- 카테고리 목록 API 필요, 임시로 역할로 설정 -->
     <RequestTaskDropdown
-      v-model="mainCategory"
-      :options="categoryOptions.map(el => el.name)"
+      v-model="categoryForm.firstCategory"
+      :options="RoleKeys"
       label-name="1차 카테고리"
       placeholder-text="1차 카테고리를 선택해주세요"
-      v-if="categoryStep == '2'" />
+      v-if="props.categoryStep == '2'" />
     <RequestTaskInput
       v-model="categoryForm.name"
       placeholder-text="카테고리명을 입력해주세요"
-      :label-name="`${categoryStep}차 카테고리명`" />
+      :label-name="`${props.categoryStep}차 카테고리명`" />
     <RequestTaskInput
       v-model="categoryForm.code"
       placeholder-text="카테고리의 고유코드를 입력해주세요"
@@ -46,13 +46,14 @@
 </template>
 
 <script lang="ts" setup>
-import { CATEGORY_FORM } from '@/constants/admin'
-import { computed, onMounted, ref, watch } from 'vue'
+import { CATEGORY_FIRST_ADD, CATEGORY_SECOND_ADD, RoleKeys } from '@/constants/admin'
+import { computed, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import ModalView from '../ModalView.vue'
 import RequestTaskDropdown from '../request-task/RequestTaskDropdown.vue'
 import RequestTaskInput from '../request-task/RequestTaskInput.vue'
+import { axiosInstance } from '@/utils/axios'
 
 const router = useRouter()
 
@@ -87,19 +88,20 @@ const handleSubmit = async () => {
   if (
     isCodeInvalidate.value ||
     categoryForm.value.name.length === 0 ||
-    categoryForm.value.code.length === 0 ||
-    (categoryStep === '2' && categoryForm.value.mainCategoryId === undefined)
+    categoryForm.value.code.length === 0
   ) {
     handleFailModal()
     return
   }
 
   try {
-    const requestUrl =
-      categoryStep === '1' ? '/api/managements/main-category' : '/api/managements/sub-category'
-    await axiosInstance.post(requestUrl, categoryForm.value, {
-      headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
-    })
+    const response = await axiosInstance.post(
+      '/api/managements/main-category',
+      categoryForm.value,
+      {
+        headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
+      }
+    )
     isModalVisible.value.add = true
   } catch {
     handleFailModal()
@@ -113,17 +115,4 @@ const isCodeInvalidate = computed(() => {
   const isInvalidate = !/^[A-Z]{1,2}$/.test(code)
   return isInvalidate ? 'code' : ''
 })
-
-const mainCategory = ref('')
-const categoryOptions = ref<Category[]>([])
-onMounted(async () => {
-  categoryOptions.value = await getMainCategory()
-  if (categoryStep === '2')
-    categoryForm.value = { ...categoryForm.value, mainCategoryId: undefined }
-})
-watch(mainCategory, () => {
-  categoryForm.value.mainCategoryId = categoryOptions.value.find(
-    el => el.name === mainCategory.value
-  )?.id
-})
 </script>
diff --git a/src/components/top-bar/SideBar.vue b/src/components/top-bar/SideBar.vue
index 7ba44dde..b8d02321 100644
--- a/src/components/top-bar/SideBar.vue
+++ b/src/components/top-bar/SideBar.vue
@@ -79,9 +79,10 @@ const { info } = storeToRefs(memberStore)
 
 const route = useRoute()
 
-const role = computed(() => info.value.memberRole)
-const name = computed(() => info.value.memberName)
-const nickname = computed(() => info.value.nickname)
+// 회원 역할, 닉네임 필요
+const role = ref('admin')
+const name = ref('백지연')
+const nickname = ref('Chloe.yeon')
 
 const filteredMenu = computed(() => {
   return role.value === 'ROLE_USER'
diff --git a/src/constants/admin.ts b/src/constants/admin.ts
index 4a848952..166e0c6a 100644
--- a/src/constants/admin.ts
+++ b/src/constants/admin.ts
@@ -38,15 +38,13 @@ import type { RoleTypes, RoleTypesEnum, UserRegistrationProps } from '@/types/ad
 
 export const CATEGORY_FIRST_ADD: Category = {
   name: '',
-  code: '',
-  id: 0
+  code: ''
 }
 
 export const CATEGORY_SECOND_ADD: SubCategory = {
   name: '',
   mainCategoryId: 0,
-  code: '',
-  id: 0
+  code: ''
 }
 
 export const INITIAL_USER_REGISTRATION: UserRegistrationProps = {
diff --git a/src/types/common.ts b/src/types/common.ts
index 6a4ecc51..612630e2 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -76,7 +76,23 @@ export interface FormCheckboxProps {
 
 export interface ColorSelectProps {
   isOpen: boolean
-  newLabel: LabelDataTypes
+}
+
+export interface LabelDataTypes {
+  labelId: number
+  labelName: string
+  labelColor: string
+}
+
+export interface MainCategoryTypes {
+  name: string
+  code: string
+}
+
+export interface SubCategoryTypes {
+  mainCategoryId: number
+  name: string
+  code: string
 }
 
 export interface CategoryDropdownProps {

From 3651a1230b8b93645932aea03b97f3a5b15fcc15 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 19:58:46 +0900
Subject: [PATCH 094/180] =?UTF-8?q?:sparkles:=20[feat]=20:=202=EC=B0=A8=20?=
 =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80=20API?=
 =?UTF-8?q?=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-management/CategoryAdd.vue           | 42 ++++++++++++-------
 src/constants/admin.ts                        | 10 +----
 src/types/common.ts                           | 13 ++----
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/components/task-management/CategoryAdd.vue b/src/components/task-management/CategoryAdd.vue
index fc05ddc5..f96c4c2e 100644
--- a/src/components/task-management/CategoryAdd.vue
+++ b/src/components/task-management/CategoryAdd.vue
@@ -22,15 +22,15 @@
     </ModalView>
     <!-- 카테고리 목록 API 필요, 임시로 역할로 설정 -->
     <RequestTaskDropdown
-      v-model="categoryForm.firstCategory"
-      :options="RoleKeys"
+      v-model="mainCategory"
+      :options="categoryOptions.map(el => el.name)"
       label-name="1차 카테고리"
       placeholder-text="1차 카테고리를 선택해주세요"
-      v-if="props.categoryStep == '2'" />
+      v-if="categoryStep == '2'" />
     <RequestTaskInput
       v-model="categoryForm.name"
       placeholder-text="카테고리명을 입력해주세요"
-      :label-name="`${props.categoryStep}차 카테고리명`" />
+      :label-name="`${categoryStep}차 카테고리명`" />
     <RequestTaskInput
       v-model="categoryForm.code"
       placeholder-text="카테고리의 고유코드를 입력해주세요"
@@ -46,14 +46,16 @@
 </template>
 
 <script lang="ts" setup>
-import { CATEGORY_FIRST_ADD, CATEGORY_SECOND_ADD, RoleKeys } from '@/constants/admin'
-import { computed, ref } from 'vue'
+import { CATEGORY_FORM } from '@/constants/admin'
+import { computed, onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import ModalView from '../ModalView.vue'
 import RequestTaskDropdown from '../request-task/RequestTaskDropdown.vue'
 import RequestTaskInput from '../request-task/RequestTaskInput.vue'
 import { axiosInstance } from '@/utils/axios'
+import { getMainCategory } from '@/api/common'
+import type { Category, CategoryForm } from '@/types/common'
 
 const router = useRouter()
 
@@ -88,20 +90,19 @@ const handleSubmit = async () => {
   if (
     isCodeInvalidate.value ||
     categoryForm.value.name.length === 0 ||
-    categoryForm.value.code.length === 0
+    categoryForm.value.code.length === 0 ||
+    (categoryStep === '2' && categoryForm.value.mainCategoryId === undefined)
   ) {
     handleFailModal()
     return
   }
 
   try {
-    const response = await axiosInstance.post(
-      '/api/managements/main-category',
-      categoryForm.value,
-      {
-        headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
-      }
-    )
+    const requestUrl =
+      categoryStep === '1' ? '/api/managements/main-category' : '/api/managements/sub-category'
+    await axiosInstance.post(requestUrl, categoryForm.value, {
+      headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
+    })
     isModalVisible.value.add = true
   } catch {
     handleFailModal()
@@ -115,4 +116,17 @@ const isCodeInvalidate = computed(() => {
   const isInvalidate = !/^[A-Z]{1,2}$/.test(code)
   return isInvalidate ? 'code' : ''
 })
+
+const mainCategory = ref('')
+const categoryOptions = ref<Category[]>([])
+onMounted(async () => {
+  categoryOptions.value = await getMainCategory()
+  if (categoryStep === '2')
+    categoryForm.value = { ...categoryForm.value, mainCategoryId: undefined }
+})
+watch(mainCategory, () => {
+  categoryForm.value.mainCategoryId = categoryOptions.value.find(
+    el => el.name === mainCategory.value
+  )?.id
+})
 </script>
diff --git a/src/constants/admin.ts b/src/constants/admin.ts
index 166e0c6a..44c1e4be 100644
--- a/src/constants/admin.ts
+++ b/src/constants/admin.ts
@@ -1,4 +1,4 @@
-import type { Category, ListBarTabProps, Option, SubCategory } from '@/types/common'
+import type { CategoryForm, ListBarTabProps, Option } from '@/types/common'
 
 export const MEMBER_MANAGEMENT_LIST_BAR_TAB: ListBarTabProps[] = [
   { content: '이름', width: 60 },
@@ -36,17 +36,11 @@ export const LOGS_LIST_BAR_TAB: ListBarTabProps[] = [
 
 import type { RoleTypes, RoleTypesEnum, UserRegistrationProps } from '@/types/admin'
 
-export const CATEGORY_FIRST_ADD: Category = {
+export const CATEGORY_FORM: CategoryForm = {
   name: '',
   code: ''
 }
 
-export const CATEGORY_SECOND_ADD: SubCategory = {
-  name: '',
-  mainCategoryId: 0,
-  code: ''
-}
-
 export const INITIAL_USER_REGISTRATION: UserRegistrationProps = {
   name: '',
   email: '',
diff --git a/src/types/common.ts b/src/types/common.ts
index 612630e2..028f44f1 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -84,21 +84,16 @@ export interface LabelDataTypes {
   labelColor: string
 }
 
-export interface MainCategoryTypes {
-  name: string
-  code: string
-}
-
-export interface SubCategoryTypes {
-  mainCategoryId: number
+export interface CategoryForm {
   name: string
   code: string
+  mainCategoryId?: number
 }
 
 export interface CategoryDropdownProps {
-  options: Category[] | SubCategory[]
+  options: CategoryForm
   labelName: string
-  modelValue: Category | SubCategory | null
+  modelValue?: CategoryForm
   isLabel?: boolean
   isDisabled?: boolean
   isInvalidate?: string

From b79ae140a57dd504f4444cc1c49e63f5e48ad234 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 22:16:58 +0900
Subject: [PATCH 095/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EB=88=84?=
 =?UTF-8?q?=EB=9D=BD=20=ED=83=80=EC=9E=85=20=EC=A0=81=EC=9A=A9=20=EB=B6=88?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=20=EB=B7=B0=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts          |  5 -----
 src/types/common.ts          |  6 ++++++
 src/views/TaskDetailView.vue | 17 -----------------
 3 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 src/views/TaskDetailView.vue

diff --git a/src/router/index.ts b/src/router/index.ts
index 1d335fae..a98db654 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -111,11 +111,6 @@ const router = createRouter({
       path: '/statistics',
       name: 'Statistics',
       component: () => import('../views/StatisticsView.vue')
-    },
-    {
-      path: '/task-detail',
-      name: 'TaskDetail',
-      component: () => import('../views/TaskDetailView.vue')
     }
   ]
 })
diff --git a/src/types/common.ts b/src/types/common.ts
index 028f44f1..8b2a526f 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -90,6 +90,12 @@ export interface CategoryForm {
   mainCategoryId?: number
 }
 
+export interface CategoryForm {
+  name: string
+  code: string
+  mainCategoryId?: number
+}
+
 export interface CategoryDropdownProps {
   options: CategoryForm
   labelName: string
diff --git a/src/views/TaskDetailView.vue b/src/views/TaskDetailView.vue
deleted file mode 100644
index d9538031..00000000
--- a/src/views/TaskDetailView.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-  <div class="w-full flex items-center justify-center h-screen bg-disabled">
-    <TaskDetail
-      :isManager="true"
-      :isApproved="false"
-      :closeTaskDetail="closeTaskDetail" />
-  </div>
-  <div class="w-full bg-body"></div>
-</template>
-
-<script setup lang="ts">
-import TaskDetail from '@/components/task-detail/TaskDetail.vue'
-
-const closeTaskDetail = () => {
-  console.log('닫기')
-}
-</script>

From 5eb5ce8defbff608017b184f3c73059d09433827 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 18:04:12 +0900
Subject: [PATCH 096/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84=20API=20=EC=97=B0=EA=B2=B0=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/statistics/StatisticsCard.vue | 22 ++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/components/statistics/StatisticsCard.vue b/src/components/statistics/StatisticsCard.vue
index 89323132..a2956b72 100644
--- a/src/components/statistics/StatisticsCard.vue
+++ b/src/components/statistics/StatisticsCard.vue
@@ -28,6 +28,8 @@ import PieChart from '../PieChart.vue'
 import LineChart from '../LineChart.vue'
 import PeriodButtons from './PeriodButtons.vue'
 import type { PeriodType } from '@/types/manager'
+import axiosInstance from '@/utils/axios'
+import { useQuery } from '@tanstack/vue-query'
 
 const { title, statisticsType, chartType } = defineProps<{
   title: string
@@ -45,4 +47,24 @@ const periodType = ref<PeriodType>('DAY')
 const changePeriod = (newPeriodType: PeriodType) => {
   periodType.value = newPeriodType
 }
+
+const fetchStatistics = async () => {
+  const response = await axiosInstance.get('/api/tasks/statistics', {
+    headers: {
+      Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}`
+    },
+    params: {
+      periodType: periodType.value,
+      statisticsType
+    }
+  })
+
+  return response.data
+}
+
+const { data } = useQuery<{ key: string; value: number }[]>({
+  queryKey: [statisticsType, periodType],
+  queryFn: fetchStatistics
+})
+console.log(data.value)
 </script>

From 75cbe8b0f8d2f0c5e928aa31b779c73c4aaeb815 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 23:25:02 +0900
Subject: [PATCH 097/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20StatisticsCar?=
 =?UTF-8?q?d=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20API=20=EC=97=B0?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LineChart.vue                 | 14 +++++++++---
 src/components/statistics/StatisticsCard.vue | 23 ++++++++++++++------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/components/LineChart.vue b/src/components/LineChart.vue
index 2e3e78ef..3869debb 100644
--- a/src/components/LineChart.vue
+++ b/src/components/LineChart.vue
@@ -41,14 +41,22 @@ const teamData = {
     {
       label: dataLabel,
       data: series,
-      fill: true,
-      tension: 0.4
+      fill: true
     }
   ]
 }
 
 const options = {
   responsive: true,
-  maintainAspectRatio: false
+  maintainAspectRatio: false,
+  scales: {
+    y: {
+      beginAtZero: true,
+      ticks: {
+        stepSize: 1
+      },
+      suggestedMax: Math.max(...series) + 1
+    }
+  }
 }
 </script>
diff --git a/src/components/statistics/StatisticsCard.vue b/src/components/statistics/StatisticsCard.vue
index a2956b72..b106cea8 100644
--- a/src/components/statistics/StatisticsCard.vue
+++ b/src/components/statistics/StatisticsCard.vue
@@ -10,20 +10,22 @@
     <div class="w-full h-[1px] bg-border-1" />
     <div class="h-60">
       <PieChart
+        :key="JSON.stringify(labels)"
         v-if="chartType === 'pie'"
-        :labels="['a', 'b', 'c']"
-        :series="[1, 2, 3]" />
+        :labels="labels || []"
+        :series="series || []" />
       <LineChart
+        :key="JSON.stringify(labels)"
         v-if="chartType === 'line'"
-        :labels="['a', 'b', 'c']"
-        :series="[1, 2, 3]"
+        :labels="labels || []"
+        :series="series || []"
         :data-label="title.slice(4)" />
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import PieChart from '../PieChart.vue'
 import LineChart from '../LineChart.vue'
 import PeriodButtons from './PeriodButtons.vue'
@@ -62,9 +64,16 @@ const fetchStatistics = async () => {
   return response.data
 }
 
-const { data } = useQuery<{ key: string; value: number }[]>({
+const { data } = useQuery<{ key: string; count: number }[]>({
   queryKey: [statisticsType, periodType],
   queryFn: fetchStatistics
 })
-console.log(data.value)
+
+const labels = computed(() => {
+  return data.value?.map(el => el.key)
+})
+
+const series = computed(() => {
+  return data.value?.map(el => el.count)
+})
 </script>

From f0cae4e115efc3ebc9086c5613a900f84c55ecb2 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 23:59:19 +0900
Subject: [PATCH 098/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20StatisticsCat?=
 =?UTF-8?q?egoryCard=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20API=20?=
 =?UTF-8?q?=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/statistics/StatisticsCard.vue  | 19 ++---
 .../statistics/StatisticsCategoryCard.vue     | 69 ++++++++++++++++---
 src/types/admin.ts                            |  5 ++
 3 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/src/components/statistics/StatisticsCard.vue b/src/components/statistics/StatisticsCard.vue
index b106cea8..76d9a991 100644
--- a/src/components/statistics/StatisticsCard.vue
+++ b/src/components/statistics/StatisticsCard.vue
@@ -10,15 +10,15 @@
     <div class="w-full h-[1px] bg-border-1" />
     <div class="h-60">
       <PieChart
-        :key="JSON.stringify(labels)"
+        :key="JSON.stringify(labels) + periodType"
         v-if="chartType === 'pie'"
-        :labels="labels || []"
-        :series="series || []" />
+        :labels="labels"
+        :series="series" />
       <LineChart
-        :key="JSON.stringify(labels)"
+        :key="JSON.stringify(labels) + periodType"
         v-if="chartType === 'line'"
-        :labels="labels || []"
-        :series="series || []"
+        :labels="labels"
+        :series="series"
         :data-label="title.slice(4)" />
     </div>
   </div>
@@ -32,6 +32,7 @@ import PeriodButtons from './PeriodButtons.vue'
 import type { PeriodType } from '@/types/manager'
 import axiosInstance from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
+import type { StatisticsData } from '@/types/admin'
 
 const { title, statisticsType, chartType } = defineProps<{
   title: string
@@ -64,16 +65,16 @@ const fetchStatistics = async () => {
   return response.data
 }
 
-const { data } = useQuery<{ key: string; count: number }[]>({
+const { data } = useQuery<StatisticsData[]>({
   queryKey: [statisticsType, periodType],
   queryFn: fetchStatistics
 })
 
 const labels = computed(() => {
-  return data.value?.map(el => el.key)
+  return data.value?.map(el => el.key) || []
 })
 
 const series = computed(() => {
-  return data.value?.map(el => el.count)
+  return data.value?.map(el => el.count) || []
 })
 </script>
diff --git a/src/components/statistics/StatisticsCategoryCard.vue b/src/components/statistics/StatisticsCategoryCard.vue
index b7c1de43..6022c947 100644
--- a/src/components/statistics/StatisticsCategoryCard.vue
+++ b/src/components/statistics/StatisticsCategoryCard.vue
@@ -11,29 +11,29 @@
     <div class="h-60 flex overflow-hidden">
       <div class="w-1/2 px-1">
         <PieChart
-          :labels="['a', 'b', 'c', 'd']"
-          :series="[1, 2, 3, 4]"
+          :key="JSON.stringify(mainLabels) + periodType"
+          :labels="mainLabels"
+          :series="mainSeries"
           @on-click="changeMainCategory" />
       </div>
       <div class="w-1/2 px-1">
         <PieChart
-          :key="mainCategory"
-          :labels="
-            mainCategory
-              ? [`${mainCategory}-1`, `${mainCategory}-2`, `${mainCategory}-3`, `${mainCategory}-4`]
-              : ['카테고리를 선택해주세요']
-          "
-          :series="mainCategory ? [1, 2, 3, 4] : []" />
+          :key="JSON.stringify(subLabels) + mainCategory + periodType"
+          :labels="subLabels"
+          :series="subSeries" />
       </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import PieChart from '../PieChart.vue'
 import PeriodButtons from './PeriodButtons.vue'
 import type { PeriodType } from '@/types/manager'
+import axiosInstance from '@/utils/axios'
+import { useQuery } from '@tanstack/vue-query'
+import type { StatisticsData } from '@/types/admin'
 
 const periodType = ref<PeriodType>('DAY')
 const changePeriod = (newPeriodType: PeriodType) => {
@@ -42,4 +42,53 @@ const changePeriod = (newPeriodType: PeriodType) => {
 
 const mainCategory = ref('')
 const changeMainCategory = (value: string) => (mainCategory.value = value)
+
+const fetchMainStatistics = async () => {
+  const response = await axiosInstance.get('/api/tasks/statistics', {
+    headers: {
+      Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}`
+    },
+    params: {
+      periodType: periodType.value,
+      statisticsType: 'REQUEST_BY_CATEGORY'
+    }
+  })
+
+  return response.data
+}
+const { data: mainData } = useQuery<StatisticsData[]>({
+  queryKey: ['REQUEST_BY_CATEGORY', periodType],
+  queryFn: fetchMainStatistics
+})
+const mainLabels = computed(() => {
+  return mainData.value?.map(el => el.key) || []
+})
+const mainSeries = computed(() => {
+  return mainData.value?.map(el => el.count) || []
+})
+
+const fetchSubStatistics = async () => {
+  const response = await axiosInstance.get('/api/tasks/statistics/subcategory', {
+    headers: {
+      Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}`
+    },
+    params: {
+      periodType: periodType.value,
+      mainCategory: mainCategory.value
+    }
+  })
+
+  return response.data
+}
+const { data: subData } = useQuery<StatisticsData[]>({
+  queryKey: [mainCategory.value, periodType],
+  queryFn: fetchSubStatistics,
+  enabled: computed(() => mainCategory.value !== '')
+})
+const subLabels = computed(() => {
+  return subData.value?.map(el => el.key) || ['카테고리를 선택해주세요']
+})
+const subSeries = computed(() => {
+  return subData.value?.map(el => el.count) || []
+})
 </script>
diff --git a/src/types/admin.ts b/src/types/admin.ts
index 08589211..3f27bc28 100644
--- a/src/types/admin.ts
+++ b/src/types/admin.ts
@@ -56,3 +56,8 @@ export interface NewLabelTypes {
   labelName: string
   labelColor: string
 }
+
+export interface StatisticsData {
+  key: string
+  count: number
+}

From beef6e8bd105dce47be416d55202ddf38627c568 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 3 Feb 2025 01:06:41 +0900
Subject: [PATCH 099/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EA=B0=80=20=EC=97=86?=
 =?UTF-8?q?=EC=9D=84=20=EB=95=8C=EC=9D=98=20=EC=98=88=EC=99=B8=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LineChart.vue                         | 5 +++++
 src/components/PieChart.vue                          | 5 +++++
 src/components/statistics/StatisticsCategoryCard.vue | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/LineChart.vue b/src/components/LineChart.vue
index 3869debb..d0f3fe06 100644
--- a/src/components/LineChart.vue
+++ b/src/components/LineChart.vue
@@ -1,7 +1,11 @@
 <template>
   <Line
+    v-if="labels.length !== 0"
     :data="teamData"
     :options="options" />
+  <NoContent
+    v-else
+    content="데이터가 없습니다" />
 </template>
 
 <script setup lang="ts">
@@ -17,6 +21,7 @@ import {
   LinearScale,
   Colors
 } from 'chart.js'
+import NoContent from './lists/NoContent.vue'
 
 ChartJS.register(
   Title,
diff --git a/src/components/PieChart.vue b/src/components/PieChart.vue
index 93a9516f..c1b22f83 100644
--- a/src/components/PieChart.vue
+++ b/src/components/PieChart.vue
@@ -1,7 +1,11 @@
 <template>
   <Pie
+    v-if="labels.length !== 0"
     :data="teamData"
     :options="options" />
+  <NoContent
+    v-else
+    content="데이터가 없습니다" />
 </template>
 
 <script setup lang="ts">
@@ -16,6 +20,7 @@ import {
   type ChartEvent,
   type ActiveElement
 } from 'chart.js'
+import NoContent from './lists/NoContent.vue'
 ChartJS.register(Title, Tooltip, Legend, ArcElement, Colors)
 
 const { labels, series } = defineProps<{ labels: string[]; series: number[] }>()
diff --git a/src/components/statistics/StatisticsCategoryCard.vue b/src/components/statistics/StatisticsCategoryCard.vue
index 6022c947..66c16fea 100644
--- a/src/components/statistics/StatisticsCategoryCard.vue
+++ b/src/components/statistics/StatisticsCategoryCard.vue
@@ -86,7 +86,7 @@ const { data: subData } = useQuery<StatisticsData[]>({
   enabled: computed(() => mainCategory.value !== '')
 })
 const subLabels = computed(() => {
-  return subData.value?.map(el => el.key) || ['카테고리를 선택해주세요']
+  return subData.value?.map(el => el.key) || []
 })
 const subSeries = computed(() => {
   return subData.value?.map(el => el.count) || []

From f13d4affffc2e8769e6ffac0c0c7c4a5c569646d Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Tue, 4 Feb 2025 00:29:22 +0900
Subject: [PATCH 100/180] =?UTF-8?q?:bug:=20[fix]=20=EB=B9=8C=EB=93=9C=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/statistics/StatisticsCard.vue         | 2 +-
 src/components/statistics/StatisticsCategoryCard.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/statistics/StatisticsCard.vue b/src/components/statistics/StatisticsCard.vue
index 76d9a991..9a547990 100644
--- a/src/components/statistics/StatisticsCard.vue
+++ b/src/components/statistics/StatisticsCard.vue
@@ -30,7 +30,7 @@ import PieChart from '../PieChart.vue'
 import LineChart from '../LineChart.vue'
 import PeriodButtons from './PeriodButtons.vue'
 import type { PeriodType } from '@/types/manager'
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import type { StatisticsData } from '@/types/admin'
 
diff --git a/src/components/statistics/StatisticsCategoryCard.vue b/src/components/statistics/StatisticsCategoryCard.vue
index 66c16fea..6fae0d6c 100644
--- a/src/components/statistics/StatisticsCategoryCard.vue
+++ b/src/components/statistics/StatisticsCategoryCard.vue
@@ -31,7 +31,7 @@ import { computed, ref } from 'vue'
 import PieChart from '../PieChart.vue'
 import PeriodButtons from './PeriodButtons.vue'
 import type { PeriodType } from '@/types/manager'
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import type { StatisticsData } from '@/types/admin'
 

From 20cff3f674d5960abc5233469ba7034d817c18f3 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 1 Feb 2025 20:03:17 +0900
Subject: [PATCH 101/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20prop?=
 =?UTF-8?q?=EB=8C=80=EC=8B=A0=20=EC=A7=81=EC=A0=91=20=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=A4=EA=B8=B0,=20=ED=8C=8C=EC=9D=BC=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=EA=B0=92=20=EB=B0=B0=EC=97=B4=EB=A1=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 24 ++++++++-------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 1b9a4570..ca757066 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -36,10 +36,10 @@
 </template>
 
 <script lang="ts" setup>
-import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
-import type { Category, SubCategory } from '@/types/common'
-import { onMounted, ref, watch } from 'vue'
+import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
+import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
+import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import ModalView from '../ModalView.vue'
@@ -85,17 +85,9 @@ const handleCancel = () => {
 }
 
 const handleSubmit = async () => {
-  if (!category1.value || !category2.value) {
-    isInvalidate.value = 'category'
-    console.log(isInvalidate.value, '변경됨')
-    return
-  } else if (!title.value) {
-    isInvalidate.value = 'input'
-    return
-  }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value.id,
+    categoryId: 1,
     title: title.value,
     description: description.value
   }
@@ -105,12 +97,14 @@ const handleSubmit = async () => {
 
   formData.append('taskInfo', newBlob)
   if (file.value && file.value.length > 0) {
-    file.value.forEach(f => formData.append('attachment', f))
+    file.value.forEach(f => {
+      formData.append('attachment', f)
+    })
   }
+  console.log(Object.fromEntries(formData), '응답')
+  console.log(file.value, '파일 현황 응답')
   try {
     const res = await postTaskRequest(formData)
-    isModalVisible.value = true
-    console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
   }

From 1add59aab252c08398bc1c6e3fabed95a2d28614 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:07:11 +0900
Subject: [PATCH 102/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=EC=9A=A9=20=EB=93=9C=EB=A1=AD?=
 =?UTF-8?q?=EB=8B=A4=EC=9A=B4=20=EA=B0=9C=EB=B3=84=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/CategoryDropDown.vue | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 030e3e62..33e6befc 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -7,18 +7,13 @@
         class="text-red-1">
         *
       </p>
-      <p
-        v-if="isInvalidateState === 'category'"
-        class="text-red-1">
-        카테고리를 선택해주세요
-      </p>
     </div>
     <div class="relative flex text-base">
       <div
         class="flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black"
         @click="toggleDropdown">
         <p :class="{ 'text-disabled': !modelValue?.name }">
-          {{ modelValue?.name ?? labelName + '를 선택해주세요' }}
+          {{ modelValue?.name ?? placeholderText }}
         </p>
         <CommonIcons
           :name="dropdownIcon"
@@ -41,15 +36,12 @@
 
 <script lang="ts" setup>
 import { dropdownIcon } from '@/constants/iconPath'
-import type { Category, CategoryDropdownProps } from '@/types/common'
-import { computed, ref } from 'vue'
+import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from '@/types/common'
+import { ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
+const { placeholderText, options, labelName, modelValue, isLabel, isDisabled } =
   defineProps<CategoryDropdownProps>()
-
-const isInvalidateState = computed(() => isInvalidate)
-
 const emit = defineEmits(['update:modelValue'])
 const dropdownOpen = ref(false)
 

From 042eb673dd19b3e11050062ce95d4a81c7e04dcf Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:11:02 +0900
Subject: [PATCH 103/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=9D=EC=84=B1=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 34 ++++++++++++++++-----
 src/types/common.ts                         | 17 +++++++++--
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index ca757066..babc100e 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -4,13 +4,13 @@
       v-model="category1"
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
-      :isInvalidate="isInvalidate"
+      :placeholderText="'1차 카테고리를 선택해주세요'"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
-      :is-invalidate="isInvalidate"
+      :placeholderText="'2차 카테고리를 선택해주세요'"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
@@ -36,13 +36,13 @@
 </template>
 
 <script lang="ts" setup>
+import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
 import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
-import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
-import { ref } from 'vue'
+import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
+import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
-import ModalView from '../ModalView.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
 import RequestTaskFileInput from './RequestTaskFileInput.vue'
 import RequestTaskInput from './RequestTaskInput.vue'
@@ -73,6 +73,24 @@ watch(category1, async newValue => {
     subCategory => subCategory.mainCategoryId === newValue?.id
   )
 })
+
+const mainCategoryArr = ref<MainCategoryTypes[]>([])
+const subCategoryArr = ref<SubCategoryTypes[]>([])
+const afterSubCategoryArr = ref<SubCategoryTypes[]>([])
+
+onMounted(async () => {
+  mainCategoryArr.value = await getMainCategory()
+  subCategoryArr.value = await getSubCategory()
+  afterSubCategoryArr.value = await getSubCategory()
+})
+
+watch(category1, async newValue => {
+  category2.value = null
+  afterSubCategoryArr.value = subCategoryArr.value.filter(
+    subCategory => subCategory.mainCategoryId === newValue?.id
+  )
+})
+
 const router = useRouter()
 
 const handleCancel = () => {
@@ -87,7 +105,7 @@ const handleCancel = () => {
 const handleSubmit = async () => {
   const formData = new FormData()
   const taskInfo = {
-    categoryId: 1,
+    categoryId: category2.value?.id,
     title: title.value,
     description: description.value
   }
@@ -96,15 +114,15 @@ const handleSubmit = async () => {
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
 
   formData.append('taskInfo', newBlob)
+
   if (file.value && file.value.length > 0) {
     file.value.forEach(f => {
       formData.append('attachment', f)
     })
   }
-  console.log(Object.fromEntries(formData), '응답')
-  console.log(file.value, '파일 현황 응답')
   try {
     const res = await postTaskRequest(formData)
+    console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
   }
diff --git a/src/types/common.ts b/src/types/common.ts
index 8b2a526f..233b786b 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -117,7 +117,18 @@ export interface LabelColorTypes {
   colorEnum: string
 }
 
-export interface TaskStatusListTypes {
-  value: Status
-  content: string
+export interface SubCategoryTypes {
+  id: number
+  mainCategoryId: number
+  name: string
+  code: string
+}
+
+export interface CategoryDropdownProps {
+  placeholderText: string
+  options: MainCategoryTypes[] | SubCategoryTypes[]
+  labelName: string
+  modelValue: MainCategoryTypes | SubCategoryTypes | null
+  isLabel?: boolean
+  isDisabled?: boolean
 }

From 0af0c6ca9ed5bb17b97269c2f2e482bd16a77f30 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 11:51:43 +0900
Subject: [PATCH 104/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EB=88=84=EB=9D=BD=EC=8B=9C=20=EA=B2=BD=EA=B3=A0=20?=
 =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request-task/CategoryDropDown.vue         | 12 +++++--
 src/components/request-task/RequestTask.vue   | 32 +++++++------------
 src/types/common.ts                           |  1 +
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 33e6befc..2c670fd1 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -7,6 +7,11 @@
         class="text-red-1">
         *
       </p>
+      <p
+        v-if="isInvalidateState === 'category'"
+        class="text-red-1">
+        카테고리를 선택해주세요
+      </p>
     </div>
     <div class="relative flex text-base">
       <div
@@ -37,11 +42,14 @@
 <script lang="ts" setup>
 import { dropdownIcon } from '@/constants/iconPath'
 import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { placeholderText, options, labelName, modelValue, isLabel, isDisabled } =
+const { placeholderText, options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
   defineProps<CategoryDropdownProps>()
+
+const isInvalidateState = computed(() => isInvalidate)
+
 const emit = defineEmits(['update:modelValue'])
 const dropdownOpen = ref(false)
 
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index babc100e..b7bef6d8 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -5,16 +5,18 @@
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
       :placeholderText="'1차 카테고리를 선택해주세요'"
+      :isInvalidate="isInvalidate"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
       :placeholderText="'2차 카테고리를 선택해주세요'"
+      :is-invalidate="isInvalidate"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
-      :placeholderText="'제목을 입력해주세요'"
+      :placeholderText="TITLE_PLACEHOLDER"
       :label-name="'제목'"
       :is-invalidate="isInvalidate" />
     <RequestTaskTextArea
@@ -55,24 +57,6 @@ const title = ref('')
 const description = ref('')
 const file = ref(null as File[] | null)
 const isInvalidate = ref('')
-const isModalVisible = ref(false)
-
-const mainCategoryArr = ref<Category[]>([])
-const subCategoryArr = ref<SubCategory[]>([])
-const afterSubCategoryArr = ref<SubCategory[]>([])
-
-onMounted(async () => {
-  mainCategoryArr.value = await getMainCategory()
-  subCategoryArr.value = await getSubCategory()
-  afterSubCategoryArr.value = await getSubCategory()
-})
-
-watch(category1, async newValue => {
-  category2.value = null
-  afterSubCategoryArr.value = subCategoryArr.value.filter(
-    subCategory => subCategory.mainCategoryId === newValue?.id
-  )
-})
 
 const mainCategoryArr = ref<MainCategoryTypes[]>([])
 const subCategoryArr = ref<SubCategoryTypes[]>([])
@@ -103,9 +87,17 @@ const handleCancel = () => {
 }
 
 const handleSubmit = async () => {
+  if (!category1.value || !category2.value) {
+    isInvalidate.value = 'category'
+    console.log(isInvalidate.value, '변경됨')
+    return
+  } else if (!title.value) {
+    isInvalidate.value = 'input'
+    return
+  }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value?.id,
+    categoryId: category2.value.id,
     title: title.value,
     description: description.value
   }
diff --git a/src/types/common.ts b/src/types/common.ts
index 233b786b..b742633a 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -131,4 +131,5 @@ export interface CategoryDropdownProps {
   modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
   isDisabled?: boolean
+  isInvalidate?: string
 }

From e3963227148ce314d39c7912d2de01e419f29879 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Mon, 3 Feb 2025 13:37:04 +0900
Subject: [PATCH 105/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=EC=B6=A9=EB=8F=8C=20=EC=BD=94=EB=93=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue | 2 +-
 src/components/request-task/RequestTask.vue | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index c310c969..78d4b07e 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -26,7 +26,7 @@ import { useRequestParamsStore } from '@/stores/params'
 import type { MyRequestResponse } from '@/types/user'
 import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { useParseParams } from '../hooks/useParseParams'
 import ListContainer from '../lists/ListContainer.vue'
 import ListPagination from '../lists/ListPagination.vue'
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index b7bef6d8..15fa33fb 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -74,7 +74,6 @@ watch(category1, async newValue => {
     subCategory => subCategory.mainCategoryId === newValue?.id
   )
 })
-
 const router = useRouter()
 
 const handleCancel = () => {

From 66de6b7410d57bc1af3ef0eb47b99e83f9e0409c Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 19:24:24 +0900
Subject: [PATCH 106/180] =?UTF-8?q?:sparkles:=20[feat]=20:=201=EC=B0=A8=20?=
 =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80=20API?=
 =?UTF-8?q?=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-management/CategoryAdd.vue           | 42 +++++++------------
 src/constants/admin.ts                        |  6 +++
 src/types/common.ts                           |  8 ++--
 3 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/src/components/task-management/CategoryAdd.vue b/src/components/task-management/CategoryAdd.vue
index f96c4c2e..fc05ddc5 100644
--- a/src/components/task-management/CategoryAdd.vue
+++ b/src/components/task-management/CategoryAdd.vue
@@ -22,15 +22,15 @@
     </ModalView>
     <!-- 카테고리 목록 API 필요, 임시로 역할로 설정 -->
     <RequestTaskDropdown
-      v-model="mainCategory"
-      :options="categoryOptions.map(el => el.name)"
+      v-model="categoryForm.firstCategory"
+      :options="RoleKeys"
       label-name="1차 카테고리"
       placeholder-text="1차 카테고리를 선택해주세요"
-      v-if="categoryStep == '2'" />
+      v-if="props.categoryStep == '2'" />
     <RequestTaskInput
       v-model="categoryForm.name"
       placeholder-text="카테고리명을 입력해주세요"
-      :label-name="`${categoryStep}차 카테고리명`" />
+      :label-name="`${props.categoryStep}차 카테고리명`" />
     <RequestTaskInput
       v-model="categoryForm.code"
       placeholder-text="카테고리의 고유코드를 입력해주세요"
@@ -46,16 +46,14 @@
 </template>
 
 <script lang="ts" setup>
-import { CATEGORY_FORM } from '@/constants/admin'
-import { computed, onMounted, ref, watch } from 'vue'
+import { CATEGORY_FIRST_ADD, CATEGORY_SECOND_ADD, RoleKeys } from '@/constants/admin'
+import { computed, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import ModalView from '../ModalView.vue'
 import RequestTaskDropdown from '../request-task/RequestTaskDropdown.vue'
 import RequestTaskInput from '../request-task/RequestTaskInput.vue'
 import { axiosInstance } from '@/utils/axios'
-import { getMainCategory } from '@/api/common'
-import type { Category, CategoryForm } from '@/types/common'
 
 const router = useRouter()
 
@@ -90,19 +88,20 @@ const handleSubmit = async () => {
   if (
     isCodeInvalidate.value ||
     categoryForm.value.name.length === 0 ||
-    categoryForm.value.code.length === 0 ||
-    (categoryStep === '2' && categoryForm.value.mainCategoryId === undefined)
+    categoryForm.value.code.length === 0
   ) {
     handleFailModal()
     return
   }
 
   try {
-    const requestUrl =
-      categoryStep === '1' ? '/api/managements/main-category' : '/api/managements/sub-category'
-    await axiosInstance.post(requestUrl, categoryForm.value, {
-      headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
-    })
+    const response = await axiosInstance.post(
+      '/api/managements/main-category',
+      categoryForm.value,
+      {
+        headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
+      }
+    )
     isModalVisible.value.add = true
   } catch {
     handleFailModal()
@@ -116,17 +115,4 @@ const isCodeInvalidate = computed(() => {
   const isInvalidate = !/^[A-Z]{1,2}$/.test(code)
   return isInvalidate ? 'code' : ''
 })
-
-const mainCategory = ref('')
-const categoryOptions = ref<Category[]>([])
-onMounted(async () => {
-  categoryOptions.value = await getMainCategory()
-  if (categoryStep === '2')
-    categoryForm.value = { ...categoryForm.value, mainCategoryId: undefined }
-})
-watch(mainCategory, () => {
-  categoryForm.value.mainCategoryId = categoryOptions.value.find(
-    el => el.name === mainCategory.value
-  )?.id
-})
 </script>
diff --git a/src/constants/admin.ts b/src/constants/admin.ts
index 44c1e4be..80d934e3 100644
--- a/src/constants/admin.ts
+++ b/src/constants/admin.ts
@@ -41,6 +41,12 @@ export const CATEGORY_FORM: CategoryForm = {
   code: ''
 }
 
+export const CATEGORY_SECOND_ADD: SubCategoryTypes = {
+  name: '',
+  mainCategoryId: 0,
+  code: ''
+}
+
 export const INITIAL_USER_REGISTRATION: UserRegistrationProps = {
   name: '',
   email: '',
diff --git a/src/types/common.ts b/src/types/common.ts
index b742633a..81d7afe7 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -111,14 +111,12 @@ export interface LabelDataTypes {
   labelColor: string
 }
 
-export interface LabelColorTypes {
-  borderColor: string
-  fillColor: string
-  colorEnum: string
+export interface MainCategoryTypes {
+  name: string
+  code: string
 }
 
 export interface SubCategoryTypes {
-  id: number
   mainCategoryId: number
   name: string
   code: string

From 43f5db62fecd7899bd59bdcc7092d04a63bfae5a Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 19:58:46 +0900
Subject: [PATCH 107/180] =?UTF-8?q?:sparkles:=20[feat]=20:=202=EC=B0=A8=20?=
 =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80=20API?=
 =?UTF-8?q?=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-management/CategoryAdd.vue           | 42 ++++++++++++-------
 src/constants/admin.ts                        |  6 ---
 src/types/common.ts                           | 14 ++-----
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/components/task-management/CategoryAdd.vue b/src/components/task-management/CategoryAdd.vue
index fc05ddc5..f96c4c2e 100644
--- a/src/components/task-management/CategoryAdd.vue
+++ b/src/components/task-management/CategoryAdd.vue
@@ -22,15 +22,15 @@
     </ModalView>
     <!-- 카테고리 목록 API 필요, 임시로 역할로 설정 -->
     <RequestTaskDropdown
-      v-model="categoryForm.firstCategory"
-      :options="RoleKeys"
+      v-model="mainCategory"
+      :options="categoryOptions.map(el => el.name)"
       label-name="1차 카테고리"
       placeholder-text="1차 카테고리를 선택해주세요"
-      v-if="props.categoryStep == '2'" />
+      v-if="categoryStep == '2'" />
     <RequestTaskInput
       v-model="categoryForm.name"
       placeholder-text="카테고리명을 입력해주세요"
-      :label-name="`${props.categoryStep}차 카테고리명`" />
+      :label-name="`${categoryStep}차 카테고리명`" />
     <RequestTaskInput
       v-model="categoryForm.code"
       placeholder-text="카테고리의 고유코드를 입력해주세요"
@@ -46,14 +46,16 @@
 </template>
 
 <script lang="ts" setup>
-import { CATEGORY_FIRST_ADD, CATEGORY_SECOND_ADD, RoleKeys } from '@/constants/admin'
-import { computed, ref } from 'vue'
+import { CATEGORY_FORM } from '@/constants/admin'
+import { computed, onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import ModalView from '../ModalView.vue'
 import RequestTaskDropdown from '../request-task/RequestTaskDropdown.vue'
 import RequestTaskInput from '../request-task/RequestTaskInput.vue'
 import { axiosInstance } from '@/utils/axios'
+import { getMainCategory } from '@/api/common'
+import type { Category, CategoryForm } from '@/types/common'
 
 const router = useRouter()
 
@@ -88,20 +90,19 @@ const handleSubmit = async () => {
   if (
     isCodeInvalidate.value ||
     categoryForm.value.name.length === 0 ||
-    categoryForm.value.code.length === 0
+    categoryForm.value.code.length === 0 ||
+    (categoryStep === '2' && categoryForm.value.mainCategoryId === undefined)
   ) {
     handleFailModal()
     return
   }
 
   try {
-    const response = await axiosInstance.post(
-      '/api/managements/main-category',
-      categoryForm.value,
-      {
-        headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
-      }
-    )
+    const requestUrl =
+      categoryStep === '1' ? '/api/managements/main-category' : '/api/managements/sub-category'
+    await axiosInstance.post(requestUrl, categoryForm.value, {
+      headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
+    })
     isModalVisible.value.add = true
   } catch {
     handleFailModal()
@@ -115,4 +116,17 @@ const isCodeInvalidate = computed(() => {
   const isInvalidate = !/^[A-Z]{1,2}$/.test(code)
   return isInvalidate ? 'code' : ''
 })
+
+const mainCategory = ref('')
+const categoryOptions = ref<Category[]>([])
+onMounted(async () => {
+  categoryOptions.value = await getMainCategory()
+  if (categoryStep === '2')
+    categoryForm.value = { ...categoryForm.value, mainCategoryId: undefined }
+})
+watch(mainCategory, () => {
+  categoryForm.value.mainCategoryId = categoryOptions.value.find(
+    el => el.name === mainCategory.value
+  )?.id
+})
 </script>
diff --git a/src/constants/admin.ts b/src/constants/admin.ts
index 80d934e3..44c1e4be 100644
--- a/src/constants/admin.ts
+++ b/src/constants/admin.ts
@@ -41,12 +41,6 @@ export const CATEGORY_FORM: CategoryForm = {
   code: ''
 }
 
-export const CATEGORY_SECOND_ADD: SubCategoryTypes = {
-  name: '',
-  mainCategoryId: 0,
-  code: ''
-}
-
 export const INITIAL_USER_REGISTRATION: UserRegistrationProps = {
   name: '',
   email: '',
diff --git a/src/types/common.ts b/src/types/common.ts
index 81d7afe7..5d69ec27 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -111,22 +111,16 @@ export interface LabelDataTypes {
   labelColor: string
 }
 
-export interface MainCategoryTypes {
-  name: string
-  code: string
-}
-
-export interface SubCategoryTypes {
-  mainCategoryId: number
+export interface CategoryForm {
   name: string
   code: string
+  mainCategoryId?: number
 }
 
 export interface CategoryDropdownProps {
-  placeholderText: string
-  options: MainCategoryTypes[] | SubCategoryTypes[]
+  options: CategoryForm
   labelName: string
-  modelValue: MainCategoryTypes | SubCategoryTypes | null
+  modelValue?: CategoryForm
   isLabel?: boolean
   isDisabled?: boolean
   isInvalidate?: string

From f10015e62f2e5b6207c64c65f0cd6c8520b7d865 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 00:56:14 +0900
Subject: [PATCH 108/180] =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=9A=94=EC=B2=AD?=
 =?UTF-8?q?=20=EA=B8=B0=EB=A1=9D=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=20API=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index 78d4b07e..849a36eb 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -26,13 +26,13 @@ import { useRequestParamsStore } from '@/stores/params'
 import type { MyRequestResponse } from '@/types/user'
 import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
-import { computed, ref, watch } from 'vue'
 import { useParseParams } from '../hooks/useParseParams'
 import ListContainer from '../lists/ListContainer.vue'
 import ListPagination from '../lists/ListPagination.vue'
 import NoContent from '../lists/NoContent.vue'
 import MyRequestListBar from './MyRequestListBar.vue'
 import MyRequestListCard from './MyRequestListCard.vue'
+import { computed } from 'vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {

From 5d64277c487f93b89667fa5795a72316349176ba Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 1 Feb 2025 20:03:17 +0900
Subject: [PATCH 109/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20prop?=
 =?UTF-8?q?=EB=8C=80=EC=8B=A0=20=EC=A7=81=EC=A0=91=20=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=A4=EA=B8=B0,=20=ED=8C=8C=EC=9D=BC=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=EA=B0=92=20=EB=B0=B0=EC=97=B4=EB=A1=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue   | 19 +++++--------------
 .../task-management/CategoryAdd.vue           |  3 ---
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 15fa33fb..5ae9e3ac 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -38,11 +38,10 @@
 </template>
 
 <script lang="ts" setup>
-import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
 import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
-import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { onMounted, ref, watch } from 'vue'
+import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
+import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
@@ -86,17 +85,9 @@ const handleCancel = () => {
 }
 
 const handleSubmit = async () => {
-  if (!category1.value || !category2.value) {
-    isInvalidate.value = 'category'
-    console.log(isInvalidate.value, '변경됨')
-    return
-  } else if (!title.value) {
-    isInvalidate.value = 'input'
-    return
-  }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value.id,
+    categoryId: 1,
     title: title.value,
     description: description.value
   }
@@ -105,15 +96,15 @@ const handleSubmit = async () => {
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
 
   formData.append('taskInfo', newBlob)
-
   if (file.value && file.value.length > 0) {
     file.value.forEach(f => {
       formData.append('attachment', f)
     })
   }
+  console.log(Object.fromEntries(formData), '응답')
+  console.log(file.value, '파일 현황 응답')
   try {
     const res = await postTaskRequest(formData)
-    console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
   }
diff --git a/src/components/task-management/CategoryAdd.vue b/src/components/task-management/CategoryAdd.vue
index f96c4c2e..aa840288 100644
--- a/src/components/task-management/CategoryAdd.vue
+++ b/src/components/task-management/CategoryAdd.vue
@@ -53,9 +53,6 @@ import FormButtonContainer from '../common/FormButtonContainer.vue'
 import ModalView from '../ModalView.vue'
 import RequestTaskDropdown from '../request-task/RequestTaskDropdown.vue'
 import RequestTaskInput from '../request-task/RequestTaskInput.vue'
-import { axiosInstance } from '@/utils/axios'
-import { getMainCategory } from '@/api/common'
-import type { Category, CategoryForm } from '@/types/common'
 
 const router = useRouter()
 

From 43f1c0f4d4bded853625a747fd8613467573145f Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 02:19:43 +0900
Subject: [PATCH 110/180] =?UTF-8?q?:recycle:=20[refactor]=20:=201,2?=
 =?UTF-8?q?=EC=B0=A8=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=84=A0=EC=96=B8=20=EB=B0=8F=20=EC=9C=84=EC=B9=98?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constants/admin.ts | 14 +++++++++++---
 src/types/common.ts    | 18 ++++++++++++------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/constants/admin.ts b/src/constants/admin.ts
index 44c1e4be..15fef027 100644
--- a/src/constants/admin.ts
+++ b/src/constants/admin.ts
@@ -1,4 +1,4 @@
-import type { CategoryForm, ListBarTabProps, Option } from '@/types/common'
+import type { ListBarTabProps, MainCategoryTypes, Option, SubCategoryTypes } from '@/types/common'
 
 export const MEMBER_MANAGEMENT_LIST_BAR_TAB: ListBarTabProps[] = [
   { content: '이름', width: 60 },
@@ -36,9 +36,17 @@ export const LOGS_LIST_BAR_TAB: ListBarTabProps[] = [
 
 import type { RoleTypes, RoleTypesEnum, UserRegistrationProps } from '@/types/admin'
 
-export const CATEGORY_FORM: CategoryForm = {
+export const CATEGORY_FIRST_ADD: MainCategoryTypes = {
   name: '',
-  code: ''
+  code: '',
+  id: 0
+}
+
+export const CATEGORY_SECOND_ADD: SubCategoryTypes = {
+  name: '',
+  mainCategoryId: 0,
+  code: '',
+  id: 0
 }
 
 export const INITIAL_USER_REGISTRATION: UserRegistrationProps = {
diff --git a/src/types/common.ts b/src/types/common.ts
index 5d69ec27..9cdabb39 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -111,17 +111,23 @@ export interface LabelDataTypes {
   labelColor: string
 }
 
-export interface CategoryForm {
+export interface MainCategoryTypes {
+  id: number
+  name: string
+  code: string
+}
+
+export interface SubCategoryTypes {
+  id: number
+  mainCategoryId: number
   name: string
   code: string
-  mainCategoryId?: number
 }
 
 export interface CategoryDropdownProps {
-  options: CategoryForm
+  placeholderText: string
+  options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue?: CategoryForm
+  modelValue: string
   isLabel?: boolean
-  isDisabled?: boolean
-  isInvalidate?: string
 }

From ebae6234e857d57c5cbf29b73fab29b09f6c7716 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:11:02 +0900
Subject: [PATCH 111/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=9D=EC=84=B1=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 11 ++++++-----
 src/types/common.ts                         |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 5ae9e3ac..71f4e0f7 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -38,10 +38,11 @@
 </template>
 
 <script lang="ts" setup>
+import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
 import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
-import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
-import { ref } from 'vue'
+import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
+import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
@@ -87,7 +88,7 @@ const handleCancel = () => {
 const handleSubmit = async () => {
   const formData = new FormData()
   const taskInfo = {
-    categoryId: 1,
+    categoryId: category2.value?.id,
     title: title.value,
     description: description.value
   }
@@ -96,15 +97,15 @@ const handleSubmit = async () => {
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
 
   formData.append('taskInfo', newBlob)
+
   if (file.value && file.value.length > 0) {
     file.value.forEach(f => {
       formData.append('attachment', f)
     })
   }
-  console.log(Object.fromEntries(formData), '응답')
-  console.log(file.value, '파일 현황 응답')
   try {
     const res = await postTaskRequest(formData)
+    console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
   }
diff --git a/src/types/common.ts b/src/types/common.ts
index 9cdabb39..3cbb4155 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -128,6 +128,7 @@ export interface CategoryDropdownProps {
   placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: string
+  modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
+  isDisabled?: boolean
 }

From 5531d7e6eea5e00b23ec3c570083fa5a64318b60 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 11:51:43 +0900
Subject: [PATCH 112/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EB=88=84=EB=9D=BD=EC=8B=9C=20=EA=B2=BD=EA=B3=A0=20?=
 =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue      | 10 +++++++++-
 src/components/request-task/RequestTaskInput.vue |  5 +++++
 src/types/common.ts                              |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 71f4e0f7..15fa33fb 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -86,9 +86,17 @@ const handleCancel = () => {
 }
 
 const handleSubmit = async () => {
+  if (!category1.value || !category2.value) {
+    isInvalidate.value = 'category'
+    console.log(isInvalidate.value, '변경됨')
+    return
+  } else if (!title.value) {
+    isInvalidate.value = 'input'
+    return
+  }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value?.id,
+    categoryId: category2.value.id,
     title: title.value,
     description: description.value
   }
diff --git a/src/components/request-task/RequestTaskInput.vue b/src/components/request-task/RequestTaskInput.vue
index 08949f94..5a411979 100644
--- a/src/components/request-task/RequestTaskInput.vue
+++ b/src/components/request-task/RequestTaskInput.vue
@@ -7,6 +7,11 @@
         class="text-red-1">
         *
       </p>
+      <p
+        v-if="isInvalidateState === 'input'"
+        class="text-red-1">
+        {{ labelName }}을 입력해주세요
+      </p>
     </div>
     <input
       class="w-full h-11 border border-border-1 px-4 focus:outline-none text-black"
diff --git a/src/types/common.ts b/src/types/common.ts
index 3cbb4155..ef3f1c5c 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -131,4 +131,5 @@ export interface CategoryDropdownProps {
   modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
   isDisabled?: boolean
+  isInvalidate?: string
 }

From 2f2449e4e7796eedc67077b0c00b24ff76ccb557 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:03:33 +0900
Subject: [PATCH 113/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=99=84=EB=A3=8C=20=ED=9B=84=20=EB=AA=A8=EB=8B=AC?=
 =?UTF-8?q?=20=EB=B0=8F=20=EB=9D=BC=EC=9A=B0=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 15fa33fb..1b5813d9 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -57,6 +57,7 @@ const title = ref('')
 const description = ref('')
 const file = ref(null as File[] | null)
 const isInvalidate = ref('')
+const isModalVisible = ref(false)
 
 const mainCategoryArr = ref<MainCategoryTypes[]>([])
 const subCategoryArr = ref<SubCategoryTypes[]>([])
@@ -113,6 +114,7 @@ const handleSubmit = async () => {
   }
   try {
     const res = await postTaskRequest(formData)
+    isModalVisible.value = true
     console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)

From a0c74fbbb4d3ba261ecbfe79b30e3ec5020608f7 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 1 Feb 2025 21:14:05 +0900
Subject: [PATCH 114/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20division?=
 =?UTF-8?q?=20->=20label=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                              |  26 +---
 .../task-management/ColorSelectModal.vue      |   8 +-
 .../task-management/LabelManagement.vue       | 127 ++++++++++++------
 .../task-management/LabelManagementLine.vue   |  70 +++++++++-
 src/types/admin.ts                            |   9 +-
 src/types/common.ts                           |  58 +-------
 6 files changed, 157 insertions(+), 141 deletions(-)

diff --git a/src/api/admin.ts b/src/api/admin.ts
index 5a952967..724a89b1 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -1,30 +1,6 @@
-import type { LabelDataTypes, NewLabelTypes } from '@/types/admin'
 import { axiosInstance } from '@/utils/axios'
 
-export const getLabelsAdmin = async () => {
+export const getDivisionsAdmin = async () => {
   const response = await axiosInstance.get('/api/managements/labels')
   return response.data
 }
-
-export const deleteLabelAdmin = async (id: number) => {
-  const response = await axiosInstance.delete(`/api/management/labels/${id}`)
-  return response.data
-}
-
-export const postAddLabelAdmin = async (newLabel: NewLabelTypes) => {
-  const response = await axiosInstance.post('/api/management/labels', newLabel)
-  return response.data
-}
-
-export const patchLabelAdmin = async (editLabel: LabelDataTypes) => {
-  const response = await axiosInstance.patch(`/api/management/labels/${editLabel.labelId}`, {
-    labelName: editLabel.labelName,
-    labelColor: editLabel.labelColor
-  })
-  return response.data
-}
-
-export const deleteCategoryAdmin = async (id: number) => {
-  const response = await axiosInstance.delete(`/api/managements/categories/${id}`)
-  return response.data
-}
diff --git a/src/components/task-management/ColorSelectModal.vue b/src/components/task-management/ColorSelectModal.vue
index 814d57c9..79688b9c 100644
--- a/src/components/task-management/ColorSelectModal.vue
+++ b/src/components/task-management/ColorSelectModal.vue
@@ -1,7 +1,7 @@
 <template>
   <div
-    v-if="isOpen"
-    class="absolute top-7 left-3 w-[176px] h-[120px] p-4 flex flex-col !z-50 shadow-custom rounded-lg bg-white gap-4 import"
+    v-if="isOpen && labelId === selectedLabelId"
+    class="absolute top-7 left-3 w-[176px] h-[120px] p-4 flex flex-col z-50 shadow-custom rounded-lg bg-white gap-4"
     @click.self="closeModal">
     <div class="flex w-full justify-between">
       <p class="text-xs font-bold text-body">색상 선택</p>
@@ -39,8 +39,8 @@ const closeModal = () => {
   emit('close')
 }
 
-const updateColor = (color: LabelColorTypes) => {
-  emit('updateColor', color)
+const updateColor = (color: string) => {
+  console.log(props.labelId, '로 색상 변경 로직', color)
   emit('close')
 }
 </script>
diff --git a/src/components/task-management/LabelManagement.vue b/src/components/task-management/LabelManagement.vue
index 771f512d..cd248122 100644
--- a/src/components/task-management/LabelManagement.vue
+++ b/src/components/task-management/LabelManagement.vue
@@ -7,67 +7,78 @@
         <p>구분명</p>
       </div>
     </div>
-    <div class="flex flex-col w-full shrink-0 overflow-y-auto pb-8">
-      <LabelManagementLine
-        :label-data="labelData"
-        @updateLabels="fetchLabels" />
-      <div
-        v-if="!isAdd"
-        class="w-full h-11 text-xs shrink-0 text-disabled gap-1 category-management-line justify-center cursor-pointer bg-white"
-        @click="isAdd = true">
-        <CommonIcons :name="plusIcon" />
-        새 구분 추가
+    <div class="flex w-full">
+      <LabelManagementLine :label-data="labelData" />
+    </div>
+    <div
+      v-if="!isAdd"
+      class="text-xs text-disabled gap-1 category-management-line justify-center cursor-pointer bg-white"
+      @click="isAdd = true">
+      <CommonIcons :name="plusIcon" />
+      <p>새 구분 추가</p>
+    </div>
+    <div
+      v-else
+      class="category-management-line justify-between bg-white">
+      <div class="flex w-full gap-7 items-center pl-3 relative">
+        <div
+          :style="{
+            borderColor: getColor(newDivision.divisionColor)?.borderColor,
+            backgroundColor: getColor(newDivision.divisionColor)?.fillColor
+          }"
+          class="w-4 h-4 rounded-full border-2 cursor-pointer pr-3"
+          @click="clickColor"></div>
+        <ColorSelectModal
+          v-if="isColorModalVisible"
+          :is-open="isColorModalVisible"
+          :label-id="0"
+          :selected-label-id="0"
+          @close="closeColor" />
+        <input
+          type="text"
+          placeholder="새로운 구분명을 입력"
+          class="w-full flex focus:outline-none" />
       </div>
-      <div
-        v-else
-        class="category-management-line justify-between bg-white shrink-0">
-        <div class="flex w-full gap-7 items-center pl-3 relative">
-          <div
-            :style="{
-              borderColor: getColor(newLabel.labelColor)?.borderColor,
-              backgroundColor: getColor(newLabel.labelColor)?.fillColor
-            }"
-            class="w-4 h-4 rounded-full border-2 cursor-pointer pr-3"
-            @click="handleColor"></div>
-          <ColorSelectModal
-            :is-open="isColorVisible"
-            :newLabel
-            @close="handleColor"
-            @updateColor="updateLabelColor" />
-          <input
-            v-model="newLabel.labelName"
-            type="text"
-            placeholder="새로운 구분명을 입력"
-            class="w-full flex focus:outline-none" />
-        </div>
-        <div class="flex gap-2 text-xs font-bold">
-          <button
-            @click="addNewLabel"
-            class="text-primary1 w-[21px]">
-            확인
-          </button>
-          <button
-            @click="handleAdd"
-            class="text-disabled w-[21px]">
-            취소
-          </button>
-        </div>
+      <div class="flex gap-2 text-xs font-bold">
+        <button
+          @click="addNewDivision"
+          class="text-primary1 w-[21px]">
+          확인
+        </button>
+        <button
+          @click="cancelAddDivision"
+          class="text-disabled w-[21px]">
+          취소
+        </button>
       </div>
     </div>
+    <div class="mt-4">
+      <CategoryList />
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
+<<<<<<< HEAD
 import { getLabelsAdmin, postAddLabelAdmin } from '@/api/admin'
 import { plusIcon } from '@/constants/iconPath'
 import type { LabelDataTypes, NewLabelTypes } from '@/types/admin'
 import type { LabelColorTypes } from '@/types/common'
 import { getColor } from '@/utils/color'
 import { onMounted, ref } from 'vue'
+=======
+import { getDivisionsAdmin } from '@/api/admin'
+import { plusIcon } from '@/constants/iconPath'
+import { mockDivisionData } from '@/datas/taskmanagement'
+import type { LabelDataTypes, NewLabelTypes } from '@/types/admin'
+import { getColor } from '@/utils/color'
+import { ref } from 'vue'
+>>>>>>> f078305 (:recycle: [refactor] : division -> label로 변경)
 import CommonIcons from '../common/CommonIcons.vue'
 import ColorSelectModal from './ColorSelectModal.vue'
 import LabelManagementLine from './LabelManagementLine.vue'
 
+<<<<<<< HEAD
 const labelData = ref<LabelDataTypes[]>([])
 const newLabel = ref<NewLabelTypes>({
   labelName: '',
@@ -103,5 +114,33 @@ const addNewLabel = async () => {
     handleAdd()
     fetchLabels()
   }
+=======
+const Divisions = await getDivisionsAdmin()
+console.log(Divisions)
+
+const labelData = ref<LabelDataTypes[]>(mockDivisionData)
+const newDivision = ref<NewLabelTypes>({
+  divisionName: '새로운 구분',
+  divisionColor: 'red'
+})
+const isColorModalVisible = ref(false)
+const isAdd = ref(false)
+
+const addNewDivision = () => {
+  console.log(newDivision, '추가로직')
+  isAdd.value = false
+}
+
+const cancelAddDivision = () => {
+  isAdd.value = false
+}
+
+const closeColor = () => {
+  isColorModalVisible.value = false
+}
+
+const clickColor = () => {
+  isColorModalVisible.value = true
+>>>>>>> f078305 (:recycle: [refactor] : division -> label로 변경)
 }
 </script>
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index d954c18d..2d797853 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -15,19 +15,20 @@
             @click="isEdit && clickColor(label.labelId)"></div>
           <ColorSelectModal
             v-if="isColorModalVisible && editValue.labelId === label.labelId"
-            :is-open="isColorModalVisible && editValue.labelId === label.labelId"
-            :new-label="editValue"
-            @update-color="updateLabelColor"
-            @close="handleColorModal" />
+            :is-open="isColorModalVisible"
+            :label-id="label.labelId"
+            :selectedLabelId="selectedLabelId"
+            @close="closeColor" />
           <input
             v-if="isEdit && editValue.labelId === label.labelId"
             v-model="editValue.labelName"
+            type="text"
             placeholder="새로운 구분명을 입력"
             class="w-full flex focus:outline-none" />
           <p
             v-else
             class="text-black">
-            {{ label.labelName }}
+            {{ labelData[0].labelName }}
           </p>
         </div>
         <div class="flex gap-2 text-xs font-bold">
@@ -37,11 +38,15 @@
             {{ isEdit && editValue.labelId === label.labelId ? '확인' : '수정' }}
           </button>
           <button
+<<<<<<< HEAD
             @click="
               isEdit && editValue.labelId === label.labelId
                 ? handleEdit()
                 : handleDeleteModal(label.labelId)
             "
+=======
+            @click="isEdit && editValue.labelId === label.labelId ? cancelEdit() : handleDelete()"
+>>>>>>> f078305 (:recycle: [refactor] : division -> label로 변경)
             :class="
               isEdit && editValue.labelId === label.labelId
                 ? 'text-disabled w-[21px]'
@@ -51,6 +56,7 @@
           </button>
         </div>
       </div>
+<<<<<<< HEAD
     </div>
     <ModalView
       type="warningType"
@@ -60,13 +66,27 @@
       <template #header>구분을 삭제 하시겠습니까?</template>
       <template #body>삭제된 구분은 복구할 수 없습니다</template>
     </ModalView>
+=======
+      <ModalView
+        type="warningType"
+        :is-open="isModalVisible"
+        @close="handleCancel">
+        <template #header>구분을 삭제 하시겠습니까?</template>
+        <template #body>삭제된 구분은 복구할 수 없습니다</template>
+      </ModalView>
+    </div>
+>>>>>>> f078305 (:recycle: [refactor] : division -> label로 변경)
   </div>
 </template>
 
 <script setup lang="ts">
+<<<<<<< HEAD
 import { deleteLabelAdmin, patchLabelAdmin } from '@/api/admin'
 import type { LabelDataTypes } from '@/types/admin'
 import type { LabelColorTypes } from '@/types/common'
+=======
+import type { LabelDataTypes } from '@/types/admin'
+>>>>>>> f078305 (:recycle: [refactor] : division -> label로 변경)
 import { getColor } from '@/utils/color'
 import { defineProps, ref } from 'vue'
 import ModalView from '../ModalView.vue'
@@ -75,6 +95,7 @@ import ColorSelectModal from './ColorSelectModal.vue'
 const { labelData } = defineProps<{ labelData: LabelDataTypes[] }>()
 
 const isModalVisible = ref(false)
+<<<<<<< HEAD
 const isColorModalVisible = ref(false)
 const isEdit = ref(false)
 const selectedLabelId = ref<number | null>(null)
@@ -120,5 +141,44 @@ const finishEdit = async () => {
   handleEdit()
   await patchLabelAdmin(editValue.value)
   emit('updateLabels')
+=======
+const isEdit = ref(false)
+const isColorModalVisible = ref(false)
+const selectedLabelId = ref<number | null>(null)
+const editValue = ref<LabelDataTypes>({
+  labelName: '',
+  labelColor: '',
+  labelId: 9999
+})
+
+const handleCancel = () => {
+  isModalVisible.value = false
+}
+
+const handleDelete = () => {
+  isModalVisible.value = true
+}
+
+const clickColor = (labelId: number) => {
+  isColorModalVisible.value = true
+  selectedLabelId.value = labelId
+}
+
+const closeColor = () => {
+  isColorModalVisible.value = false
+}
+
+const startEdit = (label: LabelDataTypes) => {
+  isEdit.value = true
+  editValue.value = label
+}
+
+const finishEdit = () => {
+  isEdit.value = false
+}
+
+const cancelEdit = () => {
+  isEdit.value = false
+>>>>>>> f078305 (:recycle: [refactor] : division -> label로 변경)
 }
 </script>
diff --git a/src/types/admin.ts b/src/types/admin.ts
index 3f27bc28..8d5952f5 100644
--- a/src/types/admin.ts
+++ b/src/types/admin.ts
@@ -53,11 +53,6 @@ export interface LabelDataTypes {
 }
 
 export interface NewLabelTypes {
-  labelName: string
-  labelColor: string
-}
-
-export interface StatisticsData {
-  key: string
-  count: number
+  divisionName: string
+  divisionColor: string
 }
diff --git a/src/types/common.ts b/src/types/common.ts
index ef3f1c5c..204f0aee 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -75,61 +75,7 @@ export interface FormCheckboxProps {
 }
 
 export interface ColorSelectProps {
-  isOpen: boolean
-}
-
-export interface LabelDataTypes {
   labelId: number
-  labelName: string
-  labelColor: string
-}
-
-export interface CategoryForm {
-  name: string
-  code: string
-  mainCategoryId?: number
-}
-
-export interface CategoryForm {
-  name: string
-  code: string
-  mainCategoryId?: number
-}
-
-export interface CategoryDropdownProps {
-  options: CategoryForm
-  labelName: string
-  modelValue?: CategoryForm
-  isLabel?: boolean
-  isDisabled?: boolean
-  isInvalidate?: string
-}
-
-export interface LabelDataTypes {
-  labelId?: number
-  labelName: string
-  labelColor: string
-}
-
-export interface MainCategoryTypes {
-  id: number
-  name: string
-  code: string
-}
-
-export interface SubCategoryTypes {
-  id: number
-  mainCategoryId: number
-  name: string
-  code: string
-}
-
-export interface CategoryDropdownProps {
-  placeholderText: string
-  options: MainCategoryTypes[] | SubCategoryTypes[]
-  labelName: string
-  modelValue: MainCategoryTypes | SubCategoryTypes | null
-  isLabel?: boolean
-  isDisabled?: boolean
-  isInvalidate?: string
+  selectedLabelId: number | null
+  isOpen: boolean
 }

From 9e3f70b2429d4374f79994bd04849734948d3460 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 13:58:03 +0900
Subject: [PATCH 115/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EB=9D=BC?=
 =?UTF-8?q?=EB=B2=A8=20=ED=83=80=EC=9E=85=20=EC=B6=94=EA=B0=80,=20division?=
 =?UTF-8?q?=20->=20label=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/common.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/types/common.ts b/src/types/common.ts
index 204f0aee..dae879e7 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -79,3 +79,9 @@ export interface ColorSelectProps {
   selectedLabelId: number | null
   isOpen: boolean
 }
+
+export interface LabelDataTypes {
+  labelId: number
+  labelName: string
+  labelColor: string
+}

From 7f8459a0807500fa815b333a6bc62035252e6f20 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 14:18:16 +0900
Subject: [PATCH 116/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EA=B5=AC=EB=B6=84=EB=AA=A9=EB=A1=9D=20get?=
 =?UTF-8?q?=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                              |   2 +-
 .../task-management/LabelManagement.vue       | 127 ++++++------------
 .../task-management/LabelManagementLine.vue   |   2 +-
 src/datas/taskmanagement.ts                   |  50 +++++++
 src/types/admin.ts                            |   4 +-
 src/types/common.ts                           |  22 +++
 6 files changed, 120 insertions(+), 87 deletions(-)
 create mode 100644 src/datas/taskmanagement.ts

diff --git a/src/api/admin.ts b/src/api/admin.ts
index 724a89b1..ee143eac 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -1,6 +1,6 @@
 import { axiosInstance } from '@/utils/axios'
 
-export const getDivisionsAdmin = async () => {
+export const getLabelsAdmin = async () => {
   const response = await axiosInstance.get('/api/managements/labels')
   return response.data
 }
diff --git a/src/components/task-management/LabelManagement.vue b/src/components/task-management/LabelManagement.vue
index cd248122..771f512d 100644
--- a/src/components/task-management/LabelManagement.vue
+++ b/src/components/task-management/LabelManagement.vue
@@ -7,78 +7,67 @@
         <p>구분명</p>
       </div>
     </div>
-    <div class="flex w-full">
-      <LabelManagementLine :label-data="labelData" />
-    </div>
-    <div
-      v-if="!isAdd"
-      class="text-xs text-disabled gap-1 category-management-line justify-center cursor-pointer bg-white"
-      @click="isAdd = true">
-      <CommonIcons :name="plusIcon" />
-      <p>새 구분 추가</p>
-    </div>
-    <div
-      v-else
-      class="category-management-line justify-between bg-white">
-      <div class="flex w-full gap-7 items-center pl-3 relative">
-        <div
-          :style="{
-            borderColor: getColor(newDivision.divisionColor)?.borderColor,
-            backgroundColor: getColor(newDivision.divisionColor)?.fillColor
-          }"
-          class="w-4 h-4 rounded-full border-2 cursor-pointer pr-3"
-          @click="clickColor"></div>
-        <ColorSelectModal
-          v-if="isColorModalVisible"
-          :is-open="isColorModalVisible"
-          :label-id="0"
-          :selected-label-id="0"
-          @close="closeColor" />
-        <input
-          type="text"
-          placeholder="새로운 구분명을 입력"
-          class="w-full flex focus:outline-none" />
+    <div class="flex flex-col w-full shrink-0 overflow-y-auto pb-8">
+      <LabelManagementLine
+        :label-data="labelData"
+        @updateLabels="fetchLabels" />
+      <div
+        v-if="!isAdd"
+        class="w-full h-11 text-xs shrink-0 text-disabled gap-1 category-management-line justify-center cursor-pointer bg-white"
+        @click="isAdd = true">
+        <CommonIcons :name="plusIcon" />
+        새 구분 추가
       </div>
-      <div class="flex gap-2 text-xs font-bold">
-        <button
-          @click="addNewDivision"
-          class="text-primary1 w-[21px]">
-          확인
-        </button>
-        <button
-          @click="cancelAddDivision"
-          class="text-disabled w-[21px]">
-          취소
-        </button>
+      <div
+        v-else
+        class="category-management-line justify-between bg-white shrink-0">
+        <div class="flex w-full gap-7 items-center pl-3 relative">
+          <div
+            :style="{
+              borderColor: getColor(newLabel.labelColor)?.borderColor,
+              backgroundColor: getColor(newLabel.labelColor)?.fillColor
+            }"
+            class="w-4 h-4 rounded-full border-2 cursor-pointer pr-3"
+            @click="handleColor"></div>
+          <ColorSelectModal
+            :is-open="isColorVisible"
+            :newLabel
+            @close="handleColor"
+            @updateColor="updateLabelColor" />
+          <input
+            v-model="newLabel.labelName"
+            type="text"
+            placeholder="새로운 구분명을 입력"
+            class="w-full flex focus:outline-none" />
+        </div>
+        <div class="flex gap-2 text-xs font-bold">
+          <button
+            @click="addNewLabel"
+            class="text-primary1 w-[21px]">
+            확인
+          </button>
+          <button
+            @click="handleAdd"
+            class="text-disabled w-[21px]">
+            취소
+          </button>
+        </div>
       </div>
     </div>
-    <div class="mt-4">
-      <CategoryList />
-    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-<<<<<<< HEAD
 import { getLabelsAdmin, postAddLabelAdmin } from '@/api/admin'
 import { plusIcon } from '@/constants/iconPath'
 import type { LabelDataTypes, NewLabelTypes } from '@/types/admin'
 import type { LabelColorTypes } from '@/types/common'
 import { getColor } from '@/utils/color'
 import { onMounted, ref } from 'vue'
-=======
-import { getDivisionsAdmin } from '@/api/admin'
-import { plusIcon } from '@/constants/iconPath'
-import { mockDivisionData } from '@/datas/taskmanagement'
-import type { LabelDataTypes, NewLabelTypes } from '@/types/admin'
-import { getColor } from '@/utils/color'
-import { ref } from 'vue'
->>>>>>> f078305 (:recycle: [refactor] : division -> label로 변경)
 import CommonIcons from '../common/CommonIcons.vue'
 import ColorSelectModal from './ColorSelectModal.vue'
 import LabelManagementLine from './LabelManagementLine.vue'
 
-<<<<<<< HEAD
 const labelData = ref<LabelDataTypes[]>([])
 const newLabel = ref<NewLabelTypes>({
   labelName: '',
@@ -114,33 +103,5 @@ const addNewLabel = async () => {
     handleAdd()
     fetchLabels()
   }
-=======
-const Divisions = await getDivisionsAdmin()
-console.log(Divisions)
-
-const labelData = ref<LabelDataTypes[]>(mockDivisionData)
-const newDivision = ref<NewLabelTypes>({
-  divisionName: '새로운 구분',
-  divisionColor: 'red'
-})
-const isColorModalVisible = ref(false)
-const isAdd = ref(false)
-
-const addNewDivision = () => {
-  console.log(newDivision, '추가로직')
-  isAdd.value = false
-}
-
-const cancelAddDivision = () => {
-  isAdd.value = false
-}
-
-const closeColor = () => {
-  isColorModalVisible.value = false
-}
-
-const clickColor = () => {
-  isColorModalVisible.value = true
->>>>>>> f078305 (:recycle: [refactor] : division -> label로 변경)
 }
 </script>
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index 2d797853..3db3fa4b 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -28,7 +28,7 @@
           <p
             v-else
             class="text-black">
-            {{ labelData[0].labelName }}
+            {{ label.labelName }}
           </p>
         </div>
         <div class="flex gap-2 text-xs font-bold">
diff --git a/src/datas/taskmanagement.ts b/src/datas/taskmanagement.ts
new file mode 100644
index 00000000..822c2eab
--- /dev/null
+++ b/src/datas/taskmanagement.ts
@@ -0,0 +1,50 @@
+import type { CategoryAllData } from '@/types/admin'
+
+export const mockCategoryAllData: CategoryAllData = {
+  categories: [
+    {
+      id: 1,
+      name: 'VM',
+      code: 'VM001',
+      subCategory: [
+        {
+          id: 1,
+          mainCategoryId: 1,
+          name: 'VM 생성',
+          code: 'VM_CR'
+        },
+        {
+          id: 2,
+          mainCategoryId: 1,
+          name: 'VM 수정',
+          code: 'VM_UD'
+        },
+        {
+          id: 3,
+          mainCategoryId: 1,
+          name: 'VM 삭제',
+          code: 'VM_DE'
+        }
+      ]
+    },
+    {
+      id: 2,
+      name: 'NFS',
+      code: 'NFS001',
+      subCategory: [
+        {
+          id: 4,
+          mainCategoryId: 2,
+          name: 'NFS 생성',
+          code: 'NFS_CR'
+        },
+        {
+          id: 5,
+          mainCategoryId: 2,
+          name: 'NFS 수정',
+          code: 'NFS_UD'
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/types/admin.ts b/src/types/admin.ts
index 8d5952f5..08589211 100644
--- a/src/types/admin.ts
+++ b/src/types/admin.ts
@@ -53,6 +53,6 @@ export interface LabelDataTypes {
 }
 
 export interface NewLabelTypes {
-  divisionName: string
-  divisionColor: string
+  labelName: string
+  labelColor: string
 }
diff --git a/src/types/common.ts b/src/types/common.ts
index dae879e7..8e9eba27 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -80,6 +80,28 @@ export interface ColorSelectProps {
   isOpen: boolean
 }
 
+export interface MainCategoryTypes {
+  id: number
+  name: string
+  code: string
+}
+
+export interface SubCategoryTypes {
+  id: number
+  mainCategoryId: number
+  name: string
+  code: string
+}
+
+export interface CategoryDropdownProps {
+  options: MainCategoryTypes[] | SubCategoryTypes[]
+  labelName: string
+  modelValue: MainCategoryTypes | SubCategoryTypes | null
+  isLabel?: boolean
+  isDisabled?: boolean
+  isInvalidate?: string
+}
+
 export interface LabelDataTypes {
   labelId: number
   labelName: string

From 12b07a8a49af43a7483bffb1e7abdec86a9a9d57 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 14:45:41 +0900
Subject: [PATCH 117/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EB=AA=A8?=
 =?UTF-8?q?=EB=8B=AC=20=EB=B0=8F=20=EC=83=81=ED=83=9C=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=ED=95=A8=EC=88=98=20=ED=95=98=EB=82=98=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                              |  5 ++
 .../task-management/LabelManagementLine.vue   | 68 ++-----------------
 2 files changed, 9 insertions(+), 64 deletions(-)

diff --git a/src/api/admin.ts b/src/api/admin.ts
index ee143eac..f8e075f6 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -4,3 +4,8 @@ export const getLabelsAdmin = async () => {
   const response = await axiosInstance.get('/api/managements/labels')
   return response.data
 }
+
+export const deleteLabelAdmin = async (id: string) => {
+  const response = await axiosInstance.delete(`/api/managements/labels/${id}`)
+  return response.data
+}
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index 3db3fa4b..d954c18d 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -15,14 +15,13 @@
             @click="isEdit && clickColor(label.labelId)"></div>
           <ColorSelectModal
             v-if="isColorModalVisible && editValue.labelId === label.labelId"
-            :is-open="isColorModalVisible"
-            :label-id="label.labelId"
-            :selectedLabelId="selectedLabelId"
-            @close="closeColor" />
+            :is-open="isColorModalVisible && editValue.labelId === label.labelId"
+            :new-label="editValue"
+            @update-color="updateLabelColor"
+            @close="handleColorModal" />
           <input
             v-if="isEdit && editValue.labelId === label.labelId"
             v-model="editValue.labelName"
-            type="text"
             placeholder="새로운 구분명을 입력"
             class="w-full flex focus:outline-none" />
           <p
@@ -38,15 +37,11 @@
             {{ isEdit && editValue.labelId === label.labelId ? '확인' : '수정' }}
           </button>
           <button
-<<<<<<< HEAD
             @click="
               isEdit && editValue.labelId === label.labelId
                 ? handleEdit()
                 : handleDeleteModal(label.labelId)
             "
-=======
-            @click="isEdit && editValue.labelId === label.labelId ? cancelEdit() : handleDelete()"
->>>>>>> f078305 (:recycle: [refactor] : division -> label로 변경)
             :class="
               isEdit && editValue.labelId === label.labelId
                 ? 'text-disabled w-[21px]'
@@ -56,7 +51,6 @@
           </button>
         </div>
       </div>
-<<<<<<< HEAD
     </div>
     <ModalView
       type="warningType"
@@ -66,27 +60,13 @@
       <template #header>구분을 삭제 하시겠습니까?</template>
       <template #body>삭제된 구분은 복구할 수 없습니다</template>
     </ModalView>
-=======
-      <ModalView
-        type="warningType"
-        :is-open="isModalVisible"
-        @close="handleCancel">
-        <template #header>구분을 삭제 하시겠습니까?</template>
-        <template #body>삭제된 구분은 복구할 수 없습니다</template>
-      </ModalView>
-    </div>
->>>>>>> f078305 (:recycle: [refactor] : division -> label로 변경)
   </div>
 </template>
 
 <script setup lang="ts">
-<<<<<<< HEAD
 import { deleteLabelAdmin, patchLabelAdmin } from '@/api/admin'
 import type { LabelDataTypes } from '@/types/admin'
 import type { LabelColorTypes } from '@/types/common'
-=======
-import type { LabelDataTypes } from '@/types/admin'
->>>>>>> f078305 (:recycle: [refactor] : division -> label로 변경)
 import { getColor } from '@/utils/color'
 import { defineProps, ref } from 'vue'
 import ModalView from '../ModalView.vue'
@@ -95,7 +75,6 @@ import ColorSelectModal from './ColorSelectModal.vue'
 const { labelData } = defineProps<{ labelData: LabelDataTypes[] }>()
 
 const isModalVisible = ref(false)
-<<<<<<< HEAD
 const isColorModalVisible = ref(false)
 const isEdit = ref(false)
 const selectedLabelId = ref<number | null>(null)
@@ -141,44 +120,5 @@ const finishEdit = async () => {
   handleEdit()
   await patchLabelAdmin(editValue.value)
   emit('updateLabels')
-=======
-const isEdit = ref(false)
-const isColorModalVisible = ref(false)
-const selectedLabelId = ref<number | null>(null)
-const editValue = ref<LabelDataTypes>({
-  labelName: '',
-  labelColor: '',
-  labelId: 9999
-})
-
-const handleCancel = () => {
-  isModalVisible.value = false
-}
-
-const handleDelete = () => {
-  isModalVisible.value = true
-}
-
-const clickColor = (labelId: number) => {
-  isColorModalVisible.value = true
-  selectedLabelId.value = labelId
-}
-
-const closeColor = () => {
-  isColorModalVisible.value = false
-}
-
-const startEdit = (label: LabelDataTypes) => {
-  isEdit.value = true
-  editValue.value = label
-}
-
-const finishEdit = () => {
-  isEdit.value = false
-}
-
-const cancelEdit = () => {
-  isEdit.value = false
->>>>>>> f078305 (:recycle: [refactor] : division -> label로 변경)
 }
 </script>

From ea8e76242c3059d8e160c8f17b85a405ff5930f4 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 14:59:57 +0900
Subject: [PATCH 118/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EA=B5=AC?=
 =?UTF-8?q?=EB=B6=84=20=EC=82=AD=EC=A0=9C=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                              |  4 +--
 .../task-management/LabelManagementLine.vue   | 26 +++++++++++--------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/api/admin.ts b/src/api/admin.ts
index f8e075f6..c3d4d687 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -5,7 +5,7 @@ export const getLabelsAdmin = async () => {
   return response.data
 }
 
-export const deleteLabelAdmin = async (id: string) => {
-  const response = await axiosInstance.delete(`/api/managements/labels/${id}`)
+export const deleteLabelAdmin = async (id: number) => {
+  const response = await axiosInstance.delete(`/api/management/labels/${id}`)
   return response.data
 }
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index d954c18d..d118b3c1 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -51,6 +51,14 @@
           </button>
         </div>
       </div>
+      <ModalView
+        type="warningType"
+        :is-open="isModalVisible"
+        @close="handleDeleteModal"
+        @click="deleteLabel(label.labelId)">
+        <template #header>구분을 삭제 하시겠습니까?</template>
+        <template #body>삭제된 구분은 복구할 수 없습니다</template>
+      </ModalView>
     </div>
     <ModalView
       type="warningType"
@@ -64,7 +72,7 @@
 </template>
 
 <script setup lang="ts">
-import { deleteLabelAdmin, patchLabelAdmin } from '@/api/admin'
+import { deleteLabelAdmin } from '@/api/admin'
 import type { LabelDataTypes } from '@/types/admin'
 import type { LabelColorTypes } from '@/types/common'
 import { getColor } from '@/utils/color'
@@ -85,21 +93,17 @@ const editValue = ref<LabelDataTypes>({
   labelId: 0
 })
 
-const emit = defineEmits(['updateLabels'])
-
-const handleDeleteModal = (labelId: number | null) => {
-  isModalVisible.value = !isModalVisible.value
-  selectedLabelId.value = labelId
-}
+const handleDeleteModal = () => (isModalVisible.value = !isModalVisible.value)
 
 const handleColorModal = () => (isColorModalVisible.value = !isColorModalVisible.value)
 
 const handleEdit = () => (isEdit.value = !isEdit.value)
 
-const deleteLabel = async (labelId: number) => {
-  await deleteLabelAdmin(labelId)
-  emit('updateLabels')
-  handleDeleteModal(0)
+const deleteLabel = async (id: number) => {
+  console.log('삭제중')
+  const res = await deleteLabelAdmin(id)
+  console.log(res)
+  handleDeleteModal()
 }
 
 const clickColor = (labelId: number) => {

From 5851d3ca36dd2126d605c06aa0126daa04aae18d Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 16:11:19 +0900
Subject: [PATCH 119/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EA=B5=AC?=
 =?UTF-8?q?=EB=B6=84=20=EC=B6=94=EA=B0=80=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                                       | 6 ++++++
 src/components/task-management/LabelManagementLine.vue | 9 ++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/api/admin.ts b/src/api/admin.ts
index c3d4d687..935fde83 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -1,3 +1,4 @@
+import type { NewLabelTypes } from '@/types/admin'
 import { axiosInstance } from '@/utils/axios'
 
 export const getLabelsAdmin = async () => {
@@ -9,3 +10,8 @@ export const deleteLabelAdmin = async (id: number) => {
   const response = await axiosInstance.delete(`/api/management/labels/${id}`)
   return response.data
 }
+
+export const postAddLabelAdmin = async (newLabel: NewLabelTypes) => {
+  const response = await axiosInstance.post('/api/management/labels', newLabel)
+  return response.data
+}
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index d118b3c1..75e8ff27 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -15,9 +15,10 @@
             @click="isEdit && clickColor(label.labelId)"></div>
           <ColorSelectModal
             v-if="isColorModalVisible && editValue.labelId === label.labelId"
-            :is-open="isColorModalVisible && editValue.labelId === label.labelId"
+            :is-open="isColorModalVisible"
+            :label-id="label.labelId"
+            :selectedLabelId="selectedLabelId"
             :new-label="editValue"
-            @update-color="updateLabelColor"
             @close="handleColorModal" />
           <input
             v-if="isEdit && editValue.labelId === label.labelId"
@@ -100,9 +101,7 @@ const handleColorModal = () => (isColorModalVisible.value = !isColorModalVisible
 const handleEdit = () => (isEdit.value = !isEdit.value)
 
 const deleteLabel = async (id: number) => {
-  console.log('삭제중')
-  const res = await deleteLabelAdmin(id)
-  console.log(res)
+  deleteLabelAdmin(id)
   handleDeleteModal()
 }
 

From 86230cf9dbe599177153e30ebc2b54196dd2b23b Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 17:01:38 +0900
Subject: [PATCH 120/180] =?UTF-8?q?:bug:=20[fix]=20:=20=EA=B5=AC=EB=B6=84?=
 =?UTF-8?q?=20=EC=82=AD=EC=A0=9C=20=EB=A7=88=EC=A7=80=EB=A7=89=20=EA=B0=92?=
 =?UTF-8?q?=EC=9D=B4=20=EB=90=98=EB=8A=94=20=EC=97=90=EB=9F=AC=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-management/LabelManagement.vue       | 106 +++++++++---------
 .../task-management/LabelManagementLine.vue   |  25 ++---
 2 files changed, 59 insertions(+), 72 deletions(-)

diff --git a/src/components/task-management/LabelManagement.vue b/src/components/task-management/LabelManagement.vue
index 771f512d..05f202c0 100644
--- a/src/components/task-management/LabelManagement.vue
+++ b/src/components/task-management/LabelManagement.vue
@@ -7,51 +7,49 @@
         <p>구분명</p>
       </div>
     </div>
-    <div class="flex flex-col w-full shrink-0 overflow-y-auto pb-8">
-      <LabelManagementLine
-        :label-data="labelData"
-        @updateLabels="fetchLabels" />
-      <div
-        v-if="!isAdd"
-        class="w-full h-11 text-xs shrink-0 text-disabled gap-1 category-management-line justify-center cursor-pointer bg-white"
-        @click="isAdd = true">
-        <CommonIcons :name="plusIcon" />
-        새 구분 추가
+    <div class="flex w-full">
+      <LabelManagementLine :label-data="labelData" />
+    </div>
+    <div
+      v-if="!isAdd"
+      class="text-xs text-disabled gap-1 category-management-line justify-center cursor-pointer bg-white"
+      @click="isAdd = true">
+      <CommonIcons :name="plusIcon" />
+      <p>새 구분 추가</p>
+    </div>
+    <div
+      v-else
+      class="category-management-line justify-between bg-white">
+      <div class="flex w-full gap-7 items-center pl-3 relative">
+        <div
+          :style="{
+            borderColor: getColor(newLabel.labelColor)?.borderColor,
+            backgroundColor: getColor(newLabel.labelColor)?.fillColor
+          }"
+          class="w-4 h-4 rounded-full border-2 cursor-pointer pr-3"
+          @click="handleColor"></div>
+        <ColorSelectModal
+          :is-open="isColorVisible"
+          :newLabel
+          @close="handleColor"
+          @updateColor="updateLabelColor" />
+        <input
+          v-model="newLabel.labelName"
+          type="text"
+          placeholder="새로운 구분명을 입력"
+          class="w-full flex focus:outline-none" />
       </div>
-      <div
-        v-else
-        class="category-management-line justify-between bg-white shrink-0">
-        <div class="flex w-full gap-7 items-center pl-3 relative">
-          <div
-            :style="{
-              borderColor: getColor(newLabel.labelColor)?.borderColor,
-              backgroundColor: getColor(newLabel.labelColor)?.fillColor
-            }"
-            class="w-4 h-4 rounded-full border-2 cursor-pointer pr-3"
-            @click="handleColor"></div>
-          <ColorSelectModal
-            :is-open="isColorVisible"
-            :newLabel
-            @close="handleColor"
-            @updateColor="updateLabelColor" />
-          <input
-            v-model="newLabel.labelName"
-            type="text"
-            placeholder="새로운 구분명을 입력"
-            class="w-full flex focus:outline-none" />
-        </div>
-        <div class="flex gap-2 text-xs font-bold">
-          <button
-            @click="addNewLabel"
-            class="text-primary1 w-[21px]">
-            확인
-          </button>
-          <button
-            @click="handleAdd"
-            class="text-disabled w-[21px]">
-            취소
-          </button>
-        </div>
+      <div class="flex gap-2 text-xs font-bold">
+        <button
+          @click="addNewLabel"
+          class="text-primary1 w-[21px]">
+          확인
+        </button>
+        <button
+          @click="handleAdd"
+          class="text-disabled w-[21px]">
+          취소
+        </button>
       </div>
     </div>
   </div>
@@ -68,22 +66,20 @@ import CommonIcons from '../common/CommonIcons.vue'
 import ColorSelectModal from './ColorSelectModal.vue'
 import LabelManagementLine from './LabelManagementLine.vue'
 
+onMounted(async () => {
+  const Labels = await getLabelsAdmin()
+  labelData.value = Labels
+})
+
 const labelData = ref<LabelDataTypes[]>([])
 const newLabel = ref<NewLabelTypes>({
   labelName: '',
   labelColor: 'RED'
 })
+
 const isColorVisible = ref(false)
 const isAdd = ref(false)
 
-const fetchLabels = async () => {
-  labelData.value = await getLabelsAdmin()
-}
-
-onMounted(async () => {
-  fetchLabels()
-})
-
 const handleAdd = () => {
   isAdd.value = !isAdd.value
 }
@@ -96,12 +92,10 @@ const updateLabelColor = (color: LabelColorTypes) => {
   newLabel.value.labelColor = color.colorEnum
 }
 
-const addNewLabel = async () => {
+const addNewLabel = () => {
   if (newLabel.value.labelName !== '') {
-    await postAddLabelAdmin(newLabel.value)
-    newLabel.value.labelName = ''
+    postAddLabelAdmin(newLabel.value)
     handleAdd()
-    fetchLabels()
   }
 }
 </script>
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index 75e8ff27..40620b57 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -15,9 +15,7 @@
             @click="isEdit && clickColor(label.labelId)"></div>
           <ColorSelectModal
             v-if="isColorModalVisible && editValue.labelId === label.labelId"
-            :is-open="isColorModalVisible"
-            :label-id="label.labelId"
-            :selectedLabelId="selectedLabelId"
+            :is-open="isColorModalVisible && editValue.labelId === label.labelId"
             :new-label="editValue"
             @close="handleColorModal" />
           <input
@@ -52,21 +50,13 @@
           </button>
         </div>
       </div>
-      <ModalView
-        type="warningType"
-        :is-open="isModalVisible"
-        @close="handleDeleteModal"
-        @click="deleteLabel(label.labelId)">
-        <template #header>구분을 삭제 하시겠습니까?</template>
-        <template #body>삭제된 구분은 복구할 수 없습니다</template>
-      </ModalView>
     </div>
     <ModalView
       type="warningType"
       :is-open="isModalVisible"
       @close="handleDeleteModal(null)"
       @click="deleteLabel(selectedLabelId || 0)">
-      <template #header>구분을 삭제 하시겠습니까?</template>
+      <template #header>{{ selectedLabelId }}구분을 삭제 하시겠습니까?</template>
       <template #body>삭제된 구분은 복구할 수 없습니다</template>
     </ModalView>
   </div>
@@ -94,15 +84,18 @@ const editValue = ref<LabelDataTypes>({
   labelId: 0
 })
 
-const handleDeleteModal = () => (isModalVisible.value = !isModalVisible.value)
+const handleDeleteModal = (labelId: number | null) => {
+  isModalVisible.value = !isModalVisible.value
+  selectedLabelId.value = labelId
+}
 
 const handleColorModal = () => (isColorModalVisible.value = !isColorModalVisible.value)
 
 const handleEdit = () => (isEdit.value = !isEdit.value)
 
-const deleteLabel = async (id: number) => {
-  deleteLabelAdmin(id)
-  handleDeleteModal()
+const deleteLabel = async (labelId: number) => {
+  deleteLabelAdmin(labelId)
+  handleDeleteModal(0)
 }
 
 const clickColor = (labelId: number) => {

From 00e62cf9ec4e6d8555ab7fb59d307994a666d20a Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 17:02:22 +0900
Subject: [PATCH 121/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=83=89?=
 =?UTF-8?q?=EC=83=81=20=ED=83=80=EC=9E=85=EC=97=90=20enum=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=B6=94=EA=B0=80=EB=A5=BC=20=ED=86=B5=ED=95=9C=20?=
 =?UTF-8?q?=EC=83=89=EA=B9=94=20=EB=B3=80=EA=B2=BD=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-management/ColorSelectModal.vue |  6 +++---
 src/types/common.ts                                 | 11 ++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/task-management/ColorSelectModal.vue b/src/components/task-management/ColorSelectModal.vue
index 79688b9c..1679d10a 100644
--- a/src/components/task-management/ColorSelectModal.vue
+++ b/src/components/task-management/ColorSelectModal.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="isOpen && labelId === selectedLabelId"
+    v-if="isOpen"
     class="absolute top-7 left-3 w-[176px] h-[120px] p-4 flex flex-col z-50 shadow-custom rounded-lg bg-white gap-4"
     @click.self="closeModal">
     <div class="flex w-full justify-between">
@@ -39,8 +39,8 @@ const closeModal = () => {
   emit('close')
 }
 
-const updateColor = (color: string) => {
-  console.log(props.labelId, '로 색상 변경 로직', color)
+const updateColor = (color: LabelColorTypes) => {
+  emit('updateColor', color)
   emit('close')
 }
 </script>
diff --git a/src/types/common.ts b/src/types/common.ts
index 8e9eba27..bbb903e8 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -75,9 +75,8 @@ export interface FormCheckboxProps {
 }
 
 export interface ColorSelectProps {
-  labelId: number
-  selectedLabelId: number | null
   isOpen: boolean
+  newLabel: LabelDataTypes
 }
 
 export interface MainCategoryTypes {
@@ -103,7 +102,13 @@ export interface CategoryDropdownProps {
 }
 
 export interface LabelDataTypes {
-  labelId: number
+  labelId?: number
   labelName: string
   labelColor: string
 }
+
+export interface LabelColorTypes {
+  borderColor: string
+  fillColor: string
+  colorEnum: string
+}

From 7ceccad3c2923cf743f13c9a2377504078ff0882 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 17:17:19 +0900
Subject: [PATCH 122/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EA=B5=AC?=
 =?UTF-8?q?=EB=B6=84=20=EC=88=98=EC=A0=95=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                                       | 10 +++++++++-
 src/components/task-management/LabelManagementLine.vue |  8 ++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/api/admin.ts b/src/api/admin.ts
index 935fde83..b08aaf88 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -1,4 +1,4 @@
-import type { NewLabelTypes } from '@/types/admin'
+import type { LabelDataTypes, NewLabelTypes } from '@/types/admin'
 import { axiosInstance } from '@/utils/axios'
 
 export const getLabelsAdmin = async () => {
@@ -15,3 +15,11 @@ export const postAddLabelAdmin = async (newLabel: NewLabelTypes) => {
   const response = await axiosInstance.post('/api/management/labels', newLabel)
   return response.data
 }
+
+export const patchLabelAdmin = async (editLabel: LabelDataTypes) => {
+  const response = await axiosInstance.patch(`/api/management/labels/${editLabel.labelId}`, {
+    labelName: editLabel.labelName,
+    labelColor: editLabel.labelColor
+  })
+  return response.data
+}
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index 40620b57..fb4c3d97 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -17,6 +17,7 @@
             v-if="isColorModalVisible && editValue.labelId === label.labelId"
             :is-open="isColorModalVisible && editValue.labelId === label.labelId"
             :new-label="editValue"
+            @update-color="updateLabelColor"
             @close="handleColorModal" />
           <input
             v-if="isEdit && editValue.labelId === label.labelId"
@@ -63,7 +64,7 @@
 </template>
 
 <script setup lang="ts">
-import { deleteLabelAdmin } from '@/api/admin'
+import { deleteLabelAdmin, patchLabelAdmin } from '@/api/admin'
 import type { LabelDataTypes } from '@/types/admin'
 import type { LabelColorTypes } from '@/types/common'
 import { getColor } from '@/utils/color'
@@ -112,9 +113,8 @@ const updateLabelColor = (color: LabelColorTypes) => {
   editValue.value.labelColor = color.colorEnum
 }
 
-const finishEdit = async () => {
+const finishEdit = () => {
   handleEdit()
-  await patchLabelAdmin(editValue.value)
-  emit('updateLabels')
+  patchLabelAdmin(editValue.value)
 }
 </script>

From d5ae4db89595ebea2d2391091a22227b09ab5d9d Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 21:12:18 +0900
Subject: [PATCH 123/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=82=AD=EC=A0=9C=20=EC=A6=89=EA=B0=81=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-management/LabelManagement.vue       | 106 +++++++++---------
 .../task-management/LabelManagementLine.vue   |   8 +-
 2 files changed, 62 insertions(+), 52 deletions(-)

diff --git a/src/components/task-management/LabelManagement.vue b/src/components/task-management/LabelManagement.vue
index 05f202c0..5caabede 100644
--- a/src/components/task-management/LabelManagement.vue
+++ b/src/components/task-management/LabelManagement.vue
@@ -7,49 +7,51 @@
         <p>구분명</p>
       </div>
     </div>
-    <div class="flex w-full">
-      <LabelManagementLine :label-data="labelData" />
-    </div>
-    <div
-      v-if="!isAdd"
-      class="text-xs text-disabled gap-1 category-management-line justify-center cursor-pointer bg-white"
-      @click="isAdd = true">
-      <CommonIcons :name="plusIcon" />
-      <p>새 구분 추가</p>
-    </div>
-    <div
-      v-else
-      class="category-management-line justify-between bg-white">
-      <div class="flex w-full gap-7 items-center pl-3 relative">
-        <div
-          :style="{
-            borderColor: getColor(newLabel.labelColor)?.borderColor,
-            backgroundColor: getColor(newLabel.labelColor)?.fillColor
-          }"
-          class="w-4 h-4 rounded-full border-2 cursor-pointer pr-3"
-          @click="handleColor"></div>
-        <ColorSelectModal
-          :is-open="isColorVisible"
-          :newLabel
-          @close="handleColor"
-          @updateColor="updateLabelColor" />
-        <input
-          v-model="newLabel.labelName"
-          type="text"
-          placeholder="새로운 구분명을 입력"
-          class="w-full flex focus:outline-none" />
+    <div class="flex flex-col w-full max-h-44 overflow-y-auto">
+      <LabelManagementLine
+        :label-data="labelData"
+        @updateLabels="fetchLabels" />
+      <div
+        v-if="!isAdd"
+        class="w-full h-11 text-xs shrink-0 text-disabled gap-1 category-management-line justify-center cursor-pointer bg-white"
+        @click="isAdd = true">
+        <CommonIcons :name="plusIcon" />
+        새 구분 추가
       </div>
-      <div class="flex gap-2 text-xs font-bold">
-        <button
-          @click="addNewLabel"
-          class="text-primary1 w-[21px]">
-          확인
-        </button>
-        <button
-          @click="handleAdd"
-          class="text-disabled w-[21px]">
-          취소
-        </button>
+      <div
+        v-else
+        class="category-management-line justify-between bg-white shrink-0">
+        <div class="flex w-full gap-7 items-center pl-3 relative">
+          <div
+            :style="{
+              borderColor: getColor(newLabel.labelColor)?.borderColor,
+              backgroundColor: getColor(newLabel.labelColor)?.fillColor
+            }"
+            class="w-4 h-4 rounded-full border-2 cursor-pointer pr-3"
+            @click="handleColor"></div>
+          <ColorSelectModal
+            :is-open="isColorVisible"
+            :newLabel
+            @close="handleColor"
+            @updateColor="updateLabelColor" />
+          <input
+            v-model="newLabel.labelName"
+            type="text"
+            placeholder="새로운 구분명을 입력"
+            class="w-full flex focus:outline-none" />
+        </div>
+        <div class="flex gap-2 text-xs font-bold">
+          <button
+            @click="addNewLabel"
+            class="text-primary1 w-[21px]">
+            확인
+          </button>
+          <button
+            @click="handleAdd"
+            class="text-disabled w-[21px]">
+            취소
+          </button>
+        </div>
       </div>
     </div>
   </div>
@@ -66,20 +68,22 @@ import CommonIcons from '../common/CommonIcons.vue'
 import ColorSelectModal from './ColorSelectModal.vue'
 import LabelManagementLine from './LabelManagementLine.vue'
 
-onMounted(async () => {
-  const Labels = await getLabelsAdmin()
-  labelData.value = Labels
-})
-
 const labelData = ref<LabelDataTypes[]>([])
 const newLabel = ref<NewLabelTypes>({
   labelName: '',
   labelColor: 'RED'
 })
-
 const isColorVisible = ref(false)
 const isAdd = ref(false)
 
+const fetchLabels = async () => {
+  labelData.value = await getLabelsAdmin()
+}
+
+onMounted(async () => {
+  fetchLabels()
+})
+
 const handleAdd = () => {
   isAdd.value = !isAdd.value
 }
@@ -92,10 +96,12 @@ const updateLabelColor = (color: LabelColorTypes) => {
   newLabel.value.labelColor = color.colorEnum
 }
 
-const addNewLabel = () => {
+const addNewLabel = async () => {
   if (newLabel.value.labelName !== '') {
-    postAddLabelAdmin(newLabel.value)
+    await postAddLabelAdmin(newLabel.value)
+    newLabel.value.labelName = ''
     handleAdd()
+    fetchLabels()
   }
 }
 </script>
diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index fb4c3d97..3d3517b7 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -57,7 +57,7 @@
       :is-open="isModalVisible"
       @close="handleDeleteModal(null)"
       @click="deleteLabel(selectedLabelId || 0)">
-      <template #header>{{ selectedLabelId }}구분을 삭제 하시겠습니까?</template>
+      <template #header>구분을 삭제 하시겠습니까?</template>
       <template #body>삭제된 구분은 복구할 수 없습니다</template>
     </ModalView>
   </div>
@@ -85,6 +85,8 @@ const editValue = ref<LabelDataTypes>({
   labelId: 0
 })
 
+const emit = defineEmits(['updateLabels'])
+
 const handleDeleteModal = (labelId: number | null) => {
   isModalVisible.value = !isModalVisible.value
   selectedLabelId.value = labelId
@@ -95,7 +97,8 @@ const handleColorModal = () => (isColorModalVisible.value = !isColorModalVisible
 const handleEdit = () => (isEdit.value = !isEdit.value)
 
 const deleteLabel = async (labelId: number) => {
-  deleteLabelAdmin(labelId)
+  await deleteLabelAdmin(labelId)
+  emit('updateLabels')
   handleDeleteModal(0)
 }
 
@@ -116,5 +119,6 @@ const updateLabelColor = (color: LabelColorTypes) => {
 const finishEdit = () => {
   handleEdit()
   patchLabelAdmin(editValue.value)
+  emit('updateLabels')
 }
 </script>

From 7bea2c082fe9853f639138702b0677a5f77dcfb1 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 21:40:51 +0900
Subject: [PATCH 124/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20axios=20?=
 =?UTF-8?q?=EC=9D=B8=EC=8A=A4=ED=84=B4=EC=8A=A4=20=EB=B6=88=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=20=EC=BD=98=EC=86=94=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/axios.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/axios.ts b/src/utils/axios.ts
index ae769d70..2531c53c 100644
--- a/src/utils/axios.ts
+++ b/src/utils/axios.ts
@@ -11,7 +11,6 @@ const setInterceptors = (instance: AxiosInstance) => {
         if (token) {
           config.headers.Authorization = `Bearer ${token}`
         }
-        console.log(token, '으로 요청 중')
       }
       return config
     },

From e817d074937fef18ebbfe54378e26adefd84f825 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 00:40:26 +0900
Subject: [PATCH 125/180] =?UTF-8?q?=EC=8A=B9=EC=9D=B8=20=EB=8C=80=EA=B8=B0?=
 =?UTF-8?q?=20=EC=A4=91=EC=9D=B8=20=EC=9A=94=EC=B2=AD=20=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20API=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/requested/RequestedList.vue | 17 +++++++++++------
 src/types/manager.ts                       | 10 ----------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/components/requested/RequestedList.vue b/src/components/requested/RequestedList.vue
index b5b25eab..43f52a12 100644
--- a/src/components/requested/RequestedList.vue
+++ b/src/components/requested/RequestedList.vue
@@ -15,7 +15,7 @@
     <template #pagination>
       <ListPagination
         :page-number="params.page + 1"
-        :total-page="totalPage || 0"
+        :total-page="totalPage"
         @update:page-number="onPageChange" />
     </template>
   </ListContainer>
@@ -28,9 +28,9 @@ import RequestedListBar from './RequestedListBar.vue'
 import RequestedListCard from './RequestedListCard.vue'
 import { useRequestParamsStore } from '@/stores/params'
 import { useParseParams } from '../hooks/useParseParams'
-import { axiosInstance } from '@/utils/axios'
+import axiosInstance from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
-import { computed } from 'vue'
+import { ref, watch } from 'vue'
 import type { RequestedResponse } from '@/types/manager'
 import NoContent from '../lists/NoContent.vue'
 
@@ -56,7 +56,12 @@ const { data } = useQuery<RequestedResponse>({
   queryFn: fetchRequestedList
 })
 
-const totalPage = computed(() => {
-  return data.value?.totalPages
-})
+watch(
+  data,
+  () => {
+    if (data.value?.totalPages) totalPage.value = data.value.totalPages
+  },
+  { once: true }
+)
+const totalPage = ref(0)
 </script>
diff --git a/src/types/manager.ts b/src/types/manager.ts
index cee2eac5..65e7984a 100644
--- a/src/types/manager.ts
+++ b/src/types/manager.ts
@@ -130,13 +130,3 @@ export interface RequestedResponse {
   isFirst: boolean
   isLast: boolean
 }
-
-export interface RequestHistoryResponse {
-  content: RequestHistoryListData[]
-  totalElements: number
-  totalPages: number
-  pageNumber: number
-  pageSize: number
-  isFirst: boolean
-  isLast: boolean
-}

From 84fad3d2252291bd90b27be32cc198154bc6d19c Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 00:56:14 +0900
Subject: [PATCH 126/180] =?UTF-8?q?=EC=A0=84=EC=B2=B4=20=EC=9A=94=EC=B2=AD?=
 =?UTF-8?q?=20=EA=B8=B0=EB=A1=9D=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=20API=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue |  4 ++--
 src/components/requested/RequestedList.vue  | 15 +++++----------
 src/types/manager.ts                        | 10 ++++++++++
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index 849a36eb..c27a306a 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -27,8 +27,8 @@ import type { MyRequestResponse } from '@/types/user'
 import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import { useParseParams } from '../hooks/useParseParams'
-import ListContainer from '../lists/ListContainer.vue'
-import ListPagination from '../lists/ListPagination.vue'
+import type { MyRequestResponse } from '@/types/user'
+import { computed } from 'vue'
 import NoContent from '../lists/NoContent.vue'
 import MyRequestListBar from './MyRequestListBar.vue'
 import MyRequestListCard from './MyRequestListCard.vue'
diff --git a/src/components/requested/RequestedList.vue b/src/components/requested/RequestedList.vue
index 43f52a12..63766955 100644
--- a/src/components/requested/RequestedList.vue
+++ b/src/components/requested/RequestedList.vue
@@ -15,7 +15,7 @@
     <template #pagination>
       <ListPagination
         :page-number="params.page + 1"
-        :total-page="totalPage"
+        :total-page="totalPage || 0"
         @update:page-number="onPageChange" />
     </template>
   </ListContainer>
@@ -30,7 +30,7 @@ import { useRequestParamsStore } from '@/stores/params'
 import { useParseParams } from '../hooks/useParseParams'
 import axiosInstance from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
-import { ref, watch } from 'vue'
+import { computed } from 'vue'
 import type { RequestedResponse } from '@/types/manager'
 import NoContent from '../lists/NoContent.vue'
 
@@ -56,12 +56,7 @@ const { data } = useQuery<RequestedResponse>({
   queryFn: fetchRequestedList
 })
 
-watch(
-  data,
-  () => {
-    if (data.value?.totalPages) totalPage.value = data.value.totalPages
-  },
-  { once: true }
-)
-const totalPage = ref(0)
+const totalPage = computed(() => {
+  return data.value?.totalPages
+})
 </script>
diff --git a/src/types/manager.ts b/src/types/manager.ts
index 65e7984a..cee2eac5 100644
--- a/src/types/manager.ts
+++ b/src/types/manager.ts
@@ -130,3 +130,13 @@ export interface RequestedResponse {
   isFirst: boolean
   isLast: boolean
 }
+
+export interface RequestHistoryResponse {
+  content: RequestHistoryListData[]
+  totalElements: number
+  totalPages: number
+  pageNumber: number
+  pageSize: number
+  isFirst: boolean
+  isLast: boolean
+}

From ba73f2f82cb4085e0a2c5dfc04c7e11034a47fbd Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 01:03:46 +0900
Subject: [PATCH 127/180] =?UTF-8?q?=EB=82=B4=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20API=20=EC=97=B0?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-task/MyTaskList.vue                 |  2 +-
 src/components/request-history/RequestHistoryList.vue |  1 +
 src/types/manager.ts                                  | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/my-task/MyTaskList.vue b/src/components/my-task/MyTaskList.vue
index d470a1e4..40dc1f21 100644
--- a/src/components/my-task/MyTaskList.vue
+++ b/src/components/my-task/MyTaskList.vue
@@ -28,7 +28,7 @@ import { useRequestParamsStore } from '@/stores/params'
 import MyTaskListCard from './MyTaskListCard.vue'
 import MyTaskListBar from './MyTaskListBar.vue'
 import { useParseParams } from '../hooks/useParseParams'
-import { axiosInstance } from '@/utils/axios'
+import axiosInstance from '@/utils/axios'
 import type { MyTaskResponse } from '@/types/manager'
 import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
diff --git a/src/components/request-history/RequestHistoryList.vue b/src/components/request-history/RequestHistoryList.vue
index d1fcc5ed..1f5d0281 100644
--- a/src/components/request-history/RequestHistoryList.vue
+++ b/src/components/request-history/RequestHistoryList.vue
@@ -32,6 +32,7 @@ import axiosInstance from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
 import type { RequestHistoryResponse } from '@/types/manager'
+import NoContent from '../lists/NoContent.vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {
diff --git a/src/types/manager.ts b/src/types/manager.ts
index cee2eac5..555dfe9e 100644
--- a/src/types/manager.ts
+++ b/src/types/manager.ts
@@ -140,3 +140,13 @@ export interface RequestHistoryResponse {
   isFirst: boolean
   isLast: boolean
 }
+
+export interface MyTaskResponse {
+  content: MyTaskListData[]
+  totalElements: number
+  totalPages: number
+  pageNumber: number
+  pageSize: number
+  isFirst: boolean
+  isLast: boolean
+}

From ec0692ea80ed153b69d94b752607530bedc85b81 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 14:45:53 +0900
Subject: [PATCH 128/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20API=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.ts         | 44 +++++++++++++++++------------------------
 src/views/LoginView.vue | 32 ++----------------------------
 2 files changed, 20 insertions(+), 56 deletions(-)

diff --git a/src/api/auth.ts b/src/api/auth.ts
index bafbad6c..d97a9443 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -1,28 +1,20 @@
-import { axiosInstance } from '@/utils/axios'
-import Cookies from 'js-cookie'
-import type { loginDataTypes } from '@/types/auth'
+import axiosInstance from '@/utils/axios'
 
-export const postLogin = async (loginData: loginDataTypes, sessionId: string) => {
-  const response = await axiosInstance.post('/api/auths/login', loginData, {
-    headers: { sessionId: sessionId }
-  })
-  Cookies.set('accessToken', response.data.accessToken, {
-    path: '/',
-    sameSite: 'strict'
-  })
-  return response.data
-}
-
-export const patchPassword = async (password: string) => {
-  const accessToken = Cookies.get('accessToken')
-
-  if (!accessToken) return
-
-  const response = await axiosInstance.patch('/api/members/password', password, {
-    headers: {
-      Authorization: `Bearer ${accessToken}`
-    }
-  })
-
-  return response.data
+export const postLogin = async (nickname: string, password: string) => {
+  const body = {
+    nickname: nickname,
+    password: password
+  }
+  const sessionIdValue = '123'
+  try {
+    const response = await axiosInstance.post('/api/auths/login', body, {
+      headers: {
+        sessionId: sessionIdValue
+      }
+    })
+    return response.data
+  } catch (error) {
+    console.error('로그인 오류:', error)
+    throw error
+  }
 }
diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index 1dd39baf..49070bb4 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -46,41 +46,13 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
-import { useRouter } from 'vue-router'
 import { postLogin } from '@/api/auth'
 
-const router = useRouter()
-
 const nickname = ref('')
 const password = ref('')
 
 const handleLogin = async () => {
-  try {
-    const loginData = {
-      nickname: nickname.value,
-      password: password.value
-    }
-    const sessionId = '000'
-    const res = await postLogin(loginData, sessionId)
-
-    if (res) {
-      switch (res.memberInfo.memberRole) {
-        case 'ROLE_ADMIN':
-          router.push('/member-management')
-          break
-        case 'ROLE_MANAGER':
-          router.push('my-request')
-          break
-        case 'ROLE_USER':
-          router.push('/my-request')
-          break
-        default:
-          router.push('/')
-      }
-    }
-  } catch (error) {
-    // 로그인 실패 시 에러 처리
-    console.error('로그인 실패:', error)
-  }
+  const res = postLogin(nickname.value, password.value)
+  console.log('요청확인:', res)
 }
 </script>

From f6db150075f798e8f69898e1867f17f815a10647 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 17:18:41 +0900
Subject: [PATCH 129/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20=EC=95=A1?=
 =?UTF-8?q?=EC=84=B8=EC=8A=A4=20=ED=86=A0=ED=81=B0=20=EC=BF=A0=ED=82=A4?=
 =?UTF-8?q?=EC=97=90=20=EC=A0=80=EC=9E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/api/auth.ts b/src/api/auth.ts
index d97a9443..3447d4d0 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -1,4 +1,5 @@
 import axiosInstance from '@/utils/axios'
+import Cookies from 'js-cookie'
 
 export const postLogin = async (nickname: string, password: string) => {
   const body = {
@@ -12,6 +13,12 @@ export const postLogin = async (nickname: string, password: string) => {
         sessionId: sessionIdValue
       }
     })
+
+    Cookies.set('accessToken', response.data.accessToken, {
+      path: '/',
+      sameSite: 'strict'
+    })
+
     return response.data
   } catch (error) {
     console.error('로그인 오류:', error)

From 59fe53bd74e31a91be0d0cb574b69bd54a0064e8 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 17:18:56 +0900
Subject: [PATCH 130/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EC=8B=9C=20=EA=B0=81=20=EC=97=AD=ED=95=A0?=
 =?UTF-8?q?=EB=A7=88=EB=8B=A4=20=EA=B2=BD=EB=A1=9C=20=EC=A7=80=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/LoginView.vue | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index 49070bb4..caf6bfaa 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -46,13 +46,36 @@
 
 <script setup lang="ts">
 import { ref } from 'vue'
+import { useRouter } from 'vue-router'
 import { postLogin } from '@/api/auth'
 
+const router = useRouter()
+
 const nickname = ref('')
 const password = ref('')
 
 const handleLogin = async () => {
-  const res = postLogin(nickname.value, password.value)
-  console.log('요청확인:', res)
+  try {
+    const res = await postLogin(nickname.value, password.value)
+
+    if (res) {
+      switch (res.memberInfo.memberRole) {
+        case 'ROLE_ADMIN':
+          router.push('/member-management')
+          break
+        case 'ROLE_MANAGER':
+          router.push('my-request')
+          break
+        case 'ROLE_USER':
+          router.push('/my-request')
+          break
+        default:
+          router.push('/')
+      }
+    }
+  } catch (error) {
+    // 로그인 실패 시 에러 처리
+    console.error('로그인 실패:', error)
+  }
 }
 </script>

From be5d2f20e0367f31fec90f4906b3a6a35caf7cbb Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 19:52:03 +0900
Subject: [PATCH 131/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20Pinia=20?=
 =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=A0=95=EB=B3=B4=20=EC=A0=80=EC=9E=A5?=
 =?UTF-8?q?=ED=95=98=EC=97=AC=20=EC=83=81=ED=83=9C=EA=B4=80=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/member.ts | 24 +++++++++++++++++++++---
 src/types/auth.ts    |  6 +-----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/stores/member.ts b/src/stores/member.ts
index e1faef45..72646809 100644
--- a/src/stores/member.ts
+++ b/src/stores/member.ts
@@ -1,10 +1,13 @@
+// stores/memberStore.ts
 import { defineStore } from 'pinia'
-import { axiosInstance } from '@/utils/axios'
+import axiosInstance from '@/utils/axios'
 import { ref } from 'vue'
 import type { User } from '@/types/auth'
+import Cookies from 'js-cookie'
 
 export const useMemberStore = defineStore('memberInfo', () => {
   const info = ref<User>({
+    memberId: 0,
     memberName: '',
     nickname: '',
     imageUrl: '',
@@ -12,19 +15,34 @@ export const useMemberStore = defineStore('memberInfo', () => {
     memberStatus: ''
   })
 
+  // API 호출 후 회원 정보 업데이트
   async function updateMemberInfoWithToken() {
     try {
-      const response = await axiosInstance.get('/api/members/info')
+      const accessToken = Cookies.get('accessToken')
 
+      if (!accessToken) {
+        console.error('Access token is missing')
+        return
+      }
+
+      const response = await axiosInstance.get('/api/members/info', {
+        headers: {
+          Authorization: `Bearer ${accessToken}`
+        }
+      })
+
+      // 받은 데이터로 상태 업데이트
       console.log('API Response:', response.data)
       updateMemberInfo(response.data)
     } catch (error) {
-      console.error('updata error:', error)
+      console.error('Error fetching member info:', error)
     }
   }
 
+  // 상태 업데이트 함수
   function updateMemberInfo(responseData: any) {
     info.value = {
+      memberId: 0,
       memberName: responseData.name || '',
       nickname: responseData.nicknanme || '',
       imageUrl: responseData.profileImageUrl || '',
diff --git a/src/types/auth.ts b/src/types/auth.ts
index 6a1bd51a..2af35891 100644
--- a/src/types/auth.ts
+++ b/src/types/auth.ts
@@ -6,14 +6,10 @@ export interface UserTypes {
 }
 
 export interface User {
+  memberId: number
   memberName: string
   nickname: string
   imageUrl: string
   memberRole: string
   memberStatus: string
 }
-
-export interface loginDataTypes {
-  nickname: string
-  password: string
-}

From b453d7974e6cf5209ff48ce1a126e5d1752fb8b4 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 19:52:34 +0900
Subject: [PATCH 132/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20Pinia?=
 =?UTF-8?q?=EC=97=90=20=EC=A0=80=EC=9E=A5=EB=90=9C=20=ED=9A=8C=EC=9B=90?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20Top,=20Side=EC=97=90=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TopBar.vue          | 56 ++++++++++++++++++++++++++++++
 src/components/top-bar/SideBar.vue |  9 +++--
 2 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 src/components/TopBar.vue

diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
new file mode 100644
index 00000000..28b9dce8
--- /dev/null
+++ b/src/components/TopBar.vue
@@ -0,0 +1,56 @@
+<template>
+  <div class="fixed w-full bg-white text-black py-2 border-b border-border-1">
+    <div
+      class="max-w-[1200px] min-w-[1024px] mx-auto px-6 flex w-full justify-between items-center">
+      <div class="flex justify-center items-center gap-6 h-full">
+        <button
+          v-show="isLogined"
+          @click="isSideOpen = true">
+          <CommonIcons :name="hamburgerIcon" />
+        </button>
+        <img src="/MainLogo.svg" />
+      </div>
+      <div
+        v-show="isLogined"
+        class="flex items-center gap-6">
+        <NotificationIcon :new-notification="12" />
+        <img
+          v-if="info?.imageUrl"
+          class="rounded-[50%] w-10 h-10"
+          :src="info.imageUrl"
+          alt="프로필 이미지" />
+        <div
+          v-else
+          class="rounded-[50%] bg-zinc-100 p-5" />
+      </div>
+    </div>
+  </div>
+  <SideBar
+    v-if="isSideOpen"
+    @close="onCloseSide" />
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import CommonIcons from './common/CommonIcons.vue'
+import SideBar from './SideBar.vue'
+import { hamburgerIcon } from '../constants/iconPath'
+import NotificationIcon from './icons/NotificationIcon.vue'
+import { storeToRefs } from 'pinia'
+import { useMemberStore } from '@/stores/member'
+
+const memberStore = useMemberStore()
+const { info } = storeToRefs(memberStore)
+
+onMounted(async () => {
+  await memberStore.updateMemberInfoWithToken()
+  console.log('Updated info after API call:', info.value)
+})
+
+const isSideOpen = ref(false)
+const isLogined = ref(true)
+
+const onCloseSide = () => {
+  isSideOpen.value = false
+}
+</script>
diff --git a/src/components/top-bar/SideBar.vue b/src/components/top-bar/SideBar.vue
index b8d02321..80a1dc20 100644
--- a/src/components/top-bar/SideBar.vue
+++ b/src/components/top-bar/SideBar.vue
@@ -68,7 +68,7 @@
 <script setup lang="ts">
 import { useRoute } from 'vue-router'
 import { computed } from 'vue'
-import CommonIcons from '../common/CommonIcons.vue'
+import CommonIcons from './common/CommonIcons.vue'
 import { hamburgerIcon } from '@/constants/iconPath'
 import { SIDE_USER_MENU, SIDE_MANAGER_MENU, SIDE_ADMIN_MENU } from '@/constants/menu'
 import { useMemberStore } from '@/stores/member'
@@ -79,10 +79,9 @@ const { info } = storeToRefs(memberStore)
 
 const route = useRoute()
 
-// 회원 역할, 닉네임 필요
-const role = ref('admin')
-const name = ref('백지연')
-const nickname = ref('Chloe.yeon')
+const role = computed(() => info.value.memberRole)
+const name = computed(() => info.value.memberName)
+const nickname = computed(() => info.value.nickname)
 
 const filteredMenu = computed(() => {
   return role.value === 'ROLE_USER'

From 90f0c140888b7a88761b7b2de168f911ae4f1855 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 20:41:18 +0900
Subject: [PATCH 133/180] =?UTF-8?q?=E2=9C=A8=20=20[feat]=20:=20=EB=B9=84?=
 =?UTF-8?q?=EB=B0=80=EB=B2=88=ED=98=B8=20=EC=9E=AC=EC=84=A4=EC=A0=95=20API?=
 =?UTF-8?q?=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.ts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/api/auth.ts b/src/api/auth.ts
index 3447d4d0..c0ddf40b 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -25,3 +25,23 @@ export const postLogin = async (nickname: string, password: string) => {
     throw error
   }
 }
+
+export const patchPassword = async (password: string) => {
+  const accessToken = Cookies.get('accessToken')
+
+  if (!accessToken) {
+    console.error('Access token is missing')
+    return
+  }
+
+  try {
+    const response = await axiosInstance.patch('/api/members/password', password, {
+      headers: {
+        Authorization: `Bearer ${accessToken}`
+      }
+    })
+    return response.data
+  } catch (error) {
+    console.log('api error:', error)
+  }
+}

From 7368716a73a7d7b58581aa1c009a4e0bb3120cb6 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 20:42:52 +0900
Subject: [PATCH 134/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TopBar.vue | 1 -
 src/stores/member.ts      | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
index 28b9dce8..f39df6e6 100644
--- a/src/components/TopBar.vue
+++ b/src/components/TopBar.vue
@@ -44,7 +44,6 @@ const { info } = storeToRefs(memberStore)
 
 onMounted(async () => {
   await memberStore.updateMemberInfoWithToken()
-  console.log('Updated info after API call:', info.value)
 })
 
 const isSideOpen = ref(false)
diff --git a/src/stores/member.ts b/src/stores/member.ts
index 72646809..099d757c 100644
--- a/src/stores/member.ts
+++ b/src/stores/member.ts
@@ -1,4 +1,3 @@
-// stores/memberStore.ts
 import { defineStore } from 'pinia'
 import axiosInstance from '@/utils/axios'
 import { ref } from 'vue'
@@ -15,13 +14,12 @@ export const useMemberStore = defineStore('memberInfo', () => {
     memberStatus: ''
   })
 
-  // API 호출 후 회원 정보 업데이트
   async function updateMemberInfoWithToken() {
     try {
       const accessToken = Cookies.get('accessToken')
 
       if (!accessToken) {
-        console.error('Access token is missing')
+        console.error('Access token error')
         return
       }
 
@@ -31,15 +29,13 @@ export const useMemberStore = defineStore('memberInfo', () => {
         }
       })
 
-      // 받은 데이터로 상태 업데이트
       console.log('API Response:', response.data)
       updateMemberInfo(response.data)
     } catch (error) {
-      console.error('Error fetching member info:', error)
+      console.error('updata error:', error)
     }
   }
 
-  // 상태 업데이트 함수
   function updateMemberInfo(responseData: any) {
     info.value = {
       memberId: 0,

From 0c1acb99821d2a7b6c2c7efece5a47f4481a3381 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 1 Feb 2025 17:55:52 +0900
Subject: [PATCH 135/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=ED=8F=BC?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=9A=94=EC=B2=AD=20api=20?=
 =?UTF-8?q?=ED=98=95=EC=8B=9D=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/test.ts    | 16 ++++++++++++++++
 src/api/user.ts    | 10 ----------
 src/utils/axios.ts |  1 +
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 src/api/test.ts

diff --git a/src/api/test.ts b/src/api/test.ts
new file mode 100644
index 00000000..bb6f3d0b
--- /dev/null
+++ b/src/api/test.ts
@@ -0,0 +1,16 @@
+import { axiosInstance } from '../utils/axios'
+
+export const getNotifications = async () => {
+  const response = await axiosInstance.get('/api/notifications?page=0&size=5')
+  return response.data
+}
+
+export const postLogin = async (nickname: string, password: string) => {
+  const response = await axiosInstance.post('/api/auths/login', { nickname, password })
+  return response.data
+}
+
+export const patchReadNotification = async (notificationId: number) => {
+  const response = await axiosInstance.patch(`/api/notification/${notificationId}`)
+  return response.data
+}
diff --git a/src/api/user.ts b/src/api/user.ts
index 28ca9ccf..86bbbbf4 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -4,13 +4,3 @@ export const postTaskRequest = async (formdata: FormData) => {
   const response = await formDataAxiosInstance.post('/api/tasks', formdata)
   return response.data
 }
-
-export const getTaskDetailUser = async (id: number) => {
-  const response = await formDataAxiosInstance.get(`/api/tasks/${id}/requests/details`)
-  return response.data
-}
-
-export const getTaskDetailManager = async (id: number) => {
-  const response = await formDataAxiosInstance.get(`/api/tasks/${id}/details`)
-  return response.data
-}
diff --git a/src/utils/axios.ts b/src/utils/axios.ts
index 2531c53c..ae769d70 100644
--- a/src/utils/axios.ts
+++ b/src/utils/axios.ts
@@ -11,6 +11,7 @@ const setInterceptors = (instance: AxiosInstance) => {
         if (token) {
           config.headers.Authorization = `Bearer ${token}`
         }
+        console.log(token, '으로 요청 중')
       }
       return config
     },

From 4a8feca786fa4a55350568d141cf52968ad0c61f Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sat, 1 Feb 2025 20:03:17 +0900
Subject: [PATCH 136/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20prop?=
 =?UTF-8?q?=EB=8C=80=EC=8B=A0=20=EC=A7=81=EC=A0=91=20=EA=B0=80=EC=A0=B8?=
 =?UTF-8?q?=EC=98=A4=EA=B8=B0,=20=ED=8C=8C=EC=9D=BC=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=EA=B0=92=20=EB=B0=B0=EC=97=B4=EB=A1=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 1b5813d9..56feab7c 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -38,11 +38,10 @@
 </template>
 
 <script lang="ts" setup>
-import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
 import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
-import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { onMounted, ref, watch } from 'vue'
+import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
+import { ref } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
@@ -87,17 +86,9 @@ const handleCancel = () => {
 }
 
 const handleSubmit = async () => {
-  if (!category1.value || !category2.value) {
-    isInvalidate.value = 'category'
-    console.log(isInvalidate.value, '변경됨')
-    return
-  } else if (!title.value) {
-    isInvalidate.value = 'input'
-    return
-  }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value.id,
+    categoryId: 1,
     title: title.value,
     description: description.value
   }
@@ -106,16 +97,15 @@ const handleSubmit = async () => {
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
 
   formData.append('taskInfo', newBlob)
-
   if (file.value && file.value.length > 0) {
     file.value.forEach(f => {
       formData.append('attachment', f)
     })
   }
+  console.log(Object.fromEntries(formData), '응답')
+  console.log(file.value, '파일 현황 응답')
   try {
     const res = await postTaskRequest(formData)
-    isModalVisible.value = true
-    console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
   }

From bc21c82f28a987233479c4d655d95908080fd652 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 02:19:43 +0900
Subject: [PATCH 137/180] =?UTF-8?q?:recycle:=20[refactor]=20:=201,2?=
 =?UTF-8?q?=EC=B0=A8=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=84=A0=EC=96=B8=20=EB=B0=8F=20=EC=9C=84=EC=B9=98?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/admin.ts  |  9 ++++++++-
 src/types/common.ts | 27 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/types/admin.ts b/src/types/admin.ts
index 08589211..42038f19 100644
--- a/src/types/admin.ts
+++ b/src/types/admin.ts
@@ -1,4 +1,4 @@
-import type { Category, Role } from './common'
+import type { Role, SubCategoryTypes } from './common'
 
 export interface MemberManagementListData {
   memberId: number
@@ -42,6 +42,13 @@ export interface CategoryLineProps {
   mainCategoryId?: string
 }
 
+export interface categoriesTypes {
+  id: number
+  name: string
+  code: string
+  subCategory: SubCategoryTypes[]
+}
+
 export interface CategoryAllData {
   categories: Category[]
 }
diff --git a/src/types/common.ts b/src/types/common.ts
index bbb903e8..e63327e3 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -112,3 +112,30 @@ export interface LabelColorTypes {
   fillColor: string
   colorEnum: string
 }
+
+export interface LabelDataTypes {
+  labelId: number
+  labelName: string
+  labelColor: string
+}
+
+export interface MainCategoryTypes {
+  id: number
+  name: string
+  code: string
+}
+
+export interface SubCategoryTypes {
+  id: number
+  mainCategoryId: number
+  name: string
+  code: string
+}
+
+export interface CategoryDropdownProps {
+  placeholderText: string
+  options: MainCategoryTypes[] | SubCategoryTypes[]
+  labelName: string
+  modelValue: string
+  isLabel?: boolean
+}

From 832760a93582189f98e544c0634ce6685e5a4ca1 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:07:11 +0900
Subject: [PATCH 138/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=EC=9A=A9=20=EB=93=9C=EB=A1=AD?=
 =?UTF-8?q?=EB=8B=A4=EC=9A=B4=20=EA=B0=9C=EB=B3=84=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/CategoryDropDown.vue | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 2c670fd1..609ebdae 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -7,11 +7,6 @@
         class="text-red-1">
         *
       </p>
-      <p
-        v-if="isInvalidateState === 'category'"
-        class="text-red-1">
-        카테고리를 선택해주세요
-      </p>
     </div>
     <div class="relative flex text-base">
       <div
@@ -42,14 +37,11 @@
 <script lang="ts" setup>
 import { dropdownIcon } from '@/constants/iconPath'
 import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { computed, ref } from 'vue'
+import { ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { placeholderText, options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
+const { placeholderText, options, labelName, modelValue, isLabel, isDisabled } =
   defineProps<CategoryDropdownProps>()
-
-const isInvalidateState = computed(() => isInvalidate)
-
 const emit = defineEmits(['update:modelValue'])
 const dropdownOpen = ref(false)
 
@@ -58,7 +50,7 @@ const toggleDropdown = () => {
   dropdownOpen.value = !dropdownOpen.value
 }
 
-const selectOption = (option: Category) => {
+const selectOption = (option: MainCategoryTypes | SubCategoryTypes) => {
   emit('update:modelValue', option)
   dropdownOpen.value = false
 }

From 89db28546b52be8cbe4d98c000d8b543c2aa18e9 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:10:43 +0900
Subject: [PATCH 139/180] =?UTF-8?q?:sparkles:=20[feat]=20:=201,=202?=
 =?UTF-8?q?=EC=B0=A8=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/api/common.ts b/src/api/common.ts
index ade690e6..a0d4fd4e 100644
--- a/src/api/common.ts
+++ b/src/api/common.ts
@@ -9,8 +9,3 @@ export const getSubCategory = async () => {
   const response = await axiosInstance.get('/api/sub-category')
   return response.data
 }
-
-export const getAllCategory = async () => {
-  const response = await axiosInstance.get('/api/category')
-  return response.data
-}

From 55d8a3915a0c082f154bd3d3c453d64fdae497ae Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:11:02 +0900
Subject: [PATCH 140/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=9D=EC=84=B1=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 17 ++++++++---------
 src/types/common.ts                         |  3 ++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 56feab7c..b92f0e29 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -5,14 +5,12 @@
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
       :placeholderText="'1차 카테고리를 선택해주세요'"
-      :isInvalidate="isInvalidate"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
       :placeholderText="'2차 카테고리를 선택해주세요'"
-      :is-invalidate="isInvalidate"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
@@ -38,10 +36,11 @@
 </template>
 
 <script lang="ts" setup>
+import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
 import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
-import { DUMMY_REQUEST_TASK_CATEGORIES } from '@/datas/taskdetail'
-import { ref } from 'vue'
+import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
+import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
@@ -49,8 +48,8 @@ import RequestTaskFileInput from './RequestTaskFileInput.vue'
 import RequestTaskInput from './RequestTaskInput.vue'
 import RequestTaskTextArea from './RequestTaskTextArea.vue'
 
-const category1 = ref<Category | null>(null)
-const category2 = ref<Category | null>(null)
+const category1 = ref<MainCategoryTypes | null>(null)
+const category2 = ref<MainCategoryTypes | null>(null)
 
 const title = ref('')
 const description = ref('')
@@ -88,7 +87,7 @@ const handleCancel = () => {
 const handleSubmit = async () => {
   const formData = new FormData()
   const taskInfo = {
-    categoryId: 1,
+    categoryId: category2.value?.id,
     title: title.value,
     description: description.value
   }
@@ -97,15 +96,15 @@ const handleSubmit = async () => {
   const newBlob = new Blob([jsonTaskInfo], { type: 'application/json' })
 
   formData.append('taskInfo', newBlob)
+
   if (file.value && file.value.length > 0) {
     file.value.forEach(f => {
       formData.append('attachment', f)
     })
   }
-  console.log(Object.fromEntries(formData), '응답')
-  console.log(file.value, '파일 현황 응답')
   try {
     const res = await postTaskRequest(formData)
+    console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
   }
diff --git a/src/types/common.ts b/src/types/common.ts
index e63327e3..27a64370 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -136,6 +136,7 @@ export interface CategoryDropdownProps {
   placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: string
+  modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
+  isDisabled?: boolean
 }

From a20222a2f7cc8c700faf1ece5447480e802c539d Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 11:51:43 +0900
Subject: [PATCH 141/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EB=88=84=EB=9D=BD=EC=8B=9C=20=EA=B2=BD=EA=B3=A0=20?=
 =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=B6=9C=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/CategoryDropDown.vue | 12 ++++++++++--
 src/components/request-task/RequestTask.vue      | 13 +++++++++++--
 src/types/common.ts                              |  1 +
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 609ebdae..8ab78003 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -7,6 +7,11 @@
         class="text-red-1">
         *
       </p>
+      <p
+        v-if="isInvalidateState === 'category'"
+        class="text-red-1">
+        카테고리를 선택해주세요
+      </p>
     </div>
     <div class="relative flex text-base">
       <div
@@ -37,11 +42,14 @@
 <script lang="ts" setup>
 import { dropdownIcon } from '@/constants/iconPath'
 import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from '@/types/common'
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { placeholderText, options, labelName, modelValue, isLabel, isDisabled } =
+const { placeholderText, options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
   defineProps<CategoryDropdownProps>()
+
+const isInvalidateState = computed(() => isInvalidate)
+
 const emit = defineEmits(['update:modelValue'])
 const dropdownOpen = ref(false)
 
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index b92f0e29..5df97d79 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -5,12 +5,14 @@
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
       :placeholderText="'1차 카테고리를 선택해주세요'"
+      :isInvalidate="isInvalidate"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
       :placeholderText="'2차 카테고리를 선택해주세요'"
+      :is-invalidate="isInvalidate"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
@@ -55,7 +57,6 @@ const title = ref('')
 const description = ref('')
 const file = ref(null as File[] | null)
 const isInvalidate = ref('')
-const isModalVisible = ref(false)
 
 const mainCategoryArr = ref<MainCategoryTypes[]>([])
 const subCategoryArr = ref<SubCategoryTypes[]>([])
@@ -85,9 +86,17 @@ const handleCancel = () => {
 }
 
 const handleSubmit = async () => {
+  if (!category1.value || !category2.value) {
+    isInvalidate.value = 'category'
+    console.log(isInvalidate.value, '변경됨')
+    return
+  } else if (!title.value) {
+    isInvalidate.value = 'input'
+    return
+  }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value?.id,
+    categoryId: category2.value.id,
     title: title.value,
     description: description.value
   }
diff --git a/src/types/common.ts b/src/types/common.ts
index 27a64370..b376ab5b 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -139,4 +139,5 @@ export interface CategoryDropdownProps {
   modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
   isDisabled?: boolean
+  isInvalidate?: string
 }

From 0f2e010ee4d4469120a077a985cbbab6d7929f8e Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:03:33 +0900
Subject: [PATCH 142/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=99=84=EB=A3=8C=20=ED=9B=84=20=EB=AA=A8=EB=8B=AC?=
 =?UTF-8?q?=20=EB=B0=8F=20=EB=9D=BC=EC=9A=B0=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 5df97d79..979b1f7e 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -45,6 +45,7 @@ import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
+import ModalView from '../ModalView.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
 import RequestTaskFileInput from './RequestTaskFileInput.vue'
 import RequestTaskInput from './RequestTaskInput.vue'
@@ -57,6 +58,7 @@ const title = ref('')
 const description = ref('')
 const file = ref(null as File[] | null)
 const isInvalidate = ref('')
+const isModalVisible = ref(false)
 
 const mainCategoryArr = ref<MainCategoryTypes[]>([])
 const subCategoryArr = ref<SubCategoryTypes[]>([])
@@ -113,6 +115,7 @@ const handleSubmit = async () => {
   }
   try {
     const res = await postTaskRequest(formData)
+    isModalVisible.value = true
     console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)

From 7a9a7d945646380b2b656860c594c7f7c0f6325e Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:09:51 +0900
Subject: [PATCH 143/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20axios=20in?=
 =?UTF-8?q?stance=20=EA=B0=9D=EC=B2=B4=20=EB=B6=84=EB=A6=AC=ED=95=B4?=
 =?UTF-8?q?=EC=84=9C=20import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-request/MyRequestList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/my-request/MyRequestList.vue b/src/components/my-request/MyRequestList.vue
index c27a306a..c310c969 100644
--- a/src/components/my-request/MyRequestList.vue
+++ b/src/components/my-request/MyRequestList.vue
@@ -26,13 +26,13 @@ import { useRequestParamsStore } from '@/stores/params'
 import type { MyRequestResponse } from '@/types/user'
 import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
+import { ref, watch } from 'vue'
 import { useParseParams } from '../hooks/useParseParams'
-import type { MyRequestResponse } from '@/types/user'
-import { computed } from 'vue'
+import ListContainer from '../lists/ListContainer.vue'
+import ListPagination from '../lists/ListPagination.vue'
 import NoContent from '../lists/NoContent.vue'
 import MyRequestListBar from './MyRequestListBar.vue'
 import MyRequestListCard from './MyRequestListCard.vue'
-import { computed } from 'vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {

From d31443e3cfc963fda8a762efca57e49792251ea2 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 12:18:58 +0900
Subject: [PATCH 144/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EB=93=9C=EB=A1=AD=EB=8B=A4?=
 =?UTF-8?q?=EC=9A=B4=20placeholder=EC=97=86=EC=9D=B4,=20input=20placeholde?=
 =?UTF-8?q?r=20=EC=83=81=EC=88=98=ED=99=94=20=EC=B7=A8=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/CategoryDropDown.vue | 4 ++--
 src/components/request-task/RequestTask.vue      | 9 ++-------
 src/types/common.ts                              | 1 -
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 8ab78003..7f377299 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -18,7 +18,7 @@
         class="flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black"
         @click="toggleDropdown">
         <p :class="{ 'text-disabled': !modelValue?.name }">
-          {{ modelValue?.name ?? placeholderText }}
+          {{ modelValue?.name ?? labelName + '를 선택해주세요' }}
         </p>
         <CommonIcons
           :name="dropdownIcon"
@@ -45,7 +45,7 @@ import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from
 import { computed, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
-const { placeholderText, options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
+const { options, labelName, modelValue, isLabel, isDisabled, isInvalidate } =
   defineProps<CategoryDropdownProps>()
 
 const isInvalidateState = computed(() => isInvalidate)
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 979b1f7e..ae084067 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -4,19 +4,17 @@
       v-model="category1"
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
-      :placeholderText="'1차 카테고리를 선택해주세요'"
       :isInvalidate="isInvalidate"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
-      :placeholderText="'2차 카테고리를 선택해주세요'"
       :is-invalidate="isInvalidate"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
-      :placeholderText="TITLE_PLACEHOLDER"
+      :placeholderText="'제목을 입력해주세요'"
       :label-name="'제목'"
       :is-invalidate="isInvalidate" />
     <RequestTaskTextArea
@@ -40,7 +38,6 @@
 <script lang="ts" setup>
 import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
-import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
 import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
@@ -109,9 +106,7 @@ const handleSubmit = async () => {
   formData.append('taskInfo', newBlob)
 
   if (file.value && file.value.length > 0) {
-    file.value.forEach(f => {
-      formData.append('attachment', f)
-    })
+    file.value.forEach(f => formData.append('attachment', f))
   }
   try {
     const res = await postTaskRequest(formData)
diff --git a/src/types/common.ts b/src/types/common.ts
index b376ab5b..ab1f13a4 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -133,7 +133,6 @@ export interface SubCategoryTypes {
 }
 
 export interface CategoryDropdownProps {
-  placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
   modelValue: MainCategoryTypes | SubCategoryTypes | null

From 624ae9aaae73a04dd8fba1bf093dac5161883332 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 20:56:59 +0900
Subject: [PATCH 145/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20a?=
 =?UTF-8?q?xios=20=EC=9D=B8=EC=8A=A4=ED=84=B4=EC=8A=A4=20=EC=9D=B4?=
 =?UTF-8?q?=EC=8A=88=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.ts      | 2 +-
 src/stores/member.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/auth.ts b/src/api/auth.ts
index c0ddf40b..a5baf222 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -1,4 +1,4 @@
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import Cookies from 'js-cookie'
 
 export const postLogin = async (nickname: string, password: string) => {
diff --git a/src/stores/member.ts b/src/stores/member.ts
index 099d757c..97039ee9 100644
--- a/src/stores/member.ts
+++ b/src/stores/member.ts
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import { ref } from 'vue'
 import type { User } from '@/types/auth'
 import Cookies from 'js-cookie'

From 78bb03ca9815b7cfcb22538b5fde8ef842b3b4f9 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 02:19:43 +0900
Subject: [PATCH 146/180] =?UTF-8?q?:recycle:=20[refactor]=20:=201,2?=
 =?UTF-8?q?=EC=B0=A8=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=84=A0=EC=96=B8=20=EB=B0=8F=20=EC=9C=84=EC=B9=98?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/common.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/types/common.ts b/src/types/common.ts
index ab1f13a4..e63327e3 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -133,10 +133,9 @@ export interface SubCategoryTypes {
 }
 
 export interface CategoryDropdownProps {
+  placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: MainCategoryTypes | SubCategoryTypes | null
+  modelValue: string
   isLabel?: boolean
-  isDisabled?: boolean
-  isInvalidate?: string
 }

From 71c338199f9eb74eb75d0a357a5d7bf936fd65a2 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:11:02 +0900
Subject: [PATCH 147/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=9D=EC=84=B1=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/request-task/RequestTask.vue | 27 +++++++++++++++++----
 src/types/common.ts                         |  3 ++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index ae084067..1e44ce14 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -4,13 +4,13 @@
       v-model="category1"
       :options="mainCategoryArr"
       :label-name="'1차 카테고리'"
-      :isInvalidate="isInvalidate"
+      :placeholderText="'1차 카테고리를 선택해주세요'"
       :isDisabled="false" />
     <CategoryDropDown
       v-model="category2"
       :options="afterSubCategoryArr"
       :label-name="'2차 카테고리'"
-      :is-invalidate="isInvalidate"
+      :placeholderText="'2차 카테고리를 선택해주세요'"
       :isDisabled="!category1" />
     <RequestTaskInput
       v-model="title"
@@ -38,11 +38,11 @@
 <script lang="ts" setup>
 import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
+import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
 import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
-import ModalView from '../ModalView.vue'
 import CategoryDropDown from './CategoryDropDown.vue'
 import RequestTaskFileInput from './RequestTaskFileInput.vue'
 import RequestTaskInput from './RequestTaskInput.vue'
@@ -73,6 +73,24 @@ watch(category1, async newValue => {
     subCategory => subCategory.mainCategoryId === newValue?.id
   )
 })
+
+const mainCategoryArr = ref<MainCategoryTypes[]>([])
+const subCategoryArr = ref<SubCategoryTypes[]>([])
+const afterSubCategoryArr = ref<SubCategoryTypes[]>([])
+
+onMounted(async () => {
+  mainCategoryArr.value = await getMainCategory()
+  subCategoryArr.value = await getSubCategory()
+  afterSubCategoryArr.value = await getSubCategory()
+})
+
+watch(category1, async newValue => {
+  category2.value = null
+  afterSubCategoryArr.value = subCategoryArr.value.filter(
+    subCategory => subCategory.mainCategoryId === newValue?.id
+  )
+})
+
 const router = useRouter()
 
 const handleCancel = () => {
@@ -95,7 +113,7 @@ const handleSubmit = async () => {
   }
   const formData = new FormData()
   const taskInfo = {
-    categoryId: category2.value.id,
+    categoryId: category2.value?.id,
     title: title.value,
     description: description.value
   }
@@ -110,7 +128,6 @@ const handleSubmit = async () => {
   }
   try {
     const res = await postTaskRequest(formData)
-    isModalVisible.value = true
     console.error('요청 성공:', res)
   } catch (error) {
     console.error('요청 실패:', error)
diff --git a/src/types/common.ts b/src/types/common.ts
index e63327e3..27a64370 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -136,6 +136,7 @@ export interface CategoryDropdownProps {
   placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: string
+  modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
+  isDisabled?: boolean
 }

From 8b568e0fa26033733647d09d1ac3944c9f6d5637 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 02:19:43 +0900
Subject: [PATCH 148/180] =?UTF-8?q?:recycle:=20[refactor]=20:=201,2?=
 =?UTF-8?q?=EC=B0=A8=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=84=A0=EC=96=B8=20=EB=B0=8F=20=EC=9C=84=EC=B9=98?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/common.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/types/common.ts b/src/types/common.ts
index 27a64370..e63327e3 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -136,7 +136,6 @@ export interface CategoryDropdownProps {
   placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: MainCategoryTypes | SubCategoryTypes | null
+  modelValue: string
   isLabel?: boolean
-  isDisabled?: boolean
 }

From da3a4f0c400b3d54a2e8ae9712decf12d0b340ae Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Sun, 2 Feb 2025 03:11:02 +0900
Subject: [PATCH 149/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=9D=EC=84=B1=20api=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/common.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/types/common.ts b/src/types/common.ts
index e63327e3..27a64370 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -136,6 +136,7 @@ export interface CategoryDropdownProps {
   placeholderText: string
   options: MainCategoryTypes[] | SubCategoryTypes[]
   labelName: string
-  modelValue: string
+  modelValue: MainCategoryTypes | SubCategoryTypes | null
   isLabel?: boolean
+  isDisabled?: boolean
 }

From 129f5effeeee7ee685a29cbdb0fe6d5deb3fe32f Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 23:39:33 +0900
Subject: [PATCH 150/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?=
 =?UTF-8?q?=EA=B0=92=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/member.ts | 2 --
 src/types/auth.ts    | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/stores/member.ts b/src/stores/member.ts
index 97039ee9..07eeb21a 100644
--- a/src/stores/member.ts
+++ b/src/stores/member.ts
@@ -6,7 +6,6 @@ import Cookies from 'js-cookie'
 
 export const useMemberStore = defineStore('memberInfo', () => {
   const info = ref<User>({
-    memberId: 0,
     memberName: '',
     nickname: '',
     imageUrl: '',
@@ -38,7 +37,6 @@ export const useMemberStore = defineStore('memberInfo', () => {
 
   function updateMemberInfo(responseData: any) {
     info.value = {
-      memberId: 0,
       memberName: responseData.name || '',
       nickname: responseData.nicknanme || '',
       imageUrl: responseData.profileImageUrl || '',
diff --git a/src/types/auth.ts b/src/types/auth.ts
index 2af35891..276cf384 100644
--- a/src/types/auth.ts
+++ b/src/types/auth.ts
@@ -6,7 +6,6 @@ export interface UserTypes {
 }
 
 export interface User {
-  memberId: number
   memberName: string
   nickname: string
   imageUrl: string

From f6ec9cdc036987b7b97e60013e99516395533db2 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 23:44:36 +0900
Subject: [PATCH 151/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=ED=86=A0=ED=81=B0=20axios=ED=8C=8C=EC=9D=BC=EC=97=90=EC=84=9C?=
 =?UTF-8?q?=20=EC=B2=98=EB=A6=AC=EB=90=98=EB=AF=80=EB=A1=9C=20=EB=B6=88?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=ED=95=98=EC=97=AC=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/member.ts | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/stores/member.ts b/src/stores/member.ts
index 07eeb21a..ab586039 100644
--- a/src/stores/member.ts
+++ b/src/stores/member.ts
@@ -15,18 +15,7 @@ export const useMemberStore = defineStore('memberInfo', () => {
 
   async function updateMemberInfoWithToken() {
     try {
-      const accessToken = Cookies.get('accessToken')
-
-      if (!accessToken) {
-        console.error('Access token error')
-        return
-      }
-
-      const response = await axiosInstance.get('/api/members/info', {
-        headers: {
-          Authorization: `Bearer ${accessToken}`
-        }
-      })
+      const response = await axiosInstance.get('/api/members/info')
 
       console.log('API Response:', response.data)
       updateMemberInfo(response.data)

From b0d66dc549233e8fac33d27a8e1b3d3230005bf7 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Sun, 2 Feb 2025 23:51:56 +0900
Subject: [PATCH 152/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=98=88=EC=99=B8?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.ts | 52 ++++++++++++++++++++-----------------------------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/src/api/auth.ts b/src/api/auth.ts
index a5baf222..89412849 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -7,41 +7,31 @@ export const postLogin = async (nickname: string, password: string) => {
     password: password
   }
   const sessionIdValue = '123'
-  try {
-    const response = await axiosInstance.post('/api/auths/login', body, {
-      headers: {
-        sessionId: sessionIdValue
-      }
-    })
-
-    Cookies.set('accessToken', response.data.accessToken, {
-      path: '/',
-      sameSite: 'strict'
-    })
-
-    return response.data
-  } catch (error) {
-    console.error('로그인 오류:', error)
-    throw error
-  }
+
+  const response = await axiosInstance.post('/api/auths/login', body, {
+    headers: {
+      sessionId: sessionIdValue
+    }
+  })
+
+  Cookies.set('accessToken', response.data.accessToken, {
+    path: '/',
+    sameSite: 'strict'
+  })
+
+  return response.data
 }
 
 export const patchPassword = async (password: string) => {
   const accessToken = Cookies.get('accessToken')
 
-  if (!accessToken) {
-    console.error('Access token is missing')
-    return
-  }
+  if (!accessToken) return
 
-  try {
-    const response = await axiosInstance.patch('/api/members/password', password, {
-      headers: {
-        Authorization: `Bearer ${accessToken}`
-      }
-    })
-    return response.data
-  } catch (error) {
-    console.log('api error:', error)
-  }
+  const response = await axiosInstance.patch('/api/members/password', password, {
+    headers: {
+      Authorization: `Bearer ${accessToken}`
+    }
+  })
+
+  return response.data
 }

From 5b0ac9f14ada65ba53b8e1e1375a5573a44c0bad Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Mon, 3 Feb 2025 00:14:44 +0900
Subject: [PATCH 153/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20r?=
 =?UTF-8?q?equest=20body=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=20=EC=84=A0=EC=96=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.ts         | 17 ++++-------------
 src/types/auth.ts       |  5 +++++
 src/views/LoginView.vue |  7 ++++++-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/api/auth.ts b/src/api/auth.ts
index 89412849..bafbad6c 100644
--- a/src/api/auth.ts
+++ b/src/api/auth.ts
@@ -1,24 +1,15 @@
 import { axiosInstance } from '@/utils/axios'
 import Cookies from 'js-cookie'
+import type { loginDataTypes } from '@/types/auth'
 
-export const postLogin = async (nickname: string, password: string) => {
-  const body = {
-    nickname: nickname,
-    password: password
-  }
-  const sessionIdValue = '123'
-
-  const response = await axiosInstance.post('/api/auths/login', body, {
-    headers: {
-      sessionId: sessionIdValue
-    }
+export const postLogin = async (loginData: loginDataTypes, sessionId: string) => {
+  const response = await axiosInstance.post('/api/auths/login', loginData, {
+    headers: { sessionId: sessionId }
   })
-
   Cookies.set('accessToken', response.data.accessToken, {
     path: '/',
     sameSite: 'strict'
   })
-
   return response.data
 }
 
diff --git a/src/types/auth.ts b/src/types/auth.ts
index 276cf384..6a1bd51a 100644
--- a/src/types/auth.ts
+++ b/src/types/auth.ts
@@ -12,3 +12,8 @@ export interface User {
   memberRole: string
   memberStatus: string
 }
+
+export interface loginDataTypes {
+  nickname: string
+  password: string
+}
diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index caf6bfaa..1dd39baf 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -56,7 +56,12 @@ const password = ref('')
 
 const handleLogin = async () => {
   try {
-    const res = await postLogin(nickname.value, password.value)
+    const loginData = {
+      nickname: nickname.value,
+      password: password.value
+    }
+    const sessionId = '000'
+    const res = await postLogin(loginData, sessionId)
 
     if (res) {
       switch (res.memberInfo.memberRole) {

From 863c78c3d048d66af9365debbe50ed5c286e4e2f Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Mon, 3 Feb 2025 00:14:56 +0900
Subject: [PATCH 154/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=20=EC=BD=94=EB=93=9C=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/member.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/stores/member.ts b/src/stores/member.ts
index ab586039..e1faef45 100644
--- a/src/stores/member.ts
+++ b/src/stores/member.ts
@@ -2,7 +2,6 @@ import { defineStore } from 'pinia'
 import { axiosInstance } from '@/utils/axios'
 import { ref } from 'vue'
 import type { User } from '@/types/auth'
-import Cookies from 'js-cookie'
 
 export const useMemberStore = defineStore('memberInfo', () => {
   const info = ref<User>({

From 6cff728442e9181fd9c2c1abc7d982cc39178088 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 01:22:48 +0900
Subject: [PATCH 155/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20test=20api?=
 =?UTF-8?q?=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/test.ts | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 src/api/test.ts

diff --git a/src/api/test.ts b/src/api/test.ts
deleted file mode 100644
index bb6f3d0b..00000000
--- a/src/api/test.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { axiosInstance } from '../utils/axios'
-
-export const getNotifications = async () => {
-  const response = await axiosInstance.get('/api/notifications?page=0&size=5')
-  return response.data
-}
-
-export const postLogin = async (nickname: string, password: string) => {
-  const response = await axiosInstance.post('/api/auths/login', { nickname, password })
-  return response.data
-}
-
-export const patchReadNotification = async (notificationId: number) => {
-  const response = await axiosInstance.patch(`/api/notification/${notificationId}`)
-  return response.data
-}

From 7902c73983d52e3addb874230a2d5f8cc2dfc304 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 01:41:34 +0900
Subject: [PATCH 156/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=20=EA=B4=80=EB=A6=AC=20=EC=B9=B4=ED=85=8C=EA=B3=A0?=
 =?UTF-8?q?=EB=A6=AC=20=EC=A0=84=EC=B2=B4=20=EC=A1=B0=ED=9A=8C=20=EC=97=B0?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/api/common.ts b/src/api/common.ts
index a0d4fd4e..ade690e6 100644
--- a/src/api/common.ts
+++ b/src/api/common.ts
@@ -9,3 +9,8 @@ export const getSubCategory = async () => {
   const response = await axiosInstance.get('/api/sub-category')
   return response.data
 }
+
+export const getAllCategory = async () => {
+  const response = await axiosInstance.get('/api/category')
+  return response.data
+}

From ecbafdfc4490ca33cab6314345f137aa0e94c1ed Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 02:33:17 +0900
Subject: [PATCH 157/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EB=B6=88?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=20mock=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/datas/taskmanagement.ts | 50 -------------------------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 src/datas/taskmanagement.ts

diff --git a/src/datas/taskmanagement.ts b/src/datas/taskmanagement.ts
deleted file mode 100644
index 822c2eab..00000000
--- a/src/datas/taskmanagement.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import type { CategoryAllData } from '@/types/admin'
-
-export const mockCategoryAllData: CategoryAllData = {
-  categories: [
-    {
-      id: 1,
-      name: 'VM',
-      code: 'VM001',
-      subCategory: [
-        {
-          id: 1,
-          mainCategoryId: 1,
-          name: 'VM 생성',
-          code: 'VM_CR'
-        },
-        {
-          id: 2,
-          mainCategoryId: 1,
-          name: 'VM 수정',
-          code: 'VM_UD'
-        },
-        {
-          id: 3,
-          mainCategoryId: 1,
-          name: 'VM 삭제',
-          code: 'VM_DE'
-        }
-      ]
-    },
-    {
-      id: 2,
-      name: 'NFS',
-      code: 'NFS001',
-      subCategory: [
-        {
-          id: 4,
-          mainCategoryId: 2,
-          name: 'NFS 생성',
-          code: 'NFS_CR'
-        },
-        {
-          id: 5,
-          mainCategoryId: 2,
-          name: 'NFS 수정',
-          code: 'NFS_UD'
-        }
-      ]
-    }
-  ]
-}

From 5136ae7455c796750365d30a905ecd5219aad1a1 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 02:33:32 +0900
Subject: [PATCH 158/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=82=AD=EC=A0=9C=20api=20?=
 =?UTF-8?q?=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin.ts                                   | 5 +++++
 src/components/task-management/CategoryLineSub.vue | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/api/admin.ts b/src/api/admin.ts
index b08aaf88..5a952967 100644
--- a/src/api/admin.ts
+++ b/src/api/admin.ts
@@ -23,3 +23,8 @@ export const patchLabelAdmin = async (editLabel: LabelDataTypes) => {
   })
   return response.data
 }
+
+export const deleteCategoryAdmin = async (id: number) => {
+  const response = await axiosInstance.delete(`/api/managements/categories/${id}`)
+  return response.data
+}
diff --git a/src/components/task-management/CategoryLineSub.vue b/src/components/task-management/CategoryLineSub.vue
index c121ff91..7c7aaef9 100644
--- a/src/components/task-management/CategoryLineSub.vue
+++ b/src/components/task-management/CategoryLineSub.vue
@@ -60,7 +60,6 @@ const router = useRouter()
 
 const isModalVisible = ref(false)
 const selectedId = ref<number | null>(null)
-const queryClient = useQueryClient()
 
 const openModal = (id: number) => {
   selectedId.value = id
@@ -74,7 +73,6 @@ const closeModal = () => {
 
 const deleteCategory = async (id: number) => {
   await deleteCategoryAdmin(id)
-  queryClient.invalidateQueries({ queryKey: ['category'] })
   closeModal()
 }
 

From 961e45998992ee7f019a8104c0d56c4674213dbc Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 09:50:38 +0900
Subject: [PATCH 159/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=ED=9B=84=20=EC=B5=9C=EC=8B=A0=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-management/LabelManagementLine.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/task-management/LabelManagementLine.vue b/src/components/task-management/LabelManagementLine.vue
index 3d3517b7..d954c18d 100644
--- a/src/components/task-management/LabelManagementLine.vue
+++ b/src/components/task-management/LabelManagementLine.vue
@@ -116,9 +116,9 @@ const updateLabelColor = (color: LabelColorTypes) => {
   editValue.value.labelColor = color.colorEnum
 }
 
-const finishEdit = () => {
+const finishEdit = async () => {
   handleEdit()
-  patchLabelAdmin(editValue.value)
+  await patchLabelAdmin(editValue.value)
   emit('updateLabels')
 }
 </script>

From ff16a3775362165e1d1f0301ad26ae3d23f182fc Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 11:50:44 +0900
Subject: [PATCH 160/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=82=AD=EC=A0=9C=20=ED=9B=84=20?=
 =?UTF-8?q?=EC=B5=9C=EC=8B=A0=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-management/CategoryLineSub.vue | 2 ++
 src/components/task-management/LabelManagement.vue | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/task-management/CategoryLineSub.vue b/src/components/task-management/CategoryLineSub.vue
index 7c7aaef9..c121ff91 100644
--- a/src/components/task-management/CategoryLineSub.vue
+++ b/src/components/task-management/CategoryLineSub.vue
@@ -60,6 +60,7 @@ const router = useRouter()
 
 const isModalVisible = ref(false)
 const selectedId = ref<number | null>(null)
+const queryClient = useQueryClient()
 
 const openModal = (id: number) => {
   selectedId.value = id
@@ -73,6 +74,7 @@ const closeModal = () => {
 
 const deleteCategory = async (id: number) => {
   await deleteCategoryAdmin(id)
+  queryClient.invalidateQueries({ queryKey: ['category'] })
   closeModal()
 }
 
diff --git a/src/components/task-management/LabelManagement.vue b/src/components/task-management/LabelManagement.vue
index 5caabede..e5921789 100644
--- a/src/components/task-management/LabelManagement.vue
+++ b/src/components/task-management/LabelManagement.vue
@@ -7,7 +7,7 @@
         <p>구분명</p>
       </div>
     </div>
-    <div class="flex flex-col w-full max-h-44 overflow-y-auto">
+    <div class="flex flex-col w-full max-h-[210px] overflow-y-auto">
       <LabelManagementLine
         :label-data="labelData"
         @updateLabels="fetchLabels" />

From b99abd526583a60f97e92b78843af298d35018a3 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 3 Feb 2025 09:32:49 +0900
Subject: [PATCH 161/180] =?UTF-8?q?:bug:=20[fix]=20=EB=B9=8C=EB=93=9C=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/my-task/MyTaskList.vue                 | 2 +-
 src/components/request-history/RequestHistoryList.vue | 2 +-
 src/components/requested/RequestedList.vue            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/my-task/MyTaskList.vue b/src/components/my-task/MyTaskList.vue
index 40dc1f21..d470a1e4 100644
--- a/src/components/my-task/MyTaskList.vue
+++ b/src/components/my-task/MyTaskList.vue
@@ -28,7 +28,7 @@ import { useRequestParamsStore } from '@/stores/params'
 import MyTaskListCard from './MyTaskListCard.vue'
 import MyTaskListBar from './MyTaskListBar.vue'
 import { useParseParams } from '../hooks/useParseParams'
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import type { MyTaskResponse } from '@/types/manager'
 import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
diff --git a/src/components/request-history/RequestHistoryList.vue b/src/components/request-history/RequestHistoryList.vue
index 1f5d0281..2399d44e 100644
--- a/src/components/request-history/RequestHistoryList.vue
+++ b/src/components/request-history/RequestHistoryList.vue
@@ -28,7 +28,7 @@ import { useRequestParamsStore } from '@/stores/params'
 import RequestHistoryListBar from './RequestHistoryListBar.vue'
 import RequestHistoryListCard from './RequestHistoryListCard.vue'
 import { useParseParams } from '../hooks/useParseParams'
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
 import type { RequestHistoryResponse } from '@/types/manager'
diff --git a/src/components/requested/RequestedList.vue b/src/components/requested/RequestedList.vue
index 63766955..b5b25eab 100644
--- a/src/components/requested/RequestedList.vue
+++ b/src/components/requested/RequestedList.vue
@@ -28,7 +28,7 @@ import RequestedListBar from './RequestedListBar.vue'
 import RequestedListCard from './RequestedListCard.vue'
 import { useRequestParamsStore } from '@/stores/params'
 import { useParseParams } from '../hooks/useParseParams'
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
 import type { RequestedResponse } from '@/types/manager'

From 87bb2a5d208f163efa6c279908b42ac2e1e66e0c Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 13:43:20 +0900
Subject: [PATCH 162/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EA=B5=AC?=
 =?UTF-8?q?=EB=B6=84=20=EC=83=89=EC=83=81=20=EB=B3=B4=EC=97=AC=EC=A7=80?=
 =?UTF-8?q?=EB=8A=94=20=EB=B2=94=EC=9C=84=20=EC=A6=9D=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-management/ColorSelectModal.vue | 2 +-
 src/components/task-management/LabelManagement.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/task-management/ColorSelectModal.vue b/src/components/task-management/ColorSelectModal.vue
index 1679d10a..814d57c9 100644
--- a/src/components/task-management/ColorSelectModal.vue
+++ b/src/components/task-management/ColorSelectModal.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     v-if="isOpen"
-    class="absolute top-7 left-3 w-[176px] h-[120px] p-4 flex flex-col z-50 shadow-custom rounded-lg bg-white gap-4"
+    class="absolute top-7 left-3 w-[176px] h-[120px] p-4 flex flex-col !z-50 shadow-custom rounded-lg bg-white gap-4 import"
     @click.self="closeModal">
     <div class="flex w-full justify-between">
       <p class="text-xs font-bold text-body">색상 선택</p>
diff --git a/src/components/task-management/LabelManagement.vue b/src/components/task-management/LabelManagement.vue
index e5921789..771f512d 100644
--- a/src/components/task-management/LabelManagement.vue
+++ b/src/components/task-management/LabelManagement.vue
@@ -7,7 +7,7 @@
         <p>구분명</p>
       </div>
     </div>
-    <div class="flex flex-col w-full max-h-[210px] overflow-y-auto">
+    <div class="flex flex-col w-full shrink-0 overflow-y-auto pb-8">
       <LabelManagementLine
         :label-data="labelData"
         @updateLabels="fetchLabels" />

From e10e2b5f6b6cf73f0cba5267712f5b4dc26c82be Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 14:05:27 +0900
Subject: [PATCH 163/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EB=82=B4=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EB=88=8C=EB=A0=80=EC=9D=84=20=EB=95=8C=20?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=EC=A0=95=EB=B3=B4=20+=20isManager=20pinia?=
 =?UTF-8?q?=ED=86=B5=ED=95=B4=20=EA=B0=80=EC=A0=B8=EC=98=A4=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetail.vue | 38 +++++++++++++----------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue
index 531a2dc2..e7d0e675 100644
--- a/src/components/task-detail/TaskDetail.vue
+++ b/src/components/task-detail/TaskDetail.vue
@@ -2,22 +2,24 @@
   <div class="fixed inset-0 bg-black bg-opacity-15 flex justify-center items-center z-50">
     <div
       class="flex flex-col overflow-y-auto rounded-lg w-full max-w-[1200px] min-w-[1024px] bg-white p-6">
+      {{ selectedId }} 요청 번호
       <TaskDetailTopBar
+        :is-manager="role === 'ROLE_MANAGER'"
         :is-approved="isApproved"
-        :close-task-detail="closeTaskDetail"
-        :id="data?.taskId || 0" />
-      <div
-        class="w-full flex gap-6"
-        v-if="data">
+        :close-task-detail="closeTaskDetail" />
+      <div class="w-full flex gap-6">
         <div class="w-full h-[718px] flex flex-col gap-y-8 overflow-y-auto scrollbar-hide">
-          <TaskDetailLeft :data="data" />
-          <div class="w-full border-[0.5px] border-border-1"></div>
+          <TaskDetailLeft :task-detail="DUMMY_TASK_DETAIL" />
+          <div class="w-full border-border-1 border"></div>
           <TaskDetailHistory
             :history="DUMMY_TASK_DETAIL_HISTORY"
-            :is-approved="false" />
+            :is-approved="false"
+            :is-manager="false" />
         </div>
         <div class="w-[1px] bg-border-1"></div>
-        <TaskDetailRight :data />
+        <TaskDetailRight
+          :task-detail="DUMMY_TASK_DETAIL"
+          :is-manager="true" />
       </div>
     </div>
   </div>
@@ -26,18 +28,20 @@
 <script setup lang="ts">
 import { getTaskDetailManager } from '@/api/user'
 import * as taskDetailData from '@/datas/taskdetail'
-import type { TaskDetailDatas, TaskDetailProps } from '@/types/user'
-import { useQuery } from '@tanstack/vue-query'
+import { useMemberStore } from '@/stores/member'
+import type { TaskDetailProps } from '@/types/user'
+import { storeToRefs } from 'pinia'
+import { computed } from 'vue'
 import TaskDetailHistory from './TaskDetailHistory.vue'
 import TaskDetailLeft from './TaskDetailLeft.vue'
 import TaskDetailRight from './TaskDetailRight.vue'
 import TaskDetailTopBar from './TaskDetailTopBar.vue'
 
-const { DUMMY_TASK_DETAIL_HISTORY } = taskDetailData
-const { isApproved, closeTaskDetail, selectedId } = defineProps<TaskDetailProps>()
+const memberStore = useMemberStore()
+const { info } = storeToRefs(memberStore)
+const role = computed(() => info.value.memberRole)
+console.log(role.value, '역할')
 
-const { data } = useQuery<TaskDetailDatas>({
-  queryKey: ['taskDetailUser', selectedId],
-  queryFn: () => getTaskDetailManager(selectedId)
-})
+const { DUMMY_TASK_DETAIL_HISTORY, DUMMY_TASK_DETAIL } = taskDetailData
+const { isApproved, closeTaskDetail, selectedId } = defineProps<TaskDetailProps>()
 </script>

From c18a890dba600a95f6d386eb4cccea02de609ba3 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 14:53:37 +0900
Subject: [PATCH 164/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=81=EC=84=B8=EC=A0=95=EB=B3=B4=20=EA=B0=80?=
 =?UTF-8?q?=EC=A0=B8=EC=98=A4=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.ts                               |  5 +++
 src/components/task-detail/TaskDetail.vue     | 36 +++++++++----------
 src/components/task-detail/TaskDetailLeft.vue |  2 +-
 .../task-detail/TaskDetailRight.vue           | 20 ++++-------
 .../task-detail/TaskDetailTopBar.vue          | 12 ++-----
 5 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/src/api/user.ts b/src/api/user.ts
index 86bbbbf4..582284e0 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -4,3 +4,8 @@ export const postTaskRequest = async (formdata: FormData) => {
   const response = await formDataAxiosInstance.post('/api/tasks', formdata)
   return response.data
 }
+
+export const getTaskDetailUser = async (id: number) => {
+  const response = await formDataAxiosInstance.get(`/api/tasks/${id}/requests/details`)
+  return response.data
+}
diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue
index e7d0e675..676f1646 100644
--- a/src/components/task-detail/TaskDetail.vue
+++ b/src/components/task-detail/TaskDetail.vue
@@ -4,44 +4,42 @@
       class="flex flex-col overflow-y-auto rounded-lg w-full max-w-[1200px] min-w-[1024px] bg-white p-6">
       {{ selectedId }} 요청 번호
       <TaskDetailTopBar
-        :is-manager="role === 'ROLE_MANAGER'"
         :is-approved="isApproved"
         :close-task-detail="closeTaskDetail" />
-      <div class="w-full flex gap-6">
+      <div
+        class="w-full flex gap-6"
+        v-if="data">
         <div class="w-full h-[718px] flex flex-col gap-y-8 overflow-y-auto scrollbar-hide">
-          <TaskDetailLeft :task-detail="DUMMY_TASK_DETAIL" />
+          <TaskDetailLeft :data="data" />
           <div class="w-full border-border-1 border"></div>
           <TaskDetailHistory
             :history="DUMMY_TASK_DETAIL_HISTORY"
-            :is-approved="false"
-            :is-manager="false" />
+            :is-approved="false" />
         </div>
         <div class="w-[1px] bg-border-1"></div>
-        <TaskDetailRight
-          :task-detail="DUMMY_TASK_DETAIL"
-          :is-manager="true" />
+        <TaskDetailRight :data />
       </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { getTaskDetailManager } from '@/api/user'
+import { getTaskDetailUser } from '@/api/user'
 import * as taskDetailData from '@/datas/taskdetail'
-import { useMemberStore } from '@/stores/member'
-import type { TaskDetailProps } from '@/types/user'
-import { storeToRefs } from 'pinia'
-import { computed } from 'vue'
+import type { TaskDetailDatas, TaskDetailProps } from '@/types/user'
+import { useQuery } from '@tanstack/vue-query'
 import TaskDetailHistory from './TaskDetailHistory.vue'
 import TaskDetailLeft from './TaskDetailLeft.vue'
 import TaskDetailRight from './TaskDetailRight.vue'
 import TaskDetailTopBar from './TaskDetailTopBar.vue'
 
-const memberStore = useMemberStore()
-const { info } = storeToRefs(memberStore)
-const role = computed(() => info.value.memberRole)
-console.log(role.value, '역할')
-
-const { DUMMY_TASK_DETAIL_HISTORY, DUMMY_TASK_DETAIL } = taskDetailData
+const { DUMMY_TASK_DETAIL_HISTORY } = taskDetailData
 const { isApproved, closeTaskDetail, selectedId } = defineProps<TaskDetailProps>()
+
+const { data } = useQuery<TaskDetailDatas>({
+  queryKey: ['taskDetailUser', selectedId],
+  queryFn: () => getTaskDetailUser(selectedId)
+})
+
+console.log(data, 'data')
 </script>
diff --git a/src/components/task-detail/TaskDetailLeft.vue b/src/components/task-detail/TaskDetailLeft.vue
index 0f466524..5cbe6c0e 100644
--- a/src/components/task-detail/TaskDetailLeft.vue
+++ b/src/components/task-detail/TaskDetailLeft.vue
@@ -18,7 +18,7 @@
     </div>
     <div>
       <p class="task-detail">첨부 파일</p>
-      <TaskDetailFiles :files="data.attachmentResponses" />
+      <TaskDetailFiles :files="data.attachmentResponse" />
     </div>
   </div>
 </template>
diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index 66c6c2ef..a57c4b2c 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -10,26 +10,19 @@
     </div>
     <div>
       <p class="task-detail">종료일</p>
-      <p class="text-sm text-black">
-        {{ (data.finishedAt && formatDate(data.finishedAt)) || '-' }}
-      </p>
+      <p class="text-sm text-black">{{ formatDate(data.finishedAt) || '-' }}</p>
     </div>
     <div>
       <p class="task-detail">상태</p>
-      <div
-        v-if="data.taskStatus === 'REQUESTED'"
-        class="w-fit">
+      <div class="w-fit">
         <TaskStatus :status="data.taskStatus" />
       </div>
-      <div v-else>
-        <TaskStatusList :status="data.taskStatus" />
-      </div>
     </div>
     <div>
       <p class="task-detail">요청자</p>
       <div class="flex gap-2">
         <img
-          :src="data.requesterImageUrl || '/images/mockProfile.jpg'"
+          :src="data.requesterImageUrl"
           class="rounded-full overflow-hidden w-5 h-5"
           alt="requesterImg" />
         <p class="text-sm text-black">{{ data.requesterNickName }}</p>
@@ -47,8 +40,8 @@
         v-else
         class="flex gap-2">
         <img
-          v-if="data.processorNickName"
-          :src="data.processorImageUrl || '/images/mockProfile.jpg'"
+          v-if="data.processorImageUrl"
+          :src="data.processorImageUrl"
           class="rounded-full overflow-hidden w-5 h-5"
           alt="processorImg" />
         <p class="text-sm text-black">{{ data.processorNickName || '-' }}</p>
@@ -86,10 +79,9 @@ import TaskStatusList from './TaskStatusList.vue'
 
 const memberStore = useMemberStore()
 const { info } = storeToRefs(memberStore)
-const isManager = computed(() => info.value.memberName === data.processorNickName)
+const isManager = computed(() => info.value.memberRole === 'ROLE_MANAGER')
 
 const { data } = defineProps<{ data: TaskDetailDatas }>()
-console.log(data, '가져온 데이터')
 
 const processor = ref(DUMMY_PROCESSOR.nickName)
 const labeling = ref(DUMMY_TASK_LABELS[0].labelName)
diff --git a/src/components/task-detail/TaskDetailTopBar.vue b/src/components/task-detail/TaskDetailTopBar.vue
index 3674414d..51ed2096 100644
--- a/src/components/task-detail/TaskDetailTopBar.vue
+++ b/src/components/task-detail/TaskDetailTopBar.vue
@@ -43,23 +43,15 @@
 </template>
 
 <script setup lang="ts">
-import {
-  approveIcon,
-  cancelIcon,
-  closeIcon,
-  modificationIcon,
-  reRequestIcon
-} from '@/constants/iconPath'
+import { cancelIcon, closeIcon, modificationIcon, reRequestIcon } from '@/constants/iconPath'
 import { useMemberStore } from '@/stores/member'
 import type { TaskDetailTopBarProps } from '@/types/manager'
 import { storeToRefs } from 'pinia'
 import { computed, ref } from 'vue'
-import { useRouter } from 'vue-router'
 import CommonIcons from '../common/CommonIcons.vue'
 import ModalView from '../ModalView.vue'
 
 const memberStore = useMemberStore()
-const router = useRouter()
 const { info } = storeToRefs(memberStore)
 const isManager = computed(() => info.value.memberRole === 'ROLE_MANAGER')
 
@@ -81,7 +73,7 @@ const ApproveTask = () => {
   router.push(`/request-approve/${id}`)
 }
 
-const { isApproved, closeTaskDetail, id } = defineProps<TaskDetailTopBarProps>()
+const { isApproved, closeTaskDetail } = defineProps<TaskDetailTopBarProps>()
 </script>
 
 <style scoped></style>

From 286c46f661cc3968cf6ed7a964e0e60a277b8cb2 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 15:20:11 +0900
Subject: [PATCH 165/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=9E=90=EC=9D=98=20=EA=B6=8C=ED=95=9C=EC=97=90=20?=
 =?UTF-8?q?=EB=A7=9E=EB=8A=94=20=EB=B3=B4=EC=97=AC=EC=A3=BC=EA=B8=B0,=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=8B=A4=EC=9A=B4,=20=EC=9A=A9=ED=96=98?=
 =?UTF-8?q?=20=ED=91=9C=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetail.vue      | 3 ---
 src/components/task-detail/TaskDetailLeft.vue  | 2 +-
 src/components/task-detail/TaskDetailRight.vue | 7 ++++---
 src/utils/date.ts                              | 3 ++-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue
index 676f1646..2b6039e6 100644
--- a/src/components/task-detail/TaskDetail.vue
+++ b/src/components/task-detail/TaskDetail.vue
@@ -2,7 +2,6 @@
   <div class="fixed inset-0 bg-black bg-opacity-15 flex justify-center items-center z-50">
     <div
       class="flex flex-col overflow-y-auto rounded-lg w-full max-w-[1200px] min-w-[1024px] bg-white p-6">
-      {{ selectedId }} 요청 번호
       <TaskDetailTopBar
         :is-approved="isApproved"
         :close-task-detail="closeTaskDetail" />
@@ -40,6 +39,4 @@ const { data } = useQuery<TaskDetailDatas>({
   queryKey: ['taskDetailUser', selectedId],
   queryFn: () => getTaskDetailUser(selectedId)
 })
-
-console.log(data, 'data')
 </script>
diff --git a/src/components/task-detail/TaskDetailLeft.vue b/src/components/task-detail/TaskDetailLeft.vue
index 5cbe6c0e..0f466524 100644
--- a/src/components/task-detail/TaskDetailLeft.vue
+++ b/src/components/task-detail/TaskDetailLeft.vue
@@ -18,7 +18,7 @@
     </div>
     <div>
       <p class="task-detail">첨부 파일</p>
-      <TaskDetailFiles :files="data.attachmentResponse" />
+      <TaskDetailFiles :files="data.attachmentResponses" />
     </div>
   </div>
 </template>
diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index a57c4b2c..6621fc70 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -10,7 +10,9 @@
     </div>
     <div>
       <p class="task-detail">종료일</p>
-      <p class="text-sm text-black">{{ formatDate(data.finishedAt) || '-' }}</p>
+      <p class="text-sm text-black">
+        {{ formatDate(data.finishedAt) || '-' }}
+      </p>
     </div>
     <div>
       <p class="task-detail">상태</p>
@@ -22,7 +24,7 @@
       <p class="task-detail">요청자</p>
       <div class="flex gap-2">
         <img
-          :src="data.requesterImageUrl"
+          :src="data.requesterImageUrl || '/images/mockProfile.jpg'"
           class="rounded-full overflow-hidden w-5 h-5"
           alt="requesterImg" />
         <p class="text-sm text-black">{{ data.requesterNickName }}</p>
@@ -80,7 +82,6 @@ import TaskStatusList from './TaskStatusList.vue'
 const memberStore = useMemberStore()
 const { info } = storeToRefs(memberStore)
 const isManager = computed(() => info.value.memberRole === 'ROLE_MANAGER')
-
 const { data } = defineProps<{ data: TaskDetailDatas }>()
 
 const processor = ref(DUMMY_PROCESSOR.nickName)
diff --git a/src/utils/date.ts b/src/utils/date.ts
index a8aabe8b..ea13a64d 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -1,4 +1,5 @@
-export const formatDate = (dateString: string) => {
+export const formatDate = (dateString: string | null) => {
+  if (dateString === null) return null
   const date = new Date(dateString)
 
   const year = date.getFullYear()

From 0336eaa87856c6c7da853f68a02cb30913c4622a Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 15:22:15 +0900
Subject: [PATCH 166/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=9E=90=EC=9D=98=20=EA=B6=8C=ED=95=9C=EC=97=90=20?=
 =?UTF-8?q?=EB=A7=9E=EB=8A=94=20top=20bar=20+=20icon=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailTopBar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/task-detail/TaskDetailTopBar.vue b/src/components/task-detail/TaskDetailTopBar.vue
index 51ed2096..59541af7 100644
--- a/src/components/task-detail/TaskDetailTopBar.vue
+++ b/src/components/task-detail/TaskDetailTopBar.vue
@@ -43,7 +43,7 @@
 </template>
 
 <script setup lang="ts">
-import { cancelIcon, closeIcon, modificationIcon, reRequestIcon } from '@/constants/iconPath'
+import { approveIcon, cancelIcon, closeIcon, modificationIcon, reRequestIcon } from '@/constants/iconPath'
 import { useMemberStore } from '@/stores/member'
 import type { TaskDetailTopBarProps } from '@/types/manager'
 import { storeToRefs } from 'pinia'

From 565b1a80b873df8b474b616fd364d990398ad659 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 15:31:15 +0900
Subject: [PATCH 167/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=EA=B0=80=20=EC=95=84=EB=8B=8C=20=EB=8B=B4?=
 =?UTF-8?q?=EB=8B=B9=EC=9E=90=EC=9D=98=20=EA=B2=BD=EC=9A=B0=20=EB=B3=B4?=
 =?UTF-8?q?=EC=9D=B4=EB=8A=94=20=EC=9E=A5=EB=A9=B4=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailRight.vue | 9 +++++----
 src/utils/date.ts                              | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index 6621fc70..adc8bca3 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -11,7 +11,7 @@
     <div>
       <p class="task-detail">종료일</p>
       <p class="text-sm text-black">
-        {{ formatDate(data.finishedAt) || '-' }}
+        {{ (data.finishedAt && formatDate(data.finishedAt)) || '-' }}
       </p>
     </div>
     <div>
@@ -42,8 +42,7 @@
         v-else
         class="flex gap-2">
         <img
-          v-if="data.processorImageUrl"
-          :src="data.processorImageUrl"
+          :src="data.processorImageUrl || '/images/mockProfile.jpg'"
           class="rounded-full overflow-hidden w-5 h-5"
           alt="processorImg" />
         <p class="text-sm text-black">{{ data.processorNickName || '-' }}</p>
@@ -81,8 +80,10 @@ import TaskStatusList from './TaskStatusList.vue'
 
 const memberStore = useMemberStore()
 const { info } = storeToRefs(memberStore)
-const isManager = computed(() => info.value.memberRole === 'ROLE_MANAGER')
+const isManager = computed(() => info.value.memberName === data.processorNickName)
+
 const { data } = defineProps<{ data: TaskDetailDatas }>()
+console.log(data, '가져온 데이터')
 
 const processor = ref(DUMMY_PROCESSOR.nickName)
 const labeling = ref(DUMMY_TASK_LABELS[0].labelName)
diff --git a/src/utils/date.ts b/src/utils/date.ts
index ea13a64d..a8aabe8b 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -1,5 +1,4 @@
-export const formatDate = (dateString: string | null) => {
-  if (dateString === null) return null
+export const formatDate = (dateString: string) => {
   const date = new Date(dateString)
 
   const year = date.getFullYear()

From 7be7f5979bc98c28c289b78745224408c2e66cfd Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 16:04:33 +0900
Subject: [PATCH 168/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=B9=B4?=
 =?UTF-8?q?=ED=85=8C=EA=B3=A0=EB=A6=AC=20=ED=83=80=EC=9E=85=20=ED=86=B5?=
 =?UTF-8?q?=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request-task/CategoryDropDown.vue           |  4 ++--
 src/components/request-task/RequestTask.vue     | 13 ++++++-------
 src/constants/admin.ts                          |  6 +++---
 src/types/admin.ts                              |  9 +--------
 src/types/common.ts                             | 17 ++---------------
 5 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/src/components/request-task/CategoryDropDown.vue b/src/components/request-task/CategoryDropDown.vue
index 7f377299..030e3e62 100644
--- a/src/components/request-task/CategoryDropDown.vue
+++ b/src/components/request-task/CategoryDropDown.vue
@@ -41,7 +41,7 @@
 
 <script lang="ts" setup>
 import { dropdownIcon } from '@/constants/iconPath'
-import type { CategoryDropdownProps, MainCategoryTypes, SubCategoryTypes } from '@/types/common'
+import type { Category, CategoryDropdownProps } from '@/types/common'
 import { computed, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 
@@ -58,7 +58,7 @@ const toggleDropdown = () => {
   dropdownOpen.value = !dropdownOpen.value
 }
 
-const selectOption = (option: MainCategoryTypes | SubCategoryTypes) => {
+const selectOption = (option: Category) => {
   emit('update:modelValue', option)
   dropdownOpen.value = false
 }
diff --git a/src/components/request-task/RequestTask.vue b/src/components/request-task/RequestTask.vue
index 1e44ce14..6de8879a 100644
--- a/src/components/request-task/RequestTask.vue
+++ b/src/components/request-task/RequestTask.vue
@@ -38,8 +38,7 @@
 <script lang="ts" setup>
 import { getMainCategory, getSubCategory } from '@/api/common'
 import { postTaskRequest } from '@/api/user'
-import { EXPLANATION_PLACEHOLDER, TITLE_PLACEHOLDER } from '@/constants/user'
-import type { MainCategoryTypes, SubCategoryTypes } from '@/types/common'
+import type { Category, SubCategory } from '@/types/common'
 import { onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
@@ -48,8 +47,8 @@ import RequestTaskFileInput from './RequestTaskFileInput.vue'
 import RequestTaskInput from './RequestTaskInput.vue'
 import RequestTaskTextArea from './RequestTaskTextArea.vue'
 
-const category1 = ref<MainCategoryTypes | null>(null)
-const category2 = ref<MainCategoryTypes | null>(null)
+const category1 = ref<Category | null>(null)
+const category2 = ref<Category | null>(null)
 
 const title = ref('')
 const description = ref('')
@@ -57,9 +56,9 @@ const file = ref(null as File[] | null)
 const isInvalidate = ref('')
 const isModalVisible = ref(false)
 
-const mainCategoryArr = ref<MainCategoryTypes[]>([])
-const subCategoryArr = ref<SubCategoryTypes[]>([])
-const afterSubCategoryArr = ref<SubCategoryTypes[]>([])
+const mainCategoryArr = ref<Category[]>([])
+const subCategoryArr = ref<SubCategory[]>([])
+const afterSubCategoryArr = ref<SubCategory[]>([])
 
 onMounted(async () => {
   mainCategoryArr.value = await getMainCategory()
diff --git a/src/constants/admin.ts b/src/constants/admin.ts
index 15fef027..4a848952 100644
--- a/src/constants/admin.ts
+++ b/src/constants/admin.ts
@@ -1,4 +1,4 @@
-import type { ListBarTabProps, MainCategoryTypes, Option, SubCategoryTypes } from '@/types/common'
+import type { Category, ListBarTabProps, Option, SubCategory } from '@/types/common'
 
 export const MEMBER_MANAGEMENT_LIST_BAR_TAB: ListBarTabProps[] = [
   { content: '이름', width: 60 },
@@ -36,13 +36,13 @@ export const LOGS_LIST_BAR_TAB: ListBarTabProps[] = [
 
 import type { RoleTypes, RoleTypesEnum, UserRegistrationProps } from '@/types/admin'
 
-export const CATEGORY_FIRST_ADD: MainCategoryTypes = {
+export const CATEGORY_FIRST_ADD: Category = {
   name: '',
   code: '',
   id: 0
 }
 
-export const CATEGORY_SECOND_ADD: SubCategoryTypes = {
+export const CATEGORY_SECOND_ADD: SubCategory = {
   name: '',
   mainCategoryId: 0,
   code: '',
diff --git a/src/types/admin.ts b/src/types/admin.ts
index 42038f19..08589211 100644
--- a/src/types/admin.ts
+++ b/src/types/admin.ts
@@ -1,4 +1,4 @@
-import type { Role, SubCategoryTypes } from './common'
+import type { Category, Role } from './common'
 
 export interface MemberManagementListData {
   memberId: number
@@ -42,13 +42,6 @@ export interface CategoryLineProps {
   mainCategoryId?: string
 }
 
-export interface categoriesTypes {
-  id: number
-  name: string
-  code: string
-  subCategory: SubCategoryTypes[]
-}
-
 export interface CategoryAllData {
   categories: Category[]
 }
diff --git a/src/types/common.ts b/src/types/common.ts
index 27a64370..fea02f6b 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -79,23 +79,10 @@ export interface ColorSelectProps {
   newLabel: LabelDataTypes
 }
 
-export interface MainCategoryTypes {
-  id: number
-  name: string
-  code: string
-}
-
-export interface SubCategoryTypes {
-  id: number
-  mainCategoryId: number
-  name: string
-  code: string
-}
-
 export interface CategoryDropdownProps {
-  options: MainCategoryTypes[] | SubCategoryTypes[]
+  options: Category[] | SubCategory[]
   labelName: string
-  modelValue: MainCategoryTypes | SubCategoryTypes | null
+  modelValue: Category | SubCategory | null
   isLabel?: boolean
   isDisabled?: boolean
   isInvalidate?: string

From 7f09ca6b0fb3f5ec99c43cd420141bb5bc9720b7 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 16:33:54 +0900
Subject: [PATCH 169/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?=EC=A7=80=EB=82=9C=20=ED=94=BC=EB=93=9C=EB=B0=B1=20=EB=82=B4?=
 =?UTF-8?q?=EC=9A=A9=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetail.vue     |  2 +-
 .../task-detail/TaskDetailRight.vue           |  6 +++-
 src/types/common.ts                           | 29 ++-----------------
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue
index 2b6039e6..90b4cb43 100644
--- a/src/components/task-detail/TaskDetail.vue
+++ b/src/components/task-detail/TaskDetail.vue
@@ -10,7 +10,7 @@
         v-if="data">
         <div class="w-full h-[718px] flex flex-col gap-y-8 overflow-y-auto scrollbar-hide">
           <TaskDetailLeft :data="data" />
-          <div class="w-full border-border-1 border"></div>
+          <div class="w-full border-[0.5px] border-border-1"></div>
           <TaskDetailHistory
             :history="DUMMY_TASK_DETAIL_HISTORY"
             :is-approved="false" />
diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index adc8bca3..8475afbf 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -16,9 +16,12 @@
     </div>
     <div>
       <p class="task-detail">상태</p>
-      <div class="w-fit">
+      <div v-if="data.taskStatus === 'REQUESTED'" class="w-fit">
         <TaskStatus :status="data.taskStatus" />
       </div>
+      <div v-else>
+        <TaskStatusList :status="data.taskStatus" />
+      </div>
     </div>
     <div>
       <p class="task-detail">요청자</p>
@@ -42,6 +45,7 @@
         v-else
         class="flex gap-2">
         <img
+          v-if="data.processorNickName"
           :src="data.processorImageUrl || '/images/mockProfile.jpg'"
           class="rounded-full overflow-hidden w-5 h-5"
           alt="processorImg" />
diff --git a/src/types/common.ts b/src/types/common.ts
index fea02f6b..6a4ecc51 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -100,30 +100,7 @@ export interface LabelColorTypes {
   colorEnum: string
 }
 
-export interface LabelDataTypes {
-  labelId: number
-  labelName: string
-  labelColor: string
-}
-
-export interface MainCategoryTypes {
-  id: number
-  name: string
-  code: string
-}
-
-export interface SubCategoryTypes {
-  id: number
-  mainCategoryId: number
-  name: string
-  code: string
-}
-
-export interface CategoryDropdownProps {
-  placeholderText: string
-  options: MainCategoryTypes[] | SubCategoryTypes[]
-  labelName: string
-  modelValue: MainCategoryTypes | SubCategoryTypes | null
-  isLabel?: boolean
-  isDisabled?: boolean
+export interface TaskStatusListTypes {
+  value: Status
+  content: string
 }

From c1fb83dbb9a4029236e4723fd35e6b231aba4111 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 16:51:31 +0900
Subject: [PATCH 170/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EB=8B=B4?=
 =?UTF-8?q?=EB=8B=B9=EC=9E=90=EC=9A=A9=20api=20get=20=EC=97=B0=EA=B2=B0=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=EC=8A=B9=EC=9D=B8=20=EC=8B=9C=20=EC=8A=B9?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B2=BD=EB=A1=9C=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.ts                                 |  5 +++++
 src/components/task-detail/TaskDetail.vue       |  7 ++++---
 src/components/task-detail/TaskDetailTopBar.vue | 12 ++++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/api/user.ts b/src/api/user.ts
index 582284e0..28ca9ccf 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -9,3 +9,8 @@ export const getTaskDetailUser = async (id: number) => {
   const response = await formDataAxiosInstance.get(`/api/tasks/${id}/requests/details`)
   return response.data
 }
+
+export const getTaskDetailManager = async (id: number) => {
+  const response = await formDataAxiosInstance.get(`/api/tasks/${id}/details`)
+  return response.data
+}
diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue
index 90b4cb43..531a2dc2 100644
--- a/src/components/task-detail/TaskDetail.vue
+++ b/src/components/task-detail/TaskDetail.vue
@@ -4,7 +4,8 @@
       class="flex flex-col overflow-y-auto rounded-lg w-full max-w-[1200px] min-w-[1024px] bg-white p-6">
       <TaskDetailTopBar
         :is-approved="isApproved"
-        :close-task-detail="closeTaskDetail" />
+        :close-task-detail="closeTaskDetail"
+        :id="data?.taskId || 0" />
       <div
         class="w-full flex gap-6"
         v-if="data">
@@ -23,7 +24,7 @@
 </template>
 
 <script setup lang="ts">
-import { getTaskDetailUser } from '@/api/user'
+import { getTaskDetailManager } from '@/api/user'
 import * as taskDetailData from '@/datas/taskdetail'
 import type { TaskDetailDatas, TaskDetailProps } from '@/types/user'
 import { useQuery } from '@tanstack/vue-query'
@@ -37,6 +38,6 @@ const { isApproved, closeTaskDetail, selectedId } = defineProps<TaskDetailProps>
 
 const { data } = useQuery<TaskDetailDatas>({
   queryKey: ['taskDetailUser', selectedId],
-  queryFn: () => getTaskDetailUser(selectedId)
+  queryFn: () => getTaskDetailManager(selectedId)
 })
 </script>
diff --git a/src/components/task-detail/TaskDetailTopBar.vue b/src/components/task-detail/TaskDetailTopBar.vue
index 59541af7..3674414d 100644
--- a/src/components/task-detail/TaskDetailTopBar.vue
+++ b/src/components/task-detail/TaskDetailTopBar.vue
@@ -43,15 +43,23 @@
 </template>
 
 <script setup lang="ts">
-import { approveIcon, cancelIcon, closeIcon, modificationIcon, reRequestIcon } from '@/constants/iconPath'
+import {
+  approveIcon,
+  cancelIcon,
+  closeIcon,
+  modificationIcon,
+  reRequestIcon
+} from '@/constants/iconPath'
 import { useMemberStore } from '@/stores/member'
 import type { TaskDetailTopBarProps } from '@/types/manager'
 import { storeToRefs } from 'pinia'
 import { computed, ref } from 'vue'
+import { useRouter } from 'vue-router'
 import CommonIcons from '../common/CommonIcons.vue'
 import ModalView from '../ModalView.vue'
 
 const memberStore = useMemberStore()
+const router = useRouter()
 const { info } = storeToRefs(memberStore)
 const isManager = computed(() => info.value.memberRole === 'ROLE_MANAGER')
 
@@ -73,7 +81,7 @@ const ApproveTask = () => {
   router.push(`/request-approve/${id}`)
 }
 
-const { isApproved, closeTaskDetail } = defineProps<TaskDetailTopBarProps>()
+const { isApproved, closeTaskDetail, id } = defineProps<TaskDetailTopBarProps>()
 </script>
 
 <style scoped></style>

From 10ae97917dc0b0d8985b987f05c79e65559314ed Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 16:52:09 +0900
Subject: [PATCH 171/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=ED=8F=AC=EB=A7=A4=ED=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailRight.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index 8475afbf..66c6c2ef 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -16,7 +16,9 @@
     </div>
     <div>
       <p class="task-detail">상태</p>
-      <div v-if="data.taskStatus === 'REQUESTED'" class="w-fit">
+      <div
+        v-if="data.taskStatus === 'REQUESTED'"
+        class="w-fit">
         <TaskStatus :status="data.taskStatus" />
       </div>
       <div v-else>

From e81bd15f6fcbdfd5e3882e7d72d6d83f4bc6e9ac Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 19:24:24 +0900
Subject: [PATCH 172/180] =?UTF-8?q?:sparkles:=20[feat]=20:=201=EC=B0=A8=20?=
 =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80=20API?=
 =?UTF-8?q?=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request-task/RequestTaskInput.vue         |  5 ---
 .../task-management/CategoryAdd.vue           | 41 +++++++------------
 src/components/top-bar/SideBar.vue            |  7 ++--
 src/constants/admin.ts                        |  6 +--
 src/types/common.ts                           | 18 +++++++-
 5 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/src/components/request-task/RequestTaskInput.vue b/src/components/request-task/RequestTaskInput.vue
index 5a411979..08949f94 100644
--- a/src/components/request-task/RequestTaskInput.vue
+++ b/src/components/request-task/RequestTaskInput.vue
@@ -7,11 +7,6 @@
         class="text-red-1">
         *
       </p>
-      <p
-        v-if="isInvalidateState === 'input'"
-        class="text-red-1">
-        {{ labelName }}을 입력해주세요
-      </p>
     </div>
     <input
       class="w-full h-11 border border-border-1 px-4 focus:outline-none text-black"
diff --git a/src/components/task-management/CategoryAdd.vue b/src/components/task-management/CategoryAdd.vue
index aa840288..fc05ddc5 100644
--- a/src/components/task-management/CategoryAdd.vue
+++ b/src/components/task-management/CategoryAdd.vue
@@ -22,15 +22,15 @@
     </ModalView>
     <!-- 카테고리 목록 API 필요, 임시로 역할로 설정 -->
     <RequestTaskDropdown
-      v-model="mainCategory"
-      :options="categoryOptions.map(el => el.name)"
+      v-model="categoryForm.firstCategory"
+      :options="RoleKeys"
       label-name="1차 카테고리"
       placeholder-text="1차 카테고리를 선택해주세요"
-      v-if="categoryStep == '2'" />
+      v-if="props.categoryStep == '2'" />
     <RequestTaskInput
       v-model="categoryForm.name"
       placeholder-text="카테고리명을 입력해주세요"
-      :label-name="`${categoryStep}차 카테고리명`" />
+      :label-name="`${props.categoryStep}차 카테고리명`" />
     <RequestTaskInput
       v-model="categoryForm.code"
       placeholder-text="카테고리의 고유코드를 입력해주세요"
@@ -46,13 +46,14 @@
 </template>
 
 <script lang="ts" setup>
-import { CATEGORY_FORM } from '@/constants/admin'
-import { computed, onMounted, ref, watch } from 'vue'
+import { CATEGORY_FIRST_ADD, CATEGORY_SECOND_ADD, RoleKeys } from '@/constants/admin'
+import { computed, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import ModalView from '../ModalView.vue'
 import RequestTaskDropdown from '../request-task/RequestTaskDropdown.vue'
 import RequestTaskInput from '../request-task/RequestTaskInput.vue'
+import { axiosInstance } from '@/utils/axios'
 
 const router = useRouter()
 
@@ -87,19 +88,20 @@ const handleSubmit = async () => {
   if (
     isCodeInvalidate.value ||
     categoryForm.value.name.length === 0 ||
-    categoryForm.value.code.length === 0 ||
-    (categoryStep === '2' && categoryForm.value.mainCategoryId === undefined)
+    categoryForm.value.code.length === 0
   ) {
     handleFailModal()
     return
   }
 
   try {
-    const requestUrl =
-      categoryStep === '1' ? '/api/managements/main-category' : '/api/managements/sub-category'
-    await axiosInstance.post(requestUrl, categoryForm.value, {
-      headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
-    })
+    const response = await axiosInstance.post(
+      '/api/managements/main-category',
+      categoryForm.value,
+      {
+        headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
+      }
+    )
     isModalVisible.value.add = true
   } catch {
     handleFailModal()
@@ -113,17 +115,4 @@ const isCodeInvalidate = computed(() => {
   const isInvalidate = !/^[A-Z]{1,2}$/.test(code)
   return isInvalidate ? 'code' : ''
 })
-
-const mainCategory = ref('')
-const categoryOptions = ref<Category[]>([])
-onMounted(async () => {
-  categoryOptions.value = await getMainCategory()
-  if (categoryStep === '2')
-    categoryForm.value = { ...categoryForm.value, mainCategoryId: undefined }
-})
-watch(mainCategory, () => {
-  categoryForm.value.mainCategoryId = categoryOptions.value.find(
-    el => el.name === mainCategory.value
-  )?.id
-})
 </script>
diff --git a/src/components/top-bar/SideBar.vue b/src/components/top-bar/SideBar.vue
index 80a1dc20..40f64455 100644
--- a/src/components/top-bar/SideBar.vue
+++ b/src/components/top-bar/SideBar.vue
@@ -79,9 +79,10 @@ const { info } = storeToRefs(memberStore)
 
 const route = useRoute()
 
-const role = computed(() => info.value.memberRole)
-const name = computed(() => info.value.memberName)
-const nickname = computed(() => info.value.nickname)
+// 회원 역할, 닉네임 필요
+const role = ref('admin')
+const name = ref('백지연')
+const nickname = ref('Chloe.yeon')
 
 const filteredMenu = computed(() => {
   return role.value === 'ROLE_USER'
diff --git a/src/constants/admin.ts b/src/constants/admin.ts
index 4a848952..166e0c6a 100644
--- a/src/constants/admin.ts
+++ b/src/constants/admin.ts
@@ -38,15 +38,13 @@ import type { RoleTypes, RoleTypesEnum, UserRegistrationProps } from '@/types/ad
 
 export const CATEGORY_FIRST_ADD: Category = {
   name: '',
-  code: '',
-  id: 0
+  code: ''
 }
 
 export const CATEGORY_SECOND_ADD: SubCategory = {
   name: '',
   mainCategoryId: 0,
-  code: '',
-  id: 0
+  code: ''
 }
 
 export const INITIAL_USER_REGISTRATION: UserRegistrationProps = {
diff --git a/src/types/common.ts b/src/types/common.ts
index 6a4ecc51..612630e2 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -76,7 +76,23 @@ export interface FormCheckboxProps {
 
 export interface ColorSelectProps {
   isOpen: boolean
-  newLabel: LabelDataTypes
+}
+
+export interface LabelDataTypes {
+  labelId: number
+  labelName: string
+  labelColor: string
+}
+
+export interface MainCategoryTypes {
+  name: string
+  code: string
+}
+
+export interface SubCategoryTypes {
+  mainCategoryId: number
+  name: string
+  code: string
 }
 
 export interface CategoryDropdownProps {

From 28d6bc5c011f0315b11acac1d92edfb6c457ea98 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 19:58:46 +0900
Subject: [PATCH 173/180] =?UTF-8?q?:sparkles:=20[feat]=20:=202=EC=B0=A8=20?=
 =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80=20API?=
 =?UTF-8?q?=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task-management/CategoryAdd.vue           | 42 ++++++++++++-------
 src/constants/admin.ts                        | 10 +----
 src/types/common.ts                           | 13 ++----
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/components/task-management/CategoryAdd.vue b/src/components/task-management/CategoryAdd.vue
index fc05ddc5..f96c4c2e 100644
--- a/src/components/task-management/CategoryAdd.vue
+++ b/src/components/task-management/CategoryAdd.vue
@@ -22,15 +22,15 @@
     </ModalView>
     <!-- 카테고리 목록 API 필요, 임시로 역할로 설정 -->
     <RequestTaskDropdown
-      v-model="categoryForm.firstCategory"
-      :options="RoleKeys"
+      v-model="mainCategory"
+      :options="categoryOptions.map(el => el.name)"
       label-name="1차 카테고리"
       placeholder-text="1차 카테고리를 선택해주세요"
-      v-if="props.categoryStep == '2'" />
+      v-if="categoryStep == '2'" />
     <RequestTaskInput
       v-model="categoryForm.name"
       placeholder-text="카테고리명을 입력해주세요"
-      :label-name="`${props.categoryStep}차 카테고리명`" />
+      :label-name="`${categoryStep}차 카테고리명`" />
     <RequestTaskInput
       v-model="categoryForm.code"
       placeholder-text="카테고리의 고유코드를 입력해주세요"
@@ -46,14 +46,16 @@
 </template>
 
 <script lang="ts" setup>
-import { CATEGORY_FIRST_ADD, CATEGORY_SECOND_ADD, RoleKeys } from '@/constants/admin'
-import { computed, ref } from 'vue'
+import { CATEGORY_FORM } from '@/constants/admin'
+import { computed, onMounted, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import FormButtonContainer from '../common/FormButtonContainer.vue'
 import ModalView from '../ModalView.vue'
 import RequestTaskDropdown from '../request-task/RequestTaskDropdown.vue'
 import RequestTaskInput from '../request-task/RequestTaskInput.vue'
 import { axiosInstance } from '@/utils/axios'
+import { getMainCategory } from '@/api/common'
+import type { Category, CategoryForm } from '@/types/common'
 
 const router = useRouter()
 
@@ -88,20 +90,19 @@ const handleSubmit = async () => {
   if (
     isCodeInvalidate.value ||
     categoryForm.value.name.length === 0 ||
-    categoryForm.value.code.length === 0
+    categoryForm.value.code.length === 0 ||
+    (categoryStep === '2' && categoryForm.value.mainCategoryId === undefined)
   ) {
     handleFailModal()
     return
   }
 
   try {
-    const response = await axiosInstance.post(
-      '/api/managements/main-category',
-      categoryForm.value,
-      {
-        headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
-      }
-    )
+    const requestUrl =
+      categoryStep === '1' ? '/api/managements/main-category' : '/api/managements/sub-category'
+    await axiosInstance.post(requestUrl, categoryForm.value, {
+      headers: { Authorization: `Bearer ${import.meta.env.VITE_ACCESS_TOKEN}` }
+    })
     isModalVisible.value.add = true
   } catch {
     handleFailModal()
@@ -115,4 +116,17 @@ const isCodeInvalidate = computed(() => {
   const isInvalidate = !/^[A-Z]{1,2}$/.test(code)
   return isInvalidate ? 'code' : ''
 })
+
+const mainCategory = ref('')
+const categoryOptions = ref<Category[]>([])
+onMounted(async () => {
+  categoryOptions.value = await getMainCategory()
+  if (categoryStep === '2')
+    categoryForm.value = { ...categoryForm.value, mainCategoryId: undefined }
+})
+watch(mainCategory, () => {
+  categoryForm.value.mainCategoryId = categoryOptions.value.find(
+    el => el.name === mainCategory.value
+  )?.id
+})
 </script>
diff --git a/src/constants/admin.ts b/src/constants/admin.ts
index 166e0c6a..44c1e4be 100644
--- a/src/constants/admin.ts
+++ b/src/constants/admin.ts
@@ -1,4 +1,4 @@
-import type { Category, ListBarTabProps, Option, SubCategory } from '@/types/common'
+import type { CategoryForm, ListBarTabProps, Option } from '@/types/common'
 
 export const MEMBER_MANAGEMENT_LIST_BAR_TAB: ListBarTabProps[] = [
   { content: '이름', width: 60 },
@@ -36,17 +36,11 @@ export const LOGS_LIST_BAR_TAB: ListBarTabProps[] = [
 
 import type { RoleTypes, RoleTypesEnum, UserRegistrationProps } from '@/types/admin'
 
-export const CATEGORY_FIRST_ADD: Category = {
+export const CATEGORY_FORM: CategoryForm = {
   name: '',
   code: ''
 }
 
-export const CATEGORY_SECOND_ADD: SubCategory = {
-  name: '',
-  mainCategoryId: 0,
-  code: ''
-}
-
 export const INITIAL_USER_REGISTRATION: UserRegistrationProps = {
   name: '',
   email: '',
diff --git a/src/types/common.ts b/src/types/common.ts
index 612630e2..028f44f1 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -84,21 +84,16 @@ export interface LabelDataTypes {
   labelColor: string
 }
 
-export interface MainCategoryTypes {
-  name: string
-  code: string
-}
-
-export interface SubCategoryTypes {
-  mainCategoryId: number
+export interface CategoryForm {
   name: string
   code: string
+  mainCategoryId?: number
 }
 
 export interface CategoryDropdownProps {
-  options: Category[] | SubCategory[]
+  options: CategoryForm
   labelName: string
-  modelValue: Category | SubCategory | null
+  modelValue?: CategoryForm
   isLabel?: boolean
   isDisabled?: boolean
   isInvalidate?: string

From bcb4d862a43cfdbf6ce999fb8d2122f0cff61a2a Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Mon, 3 Feb 2025 22:16:58 +0900
Subject: [PATCH 174/180] =?UTF-8?q?:recycle:=20[refactor]=20:=20=EB=88=84?=
 =?UTF-8?q?=EB=9D=BD=20=ED=83=80=EC=9E=85=20=EC=A0=81=EC=9A=A9=20=EB=B6=88?=
 =?UTF-8?q?=ED=95=84=EC=9A=94=20=EB=B7=B0=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/common.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/types/common.ts b/src/types/common.ts
index 028f44f1..8b2a526f 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -90,6 +90,12 @@ export interface CategoryForm {
   mainCategoryId?: number
 }
 
+export interface CategoryForm {
+  name: string
+  code: string
+  mainCategoryId?: number
+}
+
 export interface CategoryDropdownProps {
   options: CategoryForm
   labelName: string

From 440a12c76f583355ecd30711a4d1f2a06e3c2b64 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 18:04:12 +0900
Subject: [PATCH 175/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84=20API=20=EC=97=B0=EA=B2=B0=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/statistics/StatisticsCard.vue | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/components/statistics/StatisticsCard.vue b/src/components/statistics/StatisticsCard.vue
index 9a547990..c3d91598 100644
--- a/src/components/statistics/StatisticsCard.vue
+++ b/src/components/statistics/StatisticsCard.vue
@@ -30,9 +30,8 @@ import PieChart from '../PieChart.vue'
 import LineChart from '../LineChart.vue'
 import PeriodButtons from './PeriodButtons.vue'
 import type { PeriodType } from '@/types/manager'
-import { axiosInstance } from '@/utils/axios'
+import axiosInstance from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
-import type { StatisticsData } from '@/types/admin'
 
 const { title, statisticsType, chartType } = defineProps<{
   title: string
@@ -65,16 +64,9 @@ const fetchStatistics = async () => {
   return response.data
 }
 
-const { data } = useQuery<StatisticsData[]>({
+const { data } = useQuery<{ key: string; value: number }[]>({
   queryKey: [statisticsType, periodType],
   queryFn: fetchStatistics
 })
-
-const labels = computed(() => {
-  return data.value?.map(el => el.key) || []
-})
-
-const series = computed(() => {
-  return data.value?.map(el => el.count) || []
-})
+console.log(data.value)
 </script>

From 23ff42624f3d997eb06fc0a11902460055ecd78d Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 23:25:02 +0900
Subject: [PATCH 176/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20StatisticsCar?=
 =?UTF-8?q?d=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20API=20=EC=97=B0?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/statistics/StatisticsCard.vue | 23 +++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/components/statistics/StatisticsCard.vue b/src/components/statistics/StatisticsCard.vue
index c3d91598..b106cea8 100644
--- a/src/components/statistics/StatisticsCard.vue
+++ b/src/components/statistics/StatisticsCard.vue
@@ -10,15 +10,15 @@
     <div class="w-full h-[1px] bg-border-1" />
     <div class="h-60">
       <PieChart
-        :key="JSON.stringify(labels) + periodType"
+        :key="JSON.stringify(labels)"
         v-if="chartType === 'pie'"
-        :labels="labels"
-        :series="series" />
+        :labels="labels || []"
+        :series="series || []" />
       <LineChart
-        :key="JSON.stringify(labels) + periodType"
+        :key="JSON.stringify(labels)"
         v-if="chartType === 'line'"
-        :labels="labels"
-        :series="series"
+        :labels="labels || []"
+        :series="series || []"
         :data-label="title.slice(4)" />
     </div>
   </div>
@@ -64,9 +64,16 @@ const fetchStatistics = async () => {
   return response.data
 }
 
-const { data } = useQuery<{ key: string; value: number }[]>({
+const { data } = useQuery<{ key: string; count: number }[]>({
   queryKey: [statisticsType, periodType],
   queryFn: fetchStatistics
 })
-console.log(data.value)
+
+const labels = computed(() => {
+  return data.value?.map(el => el.key)
+})
+
+const series = computed(() => {
+  return data.value?.map(el => el.count)
+})
 </script>

From ed259593d65187bee0b743526e6a0accdddb1be2 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Sun, 2 Feb 2025 23:59:19 +0900
Subject: [PATCH 177/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20StatisticsCat?=
 =?UTF-8?q?egoryCard=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20API=20?=
 =?UTF-8?q?=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/statistics/StatisticsCard.vue  | 19 ++++++++++---------
 .../statistics/StatisticsCategoryCard.vue     |  4 ++--
 src/types/admin.ts                            |  5 +++++
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/components/statistics/StatisticsCard.vue b/src/components/statistics/StatisticsCard.vue
index b106cea8..76d9a991 100644
--- a/src/components/statistics/StatisticsCard.vue
+++ b/src/components/statistics/StatisticsCard.vue
@@ -10,15 +10,15 @@
     <div class="w-full h-[1px] bg-border-1" />
     <div class="h-60">
       <PieChart
-        :key="JSON.stringify(labels)"
+        :key="JSON.stringify(labels) + periodType"
         v-if="chartType === 'pie'"
-        :labels="labels || []"
-        :series="series || []" />
+        :labels="labels"
+        :series="series" />
       <LineChart
-        :key="JSON.stringify(labels)"
+        :key="JSON.stringify(labels) + periodType"
         v-if="chartType === 'line'"
-        :labels="labels || []"
-        :series="series || []"
+        :labels="labels"
+        :series="series"
         :data-label="title.slice(4)" />
     </div>
   </div>
@@ -32,6 +32,7 @@ import PeriodButtons from './PeriodButtons.vue'
 import type { PeriodType } from '@/types/manager'
 import axiosInstance from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
+import type { StatisticsData } from '@/types/admin'
 
 const { title, statisticsType, chartType } = defineProps<{
   title: string
@@ -64,16 +65,16 @@ const fetchStatistics = async () => {
   return response.data
 }
 
-const { data } = useQuery<{ key: string; count: number }[]>({
+const { data } = useQuery<StatisticsData[]>({
   queryKey: [statisticsType, periodType],
   queryFn: fetchStatistics
 })
 
 const labels = computed(() => {
-  return data.value?.map(el => el.key)
+  return data.value?.map(el => el.key) || []
 })
 
 const series = computed(() => {
-  return data.value?.map(el => el.count)
+  return data.value?.map(el => el.count) || []
 })
 </script>
diff --git a/src/components/statistics/StatisticsCategoryCard.vue b/src/components/statistics/StatisticsCategoryCard.vue
index 6fae0d6c..6022c947 100644
--- a/src/components/statistics/StatisticsCategoryCard.vue
+++ b/src/components/statistics/StatisticsCategoryCard.vue
@@ -31,7 +31,7 @@ import { computed, ref } from 'vue'
 import PieChart from '../PieChart.vue'
 import PeriodButtons from './PeriodButtons.vue'
 import type { PeriodType } from '@/types/manager'
-import { axiosInstance } from '@/utils/axios'
+import axiosInstance from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import type { StatisticsData } from '@/types/admin'
 
@@ -86,7 +86,7 @@ const { data: subData } = useQuery<StatisticsData[]>({
   enabled: computed(() => mainCategory.value !== '')
 })
 const subLabels = computed(() => {
-  return subData.value?.map(el => el.key) || []
+  return subData.value?.map(el => el.key) || ['카테고리를 선택해주세요']
 })
 const subSeries = computed(() => {
   return subData.value?.map(el => el.count) || []
diff --git a/src/types/admin.ts b/src/types/admin.ts
index 08589211..3f27bc28 100644
--- a/src/types/admin.ts
+++ b/src/types/admin.ts
@@ -56,3 +56,8 @@ export interface NewLabelTypes {
   labelName: string
   labelColor: string
 }
+
+export interface StatisticsData {
+  key: string
+  count: number
+}

From 9bc7f5e676f3c1492f9db3548fdb6fb027321251 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 3 Feb 2025 01:06:41 +0900
Subject: [PATCH 178/180] =?UTF-8?q?:sparkles:=20[feat]=20:=20=ED=86=B5?=
 =?UTF-8?q?=EA=B3=84=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EA=B0=80=20=EC=97=86?=
 =?UTF-8?q?=EC=9D=84=20=EB=95=8C=EC=9D=98=20=EC=98=88=EC=99=B8=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/statistics/StatisticsCategoryCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/statistics/StatisticsCategoryCard.vue b/src/components/statistics/StatisticsCategoryCard.vue
index 6022c947..66c16fea 100644
--- a/src/components/statistics/StatisticsCategoryCard.vue
+++ b/src/components/statistics/StatisticsCategoryCard.vue
@@ -86,7 +86,7 @@ const { data: subData } = useQuery<StatisticsData[]>({
   enabled: computed(() => mainCategory.value !== '')
 })
 const subLabels = computed(() => {
-  return subData.value?.map(el => el.key) || ['카테고리를 선택해주세요']
+  return subData.value?.map(el => el.key) || []
 })
 const subSeries = computed(() => {
   return subData.value?.map(el => el.count) || []

From 52871879e553da8ed24856e71f63ac3a7fe7cb80 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Tue, 4 Feb 2025 00:29:22 +0900
Subject: [PATCH 179/180] =?UTF-8?q?:bug:=20[fix]=20=EB=B9=8C=EB=93=9C=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/statistics/StatisticsCard.vue         | 2 +-
 src/components/statistics/StatisticsCategoryCard.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/statistics/StatisticsCard.vue b/src/components/statistics/StatisticsCard.vue
index 76d9a991..9a547990 100644
--- a/src/components/statistics/StatisticsCard.vue
+++ b/src/components/statistics/StatisticsCard.vue
@@ -30,7 +30,7 @@ import PieChart from '../PieChart.vue'
 import LineChart from '../LineChart.vue'
 import PeriodButtons from './PeriodButtons.vue'
 import type { PeriodType } from '@/types/manager'
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import type { StatisticsData } from '@/types/admin'
 
diff --git a/src/components/statistics/StatisticsCategoryCard.vue b/src/components/statistics/StatisticsCategoryCard.vue
index 66c16fea..6fae0d6c 100644
--- a/src/components/statistics/StatisticsCategoryCard.vue
+++ b/src/components/statistics/StatisticsCategoryCard.vue
@@ -31,7 +31,7 @@ import { computed, ref } from 'vue'
 import PieChart from '../PieChart.vue'
 import PeriodButtons from './PeriodButtons.vue'
 import type { PeriodType } from '@/types/manager'
-import axiosInstance from '@/utils/axios'
+import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import type { StatisticsData } from '@/types/admin'
 

From 8fbbe1c4e9121a0715452180a48dfdaea9f5ca91 Mon Sep 17 00:00:00 2001
From: jiyeon <bjyy0201@gmail.com>
Date: Tue, 4 Feb 2025 10:00:27 +0900
Subject: [PATCH 180/180] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=B3=80=EA=B2=BD=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/top-bar/SideBar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/top-bar/SideBar.vue b/src/components/top-bar/SideBar.vue
index 80a1dc20..7ba44dde 100644
--- a/src/components/top-bar/SideBar.vue
+++ b/src/components/top-bar/SideBar.vue
@@ -68,7 +68,7 @@
 <script setup lang="ts">
 import { useRoute } from 'vue-router'
 import { computed } from 'vue'
-import CommonIcons from './common/CommonIcons.vue'
+import CommonIcons from '../common/CommonIcons.vue'
 import { hamburgerIcon } from '@/constants/iconPath'
 import { SIDE_USER_MENU, SIDE_MANAGER_MENU, SIDE_ADMIN_MENU } from '@/constants/menu'
 import { useMemberStore } from '@/stores/member'