add holiday setting and layout

src/layout/MainLayout/Header/index.js

@@ -146,6 +146,9 @@ function Header(props) {
             <li>
               <Link className="systemSetting" to='/setting/sys'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1 }}>System Setting</Typography></Link>
             </li>
+            <li>
+              <Link className="holidaySetting" to='/holiday'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1 }}>Holiday Setting</Typography></Link>
+            </li>
           </ul>
         </li>
         <Box sx={{display: {xs: 'none', sm: 'none', md: 'block'}}}>

src/pages/DemandNote/Create/index.js

@@ -80,7 +80,7 @@ const Index = () => {
         !onReady ?
             <LoadingComponent/>
             :
-            <Grid container sx={{backgroundColor: 'backgroundColor.default'}} direction="column">
+            <Grid container sx={{minHeight: '87vh', backgroundColor: 'backgroundColor.default'}} direction="column">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/DemandNote/Search/index.js

@@ -92,13 +92,13 @@ const UserSearchPage_Individual = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{ minHeight: '95vh', backgroundColor: 'backgroundColor.default' }} direction="column">
+            <Grid container sx={{ minHeight: '87vh', backgroundColor: 'backgroundColor.default' }} direction="column">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/DemandNote/Search_Public/index.js

@@ -92,7 +92,7 @@ const UserSearchPage_Individual = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/EmailTemplate/Detail_GLD/index.js

@@ -117,7 +117,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/EmailTemplate/Search_GLD/index.js

@@ -55,7 +55,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/GFMIS/index.js

