From 05358bdd604467095b0db4c95db1b1140ccf6889 Mon Sep 17 00:00:00 2001 From: anna Date: Fri, 17 May 2024 14:48:20 +0800 Subject: [PATCH] iAmSmart add success Login page --- src/pages/iAmSmart/AuthCallback/index.js | 2 +- src/pages/iAmSmart/SuccessCallback/index.js | 17 +++++++++++------ src/routes/AfterLoginRoutes.js | 5 ----- src/routes/GLDUserRoutes.js | 2 +- src/routes/PublicUserRoutes.js | 5 +++++ src/translations/en.json | 2 +- src/translations/zh-CN.json | 2 +- src/translations/zh-HK.json | 2 +- 8 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/pages/iAmSmart/AuthCallback/index.js b/src/pages/iAmSmart/AuthCallback/index.js index a6aa410..d1ea104 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('iamsmart/loginSucess', {state:{loginMethod:"iAmSmart"}}); + 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 59840da..6356280 100644 --- a/src/pages/iAmSmart/SuccessCallback/index.js +++ b/src/pages/iAmSmart/SuccessCallback/index.js @@ -6,11 +6,12 @@ import { Button } from '@mui/material'; import * as React from "react"; -import { FormattedMessage } from "react-intl"; +import { FormattedMessage, useIntl } 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'))); +import CheckCircleOutlineIcon from '@mui/icons-material/CheckCircleOutline'; import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' const BackgroundHead = { @@ -26,16 +27,17 @@ const BackgroundHead = { // ==============================|| DASHBOARD - DEFAULT ||============================== // const Index = () => { + const intl = useIntl(); const location = useLocation(); const navigate = useNavigate() const [onReady, setOnReady] = React.useState(false); React.useEffect(() => { - if("iAmSmart"==location.state.loginMethod){ + if ("iAmSmart" == location?.state?.loginMethod) { setOnReady(true); - }else{ + } else { navigate('/dashboard'); - } + } }, []); return ( @@ -60,9 +62,10 @@ const Index = () => {
+ - +
@@ -77,7 +80,9 @@ const Index = () => { variant="contained" size="large" sx={{ m: 4 }} - onClick={() => { navigate("/dashboard"); }} + onClick={() => { + navigate("/dashboard"); + }} > diff --git a/src/routes/AfterLoginRoutes.js b/src/routes/AfterLoginRoutes.js index 9dccfb9..ff949ba 100644 --- a/src/routes/AfterLoginRoutes.js +++ b/src/routes/AfterLoginRoutes.js @@ -5,7 +5,6 @@ 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 ||============================== // @@ -41,10 +40,6 @@ const AfterLoginRoutes = { path: 'iamsmart/loginFail', element: }, - { - path: 'iamsmart/loginSucess', - element: - }, { path: 'verify/:verifyCode/:email', element: diff --git a/src/routes/GLDUserRoutes.js b/src/routes/GLDUserRoutes.js index 725f817..12bc095 100644 --- a/src/routes/GLDUserRoutes.js +++ b/src/routes/GLDUserRoutes.js @@ -46,7 +46,7 @@ const GLDUserRoutes = { path: '/', children: [ { - path: 'dashboard', + path: '/dashboard', element: }, { diff --git a/src/routes/PublicUserRoutes.js b/src/routes/PublicUserRoutes.js index c707e3a..6ea64e0 100644 --- a/src/routes/PublicUserRoutes.js +++ b/src/routes/PublicUserRoutes.js @@ -29,6 +29,7 @@ const OrganizationDetailPage = Loadable(lazy(() => import('pages/Organization/De const Msg_Details = Loadable(lazy(() => import('pages/Message/Details'))); const Msg_Search = Loadable(lazy(() => import('pages/Message/Search'))); const AnnouncementSearch = Loadable(lazy(() => import('pages/Announcement/Search_Public'))); +const IAmSmart_SuccessCallback = Loadable(lazy(() => import('pages/iAmSmart/SuccessCallback'))); // ==============================|| MAIN ROUTING ||============================== // @@ -48,6 +49,10 @@ const PublicDashboard = { path: 'dashboard', element: }, + { + path: 'iamsmart/loginSucess', + element: + }, { path: 'setting/manageUser', element: diff --git a/src/translations/en.json b/src/translations/en.json index 02ce0f7..7bd2638 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -155,7 +155,7 @@ "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\".", + "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", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 99f3b4d..208afc0 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -181,7 +181,7 @@ "loginErrorMessage6":"找不到用户帐户", "loginSuccessMessage1":"成功连结现有帐户", - "loginSuccessMessage2":"你是我们的现有用户，已成功连结现有帐户，以后可以透过「智方便」登入。", + "loginSuccessMessage2":"你是我们的现有用户，已成功连结现有帐户。
以后可以透过「智方便」登入。", "loginSuccessMessage3":"继续使用e-Service", "newPassword": "新密码", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 6941b44..3f9698a 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -182,7 +182,7 @@ "loginErrorMessage6":"找不到用戶帳戶", "loginSuccessMessage1":"成功連結現有帳戶", - "loginSuccessMessage2":"你是我們的現有用戶，已成功連結現有帳戶，以後可以透過「智方便」登入。", + "loginSuccessMessage2":"你是我們的現有用戶，已成功連結現有帳戶。
以後可以透過「智方便」登入。", "loginSuccessMessage3":"繼續使用e-Service", "newPassword": "新密碼",