diff --git a/src/components/file_uploads/FileUploadCom.jsx b/src/components/file_uploads/FileUploadCom.jsx index 4fba03a..e7781fc 100644 --- a/src/components/file_uploads/FileUploadCom.jsx +++ b/src/components/file_uploads/FileUploadCom.jsx @@ -1,15 +1,12 @@ -import { useState } from 'react' -import { useQuery } from '@tanstack/react-query' +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 { getBillings } from '../../services/siteServices' +import {getFilesUpload} from '../../services/siteServices' import getDateTimeFromDateString from '../../helpers/getDateTimeFromDateString'; -// import formatNumber from '../../helpers/formatNumber' -// import Avatar from '../../assets/user_avatar.jpg' - export default function FileUploadCom() { @@ -17,18 +14,18 @@ export default function FileUploadCom() { 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){ + if (filter.type && !filter.id) { return - }else if(!filter.type){ + } else if (!filter.type) { setPage(1) setWillFilter(prev => !prev) setFilter({type: '', id: ''}) - }else{ + } else { setPage(1) setWillFilter(prev => !prev) } @@ -42,110 +39,135 @@ export default function FileUploadCom() { page, ...filterData } - return getBillings(reqData) + return getFilesUpload(reqData) }, staleTime: 0 //0 mins }) - const billingData = data?.data?.payments // BILLINGS LIST + const billingData = data?.data?.file_list; // file_list + const media_server = data?.data?.media_server; // file_list const pagination = data?.data?.pagination - + debugger; return (
- +
- { isError ? + {isError ?

{error?.message}

- : - <> - {/* filter section */} -
- -
- + : + <> + {/* filter section */} +
+ +
+ +
+
+ +
+
-
- -
- -
- {/* end of filter section */} + {/* end of filter section */} - - {({ data }) => ( - <> - - - - - - - - - - - - {(data && data.length > 0) ? data?.map((item, index) => ( - - - - - - + + {({data}) => ( + <> +
- Added - - Option Name - - Member ID - - Amount - - Status -
-
-
-
{getDateTimeFromDateString(item?.added)}
-
-
-
-
-
{item?.option_name}
-
-
-
-
{item?.member_id}
-
-
-
-
${item?.amount}
- {/*
{item?.external_url}
*/} -
-
-
-
{item?.status}
-
-
+ + + + + + + + - )) - : - - - - } - -
+ Added + + Member ID + + File Name + + Group + + Status +
-
- No Record Found -
-
- - )} -
- + + + {(data && data.length > 0) ? data?.map((item, index) => { + const file_url = (media_server + "/" + item?.file_group + "/" + item?.file_uid + "/" + item.filename).toLowerCase(); + return ( + + +
+
+
{getDateTimeFromDateString(item?.added)}
+
+
+ + +
+
{item?.member_id}
+
+ + + + + + +
+
{item?.file_group}
+
+ + +
+
{item?.status}
+
+ + + ) + } + ) + : + + +
+ No Record Found +
+ + + } + + + + ) + } + + }
diff --git a/src/services/siteServices.js b/src/services/siteServices.js index d590fcd..785a7d1 100644 --- a/src/services/siteServices.js +++ b/src/services/siteServices.js @@ -88,6 +88,12 @@ export const getBillings = (reqData) => { return getAuxEnd(`/billings`, postData) } +// FUNCTION TO GET FILES +export const getFilesUpload = (reqData) => { + const postData = { ...reqData } + return getAuxEnd(`/file-uploads`, postData) +} + // FUNCTION TO GET SUBSCRIPTIONS export const getSubscriptions = (reqData) => { const postData = { ...reqData }