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

# Conflicts:
#	src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js

src/components/FiDataGrid.js

@@ -20,18 +20,18 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
     const [myHideFooterSelectedRowCount, setMyHideFooterSelectedRowCount] = React.useState(true);
     const [_sx, set_sx] = React.useState({
         padding: "4 2 4 2",
-        boxShadow: 1,
-        border: 1,
-        borderColor: '#DDD',
+        // boxShadow: 1,
+        // border: 1,
+        // borderColor: '#DDD',
         '& .MuiDataGrid-cell': {
             borderTop: 1,
             borderBottom: 1,
-            borderColor: "#EEE"
+            borderColor: "#EEE",
         },
         '& .MuiDataGrid-footerContainer': {
             border: 1,
             borderColor: "#EEE"
-        }
+        },
     });
 
 
@@ -122,7 +122,6 @@ export function FiDataGrid({ rows, columns, sx, autoHeight,
             autoHeight={_autoHeight}
             hideFooterSelectedRowCount={myHideFooterSelectedRowCount}
             sx={_sx}
-
         />
     );
 }

src/components/MainCard.js

@@ -3,7 +3,7 @@ import { forwardRef } from 'react';
 
 // material-ui
 import { useTheme } from '@mui/material/styles';
-import { Card, CardContent, CardHeader, Divider, Typography } from '@mui/material';
+import { Card, CardContent, CardHeader, Divider, Typography, Grid } from '@mui/material';
 
 // project import
 import Highlighter from './third-party/Highlighter';
@@ -39,47 +39,59 @@ const MainCard = forwardRef(
     boxShadow = theme.palette.mode === 'dark' ? boxShadow || true : boxShadow;
 
     return (
-      <Card
-        elevation={elevation || 0}
-        ref={ref}
-        {...others}
-        sx={{
-          border: border ? '1px solid' : 'none',
-          borderRadius: 2,
-          borderColor: theme.palette.mode === 'dark' ? theme.palette.divider : theme.palette.grey.A800,
-          boxShadow: boxShadow && (!border || theme.palette.mode === 'dark') ? shadow || theme.customShadows.z1 : 'inherit',
-          ':hover': {
-            boxShadow: boxShadow ? shadow || theme.customShadows.z1 : 'inherit'
-          },
-          '& pre': {
-            m: 0,
-            p: '16px !important',
-            fontFamily: theme.typography.fontFamily,
-            fontSize: '0.75rem'
-          },
-          ...sx
-        }}
+      <Grid container direction="column"
+        // alignItems="center"
+        // justify="center"
       >
-        {/* card header and action */}
-        {!darkTitle && title && (
-          <CardHeader sx={headerSX} titleTypographyProps={{ variant: 'subtitle1' }} title={title} action={secondary} />
-        )}
-        {darkTitle && title && <CardHeader sx={headerSX} title={<Typography variant="h3">{title}</Typography>} action={secondary} />}
+        <Card
+          elevation={elevation || 0}
+          ref={ref}
+          {...others}
+          sx={{
+            alignItems: "center",
+            border: border ? '1px solid' : 'none',
+            borderRadius: 2,
+            borderColor: theme.palette.mode === 'dark' ? theme.palette.divider : theme.palette.grey.A800,
+            boxShadow: boxShadow && (!border || theme.palette.mode === 'dark') ? shadow || theme.customShadows.z1 : 'inherit',
+            ':hover': {
+              boxShadow: boxShadow ? shadow || theme.customShadows.z1 : 'inherit'
+            },
+            '& pre': {
+              m: 0,
+              p: '16px !important',
+              fontFamily: theme.typography.fontFamily,
+              fontSize: '0.75rem'
+            },
+            maxWidth: { xs: 700, sm: 900, md: 1000, lg: 1300, xl: 1900 },
+            // minWidth: { xs: 600, sm: 800, md: 900, lg: 1000, xl: 1000 },
+            margin: { xs: 2.5, md: 3 },
+            // '& > *': {
+            //   flexGrow: 1,
+            //   flexBasis: '50%'
+            // },
+            ...sx
+          }}
+        >
+          {/* card header and action */}
+          {!darkTitle && title && (
+            <CardHeader sx={headerSX} titleTypographyProps={{ variant: 'subtitle1' }} title={title} action={secondary} />
+          )}
+          {darkTitle && title && <CardHeader sx={headerSX} title={<Typography variant="h3">{title}</Typography>} action={secondary} />}
 
-        {/* card content */}
-        {content && <CardContent sx={contentSX}>{children}</CardContent>}
-        {!content && children}
+          {/* card content */}
+          {content && <CardContent sx={contentSX}>{children}</CardContent>}
+          {!content && children}
 
-        {/* card footer - clipboard & highlighter  */}
-        {codeHighlight && (
-          <>
-            <Divider sx={{ borderStyle: 'dashed' }} />
-            <Highlighter codeHighlight={codeHighlight} main>
-              {children}
-            </Highlighter>
-          </>
-        )}
-      </Card>
+          {/* card footer - clipboard & highlighter  */}
+          {codeHighlight && (
+            <>
+              <Divider sx={{ borderStyle: 'dashed' }} />
+              <Highlighter codeHighlight={codeHighlight} main>
+                {children}
+              </Highlighter>
+            </>
+          )}
+        </Card></Grid>
     );
   }
 );

src/pages/Proof/Create_FromApp/ApplicationDetails.js

