alex
/
PNSPS-frontend-MaterialUI
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

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

master
Jason Chuang 1 year ago
parent
e98a50126f 9532cac728
commit
88ad67ffa9
49 changed files with 888 additions and 446 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +5
    -1
      src/pages/DemandNote/Search/index.js
  2. +5
    -1
      src/pages/DemandNote/Search_Public/index.js
  3. +5
    -1
      src/pages/EmailTemplate/Detail_GLD/index.js
  4. +5
    -1
      src/pages/EmailTemplate/Search_GLD/index.js
  5. +40
    -18
      src/pages/GFMIS/index.js
  6. +5
    -1
      src/pages/Message/Details/index.js
  7. +5
    -1
      src/pages/Organization/DetailPage/index.js
  8. +5
    -1
      src/pages/Organization/SearchPage/index.js
  9. +5
    -1
      src/pages/Payment/Card/index.js
  10. +5
    -1
      src/pages/Payment/Details_GLD/index.js
  11. +5
    -1
      src/pages/Payment/Details_Public/index.js
  12. +5
    -1
      src/pages/Payment/FPS/AckPage.js
  13. +38
    -7
      src/pages/Payment/FPS/FPS.js
  14. +5
    -1
      src/pages/Payment/FPS/fpscallback.js
  15. +5
    -1
      src/pages/Payment/PaymentCallback.js
  16. +5
    -2
      src/pages/Proof/Create_FromApp/index.js
  17. +5
    -1
      src/pages/Proof/Payment/Pay.js
  18. +5
    -1
      src/pages/Proof/Payment/Pay_Creditor.js
  19. +5
    -1
      src/pages/Proof/Reply_GLD/index.js
  20. +5
    -1
      src/pages/Proof/Reply_Public/index.js
  21. +5
    -1
      src/pages/Proof/Search_GLD/index.js
  22. +6
    -1
      src/pages/PublicNotice/ApplyForm/index.js
  23. +5
    -1
      src/pages/PublicNotice/ListPanel/index.js
  24. +5
    -1
      src/pages/PublicNotice/Search_GLD/index.js
  25. +5
    -1
      src/pages/User/DetailPage/index.js
  26. +5
    -1
      src/pages/User/DetailsPage_Individual/index.js
  27. +5
    -1
      src/pages/User/DetailsPage_Organization/index.js
  28. +5
    -1
      src/pages/User/GLDUserProfile/index.js
  29. +5
    -1
      src/pages/User/SearchPage/index.js
  30. +5
    -1
      src/pages/User/SearchPage_Individual/index.js
  31. +5
    -1
      src/pages/User/SearchPage_Organization/index.js
  32. +72
    -304
      src/pages/authentication/ForgotPassword/AfterForgotPasswordPage.js
  33. +461
    -58
      src/pages/authentication/ForgotPassword/AuthCallback/index.js
  34. +3
    -2
      src/pages/authentication/ForgotPassword/ForgotPasswordApplyForm.js
  35. +8
    -5
      src/pages/authentication/ForgotPassword/index.js
  36. +23
    -11
      src/pages/authentication/Verify.js
  37. +8
    -2
      src/pages/iAmSmart/AuthCallback/index.js
  38. +8
    -2
      src/pages/iAmSmart/DirectLoginCallback/index.js
  39. +5
    -1
      src/pages/iAmSmart/FailCallback/index.js
  40. +8
    -2
      src/pages/iAmSmart/RegistryCallback/index.js
  41. +5
    -1
      src/pages/iAmSmart/SuccessCallback/index.js
  42. +5
    -1
      src/pages/pnspsUserGroupDetailPage/index.js
  43. +5
    -1
      src/pages/pnspsUserGroupSearchPage/index.js
  44. +16
    -0
      src/routes/AfterLoginRoutes.js
  45. +10
    -1
      src/routes/LoginRoutes.js
  46. +8
    -0
      src/translations/en.json
  47. +8
    -0
      src/translations/zh-CN.json
  48. +9
    -0
      src/translations/zh-HK.json
  49. +2
    -0
      src/utils/ApiPathConst.js

+ 5
- 1
src/pages/DemandNote/Search/index.js View File

@@ -92,7 +92,11 @@ const UserSearchPage_Individual = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{ backgroundColor: 'backgroundColor.default' }} direction="column"> <Grid container sx={{ backgroundColor: 'backgroundColor.default' }} direction="column">
<Grid item xs={12}> <Grid item xs={12}>


+ 5
- 1
src/pages/DemandNote/Search_Public/index.js View File

@@ -92,7 +92,11 @@ const UserSearchPage_Individual = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{ minHeight: '85vh', backgroundColor: 'backgroundColor.default' }} direction="column"> <Grid container sx={{ minHeight: '85vh', backgroundColor: 'backgroundColor.default' }} direction="column">
<Grid item xs={12}> <Grid item xs={12}>


+ 5
- 1
src/pages/EmailTemplate/Detail_GLD/index.js View File

@@ -117,7 +117,11 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
( (
<Grid container sx={{ minHeight: '110vh', backgroundColor: 'backgroundColor.default' }} direction="column" justifyContent="flex-start" alignItems="center" > <Grid container sx={{ minHeight: '110vh', backgroundColor: 'backgroundColor.default' }} direction="column" justifyContent="flex-start" alignItems="center" >


+ 5
- 1
src/pages/EmailTemplate/Search_GLD/index.js View File

@@ -55,7 +55,11 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
( (
<Grid container sx={{ backgroundColor: 'backgroundColor.default' }} direction="column" justifyContent="flex-start" alignItems="center" > <Grid container sx={{ backgroundColor: 'backgroundColor.default' }} direction="column" justifyContent="flex-start" alignItems="center" >


+ 40
- 18
src/pages/GFMIS/index.js View File

@@ -64,24 +64,46 @@ const Index = () => {
dateFrom: input.dateFrom, dateFrom: input.dateFrom,
}, },
onSuccess: (responseData) => { onSuccess: (responseData) => {
// console.log(responseData)
const parser = new DOMParser();
const xmlDoc = parser.parseFromString(responseData, 'application/xml');
const filename = xmlDoc.querySelector('FileHeader').getAttribute('H_Filename');
const blob = new Blob([responseData], { type: 'application/xml' });
// Create a download link
const link = document.createElement('a');
link.href = URL.createObjectURL(blob);
link.download = filename+'.xml';
// Append the link to the document body
document.body.appendChild(link);
// Programmatically click the link to trigger the download
link.click();
// Clean up the link
document.body.removeChild(link);
console.log(responseData)
const parser = new DOMParser();
const xmlDoc = parser.parseFromString(responseData, 'application/xml');
// Get the DCBHeader element
const dcbHeader = xmlDoc.querySelector("DCBHeader");
// Get the Receipt and Allocation elements
const receiptElement = dcbHeader.querySelector("Receipt");
const allocationElement = dcbHeader.querySelector("Allocation");
const paymentMethodElements = Array.from(dcbHeader.querySelectorAll("PaymentMethod"));

// Remove existing elements from DCBHeader
dcbHeader.innerHTML = "";
dcbHeader.appendChild(receiptElement);
dcbHeader.appendChild(allocationElement);
if (paymentMethodElements) {
paymentMethodElements.forEach((paymentMethodElement) => {
dcbHeader.appendChild(paymentMethodElement);
});
}
const updatedXmlString = new XMLSerializer().serializeToString(xmlDoc);
const filename = xmlDoc.querySelector('FileHeader').getAttribute('H_Filename');
console.log(updatedXmlString)
const blob = new Blob([updatedXmlString], { type: 'application/xml' });
// Create a download link
const link = document.createElement('a');
link.href = URL.createObjectURL(blob);
link.download = filename+'.xml';
// Append the link to the document body
document.body.appendChild(link);
// Programmatically click the link to trigger the download
link.click();
// Clean up the link
document.body.removeChild(link);
} }
}); });
// open(UrlUtils.GEN_GFMIS_XML + "/today?online=true") // open(UrlUtils.GEN_GFMIS_XML + "/today?online=true")


+ 5
- 1
src/pages/Message/Details/index.js View File

