From 4555f34bca16e5b3972b62fb66615076d5275493 Mon Sep 17 00:00:00 2001 From: seorang42 Date: Mon, 17 Feb 2025 13:41:46 +0900 Subject: [PATCH 1/4] =?UTF-8?q?:bug:=20[fix]=20:=20=EB=B9=84=EB=B0=80?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20=EC=9E=AC=EC=84=A4=EC=A0=95=20=EC=9E=98?= =?UTF-8?q?=EB=AA=BB=EB=90=9C=20=EB=B6=84=EA=B8=B0=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20=ED=91=9C=EA=B8=B0=20=EC=98=A4?= =?UTF-8?q?=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/views/PwChangeView.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/PwChangeView.vue b/src/views/PwChangeView.vue index 51d806a..e558a48 100644 --- a/src/views/PwChangeView.vue +++ b/src/views/PwChangeView.vue @@ -22,7 +22,7 @@ v-else :title="'비밀번호\n재설정'" :content=" - !firstVisit + firstVisit ? '새로운 비밀번호를 입력해주세요\n보안을 위해 링크는 5분 후 만료됩니다' : '새로운 비밀번호를 입력해주세요' " /> @@ -128,7 +128,7 @@ const messageBody = ref('') const pw = ref('') const isConfirmed = ref(false) -const firstVisit = ref(Cookies.get('accessToken') ? true : false) +const firstVisit = ref(!Cookies.get('refreshToken') ? true : false) const handleCheck = async () => { await postPasswordCheck(pw.value) From 0bcf14e1cac14fcf44f647a73003edb8bda03a22 Mon Sep 17 00:00:00 2001 From: seorang42 Date: Mon, 17 Feb 2025 14:34:44 +0900 Subject: [PATCH 2/4] =?UTF-8?q?:bug:=20[fix]=20:=20=EB=AA=A9=EB=A1=9D?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=ED=9A=8C=EC=9B=90=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=95=84=20=EC=82=AC=EC=A7=84=20=EB=AF=B8=ED=91=9C=EC=8B=9C=20?= =?UTF-8?q?=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/lists/ListCardTab.vue | 12 +++++------- src/components/my-request/MyRequestListCard.vue | 2 +- src/components/my-task/MyTaskListCard.vue | 2 +- .../request-history/RequestHistoryListCard.vue | 4 ++-- src/components/requested/RequestedListCard.vue | 2 +- src/types/manager.ts | 8 ++++---- src/views/PwChangeView.vue | 6 +++--- 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/components/lists/ListCardTab.vue b/src/components/lists/ListCardTab.vue index 47b2536..9c9da35 100644 --- a/src/components/lists/ListCardTab.vue +++ b/src/components/lists/ListCardTab.vue @@ -3,11 +3,10 @@ class="flex gap-2 items-center" :style="{ width: width ? `${width}px` : '' }" :class="width ? 'shrink-0' : 'grow'"> -
- -
+ @@ -23,9 +22,8 @@ - - diff --git a/src/components/my-request/MyRequestListCard.vue b/src/components/my-request/MyRequestListCard.vue index 862e09c..5f0c200 100644 --- a/src/components/my-request/MyRequestListCard.vue +++ b/src/components/my-request/MyRequestListCard.vue @@ -47,7 +47,7 @@ const myRequestTabList: ListCardProps[] = [ { content: info.mainCategoryName, width: 80 }, { content: info.categoryName, width: 80 }, { content: info.title }, - { content: info.processorName, width: 120, profileImg: info.processorImg }, + { content: info.processorName, width: 120, profileImg: info.processorImg || '' }, { content: info.taskStatus, width: 80, isStatus: true }, { content: info.finishedAt ? formatDate(info.finishedAt) : '', width: 80 } ] diff --git a/src/components/my-task/MyTaskListCard.vue b/src/components/my-task/MyTaskListCard.vue index f6bf968..ec484e5 100644 --- a/src/components/my-task/MyTaskListCard.vue +++ b/src/components/my-task/MyTaskListCard.vue @@ -46,7 +46,7 @@ const myRequestTabList: ListCardProps[] = [ { content: info.mainCategoryName, width: 80 }, { content: info.categoryName, width: 80 }, { content: info.title }, - { content: info.requesterName, width: 120, profileImg: info.requesterImg }, + { content: info.requesterName, width: 120, profileImg: info.requesterUrl || '' }, { content: info.taskStatus, width: 80, isStatus: true }, { content: info.finishedAt ? formatDate(info.finishedAt) : '', width: 80 } ] diff --git a/src/components/request-history/RequestHistoryListCard.vue b/src/components/request-history/RequestHistoryListCard.vue index c6e1e44..8681c6a 100644 --- a/src/components/request-history/RequestHistoryListCard.vue +++ b/src/components/request-history/RequestHistoryListCard.vue @@ -46,8 +46,8 @@ const myRequestTabList: ListCardProps[] = [ { 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.requesterName, width: 120, profileImg: info.requesterUrl || '' }, + { content: info.processorName, width: 120, profileImg: info.processorUrl || '' }, { content: info.taskStatus, width: 80, isStatus: true }, { content: info.finishedAt ? formatDate(info.finishedAt) : '', width: 80 } ] diff --git a/src/components/requested/RequestedListCard.vue b/src/components/requested/RequestedListCard.vue index 9aa6c48..55d043f 100644 --- a/src/components/requested/RequestedListCard.vue +++ b/src/components/requested/RequestedListCard.vue @@ -73,7 +73,7 @@ const requestedTabList: ListCardProps[] = [ { content: info.mainCategoryName, width: 80 }, { content: info.categoryName, width: 80 }, { content: info.title }, - { content: info.requesterName, width: 120, profileImg: info.requesterImg } + { content: info.requesterName, width: 120, profileImg: info.requesterUrl || '' } ] const router = useRouter() const queryClient = useQueryClient() diff --git a/src/types/manager.ts b/src/types/manager.ts index 66e299a..f65bdd2 100644 --- a/src/types/manager.ts +++ b/src/types/manager.ts @@ -7,7 +7,7 @@ export interface RequestedListData { mainCategoryName: string categoryName: string title: string - requesterImg: string + requesterUrl?: string requesterName: string } @@ -18,9 +18,9 @@ export interface RequestHistoryListData { mainCategoryName: string categoryName: string title: string - requesterImg: string + requesterUrl?: string requesterName: string - processorImg?: string + processorUrl?: string processorName?: string taskStatus: string finishedAt?: string @@ -57,7 +57,7 @@ export interface MyTaskListData { mainCategoryName: string categoryName: string title: string - requesterImg: string + requesterUrl?: string requesterName: string taskStatus: string finishedAt?: string diff --git a/src/views/PwChangeView.vue b/src/views/PwChangeView.vue index e558a48..da28ac2 100644 --- a/src/views/PwChangeView.vue +++ b/src/views/PwChangeView.vue @@ -16,7 +16,7 @@ - 대문자, 소문자, 숫자, 특수문자 포함 8자-20자 입력해주세요 + 대문자, 소문자, 숫자, 특수문자 포함 8자-20자로 입력해주세요

@@ -92,7 +92,7 @@

- 비밀번호가 일치하지 않아요 + 비밀번호가 일치하지 않습니다

From 37e5f9bd9d74d7a31442c377eeac868eca729c1f Mon Sep 17 00:00:00 2001 From: seorang42 Date: Mon, 17 Feb 2025 14:37:12 +0900 Subject: [PATCH 3/4] =?UTF-8?q?:bug:=20[fix]=20:=20=ED=9A=8C=EC=9B=90=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=97=86=EC=9D=B4=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=95=84=20=EC=82=AC=EC=A7=84=20=ED=91=9C=EC=8B=9C=20=EC=98=A4?= =?UTF-8?q?=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/lists/ListCardTab.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/lists/ListCardTab.vue b/src/components/lists/ListCardTab.vue index 9c9da35..5432cba 100644 --- a/src/components/lists/ListCardTab.vue +++ b/src/components/lists/ListCardTab.vue @@ -4,7 +4,7 @@ :style="{ width: width ? `${width}px` : '' }" :class="width ? 'shrink-0' : 'grow'"> Date: Mon, 17 Feb 2025 23:28:45 +0900 Subject: [PATCH 4/4] =?UTF-8?q?:recycle:=20[refactor]=20=ED=94=BC=EA=B7=B8?= =?UTF-8?q?=EB=A7=88=EC=99=80=20UI=20=EC=9D=BC=EC=B9=98=ED=99=94=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EB=B0=8F=20=EC=B5=9C=EC=A2=85=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/EditInformation.vue | 26 +++++-- src/components/common/ModalView.vue | 2 +- .../MemberManagementListCard.vue | 2 +- .../request-approve/ManagerDropdown.vue | 3 +- .../request-task/RequestTaskDropdown.vue | 2 +- .../RequestTaskFileInputAfter.vue | 2 +- .../task-detail/TaskDetailDropdown.vue | 67 ------------------- .../task-detail/TaskDetailHistoryChat.vue | 2 +- .../task-detail/TaskDetailHistoryFile.vue | 9 ++- .../task-detail/TaskDetailManagerDropdown.vue | 3 +- src/components/top-bar/ProfileModal.vue | 10 +-- .../user-manage/DepartmentDropDown.vue | 4 +- src/types/user.ts | 6 -- 13 files changed, 46 insertions(+), 92 deletions(-) delete mode 100644 src/components/task-detail/TaskDetailDropdown.vue diff --git a/src/components/common/EditInformation.vue b/src/components/common/EditInformation.vue index bd061bd..336f224 100644 --- a/src/components/common/EditInformation.vue +++ b/src/components/common/EditInformation.vue @@ -10,7 +10,7 @@ @@ -196,17 +196,33 @@ const validateName = () => { }) } } -const handleCancel = () => { - router.back() -} -const handlePwChange = () => { +const checkChange = () => { if ( selectedFile.value || info.value.name != name.value || info.value.notificationSettingInfo.kakaoWork != kakaoWorkCheck.value || info.value.notificationSettingInfo.email != emailCheck.value ) { + return true + } else { + return false + } +} + +const modalTarget = ref('') +const handleCancel = () => { + if (checkChange()) { + modalTarget.value = 'cancel' + warningModalToggle() + } else { + router.back() + } +} + +const handlePwChange = () => { + if (checkChange()) { + modalTarget.value = 'pw' warningModalToggle() } else { changePw() diff --git a/src/components/common/ModalView.vue b/src/components/common/ModalView.vue index b69a85c..5c47159 100644 --- a/src/components/common/ModalView.vue +++ b/src/components/common/ModalView.vue @@ -72,7 +72,7 @@ type="button" class="button-large-red" @click="confirmModal"> - {{ type === 'inputType' ? '반려' : type === 'terminate' ? '종료' : '삭제' }} + {{ type === 'inputType' ? '반려' : type === 'terminate' ? '종료' : '확인' }}
diff --git a/src/components/member-management/MemberManagementListCard.vue b/src/components/member-management/MemberManagementListCard.vue index 29490e8..54e2bb2 100644 --- a/src/components/member-management/MemberManagementListCard.vue +++ b/src/components/member-management/MemberManagementListCard.vue @@ -21,7 +21,7 @@ @click="toggleModal('delete')"> 삭제 -
+
diff --git a/src/components/request-task/RequestTaskDropdown.vue b/src/components/request-task/RequestTaskDropdown.vue index e72dcf5..43d114b 100644 --- a/src/components/request-task/RequestTaskDropdown.vue +++ b/src/components/request-task/RequestTaskDropdown.vue @@ -10,7 +10,7 @@ class="relative flex">

{{ modelValue || placeholderText }} diff --git a/src/components/request-task/RequestTaskFileInputAfter.vue b/src/components/request-task/RequestTaskFileInputAfter.vue index 8a55590..3fc29bb 100644 --- a/src/components/request-task/RequestTaskFileInputAfter.vue +++ b/src/components/request-task/RequestTaskFileInputAfter.vue @@ -32,7 +32,7 @@