cookie bug fix and family dash style changes made

This commit is contained in:
victorAnumudu
2023-07-05 04:39:39 +01:00
parent 4f9ca918c9
commit 6e3061b9db
5 changed files with 61 additions and 37 deletions
+24 -28
View File
@@ -17,10 +17,7 @@ import { updateUserDetails } from "../../../store/UserDetails";
export default function Login() {
const dispatch = useDispatch();
let [loginType, setLoginType] = useState({ full: true, family: false });
const [selectedLoginType, setSelectedLoginType] = useState(
document.cookie.includes("loginType=family") ? "loginfamily" : "loginfull"
);
let [loginType, setLoginType] = useState(document.cookie.includes("loginType=family")? 'family': document.cookie.includes("loginType=full") ? 'full' : 'full');
const [checked, setValue] = useState(false);
const [loginLoading, setLoginLoading] = useState(false);
@@ -36,11 +33,12 @@ export default function Login() {
//FUNCTION TO DETERMINE/CHANGE LOGIN COMPONENT
const handleLoginType = ({ target: { name } }) => {
if (name == "full") {
setLoginType({ [name]: true, family: false });
} else if ((name = "family")) {
setLoginType({ [name]: false, family: true });
}
setLoginType(name);
let currentDate = new Date();
let expirationDate = new Date(currentDate.getTime() + (24 * 60 * 60 * 1000));
// Convert the expiration date to the appropriate format
let expirationDateString = expirationDate.toUTCString();
document.cookie = `loginType=${name}; expires=${expirationDateString}; path=/login;`;
};
// email
@@ -71,7 +69,7 @@ export default function Login() {
return;
}
if (name == "loginfull") {
if (name == "full") {
// Post Data Info for normal Login
postData = {
username: email,
@@ -80,11 +78,7 @@ export default function Login() {
login_mode: 1100,
action: 11025,
};
// Clear the loginType cookie if the user switches to loginfull
document.cookie =
"loginType=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
} else if (name == "loginfamily") {
} else if (name == "family") {
// Post Data Info for family Login
postData = {
username: email,
@@ -93,8 +87,6 @@ export default function Login() {
login_mode: 1105,
action: 11025,
};
// Set the loginType cookie to remember the user's selection
document.cookie = "loginType=family; expires=Session; path=/;";
} else {
setLoginLoading(false);
setMsgError("Invalid Login Type. Consider refreshing the page");
@@ -146,16 +138,20 @@ export default function Login() {
});
// In order to update the selected login type whenever the component renders
useEffect(() => {
setSelectedLoginType(
document.cookie.includes("loginType=family") ? "loginfamily" : "loginfull"
);
}, []);
// useEffect(() => {
// document.cookie.includes("loginType=family") ? "loginfamily" : "loginfull"
// Set the loginType cookie to remember the user's selection
// document.cookie = "loginType=family; expires=Session; path=/;";
// Clear the loginType cookie if the user switches to loginfull
// document.cookie ="loginType=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;";
// }, []);
useEffect(() => {
setMail("");
setPassword("");
}, [loginType.full, loginType.family]);
}, [loginType]);
return (
<>
@@ -192,7 +188,7 @@ export default function Login() {
<button
name="full"
className={`px-2 py-1 w-[100px] text-left h-[40px] text-lg font-bold text-[#4687ba] hover:text-[#009ef7] tracking-wide transition outline-none border-2 border-b-0 border-r-0 border-[#4687ba] ${
loginType.full && "border-r-2 h-[45px]"
loginType=='full' && "border-r-2 h-[45px]"
}`}
onClick={handleLoginType}
>
@@ -201,7 +197,7 @@ export default function Login() {
<button
name="family"
className={`px-2 py-1 w-[100px] text-left h-[40px] text-lg font-bold text-[#4687ba] hover:text-[#009ef7] tracking-wide transition outline-none border-2 border-b-0 border-l-0 border-[#4687ba] ${
loginType.family && "border-l-2 h-[45px]"
loginType=='family' && "border-l-2 h-[45px]"
}`}
onClick={handleLoginType}
>
@@ -213,7 +209,7 @@ export default function Login() {
{/* for login component */}
{
loginType.full ? (
loginType == 'full' ? (
//user login component
<div className="p-2 input-area border-2 border-[#4687ba]">
<div className="input-item mb-5">
@@ -264,7 +260,7 @@ export default function Login() {
<div className="signin-area mb-3.5">
<div className="flex justify-center">
<button
name="loginfull"
name="full"
onClick={doLogin}
type="button"
disabled={loginLoading}
@@ -352,7 +348,7 @@ export default function Login() {
<div className="signin-area mb-1.5">
<div className="flex justify-center">
<button
name="loginfamily"
name="family"
onClick={doLogin}
disabled={loginLoading}
type="button"