@@ -61,7 +61,11 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
( (
<Grid container sx={{ minHeight: '110vh', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" > <Grid container sx={{ minHeight: '110vh', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" >


+ 5
- 1
src/pages/Organization/DetailPage/index.js View File

@@ -124,7 +124,11 @@ const OrganizationDetailPage = () => {


return ( return (
isLoading ? isLoading ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container direction="column" sx={{minHeight: '90vh',backgroundColor:isGLDLoggedIn()?'backgroundColor.default':'#ffffff' }}> <Grid container direction="column" sx={{minHeight: '90vh',backgroundColor:isGLDLoggedIn()?'backgroundColor.default':'#ffffff' }}>
<Grid item xs={12}> <Grid item xs={12}>


+ 5
- 1
src/pages/Organization/SearchPage/index.js View File

@@ -65,7 +65,11 @@ const OrganizationSearchPage = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{backgroundColor:"backgroundColor.default"}}> <Grid container sx={{backgroundColor:"backgroundColor.default"}}>
<Grid item xs={12}> <Grid item xs={12}>


+ 5
- 1
src/pages/Payment/Card/index.js View File

@@ -125,7 +125,11 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
( (
<Grid container sx={{ minHeight: '110vh', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" > <Grid container sx={{ minHeight: '110vh', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" >


+ 5
- 1
src/pages/Payment/Details_GLD/index.js View File

@@ -79,7 +79,11 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
( (
<div> <div>


+ 5
- 1
src/pages/Payment/Details_Public/index.js View File

@@ -84,7 +84,11 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
( (
<div> <div>


+ 5
- 1
src/pages/Payment/FPS/AckPage.js View File

@@ -149,7 +149,11 @@ const AckPage = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
transactionData.paymentdetail?.result?.paymentstatuscode === "APPR" ? transactionData.paymentdetail?.result?.paymentstatuscode === "APPR" ?
( (


+ 38
- 7
src/pages/Payment/FPS/FPS.js View File

@@ -46,6 +46,7 @@ const Index = () => {
const [paymentId, setPaymentId] = React.useState(""); const [paymentId, setPaymentId] = React.useState("");
const [fpsqrcodeurl, setFpsqrcodeurl] = React.useState(""); const [fpsqrcodeurl, setFpsqrcodeurl] = React.useState("");
const [fpsqrcodeurlPrd, setFpsqrcodeurlPrd] = React.useState(""); const [fpsqrcodeurlPrd, setFpsqrcodeurlPrd] = React.useState("");
const [fpsqrcodeurlFps, setFpsqrcodeurlFps] = React.useState("");
const [browserType, setBrowserType] = React.useState(""); const [browserType, setBrowserType] = React.useState("");
const mobileBrowser = "Mobile"; const mobileBrowser = "Mobile";
const desktopBrowser = "Desktop"; const desktopBrowser = "Desktop";
@@ -119,16 +120,21 @@ const Index = () => {
// setFpsmerchanttimeoutdatetime(convertedDateString) // setFpsmerchanttimeoutdatetime(convertedDateString)
// setPaymentid("C202310268000681") // setPaymentid("C202310268000681")
// setPaymentstatuscode("APPR") // setPaymentstatuscode("APPR")
const webtoken = paymentData.webtoken;
const transactionid = paymentData.transactionid;
console.log(webtoken)
console.log(transactionid)
localStorage.removeItem("transactionid") localStorage.removeItem("transactionid")
localStorage.removeItem("webtoken") localStorage.removeItem("webtoken")
localStorage.setItem("transactionid", paymentData.transactionid)
localStorage.setItem("webtoken", paymentData.webtoken)
localStorage.setItem("transactionid", transactionid)
localStorage.setItem("webtoken", webtoken)



HttpUtils.post({ HttpUtils.post({
url: paymentPath+loadPaymentUrl, url: paymentPath+loadPaymentUrl,
params:{ params:{
"transactionid": paymentData.transactionid,
"webtoken": paymentData.webtoken,
"transactionid": transactionid,
"webtoken": webtoken,
"paymentmethod":"04,BCFP,FPS", "paymentmethod":"04,BCFP,FPS",
"order": { "order": {
"totalamount":paymentData.amount, "totalamount":paymentData.amount,
@@ -169,13 +175,20 @@ const Index = () => {
const parsedUrl = new URL(responseData.fpsqrcodeurl); const parsedUrl = new URL(responseData.fpsqrcodeurl);
const fpsqrcodeurl = "https://"+window.location.hostname+'/payment'+parsedUrl.pathname; const fpsqrcodeurl = "https://"+window.location.hostname+'/payment'+parsedUrl.pathname;
const fpsqrcodeurlwithFps = "https://"+"fps."+window.location.hostname+'/payment'+parsedUrl.pathname;
console.log(parsedUrl)
console.log(fpsqrcodeurl)
console.log(fpsqrcodeurlwithFps)
const openPASGUrl = pasgPath + '?pay_req_obj=' + encodeURIComponent(fpsqrcodeurl) + '&callback=' const openPASGUrl = pasgPath + '?pay_req_obj=' + encodeURIComponent(fpsqrcodeurl) + '&callback='
+ encodeURIComponent("https://"+window.location.hostname+ '/paymentPage/fps/fpscallback?TRANSACTION_ID='+paymentData.transactionid+"&WEB_TOKEN="+paymentData.webtoken+"&PAYMENT_ID="+localStorage.getItem("paymentId"));
+ encodeURIComponent("https://"+window.location.hostname+ '/paymentPage/fps/fpscallback?TRANSACTION_ID='+transactionid+"&WEB_TOKEN="+webtoken+"&PAYMENT_ID="+localStorage.getItem("paymentId"));
const openPASGUrlPrd = pasgPathPrd + '?pay_req_obj=' + encodeURIComponent(fpsqrcodeurl) + '&callback=' const openPASGUrlPrd = pasgPathPrd + '?pay_req_obj=' + encodeURIComponent(fpsqrcodeurl) + '&callback='
+ encodeURIComponent("https://"+window.location.hostname+ '/paymentPage/fps/fpscallback?TRANSACTION_ID='+paymentData.transactionid+"&WEB_TOKEN="+paymentData.webtoken+"&PAYMENT_ID="+localStorage.getItem("paymentId"));
+ encodeURIComponent("https://"+window.location.hostname+ '/paymentPage/fps/fpscallback?TRANSACTION_ID='+transactionid+"&WEB_TOKEN="+webtoken+"&PAYMENT_ID="+localStorage.getItem("paymentId"));
const openPASGUrlPrdFps = pasgPath + '?pay_req_obj=' + encodeURIComponent(fpsqrcodeurlwithFps) + '&callback='
+ encodeURIComponent("https://"+window.location.hostname+ '/paymentPage/fps/fpscallback?TRANSACTION_ID='+transactionid+"&WEB_TOKEN="+webtoken+"&PAYMENT_ID="+localStorage.getItem("paymentId"));
setFpsqrcodeurl(openPASGUrl) setFpsqrcodeurl(openPASGUrl)
setFpsqrcodeurlPrd(openPASGUrlPrd) setFpsqrcodeurlPrd(openPASGUrlPrd)
setFpsqrcodeurlFps(openPASGUrlPrdFps)


} }
}); });
@@ -254,9 +267,17 @@ const Index = () => {
window.location.assign(fpsqrcodeurlPrd); window.location.assign(fpsqrcodeurlPrd);
} }


const mobliePaymentFps = ()=>{
window.location.assign(fpsqrcodeurlFps);
}

return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
( (
<Grid container sx={{ minHeight: '110vh', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" > <Grid container sx={{ minHeight: '110vh', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" >
@@ -304,6 +325,16 @@ const Index = () => {
}} }}
sx={{ m: 4 }} sx={{ m: 4 }}
>請選擇支付程式付款-PRD</Button> >請選擇支付程式付款-PRD</Button>
<Button
component="span"
variant="contained"
size="large"
color="primary"
onClick={()=>{
mobliePaymentFps();
}}
sx={{ m: 4 }}
>請選擇支付程式付款-fps prefix</Button>
</Typography> </Typography>
: :
<Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}> <Typography variant="h3" sx={{ ml: 8, mt: 4, mr: 8, textAlign: "center" }}>


+ 5
- 1
src/pages/Payment/FPS/fpscallback.js View File

@@ -139,7 +139,11 @@ const Fpscallback = () => {
} }
return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
transactionData.paymentdetail?.result?.paymentstatuscode === "APPR" ? transactionData.paymentdetail?.result?.paymentstatuscode === "APPR" ?
( (


+ 5
- 1
src/pages/Payment/PaymentCallback.js View File

@@ -151,7 +151,11 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
transactionData.paymentdetail?.result?.paymentstatuscode === "APPR" ? transactionData.paymentdetail?.result?.paymentstatuscode === "APPR" ?
( (


+ 5
- 2
src/pages/Proof/Create_FromApp/index.js View File

@@ -68,9 +68,12 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :

<Grid container sx={{ minHeight: '85vh', backgroundColor: "backgroundColor.default" }} direction="column" spacing={1} > <Grid container sx={{ minHeight: '85vh', backgroundColor: "backgroundColor.default" }} direction="column" spacing={1} >
<Grid item xs={12}> <Grid item xs={12}>
<div style={BackgroundHead}> <div style={BackgroundHead}>


+ 5
- 1
src/pages/Proof/Payment/Pay.js View File

@@ -80,7 +80,11 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
( (
<Grid container sx={{ minHeight: '110vh', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" > <Grid container sx={{ minHeight: '110vh', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" >


+ 5
- 1
src/pages/Proof/Payment/Pay_Creditor.js View File

@@ -60,7 +60,11 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
( (
<Grid container sx={{ minHeight: '110vh', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" > <Grid container sx={{ minHeight: '110vh', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" >


+ 5
- 1
src/pages/Proof/Reply_GLD/index.js View File

@@ -112,7 +112,11 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
( (
<Grid container sx={{ minHeight: '110vh', backgroundColor: 'backgroundColor.default' }} direction="column" justifyContent="flex-start" alignItems="center" > <Grid container sx={{ minHeight: '110vh', backgroundColor: 'backgroundColor.default' }} direction="column" justifyContent="flex-start" alignItems="center" >


+ 5
- 1
src/pages/Proof/Reply_Public/index.js View File

@@ -81,7 +81,11 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
( (
<Grid container sx={{ width: '100%', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" > <Grid container sx={{ width: '100%', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" >


+ 5
- 1
src/pages/Proof/Search_GLD/index.js View File

@@ -90,7 +90,11 @@ const UserSearchPage_Individual = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{ backgroundColor: 'backgroundColor.default' }} direction="column" <Grid container sx={{ backgroundColor: 'backgroundColor.default' }} direction="column"
> >


+ 6
- 1
src/pages/PublicNotice/ApplyForm/index.js View File

@@ -6,6 +6,7 @@ import * as DateUtils from "utils/DateUtils";
import * as FormatUtils from "utils/FormatUtils"; import * as FormatUtils from "utils/FormatUtils";


import { import {
Grid,
Radio, Radio,
FormControlLabel FormControlLabel
} from '@mui/material'; } from '@mui/material';
@@ -64,7 +65,11 @@ const ApplyForm = () => {


return ( return (
isLoading ? isLoading ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<PublicNoticeApplyForm <PublicNoticeApplyForm
loadedData={userData} loadedData={userData}


+ 5
- 1
src/pages/PublicNotice/ListPanel/index.js View File

@@ -102,7 +102,11 @@ const PublicNotice = () => {


return ( return (
isLoading ? isLoading ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container> <Grid container>
<Grid item xs={12}> <Grid item xs={12}>


+ 5
- 1
src/pages/PublicNotice/Search_GLD/index.js View File

@@ -90,7 +90,11 @@ const UserSearchPage_Individual = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{ backgroundColor: 'backgroundColor.default' }}> <Grid container sx={{ backgroundColor: 'backgroundColor.default' }}>
<Grid item xs={12}> <Grid item xs={12}>


+ 5
- 1
src/pages/User/DetailPage/index.js View File

@@ -202,7 +202,11 @@ const UserMaintainPage = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{ minHeight: '90vh', backgroundColor: 'backgroundColor.default' }}> <Grid container sx={{ minHeight: '90vh', backgroundColor: 'backgroundColor.default' }}>
<Grid item xs={12}> <Grid item xs={12}>


+ 5
- 1
src/pages/User/DetailsPage_Individual/index.js View File

@@ -118,7 +118,11 @@ const UserMaintainPage_Individual = () => {


return ( return (
isLoading ? isLoading ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container direction="column" sx={{minHeight: '90vh', backgroundColor: isGLDLoggedIn()?'backgroundColor.default':'#ffffff', maxWidth:'100%' }}> <Grid container direction="column" sx={{minHeight: '90vh', backgroundColor: isGLDLoggedIn()?'backgroundColor.default':'#ffffff', maxWidth:'100%' }}>
<Grid item xs={12}> <Grid item xs={12}>


+ 5
- 1
src/pages/User/DetailsPage_Organization/index.js View File

@@ -179,7 +179,11 @@ const UserMaintainPage_Organization = () => {


return ( return (
isLoading ? isLoading ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{ backgroundColor: isGLDLoggedIn()?'backgroundColor.default':'#ffffff' }}> <Grid container sx={{ backgroundColor: isGLDLoggedIn()?'backgroundColor.default':'#ffffff' }}>
<Grid item xs={12}> <Grid item xs={12}>


+ 5
- 1
src/pages/User/GLDUserProfile/index.js View File

@@ -75,7 +75,11 @@ const UserMaintainPage = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{minHeight: '90vh', backgroundColor: 'backgroundColor.default' }}direction="column" <Grid container sx={{minHeight: '90vh', backgroundColor: 'backgroundColor.default' }}direction="column"
justifyContent="flex-start"> justifyContent="flex-start">


+ 5
- 1
src/pages/User/SearchPage/index.js View File

@@ -70,7 +70,11 @@ const UserSettingPage = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{ minHeight: '90vh', backgroundColor: "backgroundColor.default" }} direction="column"> <Grid container sx={{ minHeight: '90vh', backgroundColor: "backgroundColor.default" }} direction="column">
<Grid item xs={12}> <Grid item xs={12}>


+ 5
- 1
src/pages/User/SearchPage_Individual/index.js View File

@@ -65,7 +65,11 @@ const UserSearchPage_Individual = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{ minHeight: '90vh', backgroundColor: "backgroundColor.default" }} direction="column"> <Grid container sx={{ minHeight: '90vh', backgroundColor: "backgroundColor.default" }} direction="column">
<Grid item xs={12}> <Grid item xs={12}>


+ 5
- 1
src/pages/User/SearchPage_Organization/index.js View File

@@ -66,7 +66,11 @@ const UserSearchPage_Organization = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{backgroundColor:"backgroundColor.default"}}> <Grid container sx={{backgroundColor:"backgroundColor.default"}}>
<Grid item xs={12}> <Grid item xs={12}>


+ 72
- 304
src/pages/authentication/ForgotPassword/AfterForgotPasswordPage.js View File

@@ -3,33 +3,18 @@ import {
Grid, Grid,
Typography, Typography,
Button, Button,
// RadioGroup,
Dialog, DialogTitle, DialogContent, DialogActions,
Stack, Stack,
InputLabel, InputLabel,
// OutlinedInput,
FormHelperText,
TextField,
IconButton, InputAdornment,
// Box,
// FormControl
} from '@mui/material'; } from '@mui/material';
import { EyeInvisibleOutlined, EyeOutlined } from '@ant-design/icons';
// import { strengthColorChi, strengthIndicator } from 'utils/password-strength';


import { useFormik } from 'formik';
import * as yup from 'yup';
import * as React from "react"; import * as React from "react";
// import * as HttpUtils from "utils/HttpUtils";
// import * as UrlUtils from "utils/ApiPathConst";
// import * as FieldUtils from "utils/FieldUtils";

import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
import ForwardIcon from '@mui/icons-material/Forward'; import ForwardIcon from '@mui/icons-material/Forward';
import MainCard from 'components/MainCard'; import MainCard from 'components/MainCard';




import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
// import { notifyActionSuccess } from 'utils/CommonFunction';
import {PNSPS_LONG_BUTTON_THEME} from "themes/buttonConst"; import {PNSPS_LONG_BUTTON_THEME} from "themes/buttonConst";
import {ThemeProvider} from "@emotion/react"; import {ThemeProvider} from "@emotion/react";
import {FormattedMessage, useIntl} from "react-intl"; import {FormattedMessage, useIntl} from "react-intl";
@@ -37,13 +22,7 @@ import {FormattedMessage, useIntl} from "react-intl";
// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //


const AfterForgotPasswordPage = () => { const AfterForgotPasswordPage = () => {
const [isWarningPopUp, setIsWarningPopUp] = React.useState(false);
const [showPassword, setShowPassword] = React.useState(false);
const [showConfirmPassword, setshowConfirmPassword] = React.useState(false);
// const [level, setLevel] = React.useState();
const intl = useIntl(); const intl = useIntl();

// const [issueId, setIssueId] = React.useState(loadedData.issueId);
const navigate = useNavigate(); const navigate = useNavigate();


const BackgroundHead = { const BackgroundHead = {
@@ -56,49 +35,11 @@ const AfterForgotPasswordPage = () => {
backgroundPosition: 'right' backgroundPosition: 'right'
} }


const handleClickShowPassword = () => {
setShowPassword(!showPassword);
};

const handleClickShowConfirmPassword = () => {
setshowConfirmPassword(!showConfirmPassword);
};

const handleMouseDownPassword = (event) => {
event.preventDefault();
};

const changePassword = (
// value
) => {
// const temp = strengthIndicator(value);
// setLevel(strengthColorChi(temp));
const handleContinue = () => {
// setOpen(false);
navigate('/login');
}; };


const formik = useFormik({
enableReinitialize: true,
initialValues: {
username: '',
password: '',
confirmPassword: '',
emailVerifyHash: '',
},
validationSchema: yup.object().shape({
emailVerifyHash: yup.string().required(intl.formatMessage({id: 'requireSecurityCode'})),
username: yup.string().required(intl.formatMessage({id: 'requireUsername'})),
password: yup.string().min(8, (intl.formatMessage({id: 'atLeast8CharPassword'}))).required(intl.formatMessage({id: 'requirePassword'}))
.matches(/^\S*$/, { message: (intl.formatMessage({id: 'noSpacePassword'})) })
.matches(/^(?=.*[a-z])/, { message: (intl.formatMessage({id: 'atLeastOneSmallLetter'})) })
.matches(/^(?=.*[A-Z])/, { message: (intl.formatMessage({id: 'atLeastOneCapLetter'})) })
.matches(/^(?=.*[0-9])/, { message: (intl.formatMessage({id: 'atLeast1Number'})) })
.matches(/^(?=.*[!@#%&])/, { message: (intl.formatMessage({id: 'atLeast1SpecialChar'})) }),
confirmPassword: yup.string().min(8, (intl.formatMessage({id: 'atLeast8CharPassword'}))).required((intl.formatMessage({id: 'pleaseConfirmPassword'}))).oneOf([yup.ref('password'), null], (intl.formatMessage({id: 'samePassword'}))),
}),
onSubmit: values => {
console.log(values)
}
});

return ( return (
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" alignItems="center"> <Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" alignItems="center">
<Grid item xs={12} md={12} width="100%" > <Grid item xs={12} md={12} width="100%" >
@@ -122,11 +63,11 @@ const AfterForgotPasswordPage = () => {
{/* <Grid item xs={12}> {/* <Grid item xs={12}>
<Typography variant="pnspsFormParagraphBold">申請公共啟事</Typography> <Typography variant="pnspsFormParagraphBold">申請公共啟事</Typography>
</Grid> */} </Grid> */}
<Grid item xs={12} md={12} width={{ md: "60%", xs: "90%" }}>
<Grid item xs={12} md={12} width={{ sx:"90%", sm:"90%",md: "60%", xs: "90%" }}>
<MainCard <MainCard
sx={{ sx={{
maxWidth: { xs: 400, sm:600, md:800, lg: 1000 },
margin: { xs: 2.5, md: 3 },
maxWidth: { xs: 400, sm:730, md:800, lg: 1000 },
margin: { sm: 0, md: 3 },
'& > *': { '& > *': {
flexGrow: 1, flexGrow: 1,
flexBasis: '50%' flexBasis: '50%'
@@ -136,253 +77,80 @@ const AfterForgotPasswordPage = () => {
border={false} border={false}
boxShadow boxShadow
> >
<form onSubmit={formik.handleSubmit}>
<Grid container spacing={4} sx={{ minHeight: {xs:"75vh", sm:"75vh", md: "70vh", lg:"70vh", xl:"50vh"} }} 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" >
<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-title">
<Typography variant="h6" >
<FormattedMessage id="forgotPasswordSubTitle1"/>
</Typography>
<Typography variant="h6" >
<FormattedMessage id="forgotPasswordSubTitle2"/>
</Typography>
</InputLabel>
</Grid>
<Grid item xs={12} md={12} lg={12} width={{xs:"70%", sm:"60%",md:"50%", lg:"50%"}}>
<Grid container direction="row" justifyContent="flex-start">
<Grid item xs={12} md={12} lg={12}>
<TextField
fullWidth
onChange={formik.handleChange}
id="emailVerifyHash"
name="emailVerifyHash"
placeholder={intl.formatMessage({id: 'securityCode'})}
label={intl.formatMessage({id: 'securityCode'}) + ":"}
defaultValue={formik.values.emailVerifyHash}
value={formik.values.emailVerifyHash}
error={Boolean(formik.touched.emailVerifyHash && formik.errors.emailVerifyHash)}
onBlur={formik.handleBlur}
inputProps={{
maxLength: 50,
onKeyDown: (e) => {
if (e.key === 'Enter') {
e.preventDefault();
}
},
}}
InputLabelProps={{
shrink: true
}}
/>
</Grid>
{formik.touched.emailVerifyHash && formik.errors.emailVerifyHash && (
<FormHelperText error id="standard-weight-helper-text-username-login">
{formik.errors.emailVerifyHash}
</FormHelperText>
)}
<Grid container spacing={4} sx={{ minHeight: {xs:"80vh", sm:"70vh", md: "70vh", lg:"70vh", xl:"50vh"} }} 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' } }}>
<Grid container direction="column" alignItems="center">
<Grid item xs={12} md={12} lg={12} >
<InputLabel htmlFor="email-login-title1">
<Typography variant="h5" >
<FormattedMessage id="sentSecurityCode1"/>
</Typography>
</InputLabel>
</Grid> </Grid>
</Grid>
<Grid item xs={12} md={12} lg={12} width={{xs:"70%", sm:"60%",md:"50%", lg:"50%"}}>
<Grid container direction="row" justifyContent="flex-start">
<Grid item xs={12} md={12} lg={12}>
<TextField
fullWidth
onChange={formik.handleChange}
id="username"
name="username"
placeholder={intl.formatMessage({id: 'userLoginName'})}
label={intl.formatMessage({id: 'userLoginName'}) + ":"}
defaultValue={formik.values.username}
value={formik.values.username}
error={Boolean(formik.touched.username && formik.errors.username)}
onBlur={formik.handleBlur}
inputProps={{
maxLength: 50,
onKeyDown: (e) => {
if (e.key === 'Enter') {
e.preventDefault();
}
},
}}
InputLabelProps={{
shrink: true
}}
/>
</Grid>
{formik.touched.username && formik.errors.username && (
<FormHelperText error id="standard-weight-helper-text-username-login">
{formik.errors.username}
</FormHelperText>
)}
<Grid item xs={12} md={12} lg={12} >
<InputLabel htmlFor="email-login-title2">
<Typography variant="h5" >
<FormattedMessage id="sentSecurityCode2"/>
</Typography>
</InputLabel>
</Grid> </Grid>
{/* <Grid item xs={12} md={12} lg={12} sx={{mt:3}}>
<InputLabel htmlFor="email-login-title3">
<Typography variant="h5" >
<FormattedMessage id="requireSecurityCode"/>
</Typography>
</InputLabel>
</Grid> */}
</Grid> </Grid>
<Grid item xs={12} md={12} lg={12} width={{xs:"70%", sm:"60%",md:"50%", lg:"50%"}}>
<Grid container direction="row" justifyContent="flex-start">
<Grid item xs={12} md={12} lg={12}>
<TextField
fullWidth
onChange={(e) => {
formik.handleChange(e);
changePassword(e.target.value);
}}
id="password"
type={showPassword ? 'text' : 'password'}
name="password"
placeholder={intl.formatMessage({id: 'userPassword'})}
label={intl.formatMessage({id: 'userPassword'}) + ":"}
// defaultValue={formik.values.password.trim()}
value={formik.values.password.trim()}
error={Boolean(formik.touched.password && formik.errors.password)}
onBlur={formik.handleBlur}
inputProps={{
onKeyDown: (e) => {
if (e.key === 'Enter') {
e.preventDefault();
}
},
}}
InputLabelProps={{
shrink: true
}}
InputProps={{
endAdornment:(
<InputAdornment position="end">
<IconButton
aria-label="toggle password visibility"
onClick={handleClickShowPassword}
onMouseDown={handleMouseDownPassword}
edge="end"
size="large"
>
{showPassword ? <EyeOutlined /> : <EyeInvisibleOutlined />}
</IconButton>
</InputAdornment>
)
}}
/>
</Grid>
{/* <FormControl fullWidth sx={{ mt: 2 }}>
<Grid container spacing={2} alignItems="center">
<Grid item>
<Box sx={{ bgcolor: level?.color, width: 85, height: 8, borderRadius: '7px' }} />
</Grid>
<Grid item>
<Typography variant="subtitle1">
<FormattedMessage id={level ? level?.label : "pwWeak" }/>
</Typography>
</Grid>
</Grid>
</FormControl> */}
{formik.touched.password && formik.errors.password && (
<FormHelperText error id="helper-text-password-signup">
{formik.errors.password}
</FormHelperText>
)}
</Grid>
<Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { md: 'none', xl: 'none', lg: 'none' } }}>
<Grid container direction="column" alignItems="center">
<Grid item xs={12} md={12} lg={12} >
<InputLabel htmlFor="email-login-title1">
<Typography variant="h5" >
<FormattedMessage id="sentSecurityCode1"/>
</Typography>
</InputLabel>
</Grid> </Grid>
</Grid>
<Grid item xs={12} md={12} lg={12} width={{xs:"70%", sm:"60%",md:"50%", lg:"50%"}}>
<Grid container direction="row" justifyContent="flex-start">
<Grid item xs={12} md={12} lg={12}>
<TextField
fullWidth
onChange={(e) => {
formik.handleChange(e);
// changePassword(e.target.value);
}}
id="confirmPassword"
type={showConfirmPassword ? 'text' : 'password'}
name="confirmPassword"
placeholder={intl.formatMessage({id: 'confirmPassword'})}
label={intl.formatMessage({id: 'confirmPassword'}) + ":"}
defaultValue={formik.values.confirmPassword.trim()}
value={formik.values.confirmPassword.trim()}
error={Boolean(formik.touched.confirmPassword && formik.errors.confirmPassword)}
onBlur={formik.handleBlur}
inputProps={{
maxLength: 50,
onKeyDown: (e) => {
if (e.key === 'Enter') {
e.preventDefault();
}
},
}}
InputLabelProps={{
shrink: true
}}
InputProps={{
endAdornment:(
<InputAdornment position="end">
<IconButton
aria-label="toggle password visibility"
onClick={handleClickShowConfirmPassword}
onMouseDown={handleMouseDownPassword}
edge="end"
size="large"
>
{showConfirmPassword ? <EyeOutlined /> : <EyeInvisibleOutlined />}
</IconButton>
</InputAdornment>
)
}}
/>
</Grid>
{formik.touched.confirmPassword && formik.errors.confirmPassword && (
<FormHelperText error id="helper-text-confirmPassword-signup">
{formik.errors.confirmPassword}
</FormHelperText>
)}
<Grid item xs={12} md={12} lg={12} >
<InputLabel htmlFor="email-login-title2">
<Typography variant="h5" >
<FormattedMessage id="sentSecurityCode3"/>
</Typography>
</InputLabel>
</Grid> </Grid>
<Grid item xs={12} md={12} lg={12} >
<InputLabel htmlFor="email-login-title4">
<Typography variant="h5" >
<FormattedMessage id="sentSecurityCode4"/>
</Typography>
</InputLabel>
</Grid>
{/* <Grid item xs={12} md={12} lg={12} sx={{mt:3}}>
<InputLabel htmlFor="email-login-title3">
<Typography variant="h5" >
<FormattedMessage id="requireSecurityCode"/>
</Typography>
</InputLabel>
</Grid> */}
</Grid> </Grid>
<Grid item xs={12} md={12} lg={12} mt={1} >
<ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}>
<Button
aria-label={intl.formatMessage({id: 'continue'})}
variant="contained"
type="submit"
>
<FormattedMessage id="continue"/>
</Button>
</ThemeProvider>
</Grid>
</Grid> </Grid>
</form>
<Grid item xs={12} md={12} lg={12} mt={1} sx={{mb:3}}>
<ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}>
<Button
aria-label={intl.formatMessage({id: 'continue'})}
variant="contained"
// type="submit"
onClick={()=>handleContinue()}
>
<FormattedMessage id="continue"/>
</Button>
</ThemeProvider>
</Grid>
</Grid>

</MainCard> </MainCard>
</Grid> </Grid>
<div>
<Dialog
open={isWarningPopUp}
onClose={() => setIsWarningPopUp(false)}
PaperProps={{
sx: {
minWidth: '40vw',
maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' },
maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' }
}
}}
>
<DialogTitle>
<FormattedMessage id="attention"/>
</DialogTitle>
<DialogContent style={{ display: 'flex', }}>
{/* <Typography variant="h3" style={{ padding: '16px' }}>{warningText}</Typography> */}
</DialogContent>
<DialogActions>
<Button
aria-label={intl.formatMessage({id: 'ok'})}
onClick={() => setIsWarningPopUp(false)}
>
<FormattedMessage id="ok" />
</Button>
</DialogActions>
</Dialog>
</div>
</Grid> </Grid>
); );
}; };


+ 461
- 58
src/pages/authentication/ForgotPassword/AuthCallback/index.js View File

@@ -1,85 +1,488 @@

import { useFormik } from 'formik';
import * as yup from 'yup';
import * as React from "react"; import * as React from "react";
import * as HttpUtils from "utils/HttpUtils"; import * as HttpUtils from "utils/HttpUtils";
import * as UrlUtils from "utils/ApiPathConst"; import * as UrlUtils from "utils/ApiPathConst";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { useDispatch } from "react-redux"; import { useDispatch } from "react-redux";
import { handleLogoutFunction, handleLogin } from 'auth/index'; import { handleLogoutFunction, handleLogin } from 'auth/index';
import useJwt from "auth/jwt/useJwt";


import {
Grid,
Typography,
Button,
// RadioGroup,
// Dialog, DialogTitle, DialogContent, DialogActions,
Stack,
InputLabel,
// OutlinedInput,
FormHelperText,
TextField,
IconButton, InputAdornment,
// Box,
// FormControl
} from '@mui/material';
import Loadable from 'components/Loadable'; import Loadable from 'components/Loadable';
const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent'))); const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));

import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
// import ForwardIcon from '@mui/icons-material/Forward';
import MainCard from 'components/MainCard';
import {PNSPS_LONG_BUTTON_THEME} from "themes/buttonConst";
import {ThemeProvider} from "@emotion/react";
import {FormattedMessage, useIntl} from "react-intl";
import { EyeInvisibleOutlined, EyeOutlined } from '@ant-design/icons';
import axios from 'axios';
import { useParams,Link } from 'react-router-dom';
import CancelOutlinedIcon from '@mui/icons-material/CancelOutlined';
import LocaleContext from "components/I18nProvider";


// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //


const Index = () => { const Index = () => {

const dispatch = useDispatch() const dispatch = useDispatch()
const navigate = useNavigate() const navigate = useNavigate()

const [showPassword, setShowPassword] = React.useState(false);
const [showConfirmPassword, setshowConfirmPassword] = React.useState(false);
const [isLoading, setLoding] = React.useState(true);
const [verifyState, setVerifyState] = React.useState(null)
const [enterUseEffect, setEnterUseEffect] = React.useState(false)
const [username, setUsername] = React.useState("")
const { setLocale } = React.useContext(LocaleContext);
const params = useParams()
const intl = useIntl();
React.useEffect(() => { React.useEffect(() => {
goLogin();
console.log(params);
setEnterUseEffect(true)
}, []); }, []);


function goLogin(){
dispatch(handleLogoutFunction());
React.useEffect(() => {
// console.log("if (enterUseEffect) handleVerify()");
if (enterUseEffect){
handleVerify()
}
}, [enterUseEffect])


let params = new URLSearchParams(window.location.search)
if(params.get("code")){
HttpUtils.post({
url: UrlUtils.GET_SMART_LOGIN,
params:{
code: params.get("code")
},
onSuccess: (responseData) => {
console.log("responseData");
console.log(responseData);
const userData = {
id: responseData.id,
fullenName: responseData.name,
fullchName: responseData.chName,
email: responseData.email,
type: responseData.type,
role: responseData.role,
abilities: responseData.abilities,
creditor: responseData.creditor,
locale: responseData.preferLocale,
//avatar: require('src/assets/images/users/avatar-3.png').default,
const handleVerify = async () => {
console.log(params);
await axios.get(UrlUtils.GET_FORGOT_PASSWORD_VERIFY_USER_ACCOUNT, {
params: {
email: decodeURIComponent(params.email),
emailVerifyHash: decodeURIComponent(params.verifyCode)
}
}).then(
(response)=>{
if (response.status === 200 && response.data) {
console.log(response)
setUsername(response.data.username)
setVerifyState(true)
} else {
setVerifyState(false)
}
setLoding(false)
}
).catch(error => {
console.log(error)
setVerifyState(false)
setLoding(false)
});

}

const goLogin = async (values) =>{
dispatch(handleLogoutFunction());
HttpUtils.post({
url: UrlUtils.POST_FORGOT_PASSWORD_NEW_PASSWORD,
params:{
username: username,
newPassword: values.password
},
onSuccess: () => {
useJwt
.login({ username: username, password: values.password })
.then((response) => {
// console.log(response)
const userData = {
id: response.data.id,
fullenName: response.data.name,
fullchName: response.data.chName,
email: response.data.email,
type: response.data.type,
role: response.data.role,
abilities: response.data.abilities,
creditor: response.data.creditor,
locale: response.data.preferLocale,
//avatar: require('src/assets/images/users/avatar-3.png').default,
}
const data = { ...userData, accessToken: response.data.accessToken, refreshToken: response.data.refreshToken }
// setSuccess(true)
// console.log(response.data);
if(response.data.type === "GLD"){
setLocale("en");
localStorage.setItem('locale','en');
}else{
if (response.data.preferLocale ==="zh_HK"){
setLocale("zh-HK");
localStorage.setItem('locale','zh-HK');
} }
const data = { ...userData, accessToken: responseData.accessToken, refreshToken: responseData.refreshToken }
if(responseData.type === "GLD"){
setLocale("en");
localStorage.setItem('locale','en');
}else{
if (responseData.preferLocale ==="zh_HK"){
setLocale("zh-HK");
localStorage.setItem('locale','zh-HK');
}
if (responseData.preferLocale ==="zh-CN"){
setLocale("zh-CN");
localStorage.setItem('locale','zh-CN');
}
if (response.data.preferLocale ==="zh-CN"){
setLocale("zh-CN");
localStorage.setItem('locale','zh-CN');
} }
dispatch(handleLogin(data))
navigate('/dashboard');
},
onFail: (response)=>{
console.log("Fail");
console.log(response);
window.location.assign("/iamsmart/loginFail");
},
onError:(error)=>{
console.log(error);
window.location.assign("/iamsmart/loginFail");
}
});
}else{
window.location.assign("/iamsmart/loginFail");
}
}
dispatch(handleLogin(data))
navigate('/dashboard');
location.reload()
// setSumitting(false)
})
.catch((error) => {
// setSuccess(false)
console.error(error)
// console.error(error.response.data.error)
// setErrorMassage(error.response.data.error)
// setOpen(true)
});
},
onFail: (response)=>{
console.log("Fail");
console.log(response);
// window.location.assign("/iamsmart/loginFail");
},
onError:(error)=>{
console.log(error);
// window.location.assign("/iamsmart/loginFail");
}
});
}

const BackgroundHead = {
backgroundImage: `url(${titleBackgroundImg})`,
width: 'auto',
height: 'auto',
backgroundSize: 'contain',
backgroundRepeat: 'no-repeat',
backgroundColor: '#0C489E',
backgroundPosition: 'right'
} }


const handleClickShowPassword = () => {
setShowPassword(!showPassword);
};

const handleClickShowConfirmPassword = () => {
setshowConfirmPassword(!showConfirmPassword);
};

const handleMouseDownPassword = (event) => {
event.preventDefault();
};

const changePassword = (
// value
) => {
// const temp = strengthIndicator(value);
// setLevel(strengthColorChi(temp));
};

const formik = useFormik({
enableReinitialize: true,
initialValues: {
// username: '',
password: '',
confirmPassword: '',
// emailVerifyHash: '',
},
validationSchema: yup.object().shape({
// emailVerifyHash: yup.string().required(intl.formatMessage({id: 'requireSecurityCode'})),
// username: yup.string().required(intl.formatMessage({id: 'requireUsername'})),
password: yup.string().min(8, intl.formatMessage({id: 'atLeast8CharPassword'}))
.required(intl.formatMessage({id: 'requirePassword'}))
.matches(/^\S*$/, { message: (intl.formatMessage({id: 'noSpacePassword'}))})
.matches(/^(?=.*[a-z])/, { message: intl.formatMessage({id: 'atLeastOneSmallLetter'})})
.matches(/^(?=.*[A-Z])/, { message: intl.formatMessage({id: 'atLeastOneCapLetter'})})
.matches(/^(?=.*[0-9])/, { message: intl.formatMessage({id: 'atLeast1Number'})})
.matches(/^(?=.*[!@#%&])/, { message: intl.formatMessage({id: 'atLeast1SpecialChar'})}),
confirmPassword: yup.string().min(8, intl.formatMessage({id: 'atLeast8CharPassword'}))
.required(intl.formatMessage({id: 'pleaseConfirmPassword'}))
.oneOf([yup.ref('password'), null], intl.formatMessage({id: 'samePassword'})),
}),
onSubmit: values => {
// console.log(values)
goLogin(values)
}
});

return ( return (
<LoadingComponent />
isLoading || verifyState == null ?
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
:
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" alignItems="center">
<Grid item xs={12} md={12} width="100%" >
<div style={BackgroundHead}>
<Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
<Typography ml={15} color='#FFF' variant="h4" sx={{display: { xs: 'none', sm: 'none', md: 'block' }}}>
<FormattedMessage id="forgotUserPassword"/>
</Typography>
</Stack>
</div>
</Grid>
{/* <Grid item xs={12} width={{xs:"90%", sm:"90%", md:"60%", lg:"60%"}}>
<Button
aria-label={intl.formatMessage({id: 'back'})}
title={intl.formatMessage({id: 'back'})}
sx={{ ml: 0, mt: 2.5 }} style={{ border: '2px solid' }} variant="outlined" onClick={() => { navigate(-1) }}
>
<ForwardIcon style={{ height: 30, width: 50, transform: "rotate(180deg)" }} />
</Button>
</Grid> */}
{/* <Grid item xs={12}>
<Typography variant="pnspsFormParagraphBold">申請公共啟事</Typography>
</Grid> */}
<Grid item xs={12} md={12} width={{ sx:"90%", sm:"90%",md: "60%", xs: "90%" }}>
<MainCard
sx={{
maxWidth: { xs: 400, sm:730, md:800, lg: 1000 },
margin: { sm: 0, md: 3 },
'& > *': {
flexGrow: 1,
flexBasis: '50%'
}
}}
content={false}
border={false}
boxShadow
>
<form onSubmit={formik.handleSubmit}>
{verifyState ?
// SUCCESS page
<Grid container spacing={4} sx={{ minHeight: {xs:"80vh", sm:"50vh", md: "50vh", lg:"70vh", xl:"50vh"} }} direction="column" justifyContent="flex-start" alignItems="center">
<Grid container direction="column" alignItems="center">
<Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, }}>
<Typography display="inline" variant="h4">
<FormattedMessage id="verifySuccess"/>
</Typography>
</Grid>
<Grid item xs={12} md={12} lg={12} sx={{ mb: 1,}}>
<InputLabel htmlFor="email-login-title3">
<Typography variant="h5" >
<FormattedMessage id="setNewPassword"/>
</Typography>
</InputLabel>
</Grid>
</Grid>
{/* <Grid item xs={12} md={12} lg={12} width={{xs:"70%", sm:"60%",md:"50%", lg:"50%"}}>
<Grid container direction="row" justifyContent="flex-start">
<Grid item xs={12} md={12} lg={12}>
<TextField
fullWidth
onChange={formik.handleChange}
id="emailVerifyHash"
name="emailVerifyHash"
label={intl.formatMessage({id: 'securityCode'}) + ":"}
placeholder={intl.formatMessage({id: 'securityCode'})}
defaultValue={formik.values.emailVerifyHash}
value={formik.values.emailVerifyHash}
error={Boolean(formik.touched.emailVerifyHash && formik.errors.emailVerifyHash)}
onBlur={formik.handleBlur}
inputProps={{
maxLength: 50,
onKeyDown: (e) => {
if (e.key === 'Enter') {
e.preventDefault();
}
},
}}
InputLabelProps={{
shrink: true
}}
/>
</Grid>
{formik.touched.emailVerifyHash && formik.errors.emailVerifyHash && (
<FormHelperText error id="standard-weight-helper-text-username-login">
{formik.errors.emailVerifyHash}
</FormHelperText>
)}
</Grid>
</Grid> */}
<Grid item xs={12} md={12} lg={12} width={{xs:"70%", sm:"60%",md:"50%", lg:"50%"}}>
<Grid container direction="row" justifyContent="flex-start">
<Grid item xs={12} md={12} lg={12}>
<TextField
fullWidth
id="username"
name="username"
label={intl.formatMessage({id: 'userLoginName'}) + ":"}
placeholder={intl.formatMessage({id: 'userLoginName'})}
// defaultValue={username}
value={username}
disabled={true} />
</Grid>
</Grid>
</Grid>
<Grid item xs={12} md={12} lg={12} width={{xs:"70%", sm:"60%",md:"50%", lg:"50%"}}>
<Grid container direction="row" justifyContent="flex-start">
<Grid item xs={12} md={12} lg={12}>
<TextField
fullWidth
onChange={(e) => {
formik.handleChange(e);
changePassword(e.target.value);
}}
id="password"
type={showPassword ? 'text' : 'password'}
name="password"
label={intl.formatMessage({id: 'newPassword'}) + ":"}
placeholder={intl.formatMessage({id: 'newPassword'})}
// defaultValue={formik.values.password.trim()}
value={formik.values.password.trim()}
error={Boolean(formik.touched.password && formik.errors.password)}
onBlur={formik.handleBlur}
inputProps={{
onKeyDown: (e) => {
if (e.key === 'Enter') {
e.preventDefault();
}
},
}}
InputLabelProps={{
shrink: true
}}
InputProps={{
endAdornment:(
<InputAdornment position="end">
<IconButton
aria-label="toggle password visibility"
onClick={handleClickShowPassword}
onMouseDown={handleMouseDownPassword}
edge="end"
size="large"
>
{showPassword ? <EyeOutlined /> : <EyeInvisibleOutlined />}
</IconButton>
</InputAdornment>
)
}}
/>
</Grid>
{/* <FormControl fullWidth sx={{ mt: 2 }}>
<Grid container spacing={2} alignItems="center">
<Grid item>
<Box sx={{ bgcolor: level?.color, width: 85, height: 8, borderRadius: '7px' }} />
</Grid>
<Grid item>
<Typography variant="subtitle1">
<FormattedMessage id={level ? level?.label : "pwWeak" }/>
</Typography>
</Grid>
</Grid>
</FormControl> */}
{formik.touched.password && formik.errors.password && (
<FormHelperText error id="helper-text-password-signup">
{formik.errors.password}
</FormHelperText>
)}
</Grid>
</Grid>
<Grid item xs={12} md={12} lg={12} width={{xs:"70%", sm:"60%",md:"50%", lg:"50%"}}>
<Grid container direction="row" justifyContent="flex-start">
<Grid item xs={12} md={12} lg={12}>
<TextField
fullWidth
onChange={(e) => {
formik.handleChange(e);
// changePassword(e.target.value);
}}
id="confirmPassword"
type={showConfirmPassword ? 'text' : 'password'}
name="confirmPassword"
label={intl.formatMessage({id: 'confirmPassword'}) + ":"}
placeholder={intl.formatMessage({id: 'confirmPassword'})}
// defaultValue={formik.values.confirmPassword.trim()}
value={formik.values.confirmPassword.trim()}
error={Boolean(formik.touched.confirmPassword && formik.errors.confirmPassword)}
onBlur={formik.handleBlur}
inputProps={{
maxLength: 50,
onKeyDown: (e) => {
if (e.key === 'Enter') {
e.preventDefault();
}
},
}}
InputLabelProps={{
shrink: true
}}
InputProps={{
endAdornment:(
<InputAdornment position="end">
<IconButton
aria-label="toggle password visibility"
onClick={handleClickShowConfirmPassword}
onMouseDown={handleMouseDownPassword}
edge="end"
size="large"
>
{showConfirmPassword ? <EyeOutlined /> : <EyeInvisibleOutlined />}
</IconButton>
</InputAdornment>
)
}}
/>
</Grid>
{formik.touched.confirmPassword && formik.errors.confirmPassword && (
<FormHelperText error id="helper-text-confirmPassword-signup">
{formik.errors.confirmPassword}
</FormHelperText>
)}
</Grid>
</Grid>
<Grid item xs={12} md={12} lg={12} mt={1} sx={{mb:3}}>
<ThemeProvider theme={PNSPS_LONG_BUTTON_THEME}>
<Button
aria-label={intl.formatMessage({id: 'confirm'})}
variant="contained"
type="submit"
// onClick={()=>goLogin()}
>
<FormattedMessage id="confirm"/>
</Button>
</ThemeProvider>
</Grid>
</Grid>
:
// ERROR page
<Grid container spacing={4} sx={{ minHeight: {xs:"80vh", sm:"70vh", md: "70vh", lg:"70vh", xl:"50vh"} }} 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' } }}>
{/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */}
<CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} />
</Grid>
<Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { xs: 'none', sm: 'none', md: 'block' } }}>
<Typography display="inline" variant="h4">驗證失敗，請聯絡相關的系統管理員協助。</Typography>
</Grid>
<Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { xs: 'none', sm: 'none', md: 'block' } }}>
<Button color="error" variant="outlined" component={Link} to="/login">
<Typography variant="h5">
<FormattedMessage id="backToLogin"/>
</Typography>
</Button>
</Grid>
</Grid>
}
<Grid container spacing={4} sx={{ minHeight: {xs:"80vh", sm:"70vh", md: "70vh", lg:"70vh", xl:"50vh"} }} direction="column" justifyContent="flex-start" alignItems="center">
</Grid>
</form>
</MainCard>
</Grid>
</Grid>
); );
}; };



+ 3
- 2
src/pages/authentication/ForgotPassword/ForgotPasswordApplyForm.js View File

@@ -60,6 +60,7 @@ const ForgotPasswordApplyForm = () => {
}), }),
onSubmit: values => { onSubmit: values => {
console.log(values) console.log(values)
navigate('/forgot/password/sent');
// HttpUtils.postWithFiles({ // HttpUtils.postWithFiles({
// url: UrlUtils.POST_PUBLIC_NOTICE_APPLY, // url: UrlUtils.POST_PUBLIC_NOTICE_APPLY,
@@ -115,7 +116,7 @@ const ForgotPasswordApplyForm = () => {
<MainCard <MainCard
sx={{ sx={{
maxWidth: { xs: 400, sm:600, md:800, lg: 1000 }, maxWidth: { xs: 400, sm:600, md:800, lg: 1000 },
margin: { xs: 2.5, md: 3 },
margin: { sm: 2.5, md: 3 },
'& > *': { '& > *': {
flexGrow: 1, flexGrow: 1,
flexBasis: '50%' flexBasis: '50%'
@@ -135,7 +136,7 @@ const ForgotPasswordApplyForm = () => {
</InputLabel> </InputLabel>
</Grid> </Grid>
<Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { md: 'none', xl: 'none', lg: 'none' } }}> <Grid item xs={12} md={12} lg={12} sx={{ mb: 1, mt:5, display: { md: 'none', xl: 'none', lg: 'none' } }}>
<InputLabel htmlFor="email-login-title">
<InputLabel htmlFor="email-login-subtitle">
<Typography variant="h6" > <Typography variant="h6" >
<FormattedMessage id="forgotPasswordSubTitle1"/> <FormattedMessage id="forgotPasswordSubTitle1"/>
</Typography> </Typography>


+ 8
- 5
src/pages/authentication/ForgotPassword/index.js View File

@@ -5,10 +5,9 @@ import * as React from "react";
// import * as DateUtils from "utils/DateUtils"; // import * as DateUtils from "utils/DateUtils";
// import * as FormatUtils from "utils/FormatUtils"; // import * as FormatUtils from "utils/FormatUtils";


// import {
// Radio,
// FormControlLabel
// } from '@mui/material';
import {
Grid
} from '@mui/material';


import Loadable from 'components/Loadable'; import Loadable from 'components/Loadable';
import { lazy } from 'react'; import { lazy } from 'react';
@@ -33,7 +32,11 @@ const ApplyForm = () => {


return ( return (
isLoading ? isLoading ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<ForgotPasswordApplyForm <ForgotPasswordApplyForm
// loadedData={userData} // loadedData={userData}


+ 23
- 11
src/pages/authentication/Verify.js View File

@@ -42,12 +42,12 @@ export default function Verify() {
} }


useEffect(() => { useEffect(() => {
console.log("setEnterUseEffect(true)");
// console.log("setEnterUseEffect(true)");
setEnterUseEffect(true) setEnterUseEffect(true)
}, []) }, [])


useEffect(() => { useEffect(() => {
console.log("if (enterUseEffect) handleVerify()");
// console.log("if (enterUseEffect) handleVerify()");
if (enterUseEffect) handleVerify() if (enterUseEffect) handleVerify()
}, [enterUseEffect]) }, [enterUseEffect])


@@ -56,26 +56,38 @@ export default function Verify() {
<Stack sx={{ width: '100%', fontSize: '2rem', paddingTop: '65px' }} alignItems="center"> <Stack sx={{ width: '100%', fontSize: '2rem', paddingTop: '65px' }} alignItems="center">
<AuthWrapper> <AuthWrapper>
{isLoading || verifyState == null ? {isLoading || verifyState == null ?
<LoadingComponent /> :
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid> :
<Grid item xs={12}> <Grid item xs={12}>
{verifyState ? {verifyState ?
// SUCCESS page // SUCCESS page
<Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> <Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}>
<CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} /> <CheckCircleOutlineIcon color="success" sx={{ width: "200px", height: "200px" }} />
<Typography display="inline" variant="h4">帳戶已成功驗證。</Typography>
<Button variant="outlined" component={Link} to="/login"><Typography variant="h5">
<FormattedMessage id="backToLogin"/>
</Typography></Button>
<Typography display="inline" variant="h4">
<FormattedMessage id="verifySuccess"/>
</Typography>
<Button variant="outlined" component={Link} to="/login">
<Typography variant="h5">
<FormattedMessage id="backToLogin"/>
</Typography>
</Button>
</Stack> </Stack>
: :
// ERROR page // ERROR page
<Stack mt={1} direction="column" justifyContent="flex-start" alignItems="center" spacing={2}> <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> */} {/* <Button disabled={true} hidden={true} variant="contained" type="submit" sx={{ fontSize: 12,height:'25px'}}>Submit</Button> */}
<CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} /> <CancelOutlinedIcon color="error" sx={{ width: "200px", height: "200px" }} />
<Typography display="inline" variant="h4">驗證失敗，請聯絡相關的系統管理員協助。</Typography>
<Button color="error" variant="outlined" component={Link} to="/login"><Typography variant="h5">
<FormattedMessage id="backToLogin"/>
</Typography></Button>
<Typography display="inline" variant="h4">
<FormattedMessage id="verifyFail"/>
</Typography>
<Button color="error" variant="outlined" component={Link} to="/login">
<Typography variant="h5">
<FormattedMessage id="backToLogin"/>
</Typography>
</Button>
</Stack> </Stack>
} }
</Grid> </Grid>


+ 8
- 2
src/pages/iAmSmart/AuthCallback/index.js View File

@@ -8,7 +8,9 @@ import { handleLogoutFunction, handleLogin } from 'auth/index';


import Loadable from 'components/Loadable'; import Loadable from 'components/Loadable';
const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent'))); const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));

import {
Grid,
} from '@mui/material';


// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //


@@ -79,7 +81,11 @@ const Index = () => {
} }


return ( return (
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
); );
}; };



+ 8
- 2
src/pages/iAmSmart/DirectLoginCallback/index.js View File

@@ -8,7 +8,9 @@ import { handleLogoutFunction, handleLogin } from 'auth/index';


import Loadable from 'components/Loadable'; import Loadable from 'components/Loadable';
const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent'))); const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));

import {
Grid,
} from '@mui/material';


// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //


@@ -64,7 +66,11 @@ const Index = () => {
} }


return ( return (
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
); );
}; };



+ 5
- 1
src/pages/iAmSmart/FailCallback/index.js View File

@@ -24,7 +24,11 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{ height: '100%', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" > <Grid container sx={{ height: '100%', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" >


+ 8
- 2
src/pages/iAmSmart/RegistryCallback/index.js View File

@@ -5,7 +5,9 @@ import * as UrlUtils from "utils/ApiPathConst";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import Loadable from 'components/Loadable'; import Loadable from 'components/Loadable';
const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent'))); const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/LoadingComponent')));

import {
Grid,
} from '@mui/material';


// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //


@@ -44,7 +46,11 @@ const Index = () => {
} }


return ( return (
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
); );
}; };



+ 5
- 1
src/pages/iAmSmart/SuccessCallback/index.js View File

@@ -32,7 +32,11 @@ const Index = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{ minHeight: '110vh', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" > <Grid container sx={{ minHeight: '110vh', backgroundColor: '#fff' }} direction="column" justifyContent="flex-start" alignItems="center" >
<Grid item xs={12} width="100%"> <Grid item xs={12} width="100%">


+ 5
- 1
src/pages/pnspsUserGroupDetailPage/index.js View File

@@ -167,7 +167,11 @@ const UserMaintainPage = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{ backgroundColor: "backgroundColor.default" }}> <Grid container sx={{ backgroundColor: "backgroundColor.default" }}>
<Grid item xs={12}> <Grid item xs={12}>


+ 5
- 1
src/pages/pnspsUserGroupSearchPage/index.js View File

@@ -73,7 +73,11 @@ const UserGroupSearchPanel = () => {


return ( return (
!onReady ? !onReady ?
<LoadingComponent />
<Grid container sx={{ minHeight: '95vh', mb: 3 }} direction="column" justifyContent="center" alignItems="center">
<Grid item>
<LoadingComponent />
</Grid>
</Grid>
: :
<Grid container sx={{ minHeight: '90vh', backgroundColor: "backgroundColor.default"}} direction="column"> <Grid container sx={{ minHeight: '90vh', backgroundColor: "backgroundColor.default"}} direction="column">
<Grid item xs={12}> <Grid item xs={12}>


+ 16
- 0
src/routes/AfterLoginRoutes.js View File

@@ -48,6 +48,22 @@ const AfterLoginRoutes = {
path: 'verify/:verifyCode/:email', path: 'verify/:verifyCode/:email',
element: <Navigate to="/dashboard" /> element: <Navigate to="/dashboard" />
}, },
{
path: 'forgot/password',
element: <Navigate to="/dashboard" />
},
{
path: 'forgot/password/sent',
element: <Navigate to="/dashboard" />
},
{
path: 'forgot/password/verify',
element: <Navigate to="/dashboard" />
},
{
path: 'forgot/password/loginFail',
element: <Navigate to="/dashboard" />
},
] ]
}; };




+ 10
- 1
src/routes/LoginRoutes.js View File

@@ -14,6 +14,7 @@ const IAmSmartRegister = Loadable(lazy(() => import('pages/authentication/IAmSma
const ErrorPage = Loadable(lazy(() => import('pages/extra-pages/ErrorPage'))); const ErrorPage = Loadable(lazy(() => import('pages/extra-pages/ErrorPage')));
const ForgotPassword = Loadable(lazy(() => import('pages/authentication/ForgotPassword'))); const ForgotPassword = Loadable(lazy(() => import('pages/authentication/ForgotPassword')));
const AfterForgotPasswordPage = Loadable(lazy(() => import('pages/authentication/ForgotPassword/AfterForgotPasswordPage'))); const AfterForgotPasswordPage = Loadable(lazy(() => import('pages/authentication/ForgotPassword/AfterForgotPasswordPage')));
const ForgotPassword_Callback = Loadable(lazy(() => import('pages/authentication/ForgotPassword/AuthCallback')));


const IAmSmart_DirectLoginCallback = Loadable(lazy(() => import('pages/iAmSmart/DirectLoginCallback'))); const IAmSmart_DirectLoginCallback = Loadable(lazy(() => import('pages/iAmSmart/DirectLoginCallback')));
//const IAmSmart_FallCallback = Loadable(lazy(() => import('pages/iAmSmart/FallCallback'))); //const IAmSmart_FallCallback = Loadable(lazy(() => import('pages/iAmSmart/FallCallback')));
@@ -107,9 +108,17 @@ const LoginRoutes = {
element: <ForgotPassword/> element: <ForgotPassword/>
}, },
{ {
path: 'forgot/password/verify',
path: 'forgot/password/sent',
element: <AfterForgotPasswordPage/> element: <AfterForgotPasswordPage/>
}, },
{
path: 'forgot/password/verify/:verifyCode/:email',
element: <ForgotPassword_Callback/>
},
{
path: 'forgot/password/loginFail',
element: <IAmSmart_FailCallback/>
},
] ]
}; };




+ 8
- 0
src/translations/en.json View File

@@ -69,12 +69,18 @@
"register": "Register", "register": "Register",
"userLoginName": "Username", "userLoginName": "Username",
"userPassword": "Password", "userPassword": "Password",
"newPassword": "New Password",
"setNewPassword": "Please enter new password",
"forgotUserPassword": "Forgot Password", "forgotUserPassword": "Forgot Password",
"forgotPasswordTitle": "Find Your Account", "forgotPasswordTitle": "Find Your Account",
"forgotPasswordSubTitle": "Please enter your username to receive the code to reset your password", "forgotPasswordSubTitle": "Please enter your username to receive the code to reset your password",
"forgotPasswordSubTitle1": "Please enter your username to receive", "forgotPasswordSubTitle1": "Please enter your username to receive",
"forgotPasswordSubTitle2": "the code to reset your password", "forgotPasswordSubTitle2": "the code to reset your password",
"securityCode": "Security Code", "securityCode": "Security Code",
"sentSecurityCode1": "We sent your code to your setting email",
"sentSecurityCode2": "Please check your emails for a message with your code.",
"sentSecurityCode3": "Please check your emails for ",
"sentSecurityCode4": "a message with your code.",
"requireSecurityCode": "Please enter security code", "requireSecurityCode": "Please enter security code",
"learnMore": "Learn More", "learnMore": "Learn More",
"createOrReActivate": "Create account", "createOrReActivate": "Create account",
@@ -150,6 +156,8 @@
"acceptTerms": "I accept", "acceptTerms": "I accept",
"rejectTerms": "I do not accept", "rejectTerms": "I do not accept",
"verify": "Verify", "verify": "Verify",
"verifySuccess": "Account verified successfully",
"verifyFail": "Verification failed, please contact the relevant system administrator for assistance.",
"validVerify": "Please enter valid verification", "validVerify": "Please enter valid verification",
"requiredValid": "Please enter valid ", "requiredValid": "Please enter valid ",
"require": "Please enter ", "require": "Please enter ",


+ 8
- 0
src/translations/zh-CN.json View File

@@ -69,12 +69,18 @@
"register": "申请", "register": "申请",
"userLoginName": "用户登入名称", "userLoginName": "用户登入名称",
"userPassword": "密码", "userPassword": "密码",
"newPassword": "新密码",
"setNewPassword": "请输入新密码",
"forgotUserPassword": "忘记密码", "forgotUserPassword": "忘记密码",
"forgotPasswordTitle": "寻找你的帐号", "forgotPasswordTitle": "寻找你的帐号",
"forgotPasswordSubTitle": "请输入你的用户登入名称以重设密码", "forgotPasswordSubTitle": "请输入你的用户登入名称以重设密码",
"forgotPasswordSubTitle1": "请输入你的用户登入名称收", "forgotPasswordSubTitle1": "请输入你的用户登入名称收",
"forgotPasswordSubTitle2": "以重设密码", "forgotPasswordSubTitle2": "以重设密码",
"securityCode": "安全验证码", "securityCode": "安全验证码",
"sentSecurityCode1": "我们已将验证码送至你的电邮：",
"sentSecurityCode2": "请查看你的电子邮件信箱中是否有包含验证码的信件。",
"sentSecurityCode3": "请查看你的电子邮件信箱中",
"sentSecurityCode4": "是否有包含验证码的信件。",
"requireSecurityCode": "请输入安全验证码", "requireSecurityCode": "请输入安全验证码",
"learnMore": "了解更多", "learnMore": "了解更多",
"createOrReActivate": "建立帐户", "createOrReActivate": "建立帐户",
@@ -112,6 +118,8 @@
"requireAtLeast2Number": "请输入最少2位数字", "requireAtLeast2Number": "请输入最少2位数字",
"requireDialingCode": "请输入国际区号", "requireDialingCode": "请输入国际区号",
"requireVerify": "请输入验证", "requireVerify": "请输入验证",
"verifySuccess": "帐户已成功验证。",
"verifyFail": "验证失败，请联络相关的系统管理员协助。",
"dialingCode": "国际区号", "dialingCode": "国际区号",
"userFaxNumber": "传真号码", "userFaxNumber": "传真号码",
"userIdDoc": "身份证明文件", "userIdDoc": "身份证明文件",


+ 9
- 0
src/translations/zh-HK.json View File

@@ -69,13 +69,20 @@
"register": "申請", "register": "申請",
"userLoginName": "用戶登入名稱", "userLoginName": "用戶登入名稱",
"userPassword": "密碼", "userPassword": "密碼",
"newPassword": "新密碼",
"setNewPassword": "請輸入新密碼",
"forgotUserPassword": "忘記密碼", "forgotUserPassword": "忘記密碼",
"forgotPasswordTitle": "尋找你的帳號", "forgotPasswordTitle": "尋找你的帳號",
"forgotPasswordSubTitle": "請輸入你的用戶登入名稱以重設密碼", "forgotPasswordSubTitle": "請輸入你的用戶登入名稱以重設密碼",
"forgotPasswordSubTitle1": "請輸入你的用戶登入名稱", "forgotPasswordSubTitle1": "請輸入你的用戶登入名稱",
"forgotPasswordSubTitle2": "以重設密碼", "forgotPasswordSubTitle2": "以重設密碼",
"securityCode": "安全驗證碼", "securityCode": "安全驗證碼",
"sentSecurityCode1": "我們已將驗證碼送至你的電郵：",
"sentSecurityCode2": "請查看你的電子郵件信箱中是否有包含驗證碼的信件。",
"sentSecurityCode3": "請查看你的電子郵件信箱中",
"sentSecurityCode4": "是否有包含驗證碼的信件。",
"requireSecurityCode": "請輸入安全驗證碼", "requireSecurityCode": "請輸入安全驗證碼",
"learnMore": "了解更多", "learnMore": "了解更多",
"createOrReActivate": "建立帳戶", "createOrReActivate": "建立帳戶",
"usernameTaken": "此用戶登入名稱已被注冊，請使用其他用戶登入名稱", "usernameTaken": "此用戶登入名稱已被注冊，請使用其他用戶登入名稱",
@@ -150,6 +157,8 @@
"acceptTerms": "我接受", "acceptTerms": "我接受",
"rejectTerms": "我不接受", "rejectTerms": "我不接受",
"verify": "驗證", "verify": "驗證",
"verifySuccess": "帳戶已成功驗證。",
"verifyFail": "驗證失敗，請聯絡相關的系統管理員協助。",
"validVerify": "請輸入有效驗證", "validVerify": "請輸入有效驗證",
"requiredValid": "請輸入有效的", "requiredValid": "請輸入有效的",
"require": "請輸入", "require": "請輸入",


+ 2
- 0
src/utils/ApiPathConst.js View File

@@ -73,6 +73,8 @@ export const GET_USERNAME = apiPath+'/user/username';
export const GET_USER_EMAIL = apiPath+'/user/email'; export const GET_USER_EMAIL = apiPath+'/user/email';
export const GET_ID = apiPath+'/user/verifyID'; export const GET_ID = apiPath+'/user/verifyID';
export const GET_VERIFY_USER_ACCOUNT = apiPath+'/user/verifyEmail'; export const GET_VERIFY_USER_ACCOUNT = apiPath+'/user/verifyEmail';
export const GET_FORGOT_PASSWORD_VERIFY_USER_ACCOUNT = apiPath+'/user/verifyForgotPasswordEmail';
export const POST_FORGOT_PASSWORD_NEW_PASSWORD = apiPath+'/user/forgotPasswordNewPassword';




//Public //Public


Write Preview
Loading…
Cancel
Save