CR020 - remove importantNotice and landingMessage and privacyPolicy to settings

src/pages/authentication/AuthWrapper.js

@@ -216,7 +216,7 @@ const AuthWrapper = ({ children }) => {
                       style={{ padding: 12 }}
                       dangerouslySetInnerHTML={{
                         __html: intl.formatMessage({
-                          id: isOnlyOnline ? 'homePageHeaderMessageFullImpl' : 'homePageHeaderMessage',
+                          id: isOnlyOnline ? 'landingMessage' : 'homePageHeaderMessage',
                           defaultMessage: ''
                         })
                       }}

src/pages/extra-pages/ImportantNoticePage/ImportantNotice_cn.js

@@ -1,53 +0,0 @@
-
-const ImportantNotice = () => {
-
-	const content =`
-		 <style>
-      td.tnc { min-width: 24px; vertical-align: text-top; } div.tnc { text-align: justify; text-justify: inter-word; font-style: normal; } strong.tnc { font-size: large; } li.tnc { margin: 10px 0; }
-    </style>
-    <div class="tnc">
-      <strong class="tnc">注意事项</strong><br />
-      <ol>
-      <li class="tnc">
-      申请人在本申请表格内所提供的资料会供申请刊登公共启事及为承担法律责任用途。政府物流服务署可能会向其他政策局／部门披露你在此表格内填报的资料。申请人有权查阅及改正个人资料。如要查阅或改正个人资料，请向本署个人资料私隐主任提出，地址为香港北角渣华道333号北角政府合署十楼。 
-      </li>
-      <li class="tnc">
-      申请人必须确保递交的稿件内容正确，并且是最终的版本。在宪报上刊登公共启事一般是为符合香港法例或法院命令的规定。政府物流服务署署长有权拒收不适宜刊登的公共启事。 
-      </li>
-      <li class="tnc">
-      有关申请刊登详情，请参阅「<a href="https://pnsps.gld.gov.hk/aboutUs">透过系统于宪报刊登公共启事须知</a>」。 
-      </li>
-      </ol>
-      <strong class="tnc">免责声明</strong><br />
-      <ol>
-        <li class="tnc">
-          香港特别行政区政府物流服务署在本网站所提供的资料只供参考之用。虽然政府物流服务署已尽力确保资料准确无误，但政府物流服务署不会就本网站提供的资料的准确性作出任何明示或隐含的保证
-          。
-        </li>
-        <li class="tnc">
-          其他网站或许与本网站有所连结，又或本网站亦为第三者网站提供连结。对于与本网址有关连的任何因由所引致的任何损失或损害，政府概不负责。使用者须负责自行评估本网站所载的各项资料或与本网站有关连的各项资料，并应在根据该等资料行事前，核实该等资料，以及征询独立意见。
-        </li>
-        <li class="tnc">
-          本网站的简体中文版本是经翻译软件根据繁体版本翻译而成。如简体版本与原文有差异，概以繁体版本为准。因所提供的简体版本发生错漏而引致的任何损失或责任，政府概不负责。
-        </li>
-        <li class="tnc">
-          政府物流服务署有绝对酌情权随时删除、暂时停载或编辑本网站的各项资料而无须给予任何理由。用户须负责自行评估本网站包含或与之有关的所有资料，在依赖这些资料前应先核实资料的真确性或征询独立意见。
-        </li>
-        <li class="tnc">
-          政府物流服务署在任何情况下，都不须对因使用或不能使用本网站而引致的任何损失或损毁（包括但不限于任何关于利润、业务中断、资料和侵犯版权的损失或损毁）负上法律责任。
-        </li>
-        <li class="tnc">
-          申请表提供的个人资料是自愿的。如果申请人未有提供足够资料，我们可能无法处理相关公共启事的刊登事宜。
-        </li>
-      </ol>
-      <strong class="tnc">版权公告</strong><br />
-      本网页的内容，包括但不限于所有文本、平面图像、图画、图片、照片以及数据或其他资料的汇编，均受版权保障。香港特别行政区政府是本网页内所有版权作品的拥有人，除非预先得到政府物流服务署的书面授权，否则严禁复制、改编、分发、发布或向公众提供该等版权作品。
-    </div>
-			`
-			;
-
-			return (<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: content }} />);
-
-}
-
-			export default ImportantNotice;

src/pages/extra-pages/ImportantNoticePage/ImportantNotice_en.js

