From f2dfa6410e053fd78d6cd9cf5ea18be92c00cf9e Mon Sep 17 00:00:00 2001 From: jiyeon Date: Mon, 10 Feb 2025 16:58:11 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20[refactor]=20:=20route?= =?UTF-8?q?r.push=20->=20router.replace=20=EB=A1=9C=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/EditInformation.vue | 2 +- src/components/top-bar/ProfileModal.vue | 4 ++-- src/components/top-bar/TopBar.vue | 8 ++++---- src/views/PwChangeEmail.vue | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/common/EditInformation.vue b/src/components/common/EditInformation.vue index 7d781920..cb04d876 100644 --- a/src/components/common/EditInformation.vue +++ b/src/components/common/EditInformation.vue @@ -186,7 +186,7 @@ const handlePwChange = () => { } const changePw = () => { - router.push('/pw-check') + router.replace('/pw-check') } const warningModalToggle = () => { diff --git a/src/components/top-bar/ProfileModal.vue b/src/components/top-bar/ProfileModal.vue index 3ed586a2..09b18a50 100644 --- a/src/components/top-bar/ProfileModal.vue +++ b/src/components/top-bar/ProfileModal.vue @@ -67,7 +67,7 @@ const emit = defineEmits<{ }>() const handleEdit = () => { - router.push('/edit-information') + router.replace('/edit-information') emit('close') } const openLogoutModal = () => { @@ -76,7 +76,7 @@ const openLogoutModal = () => { const closeLogoutModal = () => { isModalVisible.value = false isLogined.value = false - router.push('/login') + router.replace('/login') } const handleLogout = async () => { diff --git a/src/components/top-bar/TopBar.vue b/src/components/top-bar/TopBar.vue index 93b8cc2c..9a6cb9ed 100644 --- a/src/components/top-bar/TopBar.vue +++ b/src/components/top-bar/TopBar.vue @@ -79,13 +79,13 @@ onMounted(async () => { const originUrl = route.path.split('/')[1] if (info.value.role === 'ROLE_USER') { - if (!PERMITTED_URL.ROLE_USER.includes(originUrl)) router.push('/my-request') + if (!PERMITTED_URL.ROLE_USER.includes(originUrl)) router.replace('/my-request') } else if (info.value.role === 'ROLE_MANAGER') { - if (!PERMITTED_URL.ROLE_MANAGER.includes(originUrl)) router.push('/my-task') + if (!PERMITTED_URL.ROLE_MANAGER.includes(originUrl)) router.replace('/my-task') } else if (info.value.role === 'ROLE_ADMIN') { - if (!PERMITTED_URL.ROLE_ADMIN.includes(originUrl)) router.push('/member-management') + if (!PERMITTED_URL.ROLE_ADMIN.includes(originUrl)) router.replace('/member-management') } else { - if (!PERMITTED_URL.UNKNOWN.includes(originUrl)) router.push('/login') + if (!PERMITTED_URL.UNKNOWN.includes(originUrl)) router.replace('/login') } }) diff --git a/src/views/PwChangeEmail.vue b/src/views/PwChangeEmail.vue index 58709f8c..20af4893 100644 --- a/src/views/PwChangeEmail.vue +++ b/src/views/PwChangeEmail.vue @@ -68,7 +68,7 @@ const email = ref('') const closeModal = () => { isModalVisible.value = !isModalVisible.value - router.push('/login') + router.replace('/login') } const closeFailModal = () => { isFailModalVisible.value = !isFailModalVisible.value From cb4fd8b11d0e5658fb97e5cb4c818352207a5bd0 Mon Sep 17 00:00:00 2001 From: jiyeon Date: Mon, 10 Feb 2025 23:17:42 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20=EC=98=A4?= =?UTF-8?q?=ED=83=80=20=EB=B0=8F=20=EC=9A=A9=EC=96=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/LoginView.vue | 20 ++++++++++---------- src/views/PwChangeEmail.vue | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index 6a7d24e6..a843dd47 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -18,9 +18,9 @@
@@ -61,7 +61,7 @@ import { useRouter } from 'vue-router' const router = useRouter() -const nickname = ref('') +const id = ref('') const password = ref('') const memberStore = useMemberStore() @@ -76,7 +76,7 @@ const closeModal = () => { const handleLogin = async () => { try { - const name = nickname.value.toString() + const name = id.value.toString() const res = await postLogin(name, password.value) const role = await memberStore.updateMemberInfoWithToken() @@ -85,16 +85,16 @@ const handleLogin = async () => { } else if (res && role && Cookies.get('refreshToken')) { switch (role) { case 'ROLE_ADMIN': - router.push('/member-management') + router.replace('/member-management') break case 'ROLE_MANAGER': - router.push('my-request') + router.replace('my-request') break case 'ROLE_USER': - router.push('/my-request') + router.replace('/my-request') break default: - router.push('/') + router.replace('/') } } } catch (error) { @@ -103,7 +103,7 @@ const handleLogin = async () => { case 401: isModalVisible.value = !isModalVisible.value messageHeader.value = '일치하는 정보가 없습니다' - messageBody.value = '닉네임과 비밀번호를 다시 확인해 주세요' + messageBody.value = '아이디과 비밀번호를 다시 확인해 주세요' break case 500: diff --git a/src/views/PwChangeEmail.vue b/src/views/PwChangeEmail.vue index 20af4893..24b1e784 100644 --- a/src/views/PwChangeEmail.vue +++ b/src/views/PwChangeEmail.vue @@ -27,7 +27,7 @@ type="email" id="email" v-model="email" - placeholder="이메일 입력해주세요" + placeholder="이메일을 입력해주세요" required class="input-box" /> From 904598dfef8310b02544d45fe727870a53cf600f Mon Sep 17 00:00:00 2001 From: jiyeon Date: Mon, 10 Feb 2025 23:51:39 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20=EC=B9=B8=20?= =?UTF-8?q?=EB=84=88=EB=B9=84=20=EC=A1=B0=EC=A0=95=20=EB=B0=8F=20=EC=9C=A0?= =?UTF-8?q?=ED=9A=A8=EC=84=B1=20=EA=B2=80=EC=82=AC=EC=97=90=20=EB=94=B0?= =?UTF-8?q?=EB=A5=B8=20=EA=B2=BD=EA=B3=A0=20

=20absolute=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/EditInformation.vue | 22 ++++++++++++---------- src/views/LoginView.vue | 2 +- src/views/PwChangeEmail.vue | 4 ++-- src/views/PwChangeView.vue | 15 +++++++++------ 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/components/common/EditInformation.vue b/src/components/common/EditInformation.vue index cc42526c..b7f7827e 100644 --- a/src/components/common/EditInformation.vue +++ b/src/components/common/EditInformation.vue @@ -59,16 +59,18 @@ maxlength="10" ref="nameInput" @blur="validateName" /> - 이름에는 특수문자가 포함될 수 없습니다. - 이름은 1글자 이상, 10글자이하만 가능합니다. +

+ 이름에는 특수문자가 포함될 수 없습니다. + 이름은 1글자 이상, 10글자이하만 가능합니다. +

아이디

diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index 4e0ded7b..4819cc98 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -15,7 +15,7 @@
-
+
- + -
+
-
+

+ class="absolute text-red-1 text-xs font-bold mt-1"> 대문자, 소문자, 숫자, 특수문자 포함 8자-20자 입력해주세요

@@ -52,7 +52,7 @@ ]" />

+ class="absolute text-red-1 text-xs font-bold mt-1"> 비밀번호가 일치하지 않아요

@@ -109,14 +109,17 @@ const closeModal = () => { } const handleChange = () => { + if (newPw.value != checkPw.value) { + isDifferent.value = true + checkPwInput.value?.focus() + } else if (newPw.value != checkPw.value) { + isDifferent.value = false + } validatePassword() if (isInvalid.value == false && newPw.value === checkPw.value) { patchPassword(newPw.value) pwChange() openModal() - } else { - isDifferent.value = true - checkPwInput.value?.focus() } } From 07777a4470eabbca143f52e6a23178a0469a9292 Mon Sep 17 00:00:00 2001 From: jiyeon Date: Mon, 10 Feb 2025 23:52:08 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20=EC=98=A4?= =?UTF-8?q?=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/PwChangeEmail.vue | 2 +- src/views/PwCheckView.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/PwChangeEmail.vue b/src/views/PwChangeEmail.vue index 8aadee15..2d1f07e7 100644 --- a/src/views/PwChangeEmail.vue +++ b/src/views/PwChangeEmail.vue @@ -4,7 +4,7 @@ :isOpen="isModalVisible" type="successType" @close="closeModal"> - + { switch (error?.response?.status) { case 400: isModalVisible.value = !isModalVisible.value - messageHeader.value = '비밀번호가 일치 하지 않습니다' + messageHeader.value = '비밀번호가 일치하지 않습니다' messageBody.value = '다시 확인하여 주세요' break case 401: isModalVisible.value = !isModalVisible.value - messageHeader.value = '비밀번호가 일치 하지 않습니다' + messageHeader.value = '비밀번호가 일치하지 않습니다' messageBody.value = '다시 확인하여 주세요' break From 75265b09a60fb823b5ef97721be53b78c2adcd72 Mon Sep 17 00:00:00 2001 From: jiyeon Date: Tue, 11 Feb 2025 00:34:24 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20=EB=B9=84?= =?UTF-8?q?=EB=B0=80=EB=B2=88=ED=98=B8=20=EA=B0=99=EC=9D=84=EC=8B=9C?= =?UTF-8?q?=EC=9D=98=20isDifferent=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/views/PwChangeView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/PwChangeView.vue b/src/views/PwChangeView.vue index 0fc0a30e..6b0643cf 100644 --- a/src/views/PwChangeView.vue +++ b/src/views/PwChangeView.vue @@ -112,7 +112,7 @@ const handleChange = () => { if (newPw.value != checkPw.value) { isDifferent.value = true checkPwInput.value?.focus() - } else if (newPw.value != checkPw.value) { + } else if (newPw.value == checkPw.value) { isDifferent.value = false } validatePassword()