diff --git a/src/Routers.jsx b/src/Routers.jsx index 02aecd8..8ad67c0 100644 --- a/src/Routers.jsx +++ b/src/Routers.jsx @@ -28,6 +28,7 @@ import TrackingPage from "./views/TrackingPage"; import CalendarPage from "./views/CalendarPage"; import ResourcePage from "./views/ResourcePage"; import MyTaskPage from "./views/MyTaskPage"; +import MyJobsList from "./views/MyJobsList"; export default function Routers() { return ( @@ -67,6 +68,7 @@ export default function Routers() { } /> } /> } /> + } /> +
+
+

+ Products History +

+
+ +
+
+ + + + + + + + + + + + + {selectedCategory === "All Categories" ? ( + <> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ) : selectedCategory === "Explore" ? ( + <> + + + + + + + + + + + + + + + + + + + + ) : ( + <> + + + + + + + + + + + + + + + + + + + + )} + +
All ProductValueUSD24H%BitsTimeStatus
+
+
+ data +
+
+

+ Mullican Computer Joy +

+ + Owned by Xoeyam + +
+
+ 		+
+ + + + + + + + + + + + + 7473 ETH + +
+ 		+
+ + + + + + + + + + 6392.99$ + +
+ 		+ + -24.75 (11.5%) + + + + 343 + + + + 2 Hours 1 min 30s + + + +
+
+
+ data +
+
+

+ Mullican Computer Joy +

+ + Owned by Xoeyam + +
+
+ 		+
+ + + + + + + + + + + + + 7473 ETH + +
+ 		+
+ + + + + + + + + + 6392.99$ + +
+ 		+ + -24.75 (11.5%) + + + + 343 + + + + 2 Hours 1 min 30s + + + +
+
+
+ data +
+
+

+ Mullican Computer Joy +

+ + Owned by Xoeyam + +
+
+ 		+
+ + + + + + + + + + + + + 7473 ETH + +
+ 		+
+ + + + + + + + + + 6392.99$ + +
+ 		+ + -24.75 (11.5%) + + + + 343 + + + + 2 Hours 1 min 30s + + + +
+
+
+ data +
+
+

+ Mullican Computer Joy +

+ + Owned by Xoeyam + +
+
+ 		+
+ + + + + + + + + + + + + 7473 ETH + +
+ 		+
+ + + + + + + + + + 6392.99$ + +
+ 		+ + -24.75 (11.5%) + + + + 343 + + + + 2 Hours 1 min 30s + + + +
+
+
+ data +
+
+

+ Mullican Computer Joy +

+ + Owned by Xoeyam + +
+
+ 		+
+ + + + + + + + + + + + + 7473 ETH + +
+ 		+
+ + + + + + + + + + 6392.99$ + +
+ 		+ + -24.75 (11.5%) + + + + 343 + + + + 2 Hours 1 min 30s + + + +
+
+
+ data +
+
+

+ Mullican Computer Joy +

+ + Owned by Xoeyam + +
+
+ 		+
+ + + + + + + + + + + + + 7473 ETH + +
+ 		+
+ + + + + + + + + + 6392.99$ + +
+ 		+ + -24.75 (11.5%) + + + + 343 + + + + 2 Hours 1 min 30s + + + +
+
+
+ data +
+
+

+ Mullican Computer Joy +

+ + Owned by Xoeyam + +
+
+ 		+
+ + + + + + + + + + + + + 7473 ETH + +
+ 		+
+ + + + + + + + + + 6392.99$ + +
+ 		+ + -24.75 (11.5%) + + + + 343 + + + + 2 Hours 1 min 30s + + + +
+
+
+ data +
+
+

+ Mullican Computer Joy +

+ + Owned by Xoeyam + +
+
+ 		+
+ + + + + + + + + + + + + 7473 ETH + +
+ 		+
+ + + + + + + + + + 6392.99$ + +
+ 		+ + -24.75 (11.5%) + + + + 343 + + + + 2 Hours 1 min 30s + + + +
+
+ + ); +} diff --git a/src/components/MyJobs/index.jsx b/src/components/MyJobs/index.jsx new file mode 100644 index 0000000..cc65a9f --- /dev/null +++ b/src/components/MyJobs/index.jsx @@ -0,0 +1,40 @@ +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"; + +export default function MyJobs() { + const [selectTab, setValue] = useState("today"); + const filterHandler = (value) => { + setValue(value); + }; + return ( + + +
+
+ {/* heading */} +
+
+

+ + My Tasks + + +

+
+
+
filterHandler("today")} className="relative"> + +
+
+
+ +
+
+ + ); +} diff --git a/src/components/MyWallet/WalletHeader.jsx b/src/components/MyWallet/WalletHeader.jsx index 31bcb5e..1c19632 100644 --- a/src/components/MyWallet/WalletHeader.jsx +++ b/src/components/MyWallet/WalletHeader.jsx @@ -33,7 +33,7 @@ export default function WalletHeader(props) { >

- Your Balance + Wallet

@@ -61,7 +61,7 @@ export default function WalletHeader(props) { {value.amount*0.01} {value.code}

- (773.69 USD) + {/*(773.69 USD)*/}

@@ -169,20 +169,20 @@ export default function WalletHeader(props) { type="button" className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white" > - Add Money + Manage -
-
-

- $ 234,435.34 -

-
-
+ {/**/} + {/*
*/} + {/*

*/} + {/* $ 234,435.34*/} + {/*

*/} + {/*
*/} + {/**/}
); } diff --git a/src/components/Partials/Sidebar.jsx b/src/components/Partials/Sidebar.jsx index 016a457..38a58e8 100644 --- a/src/components/Partials/Sidebar.jsx +++ b/src/components/Partials/Sidebar.jsx @@ -249,7 +249,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
  • (navData.isActive ? "active" : ""), sidebar ? "justify-start space-x-3.5" : "justify-center") diff --git a/src/services/UsersService.js b/src/services/UsersService.js index a16e080..6f8e0b6 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -96,6 +96,17 @@ class usersService { return this.postAuxEnd("/getjobsdata", postData); } + getMyJobList(){ + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page:0, + limit :100 + }; + return this.postAuxEnd("/myjobs", postData); + } + getGetPendingJobs(){ var postData = { uuid: localStorage.getItem("uid"), diff --git a/src/views/MyJobsList.jsx b/src/views/MyJobsList.jsx new file mode 100644 index 0000000..d839d7a --- /dev/null +++ b/src/views/MyJobsList.jsx @@ -0,0 +1,17 @@ +import React from "react"; +// import MyTasks from "../components/MyTasks"; +// import UsersService from "../services/UsersService"; +import usersService from "../services/UsersService"; +import MyJobs from "../components/MyJobs"; + +export default function MyTaskPage() { + + const userApi = new usersService(); + const activeJobList = userApi.getMyJobList(); + debugger; + return ( + <> + + + ); +}