@@ -1,88 +0,0 @@
-
-const ImportantNotice = () => {
-
-	const content = `
-	     <style>
-      td.tnc { min-width: 24px; vertical-align: text-top; } div.tnc { text-align: justify; text-justify: inter-word; font-style: normal; } strong.tnc { font-size: large; } li.tnc { margin: 10px 0; }
-    </style>
-    <div class="tnc">
-      <strong class="tnc">Points to note</strong><br />
-      <ol>
-        <li class="tnc">
-          The information provided by the applicant in this form would be used for application of public notice publication and for assumption of liability. The information provided in this form may be disclosed to other bureaux / departments.  The applicant has a right of access and correction with respect to personal data.  Requests for access to or correction of personal data should be addressed to the Personal Data Privacy Officer, Government Logistics Department, 10/F, North Point Government Offices, 333 Java Road, North Point, Hong Kong.
-        </li>
-        <li class="tnc">
-          The applicant must ensure that the public notice submitted for publication in the Gazette is accurate and is the final version. The publication of a public notice in the Gazette is normally for the compliance of the provisions of Hong Kong Laws or Court Orders. The Director of Government Logistics reserves the right to reject public notices which are considered not suitable for publication.
-        </li>
-        <li class="tnc">
-          For further details, please refer to the “<a href="https://pnsps.gld.gov.hk/aboutUs">Notes on Publishing Public Notices in the Gazette through PNSPS</a>”.
-        </li>
-      </ol>
-    <strong class="tnc">Disclaimer</strong><br />
-      <ol>
-        <li class="tnc">
-          The information provided by the Government Logistics Department of the
-          Hong Kong Special Administrative Region on this website is for
-          reference only. While the Government Logistics Department endeavours
-          to ensure the accuracy of its contents, no express or implied warranty
-          is given by the Government Logistics Department as to the accuracy of
-          the information provided on this website.
-        </li>
-        <li class="tnc">
-          There may be links from other websites to this website and this
-          website also provides links to third parties' websites. The Government
-          does not accept any responsibilities for any loss or damage whatsoever
-          arising from any cause whatsoever in connection with this website.
-          Users are responsible for making their own assessments of all
-          information contained in or in connection with this site and are
-          advised to verify such information or seek independent advice before
-          acting on it.
-        </li>
-        <li class="tnc">
-          The Simplified Chinese version of this website is generated from the
-          Traditional Chinese version with translation software. If there is any
-          discrepancy between the two versions, the Traditional Chinese version
-          should take precedence. The Government is not responsible for any loss
-          or liability due to errors arising from the translations.
-        </li>
-        <li class="tnc">
-          The Government Logistics Department is entitled to delete, suspend or
-          edit all information on this site at any time at its absolute
-          discretion without giving any reason. Users are responsible for making
-          their own assessments of all information contained in or in connection
-          with this website and are advised to verify the authenticity of such
-          information or seek independent advice before relying on the
-          information.
-        </li>
-        <li class="tnc">
-          In no event shall the Government Logistics Department be held liable
-          for any loss or damage whatsoever (including but not limited to any
-          loss or damage in respect of profits, business interruption,
-          information, infringement of copyrights) arising out of the use of or
-          inability to use this website.
-        </li>
-        <li class="tnc">
-          The personal information provided in the application form is
-          voluntary. If the applicant does not provide sufficient information,
-          we may not be able to process publication of the relevant public
-          notice.
-        </li>
-      </ol>
-      <strong class="tnc">Copyright Notice</strong><br />
-      The content available on this website, including but not limited to all
-      text, graphics, drawings, diagrams, photographs and compilation of data or
-      other materials are protected by copyright. The Government of the Hong
-      Kong Special Administrative Region is the owner of all copyright works
-      contained in this website. Any reproduction, adaptation, distribution,
-      dissemination or making available of such copyright works to the public is
-      strictly prohibited unless prior written authorization is obtained from
-      the Government Logistics Department.
-    </div>
-	`
-		;
-
-	return (<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: content }} />);
-
-}
-
-export default ImportantNotice;

src/pages/extra-pages/ImportantNoticePage/ImportantNotice_zh.js

