@@ -306,7 +306,9 @@ function Header(props) { | |||||
<Box sx={{ mr: 2, display: { md: 'none' } }}> | <Box sx={{ mr: 2, display: { md: 'none' } }}> | ||||
<Stack direction="row" justifyContent="flex-start" alignItems="center"> | <Stack direction="row" justifyContent="flex-start" alignItems="center"> | ||||
<MobileLogo /> | <MobileLogo /> | ||||
<span id="mobileTitle" >公共啟事提交及繳費系統</span> | |||||
<span id="mobileTitle" > | |||||
<FormattedMessage id="PNSPS"/> | |||||
</span> | |||||
</Stack> | </Stack> | ||||
</Box> | </Box> | ||||
</Stack> | </Stack> | ||||
@@ -364,7 +366,9 @@ function Header(props) { | |||||
<Stack direction="row" justifyContent="flex-start" alignItems="center"> | <Stack direction="row" justifyContent="flex-start" alignItems="center"> | ||||
<Logo /> | <Logo /> | ||||
<Stack justifyContent="flex-start" alignItems="center"> | <Stack justifyContent="flex-start" alignItems="center"> | ||||
<span id="systemTitle">公共啟事提交及繳費系統</span> | |||||
<span id="systemTitle"> | |||||
<FormattedMessage id="PNSPS"/> | |||||
</span> | |||||
</Stack> | </Stack> | ||||
</Stack> | </Stack> | ||||
</Box> | </Box> | ||||
@@ -382,7 +386,9 @@ function Header(props) { | |||||
<Stack direction="row" justifyContent="space-between" alignItems="center"> | <Stack direction="row" justifyContent="space-between" alignItems="center"> | ||||
<MobileLogo /> | <MobileLogo /> | ||||
<Stack justifyContent="flex-start" alignItems="center"> | <Stack justifyContent="flex-start" alignItems="center"> | ||||
<span id="mobileTitle">公共啟事提交及繳費系統</span> | |||||
<span id="mobileTitle"> | |||||
<FormattedMessage id="PNSPS"/> | |||||
</span> | |||||
</Stack> | </Stack> | ||||
<Stack justifyContent="flex-end" alignItems="center"> | <Stack justifyContent="flex-end" alignItems="center"> | ||||
@@ -15,6 +15,7 @@ const AuthCard = Loadable(lazy(() => import('./AuthCardCustom'))); | |||||
import backbroundImg from 'assets/images/bg_ml.jpg' | import backbroundImg from 'assets/images/bg_ml.jpg' | ||||
import 'assets/style/loginStyles.css' | import 'assets/style/loginStyles.css' | ||||
import { Stack } from '../../../node_modules/@mui/material/index'; | import { Stack } from '../../../node_modules/@mui/material/index'; | ||||
import {FormattedMessage} from "react-intl"; | |||||
const BackgroundHead = { | const BackgroundHead = { | ||||
backgroundImage: `url(${backbroundImg})`, | backgroundImage: `url(${backbroundImg})`, | ||||
width: '100%', | width: '100%', | ||||
@@ -44,8 +45,12 @@ const AuthWrapper = ({ children }) => ( | |||||
alignItems="center" | alignItems="center" | ||||
spacing={2}> | spacing={2}> | ||||
<Grid item xs={12} md={8} lg={8} xl={9} sx={{ ml: 4, mt: 3 ,display: { xs: 'none', sm: 'block' }}}> | <Grid item xs={12} md={8} lg={8} xl={9} sx={{ ml: 4, mt: 3 ,display: { xs: 'none', sm: 'block' }}}> | ||||
<Typography style={{textAlign: "center",fontSize: "1.8rem"}}>香港特別行政區政府</Typography> | |||||
<Typography style={{textAlign: "center",fontSize: "1.8rem",fontWeight:"bold"}}>憲報</Typography> | |||||
<Typography style={{textAlign: "center",fontSize: "1.8rem"}}> | |||||
<FormattedMessage id="HKSARGOV"/> | |||||
</Typography> | |||||
<Typography style={{textAlign: "center",fontSize: "1.8rem"}}> | |||||
<FormattedMessage id="Gazette"/> | |||||
</Typography> | |||||
</Grid> | </Grid> | ||||
<Grid | <Grid | ||||
item | item | ||||
@@ -12,6 +12,7 @@ import { Stack } from '../../../node_modules/@mui/material/index'; | |||||
import { iAmSmartPath, iAmSmartAppPath, clientId, getBowserType, isAppBowser, iAmSmartCallbackPath} from 'auth/utils' | import { iAmSmartPath, iAmSmartAppPath, clientId, getBowserType, isAppBowser, iAmSmartCallbackPath} from 'auth/utils' | ||||
import * as React from 'react'; | import * as React from 'react'; | ||||
import {FormattedMessage} from "react-intl"; | |||||
// ================================|| LOGIN ||================================ // | // ================================|| LOGIN ||================================ // | ||||
@@ -97,7 +98,9 @@ const RegisterCustom = () => { | |||||
你可點擊「智方便」按鈕,系統會自動輸入個人資料,或自行輸入個人資料,以即時啟動憲報刊登公告帳戶。 | 你可點擊「智方便」按鈕,系統會自動輸入個人資料,或自行輸入個人資料,以即時啟動憲報刊登公告帳戶。 | ||||
<br />如欲使用「智方便」提供個人資料,請先下載「智方便」流動應用程式並登記成為「智方便」用戶。 | <br />如欲使用「智方便」提供個人資料,請先下載「智方便」流動應用程式並登記成為「智方便」用戶。 | ||||
</Typography> | </Typography> | ||||
<Link href="https://www.iamsmart.gov.hk/tc/">了解更多</Link> | |||||
<Link href="https://www.iamsmart.gov.hk/tc/"> | |||||
<FormattedMessage id="learnMore"/> | |||||
</Link> | |||||
</Box> | </Box> | ||||
<Typography m={5}>或</Typography> | <Typography m={5}>或</Typography> | ||||
@@ -161,7 +164,9 @@ const RegisterCustom = () => { | |||||
<DialogContent align="right"> | <DialogContent align="right"> | ||||
<Button variant="outlined" onClick={getQRWithIAmSmart} startIcon={<img src={iAmSmartICon} alt="iAM Smart" width="30" />}><Typography variant="h5">使用「智方便」自動填表</Typography></Button> | <Button variant="outlined" onClick={getQRWithIAmSmart} startIcon={<img src={iAmSmartICon} alt="iAM Smart" width="30" />}><Typography variant="h5">使用「智方便」自動填表</Typography></Button> | ||||
<br /> | <br /> | ||||
<Link href="https://www.iamsmart.gov.hk/tc/">了解更多</Link> | |||||
<Link href="https://www.iamsmart.gov.hk/tc/"> | |||||
<FormattedMessage id="learnMore"/> | |||||
</Link> | |||||
</DialogContent> | </DialogContent> | ||||
</Dialog> | </Dialog> | ||||
</Stack> | </Stack> | ||||
@@ -43,12 +43,13 @@ import { useDispatch } from "react-redux"; | |||||
import { handleLogin } from "auth/index"; | import { handleLogin } from "auth/index"; | ||||
import useJwt from "../../../auth/jwt/useJwt"; | import useJwt from "../../../auth/jwt/useJwt"; | ||||
import { handleLogoutFunction } from 'auth/index'; | import { handleLogoutFunction } from 'auth/index'; | ||||
import {FormattedMessage} from "react-intl"; | |||||
import {FormattedMessage, useIntl} from "react-intl"; | |||||
// ============================|| FIREBASE - LOGIN ||============================ // | // ============================|| FIREBASE - LOGIN ||============================ // | ||||
const AuthLoginCustom = () => { | const AuthLoginCustom = () => { | ||||
const dispatch = useDispatch() | const dispatch = useDispatch() | ||||
const navigate = useNavigate() | const navigate = useNavigate() | ||||
const intl = useIntl(); | |||||
const [showPassword, setShowPassword] = useState(false); | const [showPassword, setShowPassword] = useState(false); | ||||
const handleClickShowPassword = () => { | const handleClickShowPassword = () => { | ||||
@@ -304,24 +305,30 @@ const AuthLoginCustom = () => { | |||||
<Stack direction="row" justifyContent="space-between" alignItems="center" spacing={2}> | <Stack direction="row" justifyContent="space-between" alignItems="center" spacing={2}> | ||||
<Link component={RouterLink} to="" color="primary"> | <Link component={RouterLink} to="" color="primary"> | ||||
<Typography align="center" variant="h6"> | <Typography align="center" variant="h6"> | ||||
忘記密碼? | |||||
<FormattedMessage id="forgotUserPassword"/>? | |||||
</Typography> | </Typography> | ||||
</Link> | </Link> | ||||
</Stack> | </Stack> | ||||
</Grid> | </Grid> | ||||
<Grid item xs={12}> | <Grid item xs={12}> | ||||
<Stack direction="row" justifyContent="space-between" alignItems="center" spacing={2}> | <Stack direction="row" justifyContent="space-between" alignItems="center" spacing={2}> | ||||
<Button onClick={() => getQRWithIAmSmart()} color="iAmSmart" fullWidth size="large" variant="outlined" startIcon={<img src={iAmSmartICon} alt="iAM Smart" width="30" />}><Typography variant="h5">智方便登入</Typography></Button> | |||||
<Button onClick={() => getQRWithIAmSmart()} color="iAmSmart" fullWidth size="large" variant="outlined" startIcon={<img src={iAmSmartICon} alt="iAM Smart" width="30" />}><Typography variant="h5"> | |||||
<FormattedMessage id="iAmSmartLogin"/> | |||||
</Typography></Button> | |||||
</Stack> | </Stack> | ||||
</Grid> | </Grid> | ||||
<Grid item xs={12}> | <Grid item xs={12}> | ||||
<Stack direction="row" justifyContent="space-between" alignItems="center" spacing={2}> | <Stack direction="row" justifyContent="space-between" alignItems="center" spacing={2}> | ||||
<Link href="https://www.iamsmart.gov.hk/tc/"><Typography align="center" variant="h6">{"了解更多 >"}</Typography></Link> | |||||
<Link href="https://www.iamsmart.gov.hk/tc/"><Typography align="center" variant="h6"> | |||||
{ intl.formatMessage({id: 'learnMore'})+" >"} | |||||
</Typography></Link> | |||||
</Stack> | </Stack> | ||||
</Grid> | </Grid> | ||||
<Grid item xs={12}> | <Grid item xs={12}> | ||||
<Stack direction="row" justifyContent="space-between" alignItems="center" spacing={2}> | <Stack direction="row" justifyContent="space-between" alignItems="center" spacing={2}> | ||||
<Button fullWidth size="large" variant="outlined" href="/register" ><Typography variant="h5">建立/重新啟動帳戶</Typography></Button> | |||||
<Button fullWidth size="large" variant="outlined" href="/register" ><Typography variant="h5"> | |||||
<FormattedMessage id="createOrReActivate"/> | |||||
</Typography></Button> | |||||
</Stack> | </Stack> | ||||
</Grid> | </Grid> | ||||
</Grid> | </Grid> | ||||
@@ -3,6 +3,10 @@ | |||||
"zh-HK": "繁體中文", | "zh-HK": "繁體中文", | ||||
"zh-CN": "简体中文", | "zh-CN": "简体中文", | ||||
"PNSPS": "PNSPS", | |||||
"HKSARGOV": "HKSAR Government", | |||||
"Gazette": "Gazette", | |||||
"mainPage": "Main Page", | "mainPage": "Main Page", | ||||
"myPublicNotice": "My Public Notice", | "myPublicNotice": "My Public Notice", | ||||
"proofRecord": "Proof Record", | "proofRecord": "Proof Record", | ||||
@@ -11,10 +15,13 @@ | |||||
"companyOrUserRecord": "Company/Institutional User Records", | "companyOrUserRecord": "Company/Institutional User Records", | ||||
"login": "Login", | "login": "Login", | ||||
"iAmSmartLogin": "iAmSmart Login", | |||||
"register": "Register", | "register": "Register", | ||||
"userLoginName": "Username", | "userLoginName": "Username", | ||||
"userPassword": "Password", | "userPassword": "Password", | ||||
"forgotUserPassword": "Forgot Password", | |||||
"learnMore": "Lean More", | |||||
"createOrReActivate": "Create/reactivate account", | |||||
"Dashboard": "Dashboard", | "Dashboard": "Dashboard", | ||||
"event": "Event" | "event": "Event" |
@@ -3,6 +3,10 @@ | |||||
"zh-HK": "繁體中文", | "zh-HK": "繁體中文", | ||||
"zh-CN": "简体中文", | "zh-CN": "简体中文", | ||||
"PNSPS": "公共启事提交及缴费系统", | |||||
"HKSARGOV": "香港特别行政区政府", | |||||
"Gazette": "宪报", | |||||
"mainPage": "主页", | "mainPage": "主页", | ||||
"myPublicNotice": "我的公共启事", | "myPublicNotice": "我的公共启事", | ||||
"proofRecord": "校对记录", | "proofRecord": "校对记录", | ||||
@@ -11,9 +15,13 @@ | |||||
"companyOrUserRecord": "公司/机构用户记录", | "companyOrUserRecord": "公司/机构用户记录", | ||||
"login": "登录", | "login": "登录", | ||||
"iAmSmartLogin": "智方便登录", | |||||
"register": "申请", | "register": "申请", | ||||
"userLoginName": "用户登入名称", | "userLoginName": "用户登入名称", | ||||
"userPassword": "密码", | "userPassword": "密码", | ||||
"forgotUserPassword": "忘记密码", | |||||
"learnMore": "了解更多", | |||||
"createOrReActivate": "建立/重新启动帐户", | |||||
"Dashboard": "仪表板", | "Dashboard": "仪表板", | ||||
"event": "活动" | "event": "活动" |
@@ -3,6 +3,10 @@ | |||||
"zh-HK": "繁體中文", | "zh-HK": "繁體中文", | ||||
"zh-CN": "简体中文", | "zh-CN": "简体中文", | ||||
"PNSPS": "公共啟事提交及繳費系統", | |||||
"HKSARGOV": "香港特別行政區政府", | |||||
"Gazette": "憲報", | |||||
"mainPage": "主頁", | "mainPage": "主頁", | ||||
"myPublicNotice": "我的公共啟事", | "myPublicNotice": "我的公共啟事", | ||||
"proofRecord": "校對記錄", | "proofRecord": "校對記錄", | ||||
@@ -11,9 +15,13 @@ | |||||
"companyOrUserRecord": "公司/機構用戶記錄", | "companyOrUserRecord": "公司/機構用戶記錄", | ||||
"login": "登入", | "login": "登入", | ||||
"iAmSmartLogin": "智方便登入", | |||||
"register": "申請", | "register": "申請", | ||||
"userLoginName": "用戶登入名稱", | "userLoginName": "用戶登入名稱", | ||||
"userPassword": "密碼", | "userPassword": "密碼", | ||||
"forgotUserPassword": "忘記密碼", | |||||
"learnMore": "了解更多", | |||||
"createOrReActivate": "建立/重新啟動帳戶", | |||||
"Dashboard": "儀表板", | "Dashboard": "儀表板", | ||||
"event": "活動" | "event": "活動" |