alex
/
PNSPS-frontend-MaterialUI
2
0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Julkaisut 0 Wiki Toiminta
Selaa lähdekoodia

update header as span

web-access-fix-2
Jason Chuang 9 tuntia sitten
vanhempi
c8d3708c91
commit
c9a33ef0d8
13 muutettua tiedostoa jossa 142 lisäystä ja 142 poistoa
Jaettu näkymä
Diff Options
Show Stats Download Patch File Download Diff File
  1. +6
    -6
      src/pages/Proof/Reply_Public/ApplicationDetails.js
  2. +13
    -13
      src/pages/Proof/Reply_Public/ProofForm.js
  3. +4
    -4
      src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js
  4. +6
    -6
      src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
  5. +10
    -10
      src/pages/User/ChangePasswordPage/index.js
  6. +1
    -1
      src/pages/User/ManagePage_OrgPublic/index.js
  7. +4
    -4
      src/pages/authentication/ForgotPassword/ForgotPasswordApplyForm.js
  8. +4
    -4
      src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js
  9. +23
    -23
      src/pages/authentication/auth-forms/BusCustomFormWizard.js
  10. +20
    -20
      src/pages/authentication/auth-forms/CustomFormWizard.js
  11. +48
    -48
      src/pages/authentication/auth-forms/IAmSmartFormWizard.js
  12. +2
    -2
      src/pages/dashboard/Public/Notice.js
  13. +1
    -1
      src/pages/dashboard/Public/index.js

+ 6
- 6
src/pages/Proof/Reply_Public/ApplicationDetails.js Näytä tiedosto

