diff --git a/src/pages/UserMenu/index.js b/src/pages/extra-pages/UserMenu/index.js similarity index 100% rename from src/pages/UserMenu/index.js rename to src/pages/extra-pages/UserMenu/index.js diff --git a/src/pages/extra-pages/UserMenuPub/index.js b/src/pages/extra-pages/UserMenuPub/index.js new file mode 100644 index 0000000..bdf9921 --- /dev/null +++ b/src/pages/extra-pages/UserMenuPub/index.js @@ -0,0 +1,173 @@ +import { Grid, Typography, Stack, } from '@mui/material'; +import { useState, useEffect, lazy } from "react"; + +import Loadable from 'components/Loadable'; +import { useIntl, FormattedMessage } from "react-intl"; + +import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' +const BackgroundHead = { + backgroundImage: `url(${titleBackgroundImg})`, + width: '100%', + height: '100%', + backgroundSize: 'contain', + backgroundRepeat: 'no-repeat', + backgroundColor: '#0C489E', + backgroundPosition: 'right' +} + +const LoadingComponent = Loadable(lazy(() => import('pages/extra-pages/LoadingComponent'))); + +import DownloadIcon from '@mui/icons-material/Download'; + +const UserMenu = () => { + const intl = useIntl(); + const { locale } = intl; + const [onReady, setOnReady] = useState(false); + + useEffect(() => { + setOnReady(true); + }, [locale]); + + const tableStyle = { + fontFamily: "arial, sans-serif", + borderCollapse: "collapse", + width: "100%", + } + + const cellStyle = { + border: "1px solid #dddddd", + textAlign: "left", + padding: "8px" + }; + + const getRow = ({ title, en, zh, cn }) => { + return <> + + {title} + + + + + + ; + } + + + return ( + !onReady ? + + + + + + : + ( + + +
+ + + + + +
+ + +
+ +

+ + + + + + + + + + {getRow({ + title: , + en: "https://pnsps.gld.gov.hk/user-guide/eng/01 - Account Activation.pdf", + zh: "https://pnsps.gld.gov.hk/user-guide/cht/01c - Account Activation.pdf", + cn: "https://pnsps.gld.gov.hk/user-guide/chs/01sc - Account Activation.pdf" + })} + + {getRow({ + title: , + en: "https://pnsps.gld.gov.hk/user-guide/eng/02 - Login.pdf", + zh: "https://pnsps.gld.gov.hk/user-guide/cht/02c - Login.pdf", + cn: "https://pnsps.gld.gov.hk/user-guide/chs/02sc - Login.pdf" + })} + + {getRow({ + title: , + en: "https://pnsps.gld.gov.hk/user-guide/eng/03 - Application for publishing a Public Notice in the Gazette.pdf", + zh: "https://pnsps.gld.gov.hk/user-guide/cht/03c - Application for publishing a Public Notice in the Gazette.pdf", + cn: "https://pnsps.gld.gov.hk/user-guide/chs/03sc - Application for publishing a Public Notice in the Gazette.pdf" + })} + + {getRow({ + title: , + en: "https://pnsps.gld.gov.hk/user-guide/eng/04 - Proofreading reply (with correction).pdf", + zh: "https://pnsps.gld.gov.hk/user-guide/cht/04c - Proofreading reply (with correction).pdf", + cn: "https://pnsps.gld.gov.hk/user-guide/chs/04sc - Proofreading reply (with correction).pdf" + })} + + {getRow({ + title: , + en: "https://pnsps.gld.gov.hk/user-guide/eng/05 - Proofreading reply (pass for printing).pdf", + zh: "https://pnsps.gld.gov.hk/user-guide/cht/05c - Proofreading reply (pass for printing).pdf", + cn: "https://pnsps.gld.gov.hk/user-guide/chs/05sc - Proofreading reply (pass for printing).pdf" + })} + + {getRow({ + title: , + en: "https://pnsps.gld.gov.hk/user-guide/eng/06 - Cancellation of application for publishing a Public Notice in the Gazette.pdf", + zh: "https://pnsps.gld.gov.hk/user-guide/cht/06c - Cancellation of application for publishing a Public Notice in the Gazette.pdf", + cn: "https://pnsps.gld.gov.hk/user-guide/chs/06sc - Cancellation of application for publishing a Public Notice in the Gazette.pdf" + })} + + {getRow({ + title: , + en: "https://pnsps.gld.gov.hk/user-guide/eng/07 - Forgot password.pdf", + zh: "https://pnsps.gld.gov.hk/user-guide/cht/07c - Forgot password.pdf", + cn: "https://pnsps.gld.gov.hk/user-guide/chs/07sc - Forgot password.pdf" + })} + + {getRow({ + title: , + en: "https://pnsps.gld.gov.hk/user-guide/eng/08 - Change password.pdf", + zh: "https://pnsps.gld.gov.hk/user-guide/cht/08c - Change password.pdf", + cn: "https://pnsps.gld.gov.hk/user-guide/chs/08sc - Change password.pdf" + })} + + {getRow({ + title: , + en: "https://pnsps.gld.gov.hk/user-guide/eng/09 - Language of email notification.pdf", + zh: "https://pnsps.gld.gov.hk/user-guide/cht/09c - Language of email notification.pdf", + cn: "https://pnsps.gld.gov.hk/user-guide/chs/09sc - Language of email notification.pdf" + })} + + {getRow({ + title: , + en: "https://pnsps.gld.gov.hk/user-guide/eng/10 - Download General Demand Note for making payment(s).pdf", + zh: "https://pnsps.gld.gov.hk/user-guide/cht/10c - Download General Demand Note for making payment(s).pdf", + cn: "https://pnsps.gld.gov.hk/user-guide/chs/10sc - Download General Demand Note for making payment(s).pdf" + })} + + +
English繁體中文简体中文
+

