From 59c9df7168272f8c0e65911ea2d7cd29831ad49f Mon Sep 17 00:00:00 2001 From: anna Date: Fri, 17 May 2024 14:03:17 +0800 Subject: [PATCH] iAmSmart Success callback --- src/pages/iAmSmart/AuthCallback/index.js | 2 +- src/pages/iAmSmart/SuccessCallback/index.js | 39 ++++++++++++++++----- src/routes/AfterLoginRoutes.js | 3 +- src/routes/LoginRoutes.js | 5 --- src/translations/en.json | 6 +++- src/translations/zh-CN.json | 8 +++-- src/translations/zh-HK.json | 6 +++- 7 files changed, 50 insertions(+), 19 deletions(-) diff --git a/src/pages/iAmSmart/AuthCallback/index.js b/src/pages/iAmSmart/AuthCallback/index.js index ac6c156..a6aa410 100644 --- a/src/pages/iAmSmart/AuthCallback/index.js +++ b/src/pages/iAmSmart/AuthCallback/index.js @@ -67,7 +67,7 @@ const Index = () => { // } // } dispatch(handleLogin(data)) - navigate('/dashboard'); + navigate('iamsmart/loginSucess', {state:{loginMethod:"iAmSmart"}}); }, onFail: (response)=>{ console.log("onFail"); diff --git a/src/pages/iAmSmart/SuccessCallback/index.js b/src/pages/iAmSmart/SuccessCallback/index.js index 07bbb7c..59840da 100644 --- a/src/pages/iAmSmart/SuccessCallback/index.js +++ b/src/pages/iAmSmart/SuccessCallback/index.js @@ -3,9 +3,12 @@ import { Grid, Typography, Stack, + Button } from '@mui/material'; import * as React from "react"; - +import { FormattedMessage } from "react-intl"; +import { useLocation } from "react-router-dom"; +import { useNavigate } from "react-router-dom"; import Loadable from 'components/Loadable'; const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent'))); @@ -23,11 +26,16 @@ const BackgroundHead = { // ==============================|| DASHBOARD - DEFAULT ||============================== // const Index = () => { - + const location = useLocation(); + const navigate = useNavigate() const [onReady, setOnReady] = React.useState(false); React.useEffect(() => { - setOnReady(true); + if("iAmSmart"==location.state.loginMethod){ + setOnReady(true); + }else{ + navigate('/dashboard'); + } }, []); return ( @@ -42,7 +50,9 @@ const Index = () => {
- iAM Smart 成功登入 + + +
@@ -51,18 +61,31 @@ const Index = () => {
- - iAM Smart 成功登入 + -
{/*row 2*/} + + +
+ +
+ + - + ); }; diff --git a/src/routes/AfterLoginRoutes.js b/src/routes/AfterLoginRoutes.js index 3623bcb..9dccfb9 100644 --- a/src/routes/AfterLoginRoutes.js +++ b/src/routes/AfterLoginRoutes.js @@ -5,6 +5,7 @@ import Loadable from 'components/Loadable'; import { Navigate } from "react-router"; const MainLayout = Loadable(lazy(() => import('layout/MainLayout'))); +const IAmSmart_SuccessCallback = Loadable(lazy(() => import('pages/iAmSmart/SuccessCallback'))); // ==============================|| MAIN ROUTING ||============================== // @@ -42,7 +43,7 @@ const AfterLoginRoutes = { }, { path: 'iamsmart/loginSucess', - element: + element: }, { path: 'verify/:verifyCode/:email', diff --git a/src/routes/LoginRoutes.js b/src/routes/LoginRoutes.js index cd36718..dd0467a 100644 --- a/src/routes/LoginRoutes.js +++ b/src/routes/LoginRoutes.js @@ -27,7 +27,6 @@ const IAmSmart_DirectLoginCallback = Loadable(lazy(() => import('pages/iAmSmart/ //const IAmSmart_FallCallback = Loadable(lazy(() => import('pages/iAmSmart/FallCallback'))); const IAmSmart_FailCallback = Loadable(lazy(() => import('pages/iAmSmart/FailCallback'))); const FailCallback_VerifyMail = Loadable(lazy(() => import('pages/iAmSmart/FailCallback_VerifyMail'))); -const IAmSmart_SuccessCallback = Loadable(lazy(() => import('pages/iAmSmart/SuccessCallback'))); const IAmSmart_AuthCallback = Loadable(lazy(() => import('pages/iAmSmart/AuthCallback'))); const IAmSmart_RegistryCallback = Loadable(lazy(() => import('pages/iAmSmart/RegistryCallback'))); @@ -90,10 +89,6 @@ const LoginRoutes = { path: 'iamsmart/loginFail', element: }, - { - path: 'iamsmart/loginSucess', - element: - }, { path: 'verify/:verifyCode/:email', element: diff --git a/src/translations/en.json b/src/translations/en.json index cce2bea..bf49a35 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -152,7 +152,11 @@ "loginErrorMessage3":"Account has not been Verified", "loginErrorMessage4":"System Connection Failed", "loginErrorMessage5":"Incorrect Username or Password", - "loginErrorMessage6":"Login fail, please try again", + "loginErrorMessage6":"User account not found", + + "loginSuccessMessage1":"User account not found", + "loginSuccessMessage2":"You are our existing user and successfully linked your existing account. From now on, you can log in through \"iAm Smart\".", + "loginSuccessMessage3":"Continue to use e-Service", "newPassword": "New Password", "setNewPassword": "Please enter new password", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 27620a7..8fa733b 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -178,7 +178,11 @@ "loginErrorMessage3":"帐户尚未验证", "loginErrorMessage4":"系统连接失败", "loginErrorMessage5":"用户名或密码错误", - "loginErrorMessage6":"登入失败，请重试", + "loginErrorMessage6":"找不到用户帐户", + + "loginSuccessMessage1":"成功连结现有帐户", + "loginSuccessMessage2":"你是我们的现有用户，已成功连结现有帐户，以后可以透过「智方便」登入。", + "loginSuccessMessage3":"继续使用e-Service", "newPassword": "新密码", "setNewPassword": "请输入新密码", @@ -197,7 +201,7 @@ "requireSecurityCode": "请输入安全验证码", "learnMore": "了解更多", "createOrReActivate": "建立帐户", - "usernameTaken": "此用户登入名称已被注册，请使用其他用户登入名称", + "usernameTaken": "此用户登入名称已被注册，请使用其他用户登入名称。", "userRegistered": "此用户已注册，请返回登入页面并进行登入流程。", "user": "用戶", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 55510f1..e1da7da 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -179,7 +179,11 @@ "loginErrorMessage3":"帳戶尚未驗證", "loginErrorMessage4":"系統連接失敗", "loginErrorMessage5":"用戶名或密碼錯誤", - "loginErrorMessage6":"登入失敗，請重試", + "loginErrorMessage6":"找不到用戶帳戶", + + "loginSuccessMessage1":"成功連結現有帳戶", + "loginSuccessMessage2":"你是我們的現有用戶，已成功連結現有帳戶，以後可以透過「智方便」登入。", + "loginSuccessMessage3":"繼續使用e-Service", "newPassword": "新密碼", "setNewPassword": "請輸入新密碼",