From e478fe51a862885260587b0044657adff7ad8d0a Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 10 Feb 2025 11:27:28 +0900
Subject: [PATCH 01/10] =?UTF-8?q?:bug:=20[fix]=20=EC=95=8C=EB=A6=BC=20API?=
 =?UTF-8?q?=20URL=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20?=
 =?UTF-8?q?=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20=EC=9D=B4=EB=8F=99=20=EB=B6=88?=
 =?UTF-8?q?=EA=B0=80=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common.ts                            |  2 +-
 src/components/top-bar/NotificationModal.vue | 10 +++++++---
 src/layout/TheView.vue                       |  4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/api/common.ts b/src/api/common.ts
index c318e696..3a9ecfa0 100644
--- a/src/api/common.ts
+++ b/src/api/common.ts
@@ -12,7 +12,7 @@ export const getNotification = async (pageNum: number, sizeNum: number) => {
 }
 
 export const patchNotificationRead = async (notificationId: number) => {
-  const response = await axiosInstance.patch(`/api/notification/${notificationId}`)
+  const response = await axiosInstance.patch(`/api/notifications/${notificationId}`)
   return response.data
 }
 
diff --git a/src/components/top-bar/NotificationModal.vue b/src/components/top-bar/NotificationModal.vue
index fb532c25..8c542b09 100644
--- a/src/components/top-bar/NotificationModal.vue
+++ b/src/components/top-bar/NotificationModal.vue
@@ -25,7 +25,7 @@
       <NotificationMessage
         v-for="notification in notifications"
         :key="notification.notificationId"
-        @click="readNotifi(notification.notificationId)"
+        @click="readNotifi(notification.notificationId, notification.taskId)"
         :type="notification.notificationType"
         :title="notification.taskTitle"
         :message="notification.message"
@@ -54,11 +54,14 @@ import 'v3-infinite-loading/lib/style.css'
 import { ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
 import NotificationMessage from './NotificationMessage.vue'
+import { useRouter } from 'vue-router'
 
 const { isOpen } = defineProps<{
   isOpen: boolean
 }>()
 
+const router = useRouter()
+
 const notifications = ref<NotificationContent[]>([])
 const page = ref(0)
 const pageSize = 5
@@ -94,9 +97,10 @@ const loadMoreNotifications = async ($state: InfiniteLoadingState) => {
   }
 }
 
