From 55a313472f93563ac6c4d5f947bfbedf222d372f Mon Sep 17 00:00:00 2001 From: jiyeon Date: Mon, 10 Feb 2025 11:44:45 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=EC=8B=9C=20=EC=97=90=EB=9F=AC(404,=20default?= =?UTF-8?q?)=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/LoginView.vue | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index 02cf29cd..6c7c0705 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -109,11 +109,23 @@ const handleLogin = async () => { messageBody.value = '닉네임과 비밀번호를 다시 확인해 주세요' break + case 404: + isModalVisible.value = !isModalVisible.value + messageHeader.value = '활성화 되어있지 않은 계정입니다' + messageBody.value = '접근 상태를 다시 확인하여주세요' + break + case 500: isModalVisible.value = !isModalVisible.value messageHeader.value = '서버에 문제가 발생했습니다' messageBody.value = '잠시후 다시 이용해주세요' break + + default: + isModalVisible.value = !isModalVisible.value + messageHeader.value = '문제가 발생했습니다' + messageBody.value = '잠시후 다시 이용해주세요' + break } } } From 5b491194e1769b277dabe730a64a3672adda6e4c Mon Sep 17 00:00:00 2001 From: jiyeon Date: Mon, 10 Feb 2025 14:28:38 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20maxLength=20?= =?UTF-8?q?=EC=9E=84=EC=9D=98=20=EC=A0=9C=EA=B1=B0=20=ED=9B=84=20=EA=B8=80?= =?UTF-8?q?=EC=9E=90=EC=88=98=20=EC=B4=88=EA=B3=BC=EC=8B=9C=20=EC=A0=9C?= =?UTF-8?q?=EC=96=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/EditInformation.vue | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/components/common/EditInformation.vue b/src/components/common/EditInformation.vue index 7d781920..4221ef86 100644 --- a/src/components/common/EditInformation.vue +++ b/src/components/common/EditInformation.vue @@ -52,7 +52,7 @@ 이름에는 특수문자가 포함될 수 없습니다. + 이름은 1글자 이상, 10글자이하만 가능합니다.

아이디

