diff --git a/src/components/common/EditInformation.vue b/src/components/common/EditInformation.vue index 4ddb9c6d..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글자이하만 가능합니다. +

아이디

@@ -190,7 +192,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/LoginView.vue b/src/views/LoginView.vue index 51adcc89..4819cc98 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -15,12 +15,12 @@
-
+
@@ -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,24 +85,22 @@ 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) { if (axios.isAxiosError(error)) { switch (error.response?.status) { case 401: - isModalVisible.value = !isModalVisible.value - console.log(error.response?.data) if (error.response?.data == 'AUTH_015') { messageHeader.value = '정지된 계정입니다' messageBody.value = @@ -111,6 +109,7 @@ const handleLogin = async () => { messageHeader.value = '일치하는 정보가 없습니다' messageBody.value = '닉네임과 비밀번호를 다시 확인해주세요' } + isModalVisible.value = !isModalVisible.value break case 404: diff --git a/src/views/PwChangeEmail.vue b/src/views/PwChangeEmail.vue index 58709f8c..2d1f07e7 100644 --- a/src/views/PwChangeEmail.vue +++ b/src/views/PwChangeEmail.vue @@ -4,7 +4,7 @@ :isOpen="isModalVisible" type="successType" @close="closeModal"> - + -
+
@@ -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 diff --git a/src/views/PwChangeView.vue b/src/views/PwChangeView.vue index 2a8bae7e..6b0643cf 100644 --- a/src/views/PwChangeView.vue +++ b/src/views/PwChangeView.vue @@ -20,7 +20,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() } } diff --git a/src/views/PwCheckView.vue b/src/views/PwCheckView.vue index 24e3cf16..9176cd5e 100644 --- a/src/views/PwCheckView.vue +++ b/src/views/PwCheckView.vue @@ -64,13 +64,13 @@ const handleCheck = async () => { 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