diff --git a/components/BillingsPage/index.tsx b/components/BillingsPage/index.tsx index 0c63add0..e0824dea 100644 --- a/components/BillingsPage/index.tsx +++ b/components/BillingsPage/index.tsx @@ -45,23 +45,23 @@ export default function BillingsView(){ const [selectedBank, setSelelectedOrg] = useState({}) const [currentFilter, setCurrentStatus] = useState({id:'1',name: 'Verified'}) - async function fetchAllBanks(){ - const res = await axios({ - method:'get', - //@ts-ignore - url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org-bank?pageNumber=${pageNumber}&pageSize=${pageSize}`, - headers:{ - "Authorization": paseto - } - }) - - return res.data; - } + // async function fetchAllBanks(){ + // const res = await axios({ + // method:'get', + // //@ts-ignore + // url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org-bank?pageNumber=${pageNumber}&pageSize=${pageSize}`, + // headers:{ + // "Authorization": paseto + // } + // }) + + // return res.data; + // } async function fetchBanks(){ const res = await axios({ method:'get', //@ts-ignore - url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org-bank?key=org_id&value=${currentOrg.orgId}&pageNumber=${pageNumber}&pageSize=${pageSize}&key2=status&value2=${currentFilter.id}`, + url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org-bank?orgId=${currentOrg.orgId}&pageNumber=${pageNumber}&pageSize=${pageSize}&status=${currentFilter.id}`, headers:{ "Authorization": paseto } @@ -77,8 +77,8 @@ export default function BillingsView(){ method:'patch', url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org-bank`, data:{ - key:'status', - value: statusNumber, // 0 means de-activated in db + // key:'status', + status: statusNumber, // 0 means de-activated in db id: id }, headers:{ @@ -121,11 +121,11 @@ export default function BillingsView(){ } - const allBanksQuery = useQuery({queryKey:['all-banks'], queryFn:fetchAllBanks, enabled:paseto !== '', staleTime:Infinity}) - const allBanksLength = allBanksQuery.data && allBanksQuery.data.data.length + // const allBanksQuery = useQuery({queryKey:['all-banks'], queryFn:fetchAllBanks, enabled:paseto !== '', staleTime:Infinity}) + // const allBanksLength = allBanksQuery.data && allBanksQuery.data.data.length - const banksQuery = useQuery({queryKey:['banks', currentFilter], queryFn:fetchBanks, enabled:paseto !== '' && allBanksQuery.isFetched}) + const banksQuery = useQuery({queryKey:['banks', currentFilter], queryFn:fetchBanks, enabled:paseto !== '' }) const data = banksQuery.data && banksQuery.data.data const totalLength = banksQuery.data && banksQuery.data.dataLength; @@ -257,7 +257,8 @@ export default function BillingsView(){
Billings
- { allBanksQuery.data && allBanksLength == 0? null :
+ {/* { allBanksQuery.data && allBanksLength == 0? null : */} +
{bankFilters.map(bankFilter=>( setCurrentStatus(bankFilter)} value={bankFilter.id}>{bankFilter.name} @@ -268,13 +269,16 @@ export default function BillingsView(){
-
} - { + + {/* } */} + + {/* { allBanksQuery.data && allBanksLength == 0 ? - : record.id} @@ -289,7 +293,7 @@ export default function BillingsView(){ showTotal:(total) => `Total: ${total} items`, }} /> - } + {/* } */} { isDrawerOpen @@ -360,8 +364,8 @@ const deleteDataHandler = async(record:Bank)=>{ url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org-bank`, data: { id:record.id, - key:'status', - value: "0" + // key:'status', + status: "0" }, headers:{ "Authorization": paseto diff --git a/components/Manager/Organizations/EditOrg/index.tsx b/components/Manager/Organizations/EditOrg/index.tsx index 1ee53e82..f1516eae 100644 --- a/components/Manager/Organizations/EditOrg/index.tsx +++ b/components/Manager/Organizations/EditOrg/index.tsx @@ -537,8 +537,8 @@ interface EditableProp{ console.log(logoHash) const payload = { - key:'logo_image_hash', - value: logoHash, + // key:'logo_image_hash', + logoImageHash: logoHash, //@ts-ignore id: selectedOrg.orgId } @@ -655,8 +655,8 @@ interface EditableProp{ console.log(coverImageHash) const payload = { - key:'cover_image_hash', - value: coverImageHash, + // key:'cover_image_hash', + coverImageHash: coverImageHash, id: selectedOrg.id } setUpdatedCoverImageHash(coverImageHash) diff --git a/pages/organizations/communities/communityVenues/index.tsx b/pages/organizations/communities/communityVenues/index.tsx index 541d3b7c..fb0fbe5f 100644 --- a/pages/organizations/communities/communityVenues/index.tsx +++ b/pages/organizations/communities/communityVenues/index.tsx @@ -50,18 +50,18 @@ function CommunityVenues(){ - async function fetchAllCommunityVenues(){ - const res = await axios({ - method:'get', - url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/community-venues?communityId=${currentCommunity.id}&pageNumber=${pageNumber}&pageSize=${pageSize}&status=${currentFilter.id}`, - headers:{ - "Authorization": paseto - } - }) - - return res.data; + // async function fetchAllCommunityVenues(){ + // const res = await axios({ + // method:'get', + // url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/community-venues?communityId=${currentCommunity.id}&pageNumber=${pageNumber}&pageSize=${pageSize}&status=${currentFilter.id}`, + // headers:{ + // "Authorization": paseto + // } + // }) + + // return res.data; - } + // } async function fetchCommunityVenues(){ const res = await axios({ method:'get', @@ -111,8 +111,8 @@ function CommunityVenues(){ const servicesData = res && res.data const totalLength = res && res.dataLength; - const allCommunityVenuesQuery = useQuery({queryKey:['all-communityVenues',{currentCommunity: currentCommunity.id}], queryFn:fetchAllCommunityVenues, enabled:paseto !== '', staleTime:Infinity}) - const allCommunityVenuesLength = allCommunityVenuesQuery.data && allCommunityVenuesQuery.data.dataLength; + // const allCommunityVenuesQuery = useQuery({queryKey:['all-communityVenues',{currentCommunity: currentCommunity.id}], queryFn:fetchAllCommunityVenues, enabled:paseto !== '', staleTime:Infinity}) + // const allCommunityVenuesLength = allCommunityVenuesQuery.data && allCommunityVenuesQuery.data.dataLength; @@ -244,9 +244,10 @@ function CommunityVenues(){ return (
- { servicesData && allCommunityVenuesLength === 0 + {/* { servicesData && allCommunityVenuesLength === 0 ? null - :
+ : */} +
Community Venues
@@ -266,13 +267,16 @@ function CommunityVenues(){ {/* } menu={{ items, onClick: (item)=>onLaunchButtonClick(item) }}>Launch New ... */}
-
} - { +
+ {/* } */} + + {/* { servicesData && allCommunityVenuesLength === 0 ? - :
record.id} @@ -287,7 +291,7 @@ function CommunityVenues(){ onChange={handleChange} dataSource={servicesData} /> - } + {/* } */} { isDrawerOpen diff --git a/pages/organizations/communities/index.tsx b/pages/organizations/communities/index.tsx index 1c7683d2..7d962006 100644 --- a/pages/organizations/communities/index.tsx +++ b/pages/organizations/communities/index.tsx @@ -53,20 +53,20 @@ function Communities(){ const urlPrefix = useUrlPrefix() - async function fetchAllCommunities(){ - const res = await axios({ - method:'get', - //@ts-ignore - url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/community?orgId=${currentOrg.orgId}&pageNumber=${pageNumber}&pageSize=${pageSize}&status=${currentFilter.id}`, - - headers:{ - "Authorization": paseto - } - }) - - return res.data.data; + // async function fetchAllCommunities(){ + // const res = await axios({ + // method:'get', + // //@ts-ignore + // url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/community?orgId=${currentOrg.orgId}&pageNumber=${pageNumber}&pageSize=${pageSize}&status=${currentFilter.id}`, + + // headers:{ + // "Authorization": paseto + // } + // }) + + // return res.data.data; - } + // } async function fetchCommunities(){ const res = await axios({ @@ -120,8 +120,8 @@ function Communities(){ const totalLength = 0; // @ts-ignore - const allCommunitysQuery = useQuery({queryKey:['all-communities',{currentOrg: currentOrg.orgId}], queryFn:fetchAllCommunities, enabled: paseto !== '', staleTime:Infinity}) - const allCommunitysLength = allCommunitysQuery.data && allCommunitysQuery.data.dataLength; + // const allCommunitysQuery = useQuery({queryKey:['all-communities',{currentOrg: currentOrg.orgId}], queryFn:fetchAllCommunities, enabled: paseto !== '', staleTime:Infinity}) + // const allCommunitysLength = allCommunitysQuery.data && allCommunitysQuery.data.dataLength; @@ -243,9 +243,10 @@ function gotoCommunityItemsPage(community:Community){
Communities
- {allCommunitysQuery.data && allCommunitysLength === 0 + {/* {allCommunitysQuery.data && allCommunitysLength === 0 ? null - :
+ : */} +
{/* filters */} @@ -265,14 +266,15 @@ function gotoCommunityItemsPage(community:Community){
- } + {/* } */} - { + {/* { allCommunitysQuery.data && allCommunitysLength === 0 ? - :
`Total: ${total} items`, }} /> - } + {/* } */} { isDrawerOpen diff --git a/pages/organizations/communities/staff/index.tsx b/pages/organizations/communities/staff/index.tsx index 339512eb..c1d59ba0 100644 --- a/pages/organizations/communities/staff/index.tsx +++ b/pages/organizations/communities/staff/index.tsx @@ -50,17 +50,17 @@ function CommunityStaff(){ const urlPrefix = useUrlPrefix() - async function fetchAllStaff(){ - const res = await axios({ - method:'get', - url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/staff/community?communityId=${currentCommunity.id}&pageNumber=${pageNumber}&pageSize=10`, - headers:{ - "Authorization": paseto - } - }) - - return res.data; - } + // async function fetchAllStaff(){ + // const res = await axios({ + // method:'get', + // url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/staff/community?communityId=${currentCommunity.id}&pageNumber=${pageNumber}&pageSize=10`, + // headers:{ + // "Authorization": paseto + // } + // }) + + // return res.data; + // } async function fetchStaff(){ const res = await axios({ method:'get', @@ -80,8 +80,8 @@ function CommunityStaff(){ const data = staffQuery.data && staffQuery.data.data const totalLength = staffQuery.data && staffQuery.data.dataLength; - const allStaffQuery = useQuery({queryKey:['all-community-staff'], queryFn:fetchAllStaff, enabled:paseto !== '', staleTime:Infinity}) - const allStaffLength = allStaffQuery.data && allStaffQuery.data.dataLength + // const allStaffQuery = useQuery({queryKey:['all-community-staff'], queryFn:fetchAllStaff, enabled:paseto !== '', staleTime:Infinity}) + // const allStaffLength = allStaffQuery.data && allStaffQuery.data.dataLength @@ -188,7 +188,7 @@ function CommunityStaff(){ return (
- {data && allStaffLength === 0 ? null : + {/* {data && allStaffLength === 0 ? null : */}
Staff
@@ -215,12 +215,13 @@ function CommunityStaff(){
- } + {/* } */} - { + {/* { data && allStaffLength === 0 ? setShowForm(true)}/> - :
record.id} @@ -235,7 +236,7 @@ function CommunityStaff(){ showTotal:(total) => `Total: ${total} items`, }} /> - } + {/* } */} { diff --git a/pages/organizations/events/index.tsx b/pages/organizations/events/index.tsx index bd23f5d1..42d4ecae 100644 --- a/pages/organizations/events/index.tsx +++ b/pages/organizations/events/index.tsx @@ -61,20 +61,20 @@ function Events(){ const urlPrefix = useUrlPrefix() - async function fetchAllEvents(){ - const res = await axios({ - method:'get', - //@ts-ignore - url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/events?orgId=${currentOrg.orgId}&pageNumber=${pageNumber}&pageSize=${pageSize}&status=${currentFilter.id}&type=all`, - - headers:{ - "Authorization": paseto - } - }) - - return res.data.data; + // async function fetchAllEvents(){ + // const res = await axios({ + // method:'get', + // //@ts-ignore + // url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/events?orgId=${currentOrg.orgId}&pageNumber=${pageNumber}&pageSize=${pageSize}&status=${currentFilter.id}&type=all`, + + // headers:{ + // "Authorization": paseto + // } + // }) + + // return res.data.data; - } + // } async function fetchEvents(){ const res = await axios({ @@ -128,8 +128,8 @@ function Events(){ const totalLength = 0; // @ts-ignore - const allEventsQuery = useQuery({queryKey:['all-events',{currentOrg: currentOrg.orgId}], queryFn:fetchAllEvents, enabled: paseto !== '', staleTime:Infinity}) - const allEventsLength = allEventsQuery.data && allEventsQuery.data.dataLength; + // const allEventsQuery = useQuery({queryKey:['all-events',{currentOrg: currentOrg.orgId}], queryFn:fetchAllEvents, enabled: paseto !== '', staleTime:Infinity}) + // const allEventsLength = allEventsQuery.data && allEventsQuery.data.dataLength; @@ -306,9 +306,10 @@ function gotoEventPage(event:Event){
Events
- {allEventsQuery.data && allEventsLength === 0 + {/* {allEventsQuery.data && allEventsLength === 0 ? null - :
+ : */} +
{/* filters */} @@ -324,14 +325,15 @@ function gotoEventPage(event:Event){
- } + {/* } */} - { + {/* { allEventsQuery.data && allEventsLength === 0 ? - :
`Total: ${total} items`, }} /> - } + {/* } */} { isDrawerOpen diff --git a/pages/organizations/events/staff/index.tsx b/pages/organizations/events/staff/index.tsx index 42ea9db8..54927aa9 100644 --- a/pages/organizations/events/staff/index.tsx +++ b/pages/organizations/events/staff/index.tsx @@ -42,17 +42,17 @@ export default function StaffView(){ const urlPrefix = useUrlPrefix() - async function fetchAllStaff(){ - const res = await axios({ - method:'get', - url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/staff/event?eventId=${currentEvent.id}&pageNumber=${pageNumber}&pageSize=10`, - headers:{ - "Authorization": paseto - } - }) + // async function fetchAllStaff(){ + // const res = await axios({ + // method:'get', + // url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/staff/event?eventId=${currentEvent.id}&pageNumber=${pageNumber}&pageSize=10`, + // headers:{ + // "Authorization": paseto + // } + // }) - return res.data; - } + // return res.data; + // } async function fetchStaff(){ const res = await axios({ method:'get', @@ -103,8 +103,8 @@ export default function StaffView(){ const data = staffQuery.data && staffQuery.data.data const totalLength = staffQuery.data && staffQuery.data.dataLength; - const allStaffQuery = useQuery({queryKey:['all-event-staff'], queryFn:fetchAllStaff, enabled:paseto !== '', staleTime:Infinity}) - const allStaffLength = allStaffQuery.data && allStaffQuery.data.dataLength + // const allStaffQuery = useQuery({queryKey:['all-event-staff'], queryFn:fetchAllStaff, enabled:paseto !== '', staleTime:Infinity}) + // const allStaffLength = allStaffQuery.data && allStaffQuery.data.dataLength @@ -211,7 +211,7 @@ export default function StaffView(){ return (
- {data && allStaffLength === 0 ? null : + {/* {data && allStaffLength === 0 ? null : */}
@@ -235,12 +235,13 @@ export default function StaffView(){
- } + {/* } */} - { + {/* { data && allStaffLength === 0 ? setShowForm(true)}/> - :
record.id} @@ -255,7 +256,7 @@ export default function StaffView(){ showTotal:(total) => `Total: ${total} items`, }} /> - } + {/* } */} {