Compare commits

..

6 Commits

5 changed files with 52 additions and 7 deletions
+12 -1
View File
@@ -1,16 +1,27 @@
import { useSelector } from "react-redux";
import {useEffect} from 'react'
import { useSelector, useDispatch} from "react-redux";
import Layout from "../Partials/Layout";
import CommonHead from "../UserHeader/CommonHead";
import MainSection from "./MainSection";
import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
import LoadingSpinner from "../Spinners/LoadingSpinner";
import { tableReload } from '../../store/TableReloads';
export default function MarketPlace({ commonHeadData }) {
const dispatch = useDispatch()
let { jobLists } = useSelector((state) => state.jobLists);
const marketData = jobLists?.result_list;
const categories = jobLists?.categories;
const image_server = jobLists?.session_image_server;
useEffect(()=>{
if(marketData?.length < 1 && !jobLists.loading){
dispatch(tableReload({ type: "MARKETTABLELIST" })); // reloads market page
}
},[])
return (
<>
<Layout>
+34 -3
View File
@@ -2,8 +2,27 @@ import React, { useEffect, useState } from "react";
import usersService from "../../services/UsersService";
import ConfirmNairaWithdraw from "./Popup/ConfirmNairaWithdraw";
import NairaWithdraw from "./Popup/NairaWithdraw";
import VirtualAddCardPopout from "./walletvirtual/VirtualAddCardPopout";
function WalletAction({ walletItem, payment, openPopUp }) {
// virtual add card popout
const [virtualPopup, setVirtualPopup] = useState({ show: false, data: {} });
/*OPENS the virtual add card popout*/
const openVirtualPopUp = (value) => {
setVirtualPopup({
show: true,
data: { ...value },
});
};
/*Closes the virtual add card popout*/
const closeVirtualPopUp = () => {
setVirtualPopup({ show: false, data: {} });
// dispatch(tableReload({ type: "WALLETTABLE" }));
};
const [showNairaWithdraw, setShowNairaWithdraw] = useState({
show: false,
state: {},
@@ -19,13 +38,14 @@ function WalletAction({ walletItem, payment, openPopUp }) {
<div className="w-1/2 flex justify-start items-center">
<button
onClick={() => {
setShowNairaWithdraw((prev) => ({ ...prev, show: true }));
walletItem.code == 'NAIRA' ? setShowNairaWithdraw((prev) => ({ ...prev, show: true })) : openVirtualPopUp({walletItem})
}}
className={`${
walletItem.code != "NAIRA" && "invisible"
walletItem.code != "NAIRA" && ""
} logout-btn btn-gradient text-white`}
>
Spend
{/* Spend */}
{walletItem.code == 'NAIRA' ? walletItem?.extra_actions?.SPEND_FROM_BALANCE[0]?.text : walletItem?.extra_actions?.ADD_VIRTUAL_CARD[0]?.text}
</button>
</div>
<div className="w-1/2 flex justify-end items-center">
@@ -71,6 +91,17 @@ function WalletAction({ walletItem, payment, openPopUp }) {
situation={showConfirmNairaWithdraw.show}
/>
)}
{/* VIRTUAL CARD POPOUT */}
{virtualPopup.show && (
<VirtualAddCardPopout
details={virtualPopup.data}
walletItem={walletItem}
onClose={closeVirtualPopUp}
situation={virtualPopup.show}
/>
)}
</div>
);
}
+2 -2
View File
@@ -9,11 +9,11 @@ import WalletItemCardVirtual from './walletvirtual/WalletItemCardVirtual'
export default function WalletBox({ wallet, payment, countries }) {
const { loading, data } = wallet;
// console.log('LOG', data[0]?.extra_actions?.SPEND_FROM_BALANCE[0])
// const { userDetails } = useSelector((state) => state.userDetails);
// const accountType = userDetails?.account_type === "FAMILY";
// console.log('mumu', data)
return (
<div className="my-wallet-wrapper w-full mb-10">
<div className="main-wrapper w-full">
+2 -1
View File
@@ -28,7 +28,8 @@ export default function Resources(props) {
//debugger;
// Collection Items
const CreatedSell = __resources?.marketdata?.data;
const tab_categories = __resources?.tab_categories?.data?.sort((a, b) => b.name.localeCompare(a.name))
// const tab_categories = __resources?.tab_categories?.data?.sort((a, b) => b.name.localeCompare(a.name)) // SORT REMOVED
const tab_categories = __resources?.tab_categories?.data
const collectionProducts = __resources?.collectiondata?.data;
const onSaleProducts = __resources?.marketdata?.data;
const CreatedBits = __resources?.productdata?.datas;
+2
View File
@@ -231,6 +231,8 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
getMyWalletList();
}, [walletTable, isLogin.status]);
// FUNCTION TO GET MARKET JOB LIST
useEffect(() => {
if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
return