From a3217e28c3db923618f4b21075d591f5c50efb55 Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 17 Jul 2024 16:57:18 +0800 Subject: [PATCH] update forgot username --- ...wordPage.js => AfterForgotUsernamePage.js} | 61 ++----------------- .../ForgotUsername/ForgotUsernameApplyForm.js | 7 +-- .../authentication/ForgotUsername/index.js | 5 +- src/routes/LoginRoutes.js | 2 +- src/translations/en.json | 4 +- src/translations/zh-CN.json | 5 ++ src/translations/zh-HK.json | 4 +- 7 files changed, 20 insertions(+), 68 deletions(-) rename src/pages/authentication/ForgotUsername/{AfterForgotPasswordPage.js => AfterForgotUsernamePage.js} (55%) diff --git a/src/pages/authentication/ForgotUsername/AfterForgotPasswordPage.js b/src/pages/authentication/ForgotUsername/AfterForgotUsernamePage.js similarity index 55% rename from src/pages/authentication/ForgotUsername/AfterForgotPasswordPage.js rename to src/pages/authentication/ForgotUsername/AfterForgotUsernamePage.js index fbbe889..e4352df 100644 --- a/src/pages/authentication/ForgotUsername/AfterForgotPasswordPage.js +++ b/src/pages/authentication/ForgotUsername/AfterForgotUsernamePage.js @@ -21,7 +21,7 @@ import {FormattedMessage, useIntl} from "react-intl"; // ==============================|| DASHBOARD - DEFAULT ||============================== // -const AfterForgotPasswordPage = () => { +const AfterForgotUsernamePage = () => { const intl = useIntl(); const navigate = useNavigate(); @@ -46,23 +46,11 @@ const AfterForgotPasswordPage = () => {
- +
- {/* - - */} - {/* - 申請公共啟事 - */} { - + - - - - - {/* - - - - - - */} - - - - - - - - + - - - - - - - - - - - - - - - {/* - - - - - - */} @@ -156,4 +105,4 @@ const AfterForgotPasswordPage = () => { }; -export default AfterForgotPasswordPage; +export default AfterForgotUsernamePage; diff --git a/src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js b/src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js index bb90ab7..ae735d3 100644 --- a/src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js +++ b/src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js @@ -70,11 +70,11 @@ const ForgotUsernameApplyForm = () => { // files: [attachment], onSuccess: function () { // notifyActionSuccess(intl.formatMessage({id: 'submissionSuccess'}) + '!') - navigate('/forgot/password/sent'); + navigate('/forgot/username/sent'); // location.reload(); }, onError:function () { - navigate('/forgot/password/sent'); + navigate('/forgot/username/sent'); } }); } @@ -100,9 +100,6 @@ const ForgotUsernameApplyForm = () => { - {/* - 申請公共啟事 - */} { : - + ); }; diff --git a/src/routes/LoginRoutes.js b/src/routes/LoginRoutes.js index 3abfc69..965cac9 100644 --- a/src/routes/LoginRoutes.js +++ b/src/routes/LoginRoutes.js @@ -21,7 +21,7 @@ const ForgotPassword_Callback = Loadable(lazy(() => import('pages/authentication const ForgotPassword_Success = Loadable(lazy(() => import('pages/authentication/ForgotPassword/AuthCallback/ResetPasswordSuccess'))); const ForgotUsername = Loadable(lazy(() => import('pages/authentication/ForgotUsername'))); -const AfterForgotUsernamePage = Loadable(lazy(() => import('pages/authentication/ForgotUsername/AfterForgotPasswordPage'))); +const AfterForgotUsernamePage = Loadable(lazy(() => import('pages/authentication/ForgotUsername/AfterForgotUsernamePage'))); const ForgotUsername_Callback = Loadable(lazy(() => import('pages/authentication/ForgotUsername/AuthCallback'))); const ForgotUsername_Success = Loadable(lazy(() => import('pages/authentication/ForgotUsername/AuthCallback/ResetPasswordSuccess'))); diff --git a/src/translations/en.json b/src/translations/en.json index 610357e..363de1b 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -177,8 +177,10 @@ "forgotPasswordSubTitle1": "Please enter your username to receive", "forgotPasswordSubTitle2": "the code to reset your password", - "forgotUsernameSubTitle": "Please enter your email to receive the code to reset your password", + "forgotUsernameSubTitle": "Please enter your email to receive the userName", "forgotUsernameSubTitle1": "Please enter your email to receive", + "sendUsernameSuccess": "The username has been emailed to you.", + "sendUsernameSuccess2": "Please check your emails.", "resetPasswordSuccess": "Password reset successfully.", "securityCode": "Security Code", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 4e678cb..2136ff2 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -207,11 +207,16 @@ "setNewPassword": "请输入新密码", "forgotUserPassword": "忘记密码", "forgotUsername": "忘记用户登入名称", + "forgotPasswordTitle": "寻找你的帐号", "forgotPasswordSubTitle": "请输入你的用户登入名称以重设密码", "forgotPasswordSubTitle1": "请输入你的用户登入名称收", "forgotPasswordSubTitle2": "以重设密码", + "forgotUsernameSubTitle": "请输入你的电邮地址以寻找用户名称", + "forgotUsernameSubTitle1": "请输入你的电邮地址", "resetPasswordSuccess": "已成功重设密码。", + "sendUsernameSuccess": "我们已将用户名称送至你的电邮地址。", + "sendUsernameSuccess2": "请查看你的电邮信箱。", "securityCode": "安全验证码", "sentSecurityCode1": "我们已将验证码送至你的电邮地址：", "sentSecurityCode2": "请查看你的电邮信箱中是否有包含验证码的信件。", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index a21e789..1534c49 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -213,8 +213,10 @@ "forgotPasswordSubTitle": "請輸入你的用戶登入名稱以重設密碼", "forgotPasswordSubTitle1": "請輸入你的用戶登入名稱", "forgotPasswordSubTitle2": "以重設密碼", - "forgotUsernameSubTitle": "請輸入你的電郵地址以重設密碼", + "forgotUsernameSubTitle": "請輸入你的電郵地址以尋找用戶名稱", "forgotUsernameSubTitle1": "請輸入你的電郵地址", + "sendUsernameSuccess": "我們已將用戶名稱送至你的電郵地址。", + "sendUsernameSuccess2": "請查看你的電郵信箱。", "resetPasswordSuccess": "已成功重設密碼。", "securityCode": "安全驗證碼", "sentSecurityCode1": "我們已將驗證碼送至你的電郵地址：",