From e8ed10ddbf37cc5777b3aca51fde7595079bcc96 Mon Sep 17 00:00:00 2001 From: Ebube Date: Fri, 30 Jun 2023 13:28:44 +0100 Subject: [PATCH 1/2] Added link to Family Market --- src/components/MyTasks/MyJobTable.jsx | 4 ++-- src/components/MyTasks/index.jsx | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/MyTasks/MyJobTable.jsx b/src/components/MyTasks/MyJobTable.jsx index 0f178c5..775a694 100644 --- a/src/components/MyTasks/MyJobTable.jsx +++ b/src/components/MyTasks/MyJobTable.jsx @@ -8,7 +8,7 @@ import { PriceFormatter } from "../Helpers/PriceFormatter"; const noTasksBg = require("../../assets/images/no-task-background.jpg"); -export default function MyJobTable({ className, ActiveJobList }) { +export default function MyJobTable({ className, ActiveJobList, Account }) { let navigate = useNavigate(); let { pathname } = useLocation(); @@ -30,7 +30,7 @@ export default function MyJobTable({ className, ActiveJobList }) { const navigateMarket = () => { setBtnLoader(true); setTimeout(() => { - navigate("/market", { replace: true }); + navigate(Account == "FULL" ? "/market" : "/", { replace: true }); setBtnLoader(false); }, 2500); }; diff --git a/src/components/MyTasks/index.jsx b/src/components/MyTasks/index.jsx index 4a2a5e1..7e1a4b3 100644 --- a/src/components/MyTasks/index.jsx +++ b/src/components/MyTasks/index.jsx @@ -3,14 +3,18 @@ import { Link } from "react-router-dom"; import Layout from "../Partials/Layout"; import MyJobTable from "./MyJobTable"; import CommonHead from "../UserHeader/CommonHead"; -import TopSellerTopBuyerSliderSection from "../Home/TopSellerTopBuyerSliderSection"; import MyOffersTable from "./MyOffersTable"; +import { useSelector } from "react-redux"; export default function MyTasks({ MyActiveOffersList, ActiveJobList, commonHeadData, }) { + const { userDetails: account_type } = useSelector( + (state) => state?.userDetails + ); + const [selectTab, setValue] = useState("today"); const filterHandler = (value) => { setValue(value); @@ -45,7 +49,7 @@ export default function MyTasks({ className="mb-10" /> )} - + From 5a0d8aebdbb1ca603d3b96d21e4508ed6583fa61 Mon Sep 17 00:00:00 2001 From: Ebube Date: Fri, 30 Jun 2023 13:48:52 +0100 Subject: [PATCH 2/2] 1280 width fixed --- src/components/Home/HomeSliders.jsx | 3 +-- src/components/MyTasks/index.jsx | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/Home/HomeSliders.jsx b/src/components/Home/HomeSliders.jsx index d46f8d2..fcbd89b 100644 --- a/src/components/Home/HomeSliders.jsx +++ b/src/components/Home/HomeSliders.jsx @@ -3,11 +3,10 @@ import slider2 from "../../assets/images/slider-2.jpg"; import HomeBannerOffersCard from "../Cards/HomeBannerOffersCard"; export default function HomeSliders(props) { - // console.log("BANNER LIST IN HomeSliders->", props.bannerList); // debugger; return ( <> -
+
{props.bannerList?.length <= 0 && ( diff --git a/src/components/MyTasks/index.jsx b/src/components/MyTasks/index.jsx index 7e1a4b3..ddcba34 100644 --- a/src/components/MyTasks/index.jsx +++ b/src/components/MyTasks/index.jsx @@ -1,8 +1,8 @@ import React, { useState } from "react"; -import { Link } from "react-router-dom"; import Layout from "../Partials/Layout"; import MyJobTable from "./MyJobTable"; import CommonHead from "../UserHeader/CommonHead"; +// import TopSellerTopBuyerSliderSection from "../Home/TopSellerTopBuyerSliderSection"; import MyOffersTable from "./MyOffersTable"; import { useSelector } from "react-redux";