From 0b5c190cf32fc91eabad7d02c2459b7bb307cff9 Mon Sep 17 00:00:00 2001
From: basssy <basssy@interplug.co.kr>
Date: Tue, 7 Jan 2025 15:25:24 +0900
Subject: [PATCH] =?UTF-8?q?Qcast=20=EC=B5=9C=EC=B4=88=20=EB=B9=84=EB=B0=80?=
 =?UTF-8?q?=EB=B2=88=ED=98=B8=EB=B3=80=EA=B2=BD=ED=8C=9D=EC=97=85=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/components/main/ChangePasswordPop.jsx | 30 ++++++++++-------------
 src/locales/ja.json                       |  1 +
 src/locales/ko.json                       |  1 +
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/components/main/ChangePasswordPop.jsx b/src/components/main/ChangePasswordPop.jsx
index 4eb7164d..508f5d25 100644
--- a/src/components/main/ChangePasswordPop.jsx
+++ b/src/components/main/ChangePasswordPop.jsx
@@ -1,12 +1,10 @@
-import React, { useState } from 'react'
+import React from 'react'
 import { useMessage } from '@/hooks/useMessage'
 import { useForm } from 'react-hook-form'
 import { sessionStore } from '@/store/commonAtom'
 import { useRecoilValue, useRecoilState } from 'recoil'
 import { useAxios } from '@/hooks/useAxios'
 import { globalLocaleStore } from '@/store/localeAtom'
-import { useRouter } from 'next/navigation'
-import { setSession } from '@/lib/authActions'
 import { logout } from '@/lib/authActions'
 export default function ChangePasswordPop(props) {
   const globalLocaleState = useRecoilValue(globalLocaleStore)
@@ -14,7 +12,6 @@ export default function ChangePasswordPop(props) {
   const { patch } = useAxios(globalLocaleState)
   const { getMessage } = useMessage()
   const [sessionState, setSessionState] = useRecoilState(sessionStore)
-  const router = useRouter()
   const formInitValue = {
     password1: '',
     password2: '',
@@ -56,6 +53,16 @@ export default function ChangePasswordPop(props) {
     const _password1 = form.watch('password1')
     const _password2 = form.watch('password2')
 
+    //비밀번호 미입력시
+    if (_password1.trim() === '') {
+      alert(getMessage('main.popup.login.validate3'))
+      return false
+    }
+    if (_password2.trim() === '') {
+      alert(getMessage('main.popup.login.validate3'))
+      return false
+    }
+
     if (_password1 !== _password2) {
       alert(getMessage('main.popup.login.validate1'))
       return false
@@ -78,10 +85,6 @@ export default function ChangePasswordPop(props) {
           if (res?.result?.resultCode === 'S') {
             alert(getMessage('main.popup.login.success'))
             logout()
-            //로그인 화면으로 이동해서 다시 로그인해야되서 setSessionState필요없음
-            // setSessionState({ ...sessionState, pwdInitYn: 'Y' })
-            //props.setChagePasswordPopOpen(false)
-            //router.push('/login')
           } else {
             alert(res?.result?.resultMsg)
           }
@@ -110,10 +113,7 @@ export default function ChangePasswordPop(props) {
                   <div className="table-item">
                     <div className="table-item-th">
                       <div className="change-password-tit">
-                        <div className="tit-b">
-                          {getMessage('main.popup.login.newPassword1')}
-                          <span className="important">*</span>
-                        </div>
+                        <div className="tit-b">{getMessage('main.popup.login.newPassword1')}</div>
                         <div className="tit-s">{getMessage('main.popup.login.placeholder')}</div>
                       </div>
                     </div>
@@ -133,10 +133,7 @@ export default function ChangePasswordPop(props) {
                   <div className="table-item">
                     <div className="table-item-th">
                       <div className="change-password-tit">
-                        <div className="tit-b">
-                          {getMessage('main.popup.login.newPassword2')}
-                          <span className="important">*</span>
-                        </div>
+                        <div className="tit-b">{getMessage('main.popup.login.newPassword2')}</div>
                         <div className="tit-s">{getMessage('main.popup.login.placeholder')}</div>
                       </div>
                     </div>
@@ -169,7 +166,6 @@ export default function ChangePasswordPop(props) {
                 className="btn-origin grey"
                 onClick={() => {
                   logout()
-                  // router.push('/login')
                 }}
               >
                 {getMessage('main.popup.login.btn2')}
diff --git a/src/locales/ja.json b/src/locales/ja.json
index be982f43..0fc32b81 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -824,6 +824,7 @@
   "main.popup.login.btn2": "変更しない",
   "main.popup.login.validate1": "入力したパスワードが異なります。",
   "main.popup.login.validate2": "半角10文字以内で入力してください。",
+  "main.popup.login.validate3": "비밀번호를 입력해주세요.",
   "main.popup.login.success": "パスワードが変更されました。",
   "common.canvas.validate.size": "寸法を入力してください.",
   "surface.shape.validate.size.1to2": "①길이는 ②보다 큰 값을 넣어주세요.",
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 05916f95..6b415e88 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -834,6 +834,7 @@
   "main.popup.login.btn2": "변경안함",
   "main.popup.login.validate1": "입력한 패스워드가 다릅니다.",
   "main.popup.login.validate2": "반각 10자 이내로 입력해주세요.",
+  "main.popup.login.validate3": "비밀번호를 입력해주세요.",
   "main.popup.login.success": "비밀번호가 변경되었습니다.",
   "common.canvas.validate.size": "사이즈를 입력해 주세요.",
   "surface.shape.validate.size.1to2": "①길이는 ②보다 큰 값을 넣어주세요.",