update layout

package-lock.json

@@ -5788,6 +5788,11 @@
         "whatwg-url": "^8.0.0"
       }
     },
+    "date-fns": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.0.6.tgz",
+      "integrity": "sha512-W+G99rycpKMMF2/YD064b2lE7jJGUe+EjOES7Q8BIGY8sbNdbgcs9XFTZwvzc9Jx1f3k7LB7gZaZa7f8Agzljg=="
+    },
     "dayjs": {
       "version": "1.11.10",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",

package.json

@@ -23,6 +23,7 @@
     "@types/react-input-mask": "^3.0.2",
     "apexcharts": "^3.35.5",
     "axios": "^1.4.0",
+    "date-fns": "^3.0.6",
     "dayjs": "^1.11.9",
     "formik": "^2.2.9",
     "framer-motion": "^7.3.6",
@@ -40,6 +41,7 @@
     "react-element-to-jsx-string": "^15.0.0",
     "react-hook-form": "^7.45.4",
     "react-input-mask": "^3.0.0-alpha.2",
+    "react-intl": "^6.4.7",
     "react-number-format": "^4.9.4",
     "react-perfect-scrollbar": "^1.5.8",
     "react-redux": "^8.0.4",
@@ -50,7 +52,6 @@
     "react-to-print": "^2.14.13",
     "react-toastify": "^9.1.3",
     "react-window": "^1.8.7",
-    "react-intl": "^6.4.7",
     "redux": "^4.2.0",
     "simplebar": "^5.3.8",
     "simplebar-react": "^2.4.1",

src/pages/PublicNotice/Search_GLD/DataGrid.js

@@ -38,7 +38,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             id: 'status',
             field: 'status',
             headerName: 'Status',
-            width: 175,
+            width: 300,
             renderCell: (params) => {
                 return [StatusUtils.getStatusEng(params)]
             },
@@ -116,7 +116,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
                     columns={columns}
                     initialState={{
                         pagination: {
-                            paginationModel: { page: 0, pageSize: 5 },
+                            paginationModel: { page: 0, pageSize: 10 },
                         },
                     }}
                     getRowHeight={() => 'auto'}

src/pages/PublicNotice/Search_GLD/SearchForm.js

@@ -13,6 +13,7 @@ import * as DateUtils from "utils/DateUtils";
 import * as FormatUtils from "utils/FormatUtils";
 import {ThemeProvider} from "@emotion/react";
 import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst";
+import dayjs from "dayjs";
 // ==============================|| DASHBOARD - DEFAULT ||============================== //
 
 
@@ -140,6 +141,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss
                                 <Grid item xs={5.25} s={5.25} md={5.25} lg={5.5}>
                                     <TextField
                                         fullWidth
+                                        //todo: set dd/mm/yyyy
                                         InputLabelProps={{
                                             shrink: true
                                         }}

src/pages/authentication/BusRegister.js

@@ -198,7 +198,7 @@ const BusRegister = () => {
             />
             {/* <CustomFormWizard step={activeStep} /> */}
           </AuthWrapper>
-          <Stack direction="row" sx={{ pb: 2 }}>
+          <Stack direction="row" sx={{ pb: 2, mt:-4, mb:2 }}>
             {activeStep === totalSteps() - 1 ? (
               <Button
                 color="inherit"

src/pages/authentication/Register.js

@@ -200,7 +200,7 @@ const Register = () => {
             />
             {/* <CustomFormWizard step={activeStep} /> */}
           </AuthWrapper>
-          <Stack direction="row" sx={{ pb: 2 }}>
+          <Stack direction="row" sx={{ pb: 2, mt:-4, mb:2 }}>
             {activeStep === 2 || activeStep === 0 ? (
               <Button
                 color="inherit"

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

@@ -753,7 +753,7 @@ const BusCustomFormWizard = (props) => {
                                 </Grid>
                                 <Grid item xs={12} mt={1} mb={1}>
                                     <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
-                                        <Typography display="inline" variant="h4" sx={{ color: '#1A4399' }}>你的機構/公司資料</Typography>
+                                        <Typography display="inline" variant="h4" /*sx={{ color: '#1A4399' }}*/>你的機構/公司資料</Typography>
                                         {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary">
                                             Already have an account?
                                         </Typography> */}
@@ -1429,7 +1429,7 @@ const BusCustomFormWizard = (props) => {
                                 </Grid>
                                 <Grid item xs={12} mt={1} mb={1}>
                                     <Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
-                                        <Typography display="inline" variant="h4" sx={{ color: '#1A4399' }}>你的機構/公司資料</Typography>
+                                        <Typography display="inline" variant="h4" /*sx={{ color: '#1A4399' }}*/>你的機構/公司資料</Typography>
                                         {/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary">
                                         Already have an account?
                                     </Typography> */}

src/themes/typography.js

@@ -97,7 +97,7 @@ const Typography = (fontFamily) => ({
     lineHeight: 1
   },
   step1: {
-    fontSize: '1.4rem',
+    fontSize: '1.1rem',
     fontWeight: 600,
     lineHeight: 1
   },