Merge branch 'New_Enhancement' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI into New_Enhancement

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

@@ -1,5 +1,5 @@
 
-const AboutUs = () => {
+const ImportantNotice = () => {
 
 	const content =`
 		 <style>
@@ -38,4 +38,4 @@ const AboutUs = () => {
 
 }
 
-			export default AboutUs;
+			export default ImportantNotice;

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

@@ -1,5 +1,5 @@
 
-const Page = () => {
+const ImportantNotice = () => {
 
 	const content = `
 	     <style>
@@ -73,4 +73,4 @@ const Page = () => {
 
 }
 
-export default Page;
+export default ImportantNotice;

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

@@ -1,5 +1,5 @@
 
-const AboutUs = () => {
+const ImportantNotice = () => {
 
 	const content =`
  <style>
@@ -38,4 +38,4 @@ const AboutUs = () => {
 
 }
 
-			export default AboutUs;
+			export default ImportantNotice;

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

@@ -16,11 +16,11 @@ 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_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')));
 
-const PrivacyPolicy = () => {
+const ImportantNotice = () => {
     const intl = useIntl();
     const { locale } = intl;
     const [onReady, setOnReady] = useState(false);
@@ -66,4 +66,4 @@ const PrivacyPolicy = () => {
 
 }
 
-export default PrivacyPolicy;
+export default ImportantNotice;

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

@@ -16,9 +16,9 @@ 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_en = Loadable(lazy(() => import('pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_en')));
+const PrivacyPolicy_zh = Loadable(lazy(() => import('pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_zh')));
+const PrivacyPolicy_cn = Loadable(lazy(() => import('pages/extra-pages/PrivacyPolicyPage/PrivacyPolicy_cn')));
 
 const PrivacyPolicy = () => {
     const intl = useIntl();

src/routes/LoginRoutes.js

@@ -12,8 +12,8 @@ const RegisterForm = Loadable(lazy(() => import('pages/authentication/Register')
 const BusRegisterForm = Loadable(lazy(() => import('pages/authentication/BusRegister')));
 const IAmSmartRegister = Loadable(lazy(() => import('pages/authentication/IAmSmartRegister')));
 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 PrivacyPolicyPage = Loadable(lazy(() => import('pages/extra-pages/PrivacyPolicyPage')));
+const ImportantNoticePage = Loadable(lazy(() => import('pages/extra-pages/ImportantNoticePage')));
 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')));