-const readNotifi = async (id: number) => {
+const readNotifi = async (id: number, taskId: number) => {
   await patchNotificationRead(id)
   emit('close')
+  router.push({ query: { taskId } })
 }
 
 const emit = defineEmits<{
@@ -108,7 +112,7 @@ const closeModal = () => {
 }
 
 const readAllNotifi = async () => {
-  await axiosInstance.patch('/api/notification')
+  await axiosInstance.patch('/api/notifications')
   emit('close')
 }
 </script>
diff --git a/src/layout/TheView.vue b/src/layout/TheView.vue
index 087e4e37..741348a6 100644
--- a/src/layout/TheView.vue
+++ b/src/layout/TheView.vue
@@ -15,6 +15,7 @@ import { ref, watch } from 'vue'
 import { useRoute } from 'vue-router'
 
 import TaskDetail from '@/components/task-detail/TaskDetail.vue'
+import router from '@/router'
 
 const route = useRoute()
 const selectedID = ref(route.query?.taskId || null)
@@ -28,5 +29,8 @@ watch(
 
 const handleModal = (id: string | null) => {
   selectedID.value = id
+  if (id === null) {
+    router.push({ query: {} })
+  }
 }
 </script>

From f56f910ac76ce0333d165801a2e81f72283801bf Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 10 Feb 2025 13:16:40 +0900
Subject: [PATCH 02/10] =?UTF-8?q?:bug:=20[fix]=20body=EC=9D=98=20overflow-?=
 =?UTF-8?q?hidden=EC=9C=BC=EB=A1=9C=20=EC=8A=A4=ED=81=AC=EB=A1=A4=20?=
 =?UTF-8?q?=EC=95=88=20=EB=90=98=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/TaskCard.vue              | 13 ++++++-------
 src/components/task-detail/TaskDetailTopBar.vue | 11 ++++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/common/TaskCard.vue b/src/components/common/TaskCard.vue
index 82180412..19f5e30d 100644
--- a/src/components/common/TaskCard.vue
+++ b/src/components/common/TaskCard.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="w-full max-w-80 border-l-8 bg-white py-4 pl-6 pr-4 flex flex-col gap-6 rounded-lg shadow-custom hover:bg-background-2 cursor-pointer"
+    class="w-full max-w-80 border-l-8 bg-white py-4 pl-4 pr-4 flex flex-col gap-6 rounded-lg shadow-custom hover:bg-background-2 cursor-pointer"
     :class="borderLeft"
     @click="handleModal(data.taskId)">
     <div class="flex flex-col gap-1">
@@ -34,12 +34,11 @@
         </div>
       </div>
     </div>
-    <TaskDetail
-      v-if="selectedID"
-      :is-approved="data.taskStatus !== 'REQUESTED'"
-      :selected-id="selectedID"
-      :close-task-detail="() => handleModal(null)" />
   </div>
+  <TaskDetail
+    v-if="selectedID"
+    :selected-id="selectedID"
+    :close-task-detail="() => handleModal(null)" />
 </template>
 
 <script setup lang="ts">
@@ -61,7 +60,7 @@ const borderLeft = computed(() => {
 })
 
 const handleModal = (id: number | null) => {
-  if (data.taskId) document.body.style.overflow = 'hidden'
+  if (id) document.body.style.overflow = 'hidden'
   else document.body.style.overflow = ''
   selectedID.value = id
 }
diff --git a/src/components/task-detail/TaskDetailTopBar.vue b/src/components/task-detail/TaskDetailTopBar.vue
index ea6f429c..93ec0f60 100644
--- a/src/components/task-detail/TaskDetailTopBar.vue
+++ b/src/components/task-detail/TaskDetailTopBar.vue
@@ -3,20 +3,20 @@
     <div class="flex gap-2 text-sm font-bold">
       <div
         v-if="isApproved && isRequestor"
-        @click="router.push(`/task-request?requestType=re&id=${id}`)"
+        @click="onButtonClick(`/task-request?requestType=re&id=${id}`)"
         class="flex gap-1 items-center cursor-pointer p-1 hover:bg-background-2 rounded">
         <CommonIcons :name="reRequestIcon" />
         <p class="text-body">재요청</p>
       </div>
       <div
         v-if="!isApproved && isRequestor"
-        @click="router.push(`/task-request?requestType=edit&id=${id}`)"
+        @click="onButtonClick(`/task-request?requestType=edit&id=${id}`)"
         class="flex gap-1 items-center cursor-pointer p-1 hover:bg-background-2 rounded">
         <CommonIcons :name="modificationIcon" />
         <p class="text-primary1">요청 수정</p>
       </div>
       <div
-        @click="ApproveTask"
+        @click="onButtonClick(`/request-approve?requestId=${id}`)"
         v-if="isProcessor && !isApproved"
         class="flex gap-1 items-center cursor-pointer p-1 hover:bg-background-2 rounded">
         <CommonIcons :name="approveIcon" />
@@ -104,7 +104,8 @@ const finishCancel = async () => {
   closeTaskDetail()
 }
 
-const ApproveTask = () => {
-  router.push(`/request-approve?requestId=${id}`)
+const onButtonClick = (url: string) => {
+  document.body.style.overflow = ''
+  router.push(url)
 }
 </script>

From 1e6cc12342c0697e98b136e7328ab95e907da132 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 10 Feb 2025 13:27:00 +0900
Subject: [PATCH 03/10] =?UTF-8?q?:bug:=20[fix]=20=EC=A0=9C=EB=AA=A9?=
 =?UTF-8?q?=EC=9D=B4=20=EA=B8=B8=EC=96=B4=EC=A7=80=EB=A9=B4=20TaskBoard?=
 =?UTF-8?q?=EC=9D=98=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=EC=9D=B4=20?=
 =?UTF-8?q?=EA=B9=A8=EC=A7=80=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/TaskCard.vue      |  6 ++--
 src/components/task-board/TaskBoard.vue | 48 ++++++++++++++-----------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/components/common/TaskCard.vue b/src/components/common/TaskCard.vue
index 19f5e30d..85c69da3 100644
--- a/src/components/common/TaskCard.vue
+++ b/src/components/common/TaskCard.vue
@@ -21,9 +21,9 @@
       <span class="text-xs text-body">{{ data.mainCategoryName }} - {{ data.categoryName }}</span>
     </div>
     <div class="flex justify-between items-end">
-      <span class="text-xs font-bold text-black whitespace-nowrap overflow-hidden text-ellipsis">{{
-        data.taskCode
-      }}</span>
+      <span class="text-xs font-bold text-black whitespace-nowrap overflow-hidden text-ellipsis">
+        {{ data.taskCode }}
+      </span>
       <div class="flex flex-col gap-1 items-end">
         <span class="text-xs font-bold text-body">{{ data.requesterDepartment }}</span>
         <div class="flex items-center gap-1.5">
diff --git a/src/components/task-board/TaskBoard.vue b/src/components/task-board/TaskBoard.vue
index 0dcae960..d8d047c2 100644
--- a/src/components/task-board/TaskBoard.vue
+++ b/src/components/task-board/TaskBoard.vue
@@ -1,25 +1,25 @@
 <template>
-  <div class="flex-1 overflow-y-auto">
-    <div class="w-full flex gap-12 sticky top-0 bg-white z-30">
-      <div class="flex flex-1 bg-primary2 rounded-t-lg">
+  <div class="overflow-y-auto">
+    <div class="w-full grid grid-cols-3 gap-12 sticky top-0 bg-white z-30">
+      <div class="flex bg-primary2 rounded-t-lg">
         <span class="text-xs font-bold text-body p-4">
           진행 중 {{ data?.tasksInProgress.length }}
         </span>
       </div>
-      <div class="flex flex-1 bg-primary2 rounded-t-lg">
+      <div class="flex bg-primary2 rounded-t-lg">
         <span class="text-xs font-bold text-body p-4">
           검토 중 {{ data?.tasksInReviewing.length }}
         </span>
       </div>
-      <div class="flex flex-1 bg-primary2 rounded-t-lg">
+      <div class="flex bg-primary2 rounded-t-lg">
         <span class="text-xs font-bold text-body p-4">
           완료 {{ data?.tasksCompleted.length }}
         </span>
       </div>
     </div>
 
-    <div class="w-full flex gap-12 min-h-[calc(100%-48px)]">
-      <div class="flex-1 px-4 pb-4 bg-primary2 rounded-b-lg relative">
+    <div class="w-full grid grid-cols-3 gap-12 min-h-[calc(100%-48px)] overflow-hidden">
+      <div class="grow shrink-0 px-4 pb-4 bg-primary2 rounded-b-lg relative">
         <div class="absolute top-0 left-0 px-4 w-full">
           <div
             v-if="data?.tasksInProgress.length === 0"
@@ -36,15 +36,17 @@
           class="flex flex-col gap-4 h-full"
           @change="event => onListChange(event, 'IN_PROGRESS')">
           <template #item="{ element }">
-            <TaskCard
-              :key="element.taskId"
-              :data="element"
-              draggable />
+            <div>
+              <TaskCard
+                :key="element.taskId"
+                :data="element"
+                draggable />
+            </div>
           </template>
         </draggableComponent>
       </div>
 
-      <div class="flex-1 px-4 pb-4 bg-primary2 rounded-b-lg relative">
+      <div class="grow shrink-0 px-4 pb-4 bg-primary2 rounded-b-lg relative">
         <div class="absolute top-0 left-0 px-4 w-full">
           <div
             v-if="data?.tasksInReviewing.length === 0"
@@ -61,15 +63,17 @@
           class="flex flex-col gap-4 h-full"
           @change="event => onListChange(event, 'IN_REVIEWING')">
           <template #item="{ element }">
-            <TaskCard
-              :key="element.taskId"
-              :data="element"
-              draggable />
+            <div>
+              <TaskCard
+                :key="element.taskId"
+                :data="element"
+                draggable />
+            </div>
           </template>
         </draggableComponent>
       </div>
 
-      <div class="flex-1 px-4 pb-4 bg-primary2 rounded-b-lg relative">
+      <div class="grow shrink-0 px-4 pb-4 bg-primary2 rounded-b-lg relative">
         <div class="absolute top-0 left-0 px-4 w-full">
           <div
             v-if="data?.tasksCompleted.length === 0"
@@ -86,10 +90,12 @@
           class="flex flex-col gap-4 h-full"
           @change="event => onListChange(event, 'COMPLETED')">
           <template #item="{ element }">
-            <TaskCard
-              :key="element.taskId"
-              :data="element"
-              draggable />
+            <div>
+              <TaskCard
+                :key="element.taskId"
+                :data="element"
+                draggable />
+            </div>
           </template>
         </draggableComponent>
       </div>

From 49db2685392d000b37d16c5690ed0b72ef257c41 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 10 Feb 2025 13:40:21 +0900
Subject: [PATCH 04/10] =?UTF-8?q?:bug:=20[fix]=20=EA=B1=B0=EB=B6=80=20->?=
 =?UTF-8?q?=20=EB=B0=98=EB=A0=A4=EB=A1=9C=20=EB=8B=A8=EC=96=B4=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20=EB=B0=8F=20=EB=B0=98=EB=A0=A4=20=EB=B2=84=ED=8A=BC?=
 =?UTF-8?q?=20=EC=83=89=EC=83=81=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/ModalView.vue            | 4 ++--
 src/components/requested/RequestedListCard.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/common/ModalView.vue b/src/components/common/ModalView.vue
index 66fe8b09..6c7af4e9 100644
--- a/src/components/common/ModalView.vue
+++ b/src/components/common/ModalView.vue
@@ -34,7 +34,7 @@
           <textarea
             v-if="type == 'inputType'"
             v-model="textValue"
-            placeholder="거부 사유를 입력해주세요"
+            placeholder="반려 사유를 입력해주세요"
             class="flex border w-full border-border-1 px-4 py-3 focus:outline-none resize-none h-[120px]" />
         </div>
 
@@ -67,7 +67,7 @@
             type="button"
             class="button-large-red"
             @click="confirmModal">
-            {{ type === 'inputType' ? '거부' : '삭제' }}
+            {{ type === 'inputType' ? '반려' : '삭제' }}
           </button>
         </div>
       </div>
diff --git a/src/components/requested/RequestedListCard.vue b/src/components/requested/RequestedListCard.vue
index 4d31ff8e..d525a442 100644
--- a/src/components/requested/RequestedListCard.vue
+++ b/src/components/requested/RequestedListCard.vue
@@ -28,10 +28,10 @@
         @click.stop="userInfo.isReviewer && toggleModal('reject')"
         :class="
           userInfo.isReviewer
-            ? 'button-medium-primary'
+            ? 'button-medium-default'
             : 'button-medium text-disabled bg-background-1'
         ">
-        거부
+        반려
       </button>
     </div>
   </div>

From a79b1b72f9a877317f41414adcf98365277b5fa2 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 10 Feb 2025 13:46:06 +0900
Subject: [PATCH 05/10] =?UTF-8?q?:bug:=20[fix]=20=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EC=B2=A8=EB=B6=80=20=EB=8C=93=EA=B8=80=20=ED=94=84=EB=A1=9C?=
 =?UTF-8?q?=ED=95=84=20=ED=91=9C=EC=8B=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailHistoryFile.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/task-detail/TaskDetailHistoryFile.vue b/src/components/task-detail/TaskDetailHistoryFile.vue
index fbfd2642..3ce17c18 100644
--- a/src/components/task-detail/TaskDetailHistoryFile.vue
+++ b/src/components/task-detail/TaskDetailHistoryFile.vue
@@ -1,19 +1,19 @@
 <template>
   <div :class="['flex w-full', isProcessor ? 'justify-end' : 'justify-start']">
     <div :class="['w-10 h-10 rounded-full pt-1.5', isProcessor ? 'order-3' : 'order-1']">
-      <img
-        :src="history.details.commentFileDetails?.profileImageUrl || '/images/mockProfile.jpg'"
-        class="rounded-full" />
+      <ImageContainer
+        :size="40"
+        :url="history.details.commentFileDetails?.profileImageUrl" />
     </div>
     <div :class="['flex flex-col gap-2 px-4 order-2', isProcessor ? 'items-end' : 'items-start']">
       <p>{{ history.details.commentFileDetails?.nickName }}</p>
       <div
         :class="[
-          'flex max-w-[400px] flex-wrap px-6 py-4 gap-4 items-center text-black rounded-lg',
+          'flex max-w-[400px] px-4 py-3 gap-4 items-center text-black rounded-lg',
           isProcessor ? 'bg-primary2' : 'bg-background-2'
         ]">
         <a
-          class="w-10 h-10 flex items-center justify-center bg-white border border-border-2 rounded-lg"
+          class="w-10 h-10 flex items-center justify-center bg-white border border-border-2 rounded-lg shrink-0 hover:bg-primary2"
           :href="history.details.commentFileDetails?.url"
           download>
           <CommonIcons :name="fileIcon" />
@@ -63,6 +63,7 @@ import { useQueryClient } from '@tanstack/vue-query'
 import { storeToRefs } from 'pinia'
 import { computed, defineProps, ref } from 'vue'
 import CommonIcons from '../common/CommonIcons.vue'
+import ImageContainer from '../common/ImageContainer.vue'
 
 const { history, requestorName, taskId } = defineProps<TaskDetailHistoryChatProps>()
 

From a8e29e54f51adef6bdf49931c5cbc4d9d687ce5b Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 10 Feb 2025 14:04:10 +0900
Subject: [PATCH 06/10] =?UTF-8?q?:bug:=20[fix]=20accessToken=20=EA=B0=B1?=
 =?UTF-8?q?=EC=8B=A0=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/api-logs/ApiLogsList.vue              |  4 +++-
 src/components/common/TaskCard.vue                   |  3 ++-
 src/components/statistics/StatisticsCategoryCard.vue |  1 +
 src/components/task-detail/TaskDetail.vue            |  5 +++--
 src/utils/axios.ts                                   | 11 +++++++----
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/components/api-logs/ApiLogsList.vue b/src/components/api-logs/ApiLogsList.vue
index c35f9c81..5560ba89 100644
--- a/src/components/api-logs/ApiLogsList.vue
+++ b/src/components/api-logs/ApiLogsList.vue
@@ -31,6 +31,7 @@ import { useQuery } from '@tanstack/vue-query'
 import type { ApiLogsResponse } from '@/types/admin'
 import { computed } from 'vue'
 import { useMemberStore } from '@/stores/member'
+import { storeToRefs } from 'pinia'
 
 const { params } = useLogsParamsStore()
 const onPageChange = (value: number) => {
@@ -47,7 +48,8 @@ const fetchApiLogsList = async () => {
   return response.data
 }
 
-const { isLogined } = useMemberStore()
+const memberStore = useMemberStore()
+const { isLogined } = storeToRefs(memberStore)
 const { data } = useQuery<ApiLogsResponse>({
   queryKey: ['apiLogs', params],
   queryFn: fetchApiLogsList,
diff --git a/src/components/common/TaskCard.vue b/src/components/common/TaskCard.vue
index 85c69da3..34b08623 100644
--- a/src/components/common/TaskCard.vue
+++ b/src/components/common/TaskCard.vue
@@ -38,7 +38,8 @@
   <TaskDetail
     v-if="selectedID"
     :selected-id="selectedID"
-    :close-task-detail="() => handleModal(null)" />
+    :close-task-detail="() => handleModal(null)"
+    click.stop />
 </template>
 
 <script setup lang="ts">
diff --git a/src/components/statistics/StatisticsCategoryCard.vue b/src/components/statistics/StatisticsCategoryCard.vue
index 3133d513..86419887 100644
--- a/src/components/statistics/StatisticsCategoryCard.vue
+++ b/src/components/statistics/StatisticsCategoryCard.vue
@@ -73,6 +73,7 @@ const mainSeries = computed(() => {
 })
 
 const fetchSubStatistics = async () => {
+  if (!isLogined.value) return
   const response = await axiosInstance.get('/api/tasks/statistics/subcategory', {
     params: {
       periodType: periodType.value,
diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue
index 71924963..7e5aefd0 100644
--- a/src/components/task-detail/TaskDetail.vue
+++ b/src/components/task-detail/TaskDetail.vue
@@ -45,7 +45,7 @@ import TaskDetailTopBar from './TaskDetailTopBar.vue'
 const { closeTaskDetail, selectedId } = defineProps<TaskDetailProps>()
 
 const memberStore = useMemberStore()
-const { info } = storeToRefs(memberStore)
+const { info, isLogined } = storeToRefs(memberStore)
 
 const { data } = useQuery<TaskDetailDatas>({
   queryKey: ['taskDetailUser', selectedId],
@@ -57,6 +57,7 @@ const { data } = useQuery<TaskDetailDatas>({
 
 const { data: historyData } = useQuery<TaskDetailHistoryData>({
   queryKey: ['historyData', selectedId],
-  queryFn: () => getHistory(selectedId)
+  queryFn: () => getHistory(selectedId),
+  enabled: isLogined
 })
 </script>
diff --git a/src/utils/axios.ts b/src/utils/axios.ts
index 1d62479e..68ba6108 100644
--- a/src/utils/axios.ts
+++ b/src/utils/axios.ts
@@ -1,10 +1,11 @@
+import { useMemberStore } from '@/stores/member'
 import axios, { type AxiosInstance, type InternalAxiosRequestConfig } from 'axios'
 import Cookies from 'js-cookie'
+import { storeToRefs } from 'pinia'
 
 const baseURL = import.meta.env.VITE_API_BASE_URL
 
 const getNewAccessToken = async () => {
-  console.log('토큰 재발급 시도')
   try {
     const refreshToken = Cookies.get('refreshToken')
     const response = await axios.post(
@@ -53,16 +54,18 @@ const setInterceptors = (instance: AxiosInstance) => {
             break
           case 403: {
             if (error.response.data !== 'AUTH_002') {
-              // Cookies.remove('accessToken')
+              const memberStore = useMemberStore()
+              const { isLogined } = storeToRefs(memberStore)
+              isLogined.value = false
+
               const originalRequest = error.config
               if (!originalRequest._retry) {
                 originalRequest._retry = true
 
                 try {
-                  console.log('토큰이 만료됨')
                   const newAccessToken = await getNewAccessToken()
-
                   originalRequest.headers.Authorization = `Bearer ${newAccessToken}`
+                  isLogined.value = true
                   return instance(originalRequest)
                 } catch (err) {
                   console.error('토큰 갱신 실패:', err)

From 1a27ad31c0584d93aaaab3044e3cc04c401af147 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 10 Feb 2025 15:11:10 +0900
Subject: [PATCH 07/10] =?UTF-8?q?:bug:=20[fix]=20TaskDetail=20=EC=97=B4?=
 =?UTF-8?q?=EB=A0=A4=20=EC=9E=88=EC=9D=84=20=EB=95=8C=20=EB=93=9C=EB=9E=98?=
 =?UTF-8?q?=EA=B7=B8=20=EB=90=98=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/TaskCard.vue      |  4 +++-
 src/components/task-board/TaskBoard.vue | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/components/common/TaskCard.vue b/src/components/common/TaskCard.vue
index 34b08623..11d66908 100644
--- a/src/components/common/TaskCard.vue
+++ b/src/components/common/TaskCard.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="w-full max-w-80 border-l-8 bg-white py-4 pl-4 pr-4 flex flex-col gap-6 rounded-lg shadow-custom hover:bg-background-2 cursor-pointer"
+    class="w-full max-w-80 border-l-8 bg-white p-4 flex flex-col gap-6 rounded-lg shadow-custom hover:bg-background-2 cursor-pointer"
     :class="borderLeft"
     @click="handleModal(data.taskId)">
     <div class="flex flex-col gap-1">
@@ -54,6 +54,7 @@ import ImageContainer from './ImageContainer.vue'
 import TaskDetail from '../task-detail/TaskDetail.vue'
 
 const { data } = defineProps<{ data: TaskCardProps; draggable?: boolean }>()
+const emit = defineEmits(['toggleModal'])
 const selectedID = ref<number | null>(null)
 
 const borderLeft = computed(() => {
@@ -63,6 +64,7 @@ const borderLeft = computed(() => {
 const handleModal = (id: number | null) => {
   if (id) document.body.style.overflow = 'hidden'
   else document.body.style.overflow = ''
+  emit('toggleModal')
   selectedID.value = id
 }
 </script>
diff --git a/src/components/task-board/TaskBoard.vue b/src/components/task-board/TaskBoard.vue
index d8d047c2..51fcf7f3 100644
--- a/src/components/task-board/TaskBoard.vue
+++ b/src/components/task-board/TaskBoard.vue
@@ -34,12 +34,14 @@
           group="taskList"
           item-key="task"
           class="flex flex-col gap-4 h-full"
-          @change="event => onListChange(event, 'IN_PROGRESS')">
+          @change="event => onListChange(event, 'IN_PROGRESS')"
+          :disabled="isDetailOpen">
           <template #item="{ element }">
             <div>
               <TaskCard
                 :key="element.taskId"
                 :data="element"
+                @toggle-modal="isDetailOpen = !isDetailOpen"
                 draggable />
             </div>
           </template>
@@ -61,12 +63,14 @@
           group="taskList"
           item-key="task"
           class="flex flex-col gap-4 h-full"
-          @change="event => onListChange(event, 'IN_REVIEWING')">
+          @change="event => onListChange(event, 'IN_REVIEWING')"
+          :disabled="isDetailOpen">
           <template #item="{ element }">
             <div>
               <TaskCard
                 :key="element.taskId"
                 :data="element"
+                @toggle-modal="isDetailOpen = !isDetailOpen"
                 draggable />
             </div>
           </template>
@@ -88,12 +92,14 @@
           group="taskList"
           item-key="task"
           class="flex flex-col gap-4 h-full"
-          @change="event => onListChange(event, 'COMPLETED')">
+          @change="event => onListChange(event, 'COMPLETED')"
+          :disabled="isDetailOpen">
           <template #item="{ element }">
             <div>
               <TaskCard
                 :key="element.taskId"
                 :data="element"
+                @toggle-modal="isDetailOpen = !isDetailOpen"
                 draggable />
             </div>
           </template>
@@ -110,7 +116,7 @@ import type { Status } from '@/types/common'
 import type { DraggableEvent, TaskCardList } from '@/types/manager'
 import { axiosInstance } from '@/utils/axios'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 import draggableComponent from 'vuedraggable'
 import { storeToRefs } from 'pinia'
 import { useParseParams } from '@/hooks/useParseParams'
@@ -183,4 +189,6 @@ const { data } = useQuery<TaskCardList>({
 const tasksInProgress = computed(() => [...(data.value?.tasksInProgress || [])])
 const tasksInReviewing = computed(() => [...(data.value?.tasksInReviewing || [])])
 const tasksCompleted = computed(() => [...(data.value?.tasksCompleted || [])])
+
+const isDetailOpen = ref(false)
 </script>

From 732dc67c64ec1314afc9d992371891c8304ad767 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 10 Feb 2025 15:35:37 +0900
Subject: [PATCH 08/10] =?UTF-8?q?:bug:=20[fix]=20TaskDetail=20=EB=82=B4?=
 =?UTF-8?q?=EC=9D=98=20=EB=93=9C=EB=A1=AD=EB=8B=A4=EC=9A=B4=EC=97=90=20use?=
 =?UTF-8?q?OutsideClick=20=EB=AF=B8=EC=9E=91=EB=8F=99=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=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/TaskDetail.vue         |  1 -
 .../task-detail/TaskDetailLabelDropdown.vue       | 15 +++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/task-detail/TaskDetail.vue b/src/components/task-detail/TaskDetail.vue
index 7e5aefd0..07a495a3 100644
--- a/src/components/task-detail/TaskDetail.vue
+++ b/src/components/task-detail/TaskDetail.vue
@@ -3,7 +3,6 @@
     :onClick="closeTaskDetail"
     class="fixed inset-0 bg-black bg-opacity-15 flex justify-center items-center z-50 p-12" />
   <div
-    @click.stop
     class="flex flex-col overflow-y-auto rounded-lg w-[calc(100%-96px)] max-w-[1104px] min-w-[768px] h-[calc(100%-96px)] bg-white shadow-custom py-6 fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-50">
     <TaskDetailTopBar
       v-if="data"
diff --git a/src/components/task-detail/TaskDetailLabelDropdown.vue b/src/components/task-detail/TaskDetailLabelDropdown.vue
index c69abc9c..ecea57cb 100644
--- a/src/components/task-detail/TaskDetailLabelDropdown.vue
+++ b/src/components/task-detail/TaskDetailLabelDropdown.vue
@@ -14,13 +14,16 @@
     </div>
     <div
       v-if="dropdownOpen"
-      class="absolute w-full h-32 overflow-y-auto top-12 flex flex-col gap-2 p-2 bg-white rounded z-10 shadow-custom text-black">
+      class="absolute w-full pb-6 top-12">
       <div
-        v-for="option in labelArr"
-        :key="option.labelId"
-        class="w-full flex text-sm items-center h-10 p-1.5 rounded hover:bg-background-2 cursor-pointer"
-        @click="selectOption(option)">
-        {{ option.labelName }}
+        class="w-full h-32 overflow-y-auto flex flex-col gap-2 p-2 bg-white rounded z-10 shadow-custom text-black">
+        <div
+          v-for="option in labelArr"
+          :key="option.labelId"
+          class="w-full flex text-sm items-center h-10 p-1.5 rounded hover:bg-background-2 cursor-pointer"
+          @click="selectOption(option)">
+          {{ option.labelName }}
+        </div>
       </div>
     </div>
   </div>

From 4825b1754376150059aeea3c84db2ea380b84255 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 10 Feb 2025 15:48:14 +0900
Subject: [PATCH 09/10] =?UTF-8?q?:bug:=20[fix]=20=EC=B9=B4=ED=85=8C?=
 =?UTF-8?q?=EA=B3=A0=EB=A6=AC=20=EC=88=98=EC=A0=95=20=EC=8B=9C=20=EB=B6=80?=
 =?UTF-8?q?=EA=B0=80=EC=84=A4=EB=AA=85=20=EC=88=98=EC=A0=95=20=EB=AF=B8?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9=20=EC=98=A4=EB=A5=98=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-management/CategoryAdd.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/task-management/CategoryAdd.vue b/src/components/task-management/CategoryAdd.vue
index bc75d7dd..2148749f 100644
--- a/src/components/task-management/CategoryAdd.vue
+++ b/src/components/task-management/CategoryAdd.vue
@@ -114,10 +114,7 @@ const handleSubmit = async () => {
     const categoryId = route.params.id
     if (categoryId) {
       const patchUrl = `/api/managements/categories/${categoryId}`
-      await axiosInstance.patch(patchUrl, {
-        name: categoryForm.value.name,
-        code: categoryForm.value.code
-      })
+      await axiosInstance.patch(patchUrl, categoryForm.value)
     } else {
       const postUrl =
         categoryStep === '1' ? '/api/managements/main-category' : '/api/managements/sub-category'

From 939930dfaa6fbc4280a2006f5f2670abde7c5643 Mon Sep 17 00:00:00 2001
From: seorang42 <seorang42@naver.com>
Date: Mon, 10 Feb 2025 22:45:03 +0900
Subject: [PATCH 10/10] =?UTF-8?q?:lipstick:=20[design]=20:=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskStatusList.vue | 4 ++--
 tailwind.config.js                            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/task-detail/TaskStatusList.vue b/src/components/task-detail/TaskStatusList.vue
index 4b0b1aad..6df4a26a 100644
--- a/src/components/task-detail/TaskStatusList.vue
+++ b/src/components/task-detail/TaskStatusList.vue
@@ -79,13 +79,13 @@ const closeModal = () => {
 }
 
 const textColor = (taskStatus: Status) => {
-  return currentStatus.value === taskStatus ? 'text-white' : `text-gray-1`
+  return currentStatus.value === taskStatus ? 'text-white' : `text-zinc-400`
 }
 
 const bgColor = (taskStatus: Status) => {
   return currentStatus.value === taskStatus
     ? `bg-${statusAsColor(taskStatus)}-1`
-    : `bg-gray-2${isProcessor ? ' hover:bg-background-1' : ''}`
+    : `bg-zinc-100${isProcessor ? ' hover:bg-zinc-200' : ''}`
 }
 
 const rejectRequest = async () => {
diff --git a/tailwind.config.js b/tailwind.config.js
index 1d44248d..95a26447 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -73,8 +73,8 @@ export default {
           2: '#F5F3FF'
         },
         gray: {
-          1: '#A1A1AA',
-          2: '#F4F4F5'
+          1: '#52525B',
+          2: '#E4E4E7'
         }
       }
     }