From 8493c1bb63d16871fa20fcd43f67c6d71b5d1a08 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GBA0BK8\\Admin" Date: Sat, 18 Mar 2023 22:59:21 -0400 Subject: [PATCH] fix job cards --- src/components/Cards/ActiveJobsCard.jsx | 174 +++++---------------- src/components/MarketPlace/MainSection.jsx | 2 +- src/components/MarketPlace/index.jsx | 4 +- src/components/MyWallet/WalletHeader.jsx | 4 +- src/services/UsersService.js | 2 +- src/views/MarketPlacePage.jsx | 25 ++- 6 files changed, 68 insertions(+), 143 deletions(-) diff --git a/src/components/Cards/ActiveJobsCard.jsx b/src/components/Cards/ActiveJobsCard.jsx index 018ddd4..cfcc1cb 100644 --- a/src/components/Cards/ActiveJobsCard.jsx +++ b/src/components/Cards/ActiveJobsCard.jsx @@ -28,12 +28,18 @@ export default function ActiveJobsCard({ }`} >
+ +

+ {datas.title} +

+ +

Added

- {datas.owner} + {datas.offer_added}

@@ -44,7 +50,7 @@ export default function ActiveJobsCard({ Expires

- {datas.creator} + {datas.expire}

@@ -58,147 +64,49 @@ export default function ActiveJobsCard({ )}) 0% 0% / cover no-repeat`, }} > -
-
- {datas.isActive && ( - - Active - - )} -
-
- - - {options && ( -
setOption(!options)} - className="w-full h-screen fixed top-0 left-0 z-10" - >
- )} -
-
    -
  • setOption(!options)} - className="text-thin-light-gray tracking-wide text-xs cursor-pointer" - > -
    - - - - - - - Share - -
    -
    • -
  • setOption(!options)} - className="text-thin-light-gray tracking-wide text-xs cursor-pointer" - > -
    - - - - - - - Report - -
    -
    • -
-
-
+
+ {datas.description}
- {hidden && ( -
- - - - - - - -
- )} + + + + +
+
- {/* title */} - -

- {datas.title} -

- +
+
+ {datas.isActive && ( + + Active + + )} +
+ + +
+ +
+
+

- {datas.eth_price} + {datas.price}

- ( {datas.usd_price}) + ( {datas.offer_code})

diff --git a/src/components/MarketPlace/MainSection.jsx b/src/components/MarketPlace/MainSection.jsx index 3f8d060..923fb42 100644 --- a/src/components/MarketPlace/MainSection.jsx +++ b/src/components/MarketPlace/MainSection.jsx @@ -95,7 +95,7 @@ export default function MainSection({ className, marketPlaceProduct }) { {({ datas }) => ( diff --git a/src/components/MarketPlace/index.jsx b/src/components/MarketPlace/index.jsx index d81361f..bbbe8e4 100644 --- a/src/components/MarketPlace/index.jsx +++ b/src/components/MarketPlace/index.jsx @@ -5,12 +5,14 @@ import Layout from "../Partials/Layout"; import MainSection from "./MainSection"; export default function MarketPlace(props) { + const JobList = props.activeJobList?.result_list; + console.log("activeJobList->",props.activeJobList.result_list); const marketProduct = products.data; return ( <> - + ); diff --git a/src/components/MyWallet/WalletHeader.jsx b/src/components/MyWallet/WalletHeader.jsx index 85c4c45..46254d5 100644 --- a/src/components/MyWallet/WalletHeader.jsx +++ b/src/components/MyWallet/WalletHeader.jsx @@ -9,7 +9,7 @@ export default function WalletHeader(props) { return ( <>
+ className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px] items-center rounded-full relative bg-purple pr-1.5 pl-4">
props.handlerBalance()} className="flex items-center lg:justify-between justify-center w-full h-full" @@ -18,7 +18,7 @@ export default function WalletHeader(props) {

- $ 234,435.34 + Wallet

diff --git a/src/services/UsersService.js b/src/services/UsersService.js index 8455a30..3fc5131 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -77,7 +77,7 @@ class usersService { page:0, limit :100 }; - return this.postAuxEnd("/activejoblist", postData); + return this.postAuxEnd("/getjobsdata", postData); } getGetPendingJobs(){ diff --git a/src/views/MarketPlacePage.jsx b/src/views/MarketPlacePage.jsx index fa35c1a..90a6793 100644 --- a/src/views/MarketPlacePage.jsx +++ b/src/views/MarketPlacePage.jsx @@ -1,14 +1,29 @@ -import React from "react"; +import React, {useState, useEffect} from 'react' import MarketPlace from "../components/MarketPlace"; import usersService from "../services/UsersService"; export default function MarketPlacePage() { - const userApi = new usersService(); - const activeJobList = userApi.getActiveJobList(); - console.log("activeJobList->",activeJobList); + // const userApi = new usersService(); + // const activeJobList = userApi.getActiveJobList(); + // console.log("activeJobList->",activeJobList); + + const [marketActiveJobList, setMarketActiveJobList] = useState([]); + const api = new usersService(); + + const getMarketActiveJobList = async () => { + try { + const res = await api.getActiveJobList(); + setMarketActiveJobList(res.data); + } catch (error) { + console.log("Error getting mode"); + } + }; + useEffect(() => { + getMarketActiveJobList(); + }, []); return ( <> - + ); }