@@ -1,53 +0,0 @@
-
-const ImportantNotice = () => {
-
-	const content =`
- <style>
-      td.tnc { min-width: 24px; vertical-align: text-top; } div.tnc { text-align: justify; text-justify: inter-word; font-style: normal; } strong.tnc { font-size: large; } li.tnc { margin: 10px 0; }
-    </style>
-    <div class="tnc">
-      <strong class="tnc">注意事項</strong><br />
-      <ol>
-        <li class="tnc">
-          申請人在本申請表格內所提供的資料會供申請刊登公共啟事及為承擔法律責任用途。政府物流服務署可能會向其他政策局／部門披露你在此表格內填報的資料。申請人有權查閱及改正個人資料。如要查閱或改正個人資料，請向本署個人資料私隱主任提出，地址為香港北角渣華道333號北角政府合署十樓。
-        </li>
-        <li class="tnc">
-          申請人必須確保遞交的稿件內容正確，並且是最終的版本。在憲報上刊登公共啟事一般是為符合香港法例或法院命令的規定。政府物流服務署署長有權拒收不適宜刊登的公共啟事。
-        </li>
-        <li class="tnc">
-          有關申請刊登詳情，請參閱「<a href="https://pnsps.gld.gov.hk/aboutUs">透過系統於憲報刊登公共啟事須知</a>」。
-        </li>
-      </ol>
-      <strong class="tnc">免責聲明</strong><br />
-      <ol>
-        <li class="tnc">
-          香港特別行政區政府物流服務署在本網站所提供的資料只供參考之用。雖然政府物流服務署已盡力確保資料準確無誤，但政府物流服務署不會就本網站提供的資料的準確性作出任何明示或隱含的保證
-          。
-        </li>
-        <li class="tnc">
-          其他網站或許與本網站有所連結，又或本網站亦為第三者網站提供連結。對於與本網址有關連的任何因由所引致的任何損失或損害，政府概不負責。使用者須負責自行評估本網站所載的各項資料或與本網站有關連的各項資料，並應在根據該等資料行事前，核實該等資料，以及徵詢獨立意見。
-        </li>
-        <li class="tnc">
-          本網站的簡體中文版本是經翻譯軟件根據繁體版本翻譯而成。如簡體版本與原文有差異，概以繁體版本為準。因所提供的簡體版本發生錯漏而引致的任何損失或責任，政府概不負責。
-        </li>
-        <li class="tnc">
-          政府物流服務署有絕對酌情權隨時刪除、暫時停載或編輯本網站的各項資料而無須給予任何理由。用戶須負責自行評估本網站包含或與之有關的所有資料，在依賴這些資料前應先核實資料的真確性或徵詢獨立意見。
-        </li>
-        <li class="tnc">
-          政府物流服務署在任何情況下，都不須對因使用或不能使用本網站而引致的任何損失或損毀（包括但不限於任何關於利潤、業務中斷、資料和侵犯版權的損失或損毀）負上法律責任。
-        </li>
-        <li class="tnc">
-          申請表提供的個人資料是自願的。如果申請人未有提供足夠資料，我們可能無法處理相關公共啟事的刊登事宜。
-        </li>
-      </ol>
-      <strong class="tnc">版權公告</strong><br />
-      本網頁的內容，包括但不限於所有文本、平面圖像、圖畫、圖片、照片以及數據或其他資料的匯編，均受版權保障。香港特別行政區政府是本網頁內所有版權作品的擁有人，除非預先得到政府物流服務署的書面授權，否則嚴禁複製、改編、分發、發布或向公眾提供該等版權作品。
-    </div>
-			`
-			;
-
-			return (<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: content }} />);
-
-}
-
-			export default ImportantNotice;

src/pages/extra-pages/ImportantNoticePage/index.js

@@ -1,69 +1,44 @@
-import { Grid, Typography, Stack, } from '@mui/material';
-import { useState, useEffect, lazy } from "react";
+import { Grid, Typography, Stack } from '@mui/material';
+import { useIntl, FormattedMessage } from 'react-intl';
 
-import Loadable from 'components/Loadable';
-import { useIntl, FormattedMessage } from "react-intl";
+import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png';
 
-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')));
-const ImportantNotice_en = Loadable(lazy(() => import('pages/extra-pages/ImportantNoticePage/ImportantNotice_en')));
-const ImportantNotice_zh = Loadable(lazy(() => import('pages/extra-pages/ImportantNoticePage/ImportantNotice_zh')));
-const ImportantNotice_cn = Loadable(lazy(() => import('pages/extra-pages/ImportantNoticePage/ImportantNotice_cn')));
+  backgroundImage: `url(${titleBackgroundImg})`,
+  width: '100%',
+  height: '100%',
+  backgroundSize: 'contain',
+  backgroundRepeat: 'no-repeat',
+  backgroundColor: '#0C489E',
+  backgroundPosition: 'right'
+};
 
 const ImportantNotice = () => {
-    const intl = useIntl();
-    const { locale } = intl;
-    const [onReady, setOnReady] = useState(false);
-    const [content, setContent] = useState("");
-
-    useEffect(() => {
-        setOnReady(true);
-        if (locale === 'zh-CN') {
-            setContent(<><ImportantNotice_cn /></>);
-        } else if (locale === 'zh-HK') {
-            setContent(<><ImportantNotice_zh /></>);
-        } else {
-            setContent(<><ImportantNotice_en /></>);
-        }
-    }, [locale]);
-
-
-    return (
-        !onReady ?
-            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
-                <Grid item>
-                    <LoadingComponent />
-                </Grid>
-            </Grid>
-            :
-            (
-                <Grid container justifyContent="center" alignItems="center" >
-                    <Grid item xs={12}>
-                        <div style={BackgroundHead}>
-                            <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
-                                <Typography component="h1" ml={15} color='#FFF' variant="h4" sx={{ display: { xs: 'none', sm: 'none', md: 'block', pt: 2 } }}>
-                                    <FormattedMessage id="importantNotice" />
-                                </Typography>
-                            </Stack>
-                        </div>
-                    </Grid>
-                    <Grid item xs={10} md={8} lg={6}>
-                        {content}
-                    </Grid>
-                </Grid>
-            )
-    );
-
-}
-
-export default ImportantNotice;
+  const intl = useIntl();
+  const htmlContent = intl.formatMessage({ id: 'importantNoticeContent', defaultMessage: '' });
+
+  return (
+    <Grid container justifyContent="center" alignItems="center">
+      <Grid item xs={12}>
+        <div style={BackgroundHead}>
+          <Stack direction="row" height="70px" justifyContent="flex-start" alignItems="center">
+            <Typography
+              component="h1"
+              ml={15}
+              color="#FFF"
+              variant="h4"
+              sx={{ display: { xs: 'none', sm: 'none', md: 'block', pt: 2 } }}
+            >
+              <FormattedMessage id="importantNotice" />
+            </Typography>
+          </Stack>
+        </div>
+      </Grid>
+      <Grid item xs={10} md={8} lg={6}>
+        <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: htmlContent }} />
+      </Grid>
+    </Grid>
+  );
+};
+
+export default ImportantNotice;

src/translations/en.json

@@ -21,7 +21,6 @@
   "PNSPS_fullname": "Public Notice Submission and Payment System",
   "HKSARGOV": "The Government of the Hong Kong Special Administrative Region",
   "homePageHeaderMessage": "<p>The <a target='_blank' href='https://pnsps.gld.gov.hk/'>Gazette Public Notice Submission and Payment System</a> (PNSPS) has been smoothly rolled out in August 2024 and will be fully implemented on 28 January 2026. Starting from <b>28 January 2026</b>, 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.</p><p>We would like to invite all applicants for publishing public notices in the Gazette to get well prepared for the change early, <a target='_blank' href='https://pnsps.gld.gov.hk/register'>register as PNSPS user</a> now and submit online applications to experience the benefits of the new online platform.</p><p>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).</p>",
-  "homePageHeaderMessageFullImpl": "<p>The Gazette Public Notice Submission and Payment System (PNSPS) has been 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. Applications made by other means will be returned to the applicant for re-submission via the PNSPS.</p><p>FPS (轉數快), PPS (繳費靈) and credit card are available in the PNSPS for payment of gazette fee. If you have any enquiries on the set-up of the online payment methods, please contact your bank (for FPS and credit card) or the PPS (PPS hotline: 2311 9876).</p>",
   "userGuideMessage": "The <a target='_blank' href='https://pnsps.gld.gov.hk/'>Gazette Public Notice Submission and Payment System</a> (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).<br/><br/>Please download the new PNSPS User Guide effective from 28 January 2026 for your reference.",
   "HKGLD": "Government Logistics Department",
   "importantNotice": "Important Notice",

src/translations/zh-CN.json

@@ -21,7 +21,6 @@
   "PNSPS_fullname": "公共启事提交及缴费系统",
   "HKSARGOV": "香港特别行政区政府",
   "homePageHeaderMessage": "<p>「<a target='_brank' href='https://pnsps.gld.gov.hk/'>宪报公共启事提交及缴费系统</a>」已于2024年8月顺利启用，并将于2026年1月28日全面推行。由2026年1月28日开始，所有申请人必须使用网上「宪报公共启事提交及缴费系统」提交公共启事申请及缴交相关费用，申请人可以选择转数快（FPS）、 缴费灵（PPS）和信用卡缴交费用。以其他方式提交的申请将退回给申请人，重新透过系统提交。 </p><p>现诚邀所有刊登宪报公共启事申请人及早为新安排做好准备，立即<a target='_brank' href='https://pnsps.gld.gov.hk/register'>登记成为系统用户</a>，使用系统提交申请，以体验新平台的便捷。 </p><p>如果你对上述网上付款方式的设定有任何查询，请联络你的银行（转数快及信用卡）或缴费灵（缴费灵热线：2311 9876）。 </p>",
