alex
/
PNSPS-frontend-MaterialUI
1
0
Разклонения 0
Код Задачи 0 Заявки за сливане 0 Версии 0 Уики Activity
Преглед на файлове

update display font

master
jason.lam преди 1 година
родител
3ea18a481a
ревизия
22594ffec3
променени са 6 файла, в които са добавени 53 реда и са изтрити 41 реда
Разделен изглед
Diff Options
Показване на статистика Download Patch File Download Diff File
  1. +11
    -11
      src/pages/Proof/Reply_Public/ApplicationDetails.js
  2. +21
    -21
      src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js
  3. +1
    -1
      src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js
  4. +7
    -0
      src/themes/themeConst.js
  5. +7
    -2
      src/themes/typography.js
  6. +6
    -6
      src/utils/FieldUtils.js

+ 11
- 11
src/pages/Proof/Reply_Public/ApplicationDetails.js Целия файл

@@ -79,7 +79,7 @@ const ApplicationDetailCard = ({ formData, }) => {
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="applicationId"/>:
</Typography></FormLabel>
</Grid>
@@ -93,7 +93,7 @@ const ApplicationDetailCard = ({ formData, }) => {
<Grid container alignItems={"left"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="applyStatus"/>:
</Typography></FormLabel>
</Grid>
@@ -112,7 +112,7 @@ const ApplicationDetailCard = ({ formData, }) => {
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="applyPerson"/>:
</Typography></FormLabel>
</Grid>
@@ -132,7 +132,7 @@ const ApplicationDetailCard = ({ formData, }) => {
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="gazetteCount"/>:
</Typography></FormLabel>
</Grid>
@@ -149,7 +149,7 @@ const ApplicationDetailCard = ({ formData, }) => {
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="contactPerson"/>:
</Typography></FormLabel>
</Grid>
@@ -164,7 +164,7 @@ const ApplicationDetailCard = ({ formData, }) => {
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="applicationPublishDate" />:
</Typography></FormLabel>
</Grid>
@@ -181,7 +181,7 @@ const ApplicationDetailCard = ({ formData, }) => {
<Grid container alignItems="left">
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="myRemarks"/>:
</Typography></FormLabel>
</Grid>
@@ -205,7 +205,7 @@ const ApplicationDetailCard = ({ formData, }) => {
<Grid item xs={12} sm={12} md={6} lg={6} sx={{mb: 1}}>
<Grid container alignItems={"center"}>
<Grid item xs={12} sm={12} md={12} lg={12} sx={{ alignItems: 'center',wordBreak: 'break-word' }}>
<Typography><Typography variant="h5">
<Typography><Typography variant="pnspsFormParagraph">
<FormattedMessage id="pleaseCheckReminder" />：
</Typography></Typography>
</Grid>
@@ -248,7 +248,7 @@ const ApplicationDetailCard = ({ formData, }) => {
</Grid>
<Grid item xs={12} sm={3} md={3} lg={3}
sx={{ mb: 1, display: 'flex', alignItems: 'center' }}>
<Typography variant="h5">
<Typography variant="pnspsFormParagraph">
<FormattedMessage id="payFeeFor"/>:
</Typography>
</Grid>
@@ -259,9 +259,9 @@ const ApplicationDetailCard = ({ formData, }) => {
{
formik.values.groupType === "Private Bill"
?
<Typography variant="h5">( {data.noOfPages} {intl.formatMessage({id: 'page'})} x $6,552 )</Typography>
<Typography variant="pnspsFormParagraph">( {data.noOfPages} {intl.formatMessage({id: 'page'})} x $6,552 )</Typography>
:
<Typography variant="h5">( {data.length} cm x {data.colCount === 2 ? "$364 二格位" : "$182 一格位"} )</Typography>
<Typography variant="pnspsFormParagraph">( {data.length} cm x {data.colCount === 2 ? "$364 二格位" : "$182 一格位"} )</Typography>
}
</Grid>
</Grid>


+ 21
- 21
src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js Целия файл

@@ -190,7 +190,7 @@ const ApplicationDetailCard = (
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="applicationId"/>:
</Typography></FormLabel>
</Grid>
@@ -220,7 +220,7 @@ const ApplicationDetailCard = (
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="applyStatus"/>:
</Typography></FormLabel>
</Grid>
@@ -236,11 +236,11 @@ const ApplicationDetailCard = (
<Grid container alignItems={"center"}>
<Stack direction="row" justifyContent="flex-start" alignItems="center">
<Grid item xs={12} md={7} lg={7}>
<FormLabel><Typography variant="h5">原因:</Typography></FormLabel>
<FormLabel><Typography variant="pnspsFormParagraph">原因:</Typography></FormLabel>
</Grid>
<Grid item xs={12} md={5} lg={5}>
<FormControl variant="outlined" fullWidth disabled>
<Typography id='reason' variant="h5">
<Typography id='reason' variant="pnspsFormParagraph">
{currentApplicationDetailData.reason}
</Typography>
</FormControl>
@@ -259,7 +259,7 @@ const ApplicationDetailCard = (
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="applyPerson"/>:
</Typography></FormLabel>
</Grid>
@@ -306,7 +306,7 @@ const ApplicationDetailCard = (
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="gazetteCount"/>:
</Typography></FormLabel>
</Grid>
@@ -340,7 +340,7 @@ const ApplicationDetailCard = (
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="contactPerson"/>:
</Typography></FormLabel>
</Grid>
@@ -370,7 +370,7 @@ const ApplicationDetailCard = (
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="publishDate"/>:
</Typography></FormLabel>
</Grid>
@@ -405,7 +405,7 @@ const ApplicationDetailCard = (
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="userContactNumber"/>:
</Typography></FormLabel>
</Grid>
@@ -454,13 +454,13 @@ const ApplicationDetailCard = (
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="currencyPrice"/>(HK$):
</Typography></FormLabel>
</Grid>

<Grid item xs={12} md={9} lg={9}>
<FormLabel><Typography variant="h5">{FormatUtils.currencyFormat(fee)}</Typography></FormLabel>
<FormLabel><Typography variant="pnspsFormParagraph">{FormatUtils.currencyFormat(fee)}</Typography></FormLabel>
</Grid>
</Grid>
</Grid>
@@ -473,7 +473,7 @@ const ApplicationDetailCard = (
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="userFaxNumber"/>:
</Typography></FormLabel>
</Grid>
@@ -524,7 +524,7 @@ const ApplicationDetailCard = (
<Grid container direction="row">
<Grid item xs={12} sm={12} md={2.5} lg={1.6}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="draftFile"/>:
</Typography></FormLabel>
</Grid>
@@ -535,7 +535,7 @@ const ApplicationDetailCard = (
<Typography
fullWidth
id='fileName'
variant="h5"
variant="pnspsFormParagraph"
>
{fileDetail.filename}
</Typography>
@@ -567,10 +567,10 @@ const ApplicationDetailCard = (
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">Care Of:</Typography></FormLabel>
<FormLabel><Typography variant="pnspsFormParagraph">Care Of:</Typography></FormLabel>
</Grid>
<Grid item xs={12} md={9} lg={9}>
<Typography variant="h5">{currentApplicationDetailData.careOf}</Typography>
<Typography variant="pnspsFormParagraph">{currentApplicationDetailData.careOf}</Typography>
</Grid>
</Grid>
</Grid> : null
@@ -579,12 +579,12 @@ const ApplicationDetailCard = (
<Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<FormLabel><Typography variant="h5">
<FormLabel><Typography variant="pnspsFormParagraph">
<FormattedMessage id="extraMark"/>:
</Typography></FormLabel>
</Grid>
<Grid item xs={12} md={9} lg={9}>
<Typography variant="h5">{currentApplicationDetailData.remarks}</Typography>
<Typography variant="pnspsFormParagraph">{currentApplicationDetailData.remarks}</Typography>
</Grid>
</Grid>
</Grid>
@@ -619,14 +619,14 @@ const ApplicationDetailCard = (
onClick={() => setIsPopUp(false)}
aria-label={intl.formatMessage({id: 'close'})}
>
<Typography variant="h5">
<Typography variant="pnspsFormParagraph">
<FormattedMessage id="close"/>
</Typography></Button>
<Button
onClick={() => doPayment()}
aria-label={intl.formatMessage({id: 'confirm'})}
>
<Typography variant="h5">
<Typography variant="pnspsFormParagraph">
<FormattedMessage id="confirm"/>
</Typography></Button>
</DialogActions>
@@ -648,7 +648,7 @@ const ApplicationDetailCard = (
onClick={() => setErrorPopUp(false)}
aria-label={intl.formatMessage({id: 'close'})}
>
<Typography variant="h5">
<Typography variant="pnspsFormParagraph">
<FormattedMessage id="close"/>
</Typography></Button>
</DialogActions>


+ 1
- 1
src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js Целия файл

@@ -217,7 +217,7 @@ const UserInformationCard_Individual_Pub = ({ formData, loadDataFun }) => {
<Grid xs={12} sm={12} md={12} lg={4}>
<Grid container alignItems={"center"} sx={{mb:2}}>
<Grid item xs={12} sm={12} md={3} lg={3} sx={{ display: 'flex', alignItems: 'center' }}>
<Typography variant="h5">
<Typography variant="pnspsFormParagraphBold">
<FormattedMessage id="idNo" />:
</Typography>
</Grid>


+ 7
- 0
src/themes/themeConst.js Целия файл

@@ -369,6 +369,13 @@ export const PNSPS_THEME = createTheme({
}
}
},
MuiFormLabel: {
styleOverrides: {
root:{
color: "#000000"
}
}
},
MuiTabPanel:{
styleOverrides:{
root:{


+ 7
- 2
src/themes/typography.js Целия файл

@@ -23,9 +23,14 @@ const Typography = (fontFamily) => ({
lineHeight: 1.5
},
pnspsFormParagraph: {
fontWeight: 400,
fontWeight: 500,
fontSize: '1.1rem',
lineHeight: 0.8
lineHeight: 1
},
pnspsFormParagraphBold: {
fontWeight: 600,
fontSize: '1.1rem',
lineHeight: 1
},
h1: {
fontWeight: 600,


+ 6
- 6
src/utils/FieldUtils.js Целия файл

@@ -13,7 +13,7 @@ export const notNullFieldLabel = (label) => {
export const getDateField = ({ label, valueName, form, disabled }) => {
return <Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3} sx={{ display: 'flex', alignItems: 'center' }}>
<Typography variant="h5">{label}</Typography>
<Typography variant="pnspsFormParagraphBold">{label}</Typography>
</Grid>
<Grid item xs={12} md={6} lg={6}>
{initField({
@@ -30,7 +30,7 @@ export const getTextField = ({ label, valueName, form, disabled }) => {
return <Grid container alignItems={"center"} xs={12} sm={12} md={12} lg={12} sx={{mb:2}}>
<Grid item xs={12} sm={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<Typography variant="h5">{label}</Typography>
<Typography variant="pnspsFormParagraphBold">{label}</Typography>
</Grid>
<Grid item xs={12} sm={12} md={6} lg={6}>
{initField({
@@ -47,7 +47,7 @@ export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...p
return <Grid container alignItems={"center"}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<Typography variant="h5">{label}</Typography>
<Typography variant="pnspsFormParagraphBold">{label}</Typography>
</Grid>
<Grid item xs={12} md={6} lg={6}>
{initField({
@@ -74,7 +74,7 @@ export const getPhoneField = ({ label, valueName, form, disabled }) => {
return <Grid container alignItems={"center"} sx={{mb:2}}>
<Grid item xs={12} md={3} lg={3}
sx={{ display: 'flex', alignItems: 'center' }}>
<Typography variant="h5">{label}</Typography>
<Typography variant="pnspsFormParagraphBold">{label}</Typography>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Stack direction="row">
@@ -119,7 +119,7 @@ export const getAddressField = ({ label, valueName, form, disabled }) => {
return <Grid container alignItems={"top"}>
<Grid item xs={12} md={3} lg={3} sx={{ display: 'flex', alignItems: 'top' }}>
<Grid item lg={12} sx={{ alignItems: 'center' }}>
<Typography variant="h5">{label}</Typography>
<Typography variant="pnspsFormParagraphBold">{label}</Typography>
</Grid>
</Grid>
<Grid item xs={12} md={6} lg={6}>
@@ -154,7 +154,7 @@ export const getAddressField = ({ label, valueName, form, disabled }) => {
export const getComboField = ({ label, dataList, valueName, form, disabled, getOptionLabel, onInputChange, onChange, filterOptions, ...props }) => {
return <Grid container alignItems={"center"} sx={{mb:2}}>
<Grid item xs={12} md={3} lg={3} sx={{ display: 'flex', alignItems: 'center' }}>
<Typography variant="h5">{label}</Typography>
<Typography variant="pnspsFormParagraphBold">{label}</Typography>
</Grid>
<Grid item xs={12} md={6} lg={6}>
<Combo


Пиши Преглед
Зареждане…
Отказ
Запис