+
+ + + ) + ); + +} + +export default UserMenu; \ No newline at end of file diff --git a/src/pages/iAmSmart/RegistryCallback/index.js b/src/pages/iAmSmart/RegistryCallback/index.js index 0fbecd5..6d9f279 100644 --- a/src/pages/iAmSmart/RegistryCallback/index.js +++ b/src/pages/iAmSmart/RegistryCallback/index.js @@ -39,7 +39,7 @@ const Index = () => { onError:(error)=>{ console.log(error); if(error?.response?.data?.exception == "msg: account created"){ - window.location.assign("/iamsmart/pleaseLogin", { state: {registryMethod:"iAmSmart"}} ); + navigate("/iamsmart/pleaseLogin", { state: {registryMethod:"iAmSmart"}} ); }else{ window.location.assign("/register"); } diff --git a/src/routes/LoginRoutes.js b/src/routes/LoginRoutes.js index 31b37c1..7aef77c 100644 --- a/src/routes/LoginRoutes.js +++ b/src/routes/LoginRoutes.js @@ -15,7 +15,9 @@ const ErrorPage = Loadable(lazy(() => import('pages/extra-pages/ErrorPage'))); const PrivacyPolicyPage = Loadable(lazy(() => import('pages/extra-pages/PrivacyPolicy'))); const ImportantNoticePage = Loadable(lazy(() => import('pages/extra-pages/ImportantNotice'))); const AboutUsPage = Loadable(lazy(() => import('pages/AboutUs'))); -const UserMenuPage = Loadable(lazy(() => import('pages/UserMenu'))); +const UserMenuPage = Loadable(lazy(() => import('pages/extra-pages/UserMenu'))); +const UserMenuPubPage = Loadable(lazy(() => import('pages/extra-pages/UserMenuPub'))); + const ForgotPassword = Loadable(lazy(() => import('pages/authentication/ForgotPassword'))); const AfterForgotPasswordPage = Loadable(lazy(() => import('pages/authentication/ForgotPassword/AfterForgotPasswordPage'))); @@ -87,6 +89,10 @@ const LoginRoutes = { path: 'userGuide', element: }, + { + path: 'userGuidePub', + element: + }, { path: 'iamsmart/logincallback', element: