AboutUs, ImportantNotice, PrivacyPolicy

src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js

@@ -112,7 +112,7 @@ const ApplicationDetailCard = (
                     handlePaymentCheck(appIdList)
                     return;
                 }
-                setErrorText(intl.formatMessage({ id: "MSG.expiredApp" }));
+                setErrorText(intl.formatMessage({ id: "MSG.App" }));
                 setErrorPopUp(true);
             }
         });

src/pages/AboutUs/index.js → src/pages/extra-pages/AboutUs/index.js

@@ -16,9 +16,9 @@ const BackgroundHead = {
 }
 
 const LoadingComponent = Loadable(lazy(() => import('pages/extra-pages/LoadingComponent')));
-const AboutUs_en = Loadable(lazy(() => import('pages/AboutUs/AboutUs_en')));
-const AboutUs_zh = Loadable(lazy(() => import('pages/AboutUs/AboutUs_zh')));
-const AboutUs_cn = Loadable(lazy(() => import('pages/AboutUs/AboutUs_cn')));
+const AboutUs_en = Loadable(lazy(() => import('pages/extra-pages/AboutUs/AboutUs_en')));
+const AboutUs_zh = Loadable(lazy(() => import('pages/extra-pages/AboutUs/AboutUs_zh')));
+const AboutUs_cn = Loadable(lazy(() => import('pages/extra-pages/AboutUs/AboutUs_cn')));
 
 const PrivacyPolicy = () => {
     const intl = useIntl();
@@ -57,7 +57,7 @@ const PrivacyPolicy = () => {
                             </Stack>
                         </div>
                     </Grid>
-                    <Grid item xs={10} md={5}>
+                    <Grid item xs={10} md={8} lg={6}>
                         {content}
                     </Grid>
                 </Grid>

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

@@ -0,0 +1,41 @@
+
+const AboutUs = () => {
+
+	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">
+          香港特别行政区政府物流服务署在本网站所提供的资料只供参考之用。虽然政府物流服务署已尽力确保资料准确无误，但政府物流服务署不会就本网站提供的资料的准确性作出任何明示或隐含的保证
+          。
+        </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 AboutUs;

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

@@ -0,0 +1,76 @@
+
+const Page = () => {
+
+	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">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 Page;

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

@@ -0,0 +1,41 @@
+
+const AboutUs = () => {
+
+	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">
+          香港特別行政區政府物流服務署在本網站所提供的資料只供參考之用。雖然政府物流服務署已盡力確保資料準確無誤，但政府物流服務署不會就本網站提供的資料的準確性作出任何明示或隱含的保證
+          。
+        </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 AboutUs;

src/pages/extra-pages/ImportantNotice.js → src/pages/extra-pages/ImportantNotice/index.js

@@ -16,14 +16,27 @@ const BackgroundHead = {
 }
 
 const LoadingComponent = Loadable(lazy(() => import('pages/extra-pages/LoadingComponent')));
+const ImportantNotice_en = Loadable(lazy(() => import('pages/extra-pages/ImportantNotice/ImportantNotice_en')));
+const ImportantNotice_zh = Loadable(lazy(() => import('pages/extra-pages/ImportantNotice/ImportantNotice_zh')));
+const ImportantNotice_cn = Loadable(lazy(() => import('pages/extra-pages/ImportantNotice/ImportantNotice_cn')));
 
-const ImportantNotice = () => {
+const PrivacyPolicy = () => {
     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 ?
@@ -44,8 +57,8 @@ const ImportantNotice = () => {
                             </Stack>
                         </div>
                     </Grid>
-                    <Grid item xs={10} md={5}>
-                        <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "termsAndCon" }) }} />
+                    <Grid item xs={10} md={8} lg={6}>
+                        {content}
                     </Grid>
                 </Grid>
             )
@@ -53,4 +66,4 @@ const ImportantNotice = () => {
 
 }
 
-export default ImportantNotice;
+export default PrivacyPolicy;

src/pages/extra-pages/PrivacyPolicy/PrivacyPolicy_cn.js

@@ -0,0 +1,60 @@
+
+const AboutUs = () => {
+
+	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"
+        ><h2><center>私隐政策</center></h2></strong
+      >
+      <ol>
+        <li class="tnc">
+          申请人在本网站内所提供的个人资料会供申请刊登公共启事及为承担法律责任用途。
+        </li>
+        <li class="tnc">
+          保障个人资料私隐是政府物流服务署每位成员所关注的事宜。我们尊重个人资料私隐，并承诺全面执行及遵从保障资料原则及《个人资料（私隐）条例》的所有相关条文。政府物流服务署建立及实施系统监控，以确保遵从以下六项保障资料原则
+          –
+          <ol type="a">
+            <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>
+        </li>
+        <li class="tnc">
+          如要查阅或改正本署所持有的个人资料，请向以下人士提出： <br /><br />
+          香港北角渣华道333号<br />
+          北角政府合署10楼<br />
+          政府物流服务署<br />
+          保障资料主任<br />
+          <br />
+          ( 注：请以个人资料私隐专员指定的表格[link -
+          https://www.gld.gov.hk/assets/gld/download-files/privacy-policy/privacy_form_c.pdf]
+          提出查阅资料的要求。)
+        </li>
+      </ol>
+    </div>
+			`
+			;
+
+			return (<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: content }} />);
+
+}
+
+			export default AboutUs;

src/pages/extra-pages/PrivacyPolicy/PrivacyPolicy_en.js

@@ -0,0 +1,83 @@
+
+const Page = () => {
+
+	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"
+			><h2><center>Privacy Policy</center></h2></strong
+		>
+		<ol>
+			<li class="tnc">
+			The personal data provided by the applicant in this website would be
+			used for application of public notice publication and for assumption
+			of liability.
+			</li>
+			<li class="tnc">
+			The protection of personal data privacy is the concern of every member
+			of Government Logistics Department. We respect personal data privacy
+			and are committed to fully implementing and complying with the data
+			protection principles and all relevant provisions of the Personal Data
+			(Privacy) Ordinance. We develop and implement programme controls that
+			give effect to the six data protection principles below –
+			<ol type="a">
+				<li class="tnc">
+				collect adequate, but not excessive, personal data by lawful and
+				fair means only for lawful purposes related to our functions or
+				activities;
+				</li>
+				<li class="tnc">
+				take all reasonably practicable steps to ensure that the personal
+				data collected or retained are accurate, having regard to the
+				purposes for which they are to be used. Erase personal data no
+				longer than necessary for the purposes for which they are to be
+				used;
+				</li>
+				<li class="tnc">
+				use the personal data collected only for purposes or directly
+				related purposes for which the data were to be used at the time of
+				collection, unless the individual concerned has given express
+				consent for a change of use or such use is permitted by law;
+				</li>
+				<li class="tnc">
+				take all reasonably practicable steps to ensure that personal data
+				are protected against unauthorized or accidental access,
+				processing, erasure or other use;
+				</li>
+				<li class="tnc">
+				take all reasonably practicable steps to ensure that a person can
+				be informed of the kinds of personal data that GLD holds and the
+				purposes for which the data are to be used; and
+				</li>
+				<li class="tnc">
+				permit persons to access and correct personal data of which they
+				are the data subject and process any access/correction requests in
+				a manner permitted or required by law.
+				</li>
+			</ol>
+			</li>
+			<li class="tnc">
+			Requests for access to or correction of personal data held by us
+			should be addressed to – <br /><br />
+			Data Protection Officer<br />
+			Government Logistics Department<br />
+			10/F, North Point Government Offices <br />
+			333 Java Road North Point<br />
+			Hong Kong<br />
+			<br />
+			(Note: Data access requests should be made on a form [link -
+			https://www.gld.gov.hk/assets/gld/download-files/privacy-policy/privacy_form_e.pdf]
+			specified by the Privacy Commissioner for Personal Data.)
+			</li>
+		</ol>
+		</div>
+	`
+		;
+
+	return (<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: content }} />);
+
+}
+
+export default Page;

src/pages/extra-pages/PrivacyPolicy/PrivacyPolicy_zh.js

@@ -0,0 +1,60 @@
+
+const AboutUs = () => {
+
+	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"
+        ><h2><center>私隱政策</center></h2></strong
+      >
+      <ol>
+        <li class="tnc">
+          申請人在本網站內所提供的個人資料會供申請刊登公共啟事及為承擔法律責任用途。
+        </li>
+        <li class="tnc">
+          保障個人資料私隱是政府物流服務署每位成員所關注的事宜。我們尊重個人資料私隱，並承諾全面執行及遵從保障資料原則及《個人資料（私隱）條例》的所有相關條文。政府物流服務署建立及實施系統監控，以確保遵從以下六項保障資料原則
+          –
+          <ol type="a">
+            <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>
+        </li>
+        <li class="tnc">
+          如要查閱或改正本署所持有的個人資料，請向以下人士提出： <br /><br />
+          香港北角渣華道333號<br />
+          北角政府合署10樓<br />
+          政府物流服務署<br />
+          保障資料主任<br />
+          <br />
+          ( 註：請以個人資料私隱專員指定的表格 [link -
+          https://www.gld.gov.hk/assets/gld/download-files/privacy-policy/privacy_form_c.pdf]
+          提出查閱資料的要求。)
+        </li>
+      </ol>
+    </div>
+			`
+			;
+
+			return (<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: content }} />);
+
+}
+
+			export default AboutUs;

src/pages/extra-pages/PrivacyPolicy.js → src/pages/extra-pages/PrivacyPolicy/index.js

@@ -1,8 +1,6 @@
-import { Grid,Typography, Stack,  } from '@mui/material';
+import { Grid, Typography, Stack, } from '@mui/material';
 import { useState, useEffect, lazy } from "react";
 
-import * as HttpUtils from "utils/HttpUtils";
-import { PRIVACY_POLICY_PATH } from "utils/ApiPathConst";
 import Loadable from 'components/Loadable';
 import { useIntl, FormattedMessage } from "react-intl";
 
@@ -18,33 +16,26 @@ const BackgroundHead = {
 }
 
 const LoadingComponent = Loadable(lazy(() => import('pages/extra-pages/LoadingComponent')));
+const PrivacyPolicy_en = Loadable(lazy(() => import('pages/extra-pages/PrivacyPolicy/PrivacyPolicy_en')));
+const PrivacyPolicy_zh = Loadable(lazy(() => import('pages/extra-pages/PrivacyPolicy/PrivacyPolicy_zh')));
+const PrivacyPolicy_cn = Loadable(lazy(() => import('pages/extra-pages/PrivacyPolicy/PrivacyPolicy_cn')));
 
 const PrivacyPolicy = () => {
     const intl = useIntl();
     const { locale } = intl;
     const [onReady, setOnReady] = useState(false);
-    const [record, setRecord] = useState({});
     const [content, setContent] = useState("");
 
     useEffect(() => {
         setOnReady(true);
-        HttpUtils.get({
-            url: PRIVACY_POLICY_PATH,
-            onSuccess: (responseData) => {
-                setRecord(responseData);
-            }
-        });
-    }, []);
-
-    useEffect(() => {
         if (locale === 'zh-CN') {
-            setContent(record.cn);
+            setContent(<><PrivacyPolicy_cn /></>);
         } else if (locale === 'zh-HK') {
-            setContent(record.zh);
+            setContent(<><PrivacyPolicy_zh /></>);
         } else {
-            setContent(record.en);
+            setContent(<><PrivacyPolicy_en /></>);
         }
-    }, [locale, record]);
+    }, [locale]);
 
 
     return (
@@ -66,8 +57,8 @@ const PrivacyPolicy = () => {
                             </Stack>
                         </div>
                     </Grid>
-                    <Grid item xs={10} md={5}>
-                        <div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: content }} />
+                    <Grid item xs={10} md={8} lg={6}>
+                        {content}
                     </Grid>
                 </Grid>
             )

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

@@ -72,7 +72,7 @@ const UserMenu = () => {
                             </Stack>
                         </div>
                     </Grid>
-                    <Grid item xs={10} md={5}>
+                    <Grid item xs={10} md={8} lg={6}>
                         <div style={{
                             textAlign: "justify",
                             textJustify: "interWord",

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

@@ -40,13 +40,13 @@ const UserMenu = () => {
         padding: "8px"
     };
 
-    const getRow = ({ title, en, zh, cn }) => {
+    const getRow = ({ title, orgEn, orgZh, orgCn, indEn, indZh, indCn }) => {
+
         return <>
             <tr>
                 <td style={cellStyle}>{title}</td>
-                <td style={cellStyle}><a href={en} target='_brank'><DownloadIcon /></a></td>
-                <td style={cellStyle}><a href={zh} target='_brank'><DownloadIcon /></a></td>
-                <td style={cellStyle}><a href={cn} target='_brank'><DownloadIcon /></a></td>
+                <td style={cellStyle}><a href={locale=="zh-HK"?orgZh: locale=="en"?orgEn:orgCn} target='_brank'><DownloadIcon /></a></td>
+                <td style={cellStyle}><a href={locale=="zh-HK"?indZh: locale=="en"?indEn:indCn} target='_brank'><DownloadIcon /></a></td>
             </tr>
         </>
             ;
@@ -72,7 +72,7 @@ const UserMenu = () => {
                             </Stack>
                         </div>
                     </Grid>
-                    <Grid item xs={10} md={5}>
+                    <Grid item xs={10} md={8} lg={6}>
                         <div style={{
                             textAlign: "justify",
                             textJustify: "interWord",
@@ -84,79 +84,108 @@ const UserMenu = () => {
                                 <table style={tableStyle}>
                                     <tr>
                                         <th style={cellStyle} width="70%"> <FormattedMessage id="fileName" /></th>
-                                        <th style={cellStyle} width="10%">English</th>
-                                        <th style={cellStyle} width="10%">繁體中文</th>
-                                        <th style={cellStyle} width="10%">简体中文</th>
+                                        <th style={cellStyle} width="15%"> <FormattedMessage id="forOrgUser" /></th>
+                                        <th style={cellStyle} width="15%"> <FormattedMessage id="forIndUser" /></th>
                                     </tr>
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide1" />,
-                                        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"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide/eng/01 - Account Activation.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide/cht/01c - Account Activation.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide/chs/01sc - Account Activation.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide/eng/01 - Account Activation.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide/cht/01c - Account Activation.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide/chs/01sc - Account Activation.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide2" />,
-                                        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"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide/eng/02 - Login.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide/cht/02c - Login.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide/chs/02sc - Login.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide/eng/02 - Login.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide/cht/02c - Login.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide/chs/02sc - Login.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide3" />,
-                                        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"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide/eng/03 - Application for publishing a Public Notice in the Gazette.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide/cht/03c - Application for publishing a Public Notice in the Gazette.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide/chs/03sc - Application for publishing a Public Notice in the Gazette.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide/eng/03 - Application for publishing a Public Notice in the Gazette.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide/cht/03c - Application for publishing a Public Notice in the Gazette.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide/chs/03sc - Application for publishing a Public Notice in the Gazette.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide4" />,
-                                        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"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide/eng/04 - Proofreading reply (with correction).pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide/cht/04c - Proofreading reply (with correction).pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide/chs/04sc - Proofreading reply (with correction).pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide/eng/04 - Proofreading reply (with correction).pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide/cht/04c - Proofreading reply (with correction).pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide/chs/04sc - Proofreading reply (with correction).pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide5" />,
-                                        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"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide/eng/05 - Proofreading reply (pass for printing).pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide/cht/05c - Proofreading reply (pass for printing).pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide/chs/05sc - Proofreading reply (pass for printing).pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide/eng/05 - Proofreading reply (pass for printing).pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide/cht/05c - Proofreading reply (pass for printing).pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide/chs/05sc - Proofreading reply (pass for printing).pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide6" />,
-                                        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"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide/eng/06 - Cancellation of application for publishing a Public Notice in the Gazette.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide/cht/06c - Cancellation of application for publishing a Public Notice in the Gazette.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide/chs/06sc - Cancellation of application for publishing a Public Notice in the Gazette.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide/eng/06 - Cancellation of application for publishing a Public Notice in the Gazette.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide/cht/06c - Cancellation of application for publishing a Public Notice in the Gazette.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide/chs/06sc - Cancellation of application for publishing a Public Notice in the Gazette.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide7" />,
-                                        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"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide/eng/07 - Forgot password.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide/cht/07c - Forgot password.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide/chs/07sc - Forgot password.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide/eng/07 - Forgot password.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide/cht/07c - Forgot password.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide/chs/07sc - Forgot password.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide8" />,
-                                        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"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide/eng/08 - Change password.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide/cht/08c - Change password.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide/chs/08sc - Change password.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide/eng/08 - Change password.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide/cht/08c - Change password.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide/chs/08sc - Change password.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide9" />,
-                                        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"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide/eng/09 - Language of email notification.pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide/cht/09c - Language of email notification.pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide/chs/09sc - Language of email notification.pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide/eng/09 - Language of email notification.pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide/cht/09c - Language of email notification.pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide/chs/09sc - Language of email notification.pdf"
                                     })}
 
                                     {getRow({
                                         title: <FormattedMessage id="userGuide10" />,
-                                        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"
+                                        orgEn: "https://pnsps.gld.gov.hk/user-guide/eng/10 - Download General Demand Note for making payment(s).pdf",
+                                        orgZh: "https://pnsps.gld.gov.hk/user-guide/cht/10c - Download General Demand Note for making payment(s).pdf",
+                                        orgCn: "https://pnsps.gld.gov.hk/user-guide/chs/10sc - Download General Demand Note for making payment(s).pdf",
+                                        indEn: "https://pnsps.gld.gov.hk/user-guide/eng/10 - Download General Demand Note for making payment(s).pdf",
+                                        indZh: "https://pnsps.gld.gov.hk/user-guide/cht/10c - Download General Demand Note for making payment(s).pdf",
+                                        indCn: "https://pnsps.gld.gov.hk/user-guide/chs/10sc - Download General Demand Note for making payment(s).pdf"
                                     })}
 
 

src/routes/LoginRoutes.js

@@ -14,7 +14,7 @@ const IAmSmartRegister = Loadable(lazy(() => import('pages/authentication/IAmSma
 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 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')));
 

src/translations/en.json

@@ -266,6 +266,8 @@
   "pleaseUploadIdDocSubTitle": "Such as: Hong Kong ID card; passport; Mainland China ID card; professional practice certificate, etc.",
   "uploadIdDoc": "Upload identity document",
   "fileName": "File name",
+  "forOrgUser": "For Organisation / Company Users",
+  "forIndUser": "For Personal Users",
   "fileSize": "File size",
   "fileSizeWarning": "Upload file size should be within 10MB",
   "dnOverdueWarning": "Please settle the outstanding demand note(s) as soon as possible.",

src/translations/zh-CN.json

@@ -302,6 +302,8 @@
   "pleaseUploadIdDocSubTitle": "如: 香港身份证; 护照; 中国内地身份证; 专业执业证书等",
   "uploadIdDoc": "上传身份证明文件",
   "fileName": "档案名称",
+  "forOrgUser": "机构/公司用户",
+  "forIndUser": "个人用户",
   "fileSize": "档案大小",
   "fileSizeWarning": "上传档案应不大于 10MB",
   "dnOverdueWarning": "请尽快缴付所有逾期未缴交的款項。",

src/translations/zh-HK.json

@@ -300,6 +300,8 @@
   "uploadIdDoc": "上傳身份證明文件",
   "uploadFile": "上傳商業登記證及其他文件",
   "fileName": "檔案名稱",
+  "forOrgUser": "機構/公司用戶",
+  "forIndUser": "個人用戶",
   "fileSize": "檔案大小",
   "fileSizeWarning": "上傳檔案應不大於 10MB",
   "dnOverdueWarning": "請盡快繳付所有逾期未繳交的款項。",