From e2875860e4902f7f104328693d733b5487cea573 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alex.cheung@2fi-solutions.com.hk>
Date: Mon, 29 Jan 2024 10:26:52 +0800
Subject: [PATCH] add back button

---
 src/pages/EmailTemplate/Detail_GLD/index.js                 | 2 +-
 src/pages/Organization/DetailPage/index.js                  | 4 ++--
 src/pages/Organization/SearchPage/OrganizationSearchForm.js | 2 +-
 src/pages/Payment/Details_Public/index.js                   | 4 ++--
 src/pages/User/DetailsPage_Individual/index.js              | 4 ++--
 src/pages/User/DetailsPage_Organization/index.js            | 4 ++--
 src/themes/buttonConst.js                                   | 4 ++++
 7 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/pages/EmailTemplate/Detail_GLD/index.js b/src/pages/EmailTemplate/Detail_GLD/index.js
index 78cf80f..3471fa6 100644
--- a/src/pages/EmailTemplate/Detail_GLD/index.js
+++ b/src/pages/EmailTemplate/Detail_GLD/index.js
@@ -129,7 +129,7 @@ const Index = () => {
                         </div>
                     </Grid>
                     <Grid item xs={12} width="100%">
-                        <Button title="Back" sx={{ ml: 6, mt: 2.5 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/emailTemplate") }}>
+                        <Button title="Back" sx={{ ml: 6, mt: 2.5 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate(-1) }}>
                             <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
                         </Button>
                     </Grid>
diff --git a/src/pages/Organization/DetailPage/index.js b/src/pages/Organization/DetailPage/index.js
index 64f8e92..7e0d8c5 100644
--- a/src/pages/Organization/DetailPage/index.js
+++ b/src/pages/Organization/DetailPage/index.js
@@ -126,7 +126,7 @@ const OrganizationDetailPage = () => {
         isLoading ?
             <LoadingComponent />
             :
-            <Grid container sx={{ backgroundColor: "backgroundColor.default" }}>
+            <Grid container direction="column" sx={{minHeight: '90vh',backgroundColor:isGLDLoggedIn()?'backgroundColor.default':'#ffffff' }}>
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
@@ -143,7 +143,7 @@ const OrganizationDetailPage = () => {
                     </div>
                 </Grid>
                 <Grid item xs={12}>
-                    <Button aria-label={intl.formatMessage({id: 'back'})} title="Back" sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/org") }}>
+                    <Button aria-label={intl.formatMessage({id: 'back'})} title="Back" sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate(-1)}}>
                         <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
                     </Button>
                 </Grid>
diff --git a/src/pages/Organization/SearchPage/OrganizationSearchForm.js b/src/pages/Organization/SearchPage/OrganizationSearchForm.js
index 93295a4..c29e940 100644
--- a/src/pages/Organization/SearchPage/OrganizationSearchForm.js
+++ b/src/pages/Organization/SearchPage/OrganizationSearchForm.js
@@ -1,6 +1,6 @@
 // material-ui
 import {
-    CButton,
+    Button,
     Grid, TextField,
     Typography,
     Autocomplete,
diff --git a/src/pages/Payment/Details_Public/index.js b/src/pages/Payment/Details_Public/index.js
index f6cd8b3..fa0960c 100644
--- a/src/pages/Payment/Details_Public/index.js
+++ b/src/pages/Payment/Details_Public/index.js
@@ -19,7 +19,7 @@ const PaymentDetails = Loadable(React.lazy(() => import('./PaymentDetails')));
 const DataGrid = Loadable(React.lazy(() => import('./DataGrid')));
 import ForwardIcon from '@mui/icons-material/Forward';
 import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
-import {FormattedMessage} from "react-intl";
+import {FormattedMessage,useIntl} from "react-intl";
 const BackgroundHead = {
     backgroundImage: `url(${titleBackgroundImg})`,
     width: '100%',
@@ -101,7 +101,7 @@ const Index = () => {
                                 </Stack>
                             </div>
                         </Grid>
-                        <Grid item xs={12} width={{xs:"90%", sm:"90%", md:"60%", lg:"60%"}}>
+                        <Grid item xs={12} width={{xs:"90%", sm:"90%", md:"90%", lg:"80%"}}>
                             <Button
                                 aria-label={intl.formatMessage({id: 'back'})}
                                 title={intl.formatMessage({id: 'back'})}
diff --git a/src/pages/User/DetailsPage_Individual/index.js b/src/pages/User/DetailsPage_Individual/index.js
index 08ed36f..6445bcf 100644
--- a/src/pages/User/DetailsPage_Individual/index.js
+++ b/src/pages/User/DetailsPage_Individual/index.js
@@ -120,7 +120,7 @@ const UserMaintainPage_Individual = () => {
         isLoading ?
             <LoadingComponent />
             :
-            <Grid container sx={{ backgroundColor: 'backgroundColor.default', maxWidth:'100%' }}>
+            <Grid container direction="column" sx={{minHeight: '90vh', backgroundColor: isGLDLoggedIn()?'backgroundColor.default':'#ffffff', maxWidth:'100%' }}>
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
@@ -139,7 +139,7 @@ const UserMaintainPage_Individual = () => {
                 <Grid item xs={12}>
                     <Button title="Back"
                             sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }}
-                            variant="outlined" onClick={() => { navigate("/indUser") }}
+                            variant="outlined" onClick={() => { navigate(-1) }}
                     >
                         <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
                     </Button>
diff --git a/src/pages/User/DetailsPage_Organization/index.js b/src/pages/User/DetailsPage_Organization/index.js
index 0831cb9..023a69c 100644
--- a/src/pages/User/DetailsPage_Organization/index.js
+++ b/src/pages/User/DetailsPage_Organization/index.js
@@ -181,7 +181,7 @@ const UserMaintainPage_Organization = () => {
         isLoading ?
             <LoadingComponent />
             :
-            <Grid container sx={{ backgroundColor: "backgroundColor.default" }}>
+            <Grid container sx={{ backgroundColor: isGLDLoggedIn()?'backgroundColor.default':'#ffffff' }}>
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
@@ -198,7 +198,7 @@ const UserMaintainPage_Organization = () => {
                     </div>
                 </Grid>
                 <Grid item xs={12}>
-                    <Button title="Back" sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/orgUser") }}>
+                    <Button title="Back" sx={{ ml: 3.5, mt: 2 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate(-1) }}>
                         <ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
                     </Button>
                 </Grid>
diff --git a/src/themes/buttonConst.js b/src/themes/buttonConst.js
index 49df81a..7d74ea4 100644
--- a/src/themes/buttonConst.js
+++ b/src/themes/buttonConst.js
@@ -42,6 +42,10 @@ export const PNSPS_BUTTON_THEME = createTheme({
         exportExcel:{
             main: '#6A8B9E',
             contrastText: '#FFFFFF',
+        },
+        success:{
+            main: '#6A8B9E',
+            contrastText: '#FFFFFF',
         }
     },
     components: {