@@ -143,6 +148,7 @@ const selectedFile = ref(null) const previewUrl = ref(null) const isInvalid = ref(false) +const isFull = ref(false) const nameInput = ref(null) const isModalVisible = ref(false) @@ -160,8 +166,13 @@ watchEffect(() => { const validateName = () => { const regex = /[!@#$%^&*(),.?":{}|<>]/g isInvalid.value = regex.test(name.value) + if (name.value.length > 10 || name.value.length < 1) { + isFull.value = true + } else { + isFull.value = false + } - if (isInvalid.value) { + if (isInvalid.value || isFull.value) { nextTick(() => { nameInput.value?.focus() }) @@ -209,7 +220,7 @@ const handleFileDelete = () => { } const handleSubmit = async () => { - if (isInvalid.value == false) { + if (isInvalid.value == false && isFull.value == false) { const formData = new FormData() const memberInfo = { name: name.value, From fdde5e5bdbfe360adb91c5125cc306301055f57d Mon Sep 17 00:00:00 2001 From: jiyeon Date: Mon, 10 Feb 2025 14:29:09 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=205=ED=9A=8C=20=EC=8B=A4=ED=8C=A8=EC=8B=9C?= =?UTF-8?q?=20=EA=B3=84=EC=A0=95=20=EC=9E=A0=EA=B8=88=20=EC=95=8C=EB=A6=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/ModalView.vue | 2 +- src/views/LoginView.vue | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/components/common/ModalView.vue b/src/components/common/ModalView.vue index 66fe8b09..2e01aecf 100644 --- a/src/components/common/ModalView.vue +++ b/src/components/common/ModalView.vue @@ -26,7 +26,7 @@
+ class="flex text-sm font-bold text-body justify-center whitespace-pre-line text-center">
diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index 6c7c0705..cb76e11c 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -105,8 +105,15 @@ const handleLogin = async () => { switch (error.response?.status) { case 401: isModalVisible.value = !isModalVisible.value - messageHeader.value = '일치하는 정보가 없습니다' - messageBody.value = '닉네임과 비밀번호를 다시 확인해 주세요' + console.log(error.response?.data) + if (error.response?.data == 'AUTH_015') { + messageHeader.value = '정지된 계정입니다' + messageBody.value = + '로그인 시도 5회 초과로 계정이 정지되었습니다\n 30분 후 다시 시도 해 주세요' + } else { + messageHeader.value = '일치하는 정보가 없습니다' + messageBody.value = '닉네임과 비밀번호를 다시 확인해 주세요' + } break case 404: From 3e6d5d83a2f73a38ce05cdad4192ab8f3d6c54e8 Mon Sep 17 00:00:00 2001 From: jiyeon Date: Mon, 10 Feb 2025 15:06:40 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20=EC=95=84?= =?UTF-8?q?=EC=A7=80=ED=8A=B8=20=EC=95=8C=EB=A6=BC=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/EditInformation.vue | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/components/common/EditInformation.vue b/src/components/common/EditInformation.vue index 4221ef86..4ddb9c6d 100644 --- a/src/components/common/EditInformation.vue +++ b/src/components/common/EditInformation.vue @@ -91,10 +91,6 @@

알림 수신 여부

- { if (info.value) { name.value = info.value.name - agitCheck.value = info.value.notificationSettingInfo.agit emailCheck.value = info.value.notificationSettingInfo.email kakaoWorkCheck.value = info.value.notificationSettingInfo.kakaoWork } @@ -186,7 +180,6 @@ const handlePwChange = () => { if ( selectedFile.value || info.value.name != name.value || - info.value.notificationSettingInfo.agit != agitCheck.value || info.value.notificationSettingInfo.kakaoWork != kakaoWorkCheck.value || info.value.notificationSettingInfo.email != emailCheck.value ) { @@ -225,7 +218,6 @@ const handleSubmit = async () => { const memberInfo = { name: name.value, isProfileImageDeleted: imageDelete.value, - agitNotification: agitCheck.value, emailNotification: emailCheck.value, kakaoWorkNotification: kakaoWorkCheck.value } From 96a7eac76cbe0bf913e30764648840d451ec9a86 Mon Sep 17 00:00:00 2001 From: jiyeon Date: Mon, 10 Feb 2025 15:07:02 +0900 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=90=9B=20=20[fix]=20:=20=ED=8C=A8?= =?UTF-8?q?=EC=8A=A4=EC=9B=8C=EB=93=9C=20focus=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/PwChangeView.vue b/src/views/PwChangeView.vue index 9feca27f..2a8bae7e 100644 --- a/src/views/PwChangeView.vue +++ b/src/views/PwChangeView.vue @@ -31,8 +31,7 @@ :class="[ 'block w-full px-4 py-4 border rounded focus:outline-none', isInvalid ? 'border-red-1' : 'border-border-1' - ]" - @blur="validatePassword" /> + ]" />

@@ -110,7 +109,8 @@ const closeModal = () => { } const handleChange = () => { - if (newPw.value === checkPw.value) { + validatePassword() + if (isInvalid.value == false && newPw.value === checkPw.value) { patchPassword(newPw.value) pwChange() openModal() From 9b84eed881c4a389b76a0782a0b1f79cb5c09b87 Mon Sep 17 00:00:00 2001 From: jiyeon Date: Mon, 10 Feb 2025 23:28:21 +0900 Subject: [PATCH 6/6] =?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/LoginView.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue index 9d2c3262..51adcc89 100644 --- a/src/views/LoginView.vue +++ b/src/views/LoginView.vue @@ -106,10 +106,10 @@ const handleLogin = async () => { if (error.response?.data == 'AUTH_015') { messageHeader.value = '정지된 계정입니다' messageBody.value = - '로그인 시도 5회 초과로 계정이 정지되었습니다\n 30분 후 다시 시도 해 주세요' + '로그인 시도 5회 초과로 계정이 정지되었습니다\n30분 후 다시 시도해주세요' } else { messageHeader.value = '일치하는 정보가 없습니다' - messageBody.value = '닉네임과 비밀번호를 다시 확인해 주세요' + messageBody.value = '닉네임과 비밀번호를 다시 확인해주세요' } break