From 7fd77a0c016c108ba0fdee42e0057d5605454982 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Wed, 12 Feb 2025 10:57:46 +0900
Subject: [PATCH 1/6] =?UTF-8?q?:bug:=20[fix]=20:=20=EB=8B=89=EB=84=A4?=
 =?UTF-8?q?=EC=9E=84=20=EC=95=84=EC=9D=B4=EB=94=94=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/views/LoginView.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index 4f8ce63..125957e 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -107,7 +107,7 @@ const handleLogin = async () => {
               '로그인 시도 5회 초과로 계정이 정지되었습니다\n30분 후 다시 시도해주세요'
           } else {
             messageHeader.value = '일치하는 정보가 없습니다'
-            messageBody.value = '닉네임과 비밀번호를 다시 확인해주세요'
+            messageBody.value = '아이디과 비밀번호를 다시 확인해주세요'
           }
           isModalVisible.value = !isModalVisible.value
           break

From 6fc1726aac67f2b06fbbd9c2cf92d9aa30ca7841 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Wed, 12 Feb 2025 12:34:01 +0900
Subject: [PATCH 2/6] =?UTF-8?q?:recycle:=20[fix]=20:=20=ED=9A=8C=EC=9B=90?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EB=8F=84?=
 =?UTF-8?q?=EB=A9=94=EC=9D=B8=20placeholder=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/user-manage/UserRegistration.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/user-manage/UserRegistration.vue b/src/components/user-manage/UserRegistration.vue
index 9c58796..666f4b4 100644
--- a/src/components/user-manage/UserRegistration.vue
+++ b/src/components/user-manage/UserRegistration.vue
@@ -23,7 +23,7 @@
         :labelName="'이메일'" />
       <RequestTaskInput
         v-model="userRegistrationForm.email"
-        :placeholderText="'@kakao.com'"
+        :placeholderText="'@kakaocorp.com'"
         :label-name="'도메인'"
         :is-not-required="false" />
     </div>

From 7274a1fd14ea9662d50d1b2cad069a5f8ec6411e Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Wed, 12 Feb 2025 12:39:05 +0900
Subject: [PATCH 3/6] =?UTF-8?q?:recycle:=20[fix]=20:=20=EC=9A=B0=EC=B8=A1?=
 =?UTF-8?q?=20=EC=8A=A4=ED=81=AC=EB=A1=A4=EB=B0=94=20=ED=95=98=EC=9D=B4?=
 =?UTF-8?q?=EB=93=9C=20=EC=86=8D=EC=84=B1=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index 9af1531..9fc9a07 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="sticky top-0 w-[280px] shrink-0 flex flex-col gap-y-6 overflow-y-auto p-6">
+  <div class="sticky top-0 w-[280px] shrink-0 flex flex-col gap-y-6 overflow-y-auto p-6 scrollbar-hide">
     <div>
       <p class="task-detail">작업코드</p>
       <p class="text-sm">{{ data.taskCode || '-' }}</p>

From 743a9a9f4b05d1d99c0cd6334fd8ec91e683dc16 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Wed, 12 Feb 2025 13:20:00 +0900
Subject: [PATCH 4/6] =?UTF-8?q?:recycle:=20[fix]=20:=20=EB=B0=98=EB=A0=A4?=
 =?UTF-8?q?=20=EC=82=AC=EC=9C=A0=20=EC=9E=85=EB=A0=A5=20=EB=B0=8F=20?=
 =?UTF-8?q?=ED=9E=88=EC=8A=A4=ED=86=A0=EB=A6=AC=20=EB=B0=98=EB=A0=A4?=
 =?UTF-8?q?=EC=82=AC=EC=9C=A0=20=EC=A1=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/task-detail/TaskDetailHistory.vue     | 4 +++-
 src/components/task-detail/TaskDetailHistoryChat.vue | 2 +-
 src/components/task-detail/TaskStatusList.vue        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/task-detail/TaskDetailHistory.vue b/src/components/task-detail/TaskDetailHistory.vue
index 99d2e4a..f37eb1f 100644
--- a/src/components/task-detail/TaskDetailHistory.vue
+++ b/src/components/task-detail/TaskDetailHistory.vue
@@ -40,7 +40,9 @@
           </div>
           <div class="flex w-full flex-col items-center">
             <TaskDetailHistoryChat
