diff --git a/src/api/auth.ts b/src/api/auth.ts index 9fc92687..35cb1391 100644 --- a/src/api/auth.ts +++ b/src/api/auth.ts @@ -33,7 +33,7 @@ export const postLogin = async (nickName: string, password: string) => { } export const patchPassword = async (password: string) => { - const request = { password: password } + const request = { password } const response = await axiosInstance.patch('/api/members/password', request) return response.data } diff --git a/src/assets/styles.css b/src/assets/styles.css index 7bcd0438..cb3f2ba3 100644 --- a/src/assets/styles.css +++ b/src/assets/styles.css @@ -51,19 +51,22 @@ body { } .button-medium { - @apply flex items-center justify-center rounded px-4 py-2 font-bold gap-1 text-xs cursor-pointer shrink-0; + @apply flex items-center justify-center rounded px-4 py-2 font-bold gap-1 text-xs cursor-pointer shrink-0 h-full; } .button-medium-primary { @apply button-medium bg-primary1 text-white hover:bg-[#6869DE]; } .button-medium-secondary { - @apply button-medium bg-white border border-primary1 text-primary1 hover:bg-background-2; + @apply button-medium bg-white border border-primary1 text-primary1 hover:bg-primary2; } .button-medium-default { @apply button-medium bg-white border border-border-1 text-disabled hover:bg-background-2; } .button-medium-red { - @apply button-medium bg-white border border-red-1 text-red-1 hover:bg-background-2; + @apply button-medium bg-white border border-red-1 text-red-1 hover:bg-red-2; +} +.button-medium-disabled { + @apply button-medium text-disabled bg-background-1; } .button-small { @@ -96,7 +99,7 @@ body { @apply flex justify-center items-center w-full h-8 px-2 border-b border-border-1 relative text-xs cursor-pointer; } .filter-dropdown-option-list { - @apply w-full max-h-[120px] overflow-y-scroll absolute left-0 top-[calc(100%+8px)] shadow-custom p-2 flex flex-col gap-2 rounded bg-white cursor-auto; + @apply w-full max-h-[160px] overflow-y-scroll absolute left-0 top-[calc(100%+8px)] shadow-custom p-2 flex flex-col gap-2 rounded bg-white cursor-auto; } .filter-dropdown-option { @apply text-xs p-2 rounded text-center cursor-pointer; diff --git a/src/components/common/EditInformation.vue b/src/components/common/EditInformation.vue index a2eaf1b9..59d1ac27 100644 --- a/src/components/common/EditInformation.vue +++ b/src/components/common/EditInformation.vue @@ -206,7 +206,7 @@ const handlePwChange = () => { } const changePw = () => { - router.replace('/pw-check') + router.replace('/pw-change') } const warningModalToggle = () => { diff --git a/src/components/common/ModalView.vue b/src/components/common/ModalView.vue index e820515a..60d90d4d 100644 --- a/src/components/common/ModalView.vue +++ b/src/components/common/ModalView.vue @@ -1,12 +1,12 @@ @@ -55,8 +65,8 @@ import { postPasswordEmailSend } from '@/api/auth' import TitleContainer from '@/components/common/TitleContainer.vue' import axios from 'axios' import { ref } from 'vue' -import router from '../router/index' import ModalView from '@/components/common/ModalView.vue' +import { useRouter } from 'vue-router' const messageHeader = ref('') const messageBody = ref('') @@ -66,8 +76,9 @@ const isFailModalVisible = ref(false) const name = ref('') const email = ref('') +const router = useRouter() + const closeModal = () => { - isModalVisible.value = !isModalVisible.value router.push('/login') } const closeFailModal = () => { diff --git a/src/views/PwChangeView.vue b/src/views/PwChangeView.vue index a8a7d0d4..d57fc6fb 100644 --- a/src/views/PwChangeView.vue +++ b/src/views/PwChangeView.vue @@ -1,23 +1,55 @@ diff --git a/src/views/PwCheckView.vue b/src/views/PwCheckView.vue index 12d80485..807ab1e9 100644 --- a/src/views/PwCheckView.vue +++ b/src/views/PwCheckView.vue @@ -2,17 +2,29 @@
+ @close="closeError"> + + + + :content="'비밀번호 재설정을 위해\n현재 비밀번호를 입력해주세요'" /> +
- +
+ + +
+
+
+
+ +

+ 대문자, 소문자, 숫자, 특수문자 포함 8자-20자 입력해주세요 +

+
+
+ +

+ 비밀번호가 일치하지 않아요 +

+
+
+ + + 취소 + +
-