@@ -123,7 +123,7 @@ const Index = () => {
         !onReady ?
             <LoadingComponent/>
             :
-            <Grid container sx={{minHeight: '95vh', backgroundColor: 'backgroundColor.default'}} direction="column">
+            <Grid container sx={{minHeight: '87vh', backgroundColor: 'backgroundColor.default'}} direction="column">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/Holiday/Search_GLD/DataGrid.js

@@ -0,0 +1,59 @@
+// material-ui
+import * as React from 'react';
+// import { GridActionsCellItem, } from "@mui/x-data-grid";
+import { FiDataGrid } from "components/FiDataGrid";
+// import EditIcon from '@mui/icons-material/Edit';
+import { useEffect } from "react";
+import { dateStr } from "utils/DateUtils";
+// import { useNavigate } from "react-router-dom";
+
+// ==============================|| EVENT TABLE ||============================== //
+
+export default function EmailTemplateTable({ recordList }) {
+    const [rows, setRows] = React.useState(recordList);
+
+    // const navigate = useNavigate()
+
+    useEffect(() => {
+        setRows(recordList);
+    }, [recordList]);
+
+    // const handleEditClick = (id) => () => {
+    //     navigate('/emailTemplate/' + id);
+    // };
+
+    const columns = [
+        {
+            id: 'holiday_DAY',
+            field: 'holiday_DAY',
+            headerName: 'Date',
+            flex: 4,
+            renderCell: (params) => {
+                let holiday_DAY = params.row.holiday_DAY;
+                return <div style={{ margin: 4 }}>{dateStr(holiday_DAY)}</div>
+            },
+        },
+        {
+            id: 'description',
+            field: 'description',
+            headerName: 'Description',
+            flex: 5,
+        },
+    ];
+
+    // function handleRowDoubleClick(params) {
+    //     navigate('/emailTemplate/' + params.id);
+    // }
+
+    return (
+        <div style={{ height: "fit-content", width: '100%' }}>
+            <FiDataGrid
+                rows={rows}
+                columns={columns}
+                customPageSize={10}
+                // onRowDoubleClick={handleRowDoubleClick}
+                getRowHeight={() => 'auto'}
+            />
+        </div>
+    );
+}

src/pages/Holiday/Search_GLD/SearchForm.js

@@ -0,0 +1,113 @@
+// material-ui
+import {
+    Button,
+    Grid, 
+    TextField,
+    // Autocomplete,
+    Typography
+} from '@mui/material';
+import MainCard from "components/MainCard";
+import { useForm } from "react-hook-form";
+import * as React from "react";
+// import * as DateUtils from "utils/DateUtils";
+import {PNSPS_BUTTON_THEME} from "themes/buttonConst";
+import {ThemeProvider} from "@emotion/react";
+// import * as ComboData from "utils/ComboData";
+// ==============================|| DASHBOARD - DEFAULT ||============================== //
+
+
+const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
+
+    // const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
+    const [maxDate] = React.useState(searchCriteria.dateFrom);
+    // const [status, setStatus] = React.useState(ComboData.paymentStatus[0]);
+
+    const { register, handleSubmit } = useForm()
+
+    const onSubmit = (data) => {
+        const temp = {
+            // code: data.code,
+            // transNo: data.transNo,
+            dateFrom: data.dateFrom,
+            dateTo: data.dateTo,
+            // status : (status?.type && status?.type != 'all') ? status?.type : "",
+        };
+        applySearch(temp);
+    };
+
+
+    return (
+        <MainCard xs={12} md={12} lg={12}
+            border={false}
+            content={false}
+            >
+
+            <form onSubmit={handleSubmit(onSubmit)} >
+                <Grid container sx={{ backgroundColor: '#ffffff', ml: 2, mt: 1}} width="98%">
+                    {/*row 1*/}
+                    <Grid item justifyContent="space-between" alignItems="center" sx={{mt:1,ml:3,mb:2.5}}>
+                        <Typography variant="h5" >
+                            Date
+                        </Typography>
+                    </Grid>
+                    {/*row 2*/}
+
+                    <Grid container display="flex" alignItems={"center"}>
+                    <Grid item xs={9} s={6} md={4} lg={4} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                        <TextField
+                            fullWidth
+                            {...register("dateFrom")}
+                            id="dateFrom"
+                            type="date"
+                            label="Credit Date"
+                            defaultValue={searchCriteria.dateFrom}
+                            InputProps={{ inputProps: { max: maxDate } }}
+                            // onChange={(newValue) => {
+                            //     setMinDate(DateUtils.dateStr(newValue));
+                            // }}
+                            InputLabelProps={{
+                                shrink: true
+                            }}
+                        />
+                    </Grid>
+
+                    <Grid item xs={9} s={6} md={4} lg={4} 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="To"
+                            defaultValue={searchCriteria.dateTo}
+                        /> */}
+                    </Grid>
+
+                    {/* <Grid item xs={9} s={6} md={4} lg={3}>
+                    </Grid> */}
+                </Grid>
+                <Grid container justifyContent="flex-end" direction="row"  alignItems="center" spacing={3}>
+                    <ThemeProvider theme={PNSPS_BUTTON_THEME}>
+                        <Grid item sx={{ ml: 3, mb: 3, }} >
+                            <Button
+                                variant="contained"
+                                type="submit"
+                            >
+                                Search
+                            </Button>
+                        </Grid>
+                    </ThemeProvider>
+                </Grid>
+                </Grid>
+            </form>
+        </MainCard>
+    );
+};
+
+export default SearchPublicNoticeForm;

src/pages/Holiday/Search_GLD/index.js

