diff --git a/src/components/I18nProvider.js b/src/components/I18nProvider.js index fdcd9f0..3ba2cbd 100644 --- a/src/components/I18nProvider.js +++ b/src/components/I18nProvider.js @@ -1,8 +1,8 @@ -import { useState, useEffect, createContext } from 'react'; +import { useState, useEffect, createContext, useMemo } from 'react'; import { IntlProvider } from 'react-intl'; -import enMessages from '../translations/en.json'; -import cnMessages from '../translations/zh-CN.json'; -import hkMessages from '../translations/zh-HK.json'; +import enBase from '../translations/en.json'; +import cnBase from '../translations/zh-CN.json'; +import hkBase from '../translations/zh-HK.json'; import { GET_COMBO, GET_CONTENT } from "utils/ApiPathConst"; import { get } from "utils/HttpUtils"; @@ -10,72 +10,106 @@ import { get } from "utils/HttpUtils"; const LocaleContext = createContext(); export const I18nProvider = ({ children }) => { - const systemMessages = { - "en": enMessages, - "zh": hkMessages, - "zh-HK": hkMessages, - "zh-CN": cnMessages - }; + const [locale, setLocale] = useState('en'); + + // keep base messages immutable + const [systemMessages, setSystemMessages] = useState({ + en: { ...enBase }, + zh: { ...hkBase }, + 'zh-HK': { ...hkBase }, + 'zh-CN': { ...cnBase } + }); + + const [loaded, setLoaded] = useState(false); + useEffect(() => { + const saved = localStorage.getItem('locale'); + if (!saved) localStorage.setItem('locale', 'en'); + else setLocale(saved); + }, []); - const [locale, setLocale] = useState('en'); // Default locale, you can change this as per your requirement - const [messages, setMessages] = useState(systemMessages[locale]); + useEffect(() => { + let alive = true; const loadTermsAndConditions = () => { + // load both endpoints then merge into state + const p1 = new Promise((resolve) => { get({ - url: GET_CONTENT, - onSuccess: (responseData) => { - for (const key in responseData) { - const value = responseData[key]; - enMessages[key] = value.en??""; - cnMessages[key] = value.cn??""; - hkMessages[key] = value.zh??""; - } - } + url: GET_CONTENT, + onSuccess: (resp) => resolve(resp || {}), + onError: () => resolve({}) }); + }); - + const p2 = new Promise((resolve) => { get({ - url: GET_COMBO, - onSuccess: (responseData) => { - for (let i = 0; i < responseData.length; i++) { - let item = responseData[i]; - enMessages[item.key] = item.en; - cnMessages[item.key] = item.cn; - hkMessages[item.key] = item.zh; - } - - } + url: GET_COMBO, + onSuccess: (resp) => resolve(resp || []), + onError: () => resolve([]) }); - } - - useEffect(() => { - loadTermsAndConditions(); - if (localStorage.getItem('locale') === null) { - //no locale case - localStorage.setItem('locale', 'en'); - } - else { - setLocale(localStorage.getItem('locale')); - } - }, []); - - useEffect(() => { - // Load the messages for the selected locale - const fetchMessages = async () => { - setMessages(systemMessages[locale]); - }; - - fetchMessages(); - }, [locale]); - - return ( - - - {children} - - - ); -} + }); + + Promise.all([p1, p2]).then(([contentMap, comboList]) => { + if (!alive) return; + + setSystemMessages((prev) => { + // clone prev first (immutably) + const next = { + ...prev, + en: { ...prev.en }, + 'zh-CN': { ...prev['zh-CN'] }, + 'zh-HK': { ...prev['zh-HK'] }, + zh: { ...prev.zh } + }; + + // merge GET_CONTENT (object) + for (const key in contentMap) { + const v = contentMap[key] || {}; + next.en[key] = v.en ?? ""; + next['zh-CN'][key] = v.cn ?? ""; + next['zh-HK'][key] = v.zh ?? ""; + next.zh[key] = v.zh ?? ""; + } + + // merge GET_COMBO (array) + for (const item of comboList) { + if (!item?.key) continue; + next.en[item.key] = item.en ?? ""; + next['zh-CN'][item.key] = item.cn ?? ""; + next['zh-HK'][item.key] = item.zh ?? ""; + next.zh[item.key] = item.zh ?? ""; + } + + return next; + }); + + setLoaded(true); + }); + }; + + loadTermsAndConditions(); + + return () => { + alive = false; + }; + }, []); + + const messages = useMemo(() => { + return systemMessages[locale] || systemMessages.en; + }, [systemMessages, locale]); + + return ( + + + {loaded ? children :
} + + + ); +}; export default LocaleContext; \ No newline at end of file diff --git a/src/layout/MainLayout/Header/HeaderContent/LocaleSelector.js b/src/layout/MainLayout/Header/HeaderContent/LocaleSelector.js index a955469..ad676aa 100644 --- a/src/layout/MainLayout/Header/HeaderContent/LocaleSelector.js +++ b/src/layout/MainLayout/Header/HeaderContent/LocaleSelector.js @@ -96,8 +96,9 @@ const LocaleSelector = () => { { - setLocale("en") + setLocale("en"); localStorage.setItem('locale','en'); + setOpen(false); }} > { { - setLocale("zh-HK") + setLocale("zh-HK"); localStorage.setItem('locale','zh-HK'); + setOpen(false); }} > { { - setLocale("zh-CN") + setLocale("zh-CN"); localStorage.setItem('locale','zh-CN'); + setOpen(false); }} > import('pages/extra-pages/LoadingCo import DownloadIcon from '@mui/icons-material/Download'; -const UserMenu = () => { +const UserMenuPub = () => { const intl = useIntl(); const { locale } = intl; const [onReady, setOnReady] = useState(false); @@ -204,4 +204,4 @@ const UserMenu = () => { } -export default UserMenu; \ No newline at end of file +export default UserMenuPub; \ No newline at end of file diff --git a/src/pages/extra-pages/UserMenuPub1/index.js b/src/pages/extra-pages/UserMenuPub1/index.js new file mode 100644 index 0000000..9acb04b --- /dev/null +++ b/src/pages/extra-pages/UserMenuPub1/index.js @@ -0,0 +1,215 @@ +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: 'auto', + height: 'auto', + 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 UserMenuPub1 = () => { + 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, orgEn, orgZh, orgCn, indEn, indZh, indCn }) => { + + return <> + + {title} + + + + + ; + } + + const pnspsurl = "https://"+window.location.hostname; + + + return ( + !onReady ? + + + + + + : + ( + + +
+ + + + + +
+ + + +
+

+ +

+

+ + + + + + + + + {getRow({ + title: , + orgEn: pnspsurl + "/user-guide-pub-1/eng/01 - Create account - c 1.pdf", + orgZh: pnspsurl + "/user-guide-pub-1/cht/01c - Create account - c 1.pdf", + orgCn: pnspsurl + "/user-guide-pub-1/chs/01sc - Create account - c 1.pdf", + indEn: pnspsurl + "/user-guide-pub-1/eng/01 - Create account - p 1.pdf", + indZh: pnspsurl + "/user-guide-pub-1/cht/01c - Create account - p 1.pdf", + indCn: pnspsurl + "/user-guide-pub-1/chs/01sc - Create account - p 1.pdf" + })} + + {getRow({ + title: , + orgEn: pnspsurl + "/user-guide-pub-1/eng/02 - Login - c 1.pdf", + orgZh: pnspsurl + "/user-guide-pub-1/cht/02c - Login - c 1.pdf", + orgCn: pnspsurl + "/user-guide-pub-1/chs/02sc - Login - c 1.pdf", + indEn: pnspsurl + "/user-guide-pub-1/eng/02 - Login - p 1.pdf", + indZh: pnspsurl + "/user-guide-pub-1/cht/02c - Login - p 1.pdf", + indCn: pnspsurl + "/user-guide-pub-1/chs/02sc - Login - p 1.pdf" + })} + + {/* UPDATED TO v2 */} + {getRow({ + title: , + orgEn: pnspsurl + "/user-guide-pub-1/eng/03 - Application for publishing a Public Notice in the Gazette - c 2.pdf", + orgZh: pnspsurl + "/user-guide-pub-1/cht/03c - Application for publishing a Public Notice in the Gazette - c 2.pdf", + orgCn: pnspsurl + "/user-guide-pub-1/chs/03sc - Application for publishing a Public Notice in the Gazette - c 2.pdf", + indEn: pnspsurl + "/user-guide-pub-1/eng/03 - Application for publishing a Public Notice in the Gazette - p 2.pdf", + indZh: pnspsurl + "/user-guide-pub-1/cht/03c - Application for publishing a Public Notice in the Gazette - p 2.pdf", + indCn: pnspsurl + "/user-guide-pub-1/chs/03sc - Application for publishing a Public Notice in the Gazette - p 2.pdf" + })} + + {getRow({ + title: , + orgEn: pnspsurl + "/user-guide-pub-1/eng/04 - Proofreading reply (with correction) - c 2.pdf", + orgZh: pnspsurl + "/user-guide-pub-1/cht/04c - Proofreading reply (with correction) - c 2.pdf", + orgCn: pnspsurl + "/user-guide-pub-1/chs/04sc - Proofreading reply (with correction) - c 2.pdf", + indEn: pnspsurl + "/user-guide-pub-1/eng/04 - Proofreading reply (with correction) - p 2.pdf", + indZh: pnspsurl + "/user-guide-pub-1/cht/04c - Proofreading reply (with correction) - p 2.pdf", + indCn: pnspsurl + "/user-guide-pub-1/chs/04sc - Proofreading reply (with correction) - p 2.pdf" + })} + + {getRow({ + title: , + orgEn: pnspsurl + "/user-guide-pub-1/eng/05 - Proofreading reply (pass for printing) - c 2.pdf", + orgZh: pnspsurl + "/user-guide-pub-1/cht/05c - Proofreading reply (pass for printing) - c 2.pdf", + orgCn: pnspsurl + "/user-guide-pub-1/chs/05sc - Proofreading reply (pass for printing) - c 2.pdf", + indEn: pnspsurl + "/user-guide-pub-1/eng/05 - Proofreading reply (pass for printing) - p 2.pdf", + indZh: pnspsurl + "/user-guide-pub-1/cht/05c - Proofreading reply (pass for printing) - p 2.pdf", + indCn: pnspsurl + "/user-guide-pub-1/chs/05sc - Proofreading reply (pass for printing) - p 2.pdf" + })} + + {getRow({ + title: , + orgEn: pnspsurl + "/user-guide-pub-1/eng/06 - Cancellation of application for publishing a Public Notice in the Gazette - c 1.pdf", + orgZh: pnspsurl + "/user-guide-pub-1/cht/06c - Cancellation of application for publishing a Public Notice in the Gazette - c 1.pdf", + orgCn: pnspsurl + "/user-guide-pub-1/chs/06sc - Cancellation of application for publishing a Public Notice in the Gazette - c 1.pdf", + indEn: pnspsurl + "/user-guide-pub-1/eng/06 - Cancellation of application for publishing a Public Notice in the Gazette - p 1.pdf", + indZh: pnspsurl + "/user-guide-pub-1/cht/06c - Cancellation of application for publishing a Public Notice in the Gazette - p 1.pdf", + indCn: pnspsurl + "/user-guide-pub-1/chs/06sc - Cancellation of application for publishing a Public Notice in the Gazette - p 1.pdf" + })} + + {getRow({ + title: , + orgEn: pnspsurl + "/user-guide-pub-1/eng/07 - Forgot password - c 1.pdf", + orgZh: pnspsurl + "/user-guide-pub-1/cht/07c - Forgot password - c 1.pdf", + orgCn: pnspsurl + "/user-guide-pub-1/chs/07sc - Forgot password - c 1.pdf", + indEn: pnspsurl + "/user-guide-pub-1/eng/07 - Forgot password - p 1.pdf", + indZh: pnspsurl + "/user-guide-pub-1/cht/07c - Forgot password - p 1.pdf", + indCn: pnspsurl + "/user-guide-pub-1/chs/07sc - Forgot password - p 1.pdf" + })} + + {getRow({ + title: , + orgEn: pnspsurl + "/user-guide-pub-1/eng/08 - Change password - c 1.pdf", + orgZh: pnspsurl + "/user-guide-pub-1/cht/08c - Change password - c 1.pdf", + orgCn: pnspsurl + "/user-guide-pub-1/chs/08sc - Change password - c 1.pdf", + indEn: pnspsurl + "/user-guide-pub-1/eng/08 - Change password - p 1.pdf", + indZh: pnspsurl + "/user-guide-pub-1/cht/08c - Change password - p 1.pdf", + indCn: pnspsurl + "/user-guide-pub-1/chs/08sc - Change password - p 1.pdf" + })} + + {getRow({ + title: , + orgEn: pnspsurl + "/user-guide-pub-1/eng/09 - Language of email notification - c 1.pdf", + orgZh: pnspsurl + "/user-guide-pub-1/cht/09c - Language of email notification - c 1.pdf", + orgCn: pnspsurl + "/user-guide-pub-1/chs/09sc - Language of email notification - c 1.pdf", + indEn: pnspsurl + "/user-guide-pub-1/eng/09 - Language of email notification - p 1.pdf", + indZh: pnspsurl + "/user-guide-pub-1/cht/09c - Language of email notification - p 1.pdf", + indCn: pnspsurl + "/user-guide-pub-1/chs/09sc - Language of email notification - p 1.pdf" + })} + + {getRow({ + title: , + orgEn: pnspsurl + "/user-guide-pub-1/eng/10-Payment-c1.pdf", + orgZh: pnspsurl + "/user-guide-pub-1/cht/10c-Payment-c1.pdf", + orgCn: pnspsurl + "/user-guide-pub-1/chs/10sc-Payment-c1.pdf", + indEn: pnspsurl + "/user-guide-pub-1/eng/10-Payment-p1.pdf", + indZh: pnspsurl + "/user-guide-pub-1/cht/10c-Payment-p1.pdf", + indCn: pnspsurl + "/user-guide-pub-1/chs/10sc-Payment-p1.pdf" + })} + + +
+ +

+
+ + + + ) + ); + +} + +export default UserMenuPub1; \ No newline at end of file diff --git a/src/routes/LoginRoutes.js b/src/routes/LoginRoutes.js index 790a421..7dd50fa 100644 --- a/src/routes/LoginRoutes.js +++ b/src/routes/LoginRoutes.js @@ -17,6 +17,7 @@ const ImportantNoticePage = Loadable(lazy(() => import('pages/extra-pages/Import const AboutUsPage = Loadable(lazy(() => import('pages/extra-pages/AboutUs'))); const UserMenuPage = Loadable(lazy(() => import('pages/extra-pages/UserMenu'))); const UserMenuPubPage = Loadable(lazy(() => import('pages/extra-pages/UserMenuPub'))); +const UserMenuPub1Page = Loadable(lazy(() => import('pages/extra-pages/UserMenuPub1'))); const DatabaseHealthCheckPage = Loadable(lazy(() => import('pages/extra-pages/DatabaseHealthCheck'))); @@ -92,6 +93,14 @@ const LoginRoutes = { path: 'userGuidePub', element: }, + { + path: 'userGuidePub1', + element: + }, + { + path: 'userguide-fi', + element: + }, { path: 'databaseHealthCheck', element: diff --git a/src/translations/en.json b/src/translations/en.json index fa2b0cf..7a57e8d 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -13,6 +13,7 @@ "PNSPS_fullname": "Public Notice Submission and Payment System", "HKSARGOV": "The Government of the Hong Kong Special Administrative Region", "homePageHeaderMessage": "

The Gazette Public Notice Submission and Payment System (PNSPS) has been smoothly rolled out in August 2024 and will be fully implemented on 28 January 2026. Starting from 28 January 2026, applications for publication of public notice in the Government Gazette and payment of gazette fee must be made online via the PNSPS. FPS (轉數快), PPS (繳費靈) and credit card are available in the PNSPS for payment of gazette fee. Applications made by other means will be returned to the applicant for re-submission via the PNSPS.

We would like to invite all applicants for publishing public notices in the Gazette to get well prepared for the change early, register as PNSPS user now and submit online applications to experience the benefits of the new online platform.

If you have any enquiries on the set-up of the above online payment methods, please contact your bank (for FPS and credit card) or the PPS (PPS hotline: 2311 9876).

", + "userGuideMessage": "The Gazette Public Notice Submission and Payment System (PNSPS)) will be fully implemented on 28 January 2026 and all applications and payment for publishing public notices on the Government Gazette must be made online via the PNSPS from 28 January 2026 onwards. FPS (轉數快), PPS (繳費靈) and credit card are available in the PNSPS for payment of gazette fee. Applications made by other means will be returned to the applicant for re-submission via the PNSPS. If you have any enquiries on the set-up of the above online payment methods, please contact your bank (for FPS and credit card) or the PPS (PPS hotline: 2311 9876).

Please download the new PNSPS User Guide effective from 28 January 2026 for your reference.", "HKGLD": "Government Logistics Department", "importantNotice": "Important Notice", "privacyPolicy": "Privacy Policy", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 9183897..c3f2e7e 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -13,6 +13,7 @@ "PNSPS_fullname": "公共启事提交及缴费系统", "HKSARGOV": "香港特别行政区政府", "homePageHeaderMessage": "

「宪报公共启事提交及缴费系统」已于2024年8月顺利启用，并将于2026年1月28日全面推行。由2026年1月28日开始，所有申请人必须使用网上「宪报公共启事提交及缴费系统」提交公共启事申请及缴交相关费用，申请人可以选择转数快（FPS）、 缴费灵（PPS）和信用卡缴交费用。以其他方式提交的申请将退回给申请人，重新透过系统提交。

现诚邀所有刊登宪报公共启事申请人及早为新安排做好准备，立即登记成为系统用户，使用系统提交申请，以体验新平台的便捷。

如果你对上述网上付款方式的设定有任何查询，请联络你的银行（转数快及信用卡）或缴费灵（缴费灵热线：2311 9876）。

", + "userGuideMessage": "「宪报公共启事提交及缴费系统」（系统）将于2026年1月28日全面推行。由2026年1月28日开始，所有申请人必须使用系统提交公共启事申请及缴交相关费用。申请人可以选择转数快（FPS）、缴费灵（PPS）和信用卡缴交费用。以其他方式提交的申请将退回给申请人，重新透过系统提交。如果你对上述网上付款方式的设定有任何查询，请联络你的银行（转数快及信用卡）或缴费灵（缴费灵热线：2311 9876）。

请你下载由2026年1月28日起生效的新系统使用者指南作参考。 ", "HKGLD": "政府物流服务署", "importantNotice": "重要告示", "privacyPolicy": "私隐政策", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 8e5cc71..f60e993 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -13,6 +13,7 @@ "PNSPS_fullname": "公共啟事提交及繳費系統", "HKSARGOV": "香港特別行政區政府", "homePageHeaderMessage": "

「憲報公共啟事提交及繳費系統」已於2024年8月順利啟用，並將於2026年1月28日全面推行。由2026年1月28日開始，所有申請人必須使用網上「憲報公共啟事提交及繳費系統」提交公共啟事申請及繳交相關費用，申請人可以選擇轉數快（FPS）、 繳費靈（PPS）和信用卡繳交費用。以其他方式提交的申請將退回給申請人，重新透過系統提交。

現誠邀所有刊登憲報公共啟事申請人及早為新安排做好準備，立即登記成為系統用戶，使用系統提交申請，以體驗新平台的便捷。

如果你對上述網上付款方式的設定有任何查詢，請聯絡你的銀行（轉數快及信用卡）或繳費靈（繳費靈熱線：2311 9876）。

", + "userGuideMessage": "「憲報公共啟事提交及繳費系統」（系統）將於2026年1月28日全面推行。由2026年1月28日開始，所有申請人必須使用系統提交公共啟事申請及繳交相關費用。申請人可以選擇轉數快（FPS）、繳費靈（PPS）和信用卡繳交費用。以其他方式提交的申請將退回給申請人，重新透過系統提交。如果你對上述網上付款方式的設定有任何查詢，請聯絡你的銀行（轉數快及信用卡）或繳費靈（繳費靈熱線：2311 9876）。

請你下載由2026年1月28日起生效的新系統使用者指南作參考。", "HKGLD": "政府物流服務署", "importantNotice": "重要告示", "privacyPolicy": "私隱政策",