@@ -70,7 +70,7 @@ const ApplicationDetailCard = ({ formData, }) => {
border={false}
content={false}
>
<Typography variant="h4" sx={{ textAlign: "left", mb: 2, borderBottom: "1px solid black" }}>
<Typography variant="h4" component="h2" sx={{ textAlign: "left", mb: 2, borderBottom: "1px solid black" }}>
<FormattedMessage id="publicNoticePaymentProofInfo" />
</Typography>
<form>
@@ -262,12 +262,12 @@ const ApplicationDetailCard = ({ formData, }) => {
<>
<Grid item xs={12} md={12} lg={12}
sx={{ display: 'flex', alignItems: 'center' }}>
<Typography variant="h5" display="inline">
<Typography variant="h5" component="span" display="inline">
<FormattedMessage id="commentDeadline" />：
</Typography>
</Grid>
<Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}>
<Typography variant="h5">&emsp;
<Typography variant="h5" component="span">&emsp;
{locale === 'en' ?
`${intl.formatMessage({ id: 'before' })} ${DateUtils.dateFormat(data?.reviseDeadline, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} `
:
@@ -278,12 +278,12 @@ const ApplicationDetailCard = ({ formData, }) => {

<Grid item xs={12} md={12} lg={12}
sx={{ display: 'flex', alignItems: 'center' }}>
<Typography variant="h5" display="inline">
<Typography variant="h5" component="span" display="inline">
<FormattedMessage id="paymentDeadline" />：
</Typography>
</Grid>
<Grid item xs={12} md={12} lg={12} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}>
<Typography variant="h5">&emsp;
<Typography variant="h5" component="span">&emsp;
{locale === 'en' ?
`${intl.formatMessage({ id: 'before' })} ${DateUtils.dateFormat(data?.expiryDate, intl.formatMessage({ id: "paymentMethodDatetimeStrFormat" }))?.replace("am", "a.m.")?.replace("pm", "p.m.")} `
:
@@ -304,7 +304,7 @@ const ApplicationDetailCard = ({ formData, }) => {
</Typography>
</Grid>
<Grid item xs={12} sm={9} md={9} lg={9} sx={{ mb: 1, display: 'flex', alignItems: 'center' }}>
<Typography variant="h4" style={{ color: "#0049B8", fontWeight: "bold", }}>{FormatUtils.currencyFormat(data.fee)}</Typography>
<Typography variant="h4" component="span" style={{ color: "#0049B8", fontWeight: "bold", }}>{FormatUtils.currencyFormat(data.fee)}</Typography>
</Grid>
<Grid item xs={12} md={9} lg={9} sx={{ mb: 4, display: 'flex', alignItems: 'center' }}>
{


+ 13
- 13
src/pages/Proof/Reply_Public/ProofForm.js Näytä tiedosto

@@ -252,7 +252,7 @@ const FormPanel = ({ formData }) => {
border={false}
content={false}>

<Typography variant="h4" sx={{ textAlign: "left", mb: 2, borderBottom: "1px solid black" }}>
<Typography variant="h4" component="h2" sx={{ textAlign: "left", mb: 2, borderBottom: "1px solid black" }}>
<FormattedMessage id="publicNoticePaymentProofComment" />
</Typography>

@@ -262,7 +262,7 @@ const FormPanel = ({ formData }) => {
formik.values.replyDate ?
<Grid container direction="column" sx={{ paddingLeft: 0, paddingRight: 0 }}>
<Grid item xs={12} sm={12} md={12} lg={8} textAlign="left">
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="proofReplyDate" /> :&nbsp;
{
locale === 'en' ?
@@ -273,7 +273,7 @@ const FormPanel = ({ formData }) => {
</Typography>
</Grid>
<Grid item xs={12} md={12} textAlign="left">
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="proofReply" /> : {formik.values.action ?
(<span style={{ color: 'green' }}>
<FormattedMessage id="proofErrorFree" />
@@ -285,7 +285,7 @@ const FormPanel = ({ formData }) => {
</Typography>
</Grid>
{/* <Grid item xs={12} md={12} textAlign="left">
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="proofReply" /> :&nbsp;
<span style={{ color: 'green' }}>
{
@@ -322,7 +322,7 @@ const FormPanel = ({ formData }) => {
isOverTime() ?
<Grid container direction="column" sx={{ paddingLeft: 0, paddingRight: 0 }} spacing={1}>
<Grid item xs={12} md={12} textAlign="left">
<Typography variant="h5"><FormattedMessage id="MSG.proofOutOfTime" /></Typography>
<Typography variant="h5" component="span"><FormattedMessage id="MSG.proofOutOfTime" /></Typography>
</Grid>
</Grid>
:
@@ -381,7 +381,7 @@ const FormPanel = ({ formData }) => {
<li><FormattedMessage id="store" /></li>
<li><FormattedMessage id="post" /></li>
</ul>
<Typography variant="h6">
<Typography variant="h6" component="span">
<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} />
</Typography>
</>
@@ -535,7 +535,7 @@ const FormPanel = ({ formData }) => {
<li><FormattedMessage id="store" /></li>
<li><FormattedMessage id="post" /></li>
</ul>
<Typography variant="h6">
<Typography variant="h6" component="span">
<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} />
</Typography>
</>
@@ -598,13 +598,13 @@ const FormPanel = ({ formData }) => {
</Grid>
}
{/* <Grid item xs={12}>
<Typography variant="h6" height="100%" >
<Typography variant="h6" component="span" height="100%" >
<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} />
</Typography>
</Grid> */}
{!isOnlyOnlinePayment?
<Grid item xs={12}>
<Typography variant="h6" height="100%" >
<Typography variant="h6" component="span" height="100%" >
<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofImportant" }) }} />
</Typography>
</Grid>:null
@@ -618,14 +618,14 @@ const FormPanel = ({ formData }) => {
{
isOverReviseDeadline() ?
<Grid item xs={12} md={12} textAlign="left">
<Typography variant="h5" style={{ color: "red" }}>
<Typography variant="h5" component="span" style={{ color: "red" }}>
<FormattedMessage id="MSG.overReviseDeadline" />
</Typography>
</Grid>
:
<>
<Grid item xs={12} md={12} textAlign="left">
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="requiredUploadFix" />：
</Typography>
</Grid>
@@ -684,7 +684,7 @@ const FormPanel = ({ formData }) => {
<Grid item xs={12} sm={12} md={12} lg={12}>
<Stack direction="row" alignItems="center">
<FormLabel sx={{ paddingRight: 2, paddingBottom: 3, textAlign: "center" }}>
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="sign" />：
</Typography>
</FormLabel>
@@ -754,7 +754,7 @@ const FormPanel = ({ formData }) => {
{warningTitle}
</DialogTitle>
<DialogContent style={{ display: 'flex', }}>
<Typography variant="h5" style={{ padding: '16px' }}>{warningText}</Typography>
<Typography variant="h5" component="span" style={{ padding: '16px' }}>{warningText}</Typography>
</DialogContent>
<DialogActions>
<Button


+ 4
- 4
src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js Näytä tiedosto

@@ -458,7 +458,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
<li><FormattedMessage id="store" /></li>
<li><FormattedMessage id="post" /></li>
</ul>
<Typography variant="h6">
<Typography variant="h6" component="span">
<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "proofNote" }) }} />
</Typography>
</>
@@ -629,7 +629,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
"aria-label": intl.formatMessage({ id: "applyTickStr" })
}}
/>
<Typography variant="h6" height="100%" >
<Typography variant="h6" component="span" height="100%" >
<div style={{ padding: 12, textAlign: 'justify' }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyTickStr" }) }} />
</Typography>
</Stack>
@@ -652,7 +652,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
</Grid>

<Grid item xs={12}>
<Typography variant="h6" height="100%" >
<Typography variant="h6" component="span" height="100%" >
<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "applyPublicNoticeText" }) }} />
</Typography>
</Grid>
@@ -678,7 +678,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
{warningTitle}
</DialogTitle>
<DialogContent style={{ display: 'flex', }}>
<Typography variant="h5" style={{ padding: '16px' }}>
<Typography variant="h5" component="span" style={{ padding: '16px' }}>
{warningText}
</Typography>
</DialogContent>


+ 6
- 6
src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js Näytä tiedosto

@@ -254,7 +254,7 @@ const ApplicationDetailCard = (
</div>
:null
}
<Typography variant="h4" sx={{ mb: 2, borderBottom: "1px solid black" }}>
<Typography variant="h4" component="h3" sx={{ mb: 2, borderBottom: "1px solid black" }}>
<FormattedMessage id="publicNoticeDetailTitle" />
</Typography>
<form>
@@ -753,13 +753,13 @@ const ApplicationDetailCard = (
}}
>
<DialogTitle>
<Typography variant="h3" >
<Typography variant="h3" component="span">
<FormattedMessage id="payConfirm" />
</Typography>
</DialogTitle>
<DialogContent style={{ display: 'flex', }}>
<Stack direction="column" justifyContent="space-between">
<Typography variant="h4">
<Typography variant="h4" component="span">
<FormattedMessage id="totalAmount" /> ($): {FormatUtils.currencyFormat(fee)}
</Typography>
</Stack>
@@ -799,7 +799,7 @@ const ApplicationDetailCard = (
}}
>
<DialogTitle></DialogTitle>
<Typography variant="h2" style={{ padding: '16px' }}><FormattedMessage id="MSG.actionFail" /></Typography>
<Typography variant="h2" component="span" style={{ padding: '16px' }}><FormattedMessage id="MSG.actionFail" /></Typography>
<DialogContent style={{ display: 'flex', }}>
<Stack direction="column" justifyContent="space-between">
{
@@ -831,7 +831,7 @@ const ApplicationDetailCard = (
}}
>
<DialogTitle></DialogTitle>
<Typography variant="h4" style={{ paddingLeft: '24px' }}><FormattedMessage id="MSG.actionFail" /></Typography>
<Typography variant="h4" component="span" style={{ paddingLeft: '24px' }}><FormattedMessage id="MSG.actionFail" /></Typography>
<DialogContent style={{ display: 'flex', }}>
<Stack direction="column" justifyContent="space-between">
<div dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: 'MSG.paymentHolded' }, { appNo: paymentHoldedErrText }) }} />
@@ -839,7 +839,7 @@ const ApplicationDetailCard = (
</DialogContent>
<DialogActions>
<Button onClick={() => setPaymentHoldedErr(false)} aria-label={intl.formatMessage({ id: 'close' })}>
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="close" />
</Typography></Button>
</DialogActions>


+ 10
- 10
src/pages/User/ChangePasswordPage/index.js Näytä tiedosto

@@ -215,13 +215,13 @@ const Index = () => {
<Grid container spacing={4} sx={{ minHeight: {xs:"80vh", sm:"50vh", md: "50vh", lg:"70vh", xl:"50vh"} }} direction="column" justifyContent="flex-start" alignItems="center">
{isPasswordExpiry()?
<Grid item width="70%" xs={12} md={12} lg={12} sx={{ mb: 1, mt:2 }}>
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="passwordExpired"/>
</Typography>
</Grid>
:
<Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:2 }}>
<Typography variant="h5" >
<Typography variant="h5" component="span">
<FormattedMessage id="setNewPassword"/>
</Typography>
</Grid>
@@ -433,14 +433,14 @@ const Index = () => {
<DialogTitle></DialogTitle>
<DialogContent style={{ display: 'flex', }}>
<Stack direction="column" justifyContent="space-between">
<Typography variant="h5" style={{ padding: '10px' }}>
<Typography variant="h5" component="span" style={{ padding: '10px' }}>
<FormattedMessage id ="changePasswordConfirm"/>
</Typography>
</Stack>
</DialogContent>
<DialogActions>
<Button disabled={isChangingPassword} onClick={() => setComfirmChangeMessage(false)}>
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="close"/>
</Typography>
</Button>
@@ -449,7 +449,7 @@ const Index = () => {
onClick={() => goLogin(changePasswordValues)}
startIcon={isChangingPassword ? <CircularProgress color="inherit" size={18} /> : null}
>
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="confirm"/>
</Typography>
</Button>
@@ -468,13 +468,13 @@ const Index = () => {
}}
>
<DialogTitle>
<Typography variant="h5" style={{ padding: '10px' }}>
<Typography variant="h5" component="span" style={{ padding: '10px' }}>
<FormattedMessage id ="MSG.actionFail"/>
</Typography>
</DialogTitle>
<DialogContent style={{ display: 'flex', }}>
<Stack direction="column" justifyContent="space-between">
<Typography variant="h5">
<Typography variant="h5" component="span">
{
expiryErrText
}
@@ -483,7 +483,7 @@ const Index = () => {
</DialogContent>
<DialogActions>
<Button onClick={() => setExpiryErr(false)}>
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="close"/>
</Typography>
</Button>
@@ -498,13 +498,13 @@ const Index = () => {
<CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} />
</Grid>
<Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5,}}>
<Typography display="inline" variant="h4">
<Typography display="inline" variant="h4" component="span">
<FormattedMessage id="resetPasswordSuccess"/>
</Typography>
</Grid>
<Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5,}}>
<Button color="success" variant="outlined" onClick={()=>logout()}>
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="backToLogin"/>
</Typography>
</Button>


+ 1
- 1
src/pages/User/ManagePage_OrgPublic/index.js Näytä tiedosto

@@ -279,7 +279,7 @@ const ManageOrgUserPage = () => {
<FormattedMessage id="confirm" />
</DialogTitle>
<DialogContent style={{ display: 'flex', }}>
<Typography variant="h5" style={{ padding: '16px' }}>{warningText}</Typography>
<Typography variant="h5" component="span" style={{ padding: '16px' }}>{warningText}</Typography>
</DialogContent>
<DialogActions>
<Button onClick={() => {


+ 4
- 4
src/pages/authentication/ForgotPassword/ForgotPasswordApplyForm.js Näytä tiedosto

@@ -128,17 +128,17 @@ const ForgotPasswordApplyForm = () => {
<Grid container spacing={2} sx={{ minHeight: '40vh' }} direction="column" justifyContent="flex-start" alignItems="center">
<Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { xs: 'none', sm: 'none', md: 'block' } }}>
<InputLabel htmlFor="email-login-title">
<Typography variant="h5" >
<Typography variant="h5" component="span">
<FormattedMessage id="forgotPasswordSubTitle"/>
</Typography>
</InputLabel>
</Grid>
<Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { md: 'none', xl: 'none', lg: 'none' } }}>
<InputLabel htmlFor="email-login-subtitle">
<Typography variant="h6" >
<Typography variant="h6" component="span">
<FormattedMessage id="forgotPasswordSubTitle1"/>
</Typography>
<Typography variant="h6" >
<Typography variant="h6" component="span">
<FormattedMessage id="forgotPasswordSubTitle2"/>
</Typography>
</InputLabel>
@@ -212,7 +212,7 @@ const ForgotPasswordApplyForm = () => {
<FormattedMessage id="attention"/>
</DialogTitle>
<DialogContent style={{ display: 'flex', }}>
{/* <Typography variant="h5" style={{ padding: '16px' }}>{warningText}</Typography> */}
{/* <Typography variant="h5" component="span" style={{ padding: '16px' }}>{warningText}</Typography> */}
</DialogContent>
<DialogActions>
<Button


+ 4
- 4
src/pages/authentication/ForgotUsername/ForgotUsernameApplyForm.js Näytä tiedosto

@@ -127,17 +127,17 @@ const ForgotUsernameApplyForm = () => {
<Grid container spacing={2} sx={{ minHeight: '40vh' }} direction="column" justifyContent="flex-start" alignItems="center">
<Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { xs: 'none', sm: 'none', md: 'block' } }}>
<InputLabel htmlFor="email-login-title">
<Typography variant="h5" >
<Typography variant="h5" component="span">
<FormattedMessage id="forgotUsernameSubTitle"/>
</Typography>
</InputLabel>
</Grid>
<Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { md: 'none', xl: 'none', lg: 'none' } }}>
<InputLabel htmlFor="email-login-subtitle">
<Typography variant="h6" >
<Typography variant="h6" component="span">
<FormattedMessage id="forgotUsernameSubTitle1"/>
</Typography>
<Typography variant="h6" >
<Typography variant="h6" component="span">
<FormattedMessage id="forgotPasswordSubTitle2"/>
</Typography>
</InputLabel>
@@ -211,7 +211,7 @@ const ForgotUsernameApplyForm = () => {
<FormattedMessage id="attention"/>
</DialogTitle>
<DialogContent style={{ display: 'flex', }}>
{/* <Typography variant="h5" style={{ padding: '16px' }}>{warningText}</Typography> */}
{/* <Typography variant="h5"component="span" style={{ padding: '16px' }}>{warningText}</Typography> */}
</DialogContent>
<DialogActions>
<Button


+ 23
- 23
src/pages/authentication/auth-forms/BusCustomFormWizard.js Näytä tiedosto

@@ -739,14 +739,14 @@ const BusCustomFormWizard = (props) => {
</Typography>
</Button>
<div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}>
<Typography display="inline" variant="h3" sx={{ color: '#1A4399' }}>
<Typography display="inline" variant="h3"component="h1" sx={{ color: '#1A4399' }}>
<FormattedMessage id="becomeNewBusinessUser"/>
</Typography>
</div>
<Typography mt={0.25} variant="h6" sx={{ color: '#B00020' }}>
<Typography mt={0.25} variant="h6" component="span" sx={{ color: '#B00020' }}>
<FormattedMessage id="requireString"/>
</Typography>
<Typography mt={0.25} variant="h4" sx={{ color: 'primary.primary' }}>
<Typography mt={0.25} variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourLoginInformation"/>
</Typography>
{/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary">
@@ -766,7 +766,7 @@ const BusCustomFormWizard = (props) => {
variant="contained"
onClick={handleCheckUsername}
sx={{ ml: 2, height: "40px" }}>
<Typography variant="h6">檢查是否重覆</Typography>
<Typography variant="h6" component="span">檢查是否重覆</Typography>
</Button> */}
</Typography>
</InputLabel>
@@ -953,7 +953,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 display="inline" variant="h4" component="h2" /*sx={{ color: '#1A4399' }}*/>
<FormattedMessage id="yourBusinessInformation"/>
</Typography>
{/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary">
@@ -1273,7 +1273,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: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourContact"/>
</Typography>
</Stack>
@@ -1551,14 +1551,14 @@ const BusCustomFormWizard = (props) => {
<Grid container>
<Grid item xs={12} md={12}>
<Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
<Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="businessRegCertAndDoc"/>
<span style={{ color: '#B00020' }}>*</span>
</Typography>
<Typography display="inline" variant="h6" sx={{ color: 'primary.primary' }}>
<Typography display="inline" variant="h6" component="span" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="pleaseUploadDoc"/>
</Typography>
{/* <Typography display="inline" variant="h6" sx={{ fontSize: 12,color: 'primary.primary'}}>如: 香港身份證; 護照; 中國內地身份證等</Typography> */}
{/* <Typography display="inline" variant="h6" component="span" sx={{ fontSize: 12,color: 'primary.primary'}}>如: 香港身份證; 護照; 中國內地身份證等</Typography> */}
<Stack mt={1} direction="row" justifyContent="flex-start" alignItems="center" spacing={2}>
<ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}>
<Button
@@ -1593,7 +1593,7 @@ const BusCustomFormWizard = (props) => {
style={{ display: 'none' }}
/>
</ThemeProvider>
{/* <Typography display="inline" variant="h6" sx={{ fontSize: 12, color: 'primary.primary'}}></Typography> */}
{/* <Typography display="inline" variant="h6" component="span" sx={{ fontSize: 12, color: 'primary.primary'}}></Typography> */}
</Stack>
{fileList != null && props.step === 0 ?
<UploadFileTable key="uploadTable" recordList={fileListData} setUpdateRows={setUpdateRows} /> : null}
@@ -1609,7 +1609,7 @@ const BusCustomFormWizard = (props) => {
<Grid item xs={12} md={12}>
<Grid container>
<Grid item xs={12} md={12}>
<Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="termsAndCondition"/>
<span style={{ color: '#B00020' }}>*</span>
</Typography>
@@ -1617,7 +1617,7 @@ const BusCustomFormWizard = (props) => {
<Grid item xs={12} md={12}>
<Grid container>
<Grid item xs={12} md={12}>
<Typography variant="h6" height="100%" sx={{ textAlign: "left", /*overflow: "scroll",*/ borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#1976d2" }}>
<Typography variant="h6" component="span" height="100%" sx={{ textAlign: "left", /*overflow: "scroll",*/ borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#1976d2" }}>
<div style={{padding: 12}} dangerouslySetInnerHTML={{__html: intl.formatMessage({id: "termsAndCon"})}} />
</Typography>
</Grid>
@@ -1670,7 +1670,7 @@ const BusCustomFormWizard = (props) => {
<Grid item xs={12} lg={12}>
<Grid container>
<Stack direction="column">
<Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="verify"/>
<span style={{ color: '#B00020' }}>*</span>
</Typography>
@@ -1744,12 +1744,12 @@ const BusCustomFormWizard = (props) => {
<Grid item xs={12}>
<Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
<div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}>
<Typography display="inline" variant="h3" sx={{ color: '#1A4399' }}>
<Typography display="inline" variant="h3"component="h1" sx={{ color: '#1A4399' }}>
<FormattedMessage id="becomeNewBusinessUser"/>
</Typography>
</div>
{/* <Typography mt={0.25} variant="h6" sx={{ fontSize: 12,color: '#B00020'}}>註有*的項目必須輸入資料</Typography> */}
<Typography mt={0.25} variant="h4" sx={{ color: 'primary.primary' }}>
{/* <Typography mt={0.25} variant="h6" component="span" sx={{ fontSize: 12,color: '#B00020'}}>註有*的項目必須輸入資料</Typography> */}
<Typography mt={0.25} variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourLoginInformation"/>
</Typography>
{/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary">
@@ -1771,7 +1771,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 display="inline" variant="h4" component="h2" /*sx={{ color: '#1A4399' }}*/>
<FormattedMessage id="yourBusinessInformation"/>
</Typography>
{/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary">
@@ -1872,7 +1872,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: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourContact"/>
</Typography>
</Stack>
@@ -1921,8 +1921,8 @@ const BusCustomFormWizard = (props) => {
<Grid container>
<Grid item xs={12} md={12}>
<Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
<Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="userIdDoc"/>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="businessRegCertAndDoc"/>
</Typography>
{fileList != null && props.step === 1 ?
<PreviewUploadFileTable key="previewTable" recordList={fileListData} /> : null}
@@ -1944,10 +1944,10 @@ const BusCustomFormWizard = (props) => {
// SUCCESS page
<Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
<CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} />
<Typography display="inline" variant="h4">
<Typography display="inline" variant="h4" component="span">
<FormattedMessage id="registerSubmitted"/>
</Typography>
<Typography display="inline" variant="h4">
<Typography display="inline" variant="h4" component="span">
<FormattedMessage id="emailSent"/>
</Typography>
<Button variant="outlined" component={Link} to="/login" >
@@ -1960,7 +1960,7 @@ const BusCustomFormWizard = (props) => {
<Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
{/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */}
<CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} />
<Typography display="inline" variant="h4">
<Typography display="inline" variant="h4" component="span">
<FormattedMessage id="registerFail" />
</Typography>
<Button color="error" variant="outlined" component={Link} to="/login" ><Typography variant="pnspsFormHeader">


+ 20
- 20
src/pages/authentication/auth-forms/CustomFormWizard.js Näytä tiedosto

@@ -960,14 +960,14 @@ const CustomFormWizard = (props) => {
</Typography>
</Button>
<div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}>
<Typography display="inline" variant="h3" sx={{ color: '#1A4399' }}>
<Typography display="inline" variant="h3" component="h1" sx={{ color: '#1A4399' }}>
<FormattedMessage id="becomeNewPersonalUser" />
</Typography>
</div>
<Typography mt={0.25} variant="h6" sx={{ color: '#B00020' }}>
<Typography mt={0.25} variant="h6" component="span" sx={{ color: '#B00020' }}>
<FormattedMessage id="requireString" />
</Typography>
<Typography mt={0.25} variant="h4" sx={{ color: 'primary.primary' }}>
<Typography mt={0.25} variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourLoginInformation" />
</Typography>
</Stack>
@@ -984,7 +984,7 @@ const CustomFormWizard = (props) => {
{/* variant="contained"*/}
{/* onClick={handleCheckUsername}*/}
{/* sx={{ ml: 2, height: "40px" }}>*/}
{/* <Typography variant="h6">檢查是否重覆</Typography>*/}
{/* <Typography variant="h6" component="span">檢查是否重覆</Typography>*/}
{/*</Button> **/}
</Typography>
</InputLabel>
@@ -1171,7 +1171,7 @@ const CustomFormWizard = (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: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourPersonalInformation" />
</Typography>
{/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary">
@@ -1185,7 +1185,7 @@ const CustomFormWizard = (props) => {
<InputLabel htmlFor="idDocType-signup">
<Typography variant="pnspsFormHeader">
<FormattedMessage id="userIdDoc" />
<span style={{ color: '#B00020' }}>*</span>
<span style={{ color: '#131313' }}>*</span>
</Typography>
</InputLabel>
{/* {formik.touched.enName && formik.errors.enName && (
@@ -1634,7 +1634,7 @@ const CustomFormWizard = (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: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourContact" />
</Typography>
</Stack>
@@ -1878,7 +1878,7 @@ const CustomFormWizard = (props) => {
<Grid container>
<Grid item xs={12} md={12}>
<Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
<Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="userIdDoc" />
<span style={{ color: '#B00020' }}>*</span></Typography>
<Typography display="inline" variant="subtitle1" sx={{ color: 'primary.primary' }}>
@@ -1937,7 +1937,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} md={12}>
<Grid container>
<Grid item xs={12} md={12}>
<Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="termsAndCondition" />
<span style={{ color: '#B00020' }}>*</span>
</Typography>
@@ -1945,7 +1945,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} md={12}>
<Grid container>
<Grid item xs={12} md={12}>
<Typography variant="h6" height="100%" sx={{ textAlign: "left", /*overflow: "scroll",*/ borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#1976d2" }}>
<Typography variant="h6" component="span" height="100%" sx={{ textAlign: "left", /*overflow: "scroll",*/ borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#1976d2" }}>
<div style={{padding: 12}} dangerouslySetInnerHTML={{__html: intl.formatMessage({id: "termsAndCon"})}} />
</Typography>
</Grid>
@@ -1998,7 +1998,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} lg={12}>
<Grid container>
<Stack direction="column">
<Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="verify" />
<span style={{ color: '#B00020' }}>*</span>
</Typography>
@@ -2072,12 +2072,12 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} md={12}>
<Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
<div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}>
<Typography display="inline" variant="h3" sx={{ color: '#1A4399' }}>
<Typography display="inline" variant="h3" component="h1" sx={{ color: '#1A4399' }}>
<FormattedMessage id="becomeNewPersonalUser" />
</Typography>
</div>
{/* <Typography mt={0.25} variant="h6" sx={{ fontSize: 12,color: '#B00020'}}>註有*的項目必須輸入資料</Typography> */}
<Typography mt={0.25} variant="h4" sx={{ color: 'primary.primary' }}>
{/* <Typography mt={0.25} variant="h6" component="span" sx={{ fontSize: 12,color: '#B00020'}}>註有*的項目必須輸入資料</Typography> */}
<Typography mt={0.25} variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourLoginInformation" />
</Typography>
{/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary">
@@ -2099,7 +2099,7 @@ const CustomFormWizard = (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: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourPersonalInformation" />
</Typography>
{/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary">
@@ -2218,7 +2218,7 @@ const CustomFormWizard = (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: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourContact" />
</Typography>
</Stack>
@@ -2259,7 +2259,7 @@ const CustomFormWizard = (props) => {
<Grid container>
<Grid item xs={12} md={12}>
<Stack spacing={1} direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
<Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="userIdDoc" />
</Typography>
{fileList != null && props.step === 1 ?
@@ -2282,10 +2282,10 @@ const CustomFormWizard = (props) => {
// SUCCESS page
<Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
<CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} />
<Typography display="inline" variant="h4">
<Typography display="inline" variant="h4" component="span">
<FormattedMessage id="registerSubmitted" />
</Typography>
<Typography display="inline" variant="h4">
<Typography display="inline" variant="h4" component="span">
<FormattedMessage id="emailSent" />
</Typography>
<Button variant="outlined" component={Link} to="/login" ><Typography variant="pnspsFormHeader">
@@ -2297,7 +2297,7 @@ const CustomFormWizard = (props) => {
<Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
{/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */}
<CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} />
<Typography display="inline" variant="h4">
<Typography display="inline" variant="h4" component="span">
<FormattedMessage id="registerFail" />
</Typography>
<Button color="error" variant="outlined" component={Link} to="/login" ><Typography variant="pnspsFormHeader">


+ 48
- 48
src/pages/authentication/auth-forms/IAmSmartFormWizard.js Näytä tiedosto

@@ -566,15 +566,15 @@ const CustomFormWizard = (props) => {
<Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
<div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}>
<Typography display="inline" variant="h3" sx={{ color: '#1A4399' }}>
<Typography display="inline" variant="h3" component="h1" sx={{ color: '#1A4399' }}>
<FormattedMessage id="becomeNewPersonalUser" />
</Typography>
</div>
<Typography mt={0.25} variant="h6" sx={{ color: '#B00020' }}>
<Typography mt={0.25} variant="h6" component="span" sx={{ color: '#B00020' }}>
<FormattedMessage id="requireString" />。
</Typography>
<Stack mt={1} direction="row" style={{ alignItems: "center" }}><img src={iAmSmartICon} alt="iAM Smart" width="25" /><Typography mt={0.25} variant="h6" >: <FormattedMessage id="MSG.providedByIAmSmart" /></Typography></Stack>
<Stack mt={1} direction="row" style={{ alignItems: "center" }}><img src={iAmSmartICon} alt="iAM Smart" width="25" /><Typography mt={0.25} variant="h6" component="span" >: <FormattedMessage id="MSG.providedByIAmSmart" /></Typography></Stack>
</Stack>
</Grid>
@@ -582,7 +582,7 @@ const CustomFormWizard = (props) => {
<Grid container spacing={1}>
<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: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourPersonalInformation" />
</Typography>
</Stack>
@@ -591,12 +591,12 @@ const CustomFormWizard = (props) => {
<Grid container sx={{ mb: 1 }}>
<InputLabel htmlFor="idDocType-signup">
<Typography variant="h5" sx={{ mr: 1 }}>
<Typography variant="h5" component="span" sx={{ mr: 1 }}>
<FormattedMessage id="HKIDcard" />: {iAmSmartData.idNo ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : <></>}
{/* {iAmSmartData.idNo + "(" + iAmSmartData.checkDigit + ")"} */}
</Typography>
<Stack direction="row">
<Typography variant="h5">
<Typography variant="h5" component="span">
{iAmSmartData?.idNo?.slice(0, 4)}{showId ? iAmSmartData?.idNo?.slice(4) : "****"}{showId ? '(' + iAmSmartData.checkDigit + ')' : null}
</Typography>
<IconButton
@@ -619,7 +619,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} md={6}>
<Stack spacing={1}>
<InputLabel htmlFor="enName-signup">
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="userEnglishName" />: {iAmSmartData.enName}{iAmSmartData.enName ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : <></>}
</Typography>
@@ -629,7 +629,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} md={6}>
<Stack spacing={1}>
<InputLabel htmlFor="chName-signup">
<Typography variant="h5">
<Typography variant="h5" component="span">
{intl.formatMessage({ id: 'userChineseName' })}: {iAmSmartData.chName}{iAmSmartData.chName ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : <></>}
</Typography>
</InputLabel>
@@ -638,7 +638,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12}>
<Stack spacing={1}>
<InputLabel htmlFor="address1-signup">
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="formAddress" />
<span style={{ color: '#B00020' }}>*</span>
@@ -794,7 +794,7 @@ const CustomFormWizard = (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: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourContact" />
</Typography>
</Stack>
@@ -804,7 +804,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} md={6}>
<Stack spacing={1} sx={{ mr: { md: 1 }, mb: 1 }}>
<InputLabel htmlFor="email-login">
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="userContactEmail" />
<span style={{ color: '#B00020' }}>*</span>
@@ -850,7 +850,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} md={6}>
<Stack spacing={1} >
<InputLabel htmlFor="emailConfirm-login">
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="confirmEmail" />
<span style={{ color: '#B00020' }}>*</span>
</Typography>
@@ -899,7 +899,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} md={12}>
<Stack direction="column" spacing={1} sx={{ mr: { md: 1 }, mb: 1 }}>
<InputLabel htmlFor="phone-signup">
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="userContactNumber" />
<span style={{ color: '#B00020' }}>*</span>
@@ -978,7 +978,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} md={12}>
<Stack spacing={1} direction="column">
<InputLabel htmlFor="fax-signup">
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="userFaxNumber" />
</Typography>
</InputLabel>
@@ -1045,7 +1045,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} md={12}>
<Grid container>
<Grid item xs={12} md={12}>
<Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="termsAndCondition" />
<span style={{ color: '#B00020' }}>*</span>
</Typography>
@@ -1053,7 +1053,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} md={12}>
<Grid container>
<Grid item xs={12} md={12}>
<Typography variant="h5" sx={{ textAlign: "left", borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#1976d2" }}>
<Typography variant="h5" component="span" sx={{ textAlign: "left", borderRadius: "inherit", borderStyle: "solid", borderWidth: "1px", borderColor: "#1976d2" }}>
<div style={{ padding: 12 }} dangerouslySetInnerHTML={{ __html: intl.formatMessage({ id: "termsAndCon" }) }} />
</Typography>
@@ -1071,7 +1071,7 @@ const CustomFormWizard = (props) => {
color="primary"
size="small"
/>
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="iConfirm" />
</Typography>
</Grid>
@@ -1088,7 +1088,7 @@ const CustomFormWizard = (props) => {
size="small"
/>
<Typography variant="h5">
<Typography variant="h5" component="span">
<FormattedMessage id="rejectTerms" />
</Typography>
</Grid>
@@ -1102,7 +1102,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} lg={12}>
<Grid container>
<Stack direction="column">
<Typography display="inline" variant="h4" sx={{ color: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="verify" />
<span style={{ color: '#B00020' }}>*</span>
</Typography>
@@ -1172,7 +1172,7 @@ const CustomFormWizard = (props) => {
<Grid item xs={12} md={12}>
<Stack direction="column" justifyContent="space-between" alignItems="baseline" sx={{ mb: { xs: -0.5, sm: 0.5 } }}>
<div style={{ borderBottom: "3px solid #1A4399", width: "100%", margin_right: "15px" }}>
<Typography display="inline" variant="h3" sx={{ color: '#1A4399' }}>
<Typography display="inline" variant="h3" component="h1" sx={{ color: '#1A4399' }}>
<FormattedMessage id="becomeNewPersonalUser" />
</Typography>
</div>
@@ -1182,7 +1182,7 @@ const CustomFormWizard = (props) => {
<Grid container spacing={2}>
<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: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourPersonalInformation" />
</Typography>
{/* <Typography component={Link} to="/login" variant="body1" sx={{ textDecoration: 'none' }} color="primary">
@@ -1192,14 +1192,14 @@ const CustomFormWizard = (props) => {
</Grid>
<Grid item xs={12} md={12} >
<Stack direction="row">
<Typography variant="h5" color={theme.palette.grey[600]} sx={{ mr: 1 }}>
<Typography variant="h5" component="h2" color={theme.palette.grey[600]} sx={{ mr: 1 }}>
<FormattedMessage id="userIdDoc" />
</Typography>
<Typography variant="h5" name="preview-idDocType-1">
<Typography variant="h5" component="span" name="preview-idDocType-1">
{formik?.values?.idNo?.slice(0, 4)}
{/* {formik.values.idNo + "(" + formik.values.checkDigit + ")"} */}
</Typography>
<Typography variant="h5" name="preview-idDocType-2">
<Typography variant="h5" component="span" name="preview-idDocType-2">
{showComId ? formik?.values?.idNo?.slice(4) : "****"}{showComId ? '(' + formik.values.checkDigit + ')' : null}
{/* {formik.values.idNo + "(" + formik.values.checkDigit + ")"} */}
</Typography>
@@ -1219,10 +1219,10 @@ const CustomFormWizard = (props) => {
</Grid>
<Grid item xs={12} md={6}>
<Stack spacing={1} direction="row">
<Typography variant="h5" color={theme.palette.grey[600]}>
<Typography variant="h5" component="span" color={theme.palette.grey[600]}>
<FormattedMessage id="userEnglishName" />:
</Typography>
<Typography variant="h5" id="preview-enName-signup">
<Typography variant="h5" component="span" id="preview-enName-signup">
{formik.values.enName}
</Typography>
{iAmSmartData.enName ? <img src={iAmSmartICon} alt="iAM Smart" width="25" /> : <></>}
@@ -1230,48 +1230,48 @@ const CustomFormWizard = (props) => {
</Grid>
<Grid item xs={12} md={6}>
<Stack spacing={1} direction="row">
<Typography variant="h5" color={theme.palette.grey[600]}>
<Typography variant="h5" component="span" color={theme.palette.grey[600]}>
<FormattedMessage id="userChineseName" />:
</Typography>
<Typography variant="h5" id="preview-chName-signup">
<Typography variant="h5" component="span" id="preview-chName-signup">
{formik.values.chName}
</Typography>
</Stack>
</Grid>
<Grid item xs={12}>
<Stack spacing={1} direction="column">
<Typography variant="h5" color={theme.palette.grey[600]}>
<Typography variant="h5" component="span" color={theme.palette.grey[600]}>
<FormattedMessage id="formAddress" />:
</Typography>
<Stack spacing={1} direction="column">
<Typography variant="h5" id="preview-address1-signup">
<Typography variant="h5" component="span" id="preview-address1-signup">
{formik.values.address1}
</Typography>
{formik.values.address2 != null ?
<Typography variant="h5" id="preview-address2-signup">
<Typography variant="h5" component="span" id="preview-address2-signup">
{formik.values.address2}
</Typography>
: null}
{formik.values.address3 != null ?
<Typography variant="h5" id="preview-address3-signup">
<Typography variant="h5" component="span" id="preview-address3-signup">
{formik.values.address3}
</Typography>
: null}
{selectedAddress5.type === "hongKong" ?
<Stack direction="column">
{/* <Typography variant="h5" color={theme.palette.grey[600]} id="preview-address4-signup">
{/* <Typography variant="h5" component="span" color={theme.palette.grey[600]} id="preview-address4-signup">
<FormattedMessage id="region" />:
</Typography> */}
<Typography variant="h5">
<Typography variant="h5" component="span">
{!selectedAddress4 ? "" : intl.formatMessage({ id: selectedAddress4.type })}
</Typography>
</Stack>
: null}
<Stack direction="column">
{/* <Typography variant="h5" color={theme.palette.grey[600]} id="preview-address5-signup">
{/* <Typography variant="h5" component="span" color={theme.palette.grey[600]} id="preview-address5-signup">
<FormattedMessage id="regionOrCountry" />:
</Typography> */}
<Typography variant="h5">
<Typography variant="h5" component="span">
{intl.formatMessage({ id: selectedAddress5.type })}
</Typography>
</Stack>
@@ -1280,27 +1280,27 @@ const CustomFormWizard = (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: 'primary.primary' }}>
<Typography display="inline" variant="h4" component="h2" sx={{ color: 'primary.primary' }}>
<FormattedMessage id="yourContact" />
</Typography>
</Stack>
</Grid>
<Grid item xs={12} md={12}>
<Stack spacing={1} direction="row">
<Typography variant="h5" color={theme.palette.grey[600]}>
<Typography variant="h5" component="span" color={theme.palette.grey[600]}>
<FormattedMessage id="userContactEmail" />:
</Typography>
<Typography variant="h5" id="preview-email-signup">
<Typography variant="h5" component="span" id="preview-email-signup">
{formik.values.email}
</Typography>
</Stack>
</Grid>
<Grid item xs={12} md={6}>
<Stack spacing={1} direction="row">
<Typography variant="h5" color={theme.palette.grey[600]}>
<Typography variant="h5" component="span" color={theme.palette.grey[600]}>
<FormattedMessage id="userContactNumber" />:
</Typography>
<Typography variant="h5" id="preview-phone-signup">
<Typography variant="h5" component="span" id="preview-phone-signup">
+{formik.values.phoneCountryCode} {formik.values.phone}
</Typography>
</Stack>
@@ -1308,10 +1308,10 @@ const CustomFormWizard = (props) => {
{formik.values.faxCountryCode != "" && formik.values.fax != "" ?
<Grid item xs={12} md={6}>
<Stack spacing={1} direction="row">
<Typography variant="h5" color={theme.palette.grey[600]}>
<Typography variant="h5" component="span" color={theme.palette.grey[600]}>
<FormattedMessage id="userFaxNumber" />:
</Typography>
<Typography variant="h5" id="preview-fax-signup">
<Typography variant="h5" component="span" id="preview-fax-signup">
+{formik.values.faxCountryCode} {formik.values.fax}
</Typography>
</Stack>
@@ -1331,13 +1331,13 @@ const CustomFormWizard = (props) => {
// SUCCESS page
<Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
<CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} />
<Typography display="inline" variant="h4">
<Typography display="inline" variant="h4" component="span">
<FormattedMessage id="registerSubmitted" />
</Typography>
<Typography display="inline" variant="h4">
<Typography display="inline" variant="h4" component="span">
<FormattedMessage id="emailSent" />
</Typography>
<Button variant="outlined" component={Link} to="/login" ><Typography variant="h5">
<Button variant="outlined" component={Link} to="/login" ><Typography variant="h5" component="span">
<FormattedMessage id="backToLogin" />
</Typography></Button>
</Stack>
@@ -1346,10 +1346,10 @@ const CustomFormWizard = (props) => {
<Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
{/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */}
<CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} />
<Typography display="inline" variant="h4">
<Typography display="inline" variant="h4" component="span">
<FormattedMessage id="registerFail" />
</Typography>
<Button color="error" variant="outlined" component={Link} to="/login" ><Typography variant="h5">
<Button color="error" variant="outlined" component={Link} to="/login" ><Typography variant="h5" component="span">
<FormattedMessage id="backToLogin" />
</Typography></Button>
</Stack>


+ 2
- 2
src/pages/dashboard/Public/Notice.js Näytä tiedosto

@@ -35,10 +35,10 @@ const SearchDemandNoteForm = (props) => {
<Typography component="h3" variant="h5" align="justify">
{locale === 'en' ? item.subjectEng : locale === 'zh-HK' ? item.subjectCht : item.subjectChs}
</Typography>
<Typography variant="subtitle2" sx={{ color: '#000' }} align="justify">
<Typography component="span" variant="subtitle2" sx={{ color: '#000' }} align="justify">
{DateUtils.dateValue(item.announceDate)}
</Typography>
<Typography component="h4" variant="h6" sx={{ pt: 1, fontWeight: 400 }} align="justify">
<Typography component="span" variant="h6" sx={{ pt: 1, fontWeight: 400 }} align="justify">
{locale === 'en' ? item.contentEng : locale === 'zh-HK' ? item.contentCht : item.contentChs}
</Typography>
<Divider sx={{ pt: 1 }} />


+ 1
- 1
src/pages/dashboard/Public/index.js Näytä tiedosto

@@ -126,7 +126,7 @@ const DashboardDefault = () => {
>
{item.subject}
</Typography>
<Typography variant="subtitle2" sx={{ color: '#000' }} align="justify">
<Typography component="span" variant="subtitle2" sx={{ color: '#000' }} align="justify">
{DateUtils.datetimeStr(item.sentDate)}
</Typography>
</Stack>


Kirjoita Esikatselu
Ladataan…
Peruuta
Tallenna