@@ -0,0 +1,208 @@
+// material-ui
+import {
+    Grid,
+    Typography,
+    Stack,
+    Button,
+    Dialog, DialogTitle, DialogContent, DialogActions,
+} from '@mui/material';
+import * as UrlUtils from "utils/ApiPathConst";
+import * as React from "react";
+import * as HttpUtils from "utils/HttpUtils";
+
+import Loadable from 'components/Loadable';
+const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));
+const HolidayTable = Loadable(React.lazy(() => import('pages/Holiday/Search_GLD/DataGrid')))
+import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
+// import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline';
+import MainCard from 'components/MainCard';
+const SearchForm = Loadable(React.lazy(() => import('./SearchForm')));
+
+const BackgroundHead = {
+    backgroundImage: `url(${titleBackgroundImg})`,
+    width: '100%',
+    height: '100%',
+    backgroundSize: 'contain',
+    backgroundRepeat: 'no-repeat',
+    backgroundColor: '#0C489E',
+    backgroundPosition: 'right'
+}
+// import { useNavigate } from "react-router";
+import {PNSPS_LONG_BUTTON_THEME} from "themes/buttonConst";
+import {ThemeProvider} from "@emotion/react";
+import { dateStr_Year } from "utils/DateUtils";
+import { notifySaveSuccess } from 'utils/CommonFunction';
+
+// ==============================|| DASHBOARD - DEFAULT ||============================== //
+
+const Index = () => {
+
+    const [record, setRecord] = React.useState([]);
+    const [onReady, setOnReady] = React.useState(false);
+    // const navigate = useNavigate()
+    const [searchCriteria, setSearchCriteria] = React.useState({
+        dateFrom: dateStr_Year(new Date()),
+        // dateFrom: DateUtils.dateStr(new Date().setDate(new Date().getDate()-14)),
+    });
+    const [attachments, setAttachments] = React.useState([]);
+    const [wait, setWait] = React.useState(false);
+    const [isWarningPopUp, setIsWarningPopUp] = React.useState(false);
+    const [warningText, setWarningText] = React.useState("");
+
+    React.useLayoutEffect(() => {
+        loadForm();
+    }, []);
+
+    React.useLayoutEffect(() => {
+        setOnReady(true);
+    }, [record]);
+
+    const loadForm = () => {
+        HttpUtils.get({
+            url: UrlUtils.GET_HOLIDAY,
+            onSuccess: (responseData) => {
+                console.log(dateStr_Year(new Date()))
+                setRecord(responseData);
+            }
+        });
+    }
+
+    function applySearch(input) {
+        setSearchCriteria(input);
+    }
+
+    React.useEffect(() => {
+        if (!attachments || attachments.length <= 0) {
+            setAttachments([]);
+            return;
+        }
+        importHoliday();
+    }, [attachments]);
+
+    const readFile = (event) => {
+        let file = event.target.files[0];
+        if (file) {
+            if (!file.name.toLowerCase().substr(file.name.length - 5).includes(".xlsx")) {
+                setWarningText("Please upload a valid file (File format: .xlsx).");
+                setIsWarningPopUp(true);
+                document.getElementById("uploadFileBtn").value = "";
+                return;
+            }
+            file['id'] = attachments.length;
+            setAttachments([
+                ...attachments,
+                file
+            ]);
+            document.getElementById("uploadFileBtn").value = "";
+        }
+    }
+
+    const importHoliday = () => {
+        setWait(true);
+        if (!attachments || attachments.length <= 0) {
+            setWarningText("Please upload file.");
+            setSaving(false);
+            return;
+        }
+        HttpUtils.postWithFiles({
+            url: UrlUtils.POST_HOLIDAY,
+            files: attachments,
+            onSuccess: () => {
+                notifySaveSuccess()
+                setWait(false);
+                setAttachments([]);
+                loadForm();
+            }
+        });
+    }
+
+    return (
+        !onReady ?
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+                <Grid item>
+                    <LoadingComponent />
+                </Grid>
+            </Grid>
+            :
+            (
+                <Grid container sx={{minHeight: '87vh', 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'>
+                                <Typography ml={15} color='#FFF' variant="h4" sx={{ pt: 2 }}>Holiday Setting</Typography>
+                            </Stack>
+                        </div>
+                    </Grid>
+                    <Grid item xs={12} md={12} lg={12} width="100%">
+                        <Stack direction="row" justifyContent="flex-start" alignItems="center" sx={{ml:2,mt:1}} >
+                            <ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}>
+                                <input
+                                    id="uploadFileBtn"
+                                    name="file"
+                                    type="file"
+                                    accept=".xlsx"
+                                    style={{ display: 'none' }}
+                                    disabled={wait}
+                                    onChange={(event) => {
+                                        readFile(event)
+                                    }}
+                                />
+                                <label htmlFor="uploadFileBtn">
+                                    <Button
+                                        component="span"
+                                        variant="contained"
+                                        size="large"
+                                        disabled={wait}
+                                    >
+                                        <Typography variant="h5">Upload Files</Typography>
+                                    </Button>
+                                </label>
+                            </ThemeProvider>
+                        </Stack>
+                    </Grid>
+                    {/*row 1*/}
+                    <Grid item xs={12} md={12} lg={12} width="100%">
+                        <SearchForm 
+                            applySearch={applySearch}
+                            // generateXML={generateXML}
+                            searchCriteria={searchCriteria}
+                        />
+                    </Grid>
+                    {/*row 2*/}
+                    <Grid item xs={12} md={12} lg={12} width="100%">
+                        <MainCard elevation={0}
+                            border={false}
+                            content={false}
+                        >
+                            <HolidayTable
+                                recordList={record}
+                            />
+                        </MainCard>
+                    </Grid>
+                    <div>
+                        <Dialog
+                            open={isWarningPopUp}
+                            onClose={() => setIsWarningPopUp(false)}
+                            PaperProps={{
+                                sx: {
+                                    minWidth: '40vw',
+                                    maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
+                                    maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
+                                }
+                            }}
+                        >
+                            <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>
+                </Grid >
+            )
+    );
+};
+
+export default Index;

src/pages/Message/Details/index.js

@@ -61,7 +61,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/Organization/DetailPage/index.js

@@ -124,13 +124,13 @@ const OrganizationDetailPage = () => {
 
     return (
         isLoading ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container direction="column" sx={{minHeight: '90vh',backgroundColor:isGLDLoggedIn()?'backgroundColor.default':'#ffffff' }}>
+            <Grid container direction="column" sx={{minHeight: '87vh',backgroundColor:isGLDLoggedIn()?'backgroundColor.default':'#ffffff' }}>
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/Organization/SearchPage/index.js

@@ -65,13 +65,13 @@ const OrganizationSearchPage = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{minHeight: '95vh', backgroundColor:"backgroundColor.default"}} direction="column">
+            <Grid container sx={{minHeight: '87vh', backgroundColor:"backgroundColor.default"}} direction="column">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/Payment/Card/index.js

@@ -125,7 +125,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/Payment/Details_GLD/index.js

@@ -79,7 +79,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/Payment/Details_Public/index.js

@@ -92,7 +92,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/Payment/FPS/AckPage.js

@@ -149,7 +149,7 @@ const AckPage = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/Payment/FPS/FPS.js

@@ -273,7 +273,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/Payment/FPS/fpscallback.js

@@ -139,7 +139,7 @@ const Fpscallback = () => {
     }
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/Payment/PaymentCallback.js

@@ -151,7 +151,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/Payment/Search_GLD/index.js

@@ -64,7 +64,7 @@ const Index = () => {
         !onReady ?
             <LoadingComponent/>
             :
-            <Grid container sx={{backgroundColor: 'backgroundColor.default'}} direction="column">
+            <Grid container sx={{minHeight: '87vh', backgroundColor: 'backgroundColor.default'}} direction="column">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/Proof/Create_FromApp/index.js

@@ -69,7 +69,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/Proof/Payment/Pay.js

@@ -80,7 +80,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/Proof/Payment/Pay_Creditor.js

@@ -60,7 +60,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/Proof/Reply_GLD/index.js

@@ -112,7 +112,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/Proof/Reply_Public/index.js

@@ -81,7 +81,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/Proof/Search_GLD/index.js

@@ -90,13 +90,13 @@ const UserSearchPage_Individual = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{ minHeight: '95vh', backgroundColor: 'backgroundColor.default' }} direction="column"
+            <Grid container sx={{ minHeight: '87vh', backgroundColor: 'backgroundColor.default' }} direction="column"
             >
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>

src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js

@@ -158,7 +158,7 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
 
 
     return (
-        <Grid container sx={{ minHeight: '95vh', backgroundColor: '#ffffff', mb: 3 }} direction="column" alignItems="center">
+        <Grid container sx={{ minHeight: '87vh', backgroundColor: '#ffffff', mb: 3 }} direction="column" alignItems="center">
             <Grid item xs={12} md={12} width="100%" >
                 <div style={BackgroundHead}>
                     <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/PublicNotice/ApplyForm/index.js

@@ -65,7 +65,7 @@ const ApplyForm = () => {
 
     return (
         isLoading ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/PublicNotice/ListPanel/index.js

@@ -102,13 +102,13 @@ const PublicNotice = () => {
 
     return (
         isLoading ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{ minHeight: '95vh', backgroundColor:'backgroundColor.default'}} direction="column">
+            <Grid container sx={{ minHeight: '87vh', backgroundColor:'backgroundColor.default'}} direction="column">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/PublicNotice/Search_GLD/index.js

@@ -90,13 +90,13 @@ const UserSearchPage_Individual = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{ minHeight: '95vh',backgroundColor: 'backgroundColor.default' }} direction="column">
+            <Grid container sx={{ minHeight: '87vh',backgroundColor: 'backgroundColor.default' }} direction="column">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/Setting/SystemSetting/index.js

@@ -69,7 +69,7 @@ const SystemSetting = () => {
 
     return (
        
-            <Grid container sx={{ minHeight: '90vh', backgroundColor: 'backgroundColor.default' }} direction="column"
+            <Grid container sx={{ minHeight: '87vh', backgroundColor: 'backgroundColor.default' }} direction="column"
                 justifyContent="flex-start">
                 <>
                     <Grid item xs={12}>

src/pages/User/DetailPage/index.js

@@ -202,13 +202,13 @@ const UserMaintainPage = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{ minHeight: '90vh', backgroundColor: 'backgroundColor.default' }}>
+            <Grid container sx={{ minHeight: '87vh', backgroundColor: 'backgroundColor.default' }}>
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/User/DetailsPage_Individual/index.js

@@ -118,13 +118,13 @@ const UserMaintainPage_Individual = () => {
 
     return (
         isLoading ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container direction="column" sx={{minHeight: '90vh', backgroundColor: isGLDLoggedIn()?'backgroundColor.default':'#ffffff', maxWidth:'100%' }}>
+            <Grid container direction="column" sx={{minHeight: '87vh', backgroundColor: isGLDLoggedIn()?'backgroundColor.default':'#ffffff', maxWidth:'100%' }}>
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/User/DetailsPage_Organization/index.js

@@ -179,13 +179,13 @@ const UserMaintainPage_Organization = () => {
 
     return (
         isLoading ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{ minHeight: '95vh', backgroundColor: isGLDLoggedIn()?'backgroundColor.default':'#ffffff' }} direction="column">
+            <Grid container sx={{ minHeight: '87vh', backgroundColor: isGLDLoggedIn()?'backgroundColor.default':'#ffffff' }} direction="column">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/User/GLDUserProfile/index.js

@@ -75,13 +75,13 @@ const UserMaintainPage = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{minHeight: '90vh',  backgroundColor: 'backgroundColor.default' }}direction="column"
+            <Grid container sx={{minHeight: '87vh',  backgroundColor: 'backgroundColor.default' }}direction="column"
             justifyContent="flex-start">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>

src/pages/User/SearchPage/index.js

@@ -70,13 +70,13 @@ const UserSettingPage = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{ minHeight: '90vh', backgroundColor: "backgroundColor.default" }} direction="column">
+            <Grid container sx={{ minHeight: '87vh', backgroundColor: "backgroundColor.default" }} direction="column">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/User/SearchPage_Individual/index.js

@@ -65,13 +65,13 @@ const UserSearchPage_Individual = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{ minHeight: '90vh', backgroundColor: "backgroundColor.default" }} direction="column">
+            <Grid container sx={{ minHeight: '87vh', backgroundColor: "backgroundColor.default" }} direction="column">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/User/SearchPage_Organization/index.js

@@ -66,13 +66,13 @@ const UserSearchPage_Organization = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{minHeight: '95vh',backgroundColor:"backgroundColor.default"}} direction="column">
+            <Grid container sx={{minHeight: '87vh',backgroundColor:"backgroundColor.default"}} direction="column">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/authentication/AuthWrapper.js

@@ -26,7 +26,7 @@ const BackgroundHead = {
 // ==============================|| AUTHENTICATION - WRAPPER ||============================== //
 
 const AuthWrapper = ({ children }) => (
-  <Box sx={{ minHeight: '90vh' }}>
+  <Box sx={{ minHeight: '87vh' }}>
     {/* <AuthBackground /> */}
     {/* <img src={banner} alt="banner" width="100%" /> */}
     <div style={BackgroundHead}>
@@ -36,7 +36,7 @@ const AuthWrapper = ({ children }) => (
         justifyContent="space-between"
         alignItems="center"
         sx={{
-          minHeight: '90vh'
+          minHeight: '87vh'
         }}
       >
         <Grid item xs={11}>

src/pages/authentication/AuthWrapperCustom.js

@@ -24,7 +24,7 @@ const AuthWrapperCustom = ({ children }) => (
       justifyContent="center"
       alignItems="flex-start"
       sx={{
-        minHeight: '90vh',
+        minHeight: '87vh',
       }}
     >
       {/* <Grid item xs={12} sx={{ ml: 3, mt: 3 }}>

src/pages/authentication/ForgotPassword/AfterForgotPasswordPage.js

@@ -41,7 +41,7 @@ const AfterForgotPasswordPage = () => {
     };
 
     return (
-        <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" alignItems="center">
+        <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" alignItems="center">
             <Grid item xs={12} md={12} width="100%" >
                 <div style={BackgroundHead}>
                     <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/authentication/ForgotPassword/AuthCallback/ResetPasswordSuccess.js

@@ -65,13 +65,13 @@ const ResetPasswordSuccess = () => {
 
     return (
         isLoading ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" alignItems="center">
                 <Grid item xs={12} md={12} width="100%" >
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/authentication/ForgotPassword/AuthCallback/index.js

@@ -188,13 +188,13 @@ const Index = () => {
 
     return (
         isLoading || verifyState == null ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" alignItems="center">
                 <Grid item xs={12} md={12} width="100%" >
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/authentication/ForgotPassword/ForgotPasswordApplyForm.js

@@ -79,7 +79,7 @@ const ForgotPasswordApplyForm = () => {
     });
 
     return (
-        <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" alignItems="center">
+        <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" alignItems="center">
             <Grid item xs={12} md={12} width="100%" >
                 <div style={BackgroundHead}>
                     <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/authentication/ForgotPassword/index.js

@@ -32,7 +32,7 @@ const ApplyForm = () => {
 
     return (
         isLoading ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/authentication/ForgotUsername/AfterForgotPasswordPage.js

@@ -41,7 +41,7 @@ const AfterForgotPasswordPage = () => {
     };
 
     return (
-        <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" alignItems="center">
+        <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" alignItems="center">
             <Grid item xs={12} md={12} width="100%" >
                 <div style={BackgroundHead}>
                     <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/authentication/ForgotUsername/AuthCallback/ResetPasswordSuccess.js

@@ -77,13 +77,13 @@ const ResetPasswordSuccess = () => {
 
     return (
         isLoading ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" alignItems="center">
                 <Grid item xs={12} md={12} width="100%" >
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/authentication/ForgotUsername/AuthCallback/index.js

@@ -188,13 +188,13 @@ const Index = () => {
 
     return (
         isLoading || verifyState == null ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" alignItems="center">
                 <Grid item xs={12} md={12} width="100%" >
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js

@@ -81,7 +81,7 @@ const ForgotUsernameApplyForm = () => {
     });
 
     return (
-        <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" alignItems="center">
+        <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" alignItems="center">
             <Grid item xs={12} md={12} width="100%" >
                 <div style={BackgroundHead}>
                     <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/authentication/ForgotUsername/index.js

@@ -32,7 +32,7 @@ const ApplyForm = () => {
 
     return (
         isLoading ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/authentication/Verify.js

@@ -56,7 +56,7 @@ export default function Verify() {
         <Stack sx={{ width: '100%', fontSize: '2rem', paddingTop: '65px' }} alignItems="center">
             <AuthWrapper>
                 {isLoading || verifyState == null ?
-                    <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+                    <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                         <Grid item>
                             <LoadingComponent />
                         </Grid>

src/pages/dashboard/GLD/index.js

@@ -21,7 +21,7 @@ const DashboardDefault = () => {
     backgroundPosition: 'right'
   }
   return (
-    <Grid container sx={{minHeight: '90vh', backgroundColor: "backgroundColor.default"}} direction="column">
+    <Grid container sx={{minHeight: '87vh', backgroundColor: "backgroundColor.default"}} direction="column">
       <Grid item xs={12}>
         <div style={BackgroundHead}>
           <Stack direction="row"  height='70px' justifyContent="flex-start" alignItems="center">

src/pages/dashboard/Public/index.js

@@ -36,7 +36,7 @@ const DashboardDefault = () => {
     backgroundPosition: 'right'
   }
   return (
-    <Grid container sx={{ minHeight: '90vh' }} direction="column">
+    <Grid container sx={{ minHeight: '87vh' }} direction="column">
       <Grid item xs={12} >
         <div style={BackgroundHead}>
           <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/pages/iAmSmart/AuthCallback/index.js

@@ -81,7 +81,7 @@ const Index = () => {
     }
 
     return (
-        <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+        <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
             <Grid item>
                 <LoadingComponent />
             </Grid>

src/pages/iAmSmart/DirectLoginCallback/index.js

@@ -66,7 +66,7 @@ const Index = () => {
     }
 
     return (
-        <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+        <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
             <Grid item>
                 <LoadingComponent />
             </Grid>

src/pages/iAmSmart/FailCallback/index.js

@@ -24,7 +24,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/iAmSmart/RegistryCallback/index.js

@@ -46,7 +46,7 @@ const Index = () => {
     }
 
     return (
-        <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+        <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
             <Grid item>
                 <LoadingComponent />
             </Grid>

src/pages/iAmSmart/SuccessCallback/index.js

@@ -32,7 +32,7 @@ const Index = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/pnspsUserGroupDetailPage/index.js

@@ -167,7 +167,7 @@ const UserMaintainPage = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>

src/pages/pnspsUserGroupSearchPage/index.js

@@ -73,13 +73,13 @@ const UserGroupSearchPanel = () => {
 
     return (
         !onReady ?
-            <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
+            <Grid container sx={{ minHeight: '87vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
                 <Grid item>
                     <LoadingComponent />
                 </Grid>
             </Grid>
             :
-            <Grid container sx={{ minHeight: '90vh', backgroundColor: "backgroundColor.default"}} direction="column">
+            <Grid container sx={{ minHeight: '87vh', backgroundColor: "backgroundColor.default"}} direction="column">
                 <Grid item xs={12}>
                     <div style={BackgroundHead}>
                         <Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">

src/routes/SettingRoutes.js

@@ -22,6 +22,7 @@ const OrganizationDetailPage = Loadable(lazy(() => import('pages/Organization/De
 const OrganizationDetailPage_fromUser = Loadable(lazy(() => import('pages/Organization/DetailPage_FromUser')));
 const EmailTemplatePage = Loadable(lazy(() => import('pages/EmailTemplate/Search_GLD')));
 const EmailTemplateDetailPage = Loadable(lazy(() => import('pages/EmailTemplate/Detail_GLD')));
+const HolidayPage = Loadable(lazy(() => import('pages/Holiday/Search_GLD')));
 
 
 // ==============================|| AUTH ROUTING ||============================== //
@@ -90,6 +91,10 @@ const SettingRoutes = {
             path: '/emailTemplate/:id',
             element: <EmailTemplateDetailPage/>
         },
+        {
+            path: 'holiday',
+            element: <HolidayPage/>
+        },
     ]
 };
 

src/utils/ApiPathConst.js

@@ -162,4 +162,8 @@ export const GEN_GAZETTE_PROOF = apiPath+'/proof/gazetteProof'; //POST
 export const GEN_PAYMENT_RECEIPT = apiPath+'/payment/receipt'; //POST
 
 //gen report
-export const GEN_GFMIS_XML = apiPath+'/gfmis'; //GET
+export const GEN_GFMIS_XML = apiPath+'/gfmis'; //GET
+
+//Holiday
+export const GET_HOLIDAY = apiPath+'/holiday/list'; //GET
+export const POST_HOLIDAY = apiPath+'/holiday/import'; //POST

src/utils/DateUtils.js

@@ -9,6 +9,10 @@ export const dateStr = (date) =>{
     return dateFormat(date,"YYYY-MM-DD")
 };
 
+export const dateStr_Year = (date) =>{
+    return dateFormat(date,'YYYY')
+};
+
 export const datetimeStr_Cht = (date) =>{ 
     return dateFormat(date,"YYYY年MM月DD日 HH:mm:ss")
 };