Compare commits

...

8 Commits

6 changed files with 65 additions and 18 deletions
+6 -4
View File
@@ -23,17 +23,19 @@ export default function ProductCardStyleTwo({
return ( return (
<div <div
className={`card-style-two w-full h-[336px] p-[20px] bg-white dark:bg-dark-white rounded-2xl section-shadow ${ className={`card-style-two w-full p-[20px] bg-white dark:bg-dark-white rounded-2xl section-shadow ${
className || "" className || ""
}`} }`}
> >
<div className="flex flex-col justify-between w-full h-full"> <div className="flex flex-col justify-between w-full h-full">
<div className="thumbnail-area w-full"> <div className="thumbnail-area w-full">
<div <div
className="w-full h-[236px] p-6 rounded-xl overflow-hidden" className="w-full h-[140px] p-6 rounded-lg overflow-hidden"
style={{ style={{
// background: `url(${`https://blog.wrenchboard.com/wp-content/uploads/${datas.meta_value}`}) 0% 0% / cover no-repeat`, // background: `url(${`https://blog.wrenchboard.com/wp-content/uploads/${datas.meta_value}`}) 0% 0% / cover no-repeat`,
background: `url(${`${bg}${datas.meta_value}`}) 0% 0% / cover no-repeat`, // background: `url(${`${bg}${datas.meta_value}`}) 0% 0% / cover no-repeat`,
background: `url(${`${bg}${datas.meta_value}`}) no-repeat`,
backgroundSize: '100%',
}} }}
> >
<div className="product-two-options flex justify-between mb-5 relative"> <div className="product-two-options flex justify-between mb-5 relative">
@@ -50,7 +52,7 @@ export default function ProductCardStyleTwo({
</div> </div>
<div className="details-area"> <div className="details-area">
{/* title */} {/* title */}
<Link to={`/blog-page?blog_id=${datas.ID}`} className="mb-2.5" rel="noreferrer"> <Link to={`/blog-page?blog_id=${datas.ID}`} className="py-2 mb-2.5" rel="noreferrer">
<h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize"> <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
{datas.post_title || "dummy title..."} {datas.post_title || "dummy title..."}
</h1> </h1>
+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 Layout from "../Partials/Layout";
import CommonHead from "../UserHeader/CommonHead"; import CommonHead from "../UserHeader/CommonHead";
import MainSection from "./MainSection"; import MainSection from "./MainSection";
import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb"; import CustomBreadcrumb from "../Breadcrumb/CustomBreadcrumb";
import LoadingSpinner from "../Spinners/LoadingSpinner"; import LoadingSpinner from "../Spinners/LoadingSpinner";
import { tableReload } from '../../store/TableReloads';
export default function MarketPlace({ commonHeadData }) { export default function MarketPlace({ commonHeadData }) {
const dispatch = useDispatch()
let { jobLists } = useSelector((state) => state.jobLists); let { jobLists } = useSelector((state) => state.jobLists);
const marketData = jobLists?.result_list; const marketData = jobLists?.result_list;
const categories = jobLists?.categories; const categories = jobLists?.categories;
const image_server = jobLists?.session_image_server; const image_server = jobLists?.session_image_server;
useEffect(()=>{
if(marketData?.length < 1 && !jobLists.loading){
dispatch(tableReload({ type: "MARKETTABLELIST" })); // reloads market page
}
},[])
return ( return (
<> <>
<Layout> <Layout>
+34 -3
View File
@@ -2,8 +2,27 @@ import React, { useEffect, useState } from "react";
import usersService from "../../services/UsersService"; import usersService from "../../services/UsersService";
import ConfirmNairaWithdraw from "./Popup/ConfirmNairaWithdraw"; import ConfirmNairaWithdraw from "./Popup/ConfirmNairaWithdraw";
import NairaWithdraw from "./Popup/NairaWithdraw"; import NairaWithdraw from "./Popup/NairaWithdraw";
import VirtualAddCardPopout from "./walletvirtual/VirtualAddCardPopout";
function WalletAction({ walletItem, payment, openPopUp }) { 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({ const [showNairaWithdraw, setShowNairaWithdraw] = useState({
show: false, show: false,
state: {}, state: {},
@@ -19,13 +38,14 @@ function WalletAction({ walletItem, payment, openPopUp }) {
<div className="w-1/2 flex justify-start items-center"> <div className="w-1/2 flex justify-start items-center">
<button <button
onClick={() => { onClick={() => {
setShowNairaWithdraw((prev) => ({ ...prev, show: true })); walletItem.code == 'NAIRA' ? setShowNairaWithdraw((prev) => ({ ...prev, show: true })) : openVirtualPopUp({walletItem})
}} }}
className={`${ className={`${
walletItem.code != "NAIRA" && "invisible" walletItem.code != "NAIRA" && ""
} logout-btn btn-gradient text-white`} } 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> </button>
</div> </div>
<div className="w-1/2 flex justify-end items-center"> <div className="w-1/2 flex justify-end items-center">
@@ -71,6 +91,17 @@ function WalletAction({ walletItem, payment, openPopUp }) {
situation={showConfirmNairaWithdraw.show} situation={showConfirmNairaWithdraw.show}
/> />
)} )}
{/* VIRTUAL CARD POPOUT */}
{virtualPopup.show && (
<VirtualAddCardPopout
details={virtualPopup.data}
walletItem={walletItem}
onClose={closeVirtualPopUp}
situation={virtualPopup.show}
/>
)}
</div> </div>
); );
} }
+2 -2
View File
@@ -9,11 +9,11 @@ import WalletItemCardVirtual from './walletvirtual/WalletItemCardVirtual'
export default function WalletBox({ wallet, payment, countries }) { export default function WalletBox({ wallet, payment, countries }) {
const { loading, data } = wallet; const { loading, data } = wallet;
// console.log('LOG', data[0]?.extra_actions?.SPEND_FROM_BALANCE[0])
// const { userDetails } = useSelector((state) => state.userDetails); // const { userDetails } = useSelector((state) => state.userDetails);
// const accountType = userDetails?.account_type === "FAMILY"; // const accountType = userDetails?.account_type === "FAMILY";
// console.log('mumu', data)
return ( return (
<div className="my-wallet-wrapper w-full mb-10"> <div className="my-wallet-wrapper w-full mb-10">
<div className="main-wrapper w-full"> <div className="main-wrapper w-full">
+9 -8
View File
@@ -24,10 +24,12 @@ export default function Resources(props) {
const ownProducts = products.datas; const ownProducts = products.datas;
// Resource Props // Resource Props
const __resources = props.MyResourceData; const __resources = props.MyResourceData;
//debugger; //debugger;
// Collection Items // Collection Items
const CreatedSell = __resources?.marketdata?.data; const CreatedSell = __resources?.marketdata?.data;
const tab_categories = __resources?.tab_categories?.data; // 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 collectionProducts = __resources?.collectiondata?.data;
const onSaleProducts = __resources?.marketdata?.data; const onSaleProducts = __resources?.marketdata?.data;
const CreatedBits = __resources?.productdata?.datas; const CreatedBits = __resources?.productdata?.datas;
@@ -77,23 +79,22 @@ export default function Resources(props) {
} }
}; };
useEffect(() => {
getUploadedFiles();
}, [uploadsTable]);
// const [tab, setTab] = useState(tab_categories ? tab_categories[0]?.name : ""); // const [tab, setTab] = useState(tab_categories ? tab_categories[0]?.name : "");
const [tab, setTab] = useState( const [tab, setTab] = useState(
props.activeTab props.activeTab
? props.activeTab ? props.activeTab
: tab_categories : "onsale"
? tab_categories[0]?.name
: ""
); );
const tabHandler = (value) => { const tabHandler = (value) => {
setTab(value); setTab(value);
}; };
useEffect(() => {
getUploadedFiles();
}, [uploadsTable]);
// Category Components // Category Components
const tabComponents = { const tabComponents = {
blog: <BlogTab blogdata={blogItems} />, blog: <BlogTab blogdata={blogItems} />,
+2
View File
@@ -231,6 +231,8 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
getMyWalletList(); getMyWalletList();
}, [walletTable, isLogin.status]); }, [walletTable, isLogin.status]);
// FUNCTION TO GET MARKET JOB LIST
useEffect(() => { useEffect(() => {
if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
return return