diff --git a/src/components/recent_signup/RecentSignup.jsx b/src/components/recent_signup/RecentSignup.jsx index 59647ca..97e5350 100644 --- a/src/components/recent_signup/RecentSignup.jsx +++ b/src/components/recent_signup/RecentSignup.jsx @@ -1,146 +1,203 @@ -import { useState } from 'react' -import { useQuery } from '@tanstack/react-query' -import queryKeys from '../../services/queryKeys' +import { useState } from "react"; +import { useQuery } from "@tanstack/react-query"; +import queryKeys from "../../services/queryKeys"; -import BreadcrumbCom from '../breadcrumb/BreadcrumbCom' -import TablePaginatedWrapper from '../tableWrapper/TablePaginatedWrapper' -import Icons from '../Icons' -import { getRecentSignup } from '../../services/siteServices' -import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString' -// import formatNumber from '../../helpers/formatNumber' -// import formatNumber from '../../helpers/formatNumber' -// import Avatar from '../../assets/user_avatar.jpg' +import BreadcrumbCom from "../breadcrumb/BreadcrumbCom"; +import TablePaginatedWrapper from "../tableWrapper/TablePaginatedWrapper"; +import Icons from "../Icons"; +import { getRecentSignup } from "../../services/siteServices"; +import getDateTimeFromDateString from "../../helpers/getDateTimeFromDateString"; +import {Link} from 'react-router-dom'; export default function RecentSignup() { + const [page, setPage] = useState(1); + const [filter, setFilter] = useState({ type: "", id: "" }); + const [willFilter, setWillFilter] = useState(false); - const [page, setPage] = useState(1) - const [filter, setFilter] = useState({type: '', id: ''}) - const [willFilter, setWillFilter] = useState(false) + const handleFilter = ({ target: { name, value } }) => { + setFilter((prev) => ({ ...prev, [name]: value })); + }; - const handleFilter = ({target:{name, value}}) => { - setFilter(prev => ({...prev, [name]:value})) + const handleFilterByParams = () => { + if (filter.type && !filter.id) { + return; + } else if (!filter.type) { + setPage(1); + setWillFilter((prev) => !prev); + setFilter({ type: "", id: "" }); + } else { + setPage(1); + setWillFilter((prev) => !prev); } + }; - const handleFilterByParams = () => { - if(filter.type && !filter.id){ - return - }else if(!filter.type){ - setPage(1) - setWillFilter(prev => !prev) - setFilter({type: '', id: ''}) - }else{ - setPage(1) - setWillFilter(prev => !prev) - } - } + const { data, isFetching, isError, error } = useQuery({ + queryKey: [...queryKeys.recent_signup, page, willFilter], + queryFn: () => { + const filterData = filter?.type ? { [filter?.type]: filter.id } : {}; + const reqData = { + page, + ...filterData, + }; + return getRecentSignup(reqData); + }, + staleTime: 0, //0 mins + }); + const recentSignupData = data?.data?.members; // BILLINGS LIST + const pagination = data?.data?.pagination; + // console.log('DATA', data?.data) - const {data, isFetching, isError, error} = useQuery({ - queryKey: [...queryKeys.recent_signup, page, willFilter], - queryFn: () => { - const filterData = filter?.type ? {[filter?.type]: filter.id} : {} - const reqData = { - page, - ...filterData - } - return getRecentSignup(reqData) - }, - staleTime: 0 //0 mins - }) - const recentSignupData = data?.data?.payments // BILLINGS LIST - const pagination = data?.data?.pagination - // console.log('DATA', data?.data) + return ( +
+ - return ( -
- - -
- { isError ? -

{error?.message}

- : - <> - {/* filter section */} -
- -
- -
-
- -
- -
- {/* end of filter section */} - - - {({ data }) => ( - <> - - - - - - - - - - - {(data && data.length > 0) ? data?.map((item, index) => ( - - - - - - - )) - : - - - - } - -
- Added - - Option Name - - Amount - - Status -
-
-
-
{getDateTimeFromDateString(item?.added)}
-
-
-
-
-
{item?.option_name}
-
-
-
-
${item?.amount}
- {/*
{item?.external_url}
*/} -
-
-
-
{item?.status}
-
-
-
- No Record Found -
-
- - )} -
- - } +
+ {isError ? ( +

{error?.message}

+ ) : ( + <> + {/* filter section */} +
+ +
+ +
+
+ +
+
-
- ) -} \ No newline at end of file + {/* end of filter section */} + + + {({ data }) => ( + <> + + + + + + + + + + + + {data && data.length > 0 ? ( + data?.map((item, index) => ( + + + + + + + + + )) + ) : ( + + + + )} + +
+ Added + + User Name /Email + + Name + + Country + + Action +
+
+
+
+ {getDateTimeFromDateString(item?.added)} +
+
+
+
+
+
+ {item?.username} +
+
+ {item?.email} +
+
+
+
+
+ {item?.firstname} {item?.lastname} +
+ {/*
{item?.external_url}
*/} +
+
+
+
+ {item?.country} +
+
+
+
+
+ + + +
+
+
+
+ No Record Found +
+
+ + )} +
+ + )} +
+
+ ); +}