-              v-if="item.taskHistoryType === 'COMMENT'"
+              v-if="
+                item.taskHistoryType === 'COMMENT' || item.taskHistoryType === 'TASK_TERMINATED'
+              "
               :history="item"
               :requestor-name="requestorName"
               :task-id="taskId" />
diff --git a/src/components/task-detail/TaskDetailHistoryChat.vue b/src/components/task-detail/TaskDetailHistoryChat.vue
index ac8bdff..0bbfc0f 100644
--- a/src/components/task-detail/TaskDetailHistoryChat.vue
+++ b/src/components/task-detail/TaskDetailHistoryChat.vue
@@ -21,7 +21,7 @@
             'flex max-w-[400px] flex-wrap px-4 py-3 text-base rounded-lg font-normal',
             isRequestor ? 'bg-background-2' : 'bg-primary2'
           ]">
-          {{ history.details.commentDetails?.comment }}
+          {{ history.details.commentDetails?.comment || history.details.taskDetails?.value }}
         </p>
         <div
           :class="[
diff --git a/src/components/task-detail/TaskStatusList.vue b/src/components/task-detail/TaskStatusList.vue
index 1f644f4..768b789 100644
--- a/src/components/task-detail/TaskStatusList.vue
+++ b/src/components/task-detail/TaskStatusList.vue
@@ -95,7 +95,7 @@ const rejectRequest = async () => {
     return
   }
   try {
-    await axiosInstance.patch(`/api/tasks/${taskId}/terminate`, rejectReason)
+    await axiosInstance.patch(`/api/tasks/${taskId}/terminate`, { reason: rejectReason.value })
     toggleModal('success')
     emit('update:status', 'TERMINATED')
     currentStatus.value = 'TERMINATED'

From eb567495b3696261072ad758c8e5898316ee0101 Mon Sep 17 00:00:00 2001
From: Minkyu0424 <yng1404@gmail.com>
Date: Wed, 12 Feb 2025 13:39:40 +0900
Subject: [PATCH 5/6] =?UTF-8?q?:recycle:=20[fix]=20:=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=20=EC=A2=85=EB=A3=8C=EC=82=AC=EC=9C=A0=20=EC=9E=85=EB=A0=A5?=
 =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=B4=88=EA=B8=B0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/ModalView.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/common/ModalView.vue b/src/components/common/ModalView.vue
index 60d90d4..8c5a9cf 100644
--- a/src/components/common/ModalView.vue
+++ b/src/components/common/ModalView.vue
@@ -81,9 +81,9 @@
 
 <script setup lang="ts">
 import { failIcon, successIcon, warningIcon } from '@/constants/iconPath'
+import { preventEnter } from '@/utils/preventEnter'
 import { onUnmounted, ref, watch } from 'vue'
 import CommonIcons from './CommonIcons.vue'
-import { preventEnter } from '@/utils/preventEnter'
 
 const { isOpen, type, modelValue } = defineProps<{
   isOpen: boolean
@@ -116,6 +116,7 @@ watch(
   () => isOpen,
   () => {
     if (isOpen) {
+      textValue.value = ''
       document.body.style.overflow = 'hidden'
       window.addEventListener('keydown', preventEnter)
     } else {

From af0fc9fb60bcb9a7b82fc765f8c2d54bb4ca006d Mon Sep 17 00:00:00 2001
From: Miinkyuuu <yng1404@gmail.com>
Date: Wed, 12 Feb 2025 17:08:30 +0900
Subject: [PATCH 6/6] =?UTF-8?q?Revert=20"Clap-392=20UI/UX=20=EA=B0=9C?=
 =?UTF-8?q?=EC=84=A0=20Moya"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/ModalView.vue                  | 3 +--
 src/components/task-detail/TaskDetailHistory.vue     | 4 +---
 src/components/task-detail/TaskDetailHistoryChat.vue | 2 +-
 src/components/task-detail/TaskDetailRight.vue       | 2 +-
 src/components/task-detail/TaskStatusList.vue        | 2 +-
 src/components/user-manage/UserRegistration.vue      | 2 +-
 src/views/LoginView.vue                              | 2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/components/common/ModalView.vue b/src/components/common/ModalView.vue
index 8c5a9cf..60d90d4 100644
--- a/src/components/common/ModalView.vue
+++ b/src/components/common/ModalView.vue
@@ -81,9 +81,9 @@
 
 <script setup lang="ts">
 import { failIcon, successIcon, warningIcon } from '@/constants/iconPath'
-import { preventEnter } from '@/utils/preventEnter'
 import { onUnmounted, ref, watch } from 'vue'
 import CommonIcons from './CommonIcons.vue'
+import { preventEnter } from '@/utils/preventEnter'
 
 const { isOpen, type, modelValue } = defineProps<{
   isOpen: boolean
@@ -116,7 +116,6 @@ watch(
   () => isOpen,
   () => {
     if (isOpen) {
-      textValue.value = ''
       document.body.style.overflow = 'hidden'
       window.addEventListener('keydown', preventEnter)
     } else {
diff --git a/src/components/task-detail/TaskDetailHistory.vue b/src/components/task-detail/TaskDetailHistory.vue
index f37eb1f..99d2e4a 100644
--- a/src/components/task-detail/TaskDetailHistory.vue
+++ b/src/components/task-detail/TaskDetailHistory.vue
@@ -40,9 +40,7 @@
           </div>
           <div class="flex w-full flex-col items-center">
             <TaskDetailHistoryChat
-              v-if="
-                item.taskHistoryType === 'COMMENT' || item.taskHistoryType === 'TASK_TERMINATED'
-              "
+              v-if="item.taskHistoryType === 'COMMENT'"
               :history="item"
               :requestor-name="requestorName"
               :task-id="taskId" />
diff --git a/src/components/task-detail/TaskDetailHistoryChat.vue b/src/components/task-detail/TaskDetailHistoryChat.vue
index 0bbfc0f..ac8bdff 100644
--- a/src/components/task-detail/TaskDetailHistoryChat.vue
+++ b/src/components/task-detail/TaskDetailHistoryChat.vue
@@ -21,7 +21,7 @@
             'flex max-w-[400px] flex-wrap px-4 py-3 text-base rounded-lg font-normal',
             isRequestor ? 'bg-background-2' : 'bg-primary2'
           ]">
-          {{ history.details.commentDetails?.comment || history.details.taskDetails?.value }}
+          {{ history.details.commentDetails?.comment }}
         </p>
         <div
           :class="[
diff --git a/src/components/task-detail/TaskDetailRight.vue b/src/components/task-detail/TaskDetailRight.vue
index 9fc9a07..9af1531 100644
--- a/src/components/task-detail/TaskDetailRight.vue
+++ b/src/components/task-detail/TaskDetailRight.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="sticky top-0 w-[280px] shrink-0 flex flex-col gap-y-6 overflow-y-auto p-6 scrollbar-hide">
+  <div class="sticky top-0 w-[280px] shrink-0 flex flex-col gap-y-6 overflow-y-auto p-6">
     <div>
       <p class="task-detail">작업코드</p>
       <p class="text-sm">{{ data.taskCode || '-' }}</p>
diff --git a/src/components/task-detail/TaskStatusList.vue b/src/components/task-detail/TaskStatusList.vue
index 768b789..1f644f4 100644
--- a/src/components/task-detail/TaskStatusList.vue
+++ b/src/components/task-detail/TaskStatusList.vue
@@ -95,7 +95,7 @@ const rejectRequest = async () => {
     return
   }
   try {
-    await axiosInstance.patch(`/api/tasks/${taskId}/terminate`, { reason: rejectReason.value })
+    await axiosInstance.patch(`/api/tasks/${taskId}/terminate`, rejectReason)
     toggleModal('success')
     emit('update:status', 'TERMINATED')
     currentStatus.value = 'TERMINATED'
diff --git a/src/components/user-manage/UserRegistration.vue b/src/components/user-manage/UserRegistration.vue
index 666f4b4..9c58796 100644
--- a/src/components/user-manage/UserRegistration.vue
+++ b/src/components/user-manage/UserRegistration.vue
@@ -23,7 +23,7 @@
         :labelName="'이메일'" />
       <RequestTaskInput
         v-model="userRegistrationForm.email"
-        :placeholderText="'@kakaocorp.com'"
+        :placeholderText="'@kakao.com'"
         :label-name="'도메인'"
         :is-not-required="false" />
     </div>
diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index 125957e..4f8ce63 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -107,7 +107,7 @@ const handleLogin = async () => {
               '로그인 시도 5회 초과로 계정이 정지되었습니다\n30분 후 다시 시도해주세요'
           } else {
             messageHeader.value = '일치하는 정보가 없습니다'
-            messageBody.value = '아이디과 비밀번호를 다시 확인해주세요'
+            messageBody.value = '닉네임과 비밀번호를 다시 확인해주세요'
           }
           isModalVisible.value = !isModalVisible.value
           break