Browse Source

update main page

master
jason.lam 1 year ago
parent
commit
6fb801460c
2 changed files with 21 additions and 4 deletions
  1. +5
    -0
      src/pages/Message/Search/SearchForm.js
  2. +16
    -4
      src/pages/dashboard/Public/index.js

+ 5
- 0
src/pages/Message/Search/SearchForm.js View File

@@ -77,6 +77,7 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
fullWidth fullWidth
{...register("keyword")} {...register("keyword")}
id='keyword' id='keyword'
aria-label={intl.formatMessage({id: 'keyword'})}
label={intl.formatMessage({id: 'keyword'}) + ":"} label={intl.formatMessage({id: 'keyword'}) + ":"}
defaultValue={searchCriteria.code} defaultValue={searchCriteria.code}
InputLabelProps={{ InputLabelProps={{
@@ -93,6 +94,7 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
{...register("dateFrom")} {...register("dateFrom")}
id="dateFrom" id="dateFrom"
type="date" type="date"
aria-label={intl.formatMessage({id: 'dateFrom'})}
label={intl.formatMessage({id: 'dateFrom'})} label={intl.formatMessage({id: 'dateFrom'})}
defaultValue={searchCriteria.dateFrom} defaultValue={searchCriteria.dateFrom}
InputProps={{ inputProps: { max: maxDate } }} InputProps={{ inputProps: { max: maxDate } }}
@@ -120,6 +122,7 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
onChange={(newValue) => { onChange={(newValue) => {
setMaxDate(DateUtils.dateStr(newValue)); setMaxDate(DateUtils.dateStr(newValue));
}} }}
aria-label={intl.formatMessage({id: 'dateTo'})}
id="dateTo" id="dateTo"
type="date" type="date"
//label="付款日期(到)" //label="付款日期(到)"
@@ -139,6 +142,7 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
<Button <Button
variant="contained" variant="contained"
onClick={resetForm} onClick={resetForm}
aria-label={intl.formatMessage({id: 'reset'})}
> >
<FormattedMessage id="reset"/> <FormattedMessage id="reset"/>
</Button> </Button>
@@ -148,6 +152,7 @@ const SearchForm = ({ applySearch, searchCriteria }) => {
<Button <Button
variant="contained" variant="contained"
type="submit" type="submit"
aria-label={intl.formatMessage({id: 'submit'})}
> >
<FormattedMessage id="submit"/> <FormattedMessage id="submit"/>
</Button> </Button>


+ 16
- 4
src/pages/dashboard/Public/index.js View File

@@ -10,7 +10,7 @@ import {
} from '@mui/material'; } from '@mui/material';
import { isORGLoggedIn, } from "utils/Utils"; import { isORGLoggedIn, } from "utils/Utils";
import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
import { FormattedMessage } from "react-intl";
import {FormattedMessage, useIntl} from "react-intl";
import AdsClickRoundedIcon from '@mui/icons-material/AdsClickRounded'; import AdsClickRoundedIcon from '@mui/icons-material/AdsClickRounded';
import * as React from "react"; import * as React from "react";
import Loadable from 'components/Loadable'; import Loadable from 'components/Loadable';
@@ -23,6 +23,7 @@ import { useNavigate } from "react-router-dom";


const DashboardDefault = () => { const DashboardDefault = () => {
const navigate = useNavigate() const navigate = useNavigate()
const intl = useIntl();
const userData = JSON.parse(localStorage.getItem("userData")); const userData = JSON.parse(localStorage.getItem("userData"));
const BackgroundHead = { const BackgroundHead = {
// backgroundColor: '#0d47a1', // backgroundColor: '#0d47a1',
@@ -49,7 +50,12 @@ const DashboardDefault = () => {
<Grid item xs={12} md={12} sx={{ textAlign: "center" }}> <Grid item xs={12} md={12} sx={{ textAlign: "center" }}>
<Grid container justifyContent="center" spacing={2} sx={{ pt: 2 }} alignitems="stretch" > <Grid container justifyContent="center" spacing={2} sx={{ pt: 2 }} alignitems="stretch" >
<Grid item xs={12} lg={5} sx={{ pt: 2 }} style={{ height: '100%' }}> <Grid item xs={12} lg={5} sx={{ pt: 2 }} style={{ height: '100%' }}>
<Button xs={12} onClick={()=>{ navigate("/publicNotice/apply");}} style={{ justifyContent: "flex-start" }} sx={{ width: "100%", p: 4, border: '3px solid #e1edfc', borderRadius: '10px', backgroundColor: "#e1edfc" }} >
<Button
xs={12} onClick={()=>{ navigate("/publicNotice/apply");}}
style={{ justifyContent: "flex-start" }}
aria-label={intl.formatMessage({id: 'submitApplication'})}
sx={{ width: "100%", p: 4, border: '3px solid #e1edfc', borderRadius: '10px', backgroundColor: "#e1edfc" }}
>
<Stack direction="row" spacing={2}> <Stack direction="row" spacing={2}>
<AdsClickRoundedIcon /> <AdsClickRoundedIcon />
<Stack direction="column" alignItems="start"> <Stack direction="column" alignItems="start">
@@ -66,7 +72,10 @@ const DashboardDefault = () => {
<Typography variant="h4"> <Typography variant="h4">
<FormattedMessage id="announcement" /> <FormattedMessage id="announcement" />
</Typography> </Typography>
<Button color="gray"><u>
<Button
color="gray"
aria-label={intl.formatMessage({id: 'viewAllAnnouncement'})}
><u>
<FormattedMessage id="viewAllAnnouncement" /> <FormattedMessage id="viewAllAnnouncement" />
</u></Button> </u></Button>
</Stack> </Stack>
@@ -80,7 +89,10 @@ const DashboardDefault = () => {
<Typography variant="h4"> <Typography variant="h4">
<FormattedMessage id="systemMessage" /> <FormattedMessage id="systemMessage" />
</Typography> </Typography>
<Button onClick={()=>{navigate("/msg/search");}} color="gray"><u>
<Button
aria-label={intl.formatMessage({id: 'viewAllSystemMessage'})}
onClick={()=>{navigate("/msg/search");}} color="gray"
><u>
<FormattedMessage id="viewAllSystemMessage" /> <FormattedMessage id="viewAllSystemMessage" />
</u></Button> </u></Button>
</Stack> </Stack>


Loading…
Cancel
Save