From bcd1d9e95199a01c47904c8150b5232a6bc3b3b4 Mon Sep 17 00:00:00 2001 From: Alex Cheung Date: Wed, 23 Aug 2023 16:44:30 +0800 Subject: [PATCH] change menu bar with login status --- src/assets/style/styles.css | 5 +- src/layout/MainLayout/Header/index.js | 71 +++- src/pages/authentication/AuthWrapperCustom.js | 11 +- .../auth-forms/CustomFormWizard.js | 360 +++++------------- .../pnspsUserSearchPage/UserSearchForm.js | 1 - 5 files changed, 179 insertions(+), 269 deletions(-) diff --git a/src/assets/style/styles.css b/src/assets/style/styles.css index 01042ec..ff77584 100644 --- a/src/assets/style/styles.css +++ b/src/assets/style/styles.css @@ -1,4 +1,7 @@ body{ padding-top: 43px; font-family: 微軟正黑體; -} \ No newline at end of file +} +/* main{ + padding-top: 43px; +} */ \ No newline at end of file diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js index e725850..48c4489 100644 --- a/src/layout/MainLayout/Header/index.js +++ b/src/layout/MainLayout/Header/index.js @@ -36,6 +36,8 @@ import Logo from 'components/Logo'; import MobileLogo from 'components/MobileLogo'; import Profile from './HeaderContent/Profile'; import "assets/style/navbarStyles.css"; +import {isUserLoggedIn} from "utils/Utils"; + // assets // import { MenuFoldOutlined,MenuOutlined } from '@ant-design/icons'; // import { AppBar } from '../../../../node_modules/@mui/material/index'; @@ -68,12 +70,79 @@ function Header(props) { + {} ); const container = window !== undefined ? () => window().document.body : undefined; return ( + isUserLoggedIn() ? + + + + + + + 公共啟事提交及繳費系統 + + + + + + + 公共啟事提交及繳費系統 + + + + + + + + + + + + + {drawer} + + + : @@ -116,7 +185,7 @@ function Header(props) { 申請 - + {/* */} diff --git a/src/pages/authentication/AuthWrapperCustom.js b/src/pages/authentication/AuthWrapperCustom.js index d86f820..a477405 100644 --- a/src/pages/authentication/AuthWrapperCustom.js +++ b/src/pages/authentication/AuthWrapperCustom.js @@ -14,14 +14,15 @@ import AuthBackground from 'assets/images/auth/AuthBackground'; // ==============================|| AUTHENTICATION - WRAPPER ||============================== // const AuthWrapperCustom = ({ children }) => ( - + {/* @@ -33,8 +34,8 @@ const AuthWrapperCustom = ({ children }) => ( xs={12} container justifyContent="center" - alignItems="center" - sx={{ minHeight: { xs: 'calc(100vh - 134px)', md: 'calc(100vh - 112px)' }}} + alignItems="flex-start" + sx={{ minHeight: { xs: 'calc(80vh - 134px)', md: 'calc(80vh - 112px)' }}} > {children} diff --git a/src/pages/authentication/auth-forms/CustomFormWizard.js b/src/pages/authentication/auth-forms/CustomFormWizard.js index 71cc714..67f217e 100644 --- a/src/pages/authentication/auth-forms/CustomFormWizard.js +++ b/src/pages/authentication/auth-forms/CustomFormWizard.js @@ -149,8 +149,8 @@ const CustomFormWizard = (props) => { address2: Yup.string().max(255).required('請輸入第二行地址'), address3: Yup.string().max(255).required('請輸入第三行地址'), email: Yup.string().email('Must be a valid email').max(255).required('Email is required'), - idNo: Yup.string().max(255).required('請輸入身證件號碼'), - checkDigit:Yup.string().max(1).required('請輸入身證件號碼'), + idNo: Yup.string().max(255).required('請輸入證件號碼'), + checkDigit:Yup.string().max(1).required('請輸入證件號碼'), idType: Yup.string().max(255).required('請輸入第三行地址'), })} > @@ -774,7 +774,7 @@ const CustomFormWizard = (props) => { - + 身份證明文件 請上傳你的 有效身份證明文件 的數碼檔案，以驗證你的身份。 如: 香港身份證; 護照; 中國內地身份證等 @@ -811,13 +811,13 @@ const CustomFormWizard = (props) => { - +
成為新的個人用戶
- 註有*的項目必須輸入資料 + {/* 註有*的項目必須輸入資料 */} 你的登入資料 {/* Already have an account? @@ -827,103 +827,15 @@ const CustomFormWizard = (props) => { - - 用戶登入名稱 - * - - + + + 用戶登入名稱: + + + {values.username} + - - - - - - 密碼 - * - - 密碼規則 - - { - handleChange(e); - changePassword(e.target.value); - }} - endAdornment={ - - - {showPassword ? : } - - - } - placeholder="密碼" - readOnly - /> - - - - - 確認密碼 - * - - { - handleChange(e); - changePassword(e.target.value); - }} - inputProps={{ - onKeyDown: (e) => { - if (e.key === 'Enter') { - e.preventDefault(); - } - }, - }} - endAdornment={ - - - {showConfirmPassword ? : } - - - } - placeholder="確認密碼" - fullWidth - readOnly - /> - - - - 你的個人資料 @@ -932,111 +844,77 @@ const CustomFormWizard = (props) => { */} - + - 英文姓名 - * - - + + 身份證明文件 + + + + + + + + 證件類別: + + + {values.idDocType} + - - 中文姓名 - + + + 證件號碼: + + + {values.idNo} ({values.checkDigit}) + + + + + + + + 英文姓名: + + + {values.enName} + + + + + + + 中文姓名: + + + {values.chName} + - - 地址 - * - - - - - - + + + 地址: + + + + {values.address1} + + + {values.address2} + + + {values.address3} + + + {values.address4} + + + {values.address5} + + @@ -1044,78 +922,38 @@ const CustomFormWizard = (props) => { 你的聯絡資料 - - - 電郵 - * - - - - - - - 確認電郵 - * - - + + + + 電郵: + + + {values.email} + - - 聯絡電話 - * - - + + + 聯絡電話: + + + +{values.phoneCountryCode} {values.phone} + - - 傳真號碼 - + + + 傳真號碼: + + + +{values.faxCountryCode} {values.fax} + - + 身份證明文件 請上傳你的 有效身份證明文件 的數碼檔案，以驗證你的身份。 如: 香港身份證; 護照; 中國內地身份證等 diff --git a/src/pages/pnspsUserSearchPage/UserSearchForm.js b/src/pages/pnspsUserSearchPage/UserSearchForm.js index 6d25b6f..33cc35a 100644 --- a/src/pages/pnspsUserSearchPage/UserSearchForm.js +++ b/src/pages/pnspsUserSearchPage/UserSearchForm.js @@ -191,7 +191,6 @@ const UserSearchForm = ({applySearch}) => { - {/*last row*/}