Merge branch 'master' into add-family-acc

This commit was merged in pull request #52.
This commit is contained in:
Ebube
2023-05-10 16:12:54 +01:00
13 changed files with 279 additions and 257 deletions
+1
View File
@@ -3,6 +3,7 @@ import dataImage1 from "../../assets/images/data-table-user-1.png";
export default function FamilyTable({ className, familyList, loader }) {
const filterCategories = ["All Categories", "Explore", "Featured"];
console.log(familyList)
const [selectedCategory, setCategory] = useState(filterCategories[0]);
return (
<div
+12 -9
View File
@@ -8,10 +8,10 @@ import SiteService from "../../services/SiteService";
export default function FamilyAcc() {
const [selectTab, setValue] = useState("today");
const [selectedAge, setSelectedAge] = useState(undefined);
const [familyList, setFamilyList] = useState([]);
const [isOpen, setIsOpen] = useState(false);
const [loader, setLoader] = useState(false);
const [popUp, setPopUp] = useState(false);
const [isOpen, setIsOpen] = useState(false)
const [familyList, setFamilyList] = useState([])
const [listReload, setListReload] = useState(false);
const [msgErr, setMsgErr] = useState("");
const [formData, setFormData] = useState({
@@ -32,8 +32,8 @@ export default function FamilyAcc() {
let id = useId();
// For the age drop down
let startAge = 16;
let endAge = 70;
let startAge = 5;
let endAge = 16;
// creates an array of age values ranging from 16 to 70
const ageRange = Array.from(
{ length: endAge - startAge + 1 },
@@ -49,12 +49,13 @@ export default function FamilyAcc() {
setFormData({ ...formData, [name]: value });
};
// Add member
const addMember = async () => {
let { first_name, last_name } = formData;
const { first_name, last_name } = formData;
setLoader(true);
try {
if (first_name !== "" && last_name !== "") {
const reqData = {
let reqData = {
member_id: localStorage.getItem("member_id"),
uid: localStorage.getItem("uid"),
session_id: localStorage.getItem("session_token"),
@@ -62,9 +63,10 @@ export default function FamilyAcc() {
lastname: last_name,
age: selectedAge,
};
const res = await apiCall.addFamily(reqData);
console.log(reqData);
let res = await apiCall.addFamily(reqData);
const { data } = res;
if (data.internal_return > 0 && data.status == "OK") {
if (data?.internal_return > 0 && data?.status == "OK") {
setLoader(false);
setListReload((prev) => !prev);
setIsOpen(false);
@@ -79,6 +81,7 @@ export default function FamilyAcc() {
} catch (error) {
setLoader(false);
setMsgErr("An error occurred");
throw new Error(error);
} finally {
setTimeout(() => {
setMsgErr(null);
@@ -236,7 +239,7 @@ const FamilyForm = ({
</div>
</div>
{msgErr && (
<div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px]">
<div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-xs font-light leading-[19.5px]">
{msgErr}
</div>
)}