diff --git a/src/assets/images/no-task-background.jpg b/src/assets/images/no-task-background.jpg new file mode 100644 index 0000000..fc39357 Binary files /dev/null and b/src/assets/images/no-task-background.jpg differ diff --git a/src/components/Cards/HomeBannerOffersCard.jsx b/src/components/Cards/HomeBannerOffersCard.jsx index dce12dd..18383ac 100644 --- a/src/components/Cards/HomeBannerOffersCard.jsx +++ b/src/components/Cards/HomeBannerOffersCard.jsx @@ -1,7 +1,5 @@ import React, { useEffect, useState } from "react"; import { Link } from "react-router-dom"; -import localImgLoad from "../../lib/localImgLoad"; -import bannerImage from "../../assets/images/banner-coupons.jpg"; export default function HomeBannerOffersCard(props) { const [imageUrl, setImageUrl] = useState(""); diff --git a/src/components/MyTasks/MyJobTable.jsx b/src/components/MyTasks/MyJobTable.jsx index da369d1..67cadb8 100644 --- a/src/components/MyTasks/MyJobTable.jsx +++ b/src/components/MyTasks/MyJobTable.jsx @@ -1,60 +1,55 @@ -import React, { useCallback, useEffect, useMemo, useState } from "react"; +import { useState } from "react"; import dataImage1 from "../../assets/images/data-table-user-1.png"; - import PaginatedList from "../Pagination/PaginatedList"; import { handlePagingFunc } from "../Pagination/HandlePagination"; -import usersService from "../../services/UsersService"; import LoadingSpinner from "../Spinners/LoadingSpinner"; +import { useNavigate, useLocation } from "react-router-dom"; -import {useNavigate, useLocation} from 'react-router-dom' +const noTasksBg = require("../../assets/images/no-task-background.jpg"); export default function MyJobTable({ className, ActiveJobList }) { - let navigate = useNavigate() - let {pathname} = useLocation() - - // const [tasksData, setTasksData] = useState(null); - // const [loader, setLoader] = useState(false); - - // let apiCall = useMemo(() => new usersService(), []); - - // const displayTasks = useCallback(async () => { - // try { - // const res = await apiCall.getMyActiveTaskList(); - // let { - // data: { result_list }, - // internal_return, - // statusText, - // } = await res; - // if (internal_return < 0 || statusText !== "OK") return; - // setTasksData(result_list); - // setLoader(false); - // } catch (error) { - // throw new Error(error); - // } - // }, [apiCall]); - - // useEffect(() => { - // displayTasks(); - // }, []); + let navigate = useNavigate(); + let { pathname } = useLocation(); const [currentPage, setCurrentPage] = useState(0); const indexOfFirstItem = Number(currentPage); const indexOfLastItem = Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE); - const currentTask = ActiveJobList?.data?.slice(indexOfFirstItem, indexOfLastItem); + const currentTask = ActiveJobList?.data?.slice( + indexOfFirstItem, + indexOfLastItem + ); const handlePagination = (e) => { handlePagingFunc(e, setCurrentPage); }; + // To navigate to task + const [btnLoader, setBtnLoader] = useState(false); + const navigateMarket = () => { + setBtnLoader(true); + setTimeout(() => { + navigate("/market", { replace: true }); + setBtnLoader(false); + }, 2500); + }; + return (
+ {!ActiveJobList?.data.length && ( +
+ )} {ActiveJobList.loading ? ( -
+
) : ( @@ -117,7 +112,7 @@ export default function MyJobTable({ className, ActiveJobList }) { type="button" onClick={() => { navigate("/manage-active-job", { - state: {...task, pathname}, + state: { ...task, pathname }, }); }} className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white" @@ -127,23 +122,27 @@ export default function MyJobTable({ className, ActiveJobList }) {
)) - ) - : - ( - ActiveJobList.status ? -
-
- No Tasks! + ) : ActiveJobList.status ? ( +
+
+ You currently have "0" task
+
- : -
-

- Error Occurred! Unable to display Tasks! -

-
- ) - } + ) : ( +
+

Error Occurred! Unable to display Tasks!

+
+ )}
{/* PAGINATION BUTTON */} @@ -166,5 +165,3 @@ export default function MyJobTable({ className, ActiveJobList }) {
); } - -/* */