diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index 553a9cb..9b1e7fa 100644 --- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js +++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js @@ -28,10 +28,13 @@ const PublicNoticeApplyForm = ({loadedData, selections}) => { const BackgroundHead = { backgroundImage: `url(${titleBackgroundImg})`, - width: '100%', - height: '100%', - backgroundSize:'cover' - } + width: 'auto', + height: 'auto', + backgroundSize:'contain', + backgroundRepeat: 'no-repeat', + backgroundColor: '#0C489E', + backgroundPosition: 'right' + } // React.useEffect(()=>{ // setFormData(loadedData); // },[]); diff --git a/src/pages/PublicNotice/ListPanel/index.js b/src/pages/PublicNotice/ListPanel/index.js index b059e10..63a0cae 100644 --- a/src/pages/PublicNotice/ListPanel/index.js +++ b/src/pages/PublicNotice/ListPanel/index.js @@ -40,7 +40,10 @@ const PublicNotice = () => { backgroundImage: `url(${titleBackgroundImg})`, width: '100%', height: '100%', - backgroundSize: 'cover' + backgroundSize:'contain', + backgroundRepeat: 'no-repeat', + backgroundColor: '#0C489E', + backgroundPosition: 'right' } useEffect(() => { diff --git a/src/pages/PublicNoticeDetail/index.js b/src/pages/PublicNoticeDetail/index.js index 05ce602..12e11fe 100644 --- a/src/pages/PublicNoticeDetail/index.js +++ b/src/pages/PublicNoticeDetail/index.js @@ -46,7 +46,10 @@ const DashboardDefault = () => { backgroundImage: `url(${titleBackgroundImg})`, width: '100%', height: '100%', - backgroundSize:'cover' + backgroundSize:'contain', + backgroundRepeat: 'no-repeat', + backgroundColor: '#0C489E', + backgroundPosition: 'right' } // const appNo = "G2023-343" diff --git a/src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js b/src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js index 3a8b41c..1fc3c93 100644 --- a/src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js +++ b/src/pages/PublicNoticeDetail_GLD/ClientDetailCard.js @@ -65,8 +65,14 @@ const ClientDetailCard = ( 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(); + } + // useEffect(() => { // //upload latest data to parent // const values = getValues(); diff --git a/src/pages/PublicNoticeDetail_GLD/index.js b/src/pages/PublicNoticeDetail_GLD/index.js index f07049c..a5c4d0f 100644 --- a/src/pages/PublicNoticeDetail_GLD/index.js +++ b/src/pages/PublicNoticeDetail_GLD/index.js @@ -70,7 +70,10 @@ const PublicNoticeDetail_GLD = () => { backgroundImage: `url(${titleBackgroundImg})`, width: '100%', height: '100%', - backgroundSize:'cover' + backgroundSize:'contain', + backgroundRepeat: 'no-repeat', + backgroundColor: '#0C489E', + backgroundPosition: 'right' } const title = groupNo!=null?("Application / "+appNo+", "+gazetteIssue+", "+issueNum+" , "+groupNo):("Application / "+appNo+", "+gazetteIssue+", "+issueNum) diff --git a/src/pages/PublicNoticeSearch_GLD/index.js b/src/pages/PublicNoticeSearch_GLD/index.js index bf925c7..49f4c61 100644 --- a/src/pages/PublicNoticeSearch_GLD/index.js +++ b/src/pages/PublicNoticeSearch_GLD/index.js @@ -1,6 +1,8 @@ // material-ui import { - Grid + Grid, + Typography, + Stack } from '@mui/material'; import MainCard from "components/MainCard"; import * as UrlUtils from "utils/ApiPathConst"; @@ -12,6 +14,17 @@ import Loadable from 'components/Loadable'; const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent'))); const SearchForm = Loadable(React.lazy(() => import('./SearchForm'))); const EventTable = Loadable(React.lazy(() => import('./DataGrid'))); +import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' + +const BackgroundHead = { + backgroundImage: `url(${titleBackgroundImg})`, + width: '100%', + height: '100%', + backgroundSize:'contain', + backgroundRepeat: 'no-repeat', + backgroundColor: '#0C489E', + backgroundPosition: 'right' +} // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -66,29 +79,34 @@ const UserSearchPage_Individual = () => { !onReady ? : - - {/*row 1*/} - - - - {/*row 2*/} - - - + +
+ + Application + +
+
+ {/*row 1*/} + + -
+
+ {/*row 2*/} + + + + +
- - - ); }; diff --git a/src/pages/gldDashboard/index.js b/src/pages/gldDashboard/index.js index 1e9d81f..1de162e 100644 --- a/src/pages/gldDashboard/index.js +++ b/src/pages/gldDashboard/index.js @@ -15,7 +15,10 @@ const DashboardDefault = () => { backgroundImage: `url(${titleBackgroundImg})`, width: '100%', height: '100%', - backgroundSize:'cover' + backgroundSize:'contain', + backgroundRepeat: 'no-repeat', + backgroundColor: '#0C489E', + backgroundPosition: 'right' } return ( diff --git a/src/pages/publicDashboard/index.js b/src/pages/publicDashboard/index.js index e926d27..116dcd6 100644 --- a/src/pages/publicDashboard/index.js +++ b/src/pages/publicDashboard/index.js @@ -19,7 +19,10 @@ const DashboardDefault = () => { backgroundImage: `url(${titleBackgroundImg})`, width: '100%', height: '100%', - backgroundSize:'cover' + backgroundSize:'contain', + backgroundRepeat: 'no-repeat', + backgroundColor: '#0C489E', + backgroundPosition: 'right' } return (