diff --git a/src/components/FamilyAcc/FamilyManage.jsx b/src/components/FamilyAcc/FamilyManage.jsx index 6d80804..d8af7c7 100644 --- a/src/components/FamilyAcc/FamilyManage.jsx +++ b/src/components/FamilyAcc/FamilyManage.jsx @@ -1,76 +1,18 @@ -import React, { useCallback, useEffect, useMemo, useState } from "react"; -import InputCom from "../Helpers/Inputs/InputCom"; +import React, { useState } from "react"; import Layout from "../Partials/Layout"; -import FamilyTable from "./FamilyTable"; -import SiteService from "../../services/SiteService"; -import ModalCom from "../Helpers/ModalCom"; import FamilyManageTabs from "./FamilyManageTabs"; import { useLocation } from "react-router-dom"; export default function FamilyManage() { const [selectTab, setValue] = useState("today"); - const [selectedAge, setSelectedAge] = useState(undefined); - const [familyList, setFamilyList] = useState([]); - const [loader, setLoader] = useState(false); - const [popUp, setPopUp] = useState(false); - const [listReload, setListReload] = useState(false); - const [msgErr, setMsgErr] = useState(""); - const [formData, setFormData] = useState({ - first_name: "", - last_name: "", - }); let location = useLocation(); let accountDetails = location?.state - - const apiCall = useMemo(() => new SiteService(), []); - - // This is to make sure it's called once and used everywhere - let memberId = localStorage.getItem("member_id"); - let uid = localStorage.getItem("uid"); - let sessionId = localStorage.getItem("session_token"); - - const popUpHandler = () => { - setPopUp((prev) => !prev); - }; - // tab handler const filterHandler = (value) => { setValue(value); }; - // member listing - const memberList = useCallback(async () => { - setLoader(true); - try { - let reqData = { - member_id: memberId, - uid: uid, - session_id: sessionId, - limit: 20, - offset: 0, - action: 22010, - }; - - let res = await apiCall.familyListings(reqData); - const { data } = res; - if (data?.internal_return >= 0 && data?.status == "OK") { - let { result_list } = data; - setFamilyList(result_list); - setLoader(false); - } else return; - } catch (error) { - setLoader(false); - throw new Error(error); - } - }, [apiCall, memberId, sessionId, uid]); - - useEffect(() => { - memberList(); - }, [listReload, memberList]); - - console.log('Ebueb', familyList) - return ( {/**/} @@ -94,7 +36,7 @@ export default function FamilyManage() { > - + diff --git a/src/components/FamilyAcc/FamilyManageTabs.jsx b/src/components/FamilyAcc/FamilyManageTabs.jsx index 590af79..c17f860 100644 --- a/src/components/FamilyAcc/FamilyManageTabs.jsx +++ b/src/components/FamilyAcc/FamilyManageTabs.jsx @@ -6,7 +6,6 @@ import React, { useState, } from "react"; import LoadingSpinner from "../Spinners/LoadingSpinner"; -import cover from "../../assets/images/profile-info-cover.png"; import profile from "../../assets/images/profile-info-profile.png"; import usersService from "../../services/UsersService"; import FamilyTasks from "./FamilyTasks"; @@ -14,6 +13,7 @@ import FamilyTasks from "./FamilyTasks"; export default function FamilyManageTabs({ className, accountDetails, + listReload, loader, }) { const [familyDetails, setFamilyDetails] = useState(null); @@ -75,9 +75,8 @@ export default function FamilyManageTabs({ useEffect(() => { familyManageHandler(); - }, []); + }, [tab]); - console.log(familyDetails); return (
Tasks; -} - function Account({ familyDetails }) { return (
diff --git a/src/components/FamilyAcc/index.jsx b/src/components/FamilyAcc/index.jsx index 8927505..12fcf7c 100644 --- a/src/components/FamilyAcc/index.jsx +++ b/src/components/FamilyAcc/index.jsx @@ -73,6 +73,7 @@ export default function FamilyAcc() { if (data?.internal_return > 0 && data?.status == "OK") { setLoader(false); setListReload((prev) => !prev); + popUpHandler() } else { setLoader(false); setMsgErr("Sorry, something went wrong"); @@ -93,6 +94,7 @@ export default function FamilyAcc() { first_name: "", last_name: "", }); + setSelectedAge("") } }; diff --git a/src/components/Helpers/DataIteration.jsx b/src/components/Helpers/DataIteration.jsx index 9e5ebc1..422ac89 100644 --- a/src/components/Helpers/DataIteration.jsx +++ b/src/components/Helpers/DataIteration.jsx @@ -5,9 +5,8 @@ function DataIteration(props) { return ( <> {datas && - datas.length >= endLength && - datas - .slice(startLength, endLength) + datas?.length >= endLength && + datas?.slice(startLength, endLength) .map((value) => children({ datas: value }))} ); diff --git a/src/components/MarketPlace/MainSection.jsx b/src/components/MarketPlace/MainSection.jsx index 566b7fb..56b4961 100644 --- a/src/components/MarketPlace/MainSection.jsx +++ b/src/components/MarketPlace/MainSection.jsx @@ -1,8 +1,5 @@ import React, { useEffect, useState } from "react"; -//import ProductCardStyleTwo from "../Cards/ProductCardStyleTwo"; import DataIteration from "../Helpers/DataIteration"; -// import SearchCom from "../Helpers/SearchCom"; -// import ActiveJobsCard from "../Cards/ActiveJobsCard"; import AvailableJobsCard from "../Cards/AvailableJobsCard"; export default function MainSection({ className, marketPlaceProduct }) { @@ -13,13 +10,13 @@ export default function MainSection({ className, marketPlaceProduct }) { }; useEffect(() => { if (tab === "artist") { - setProducts(marketPlaceProduct.slice(0, 3)); + setProducts(marketPlaceProduct?.slice(0, 3)); } else if (tab === "market") { - setProducts(marketPlaceProduct.slice(0, 6)); + setProducts(marketPlaceProduct?.slice(0, 6)); } else if (tab === "shop") { - setProducts(marketPlaceProduct.slice(6, 9)); + setProducts(marketPlaceProduct?.slice(6, 9)); } else if (tab === "assets") { - setProducts(marketPlaceProduct.slice(3, 6)); + setProducts(marketPlaceProduct?.slice(3, 6)); } else { setProducts(marketPlaceProduct); }