updated translations and oauth

This commit is contained in:
2021-11-19 09:30:04 +00:00
parent 3c38da1400
commit f9f7b777e7
91 changed files with 2519 additions and 1275 deletions
+21 -14
View File
@@ -114,17 +114,22 @@ let Login = (props) => {
const router = useRouter();
const { locale } = router;
const [showSpinnerState, setShowSpinnerState] = useState(false);
// const [showSpinnerState, setShowSpinnerState] = useState(false);
const [validLoginID, setValidLoginID] = useState(null);
let spinnerState = () => {
showSpinnerState == true
? setShowSpinnerState(false)
: setShowSpinnerState(true);
};
// let spinnerState = () => {
// showSpinnerState == true
// ? setShowSpinnerState(false)
// : setShowSpinnerState(true);
// };
const onHandleSubmit = (values) => {
spinnerState();
//spinnerState();
let now = new Date();
let expDate = new Date(now);
expDate.setDate(now.getDate() + 1);
getLogin(values.loginUserID, values.loginUserPassword).then((data) => {
data.value.length != 0
@@ -132,14 +137,16 @@ let Login = (props) => {
setLoggedInUserId(data.value[0].contactid),
setCookie(null, "pinsUser", data.value[0].contactid, {
path: "/",
expires: expDate,
}),
spinnerState(),
// spinnerState(),
router.replace({
pathname:
router.locale == "cy" ? "/fymhorth" : "/myportal",
shallow: true,
}))
: (setShowSpinnerState(false), setValidLoginID(false));
: //setShowSpinnerState(false),
setValidLoginID(false);
});
};
@@ -147,12 +154,12 @@ let Login = (props) => {
useEffect(() => {
cookies.pinsUser != null || typeof cookies.pinsUser != "undefined"
? (spinnerState(),
? // spinnerState(),
router.replace("/myportal", null, {
shallow: true,
}))
})
: "";
}, []);
}, [cookies.pinsUser, router]);
return (
<div className="card" id="login-card">
@@ -243,11 +250,11 @@ let Login = (props) => {
</div>
</div>
</form>
<LoadingOverlay
{/* <LoadingOverlay
active={showSpinnerState}
spinner
text="Logging in"
/>
/> */}
</div>
);
};