diff --git a/src/pages/authentication/auth-forms/AuthLoginCustom.js b/src/pages/authentication/auth-forms/AuthLoginCustom.js index 3afe339..d043fa7 100644 --- a/src/pages/authentication/auth-forms/AuthLoginCustom.js +++ b/src/pages/authentication/auth-forms/AuthLoginCustom.js @@ -118,7 +118,11 @@ const AuthLoginCustom = () => { .catch((error) => { // setSuccess(false) setOnLogin(false) - setErrorMassage(error.response.data.error) + if(error.response!= undefined){ + setErrorMassage(error.response.data.error) + }else{ + setErrorMassage("CONNECTION_ERROR") + } setOpen(true) }); } else { diff --git a/src/pages/authentication/auth-forms/PasswordAlertDialog.js b/src/pages/authentication/auth-forms/PasswordAlertDialog.js index ba25ac5..305a139 100644 --- a/src/pages/authentication/auth-forms/PasswordAlertDialog.js +++ b/src/pages/authentication/auth-forms/PasswordAlertDialog.js @@ -29,22 +29,27 @@ const PasswordAlertDialog = (props) => { - {props.errorMassage === 'ACCOUNT_LOCKED_ERROR' ? - - - 帳戶將被封鎖 - - - 帳戶連續五次登入錯誤,請與系統管理員聯絡 - - : - props.errorMassage === 'ACCOUNT_VERIFIED_ERROR' ? - - 帳戶尚未驗證 - : - - 用戶名或密碼錯誤 - + { + props.errorMassage === 'ACCOUNT_LOCKED_ERROR' ? + + + + + + + + : + props.errorMassage === 'ACCOUNT_VERIFIED_ERROR' ? + + + : + props.errorMassage === 'CONNECTION_ERROR' ? + + + : + + + } diff --git a/src/translations/en.json b/src/translations/en.json index 3ca6b38..6930139 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -105,6 +105,13 @@ "register": "Register", "userLoginName": "Username", "userPassword": "Password", + + "loginErrorMessage1":"Account will be blocked", + "loginErrorMessage2":"Account login errors for Five Consecutive Times, please contact the system administrator", + "loginErrorMessage3":"Account has not been Verified", + "loginErrorMessage4":"System Connection Failed", + "loginErrorMessage5":"Incorrect Username or Password", + "newPassword": "New Password", "setNewPassword": "Please enter new password", "forgotUserPassword": "Forgot Password", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 4a0ee02..f442884 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -104,6 +104,13 @@ "register": "申请", "userLoginName": "用户登入名称", "userPassword": "密码", + + "loginErrorMessage1":"帐户将被封锁", + "loginErrorMessage2":"帐户连续五次登入错误,请与系统管理员联络", + "loginErrorMessage3":"帐户尚未验证", + "loginErrorMessage4":"系统连接失败", + "loginErrorMessage5":"用户名或密码错误", + "newPassword": "新密码", "setNewPassword": "请输入新密码", "forgotUserPassword": "忘记密码", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 32dbc32..259083d 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -104,6 +104,13 @@ "register": "申請", "userLoginName": "用戶登入名稱", "userPassword": "密碼", + + "loginErrorMessage1":"帳戶將被封鎖", + "loginErrorMessage2":"帳戶連續五次登入錯誤,請與系統管理員聯絡", + "loginErrorMessage3":"帳戶尚未驗證", + "loginErrorMessage4":"系統連接失敗", + "loginErrorMessage5":"用戶名或密碼錯誤", + "newPassword": "新密碼", "setNewPassword": "請輸入新密碼", "forgotUserPassword": "忘記密碼", @@ -112,10 +119,8 @@ "forgotPasswordSubTitle": "請輸入你的用戶登入名稱以重設密碼", "forgotPasswordSubTitle1": "請輸入你的用戶登入名稱", "forgotPasswordSubTitle2": "以重設密碼", - "forgotUsernameSubTitle": "請輸入你的電郵以重設密碼", "forgotUsernameSubTitle1": "請輸入你的電郵", - "resetPasswordSuccess": "已成功重設密碼。", "securityCode": "安全驗證碼", "sentSecurityCode1": "我們已將驗證碼送至你的電郵:",