Compare commits

..

1 Commits

Author SHA1 Message Date
victorAnumudu a8416a8433 made family page to reload after adding a task 2023-10-10 10:17:22 +01:00
7 changed files with 14 additions and 36 deletions
-3
View File
@@ -88,6 +88,3 @@ REACT_APP_SHOW_OFFER_GROUP_JOB=0
#UPLOAD PROFILE PICTURE #UPLOAD PROFILE PICTURE
REACT_APP_SHOW_UPLOAD_PROFILE_PICTURE=0 REACT_APP_SHOW_UPLOAD_PROFILE_PICTURE=0
#GOOGLE RECAPTCHA SITEKEY
REACT_APP_GOOGLE_RECAPTCHA_SITEKEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
-3
View File
@@ -56,6 +56,3 @@ REACT_APP_SHOW_OFFER_GROUP_JOB=0
#UPLOAD PROFILE PICTURE #UPLOAD PROFILE PICTURE
REACT_APP_SHOW_UPLOAD_PROFILE_PICTURE=0 REACT_APP_SHOW_UPLOAD_PROFILE_PICTURE=0
#GOOGLE RECAPTCHA SITEKEY
REACT_APP_GOOGLE_RECAPTCHA_SITEKEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
-3
View File
@@ -62,6 +62,3 @@ REACT_APP_SHOW_OFFER_GROUP_JOB=0
#UPLOAD PROFILE PICTURE #UPLOAD PROFILE PICTURE
REACT_APP_SHOW_UPLOAD_PROFILE_PICTURE=0 REACT_APP_SHOW_UPLOAD_PROFILE_PICTURE=0
#GOOGLE RECAPTCHA SITEKEY
REACT_APP_GOOGLE_RECAPTCHA_SITEKEY=6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
-1
View File
@@ -21,7 +21,6 @@
"react-chartjs-2": "^4.1.0", "react-chartjs-2": "^4.1.0",
"react-countup": "^6.2.0", "react-countup": "^6.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-google-recaptcha": "^3.1.0",
"react-qr-code": "^2.0.11", "react-qr-code": "^2.0.11",
"react-redux": "^8.0.5", "react-redux": "^8.0.5",
"react-router-dom": "^6.0.2", "react-router-dom": "^6.0.2",
@@ -7,8 +7,6 @@ import AuthLayout from "../AuthLayout";
import EmailValidator from "../../../lib/EmailValidator"; import EmailValidator from "../../../lib/EmailValidator";
import ForgetPwdResponse from "../ForgetPwdResponse"; import ForgetPwdResponse from "../ForgetPwdResponse";
import ReCAPTCHA from "react-google-recaptcha";
export default function ForgotPassword() { export default function ForgotPassword() {
const [checked, setValue] = useState(false); const [checked, setValue] = useState(false);
const [resetLoading, setResetLoading] = useState(false); const [resetLoading, setResetLoading] = useState(false);
@@ -24,18 +22,9 @@ export default function ForgotPassword() {
setMail(e?.target.value); setMail(e?.target.value);
}; };
// const humanChecker = () => { const humanChecker = () => {
// setValue(!checked); setValue(!checked);
// }; };
function humanChecker(value) {
// console.log("Captcha value:", value);
if(value){
setValue(true)
}else{
setValue(false)
}
}
const resetHandler = async () => { const resetHandler = async () => {
if (email == "") { if (email == "") {
@@ -124,16 +113,10 @@ export default function ForgotPassword() {
/> />
</div> </div>
{/* hCaptha clone for the time being */} {/* hCaptha clone for the time being */}
<div className="mb-10 flex justify-center w-full"> <div className="mb-10">
<ReCAPTCHA
sitekey={process.env.REACT_APP_GOOGLE_RECAPTCHA_SITEKEY}
onChange={humanChecker}
/>
</div>
{/* <div className="mb-10">
<div className="w-[303px] h-[78px] mx-auto overflow-hidden"> <div className="w-[303px] h-[78px] mx-auto overflow-hidden">
<div className="w-[300px] h-[74px] bg-white bottom-[1px] rounded border-gray-100 overflow-hidden cursor-pointer"> <div className="w-[300px] h-[74px] bg-white bottom-[1px] rounded border-gray-100 overflow-hidden cursor-pointer">
{/* Checkbox */}
<div className="h-full relative inline-block"> <div className="h-full relative inline-block">
<div className="relative table top-0 h-full"> <div className="relative table top-0 h-full">
<div className="table-cell align-middle"> <div className="table-cell align-middle">
@@ -165,7 +148,7 @@ export default function ForgotPassword() {
<div className="h-full relative inline-block w-16"></div> <div className="h-full relative inline-block w-16"></div>
</div> </div>
</div> </div>
</div> */} </div>
{msgError && ( {msgError && (
<div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]"> <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">
{msgError} {msgError}
@@ -51,6 +51,8 @@ export default function FamilyManageTabs({
}); });
}; };
const [updatePage, setUpdatePage] = useState(false) // State to determine when to update the page
// State for family task data // State for family task data
const [familyTask, setFamilyTask] = useState({ loading: false, data: [] }); const [familyTask, setFamilyTask] = useState({ loading: false, data: [] });
@@ -220,7 +222,7 @@ export default function FamilyManageTabs({
// Invoke the manageFamily function when the component mounts // Invoke the manageFamily function when the component mounts
manageFamily(); manageFamily();
}, []); }, [updatePage]);
// Effect to manage family tasks // Effect to manage family tasks
useEffect(() => { useEffect(() => {
@@ -356,6 +358,7 @@ export default function FamilyManageTabs({
setActiveTask={setActiveTask} setActiveTask={setActiveTask}
activeTask={activeTask} activeTask={activeTask}
familyDetailsData={details.familyDetails.data} familyDetailsData={details.familyDetails.data}
setUpdatePage={setUpdatePage}
/> />
)} )}
</div> </div>
@@ -15,6 +15,7 @@ const AssignTaskPopout = React.memo(
familyTask, familyTask,
activeTask, activeTask,
setActiveTask, setActiveTask,
setUpdatePage
}) => { }) => {
const apiCall = new usersService(); const apiCall = new usersService();
@@ -143,6 +144,7 @@ const AssignTaskPopout = React.memo(
status: true, status: true,
message: "action successful", message: "action successful",
}); });
setUpdatePage(prev => !prev) // Updates family task page by calling the useeffect hook
setTimeout(() => { setTimeout(() => {
setRequestStatus({ loading: false, status: false, message: "" }); setRequestStatus({ loading: false, status: false, message: "" });
action(); // FUNCTION THAT CLOSES THE MODAL BOX action(); // FUNCTION THAT CLOSES THE MODAL BOX