Merge branch 'master' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI

src/layout/MainLayout/Header/HeaderContent/index.js

@@ -8,6 +8,8 @@ import { Button ,Box } from '@mui/material';
 // import Search from './Search';
 import Profile from './Profile';
 import LocaleSelector from "./LocaleSelector";
+import {FormattedMessage} from "react-intl";
+import React from "react";
 // import Notification from './Notification';
 // import MobileSection from './MobileSection';
 
@@ -22,7 +24,9 @@ const HeaderContent = () => {
       {/* {!matchesXs && <Search />}
       {matchesXs && <Box sx={{ width: '100%', ml: 1 }} />} */}
       <Box>
-        <Button size="large" sx={{color:"#000000"}}>主頁</Button>
+        <Button size="large" sx={{color:"#000000"}}>
+            <FormattedMessage id="mainPage"/>
+        </Button>
       </Box>
       {/* <IconButton
         component={Link}

src/layout/MainLayout/Header/index.js

@@ -27,7 +27,7 @@ import {
   // ListItemButton,
   // ListItemText,
   IconButton,
-  Drawer,
+  Drawer, Grid,
   //  useMediaQuery
 } from '@mui/material';
 import MenuIcon from '@mui/icons-material/Menu';
@@ -49,6 +49,7 @@ import { handleLogoutFunction } from 'auth/index';
 // import { AppBar } from '../../../../node_modules/@mui/material/index';
 import { Link } from "react-router-dom";
 import LocaleSelector from "./HeaderContent/LocaleSelector";
+import {FormattedMessage} from "react-intl";
 
 const drawerWidth = 240;
 
@@ -135,7 +136,9 @@ function Header(props) {
       :
       <div id="individualUserContent">
         <li>
-          <Link className="dashboard" to='/dashboard'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>主頁</Typography></Link>
+          <Link className="dashboard" to='/dashboard'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>
+            <FormattedMessage id="mainPage"/>
+          </Typography></Link>
         </li>
         <li>
           <Link className="myDocumet" to='/publicNotice'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>我的公共啟事</Typography></Link>
@@ -299,7 +302,13 @@ function Header(props) {
                 <ul id="navbar" width="100%" >
                   {loginContent}
                 </ul>
-                <Profile />
+
+                <Grid item>
+                  <Grid container direction="row" >
+                    <LocaleSelector />
+                    <Profile />
+                  </Grid>
+                </Grid>
               </Stack>
             </Box>
           </Toolbar>

src/pages/Proof/Reply_Public/ProofForm.js

@@ -239,7 +239,7 @@ const FormPanel = ({ formData }) => {
                                                 </Grid>
 
 
-                                                <Grid item xs={12} md={12} textAlign="left" sx={{ width:'95%', maxWidth: {xs:'70vw', sm:'72vw', md:'75vw',lg:'80vw'}}} >
+                                                <Grid item xs={12} sm={12} md={12} lg={12} textAlign="left" sx={{ width:'95%', maxWidth: {xs:'70vw', sm:'72vw', md:'75vw',lg:'80vw'}}} >
                                                     <UploadFileTable key="uploadTable" recordList={attachments} setRecordList={setAttachments} />
                                                 </Grid>
                                             </>

src/pages/Proof/Search_Public/index.js

@@ -96,7 +96,7 @@ const UserSearchPage_Individual = () => {
                     />
                 </Grid>
                 {/*row 2*/}
-                <Grid item xs={12} md={12} lg={12}>
+                <Grid item xs={12} sm={12} md={12} lg={12}>
                     <MainCard elevation={0}
                             border={false}
                             content={false}

src/translations/en.json

@@ -1,9 +1,10 @@
 {
   "en": "English",
-  "zh-HK": "Traditional Chinese",
-  "zh-CN": "Simplified Chinese",
+  "zh-HK": "繁體中文",
+  "zh-CN": "简体中文",
 
   "userLoginName": "User login name",
+  "mainPage": "Main Page",
 
   "Dashboard": "Dashboard",
   "event": "Event"

src/translations/zh-CN.json

@@ -1,9 +1,10 @@
 {
-  "en": "英文",
-  "zh-HK": "繁体中文",
+  "en": "English",
+  "zh-HK": "繁體中文",
   "zh-CN": "简体中文",
 
   "userLoginName": "用戶登入名稱",
+  "mainPage": "主页",
 
   "Dashboard": "仪表板",
   "event": "活动"

src/translations/zh-HK.json

@@ -1,9 +1,10 @@
 {
-  "en": "英文",
+  "en": "English",
   "zh-HK": "繁體中文",
-  "zh-CN": "簡體中文",
+  "zh-CN": "简体中文",
 
   "userLoginName": "用戶登入名稱",
+  "mainPage": "主頁",
 
   "Dashboard": "儀表板",
   "event": "活動"