-  "homePageHeaderMessageFullImpl": "<p>「宪报公共启事提交及缴费系统」已于2026年1月28日全面推行。由2026年1月28日开始，所有申请人必须使用网上「宪报公共启事提交及缴费系统」提交公共启事申请及缴交相关费用。以其他方式提交的申请将退回给申请人，重新透过系统提交。 </p><p>申请人可以选择转数快（FPS）、 缴费灵（PPS）和信用卡缴交费用。如果你对网上付款方式的设定有任何查询，请联络你的银行（转数快及信用卡）或缴费灵（缴费灵热线：2311 9876）。 </p>",
   "userGuideMessage": "「<a target='_blank' href='https://pnsps.gld.gov.hk/'>宪报公共启事提交及缴费系统</a>」（系统）将于2026年1月28日全面推行。由2026年1月28日开始，所有申请人必须使用系统提交公共启事申请及缴交相关费用。申请人可以选择转数快（FPS）、缴费灵（PPS）和信用卡缴交费用。以其他方式提交的申请将退回给申请人，重新透过系统提交。如果你对上述网上付款方式的设定有任何查询，请联络你的银行（转数快及信用卡）或缴费灵（缴费灵热线：2311 9876）。 <br/><br/>请你下载由2026年1月28日起生效的新系统使用者指南作参考。 ",
   "HKGLD": "政府物流服务署",
   "importantNotice": "重要告示",

src/translations/zh-HK.json

@@ -21,7 +21,6 @@
   "PNSPS_fullname": "公共啟事提交及繳費系統",
   "HKSARGOV": "香港特別行政區政府",
   "homePageHeaderMessage": "<p>「<a target='_brank' href='https://pnsps.gld.gov.hk/'>憲報公共啟事提交及繳費系統</a>」已於2024年8月順利啟用，並將於2026年1月28日全面推行。由2026年1月28日開始，所有申請人必須使用網上「憲報公共啟事提交及繳費系統」提交公共啟事申請及繳交相關費用，申請人可以選擇轉數快（FPS）、 繳費靈（PPS）和信用卡繳交費用。以其他方式提交的申請將退回給申請人，重新透過系統提交。</p><p>現誠邀所有刊登憲報公共啟事申請人及早為新安排做好準備，立即<a target='_brank' href='https://pnsps.gld.gov.hk/register'>登記成為系統用戶</a>，使用系統提交申請，以體驗新平台的便捷。</p><p>如果你對上述網上付款方式的設定有任何查詢，請聯絡你的銀行（轉數快及信用卡）或繳費靈（繳費靈熱線：2311 9876）。</p>",
-  "homePageHeaderMessageFullImpl": "<p>「憲報公共啟事提交及繳費系統」已於2026年1月28日全面推行。由2026年1月28日開始，所有申請人必須使用網上「憲報公共啟事提交及繳費系統」提交公共啟事申請及繳交相關費用。以其他方式提交的申請將退回給申請人，重新透過系統提交。</p><p>申請人可以選擇轉數快（FPS）、 繳費靈（PPS）和信用卡繳交費用。如果你對網上付款方式的設定有任何查詢，請聯絡你的銀行（轉數快及信用卡）或繳費靈（繳費靈熱線：2311 9876）。</p>",
   "userGuideMessage": "「<a target='_blank' href='https://pnsps.gld.gov.hk/'>憲報公共啟事提交及繳費系統</a>」（系統）將於2026年1月28日全面推行。由2026年1月28日開始，所有申請人必須使用系統提交公共啟事申請及繳交相關費用。申請人可以選擇轉數快（FPS）、繳費靈（PPS）和信用卡繳交費用。以其他方式提交的申請將退回給申請人，重新透過系統提交。如果你對上述網上付款方式的設定有任何查詢，請聯絡你的銀行（轉數快及信用卡）或繳費靈（繳費靈熱線：2311 9876）。<br/><br/>請你下載由2026年1月28日起生效的新系統使用者指南作參考。",
   "HKGLD": "政府物流服務署",
   "importantNotice": "重要告示",