@@ -59,7 +59,7 @@ const SearchPublicNoticeForm = ({ formData }) => {
                 {/*row 1*/}
                 <CardContent sx={{ px: 2.5, pt: 3 }}>
                     <Grid item justifyContent="space-between" alignItems="center">
-                        <Typography variant="h5" sx={{ mb: 2, borderBottom: "1px solid black" }}>
+                        <Typography variant="h4" sx={{ mb: 2, borderBottom: "1px solid black" }}>
                             Application Details
                         </Typography>
                     </Grid>
@@ -72,12 +72,13 @@ const SearchPublicNoticeForm = ({ formData }) => {
                             alignItems="center">
                             <Grid item xs={12} md={6} lg={6} sx={{ mb: 1 }}>
                                 <Grid container alignItems={"center"}>
-                                    <Grid item xs={12} md={3} lg={3}
-                                        sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Application No:</FormLabel>
+                                    <Grid item xs={12} md={4} lg={4}
+                                        // sx={{ display: 'flex', alignItems: 'center' }}
+                                        >
+                                        <FormLabel><Typography variant="h5">Application No:</Typography></FormLabel>
                                     </Grid>
 
-                                    <Grid item xs={12} md={9} lg={9}>
+                                    <Grid item xs={12} md={8} lg={8}>
                                         <DisplayField
                                             name='appNo'
                                         />
@@ -90,34 +91,34 @@ const SearchPublicNoticeForm = ({ formData }) => {
                             alignItems="center">
                             <Grid item xs={12} md={6} lg={6} sx={{ mb: 1 }}>
                                 <Grid container alignItems={"center"}>
-                                    <Grid item xs={12} md={3} lg={3}
+                                    <Grid item xs={12} md={4} lg={4}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Applicant:</FormLabel>
+                                        <FormLabel><Typography variant="h5">Applicant:</Typography></FormLabel>
                                     </Grid>
 
-                                    <Grid item xs={12} md={9} lg={9}>
+                                    <Grid item xs={12} md={8} lg={8}>
                                         <DisplayField
                                             name={formik.values?.orgId ? 'enCompanyName' : 'contactPerson'}
                                         />
                                     </Grid>
                                 </Grid>
                             </Grid>
-                            <Grid item xs={12} md={5} lg={5} sx={{ mb: 1, ml: 1 }}>
+                            <Grid item xs={12} md={5} lg={5} sx={{ mb: 1 }}>
                                 <Grid container alignItems={"center"}>
                                     <Grid item xs={12} md={4} lg={4}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Contact Phone:</FormLabel>
+                                        <FormLabel><Typography variant="h5">Contact Phone:</Typography></FormLabel>
                                     </Grid>
 
                                     <Grid item xs={12} md={8} lg={8}>
                                         <Stack direction="row">
                                             <DisplayField
                                                 name='tel_countryCode'
-                                                width='25%'
+                                                width='35%'
                                             />
                                             <DisplayField
                                                 name='phoneNumber'
-                                                width='75%'
+                                                width='65%'
                                             />
                                         </Stack>
                                     </Grid>
@@ -128,34 +129,34 @@ const SearchPublicNoticeForm = ({ formData }) => {
                             alignItems="center">
                             <Grid item xs={12} md={6} lg={6} sx={{ mb: 1 }}>
                                 <Grid container alignItems={"center"}>
-                                    <Grid item xs={12} md={3} lg={3}
+                                    <Grid item xs={12} md={4} lg={4}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Contect Person:</FormLabel>
+                                        <FormLabel><Typography variant="h5">Contact Person:</Typography></FormLabel>
                                     </Grid>
 
-                                    <Grid item xs={12} md={9} lg={9}>
+                                    <Grid item xs={12} md={8} lg={8}>
                                         <DisplayField
                                             name='contactPerson'
                                         />
                                     </Grid>
                                 </Grid>
                             </Grid>
-                            <Grid item xs={12} md={5} lg={5} sx={{ mb: 1, ml: 1 }}>
+                            <Grid item xs={12} md={5} lg={5} sx={{ mb: 1 }}>
                                 <Grid container alignItems={"center"}>
                                     <Grid item xs={12} md={4} lg={4}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Contact Fax:</FormLabel>
+                                        <FormLabel><Typography variant="h5">Contact Fax:</Typography></FormLabel>
                                     </Grid>
 
                                     <Grid item xs={12} md={8} lg={8}>
                                         <Stack direction="row">
                                             <DisplayField
                                                 name='fax_countryCode'
-                                                width='25%'
+                                                width='35%'
                                             />
                                             <DisplayField
                                                 name='faxNumber'
-                                                width='75%'
+                                                width='65%'
                                             />
                                         </Stack>
                                     </Grid>

src/pages/Proof/Create_FromApp/GazetteDetails.js

@@ -26,7 +26,6 @@ const GazetteDetails = ({ formData }) => {
         initialValues: data,
     });
 
-
     const DisplayField = ({ name, width }) => {
         return <TextField
             fullWidth
@@ -54,49 +53,48 @@ const GazetteDetails = ({ formData }) => {
         <MainCard xs={12} md={12} lg={12}
             border={false}
             content={false}
-            style={{ height: '100%'}}
-            >
+            style={{ height: '100%' }}
+        >
 
-            <form style={{ height: '100%'}}>
+            <form style={{ height: '100%' }}>
                 {/*row 1*/}
                 <CardContent sx={{ px: 2.5, pt: 3 }}>
                     <Grid item justifyContent="space-between" alignItems="center">
-                        <Typography variant="h5" sx={{ mb: 2, borderBottom: "1px solid black" }}>
+                        <Typography variant="h4" sx={{ mb: 2, borderBottom: "1px solid black" }}>
                             Gazette Details
                         </Typography>
                     </Grid>
                 </CardContent>
 
                 {/*row 2*/}
-                <Grid container direction="column" sx={{ paddingLeft: 4, paddingRight: 4 }} style={{ height: '100%'}}>
+                <Grid container direction="column" sx={{ paddingLeft: 4, paddingRight: 4 }} style={{ height: '100%' }}>
                     <Grid item xs={12} md={12}>
                         <Grid container direction="row" justifyContent="space-between"
                             alignItems="center">
-                            <Grid item xs={12} md={6} lg={6} sx={{ mb: 1 }}>
+                            <Grid item xs={12} md={12} lg={12} sx={{ mb: 1 }}>
                                 <Grid container alignItems={"center"}>
-                                    <Grid item xs={12} md={3} lg={3}
+                                    <Grid item xs={12} md={4} lg={4}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Issue Number:</FormLabel>
+                                        <FormLabel><Typography variant="h5">Issue Number:</Typography></FormLabel>
                                     </Grid>
 
-                                    <Grid item xs={12} md={9} lg={9}>
+                                    <Grid item xs={12} md={8} lg={8}>
                                         <DisplayField
                                             name="issueNoStr"
-
                                         />
                                     </Grid>
                                 </Grid>
                             </Grid>
-                            <Grid item xs={12} md={5} lg={5} sx={{ mb: 1, ml: 1 }}>
+                            <Grid item xs={12} md={12} lg={12} sx={{ mb: 1 }}>
                                 <Grid container alignItems={"center"}>
-                                    <Grid item xs={12} md={3} lg={3}
+                                    <Grid item xs={12} md={4} lg={4}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Gazette Code:</FormLabel>
+                                        <FormLabel><Typography variant="h5">Issue Date:</Typography></FormLabel>
                                     </Grid>
 
-                                    <Grid item xs={12} md={9} lg={9}>
+                                    <Grid item xs={12} md={8} lg={8}>
                                         <DisplayField
-                                            name="groupNo"
+                                            name="issueDate"
 
                                         />
                                     </Grid>
@@ -105,29 +103,28 @@ const GazetteDetails = ({ formData }) => {
                         </Grid>
                         <Grid container direction="row" justifyContent="space-between"
                             alignItems="center">
-                            <Grid item xs={12} md={6} lg={6} sx={{ mb: 1 }}>
+                            <Grid item xs={12} md={12} lg={12} sx={{ mb: 1 }}>
                                 <Grid container alignItems={"center"}>
-                                    <Grid item xs={12} md={3} lg={3}
+                                    <Grid item xs={12} md={4} lg={4}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Issue Date:</FormLabel>
+                                        <FormLabel><Typography variant="h5">Gazette Code:</Typography></FormLabel>
                                     </Grid>
 
-                                    <Grid item xs={12} md={9} lg={9}>
+                                    <Grid item xs={12} md={8} lg={8}>
                                         <DisplayField
-                                            name="issueDate"
-
+                                            name="groupNo"
                                         />
                                     </Grid>
                                 </Grid>
                             </Grid>
-                            <Grid item xs={12} md={5} lg={5} sx={{ mb: 1, ml: 1 }}>
+                            <Grid item xs={12} md={12} lg={12} sx={{ mb: 1 }}>
                                 <Grid container alignItems={"center"}>
-                                    <Grid item xs={12} md={3} lg={3}
+                                    <Grid item xs={12} md={4} lg={4}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Group Title:</FormLabel>
+                                        <FormLabel><Typography variant="h5">Group Title:</Typography></FormLabel>
                                     </Grid>
 
-                                    <Grid item xs={12} md={9} lg={9}>
+                                    <Grid item xs={12} md={8} lg={8}>
                                         <DisplayField
                                             name="groupTitle"
                                         />

src/pages/Proof/Create_FromApp/ProofForm.js

@@ -162,9 +162,6 @@ const FormPanel = ({ formData }) => {
         }
     }
 
-
-
-
     return (
         <MainCard xs={12} md={12} lg={12}
             border={false}
@@ -174,7 +171,7 @@ const FormPanel = ({ formData }) => {
                 {/*row 1*/}
                 <CardContent sx={{ px: 2.5, pt: 3 }}>
                     <Grid item justifyContent="space-between" alignItems="center">
-                        <Typography variant="h5" sx={{ mb: 2, borderBottom: "1px solid black" }}>
+                        <Typography variant="h4" sx={{ mb: 2, borderBottom: "1px solid black" }}>
                             Proof
                         </Typography>
                     </Grid>
@@ -200,7 +197,9 @@ const FormPanel = ({ formData }) => {
                                 variant="contained"
                                 size="large"
                                 disabled={attachments.length >= (formik.values.groupType == "A" ? 2 : 1)}
-                            > Upload Files</Button>
+                            >
+                                <Typography variant="h5">Upload Files</Typography>
+                            </Button>
                         </label>
                     </Grid>
 
@@ -211,8 +210,8 @@ const FormPanel = ({ formData }) => {
 
                     {
                         wait ?
-                            <Grid item xs={12} md={12}>
-                                <Typography variant="h3" style={{color: "blue" }}>Calculating, please wait ...</Typography>
+                            <Grid item xs={12} md={12} sx={{ mt: 1.5, mb: 1.5 }}>
+                                <Typography variant="h3" style={{ color: "blue" }}>Calculating, please wait ...</Typography>
                             </Grid>
                             :
                             <Grid item xs={12} md={12}>
@@ -224,7 +223,7 @@ const FormPanel = ({ formData }) => {
                                         textTransform: 'capitalize',
                                         alignItems: 'end'
                                     }}>
-                                    Calculate
+                                    <Typography variant="h5">Calculate</Typography>
                                 </Button>
                             </Grid>
                     }
@@ -258,13 +257,13 @@ const FormPanel = ({ formData }) => {
                                         }
                                     />
                                     <FormLabel sx={{ paddingLeft: 2, paddingRight: 2, textAlign: "center" }}>
-                                        pages
+                                        <Typography variant="h5">pages</Typography>
                                     </FormLabel>
                                     <FormLabel sx={{ paddingLeft: 2, paddingRight: 2, textAlign: "center" }}>
-                                        x
+                                        <Typography variant="h5">x</Typography>
                                     </FormLabel>
                                     <FormLabel sx={{ paddingLeft: 2, paddingRight: 2, textAlign: "center" }}>
-                                        ${formik.values.price ? formik.values.price : "6,552"}
+                                        <Typography variant="h5">${formik.values.price ? formik.values.price : "6,552"}</Typography>
                                     </FormLabel>
                                 </Stack>
                             </Grid>
@@ -294,11 +293,11 @@ const FormPanel = ({ formData }) => {
                                         }
                                     />
                                     <FormLabel sx={{ paddingLeft: 2, paddingRight: 2, textAlign: "center" }}>
-                                        cm
+                                        <Typography variant="h5">cm</Typography>
                                     </FormLabel>
 
                                     <FormLabel sx={{ paddingLeft: 2, paddingRight: 4, textAlign: "center" }}>
-                                        x
+                                        <Typography variant="h5">x</Typography>
                                     </FormLabel>
 
                                     <Autocomplete
@@ -337,10 +336,10 @@ const FormPanel = ({ formData }) => {
                     <Grid item xs={12} md={12}>
                         <Stack direction="row" sx={{ display: 'flex', alignItems: 'center' }}>
                             <FormLabel sx={{ paddingRight: 2, textAlign: "center" }}>
-                                Necessary fee:
+                                <Typography variant="h5">Necessary fee:</Typography>
                             </FormLabel>
                             <FormLabel sx={{ paddingLeft: 2, paddingRight: 2, textAlign: "center" }}>
-                                $
+                                <Typography variant="h5">$</Typography>
                             </FormLabel>
                             <TextField
                                 fullWidth
@@ -375,7 +374,7 @@ const FormPanel = ({ formData }) => {
                                 textTransform: 'capitalize',
                                 alignItems: 'end'
                             }}>
-                            Save
+                            <Typography variant="h5">Save</Typography>
                         </Button>
                     </Grid>
 
@@ -385,12 +384,12 @@ const FormPanel = ({ formData }) => {
             </form>
             <div>
                 <Dialog open={isWarningPopUp} onClose={() => setIsWarningPopUp(false)}  >
-                    <DialogTitle>Warning</DialogTitle>
+                    <DialogTitle><Typography variant="h3">Warning</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
-                        <Typography variant="h3" style={{ padding: '16px' }}>{warningText}</Typography>
+                        <Typography variant="h4" style={{ padding: '16px' }}>{warningText}</Typography>
                     </DialogContent>
                     <DialogActions>
-                        <Button onClick={() => setIsWarningPopUp(false)}>OK</Button>
+                        <Button onClick={() => setIsWarningPopUp(false)}><Typography variant="h5">OK</Typography></Button>
                     </DialogActions>
                 </Dialog>
             </div>

src/pages/Proof/Create_FromApp/index.js

@@ -20,7 +20,7 @@ const BackgroundHead = {
     backgroundImage: `url(${titleBackgroundImg})`,
     width: '100%',
     height: '100%',
-    backgroundSize:'contain',
+    backgroundSize: 'contain',
     backgroundRepeat: 'no-repeat',
     backgroundColor: '#0C489E',
     backgroundPosition: 'right'
@@ -69,23 +69,28 @@ const Index = () => {
             <LoadingComponent />
             :
 
-            <Grid container sx={{ minHeight: '85vh', backgroundColor: '#eee' }} direction="column" spacing={1} >
+            <Grid container sx={{ minHeight: '85vh', backgroundColor: "backgroundColor.default" }} direction="column" spacing={1} >
+                <Grid item xs={12}>
+                    <div style={BackgroundHead}>
+                        <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
+                            <Typography ml={15} color='#FFF' variant="h4">Create Proof</Typography>
+                        </Stack>
+                    </div>
+                </Grid>
                 <MainCard
                     elevation={0}
                     border={false}
-                    content={false}>
-                        <Grid item xs={12}>
-                <div style={BackgroundHead}>
-                    <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
-                        <Typography ml={15} color='#FFF' variant="h4">Create Proof</Typography>
-                    </Stack>
-                </div>
-            </Grid>
+                    content={false}
+                    sx={{
+                        backgroundColor: "backgroundColor.default"
+                    }}
+                >
+
                     {/*row 1*/}
                     <Grid item xs={12} md={12} lg={12}>
                         <Grid container direction="row" justify="flex-start" alignItems="stretch" spacing={1}>
                             <Grid item xs={12} md={12} lg={8}>
-                                <Box xs={12} ml={4} mt={3} sx={{ p: 1, border: '3px groove grey', borderRadius: '10px' }}>
+                                <Box xs={12} ml={4} mt={3} sx={{ pb: 8.5, pt: 1, borderRadius: '10px', backgroundColor: "#fff" }}>
                                     <ApplicationDetails
                                         formData={record}
                                         style={{
@@ -96,8 +101,8 @@ const Index = () => {
                                     />
                                 </Box>
                             </Grid>
-                            <Grid item xs={12} md={12} lg={4} >
-                                <Box xs={12} ml={4} mt={3} sx={{ p: 1, border: '3px groove grey', borderRadius: '10px' }}>
+                            <Grid item xs={12} md={12} lg={3.85}>
+                                <Box xs={12} ml={4} mt={3} sx={{ p: 1, borderRadius: '10px', backgroundColor: "#fff" }}>
                                     <GazetteDetails
                                         formData={record}
                                         style={{
@@ -111,18 +116,18 @@ const Index = () => {
                         </Grid>
                     </Grid>
                     {/*row 2*/}
-                    <Grid item xs={12} md={12} lg={12}>
+                    <Grid item xs={12} md={12} lg={12} sx={{ ml: 1 }}>
                         <MainCard elevation={0}
                             border={false}
                             content={false}
+                            backgroundColor={"backgroundColor.default"}
                         >
-                                <Box xs={12} ml={4} mt={3} sx={{ p: 1, border: '3px groove grey', borderRadius: '10px' }}>
-
-                            <ProofForm
-                                formData={record}
-                            />
+                            <Box xs={12} ml={4} mt={3} sx={{ p: 1, borderRadius: '10px', backgroundColor: "#fff" }}>
+                                <ProofForm
+                                    formData={record}
+                                />
                             </Box>
-                            <br/>
+                            <br />
                         </MainCard>
                     </Grid>
                 </MainCard>

src/pages/Proof/Reply_GLD/ApplicationDetails.js

@@ -16,7 +16,10 @@ const MainCard = Loadable(React.lazy(() => import('components/MainCard')));
 import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
 import FileList from "components/FileList"
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
-const ApplicationDetailCard = ({ formData, setBackButtonPos }) => {
+const ApplicationDetailCard = ({ 
+    formData, 
+    // setBackButtonPos 
+}) => {
 
     const params = useParams();
 
@@ -64,9 +67,9 @@ const ApplicationDetailCard = ({ formData, setBackButtonPos }) => {
         });
     }
     
-    React.useEffect(()=>{
-        if (document.getElementById("applicationDetailsMainCard")) setBackButtonPos(`${document.getElementById("applicationDetailsMainCard")?.getBoundingClientRect().left / 2}px`)
-    },[document.getElementById("applicationDetailsMainCard")])
+    // React.useEffect(()=>{
+        // if (document.getElementById("applicationDetailsMainCard")) setBackButtonPos(`${document.getElementById("applicationDetailsMainCard")?.getBoundingClientRect().left / 3}px`)
+    // },[document.getElementById("applicationDetailsMainCard")])
 
     return (
         <MainCard
@@ -74,7 +77,7 @@ const ApplicationDetailCard = ({ formData, setBackButtonPos }) => {
             border={false}
             content={false}
         >
-            <Typography variant="h5" sx={{ textAlign: "left", mb: 2, borderBottom: "1px solid black" }}>
+            <Typography variant="h4" sx={{ textAlign: "left", mb: 2, borderBottom: "1px solid black" }}>
                 Public Notice: Proofreading Reply
             </Typography>
             <form>
@@ -86,7 +89,7 @@ const ApplicationDetailCard = ({ formData, setBackButtonPos }) => {
                                 <Grid container alignItems={"center"}>
                                     <Grid item xs={12} md={3} lg={3}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>App No.:</FormLabel>
+                                        <FormLabel><Typography variant="h5">App No.:</Typography></FormLabel>
                                     </Grid>
 
                                     <Grid item xs={12} md={9} lg={9}>
@@ -98,7 +101,7 @@ const ApplicationDetailCard = ({ formData, setBackButtonPos }) => {
                                 <Grid container alignItems={"left"}>
                                     <Grid item xs={12} md={3} lg={3}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Status:</FormLabel>
+                                        <FormLabel><Typography variant="h5">Status:</Typography></FormLabel>
                                     </Grid>
 
                                     <Grid item xs={12} md={9} lg={9} sx={{ display: 'flex', alignItems: 'center' }}>
@@ -115,7 +118,7 @@ const ApplicationDetailCard = ({ formData, setBackButtonPos }) => {
                                 <Grid container alignItems={"center"}>
                                     <Grid item xs={12} md={3} lg={3}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Applicant:</FormLabel>
+                                        <FormLabel><Typography variant="h5">Applicant:</Typography></FormLabel>
                                     </Grid>
 
                                     <Grid item xs={12} md={9} lg={9}>
@@ -133,7 +136,7 @@ const ApplicationDetailCard = ({ formData, setBackButtonPos }) => {
                                 <Grid container alignItems={"center"}>
                                     <Grid item xs={12} md={3} lg={3}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Issue No:</FormLabel>
+                                        <FormLabel><Typography variant="h5">Issue No:</Typography></FormLabel>
                                     </Grid>
 
                                     <Grid item xs={12} md={9} lg={9}>
@@ -148,7 +151,7 @@ const ApplicationDetailCard = ({ formData, setBackButtonPos }) => {
                                 <Grid container alignItems={"center"}>
                                     <Grid item xs={12} md={3} lg={3}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Contact Person:</FormLabel>
+                                        <FormLabel><Typography variant="h5">Contact Person:</Typography></FormLabel>
                                     </Grid>
 
                                     <Grid item xs={12} md={9} lg={9}>
@@ -161,7 +164,7 @@ const ApplicationDetailCard = ({ formData, setBackButtonPos }) => {
                                 <Grid container alignItems={"center"}>
                                     <Grid item xs={12} md={3} lg={3}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <FormLabel>Issue Date:</FormLabel>
+                                        <FormLabel><Typography variant="h5">Issue Date:</Typography></FormLabel>
                                     </Grid>
 
                                     <Grid item xs={12} md={9} lg={9}>
@@ -194,7 +197,7 @@ const ApplicationDetailCard = ({ formData, setBackButtonPos }) => {
                             <Grid item xs={12} md={6} lg={6} sx={{ mb: 1, }}>
                                 <Grid container alignItems={"center"}>
                                     <Grid item xs={12} md={12} lg={12} sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <Typography>Print file：</Typography>
+                                        <Typography variant="h5">Print file：</Typography>
                                     </Grid>
                                 </Grid>
                                 <FileList
@@ -213,25 +216,25 @@ const ApplicationDetailCard = ({ formData, setBackButtonPos }) => {
                                 <Grid container alignItems={"center"}>
                                     <Grid item xs={12} md={12} lg={12}
                                         sx={{ display: 'flex', alignItems: 'center' }}>
-                                        <Typography>Deadline for payment and reply：</Typography>
+                                        <Typography variant="h5">Deadline for payment and reply：</Typography>
                                     </Grid>
                                     <Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}>
-                                        <Typography>{DateUtils.dateStr(data.returnBeforeDate)} Before 2:00 PM</Typography>
+                                        <Typography variant="h5">{DateUtils.dateStr(data.returnBeforeDate)} Before 2:00 PM</Typography>
                                     </Grid>
                                     <Grid item xs={12} md={3} lg={3}
                                         sx={{ mb: 1, display: 'flex', alignItems: 'center' }}>
-                                        <Typography>Fee:</Typography>
+                                        <Typography variant="h5">Fee:</Typography>
                                     </Grid>
                                     <Grid item xs={12} md={9} lg={9} sx={{ mb: 1, display: 'flex', alignItems: 'center' }}>
-                                        <Typography style={{ color: "blue", fontWeight: "bold", }}>{currencyFormat(data.fee)}</Typography>
+                                        <Typography variant="h5" style={{ color: "blue", fontWeight: "bold", }}>{currencyFormat(data.fee)}</Typography>
                                     </Grid>
                                     <Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}>
                                         {
                                             formik.values.groupType == "A"
                                                 ?
-                                                <Typography>( {data.noOfPages} page x $6,552 )</Typography>
+                                                <Typography variant="h5">( {data.noOfPages} page x $6,552 )</Typography>
                                                 :
-                                                <Typography>( {data.length} cm x {data.colCount == 2 ? "$364 Double Column" : "$182 Single Column"} )</Typography>
+                                                <Typography variant="h5">( {data.length} cm x {data.colCount == 2 ? "$364 Double Column" : "$182 Single Column"} )</Typography>
                                         }
                                     </Grid>
                                 </Grid>

src/pages/Proof/Reply_GLD/ProofForm.js

@@ -48,7 +48,7 @@ const FormPanel = ({ formData }) => {
             border={false}
             content={false}>
 
-            <Typography variant="h5" sx={{ textAlign: "left", mb: 2, borderBottom: "1px solid black" }}>
+            <Typography variant="h4" sx={{ textAlign: "left", mb: 2, borderBottom: "1px solid black" }}>
                 Public Notice: Proofreading Reply
             </Typography>
 
@@ -58,10 +58,10 @@ const FormPanel = ({ formData }) => {
                     formik.values.replyDate ?
                         <Grid container direction="column" sx={{ paddingLeft: 4, paddingRight: 4 }} spacing={1}>
                             <Grid item xs={12} md={12} textAlign="left">
-                                Reply Date: {DateUtils.datetimeStr(formik.values.replyDate)}
+                                <Typography variant="h5">Reply Date: {DateUtils.datetimeStr(formik.values.replyDate)}</Typography>
                             </Grid>
                             <Grid item xs={12} md={12} textAlign="left">
-                                Reply: {formik.values.action ? (<span style={{color:'green'}}>Ready for printing (correct manuscript).</span>) : (<span style={{color:'red'}}>Not ready for printing (requires modification).</span>)}
+                                <Typography variant="h5">Reply: {formik.values.action ? (<span style={{ color: 'green' }}>Ready for printing (correct manuscript).</span>) : (<span style={{ color: 'red' }}>Not ready for printing (requires modification).</span>)}</Typography>
                             </Grid>
                             {
                                 formik.values.action ?
@@ -87,13 +87,13 @@ const FormPanel = ({ formData }) => {
                             isOverTime() ?
                                 <Grid container direction="column" sx={{ paddingLeft: 4, paddingRight: 4 }} spacing={1}>
                                     <Grid item xs={12} md={12} textAlign="left">
-                                        The response timed out, please apply again.
+                                        <Typography variant="h5">The response timed out, please apply again.</Typography>
                                     </Grid>
                                 </Grid>
                                 :
                                 <Grid container direction="column" sx={{ paddingLeft: 4, paddingRight: 4 }} spacing={1}>
                                     <Grid item xs={12} md={12} textAlign="left">
-                                        Wait for reply.
+                                        <Typography variant="h5">Wait for reply.</Typography>
                                     </Grid>
                                 </Grid>
                         )

src/pages/Proof/Reply_GLD/index.js

@@ -92,12 +92,12 @@ const Index = () => {
     //     }
     // })
 
-    const [backButtonPos, setBackButtonPos] = React.useState()
-    const backButtonRef = React.useRef()
-    React.useLayoutEffect(()=>{
+    // const [backButtonPos, setBackButtonPos] = React.useState()
+    // const backButtonRef = React.useRef()
+    // React.useLayoutEffect(()=>{
         // console.log(applicationDetailsRef.current?.getBoundingClientRect())
-        if (backButtonRef.current) backButtonRef.current.style.marginLeft = `${backButtonPos}`
-    },[backButtonPos])
+    //     if (backButtonRef.current) backButtonRef.current.style.marginLeft = `${backButtonPos}`
+    // },[backButtonPos])
 
     // React.useEffect(()=>{
     //     if (backButtonRef.current) backButtonRef.current.style.marginLeft = `${backButtonLeftPos}`
@@ -108,7 +108,7 @@ const Index = () => {
             <LoadingComponent />
             :
             (
-                    <Grid container sx={{ minHeight: '110vh', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" >
+                    <Grid container sx={{ minHeight: '110vh', backgroundColor: 'backgroundColor.default' }} direction="column" justifyContent="flex-start" alignItems="center" >
                         <Grid item xs={12} width="100%">
                             <div style={BackgroundHead} width="100%">
                                 <Stack direction="row" height='70px'>
@@ -117,19 +117,19 @@ const Index = () => {
                             </div>
                         </Grid>
                         <Grid item xs={12} width="100%">
-                            <Button ref={backButtonRef} sx={{ml: backButtonPos, mt:2}} style={{ border: '2px solid' }} variant="outlined" onClick={()=>{navigate("/proof/search")}}>
+                            <Button sx={{ml: 6, mt:2}} style={{ border: '2px solid' }} variant="outlined" onClick={()=>{navigate("/proof/search")}}>
                                 <KeyboardBackspaceOutlinedIcon/>
                                 <Typography variant="h4">Back</Typography>
                             </Button>
                         </Grid>
                         {/*row 1*/}
                         <Grid item xs={12} md={12} >
-                            <Grid container justifyContent="flex-start" alignItems="center" >
+                            <Grid container justifyContent="flex-start" alignItems="center" direction="column">
                                 <center>
-                                    <Grid item xs={12} md={12} sx={{ pt: 2 }}>
-                                        <Box  xs={12} md={12} sx={{ p: 4, border: '3px groove grey', borderRadius: '10px' }}>
+                                    <Grid item xs={12} md={12} sx={{ pt: 2, ml: 6, mr: 6, }}>
+                                        <Box xs={12} md={12} sx={{ p: 4, borderRadius: '10px', backgroundColor: '#ffffff' }}>
                                             <ApplicationDetails
-                                                setBackButtonPos={setBackButtonPos}
+                                                // setBackButtonPos={setBackButtonPos}
                                                 formData={record}
                                                 style={{
                                                     display: "flex",
@@ -139,8 +139,8 @@ const Index = () => {
                                             />
                                         </Box>
                                     </Grid>
-                                    <Grid item xs={12} md={12} sx={{ pt: 1, pb: 2 }}>
-                                        <Box xs={12} md={12} sx={{ p: 4, border: '3px groove grey', borderRadius: '10px' }}>
+                                    <Grid item xs={12} md={12} sx={{ pt: 3, pb: 2, ml: 6, mr: 6, }}>
+                                        <Box xs={12} md={12} sx={{ p: 4, borderRadius: '10px', backgroundColor: '#ffffff' }}>
                                             <ProofForm
                                                 formData={record}
                                             />

src/pages/Proof/Search_GLD/DataGrid.js

@@ -1,11 +1,12 @@
 // material-ui
 import * as React from 'react';
 import {
-    Button
+    Button,
+    Box
 } from '@mui/material';
 import * as DateUtils from "utils/DateUtils";
-import {useNavigate} from "react-router-dom";
-import {FiDataGrid} from "components/FiDataGrid";
+import { useNavigate } from "react-router-dom";
+import { FiDataGrid } from "components/FiDataGrid";
 // ==============================|| EVENT TABLE ||============================== //
 
 export default function SearchPublicNoticeTable({ recordList }) {
@@ -17,7 +18,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
     }, [recordList]);
 
     const handleEditClick = (params) => () => {
-        navigate('/proof/reply/'+ params.row.id);
+        navigate('/proof/reply/' + params.row.id);
     };
 
 
@@ -35,16 +36,16 @@ export default function SearchPublicNoticeTable({ recordList }) {
             id: 'appId',
             field: 'appId',
             headerName: 'Application No./ Gazette Code/ Gazette Issue',
-            flex: 1,
+            flex: 1.5,
             renderCell: (params) => {
                 let appNo = params.row.appNo;
                 let code = params.row.groupNo;
                 let isssue = params.row.issueYear
-                +" Vol. "+zeroPad(params.row.issueVolume,3)
-                +", No. "+zeroPad(params.row.issueNo,2)
-                +", "+DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)");
+                    + " Vol. " + zeroPad(params.row.issueVolume, 3)
+                    + ", No. " + zeroPad(params.row.issueNo, 2)
+                    + ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)");
 
-                return <div style={{margin: 4}}>App No: {appNo}<br/>Gazette Code: {code}<br/>Issue: {isssue}</div>
+                return <div style={{ margin: 4 }}>App No: {appNo}<br />Gazette Code: {code}<br />Issue: {isssue}</div>
             },
         },
         {
@@ -62,7 +63,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             headerName: 'Confirmed/Return Date',
             flex: 1,
             valueGetter: (params) => {
-                return params?.value?DateUtils.datetimeStr(params?.value):"";
+                return params?.value ? DateUtils.datetimeStr(params?.value) : "";
             }
         },
         {
@@ -71,7 +72,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             headerName: 'Contact Person',
             flex: 1,
             renderCell: (params) => {
-                let company = params.row.enCompanyName!= null ?" ("+(params.row.enCompanyName)+")":"";
+                let company = params.row.enCompanyName != null ? " (" + (params.row.enCompanyName) + ")" : "";
 
                 let phone = JSON.parse(params.row.contactTelNo);
                 let faxNo = JSON.parse(params.row.contactFaxNo);
@@ -99,7 +100,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             headerName: 'Gazette Group',
             flex: 1,
             valueGetter: (params) => {
-                return (params?.value)?(params?.value):"";
+                return (params?.value) ? (params?.value) : "";
             }
         },
         {
@@ -108,42 +109,44 @@ export default function SearchPublicNoticeTable({ recordList }) {
             headerName: 'Fee',
             flex: 1,
             valueGetter: (params) => {
-                return (params?.value)?"$ "+currencyFormat(params?.value):"";
+                return (params?.value) ? "$ " + currencyFormat(params?.value) : "";
             }
         },
     ];
 
     function currencyFormat(num) {
         return num.toLocaleString('en-US', {
-            minimumFractionDigits: 2 
-          });
+            minimumFractionDigits: 2
+        });
     }
 
 
     function zeroPad(num, places) {
-        num=num?num:0;
+        num = num ? num : 0;
         var zero = places - num.toString().length + 1;
         return Array(+(zero > 0 && zero)).join("0") + num;
     }
-    
+
     function handleRowDoubleClick(params) {
         navigate('/proof/reply/' + params.row.id);
     }
 
     return (
-        <div style={{ height: 400, width: '100%' }}>
-
-            <FiDataGrid
-                rowHeight={80}
-                rows={rows}
-                columns={columns}
-                initialState={{
-                    pagination: {
-                        paginationModel: { page: 0, pageSize: 5 },
-                    },
-                }}
-                onRowDoubleClick={handleRowDoubleClick}
-            />
+        <div style={{ height: '100%', width: '100%' }}>
+            <Box sx={{ backgroundColor: "#fff", ml: 2 }} width="98%">
+                <FiDataGrid
+                    rowHeight={80}
+                    rows={rows}
+                    columns={columns}
+                    initialState={{
+                        pagination: {
+                            paginationModel: { page: 0, pageSize: 5 },
+                        },
+                    }}
+                    onRowDoubleClick={handleRowDoubleClick}
+                    getRowHeight={() => 'auto'}
+                />
+            </Box>
         </div>
     );
 }

src/pages/Proof/Search_GLD/SearchForm.js

@@ -10,11 +10,12 @@ import { useForm } from "react-hook-form";
 import * as React from "react";
 import * as ComboData from "utils/ComboData";
 import * as DateUtils from "utils/DateUtils";
+import { Typography } from '../../../../node_modules/@mui/material/index';
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
 
-const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issueComboData
-     }) => {
+const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, issueComboData
+}) => {
 
     const [type, setType] = React.useState([]);
     const [status, setStatus] = React.useState(ComboData.proofStatus[0]);
@@ -47,7 +48,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issu
             contact: data.contact,
             replyed: (status?.type && status?.type != 'all') ? status?.type : "",
             orgId: (orgSelected?.key && orgSelected?.key > 0) ? orgSelected?.key : "",
-            
+
         };
         applySearch(temp);
     };
@@ -73,16 +74,16 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issu
         reset();
     }
 
-    function getIssueLabel(data){
-        if(data=={}) return "";
-        return  data.year
-        +" Vol. "+zeroPad(data.volume,3)
-        +", No. "+zeroPad(data.issueNo,2)
-        +", "+DateUtils.dateFormat(data.issueDate, "D MMM YYYY (ddd)");
+    function getIssueLabel(data) {
+        if (data == {}) return "";
+        return data.year
+            + " Vol. " + zeroPad(data.volume, 3)
+            + ", No. " + zeroPad(data.issueNo, 2)
+            + ", " + DateUtils.dateFormat(data.issueDate, "D MMM YYYY (ddd)");
     }
 
     function zeroPad(num, places) {
-        num=num?num:0;
+        num = num ? num : 0;
         var zero = places - num.toString().length + 1;
         return Array(+(zero > 0 && zero)).join("0") + num;
     }
@@ -90,222 +91,227 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issu
     return (
         <MainCard xs={12} md={12} lg={12}
             border={false}
-            content={false}>
+            content={false}
+            sx={{ backgroundColor: 'backgroundColor.default' }}
+        >
 
             <form onSubmit={handleSubmit(onSubmit)}>
-                {/*row 1*/}
-                <CardContent sx={{ px: 2.5, pt: 3 }}>
-                    <Grid item justifyContent="space-between" alignItems="center">
-                        Search Form
-                    </Grid>
-                </CardContent>
-
-                {/*row 2*/}
-                <Grid container alignItems={"center"}>
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <TextField
-                            fullWidth
-                            {...register("refNo")}
-                            id='refNo'
-                            label="Proof No."
-                            defaultValue={searchCriteria.refNo}
-                            InputLabelProps={{
-                                shrink: true
-                            }}
-                        />
-                    </Grid>
+                <Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 3, mb: 3 }} width="98%">
+
+                    {/*row 1*/}
+                    <CardContent sx={{ px: 2.5, pt: 3 }}>
+                        <Grid item justifyContent="space-between" alignItems="center">
+                            <Typography variant="h5">Search Form</Typography>
+                        </Grid>
+                    </CardContent>
+
+                    {/*row 2*/}
+                    <Grid container alignItems={"center"}>
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <TextField
+                                fullWidth
+                                {...register("refNo")}
+                                id='refNo'
+                                label="Proof No."
+                                defaultValue={searchCriteria.refNo}
+                                InputLabelProps={{
+                                    shrink: true
+                                }}
+                            />
+                        </Grid>
+
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <TextField
+                                fullWidth
+                                {...register("code")}
+                                id='code'
+                                label="Application / Gazette Code"
+                                defaultValue={searchCriteria.code}
+                                InputLabelProps={{
+                                    shrink: true
+                                }}
+                            />
+                        </Grid>
+
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <Autocomplete
+                                {...register("issueId")}
+                                disablePortal
+                                id="issueId"
+                                options={issueCombo}
+                                value={issueSelected}
+                                inputValue={(issueSelected?.id) ? getIssueLabel(issueSelected) : ""}
+                                getOptionLabel={(option) => getIssueLabel(option)}
+                                onChange={(event, newValue) => {
+                                    setIssueSelected(newValue);
+                                }}
+                                renderInput={(params) => (
+                                    <TextField {...params}
+                                        label="Gazette Issue"
+                                        InputLabelProps={{
+                                            shrink: true
+                                        }}
+                                    />
+                                )}
+                            />
+                        </Grid>
+
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <Autocomplete
+                                {...register("gazettGroup")}
+                                disablePortal
+                                id="gazettGroup"
+                                options={ComboData.groupTitle}
+                                value={groupSelected}
+                                inputValue={(groupSelected?.label) ? groupSelected?.label : ""}
+                                getOptionLabel={(option) => option.label}
+                                onChange={(event, newValue) => {
+                                    setGroupSelected(newValue);
+                                }}
+                                renderInput={(params) => (
+                                    <TextField {...params}
+                                        label="Gazette Group"
+                                        InputLabelProps={{
+                                            shrink: true
+                                        }}
+                                    />
+                                )}
+                            />
+                        </Grid>
+
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <TextField
+                                fullWidth
+                                {...register("dateFrom")}
+                                id="dateFrom"
+                                type="date"
+                                label="Proof Date (From)"
+                                defaultValue={searchCriteria.dateFrom}
+                                InputProps={{ inputProps: { max: maxDate } }}
+                                onChange={(newValue) => {
+                                    setMinDate(DateUtils.dateStr(newValue));
+                                }}
+                                InputLabelProps={{
+                                    shrink: true
+                                }}
+                            />
+                        </Grid>
+
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <TextField
+                                fullWidth
+                                InputLabelProps={{
+                                    shrink: true
+                                }}
+                                {...register("dateTo")}
+                                InputProps={{ inputProps: { min: minDate } }}
+                                onChange={(newValue) => {
+                                    setMaxDate(DateUtils.dateStr(newValue));
+                                }}
+                                id="dateTo"
+                                type="date"
+                                label="Proof Date(To)"
+                                defaultValue={searchCriteria.dateTo}
+                            />
+                        </Grid>
+
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <TextField
+                                fullWidth
+                                {...register("contact")}
+                                id="contact"
+                                label="Contact Person"
+                                defaultValue={searchCriteria.contact}
+                                InputLabelProps={{
+                                    shrink: true
+                                }}
+                            />
+
+                        </Grid>
+
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <Autocomplete
+                                {...register("status")}
+                                disablePortal
+                                id="status"
+                                filterOptions={(options) => options}
+                                options={ComboData.proofStatus}
+                                value={status}
+                                inputValue={status?.label ? status?.label : ""}
+                                onChange={(event, newValue) => {
+                                    if (newValue !== null) {
+                                        setStatus(newValue);
+                                    }
+                                }}
+                                renderInput={(params) => (
+                                    <TextField {...params}
+                                        label="Status"
+                                    />
+                                )}
+                                InputLabelProps={{
+                                    shrink: true
+                                }}
+                            />
+                        </Grid>
+
+                        {
+                            orgCombo ?
+                                <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                                    <Autocomplete
+                                        {...register("orgId")}
+                                        disablePortal={false}
+                                        id="orgId"
+                                        options={orgCombo}
+                                        value={orgSelected}
+                                        inputValue={(orgSelected?.label) ? orgSelected?.label : ""}
+                                        onChange={(event, newValue) => {
+                                            setOrgSelected(newValue);
+                                        }}
+                                        renderInput={(params) => (
+                                            <TextField {...params}
+                                                label="Organization"
+                                                InputLabelProps={{
+                                                    shrink: true
+                                                }}
+                                            />
+                                        )}
+                                    />
+                                </Grid>
+                                : <></>
+                        }
 
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <TextField
-                            fullWidth
-                            {...register("code")}
-                            id='code'
-                            label="Application / Gazette Code"
-                            defaultValue={searchCriteria.code}
-                            InputLabelProps={{
-                                shrink: true
-                            }}
-                        />
-                    </Grid>
-
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <Autocomplete
-                            {...register("issueId")}
-                            disablePortal
-                            id="issueId"
-                            options={issueCombo}
-                            value={issueSelected}
-                            inputValue={(issueSelected?.id) ? getIssueLabel(issueSelected) : ""}
-                            getOptionLabel={(option)=>getIssueLabel(option)}
-                            onChange={(event, newValue) => {
-                                setIssueSelected(newValue);
-                            }}
-                            renderInput={(params) => (
-                                <TextField {...params}
-                                    label="Gazette Issue"
-                                    InputLabelProps={{
-                                        shrink: true
-                                    }}
-                                />
-                            )}
-                        />
-                    </Grid>
 
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <Autocomplete
-                            {...register("gazettGroup")}
-                            disablePortal
-                            id="gazettGroup"
-                            options={ComboData.groupTitle}
-                            value={groupSelected}
-                            inputValue={(groupSelected?.label)?groupSelected?.label:""}
-                            getOptionLabel={(option)=>option.label}
-                            onChange={(event, newValue) => {
-                                setGroupSelected(newValue);
-                            }}
-                            renderInput={(params) => (
-                                <TextField {...params}
-                                    label="Gazette Group"
-                                    InputLabelProps={{
-                                        shrink: true
-                                    }}
-                                />
-                            )}
-                        />
                     </Grid>
 
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <TextField
-                            fullWidth
-                            {...register("dateFrom")}
-                            id="dateFrom"
-                            type="date"
-                            label="Proof Date (From)"
-                            defaultValue={searchCriteria.dateFrom}
-                            InputProps={{ inputProps: { max: maxDate } }}
-                            onChange={(newValue) => {
-                                setMinDate(DateUtils.dateStr(newValue));
-                            }}
-                            InputLabelProps={{
-                                shrink: true
-                            }}
-                        />
-                    </Grid>
-
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <TextField
-                            fullWidth
-                            InputLabelProps={{
-                                shrink: true
-                            }}
-                            {...register("dateTo")}
-                            InputProps={{ inputProps: { min: minDate } }}
-                            onChange={(newValue) => {
-                                setMaxDate(DateUtils.dateStr(newValue));
-                            }}
-                            id="dateTo"
-                            type="date"
-                            label="Proof Date(To)"
-                            defaultValue={searchCriteria.dateTo}
-                        />
-                    </Grid>
-
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <TextField
-                            fullWidth
-                            {...register("contact")}
-                            id="contact"
-                            label="Contact Person"
-                            defaultValue={searchCriteria.contact}
-                            InputLabelProps={{
-                                shrink: true
-                            }}
-                        />
-
-                    </Grid>
-
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <Autocomplete
-                            {...register("status")}
-                            disablePortal
-                            id="status"
-                            filterOptions={(options) => options}
-                            options={ComboData.proofStatus}
-                            value={status}
-                            inputValue={status?.label?status?.label:""}
-                            onChange={(event, newValue) => {
-                                if (newValue !== null) {
-                                    setStatus(newValue);
-                                }
-                            }}
-                            renderInput={(params) => (
-                                <TextField {...params}
-                                    label="Status"
-                                />
-                            )}
-                            InputLabelProps={{
-                                shrink: true
-                            }}
-                        />
-                    </Grid>
-
-                    {
-                        orgCombo ?
-                            <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                                <Autocomplete
-                                    {...register("orgId")}
-                                    disablePortal
-                                    id="orgId"
-                                    options={orgCombo}
-                                    value={orgSelected}
-                                    inputValue={(orgSelected?.label) ? orgSelected?.label : ""}
-                                    onChange={(event, newValue) => {
-                                        setOrgSelected(newValue);
-                                    }}
-                                    renderInput={(params) => (
-                                        <TextField {...params}
-                                            label="Organization"
-                                            InputLabelProps={{
-                                                shrink: true
-                                            }}
-                                        />
-                                    )}
-                                />
-                            </Grid>
-                            : <></>
-                    }
-
-
-                </Grid>
-
-
-                {/*last row*/}
-                <Grid container maxWidth justifyContent="flex-end">
-
-                    <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
-                        <Button
-                            size="large"
-                            variant="contained"
-                            onClick={resetForm}
-                            sx={{
-                                textTransform: 'capitalize',
-                                alignItems: 'end'
-                            }}>
-                            Clear
-                        </Button>
-                    </Grid>
 
-                    <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
-                        <Button
-                            size="large"
-                            variant="contained"
-                            type="submit"
-                            sx={{
-                                textTransform: 'capitalize',
-                                alignItems: 'end'
-                            }}>
-                            Submit
-                        </Button>
+                    {/*last row*/}
+                    <Grid container maxWidth justifyContent="flex-end">
+
+                        <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
+                            <Button
+                                size="large"
+                                variant="contained"
+                                onClick={resetForm}
+                                sx={{
+                                    textTransform: 'capitalize',
+                                    alignItems: 'end'
+                                }}>
+                                <Typography variant="h5">Clear</Typography>
+                            </Button>
+                        </Grid>
+
+                        <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
+                            <Button
+                                size="large"
+                                variant="contained"
+                                type="submit"
+                                sx={{
+                                    textTransform: 'capitalize',
+                                    alignItems: 'end'
+                                }}>
+                                <Typography variant="h5">Submit</Typography>
+                            </Button>
+                        </Grid>
                     </Grid>
                 </Grid>
             </form>

src/pages/Proof/Search_GLD/index.js

@@ -20,7 +20,7 @@ const BackgroundHead = {
     backgroundImage: `url(${titleBackgroundImg})`,
     width: '100%',
     height: '100%',
-    backgroundSize:'contain',
+    backgroundSize: 'contain',
     backgroundRepeat: 'no-repeat',
     backgroundColor: '#0C489E',
     backgroundPosition: 'right'
@@ -30,12 +30,12 @@ const BackgroundHead = {
 
 const UserSearchPage_Individual = () => {
 
-    const [record,setRecord] = React.useState([]);
-    const [orgCombo,setOrgCombo] = React.useState([]);
-    const [issueCombo,setIssueCombo] = React.useState([]);
+    const [record, setRecord] = React.useState([]);
+    const [orgCombo, setOrgCombo] = React.useState([]);
+    const [issueCombo, setIssueCombo] = React.useState([]);
     const [searchCriteria, setSearchCriteria] = React.useState({
         dateTo: DateUtils.dateStr(new Date()),
-        dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+        dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate() - 14)),
     });
     const [onReady, setOnReady] = React.useState(false);
 
@@ -53,36 +53,36 @@ const UserSearchPage_Individual = () => {
         getUserList();
     }, [searchCriteria]);
 
-    function getUserList(){
+    function getUserList() {
         HttpUtils.get({
             url: UrlUtils.LIST_PROOF,
             params: searchCriteria,
-            onSuccess: function(responseData){
+            onSuccess: function (responseData) {
                 setRecord(responseData);
             }
         });
     }
 
-    function getOrgCombo(){
+    function getOrgCombo() {
         HttpUtils.get({
             url: UrlUtils.GET_ORG_COMBO,
-            onSuccess: function(responseData){
+            onSuccess: function (responseData) {
                 let combo = responseData;
                 setOrgCombo(combo);
             }
         });
     }
 
-    function getIssueCombo(){
+    function getIssueCombo() {
         HttpUtils.get({
             url: UrlUtils.GET_ISSUE_COMBO,
-            onSuccess: function(responseData){
+            onSuccess: function (responseData) {
                 let combo = responseData;
                 setIssueCombo(combo);
             }
         });
     }
-    
+
 
     function applySearch(input) {
         setSearchCriteria(input);
@@ -90,9 +90,10 @@ const UserSearchPage_Individual = () => {
 
     return (
         !onReady ?
-            <LoadingComponent/>
+            <LoadingComponent />
             :
-            <Grid container sx={{minHeight: '85vh',backgroundColor:'#ffffff'}} direction="column">
+            <Grid container sx={{ minHeight: '85vh', backgroundColor: 'backgroundColor.default' }} direction="column"
+            >
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
@@ -102,18 +103,19 @@ const UserSearchPage_Individual = () => {
                 </Grid>
                 {/*row 1*/}
                 <Grid item xs={12} md={12} lg={12}>
-                    <SearchForm 
-                    applySearch={applySearch}
-                    orgComboData={orgCombo}
-                    issueComboData={issueCombo}
-                    searchCriteria={searchCriteria}
+                    <SearchForm
+                        applySearch={applySearch}
+                        orgComboData={orgCombo}
+                        issueComboData={issueCombo}
+                        searchCriteria={searchCriteria}
                     />
                 </Grid>
                 {/*row 2*/}
-                <Grid item xs={12} md={12} lg={12}>
+
+                <Grid item xs={12} md={12} lg={12} sx={{ ml: 2, mr: 2 }}>
                     <MainCard elevation={0}
-                            border={false}
-                            content={false}
+                        border={false}
+                        content={false}
                     >
                         <EventTable
                             recordList={record}

src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js

@@ -121,7 +121,7 @@ const ApplicationDetailCard = (
                 }
             });
             
-        }else{
+        }else {
             setWarningText("Please generate Gazette Code before Create Proof.");
             setIsWarningPopUp(true);
         }
@@ -161,7 +161,7 @@ const ApplicationDetailCard = (
                                             alignItems: 'end'
                                         }}>
                                         <EditNoteIcon />
-                                        <Typography ml={1}> Create Proof</Typography>
+                                        <Typography ml={1} variant="h5"> Create Proof</Typography>
                                     </Button> :
                                     null
                                 }
@@ -184,7 +184,7 @@ const ApplicationDetailCard = (
                                             color="orange"
                                         >
                                             <ReplayIcon />
-                                            <Typography ml={1}> Re-submit</Typography>
+                                            <Typography ml={1} variant="h5"> Re-submit</Typography>
                                         </Button>
                                         <Button
                                             // size="large"
@@ -196,7 +196,7 @@ const ApplicationDetailCard = (
                                                 alignItems: 'end',
                                             }}>
                                             <CloseIcon />
-                                            <Typography ml={1}>Not accepted</Typography>
+                                            <Typography ml={1} variant="h5">Not accepted</Typography>
                                         </Button>
                                     </> :
                                     currentApplicationDetailData.status == "paid" ?
@@ -211,7 +211,7 @@ const ApplicationDetailCard = (
                                                     backgroundColor: '#52b202'
                                                 }}>
                                                 <DoneIcon />
-                                                <Typography ml={1}> Complete</Typography>
+                                                <Typography ml={1} variant="h5">Complete</Typography>
                                             </Button>
                                             <Button
                                                 // size="large"
@@ -223,7 +223,7 @@ const ApplicationDetailCard = (
                                                     backgroundColor: '#ffa733'
                                                 }}>
                                                 <CloseIcon />
-                                                <Typography ml={1}> Withdraw</Typography>
+                                                <Typography ml={1} variant="h5">Withdraw</Typography>
                                             </Button>
                                         </> : null
                                 }
@@ -231,7 +231,7 @@ const ApplicationDetailCard = (
                         </Grid>
                     </Grid> : null
                 }
-                <Typography variant="h5" xs={12} md={12} sx={{ mb: 2, borderBottom: "1px solid black" }}>
+                <Typography variant="h4" xs={12} md={12} sx={{ mb: 2, borderBottom: "1px solid black" }}>
                     Application Details
                 </Typography>
                 <form>
@@ -243,7 +243,7 @@ const ApplicationDetailCard = (
                                     <Grid container alignItems={"center"}>
                                         <Grid item xs={12} md={3} lg={3}
                                             sx={{ display: 'flex', alignItems: 'center' }}>
-                                            <FormLabel>Application No:</FormLabel>
+                                            <FormLabel><Typography variant="h5">Application No:</Typography></FormLabel>
                                         </Grid>
 
                                         <Grid item xs={12} md={9} lg={9}>
@@ -271,7 +271,7 @@ const ApplicationDetailCard = (
                                     <Grid container alignItems={"center"}>
                                         <Grid item xs={12} md={3} lg={3}
                                             sx={{ display: 'flex', alignItems: 'center' }}>
-                                            <FormLabel>Status:</FormLabel>
+                                            <FormLabel><Typography variant="h5">Status:</Typography></FormLabel>
                                         </Grid>
 
                                         <Grid item xs={12} md={9} lg={9}>
@@ -288,7 +288,7 @@ const ApplicationDetailCard = (
                                     <Grid container alignItems={"center"}>
                                         <Grid item xs={12} md={3} lg={3}
                                             sx={{ display: 'flex', alignItems: 'center' }}>
-                                            <FormLabel>Applicant:</FormLabel>
+                                            <FormLabel><Typography variant="h5">Applicant:</Typography></FormLabel>
                                         </Grid>
 
                                         <Grid item xs={12} md={9} lg={9}>
@@ -333,7 +333,7 @@ const ApplicationDetailCard = (
                                     <Grid container alignItems={"center"}>
                                         <Grid item xs={12} md={4} lg={4}
                                             sx={{ display: 'flex', alignItems: 'center' }}>
-                                            <FormLabel>Contact Phone:</FormLabel>
+                                            <FormLabel><Typography variant="h5">Contact Phone:</Typography></FormLabel>
                                         </Grid>
 
                                         <Grid item xs={12} md={8} lg={8}>
@@ -388,7 +388,7 @@ const ApplicationDetailCard = (
                                     <Grid container alignItems={"center"}>
                                         <Grid item xs={12} md={3} lg={3}
                                             sx={{ display: 'flex', alignItems: 'center' }}>
-                                            <FormLabel>Contect Person:</FormLabel>
+                                            <FormLabel><Typography variant="h5">Contect Person:</Typography></FormLabel>
                                         </Grid>
 
                                         <Grid item xs={12} md={9} lg={9}>
@@ -416,7 +416,7 @@ const ApplicationDetailCard = (
                                     <Grid container alignItems={"center"}>
                                         <Grid item xs={12} md={4} lg={4}
                                             sx={{ display: 'flex', alignItems: 'center' }}>
-                                            <FormLabel>Contact Fax:</FormLabel>
+                                            <FormLabel><Typography variant="h5">Contact Fax:</Typography></FormLabel>
                                         </Grid>
 
                                         <Grid item xs={12} md={8} lg={8}>
@@ -475,7 +475,7 @@ const ApplicationDetailCard = (
                                             <Grid container direction="row">
                                                 <Grid item xs={12} md={3} lg={3}
                                                     sx={{ display: 'flex', alignItems: 'center' }}>
-                                                    <FormLabel>Manuscript File:</FormLabel>
+                                                    <FormLabel><Typography variant="h5">Manuscript File:</Typography></FormLabel>
                                                 </Grid>
                                                 <Grid item xs={12} md={9} lg={9} sx={{ display: 'flex', alignItems: 'center' }}>
                                                     <Grid container direction="row" justifyContent="flex-start">
@@ -484,6 +484,7 @@ const ApplicationDetailCard = (
                                                                 <Typography
                                                                     // fullWidth
                                                                     id='fileName'
+                                                                    variant="h5"
                                                                 >
                                                                     {fileDetail.filename}
                                                                 </Typography>
@@ -512,16 +513,16 @@ const ApplicationDetailCard = (
                     </Grid>
                 </form>
                 <div>
-                <Dialog open={isWarningPopUp} onClose={() => setIsWarningPopUp(false)}  >
-                    <DialogTitle>Warning</DialogTitle>
-                    <DialogContent style={{ display: 'flex', }}>
-                        <Typography variant="h3" style={{ padding: '16px' }}>{warningText}</Typography>
-                    </DialogContent>
-                    <DialogActions>
-                        <Button onClick={() => setIsWarningPopUp(false)}>OK</Button>
-                    </DialogActions>
-                </Dialog>
-            </div>
+                    <Dialog open={isWarningPopUp} onClose={() => setIsWarningPopUp(false)}  >
+                        <DialogTitle><Typography variant="h3">Warning</Typography></DialogTitle>
+                        <DialogContent style={{ display: 'flex', }}>
+                            <Typography variant="h4" style={{ padding: '16px' }}>{warningText}</Typography>
+                        </DialogContent>
+                        <DialogActions>
+                            <Button onClick={() => setIsWarningPopUp(false)}><Typography variant="h5">OK</Typography></Button>
+                        </DialogActions>
+                    </Dialog>
+                </div>
             </MainCard>
     );
 };

src/pages/PublicNotice/Details_GLD/ClientDetailCard.js

@@ -1,8 +1,8 @@
 // material-ui
 import {
-    FormControl, 
+    FormControl,
     Button,
-    Grid, 
+    Grid,
     // InputAdornment, 
     Typography, FormLabel,
     OutlinedInput,
@@ -10,11 +10,11 @@ import {
 } from '@mui/material';
 import MainCard from "../../../components/MainCard";
 import * as React from "react";
-import {useForm} from "react-hook-form";
+import { useForm } from "react-hook-form";
 import {
     useEffect,
     useState
-    } from "react";
+} from "react";
 // import Checkbox from "@mui/material/Checkbox";
 import Loadable from 'components/Loadable';
 import { lazy } from 'react';
@@ -27,17 +27,17 @@ import HighlightOff from '@mui/icons-material/HighlightOff';
 
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 const ClientDetailCard = (
-    {   applicationDetailData,
+    { applicationDetailData,
         // isCollectData,
         // updateUserObject,
         // isNewRecord
     }
-    ) => {
+) => {
     // const params = useParams();
     const [currentApplicationDetailData, setCurrentApplicationDetailData] = useState({});
-    const [onReady,setOnReady] = useState(false);
-    const [companyName, setCompanyName] = useState({enCompanyName:"",chCompanyName:""});
-    const {register, 
+    const [onReady, setOnReady] = useState(false);
+    const [companyName, setCompanyName] = useState({ enCompanyName: "", chCompanyName: "" });
+    const { register,
         // getValues
     } = useForm()
     // const navigate = useNavigate()
@@ -46,12 +46,12 @@ const ClientDetailCard = (
         //if user data from parent are not null
         if (Object.keys(applicationDetailData).length > 0 && applicationDetailData !== undefined) {
             setCurrentApplicationDetailData(applicationDetailData.userData);
-            if (!applicationDetailData.companyName1==null){
+            if (!applicationDetailData.companyName1 == null) {
                 setCompanyName(applicationDetailData.companyName);
-            }else{
-                const companyNameData ={
-                    enCompanyName:applicationDetailData.userData.enCompanyName,
-                    chCompanyName:applicationDetailData.userData.chCompanyName
+            } else {
+                const companyNameData = {
+                    enCompanyName: applicationDetailData.userData.enCompanyName,
+                    chCompanyName: applicationDetailData.userData.chCompanyName
                 }
                 setCompanyName(companyNameData)
             }
@@ -68,12 +68,12 @@ const ClientDetailCard = (
 
     const handleViewClick = () => () => {
         console.log(currentApplicationDetailData)
-        currentApplicationDetailData.type == "ORG"?
-        window.open('/orgUser/'+ currentApplicationDetailData.id, "_blank", "noreferrer"):
-        window.open('/indUser/'+ currentApplicationDetailData.id, "_blank", "noreferrer");
+        currentApplicationDetailData.type == "ORG" ?
+            window.open('/orgUser/' + currentApplicationDetailData.id, "_blank", "noreferrer") :
+            window.open('/indUser/' + currentApplicationDetailData.id, "_blank", "noreferrer");
         window.addEventListener("focus", onFocus)
     };
-    
+
     const onFocus = () => {
         window.removeEventListener("focus", onFocus)
         location.reload();
@@ -91,15 +91,15 @@ const ClientDetailCard = (
 
     return (
         !onReady ?
-            <LoadingComponent/>
+            <LoadingComponent />
             :
             <MainCard elevation={0}
-                      border={false}
-                      content={false}
-                      sx={{xs:"12", md:"7"}}>
+                border={false}
+                content={false}
+                sx={{ xs: "12", md: "7" }}>
                 <Grid container spacing={1} direction="row">
                     <Grid item xs={12} md={7} >
-                        <Stack 
+                        <Stack
                             direction="row"
                             justifyContent="flex-start"
                             alignItems="center"
@@ -114,42 +114,42 @@ const ClientDetailCard = (
                                     textTransform: 'capitalize',
                                     alignItems: 'end',
                                 }}>
-                                <ContentPasteSearchIcon/>
-                                <Typography ml={1} mr={1}> View</Typography>
+                                <ContentPasteSearchIcon />
+                                <Typography variant="h5" ml={1} mr={1}> View</Typography>
                             </Button>
                         </Stack>
                     </Grid>
                 </Grid>
-                <Typography variant="h5" sx={{mb: 2, borderBottom: "1px solid black"}}>
-                        Client Details
+                <Typography variant="h4" sx={{ mb: 2, borderBottom: "1px solid black" }}>
+                    Client Details
                 </Typography>
                 <form>
                     <Grid container direction="column" justifyContent="flex-start"
-                                alignItems="flex-start">
+                        alignItems="flex-start">
                         <Grid item xs={12} md={12} lg={12} mb={1}  >
-                                {currentApplicationDetailData.verifiedBy!==null?
-                                    <Stack direction="row">
-                                        <Typography>
-                                            Verified
-                                        </Typography>
-                                        <CheckCircleOutline color="success"/>
-                                    </Stack>:
-                                    <Stack direction="row">
-                                        <Typography>
-                                            Not Verified
-                                        </Typography>
-                                        <HighlightOff color="error"/>
-                                    </Stack>
-                                }
+                            {currentApplicationDetailData.verifiedBy !== null ?
+                                <Stack direction="row">
+                                    <Typography variant="h5">
+                                        Verified
+                                    </Typography>
+                                    <CheckCircleOutline sx={{ mt: 0.5, ml: 0.2 }} color="success" />
+                                </Stack> :
+                                <Stack direction="row">
+                                    <Typography variant="h5">
+                                        Not Verified
+                                    </Typography>
+                                    <HighlightOff sx={{ mt: 0.5, ml: 0.2 }} color="error" />
+                                </Stack>
+                            }
                         </Grid>
                     </Grid>
                     <Grid container direction="column" justifyContent="flex-start"
-                                alignItems="flex-start">
+                        alignItems="flex-start">
                         <Grid item xs={12} md={12} lg={12} mb={1}  >
-                            <FormLabel>Client Type:</FormLabel>
+                            <FormLabel><Typography variant="h5">Client Type:</Typography></FormLabel>
                         </Grid>
-                        <Grid item xs={12} md={12} lg={12} mb={1} sx={{width:'100%'}} >
-                            <FormControl variant="outlined" sx={{width:'100%'}} disabled>
+                        <Grid item xs={12} md={12} lg={12} mb={1} sx={{ width: '100%' }} >
+                            <FormControl variant="outlined" sx={{ width: '100%' }} disabled>
                                 <OutlinedInput
                                     size="small"
                                     {...register("type",
@@ -167,99 +167,23 @@ const ClientDetailCard = (
                             </FormControl>
                         </Grid>
                     </Grid>
-                    {currentApplicationDetailData.type==="ORG"?
-                    <>
-                        <Grid container direction="column" justifyContent="flex-start"
-                                    alignItems="flex-start">
-                            <Grid item xs={12} md={12} lg={12} mb={1}   
-                                sx={{display: 'flex', alignItems: 'center'}}>
-                                <FormLabel>Company Name (English):</FormLabel>
-                            </Grid>
-                            <Grid item xs={12} md={12} lg={12} mb={1} sx={{width:'100%'}}  >
-                                <FormControl variant="outlined"  sx={{width:'100%'}} disabled >
-                                    <OutlinedInput
-                                        size="small"
-                                        {...register("enCompanyName",
-                                            {
-                                                value: companyName.enCompanyName ,
-                                            })}
-                                        id='enCompanyName'
-                                        sx={{
-                                            "& .MuiInputBase-input.Mui-disabled": {
-                                                WebkitTextFillColor: "#000000",
-                                                background: "#f8f8f8",
-                                            },
-                                        }}
-                                    />
-                                </FormControl>
-                            </Grid>
-                        </Grid>
-                        <Grid container direction="column" justifyContent="flex-start"
-                                    alignItems="flex-start">
-                            <Grid item xs={12} md={12} lg={12} mb={1}   
-                                sx={{display: 'flex', alignItems: 'center'}}>
-                                <FormLabel>Company Name (Chinese):</FormLabel>
-                            </Grid>
-                            <Grid item xs={12} md={12} lg={12} mb={1} sx={{width:'100%'}}  >
-                                <FormControl variant="outlined" sx={{width:'100%'}}  disabled >
-                                    <OutlinedInput
-                                        size="small"
-                                        {...register("chCompanyName",
-                                            {
-                                                value: companyName.chCompanyName,
-                                            })}
-                                        id='chCompanyName'
-                                        sx={{
-                                            "& .MuiInputBase-input.Mui-disabled": {
-                                                WebkitTextFillColor: "#000000",
-                                                background: "#f8f8f8",
-                                            },
-                                        }}
-                                    />
-                                </FormControl>
-                            </Grid>
-                        </Grid>
-                        <Grid container direction="column" justifyContent="flex-start"
-                                    alignItems="flex-start">
-                            <Grid item xs={12} md={12} lg={12} mb={1}   
-                                sx={{display: 'flex', alignItems: 'center'}}>
-                                <FormLabel>English Name:</FormLabel>
-                            </Grid>
-                            <Grid item xs={12} md={12} lg={12} mb={1}  sx={{width:'100%'}} >
-                                <FormControl variant="outlined"  sx={{width:'100%'}} disabled >
-                                    <OutlinedInput
-                                        size="small"
-                                        {...register("contactPerson",
-                                            {
-                                                value: currentApplicationDetailData.contactPerson,
-                                            })}
-                                        id='contactPerson'
-                                        sx={{
-                                            "& .MuiInputBase-input.Mui-disabled": {
-                                                WebkitTextFillColor: "#000000",
-                                                background: "#f8f8f8",
-                                            },
-                                        }}
-                                    />
-                                </FormControl>
-                            </Grid>
-                        </Grid>
-                        <Grid container direction="column" justifyContent="flex-start"
-                                    alignItems="flex-start">
-                            <Grid item xs={12} md={12} lg={12} mb={1}   
-                                sx={{display: 'flex', alignItems: 'center'}}>
-                                <FormLabel>Contact Phone:</FormLabel>
-                            </Grid>
-                            <Grid item xs={12} md={12} lg={12} mb={1}   >
-                                <Stack direction="row">
-                                    <FormControl variant="outlined" sx={{width:'40%'}} disabled>
+                    {currentApplicationDetailData.type === "ORG" ?
+                        <>
+                            <Grid container direction="column" justifyContent="flex-start"
+                                alignItems="flex-start">
+                                <Grid item xs={12} md={12} lg={12} mb={1}
+                                    sx={{ display: 'flex', alignItems: 'center' }}>
+                                    <FormLabel><Typography variant="h5">Company Name (English):</Typography></FormLabel>
+                                </Grid>
+                                <Grid item xs={12} md={12} lg={12} mb={1} sx={{ width: '100%' }}  >
+                                    <FormControl variant="outlined" sx={{ width: '100%' }} disabled >
                                         <OutlinedInput
                                             size="small"
-                                            {...register("countryCode",
+                                            {...register("enCompanyName",
                                                 {
-                                                    value: currentApplicationDetailData.contactTel.countryCode,
+                                                    value: companyName.enCompanyName,
                                                 })}
-                                            id='countryCode'
+                                            id='enCompanyName'
                                             sx={{
                                                 "& .MuiInputBase-input.Mui-disabled": {
                                                     WebkitTextFillColor: "#000000",
@@ -268,14 +192,23 @@ const ClientDetailCard = (
                                             }}
                                         />
                                     </FormControl>
-                                    <FormControl variant="outlined" sx={{width:'100%'}} disabled>
+                                </Grid>
+                            </Grid>
+                            <Grid container direction="column" justifyContent="flex-start"
+                                alignItems="flex-start">
+                                <Grid item xs={12} md={12} lg={12} mb={1}
+                                    sx={{ display: 'flex', alignItems: 'center' }}>
+                                    <FormLabel><Typography variant="h5">Company Name (Chinese):</Typography></FormLabel>
+                                </Grid>
+                                <Grid item xs={12} md={12} lg={12} mb={1} sx={{ width: '100%' }}  >
+                                    <FormControl variant="outlined" sx={{ width: '100%' }} disabled >
                                         <OutlinedInput
                                             size="small"
-                                            {...register("phoneNumber",
+                                            {...register("chCompanyName",
                                                 {
-                                                    value: currentApplicationDetailData.contactTel.phoneNumber,
+                                                    value: companyName.chCompanyName,
                                                 })}
-                                            id='phoneNumber'
+                                            id='chCompanyName'
                                             sx={{
                                                 "& .MuiInputBase-input.Mui-disabled": {
                                                     WebkitTextFillColor: "#000000",
@@ -284,102 +217,118 @@ const ClientDetailCard = (
                                             }}
                                         />
                                     </FormControl>
-                                </Stack>
-                            </Grid>
-                        </Grid>
-                        <Grid container direction="column" justifyContent="flex-start"
-                                    alignItems="flex-start">
-                            <Grid item xs={12} md={12} lg={12} mb={1}   
-                                sx={{display: 'flex', alignItems: 'center'}}>
-                                <FormLabel>Email:</FormLabel>
-                            </Grid>
-                            <Grid item xs={12} md={12} lg={12} mb={1} sx={{width:'100%'}}  >
-                                <FormControl variant="outlined"  sx={{width:'100%'}} disabled >
-                                    <OutlinedInput
-                                        size="small"
-                                        {...register("emailBus",
-                                            {
-                                                value: currentApplicationDetailData.emailBus,
-                                            })}
-                                        id='emailBus'
-                                        sx={{
-                                            "& .MuiInputBase-input.Mui-disabled": {
-                                                WebkitTextFillColor: "#000000",
-                                                background: "#f8f8f8",
-                                            },
-                                        }}
-                                    />
-                                </FormControl>
+                                </Grid>
                             </Grid>
-                        </Grid>
-                    </>:
-                    <>
-                        <Grid container direction="column" justifyContent="flex-start"
-                                    alignItems="flex-start">
-                            <Grid item xs={12} md={12} lg={12} mb={1}   
-                                sx={{display: 'flex', alignItems: 'center'}}>
-                                <FormLabel>English Name:</FormLabel>
-                            </Grid>
-                            <Grid item xs={12} md={12} lg={12} mb={1} sx={{width:'100%'}}  >
-                                <FormControl variant="outlined"  sx={{width:'100%'}} disabled >
-                                    <OutlinedInput
-                                        size="small"
-                                        {...register("enName",
-                                            {
-                                                value: currentApplicationDetailData.enName,
-                                            })}
-                                        id='enName'
-                                        sx={{
-                                            "& .MuiInputBase-input.Mui-disabled": {
-                                                WebkitTextFillColor: "#000000",
-                                                background: "#f8f8f8",
-                                            },
-                                        }}
-                                    />
-                                </FormControl>
-                            </Grid>
-                        </Grid>
-                        <Grid container direction="column" justifyContent="flex-start"
-                                    alignItems="flex-start">
-                            <Grid item xs={12} md={12} lg={12} mb={1}   
-                                sx={{display: 'flex', alignItems: 'center'}}>
-                                <FormLabel>Chinese Name:</FormLabel>
+                            <Grid container direction="column" justifyContent="flex-start"
+                                alignItems="flex-start">
+                                <Grid item xs={12} md={12} lg={12} mb={1}
+                                    sx={{ display: 'flex', alignItems: 'center' }}>
+                                    <FormLabel><Typography variant="h5">English Name:</Typography></FormLabel>
+                                </Grid>
+                                <Grid item xs={12} md={12} lg={12} mb={1} sx={{ width: '100%' }} >
+                                    <FormControl variant="outlined" sx={{ width: '100%' }} disabled >
+                                        <OutlinedInput
+                                            size="small"
+                                            {...register("contactPerson",
+                                                {
+                                                    value: currentApplicationDetailData.contactPerson,
+                                                })}
+                                            id='contactPerson'
+                                            sx={{
+                                                "& .MuiInputBase-input.Mui-disabled": {
+                                                    WebkitTextFillColor: "#000000",
+                                                    background: "#f8f8f8",
+                                                },
+                                            }}
+                                        />
+                                    </FormControl>
+                                </Grid>
                             </Grid>
-                            <Grid item xs={12} md={12} lg={12} mb={1}  sx={{width:'100%'}} >
-                                <FormControl variant="outlined" sx={{width:'100%'}} disabled >
-                                    <OutlinedInput
-                                        size="small"
-                                        {...register("chName",
-                                            {
-                                                value: currentApplicationDetailData.chName,
-                                            })}
-                                        id='chName'
-                                        sx={{
-                                            "& .MuiInputBase-input.Mui-disabled": {
-                                                WebkitTextFillColor: "#000000",
-                                                background: "#f8f8f8",
-                                            },
-                                        }}
-                                    />
-                                </FormControl>
+                            <Grid container direction="column" justifyContent="flex-start"
+                                alignItems="flex-start">
+                                <Grid item xs={12} md={12} lg={12} mb={1}
+                                    sx={{ display: 'flex', alignItems: 'center' }}>
+                                    <FormLabel><Typography variant="h5">Contact Phone:</Typography></FormLabel>
+                                </Grid>
+                                <Grid item xs={12} md={12} lg={12} mb={1}   >
+                                    <Stack direction="row">
+                                        <FormControl variant="outlined" sx={{ width: '40%' }} disabled>
+                                            <OutlinedInput
+                                                size="small"
+                                                {...register("countryCode",
+                                                    {
+                                                        value: currentApplicationDetailData.contactTel.countryCode,
+                                                    })}
+                                                id='countryCode'
+                                                sx={{
+                                                    "& .MuiInputBase-input.Mui-disabled": {
+                                                        WebkitTextFillColor: "#000000",
+                                                        background: "#f8f8f8",
+                                                    },
+                                                }}
+                                            />
+                                        </FormControl>
+                                        <FormControl variant="outlined" sx={{ width: '100%' }} disabled>
+                                            <OutlinedInput
+                                                size="small"
+                                                {...register("phoneNumber",
+                                                    {
+                                                        value: currentApplicationDetailData.contactTel.phoneNumber,
+                                                    })}
+                                                id='phoneNumber'
+                                                sx={{
+                                                    "& .MuiInputBase-input.Mui-disabled": {
+                                                        WebkitTextFillColor: "#000000",
+                                                        background: "#f8f8f8",
+                                                    },
+                                                }}
+                                            />
+                                        </FormControl>
+                                    </Stack>
+                                </Grid>
                             </Grid>
-                        </Grid>
-                        <Grid container direction="column" justifyContent="flex-start"
-                                    alignItems="flex-start">
-                            <Grid item xs={12} md={12} lg={12} mb={1}   
-                                sx={{display: 'flex', alignItems: 'center'}}>
-                                <FormLabel>Contact Phone:</FormLabel>
+                            <Grid container direction="column" justifyContent="flex-start"
+                                alignItems="flex-start">
+                                <Grid item xs={12} md={12} lg={12} mb={1}
+                                    sx={{ display: 'flex', alignItems: 'center' }}>
+                                    <FormLabel><Typography variant="h5">Email:</Typography></FormLabel>
+                                </Grid>
+                                <Grid item xs={12} md={12} lg={12} mb={1} sx={{ width: '100%' }}  >
+                                    <FormControl variant="outlined" sx={{ width: '100%' }} disabled >
+                                        <OutlinedInput
+                                            size="small"
+                                            {...register("emailBus",
+                                                {
+                                                    value: currentApplicationDetailData.emailBus,
+                                                })}
+                                            id='emailBus'
+                                            sx={{
+                                                "& .MuiInputBase-input.Mui-disabled": {
+                                                    WebkitTextFillColor: "#000000",
+                                                    background: "#f8f8f8",
+                                                },
+                                            }}
+                                        />
+                                    </FormControl>
+                                </Grid>
                             </Grid>
-                            <Grid item xs={12} md={12} lg={12} mb={1} sx={{width:'100%'}}  >
-                                <Stack direction="row">
-                                    <FormControl variant="outlined" sx={{width:'40%'}} disabled>
+                        </> :
+                        <>
+                            <Grid container direction="column" justifyContent="flex-start"
+                                alignItems="flex-start">
+                                <Grid item xs={12} md={12} lg={12} mb={1}
+                                    sx={{ display: 'flex', alignItems: 'center' }}>
+                                    <FormLabel><Typography variant="h5">English Name:</Typography></FormLabel>
+                                </Grid>
+                                <Grid item xs={12} md={12} lg={12} mb={1} sx={{ width: '100%' }}  >
+                                    <FormControl variant="outlined" sx={{ width: '100%' }} disabled >
                                         <OutlinedInput
                                             size="small"
-                                            {...register("countryCode",
+                                            {...register("enName",
                                                 {
-                                                    value: currentApplicationDetailData.mobileNumber.countryCode,
+                                                    value: currentApplicationDetailData.enName,
                                                 })}
-                                            id='countryCode'
+                                            id='enName'
                                             sx={{
                                                 "& .MuiInputBase-input.Mui-disabled": {
                                                     WebkitTextFillColor: "#000000",
@@ -388,14 +337,23 @@ const ClientDetailCard = (
                                             }}
                                         />
                                     </FormControl>
-                                    <FormControl variant="outlined" sx={{width:'100%'}} disabled>
+                                </Grid>
+                            </Grid>
+                            <Grid container direction="column" justifyContent="flex-start"
+                                alignItems="flex-start">
+                                <Grid item xs={12} md={12} lg={12} mb={1}
+                                    sx={{ display: 'flex', alignItems: 'center' }}>
+                                    <FormLabel><Typography variant="h5">Chinese Name:</Typography></FormLabel>
+                                </Grid>
+                                <Grid item xs={12} md={12} lg={12} mb={1} sx={{ width: '100%' }} >
+                                    <FormControl variant="outlined" sx={{ width: '100%' }} disabled >
                                         <OutlinedInput
                                             size="small"
-                                            {...register("phoneNumber",
+                                            {...register("chName",
                                                 {
-                                                    value: currentApplicationDetailData.mobileNumber.phoneNumber,
+                                                    value: currentApplicationDetailData.chName,
                                                 })}
-                                            id='phoneNumber'
+                                            id='chName'
                                             sx={{
                                                 "& .MuiInputBase-input.Mui-disabled": {
                                                     WebkitTextFillColor: "#000000",
@@ -404,37 +362,79 @@ const ClientDetailCard = (
                                             }}
                                         />
                                     </FormControl>
-                                </Stack>
+                                </Grid>
                             </Grid>
-                        </Grid>
-                        <Grid container direction="column" justifyContent="flex-start"
-                                    alignItems="flex-start">
-                            <Grid item xs={12} md={12} lg={12} mb={1}   
-                                sx={{display: 'flex', alignItems: 'center'}}>
-                                <FormLabel>Email:</FormLabel>
+                            <Grid container direction="column" justifyContent="flex-start"
+                                alignItems="flex-start">
+                                <Grid item xs={12} md={12} lg={12} mb={1}
+                                    sx={{ display: 'flex', alignItems: 'center' }}>
+                                    <FormLabel><Typography variant="h5">Contact Phone:</Typography></FormLabel>
+                                </Grid>
+                                <Grid item xs={12} md={12} lg={12} mb={1} sx={{ width: '100%' }}  >
+                                    <Stack direction="row">
+                                        <FormControl variant="outlined" sx={{ width: '40%' }} disabled>
+                                            <OutlinedInput
+                                                size="small"
+                                                {...register("countryCode",
+                                                    {
+                                                        value: currentApplicationDetailData.mobileNumber.countryCode,
+                                                    })}
+                                                id='countryCode'
+                                                sx={{
+                                                    "& .MuiInputBase-input.Mui-disabled": {
+                                                        WebkitTextFillColor: "#000000",
+                                                        background: "#f8f8f8",
+                                                    },
+                                                }}
+                                            />
+                                        </FormControl>
+                                        <FormControl variant="outlined" sx={{ width: '100%' }} disabled>
+                                            <OutlinedInput
+                                                size="small"
+                                                {...register("phoneNumber",
+                                                    {
+                                                        value: currentApplicationDetailData.mobileNumber.phoneNumber,
+                                                    })}
+                                                id='phoneNumber'
+                                                sx={{
+                                                    "& .MuiInputBase-input.Mui-disabled": {
+                                                        WebkitTextFillColor: "#000000",
+                                                        background: "#f8f8f8",
+                                                    },
+                                                }}
+                                            />
+                                        </FormControl>
+                                    </Stack>
+                                </Grid>
                             </Grid>
-                            <Grid item xs={12} md={12} lg={12} mb={1} sx={{width:'100%'}} >
-                                <FormControl variant="outlined" sx={{width:'100%'}} disabled >
-                                    <OutlinedInput
-                                        size="small"
-                                        {...register("emailAddress",
-                                            {
-                                                value: currentApplicationDetailData.emailAddress,
-                                            })}
-                                        id='emailAddress'
-                                        sx={{
-                                            "& .MuiInputBase-input.Mui-disabled": {
-                                                WebkitTextFillColor: "#000000",
-                                                background: "#f8f8f8",
-                                            },
-                                        }}
-                                    />
-                                </FormControl>
+                            <Grid container direction="column" justifyContent="flex-start"
+                                alignItems="flex-start">
+                                <Grid item xs={12} md={12} lg={12} mb={1}
+                                    sx={{ display: 'flex', alignItems: 'center' }}>
+                                    <FormLabel><Typography variant="h5">Email:</Typography></FormLabel>
+                                </Grid>
+                                <Grid item xs={12} md={12} lg={12} mb={1} sx={{ width: '100%' }} >
+                                    <FormControl variant="outlined" sx={{ width: '100%' }} disabled >
+                                        <OutlinedInput
+                                            size="small"
+                                            {...register("emailAddress",
+                                                {
+                                                    value: currentApplicationDetailData.emailAddress,
+                                                })}
+                                            id='emailAddress'
+                                            sx={{
+                                                "& .MuiInputBase-input.Mui-disabled": {
+                                                    WebkitTextFillColor: "#000000",
+                                                    background: "#f8f8f8",
+                                                },
+                                            }}
+                                        />
+                                    </FormControl>
+                                </Grid>
                             </Grid>
-                        </Grid>
-                    </>
+                        </>
                     }
-                    
+
                 </form>
             </MainCard>
     );

src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js

@@ -124,7 +124,7 @@ const GazetteDetailCard = (
                                         alignItems: 'end'
                                     }}>
                                     <EditNoteIcon />
-                                    <Typography ml={1}> Gen Gazette Code</Typography>
+                                    <Typography variant="h5" ml={1}> Gen Gazette Code</Typography>
                                 </Button>
                             </Stack>
                         </Grid>
@@ -142,7 +142,7 @@ const GazetteDetailCard = (
                                     <Grid container alignItems={"center"}>
                                         <Grid item xs={12} md={3} lg={3}
                                             sx={{display: 'flex', alignItems: 'center'}}>
-                                            <FormLabel>Issue Number:</FormLabel>
+                                            <FormLabel><Typography variant="h5">Issue Number:</Typography></FormLabel>
                                         </Grid>
 
                                         <Grid item xs={12} md={9} lg={9}>
@@ -171,7 +171,7 @@ const GazetteDetailCard = (
                                     <Grid container alignItems={"center"}>
                                         <Grid item xs={12} md={3} lg={3}
                                             sx={{display: 'flex', alignItems: 'center'}}>
-                                            <FormLabel>Gazette Code:</FormLabel>
+                                            <FormLabel><Typography variant="h5">Gazette Code:</Typography></FormLabel>
                                         </Grid>
 
                                         <Grid item xs={12} md={9} lg={9}>
@@ -203,7 +203,7 @@ const GazetteDetailCard = (
                                     <Grid container alignItems={"center"}>
                                         <Grid item xs={12} md={3} lg={3}
                                             sx={{display: 'flex', alignItems: 'center'}}>
-                                            <FormLabel>Issue Date:</FormLabel>
+                                            <FormLabel><Typography variant="h5">Issue Date:</Typography></FormLabel>
                                         </Grid>
 
                                         <Grid item xs={12} md={9} lg={9}>
@@ -232,7 +232,7 @@ const GazetteDetailCard = (
                                     <Grid container alignItems={"center"}>
                                         <Grid item xs={12} md={3} lg={3}
                                             sx={{display: 'flex', alignItems: 'center'}}>
-                                            <FormLabel>Group Title:</FormLabel>
+                                            <FormLabel><Typography variant="h5">Group Title:</Typography></FormLabel>
                                         </Grid>
 
                                         <Grid item xs={12} md={9} lg={9}>
@@ -263,13 +263,13 @@ const GazetteDetailCard = (
                 </form>
                 <div>
                 <Dialog open={isWarningPopUp} onClose={() => setIsWarningPopUp(false)}  >
-                    <DialogTitle>Warning</DialogTitle>
+                    <DialogTitle><Typography variant="h3">Warning</Typography></DialogTitle>
                     <DialogContent style={{ display: 'flex', }}>
-                        <Typography variant="h3" style={{ padding: '16px' }}>{warningText}</Typography>
+                        <Typography variant="h4" style={{ padding: '16px' }}>{warningText}</Typography>
                     </DialogContent>
                     <DialogActions>
-                        <Button onClick={() => setIsWarningPopUp(false)}>No</Button>
-                        <Button color="success" onClick={()=>callback()}>Yes</Button>
+                        <Button onClick={() => setIsWarningPopUp(false)}><Typography variant="h5">No</Typography></Button>
+                        <Button color="success" onClick={()=>callback()}><Typography variant="h5">Yes</Typography></Button>
                     </DialogActions>
                 </Dialog>
             </div>

src/pages/PublicNotice/Details_GLD/StatusChangeDialog.js

@@ -45,25 +45,25 @@ const StatusChangeDialog = (props) => {
     } else {
       setDialogTitle("Action Confirm");
       setPrositiveBtnText("Confirm");
-      let str = "Are you sure you want to "+props.getStatus+" this application?"
+      let str = "Are you sure you want to " + props.getStatus + " this application?"
       return getConfirmContent(str);
     }
   }, [props.getStatus]);
 
   const acceptedHandle = () => () => {
     const getStatus = props.getStatus.status;
-    if(getStatus == "notAccepted"){
-      if(!remarks || remarks=="" )
+    if (getStatus == "notAccepted") {
+      if (!remarks || remarks == "")
         setHelperText("Please enter reason");
     }
-    if(!helperText){
-      props.setReason({"reason": remarks});
-      if (remarks!=null&&remarks!=""){
+    if (!helperText) {
+      props.setReason({ "reason": remarks });
+      if (remarks != null && remarks != "") {
         console.log(remarks)
         // props.setStatusWindowAccepted(true);
       }
     }
-    if(getStatus != "notAccepted"){
+    if (getStatus != "notAccepted") {
       props.setStatusWindowAccepted(true);
     }
   };
@@ -80,9 +80,9 @@ const StatusChangeDialog = (props) => {
 
   const getConfirmContent = (text) => {
     setContent(<Grid container direction="row" justifyContent="center" alignItems="center">
-        <FormLabel sx={{ fontSize: "20px", color: "#000000", textAlign: "center" }}>
-          {text}
-        </FormLabel>
+      <FormLabel sx={{ fontSize: "20px", color: "#000000", textAlign: "center" }}>
+        <Typography variant="h5">{text}</Typography>
+      </FormLabel>
     </Grid>);
   }
 
@@ -98,12 +98,12 @@ const StatusChangeDialog = (props) => {
           inputProps={{ maxLength: 255 }}
           placeholder="Please enter reason"
           helperText={helperText}
-          onChange={(newValues)=>{
+          onChange={(newValues) => {
             setRemarks(newValues.target.value);
             setHelperText("");
           }}
         >
-          </TextField>
+        </TextField>
       </Grid>
     </Grid>
     );
@@ -115,11 +115,11 @@ const StatusChangeDialog = (props) => {
         <Grid container alignItems={"center"}>
           <Grid item xs={12} md={2} lg={3}
             sx={{ display: 'flex', alignItems: 'center' }}>
-            <Typography>Target Issue:</Typography>
+            <Typography variant="h5">Target Issue:</Typography>
           </Grid>
           <Grid item xs={12} md={9} lg={9}>
             <FormLabel>
-              {props.gazetteIssue + ", "}{props.issueNum + ", "}{props.issueDate}
+            <Typography variant="h5">{props.gazetteIssue + ", "}{props.issueNum + ", "}{props.issueDate}</Typography>
             </FormLabel>
           </Grid>
         </Grid>
@@ -128,7 +128,7 @@ const StatusChangeDialog = (props) => {
         <Grid container alignItems={"center"}>
           <Grid item xs={12} md={3} lg={3}
             sx={{ display: 'flex', alignItems: 'center' }}>
-            <Typography>Gazette Group:</Typography>
+            <Typography variant="h5">Gazette Group:</Typography>
           </Grid>
           <Grid item xs={12} md={9} lg={9}>
             <Autocomplete
@@ -144,7 +144,8 @@ const StatusChangeDialog = (props) => {
                   setComboInputValue(newValue);
                   props.setSelectedGazetteGroup(newValue);
                   formik.setFieldValue("", "")
-                } else {gazetteGroup
+                } else {
+                  gazetteGroup
                   props.setSelectedGazetteGroupInputType("");
                 }
               }}
@@ -188,12 +189,16 @@ const StatusChangeDialog = (props) => {
       <Stack direction="row" justifyContent="space-around">
         <DialogActions>
           <Button variant="contained" onClick={props.handleClose} autoFocus >
-            Cancel
+            <Typography variant="h5">
+              Cancel
+            </Typography>
           </Button>
         </DialogActions>
         <DialogActions>
           <Button variant="contained" color="success" onClick={acceptedHandle()} autoFocus disabled={Object.keys(props.selectedGazetteGroup).length === 0 && props.getStatus === "genGazetteCode"}>
-            {prositiveBtnText}
+            <Typography variant="h5">
+              {prositiveBtnText}
+            </Typography>
           </Button>
         </DialogActions>
       </Stack>

src/pages/PublicNotice/Details_GLD/index.js

@@ -299,7 +299,7 @@ const PublicNoticeDetail_GLD = () => {
   }, [getUploadStatus]);
 
   return (
-    <Grid container sx={{ maxnHeight: '500vh', backgroundColor: '#ffffff' }} direction="column">
+    <Grid container sx={{ maxHeight: '500vh', backgroundColor: 'backgroundColor.default' }} direction="column">
       <StatusChangeDialog open={open}
         handleClose={handleClose}
         setReason={setReason}
@@ -334,10 +334,10 @@ const PublicNoticeDetail_GLD = () => {
       </Grid>
       <Grid item xs={12} >
         <Grid container direction="row">
-          <Grid item xs={12} md={10}>
+          <Grid item xs={12} md={10} lg={10} xl={10}>
             <Grid container direction="column">
-              <Grid item xs={12} md={10}>
-                <Box xs={12} ml={4} mt={3} sx={{ p: 2, border: '3px groove grey', borderRadius: '10px' }}>
+              <Grid item xs={12} md={10} lg={10} xl={10}>
+                <Box xs={12} ml={4} mt={3} sx={{ p: 2, borderRadius: '10px', backgroundColor: '#ffffff' }}>
                   {isLoading && editMode ?
                     <LoadingComponent /> :
                     <ApplicationDetailCard
@@ -353,8 +353,8 @@ const PublicNoticeDetail_GLD = () => {
                   }
                 </Box>
               </Grid>
-              <Grid item xs={12} md={10}>
-                <Box xs={12} ml={4} mt={1} sx={{ p: 2, border: '3px groove grey', borderRadius: '10px' }}>
+              <Grid item xs={12} md={10} lg={10} xl={10}>
+                <Box xs={12} ml={4} mt={3} sx={{ p: 2, borderRadius: '10px', backgroundColor: '#ffffff' }}>
                   <GazetteDetailCard
                     // updateUserObject={updateUserObject}
                     applicationDetailData={applicationDetailData}
@@ -364,8 +364,8 @@ const PublicNoticeDetail_GLD = () => {
                   />
                 </Box>
               </Grid>
-              <Grid item xs={12} md={10}>
-                <Box xs={12} ml={4} mt={3} sx={{ p: 2, border: '3px groove grey', borderRadius: '10px' }}>
+              <Grid item xs={12} md={10} lg={10} xl={10}>
+                <Box xs={12} ml={4} mt={3} sx={{ p: 2, borderRadius: '10px', backgroundColor: '#ffffff' }}>
                   <TabTableDetail
                     applicationDetailData={applicationDetailData}
                     proofList={proofList}
@@ -375,10 +375,10 @@ const PublicNoticeDetail_GLD = () => {
               </Grid>
             </Grid>
           </Grid>
-          <Grid item xs={12} md={2} lg={2}>
+          <Grid item xs={12} md={2} lg={2} xl={2}>
             <Grid container>
               <Grid item xs={12} md={12}>
-                <Box xs={12} md={12} ml={1} mt={3} mr={1} height='800px' sx={{ p: 2, border: '3px groove grey', borderRadius: '10px' }}>
+                <Box xs={12} md={12} ml={3} mt={3} mr={1} height='800px' sx={{ p: 2, borderRadius: '10px', backgroundColor: '#ffffff' }}>
                   <ClientDetailCard
                     // updateUserObject={updateUserObject}
                     applicationDetailData={applicationDetailData}

src/pages/PublicNotice/Details_Public/index.js

@@ -1,14 +1,15 @@
 import {
   useEffect,
   useState
-  } from "react";
+} from "react";
 
 // material-ui
 import {
   Grid,
   Typography,
   Stack,
-  Box
+  Box,
+  Button
 } from '@mui/material';
 import Loadable from 'components/Loadable';
 import { lazy } from 'react';
@@ -25,8 +26,9 @@ import {
   GET_PUBLIC_NOTICE_APPLY_DETAIL,
   SET_PUBLIC_NOTICE_STATUS_CANCELLED
 } from "utils/ApiPathConst";
-import {useNavigate} from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 const StatusChangeDialog = Loadable(lazy(() => import('./StatusChangeDialog')));
+import KeyboardBackspaceOutlinedIcon from '@mui/icons-material/KeyboardBackspaceOutlined';
 
 // ==============================|| Body - DEFAULT ||============================== //
 
@@ -46,7 +48,7 @@ const DashboardDefault = () => {
     backgroundImage: `url(${titleBackgroundImg})`,
     width: '100%',
     height: '100%',
-    backgroundSize:'contain',
+    backgroundSize: 'contain',
     backgroundRepeat: 'no-repeat',
     backgroundColor: '#0C489E',
     backgroundPosition: 'right'
@@ -58,23 +60,23 @@ const DashboardDefault = () => {
   }, []);
 
   const loadApplicationDetail = () => {
-    if(params.id > 0 ){
+    if (params.id > 0) {
       axios.get(`${GET_PUBLIC_NOTICE_APPLY_DETAIL}/${params.id}`)
-          .then((response) => {
-              if (response.status === 200) {
-                setApplicationDetailData(response.data);
-                setAapNo(response.data.data.appNo);
-              }
-          })
-          .catch(error => {
-              console.log(error);
-              return false;
-          });
+        .then((response) => {
+          if (response.status === 200) {
+            setApplicationDetailData(response.data);
+            setAapNo(response.data.data.appNo);
+          }
+        })
+        .catch(error => {
+          console.log(error);
+          return false;
+        });
     }
   }
 
   useEffect(() => {
-    if(applicationDetailData.data === null){
+    if (applicationDetailData.data === null) {
       navigate('/publicNotice');
     }
   }, [applicationDetailData]);
@@ -86,8 +88,8 @@ const DashboardDefault = () => {
   };
 
   useEffect(() => {
-    if(statusWindowAccepted){
-      if(getStatus == "cancel"){
+    if (statusWindowAccepted) {
+      if (getStatus == "cancel") {
         onCancelledClick()
       }
     }
@@ -95,31 +97,31 @@ const DashboardDefault = () => {
 
   useEffect(() => {
     // console.log(getStatus)
-    if(getStatus!==""){
+    if (getStatus !== "") {
       setOpen(true)
     }
   }, [getStatus]);
 
   const onCancelledClick = () => {
-    if(params.id > 0 ){
-        axios.get(`${SET_PUBLIC_NOTICE_STATUS_CANCELLED}/${params.id}`)
-          .then((response) => {
-              if (response.status === 204) {
-                setOpen(false);
-                handleClose();
-                loadApplicationDetail()
-              }
-          })
-          .catch(error => {
-              console.log(error);
-              return false;
-          });
+    if (params.id > 0) {
+      axios.get(`${SET_PUBLIC_NOTICE_STATUS_CANCELLED}/${params.id}`)
+        .then((response) => {
+          if (response.status === 204) {
+            setOpen(false);
+            handleClose();
+            loadApplicationDetail()
+          }
+        })
+        .catch(error => {
+          console.log(error);
+          return false;
+        });
     }
   };
 
   return (
-    <Grid container sx={{minHeight: '110vh',backgroundColor:'#ffffff'}} direction="column">
-      <StatusChangeDialog open={open} handleClose={handleClose} setStatusWindowAccepted={setStatusWindowAccepted} getStatus={getStatus}/>
+    <Grid container sx={{ minHeight: '110vh', backgroundColor: '#ffffff' }} direction="column">
+      <StatusChangeDialog open={open} handleClose={handleClose} setStatusWindowAccepted={setStatusWindowAccepted} getStatus={getStatus} />
       <Grid item xs={12}>
         <div style={BackgroundHead}>
           <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
@@ -128,33 +130,40 @@ const DashboardDefault = () => {
         </div>
       </Grid>
       <Grid item xs={12} >
-          <Stack direction="row" height='20px' justifyContent="flex-start" alignItems="center">
-            <Typography ml={3} mt={3} variant="h4">我的公共啟事 / {appNo}</Typography>
-          </Stack>
+        <Stack direction="row" height='20px' justifyContent="flex-start" alignItems="center">
+          <Typography ml={3} mt={3} variant="h4">我的公共啟事 / {appNo}</Typography>
+        </Stack>
       </Grid>
+
       <Grid item xs={12} md={12}>
         <Grid container direction="column" justifyContent="flex-start" alignItems="center">
+          <Grid item xs={12} width="75%">
+            <Button sx={{ mt: 4 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate("/publicNotice") }}>
+              <KeyboardBackspaceOutlinedIcon />
+              <Typography variant="h4">Back</Typography>
+            </Button>
+          </Grid>
           {/* <Grid item xs={12} md={12} > */}
-            {/* <Grid container direction="column" alignItems="center"> */}
-              <Grid item width="75%">
-                <Box xs={12} mt={6} sx={{ p: 2, border: '3px groove grey', borderRadius: '10px'}}>
-                  <ApplicationDetailCard 
-                    setStatus = {setStatus}
-                    applicationDetailData={applicationDetailData}
-                    // isCollectData={isCollectData}
-                    // isNewRecord={isNewRecord}
-                  />
-                </Box>
-              </Grid>
-              {/* <Grid item xs={12} md={12} width="85%">
+          {/* <Grid container direction="column" alignItems="center"> */}
+          <Grid item width="75%">
+            <Box xs={12} mt={3} sx={{ p: 2, border: '3px groove grey', borderRadius: '10px' }}>
+              <ApplicationDetailCard
+                setStatus={setStatus}
+                applicationDetailData={applicationDetailData}
+              // isCollectData={isCollectData}
+              // isNewRecord={isNewRecord}
+              />
+            </Box>
+          </Grid>
+          {/* <Grid item xs={12} md={12} width="85%">
                 <Box xs={12} mt={3}>
                   <TabTableDetail applicationDetailData={applicationDetailData}/>
                 </Box>
               </Grid> */}
-            {/* </Grid> */}
+          {/* </Grid> */}
           {/* </Grid> */}
         </Grid>
-          
+
       </Grid>
     </Grid>
   );

src/pages/PublicNotice/Search_GLD/DataGrid.js

@@ -1,12 +1,13 @@
 // material-ui
 import * as React from 'react';
 import {
-    Button
+    Button,
+    Box
 } from '@mui/material';
 import * as DateUtils from "utils/DateUtils";
 import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
-import {useNavigate} from "react-router-dom";
-import {FiDataGrid} from "components/FiDataGrid";
+import { useNavigate } from "react-router-dom";
+import { FiDataGrid } from "components/FiDataGrid";
 // ==============================|| EVENT TABLE ||============================== //
 
 export default function SearchPublicNoticeTable({ recordList }) {
@@ -18,7 +19,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
     }, [recordList]);
 
     const handleEditClick = (params) => () => {
-        navigate('/application/'+ params.id);
+        navigate('/application/' + params.id);
     };
 
 
@@ -36,7 +37,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             id: 'status',
             field: 'status',
             headerName: 'Status',
-            width: 150,
+            width: 175,
             renderCell: (params) => {
                 return [StatusUtils.getStatusEng(params)]
             },
@@ -56,7 +57,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             headerName: 'Contact Person',
             flex: 2,
             renderCell: (params) => {
-                let company = params.row.enCompanyName!= null ?" ("+(params.row.enCompanyName)+")":"";
+                let company = params.row.enCompanyName != null ? " (" + (params.row.enCompanyName) + ")" : "";
 
                 let phone = JSON.parse(params.row.contactTelNo);
                 let faxNo = JSON.parse(params.row.contactFaxNo);
@@ -84,7 +85,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             headerName: 'Gazette Group',
             flex: 1,
             valueGetter: (params) => {
-                return (params?.value)?(params?.value):"";
+                return (params?.value) ? (params?.value) : "";
             }
         },
         {
@@ -94,37 +95,39 @@ export default function SearchPublicNoticeTable({ recordList }) {
             flex: 1,
             valueGetter: (params) => {
                 return params.row.issueYear
-                +" Vol. "+zeroPad(params.row.issueVolume,3)
-                +", No. "+zeroPad(params.row.issueNo,2)
-                +", "+DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)");
+                    + " Vol. " + zeroPad(params.row.issueVolume, 3)
+                    + ", No. " + zeroPad(params.row.issueNo, 2)
+                    + ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)");
             }
         },
     ];
 
     function zeroPad(num, places) {
-        num=num?num:0;
+        num = num ? num : 0;
         var zero = places - num.toString().length + 1;
         return Array(+(zero > 0 && zero)).join("0") + num;
     }
 
     function handleRowDoubleClick(params) {
         // handleEditClick(params)
-        navigate('/application/'+ params.id);
+        navigate('/application/' + params.id);
     }
 
     return (
-        <div style={{ height: 400, width: '100%' }}>
-
-            <FiDataGrid
-                rows={rows}
-                columns={columns}
-                initialState={{
-                    pagination: {
-                        paginationModel: { page: 0, pageSize: 5 },
-                    },
-                }}
-                onRowDoubleClick={handleRowDoubleClick}
-            />
+        <div style={{ height: '100%', width: '100%' }}>
+            <Box sx={{ backgroundColor: "#fff", ml: 2 }} width="98%">
+                <FiDataGrid
+                    rows={rows}
+                    columns={columns}
+                    initialState={{
+                        pagination: {
+                            paginationModel: { page: 0, pageSize: 5 },
+                        },
+                    }}
+                    getRowHeight={() => 'auto'}
+                    onRowDoubleClick={handleRowDoubleClick}
+                />
+            </Box>
         </div>
     );
 }

src/pages/PublicNotice/Search_GLD/SearchForm.js

@@ -3,18 +3,19 @@ import {
     Button,
     CardContent,
     Grid, TextField,
-    Autocomplete
+    Autocomplete,
+    Typography
 } from '@mui/material';
 import MainCard from "components/MainCard";
 import { useForm } from "react-hook-form";
-import * as React  from "react";
+import * as React from "react";
 import * as ComboData from "utils/ComboData";
 import * as DateUtils from "utils/DateUtils";
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
 
-const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issueComboData
-     }) => {
+const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, issueComboData
+}) => {
 
     const [type, setType] = React.useState([]);
     // const [status, setStatus] = React.useState({ key: 0, label: 'All', type: 'all' });
@@ -28,7 +29,6 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issu
     const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
     const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo);
 
-
     const { reset, register, handleSubmit } = useForm()
     const onSubmit = (data) => {
         data.status = selectedLabelsString
@@ -71,16 +71,16 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issu
         reset();
     }
 
-    function getIssueLabel(data){
-        if(data=={}) return "";
-        return  data.year
-        +" Vol. "+zeroPad(data.volume,3)
-        +", No. "+zeroPad(data.issueNo,2)
-        +", "+DateUtils.dateFormat(data.issueDate, "D MMM YYYY (ddd)");
+    function getIssueLabel(data) {
+        if (data == {}) return "";
+        return data.year
+            + " Vol. " + zeroPad(data.volume, 3)
+            + ", No. " + zeroPad(data.issueNo, 2)
+            + ", " + DateUtils.dateFormat(data.issueDate, "D MMM YYYY (ddd)");
     }
 
     function zeroPad(num, places) {
-        num=num?num:0;
+        num = num ? num : 0;
         var zero = places - num.toString().length + 1;
         return Array(+(zero > 0 && zero)).join("0") + num;
     }
@@ -88,83 +88,87 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issu
     return (
         <MainCard xs={12} md={12} lg={12}
             border={false}
-            content={false}>
+            content={false}
+            sx={{ backgroundColor: 'backgroundColor.default' }}
+        >
 
             <form onSubmit={handleSubmit(onSubmit)}>
-                {/*row 1*/}
-                <CardContent sx={{ px: 2.5, pt: 3 }}>
-                    <Grid item justifyContent="space-between" alignItems="center">
-                        Search Form
-                    </Grid>
-                </CardContent>
-
-                {/*row 2*/}
-                <Grid container alignItems={"center"}>
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <TextField
-                            fullWidth
-                            {...register("appNo")}
-                            id='appNo'
-                            label="App No."
-                            defaultValue={searchCriteria.appNo}
-                            InputLabelProps={{
-                                shrink: true
-                            }}
-                        />
-                    </Grid>
-
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <TextField
-                            fullWidth
-                            {...register("dateFrom")}
-                            id="dateFrom"
-                            type="date"
-                            label="Submit Date(From)"
-                            defaultValue={searchCriteria.dateFrom}
-                            InputProps={{ inputProps: { max: maxDate } }}
-                            onChange={(newValue) => {
-                                setMinDate(DateUtils.dateStr(newValue));
-                            }}
-                            InputLabelProps={{
-                                shrink: true
-                            }}
-                        />
-                    </Grid>
-
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <TextField
-                            fullWidth
-                            InputLabelProps={{
-                                shrink: true
-                            }}
-                            {...register("dateTo")}
-                            InputProps={{ inputProps: { min: minDate } }}
-                            onChange={(newValue) => {
-                                setMaxDate(DateUtils.dateStr(newValue));
-                            }}
-                            id="dateTo"
-                            type="date"
-                            label="Submit Date(To)"
-                            defaultValue={searchCriteria.dateTo}
-                        />
-                    </Grid>
-
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <TextField
-                            fullWidth
-                            {...register("contact")}
-                            id="contact"
-                            label="Contact Person"
-                            defaultValue={searchCriteria.contact}
-                            InputLabelProps={{
-                                shrink: true
-                            }}
-                        />
-
+                <Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 3, mb: 3}} width="98%">
+                    {/*row 1*/}
+                    <Grid item xs={12}>
+                        <CardContent sx={{ px: 2.5, pt: 3 }}>
+                            <Grid item justifyContent="space-between" alignItems="center">
+                                <Typography variant="h5">Search Form</Typography>
+                            </Grid>
+                        </CardContent>
                     </Grid>
-
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        {/* <Autocomplete
+                    {/*row 2*/}
+                    <Grid container display="flex" alignItems={"center"}>
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <TextField
+                                fullWidth
+                                {...register("appNo")}
+                                id='appNo'
+                                label={"App No."}
+                                defaultValue={searchCriteria.appNo}
+                                InputLabelProps={{
+                                    shrink: true
+                                }}
+                            />
+                        </Grid>
+
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <TextField
+                                fullWidth
+                                {...register("dateFrom")}
+                                id="dateFrom"
+                                type="date"
+                                label={"Submit Date(From)"}
+                                defaultValue={searchCriteria.dateFrom}
+                                InputProps={{ inputProps: { max: maxDate } }}
+                                onChange={(newValue) => {
+                                    setMinDate(DateUtils.dateStr(newValue));
+                                }}
+                                InputLabelProps={{
+                                    shrink: true
+                                }}
+                            />
+                        </Grid>
+
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <TextField
+                                fullWidth
+                                InputLabelProps={{
+                                    shrink: true
+                                }}
+                                {...register("dateTo")}
+                                InputProps={{ inputProps: { min: minDate } }}
+                                onChange={(newValue) => {
+                                    setMaxDate(DateUtils.dateStr(newValue));
+                                }}
+                                id="dateTo"
+                                type="date"
+                                label={"Submit Date(To)"}
+                                defaultValue={searchCriteria.dateTo}
+                            />
+                        </Grid>
+
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <TextField
+                                fullWidth
+                                {...register("contact")}
+                                id="contact"
+                                label={"Contact Person"}
+                                defaultValue={searchCriteria.contact}
+                                InputLabelProps={{
+                                    shrink: true
+                                }}
+                            />
+
+                        </Grid>
+
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            {/* <Autocomplete
                             {...register("status")}
                             disablePortal
                             id="status"
@@ -186,134 +190,135 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria,issu
                                 shrink: true
                             }}
                         /> */}
-                        <Autocomplete
-                            multiple  
-                            {...register("status")}
-                            id="status"
-                            options={ComboData.publicNoticeStatic_GLD}
-                            value={selectedStatus}  
-                            onChange={(event, newValue) => {
-                                const findAllIndex = newValue.findIndex((ele) => {
-                                    return ele.type === "all"
-                                })
-
-                                if (findAllIndex > -1) {
-                                    setSelectedStatus([newValue[findAllIndex]]);  
-                                    setSelectedLabelsString('all')
-                                } else {
-                                    const selectedLabels = newValue.map(option => option.type);
-                                    const selectedLabelsString = `${selectedLabels.join(',')}`;
-                                    setSelectedStatus(newValue);  
-                                    setSelectedLabelsString(selectedLabelsString);
-                                }
-                            }}
-                            getOptionLabel={(option) => option.label}  
-                            renderInput={(params) => (
-                                <TextField
-                                {...params}
-                                label="Status"
-                                />
-                            )}
-                        />
-                    </Grid>
-
-                    {
-                        orgCombo ?
-                            <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                                <Autocomplete
-                                    {...register("orgId")}
-                                    disablePortal
-                                    id="orgId"
-                                    options={orgCombo}
-                                    value={orgSelected}
-                                    inputValue={(orgSelected?.label) ? orgSelected?.label : ""}
-                                    onChange={(event, newValue) => {
-                                        if (newValue !== null) {
-                                            setOrgSelected(newValue);
-                                        }
-                                    }}
-                                    renderInput={(params) => (
-                                        <TextField {...params}
-                                            label="Organization"
-                                            InputLabelProps={{
-                                                shrink: true
-                                            }}
-                                        />
-                                    )}
-                                />
-                            </Grid>
-                            : <></>
-                    }
-
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <Autocomplete
-                            {...register("issueId")}
-                            disablePortal
-                            id="issueId"
-                            options={issueCombo}
-                            value={issueSelected}
-                            inputValue={(issueSelected?.id) ? getIssueLabel(issueSelected) : ""}
-                            getOptionLabel={(option)=>getIssueLabel(option)}
-                            onChange={(event, newValue) => {
-                                if (newValue !== null) {
-                                    setIssueSelected(newValue);
-                                }
-                            }}
-                            renderInput={(params) => (
-                                <TextField {...params}
-                                    label="Gazette Issue"
-                                    InputLabelProps={{
-                                        shrink: true
-                                    }}
-                                />
-                            )}
-                        />
-                    </Grid>
-
-                    <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
-                        <TextField
-                            fullWidth
-                            {...register("groupNo")}
-                            id='groupNo'
-                            label="Gazette Code."
-                            defaultValue={searchCriteria.groupNo}
-                            InputLabelProps={{
-                                shrink: true
-                            }}
-                        />
-                    </Grid>
-
-
-                </Grid>
-
-
-                {/*last row*/}
-                <Grid container maxWidth justifyContent="flex-end">
-
-                    <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
-                        <Button
-                            size="large"
-                            variant="contained"
-                            onClick={resetForm}
-                            sx={{
-                                textTransform: 'capitalize',
-                                alignItems: 'end'
-                            }}>
-                            Clear
-                        </Button>
+                            <Autocomplete
+                                multiple
+                                {...register("status")}
+                                id="status"
+                                options={ComboData.publicNoticeStatic_GLD}
+                                value={selectedStatus}
+                                onChange={(event, newValue) => {
+                                    const findAllIndex = newValue.findIndex((ele) => {
+                                        return ele.type === "all"
+                                    })
+
+                                    if (findAllIndex > -1) {
+                                        setSelectedStatus([newValue[findAllIndex]]);
+                                        setSelectedLabelsString('all')
+                                    } else {
+                                        const selectedLabels = newValue.map(option => option.type);
+                                        const selectedLabelsString = `${selectedLabels.join(',')}`;
+                                        setSelectedStatus(newValue);
+                                        setSelectedLabelsString(selectedLabelsString);
+                                    }
+                                }}
+                                getOptionLabel={(option) => option.label}
+                                renderInput={(params) => (
+                                    <TextField
+                                        {...params}
+                                        label="Status"
+                                        InputLabelProps={{
+                                            shrink: true
+                                        }}
+                                    />
+                                )}
+                            />
+                        </Grid>
+
+                        {
+                            orgCombo ?
+                                <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                                    <Autocomplete
+                                        {...register("orgId")}
+                                        disablePortal
+                                        id="orgId"
+                                        options={orgCombo}
+                                        value={orgSelected}
+                                        inputValue={(orgSelected?.label) ? orgSelected?.label : ""}
+                                        onChange={(event, newValue) => {
+                                            if (newValue !== null) {
+                                                setOrgSelected(newValue);
+                                            }
+                                        }}
+                                        renderInput={(params) => (
+                                            <TextField {...params}
+                                                label="Organization"
+                                                InputLabelProps={{
+                                                    shrink: true
+                                                }}
+                                            />
+                                        )}
+                                    />
+                                </Grid>
+                                : <></>
+                        }
+
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <Autocomplete
+                                {...register("issueId")}
+                                disablePortal
+                                id="issueId"
+                                options={issueCombo}
+                                value={issueSelected}
+                                inputValue={(issueSelected?.id) ? getIssueLabel(issueSelected) : ""}
+                                getOptionLabel={(option) => getIssueLabel(option)}
+                                onChange={(event, newValue) => {
+                                    if (newValue !== null) {
+                                        setIssueSelected(newValue);
+                                    }
+                                }}
+                                renderInput={(params) => (
+                                    <TextField {...params}
+                                        label="Gazette Issue"
+                                        InputLabelProps={{
+                                            shrink: true
+                                        }}
+                                    />
+                                )}
+                            />
+                        </Grid>
+
+                        <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                            <TextField
+                                fullWidth
+                                {...register("groupNo")}
+                                id='groupNo'
+                                label="Gazette Code."
+                                defaultValue={searchCriteria.groupNo}
+                                InputLabelProps={{
+                                    shrink: true
+                                }}
+                            />
+                        </Grid>
                     </Grid>
 
-                    <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
-                        <Button
-                            size="large"
-                            variant="contained"
-                            type="submit"
-                            sx={{
-                                textTransform: 'capitalize',
-                                alignItems: 'end'
-                            }}>
-                            Submit
-                        </Button>
+                    {/*last row*/}
+                    <Grid container maxWidth justifyContent="flex-end">
+
+                        <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
+                            <Button
+                                size="large"
+                                variant="contained"
+                                onClick={resetForm}
+                                sx={{
+                                    textTransform: 'capitalize',
+                                    alignItems: 'end'
+                                }}>
+                                <Typography variant="h5">Clear</Typography>
+                            </Button>
+                        </Grid>
+
+                        <Grid item sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
+                            <Button
+                                size="large"
+                                variant="contained"
+                                type="submit"
+                                sx={{
+                                    textTransform: 'capitalize',
+                                    alignItems: 'end'
+                                }}>
+                                <Typography variant="h5">Submit</Typography>
+                            </Button>
+                        </Grid>
                     </Grid>
                 </Grid>
             </form>

src/pages/PublicNotice/Search_GLD/index.js

@@ -20,7 +20,7 @@ const BackgroundHead = {
     backgroundImage: `url(${titleBackgroundImg})`,
     width: '100%',
     height: '100%',
-    backgroundSize:'contain',
+    backgroundSize: 'contain',
     backgroundRepeat: 'no-repeat',
     backgroundColor: '#0C489E',
     backgroundPosition: 'right'
@@ -30,12 +30,12 @@ const BackgroundHead = {
 
 const UserSearchPage_Individual = () => {
 
-    const [record,setRecord] = React.useState([]);
-    const [orgCombo,setOrgCombo] = React.useState([]);
-    const [issueCombo,setIssueCombo] = React.useState([]);
+    const [record, setRecord] = React.useState([]);
+    const [orgCombo, setOrgCombo] = React.useState([]);
+    const [issueCombo, setIssueCombo] = React.useState([]);
     const [searchCriteria, setSearchCriteria] = React.useState({
         dateTo: DateUtils.dateStr(new Date()),
-        dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+        dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate() - 14)),
     });
     const [onReady, setOnReady] = React.useState(false);
 
@@ -53,36 +53,36 @@ const UserSearchPage_Individual = () => {
         getUserList();
     }, [searchCriteria]);
 
-    function getUserList(){
+    function getUserList() {
         HttpUtils.get({
             url: UrlUtils.GET_PUBLIC_NOTICE_LIST,
             params: searchCriteria,
-            onSuccess: function(responseData){
+            onSuccess: function (responseData) {
                 setRecord(responseData);
             }
         });
     }
 
-    function getOrgCombo(){
+    function getOrgCombo() {
         HttpUtils.get({
             url: UrlUtils.GET_ORG_COMBO,
-            onSuccess: function(responseData){
+            onSuccess: function (responseData) {
                 let combo = responseData;
                 setOrgCombo(combo);
             }
         });
     }
 
-    function getIssueCombo(){
+    function getIssueCombo() {
         HttpUtils.get({
             url: UrlUtils.GET_ISSUE_COMBO,
-            onSuccess: function(responseData){
+            onSuccess: function (responseData) {
                 let combo = responseData;
                 setIssueCombo(combo);
             }
         });
     }
-    
+
 
     function applySearch(input) {
         setSearchCriteria(input);
@@ -90,9 +90,9 @@ const UserSearchPage_Individual = () => {
 
     return (
         !onReady ?
-            <LoadingComponent/>
+            <LoadingComponent />
             :
-            <Grid container sx={{minHeight: '85vh',backgroundColor:'#ffffff'}} direction="column">
+            <Grid container sx={{ minHeight: '85vh', backgroundColor: 'backgroundColor.default' }} direction="column">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
@@ -102,18 +102,19 @@ const UserSearchPage_Individual = () => {
                 </Grid>
                 {/*row 1*/}
                 <Grid item xs={12} md={12} lg={12}>
-                    <SearchForm 
-                    applySearch={applySearch}
-                    orgComboData={orgCombo}
-                    issueComboData={issueCombo}
-                    searchCriteria={searchCriteria}
+                    <SearchForm
+                        applySearch={applySearch}
+                        orgComboData={orgCombo}
+                        issueComboData={issueCombo}
+                        searchCriteria={searchCriteria}
                     />
                 </Grid>
                 {/*row 2*/}
                 <Grid item xs={12} md={12} lg={12}>
                     <MainCard elevation={0}
-                            border={false}
-                            content={false}
+                        border={false}
+                        content={false}
+                        sx={{ backgroundColor: 'backgroundColor.default' }}
                     >
                         <EventTable
                             recordList={record}
@@ -122,6 +123,5 @@ const UserSearchPage_Individual = () => {
                 </Grid>
             </Grid>
     );
-};
-
+}
 export default UserSearchPage_Individual;

src/pages/User/DetailPage/UserAuthorityCard.js

@@ -50,7 +50,7 @@ const UserAuthorityCard = ({ isCollectData, updateUserAuthList, userData, isNewR
                 border={false}
                 content={false}
             >
-                <Typography variant="h5" sx={{ mt: 3, ml: 3, mb: 2, mr: 3, borderBottom: "1px solid black" }}>
+                <Typography variant="h6" sx={{ mt: 3, ml: 3, mb: 2, mr: 3, borderBottom: "1px solid black" }}>
                     User Authority
                 </Typography>
 

src/pages/User/DetailPage/index.js

@@ -204,7 +204,7 @@ const UserMaintainPage = () => {
         !onReady ?
             <LoadingComponent />
             :
-            <Grid container sx={{ minHeight: '90vh' }}>
+            <Grid container sx={{ minHeight: '90vh', backgroundColor: 'backgroundColor.default' }}>
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
@@ -222,7 +222,7 @@ const UserMaintainPage = () => {
                 <Grid item xs={12} md={5} lg={5}>
                     <Grid container>
                         <Grid item xs={12} md={12} lg={12}>
-                            <Box xs={12} ml={4} mt={3} sx={{ p: 1, border: '3px groove grey', borderRadius: '10px' }}>
+                            <Box xs={12} ml={4} mt={3} sx={{ p: 1, borderRadius: '10px', backgroundColor: '#fff' }}>
                                 <UserInformationCard
                                     updateUserObject={updateUserObject}
                                     userData={userData}
@@ -233,7 +233,7 @@ const UserMaintainPage = () => {
                         </Grid>
 
                         <Grid item xs={12} md={12} lg={12} sx={{ mt: 3 }}>
-                            <Box xs={12} ml={4} mt={3} sx={{ p: 1, border: '3px groove grey', borderRadius: '10px' }}>
+                            <Box xs={12} ml={4} mt={2} sx={{ p: 1, borderRadius: '10px', backgroundColor: '#fff' }}>
                                 <UserGroupCard
                                     updateUserGroupList={updateUserGroupList}
                                     userData={userData}
@@ -246,7 +246,7 @@ const UserMaintainPage = () => {
                 </Grid>
                 {/*col 2*/}
                 <Grid item xs={12} md={7} lg={7}>
-                    <Box xs={12} ml={4} mt={3} mr={3} sx={{ p: 1, border: '3px groove grey', borderRadius: '10px' }}>
+                    <Box xs={12} ml={4} mt={3} mr={3} sx={{ p: 1, borderRadius: '10px', backgroundColor: '#fff' }}>
                         <UserAuthorityCard
                             updateUserAuthList={updateUserAuthList}
                             userData={userData}
@@ -270,7 +270,7 @@ const UserMaintainPage = () => {
                                 disabled={isNewRecord}
                                 onClick={handleDeleteClick}
                             >
-                                Delete User
+                                <Typography variant="h5">Delete User</Typography>
                             </Button>
                             <GeneralConfirmWindow
                                 isWindowOpen={isWindowOpen}
@@ -292,7 +292,7 @@ const UserMaintainPage = () => {
                                 }}
                                 onClick={submitData}
                             >
-                                Save
+                                <Typography variant="h5">Save</Typography>
                             </Button>
                         </Grid>
                     </Grid>

src/pages/User/SearchPage/UserSearchForm.js

@@ -70,7 +70,7 @@ const UserSearchForm = ({ applySearch }) => {
                 {/*row 1*/}
                 <CardContent sx={{ px: 2.5, pt: 3 }}>
                     <Grid item justifyContent="space-between" alignItems="center">
-                        Search Form (GLD User)
+                        <Typography variant="h5">Search Form (GLD User)</Typography>
                     </Grid>
                 </CardContent>
 
@@ -82,6 +82,9 @@ const UserSearchForm = ({ applySearch }) => {
                             {...register("userName")}
                             id='userName'
                             label="Username"
+                            InputLabelProps={{
+                                shrink: true
+                            }}
                         />
                     </Grid>
 
@@ -91,6 +94,9 @@ const UserSearchForm = ({ applySearch }) => {
                             {...register("fullenName")}
                             id="fullenName"
                             label="Full Name"
+                            InputLabelProps={{
+                                shrink: true
+                            }}
                         />
                     </Grid>
 
@@ -100,6 +106,9 @@ const UserSearchForm = ({ applySearch }) => {
                             {...register("post")}
                             id="post"
                             label="Post"
+                            InputLabelProps={{
+                                shrink: true
+                            }}
                         />
                     </Grid>
 
@@ -109,6 +118,9 @@ const UserSearchForm = ({ applySearch }) => {
                             {...register("email")}
                             id="email"
                             label="Email"
+                            InputLabelProps={{
+                                shrink: true
+                            }}
                         />
                     </Grid>
 
@@ -118,6 +130,9 @@ const UserSearchForm = ({ applySearch }) => {
                             {...register("phone")}
                             id="phone"
                             label="Phone"
+                            InputLabelProps={{
+                                shrink: true
+                            }}
                         />
                     </Grid>
 
@@ -132,7 +147,7 @@ const UserSearchForm = ({ applySearch }) => {
                                     size="small"
                                 />
                             }
-                            label={<Typography variant="h6">Locked</Typography>}
+                            label={<Typography variant="h5">Locked</Typography>}
                         />
                     </Grid>
                 </Grid>
@@ -151,7 +166,7 @@ const UserSearchForm = ({ applySearch }) => {
                                 alignItems: 'end'
                             }}>
                             <AddCircleOutlineIcon />
-                            New User
+                            <Typography sx={{ ml: 1 }} variant="h5">New User</Typography>
                         </Button>
                     </Grid>
                     <Grid item xs={8} md={8} sx={{ ml: 3, mr: 3, mb: 3, mt: 3 }}>
@@ -165,7 +180,7 @@ const UserSearchForm = ({ applySearch }) => {
                                         textTransform: 'capitalize',
                                         alignItems: 'end'
                                     }}>
-                                    Clear
+                                    <Typography variant="h5">Clear</Typography>
                                 </Button>
                             </Grid>
 
@@ -178,7 +193,7 @@ const UserSearchForm = ({ applySearch }) => {
                                         textTransform: 'capitalize',
                                         alignItems: 'end'
                                     }}>
-                                    Search
+                                    <Typography variant="h5">Search</Typography>
                                 </Button>
                             </Grid>
                         </Grid>

src/pages/User/SearchPage/UserTable.js

@@ -136,6 +136,7 @@ export default function UserTable({recordList,setChangeLocked}) {
                     },
                 }}
                 onRowDoubleClick={handleRowDoubleClick}
+                getRowHeight={() => 'auto'}
             />
         </div>
     );

src/pages/User/SearchPage/index.js

@@ -1,14 +1,14 @@
 // material-ui
 import {
-    Grid, 
+    Grid,
     Typography,
     Stack,
     // Button
 } from '@mui/material';
 import MainCard from "../../../components/MainCard";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
 import axios from "axios";
-import {GLD_USER_PATH} from "../../../utils/ApiPathConst";
+import { GLD_USER_PATH } from "../../../utils/ApiPathConst";
 import * as React from "react";
 
 import Loadable from 'components/Loadable';
@@ -22,7 +22,7 @@ const BackgroundHead = {
     backgroundImage: `url(${titleBackgroundImg})`,
     width: '100%',
     height: '100%',
-    backgroundSize:'contain',
+    backgroundSize: 'contain',
     backgroundRepeat: 'no-repeat',
     backgroundColor: '#0C489E',
     backgroundPosition: 'right'
@@ -30,7 +30,7 @@ const BackgroundHead = {
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
 const UserSettingPage = () => {
-    const [record,setRecord] = useState([]);
+    const [record, setRecord] = useState([]);
     const [searchCriteria, setSearchCriteria] = useState({});
     const [onReady, setOnReady] = useState(false);
     const [changelocked, setChangeLocked] = React.useState(false);
@@ -49,9 +49,9 @@ const UserSettingPage = () => {
         getUserList();
     }, [searchCriteria]);
 
-    function getUserList(){
+    function getUserList() {
         axios.get(`${GLD_USER_PATH}`,
-            {params: searchCriteria}
+            { params: searchCriteria }
         )
             .then((response) => {
                 if (response.status === 200) {
@@ -70,35 +70,35 @@ const UserSettingPage = () => {
 
     return (
         !onReady ?
-            <LoadingComponent/>
+            <LoadingComponent />
             :
-        <Grid container sx={{minHeight: '90vh'}} direction="column">
-            <Grid item xs={12}>
-                <div style={BackgroundHead}>
-                    <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
-                        <Typography ml={15} color='#FFF' variant="h4">View GLD User</Typography>
-                    </Stack>
-                </div>
-            </Grid>
+            <Grid container sx={{ minHeight: '90vh', backgroundColor: "backgroundColor.default" }} direction="column">
+                <Grid item xs={12}>
+                    <div style={BackgroundHead}>
+                        <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
+                            <Typography ml={15} color='#FFF' variant="h4">View GLD User</Typography>
+                        </Stack>
+                    </div>
+                </Grid>
 
-            {/*row 1*/}
-            <Grid item xs={12} md={12} lg={12}>
-                <SearchForm applySearch={applySearch}/>
-            </Grid>
-            {/*row 2*/}
-            <Grid item xs={12} md={12} lg={12}>
-                <MainCard elevation={0}
-                          border={false}
-                          content={false}
-                >
-                    <EventTable
-                        recordList={record}
-                        setChangeLocked={setChangeLocked}
-                    />
-                </MainCard>
-            </Grid>
+                {/*row 1*/}
+                <Grid item xs={12} md={12} lg={12}>
+                    <SearchForm applySearch={applySearch} />
+                </Grid>
+                {/*row 2*/}
+                <Grid item xs={12} md={12} lg={12}>
+                    <MainCard elevation={0}
+                        border={false}
+                        content={false}
+                    >
+                        <EventTable
+                            recordList={record}
+                            setChangeLocked={setChangeLocked}
+                        />
+                    </MainCard>
+                </Grid>
 
-        </Grid>
+            </Grid>
 
     );
 };

src/pages/authentication/auth-forms/CustomFormWizard.js

@@ -816,7 +816,7 @@ const CustomFormWizard = (props) => {
 
                                     <Grid container>
                                         <Grid item xs={12} md={6} >
-                                            <Stack spacing={1} sx={{ mr: { md: 1 }, mb: { xs: 0.5 } }}>
+                                            <Stack spacing={1} sx={{ mr: { md: 1 } }}>
                                                 <Autocomplete
                                                     disablePortal
                                                     id="idDocType"

src/themes/overrides/Chip.js

@@ -5,6 +5,7 @@ export default function Chip(theme) {
     MuiChip: {
       styleOverrides: {
         root: {
+          fontSize: "1.2rem",
           borderRadius: 4,
           '&:active': {
             boxShadow: 'none'

src/themes/overrides/DataGrid.js

@@ -0,0 +1,69 @@
+// ==============================|| OVERRIDES - DATAGRID ||============================== //
+
+export default function DataGrid() {
+    const cellFontSize = "1.1rem"
+    const cellFooterFontSize = "1.1rem"
+    const cellHeaderFontSize = "1.1rem"
+    const selectedNumberFontSize = "1.2rem"
+    const actionIconSize = "2rem"
+
+    const cellFontWeight = 600
+    const cellFooterFontWeight = 600
+    const cellHeaderFontWeight = 600
+    const selectedNumberFontWeight = 600
+
+    return {
+        MuiDataGrid: {
+            styleOverrides: {
+                root: {
+                    // fontSize: "3rem"
+                    '& .MuiDataGrid-cell': {
+                        fontSize: cellFontSize,
+                        fontWeight: cellFontWeight
+                    },
+                    '& .MuiDataGrid-footerContainer': {
+                        fontSize: cellFooterFontSize,
+                        fontWeight: cellFooterFontWeight
+                    },
+                    '& .MuiTablePagination-selectLabel': {
+                        fontSize: cellFooterFontSize,
+                        fontWeight: cellFooterFontWeight,
+                        marginTop: 15,
+                    },
+                    '& .MuiTablePagination-select': {
+                        fontSize: selectedNumberFontSize,
+                        fontWeight: selectedNumberFontWeight,
+                        marginTop: 8,
+                    },
+                    '& .MuiTablePagination-selectIcon': {
+                        marginTop: 1,
+                    },
+                    '& .MuiTablePagination-displayedRows': {
+                        fontSize: cellFooterFontSize,
+                        fontWeight: cellFooterFontWeight,
+                    },
+                    '& .MuiTablePagination-actions': {
+                        fontSize: cellFooterFontSize,
+                        fontWeight: cellFooterFontWeight,
+                        svg: {
+                            width: actionIconSize,
+                            height: actionIconSize,
+                        }
+                    },
+                    '& .MuiDataGrid-rowCount': {
+                        fontSize: cellFooterFontSize,
+                        fontWeight: cellFooterFontWeight
+                    },
+                    '& .MuiDataGrid-columnHeaderTitle': {
+                        fontSize: cellHeaderFontSize,
+                        fontWeight: cellHeaderFontWeight,
+                    },
+                    button: {
+                        fontSize: cellFontSize,
+                        fontWeight: cellFontWeight
+                    }
+                },
+            }
+        }
+    };
+}

src/themes/overrides/OutlinedInput.js

@@ -14,6 +14,9 @@ export default function OutlinedInput(theme) {
           borderColor: theme.palette.grey[300]
         },
         root: {
+          fontSize: '1.2rem',
+          fontWeight: 600,
+          lineHeight: 1.57,
           '&:hover .MuiOutlinedInput-notchedOutline': {
             borderColor: theme.palette.primary.light
           },

src/themes/overrides/Tab.js

@@ -6,7 +6,9 @@ export default function Tab(theme) {
       styleOverrides: {
         root: {
           minHeight: 46,
-          color: theme.palette.text.primary
+          color: theme.palette.text.primary,
+          fontSize: "1.2rem",
+          fontWeight: 600
         }
       }
     }

src/themes/overrides/Textfield.js

@@ -0,0 +1,27 @@
+// ==============================|| OVERRIDES - TEXTFIELD ||============================== //
+
+export default function Textfield() {
+
+  const labelFontSize = "1.1rem"
+  const labelFontWeight = 600
+  const inputFontSize = "1.2rem"
+  const inputFontWeight = 600
+  return {
+    MuiTextField: {
+      styleOverrides: {
+        root: {
+          "& label": {
+            fontSize: labelFontSize,
+            fontWeight: labelFontWeight,
+          },
+          "& input": {
+            fontSize: inputFontSize,
+            fontWeight: inputFontWeight,
+            padding: "16px",
+            alignItems: "center"
+          }
+        },
+      }
+    }
+  };
+}

src/themes/overrides/index.js

@@ -17,6 +17,8 @@ import Tab from './Tab';
 import TableCell from './TableCell';
 import Tabs from './Tabs';
 import Typography from './Typography';
+import Textfield from './Textfield';
+import DataGrid from './DataGrid';
 
 // ==============================|| OVERRIDES - MAIN ||============================== //
 
@@ -27,6 +29,7 @@ export default function ComponentsOverrides(theme) {
     CardContent(),
     Checkbox(theme),
     Chip(theme),
+    DataGrid(),
     IconButton(theme),
     InputLabel(theme),
     LinearProgress(),
@@ -36,6 +39,7 @@ export default function ComponentsOverrides(theme) {
     Tab(theme),
     TableCell(theme),
     Tabs(),
+    Textfield(),
     Typography()
   );
 }

src/themes/typography.js

@@ -62,7 +62,7 @@ const Typography = (fontFamily) => ({
     lineHeight: 1.57
   },
   subtitle2: {
-    fontSize: '0.8rem',
+    fontSize: '0.9rem',
     fontWeight: 500,
     lineHeight: 1.66
   },
@@ -84,9 +84,9 @@ const Typography = (fontFamily) => ({
   overline: {
     lineHeight: 1.66
   },
-  button: {
-    textTransform: 'capitalize'
-  }
+  button: { 
+    textTransform: 'capitalize',
+  },
 });
 
 export default Typography;

src/utils/statusUtils/Base.js

@@ -1,6 +1,7 @@
+import { Typography } from "@mui/material"
 
 export function getStatusTag({ color = "#000", textColor = "#FFF", text = "" }) {
     return (
-        <div style={{ borderRadius: "25px", "background": color, "color": textColor, "padding": "5px 10px 5px 10px" }}><b>{text}</b></div>
+        <div style={{ borderRadius: "25px", "background": color, "color": textColor, "padding": "5px 10px 5px 10px", margin: "6px 4px 6px 4px" }}><Typography variant="h6">{text}</Typography></div>
     )
 }