Redirecting ...
+ )
+}
+
+export default Redirect
\ No newline at end of file
diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx
index 83a7e62..c8a5c2b 100644
--- a/src/components/AuthPages/Login/index.jsx
+++ b/src/components/AuthPages/Login/index.jsx
@@ -130,17 +130,11 @@ export default function Login() {
flow: 'auth-code',
ux_mode:'redirect',
redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
- onSuccess: async (tokenResponse) => {
- console.log(tokenResponse);
- // const userInfo = await axios.get(
- // 'https://www.googleapis.com/oauth2/v3/userinfo',
- // { headers: { Authorization: `Bearer ${tokenResponse.access_token}` } },
- // );
- // console.log(userInfo);
+ onSuccess: async (codeResponse) => {
+ console.log(codeResponse);
},
onError: (errorResponse) => console.log(errorResponse),
});
- console.log(process.env.REACT_APP_GOOGLE_CLIENT_ID, process.env.REACT_APP_GOOGLE_REDIRECT_URL)
useEffect(() => {
setMail("");
diff --git a/src/components/MyTasks/MyJobTable.jsx b/src/components/MyTasks/MyJobTable.jsx
index d0dcad6..2393e31 100644
--- a/src/components/MyTasks/MyJobTable.jsx
+++ b/src/components/MyTasks/MyJobTable.jsx
@@ -128,11 +128,11 @@ export default function MyJobTable({ className }) {
))
) : (
-
+
No Tasks!
-
+ {
+ setOfferPopout({ show: false, data: {} });
+ }}
+ situation={offerPopout.show}
+ />
+ )}
+ {/* End of Offer Job Popout */}
+
+
+
+ );
+}
diff --git a/src/components/MyTasks/index.jsx b/src/components/MyTasks/index.jsx
index f373593..9eea234 100644
--- a/src/components/MyTasks/index.jsx
+++ b/src/components/MyTasks/index.jsx
@@ -3,8 +3,10 @@ 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";
-export default function MyTasks({commonHeadData}) {
+export default function MyTasks({MyActiveOffersList, commonHeadData}) {
const [selectTab, setValue] = useState("today");
const filterHandler = (value) => {
setValue(value);
@@ -32,6 +34,9 @@ export default function MyTasks({commonHeadData}) {
>
+
+
+
+ {/* Offer Job Popout */}
+ {offerPopout.show && (
+
+
+
+
+
+
+ + Offers +
+
+
+
+
+
+
+
+ {MyActiveOffersList &&
+ MyActiveOffersList?.result_list?.length > 0 &&
+ MyActiveOffersList.result_list.map((value, index) => (
+
+
+
+
+
+ {/* title */}
+
+ ))}
+
+
+
+ {/*
+
+ {/* username */}
+ + {value.title} +
+
+
+ {/* items */}
+ + {value.timeline_days} Days +
+
+
+
+
+ {value.price*0.01} {value.currency}
+
+ */}
+ {/* /!* img *!/*/}
+ {/*
*/}
+ {/* */}
+ {/*
*/}
+ {/* /!* title *!/*/}
+ {/* */}
+ {/* 
*/}
+ {/*
*/}
+ {/* */}
+ {/* */}
+ {/*
*/}
+ {/* */}
+ {/*
*/}
+ {/* /!* username *!/*/}
+ {/* */} + {/* Brokln Simons*/} + {/*
*/} + {/**/}
+ {/*
*/}
+ {/* /!* items *!/*/}
+ {/* */} + {/* @broklinslam_75*/} + {/*
*/} + {/**/}
+ {/*
*/}
+ {/* */}
+ {/**/}
+ {/* */}
+ {/* */}
+ {/* 3435 Items*/}
+ {/*
*/}
+ {/* */}
+ {/* /!* img *!/*/}
+ {/*
*/}
+ {/* */}
+ {/*
*/}
+ {/* /!* title *!/*/}
+ {/* */}
+ {/* 
*/}
+ {/*
*/}
+ {/* */}
+ {/* */}
+ {/*
*/}
+ {/* */}
+ {/*
*/}
+ {/* /!* username *!/*/}
+ {/* */} + {/* Brokln Simons*/} + {/*
*/} + {/**/}
+ {/*
*/}
+ {/* /!* items *!/*/}
+ {/* */} + {/* @broklinslam_75*/} + {/*
*/} + {/**/}
+ {/*
*/}
+ {/* */}
+ {/**/}
+ {/* */}
+ {/* */}
+ {/* 3435 Items*/}
+ {/*
*/}
+ {/* */}
+ {/* /!* img *!/*/}
+ {/*
*/}
+ {/* */}
+ {/*
*/}
+ {/* /!* title *!/*/}
+ {/* */}
+ {/* 
*/}
+ {/*
*/}
+ {/* */}
+ {/* */}
+ {/*
*/}
+ {/* */}
+ {/*
*/}
+ {/* /!* username *!/*/}
+ {/* */} + {/* Brokln Simons*/} + {/*
*/} + {/**/}
+ {/*
*/}
+ {/* /!* items *!/*/}
+ {/* */} + {/* @broklinslam_75*/} + {/*
*/} + {/**/}
+ {/*
*/}
+ {/* */}
+ {/**/}
+ {/* */}
+ {/* */}
+ {/* 3435 Items*/}
+ {/*
*/}
+ {/* */}
+ {/* /!* img *!/*/}
+ {/*
*/}
+ */}
+ {/*
*/}
+ {/* /!* title *!/*/}
+ {/* */}
+ {/* */}
+ {/*
*/}
+ {/* */}
+ {/* */}
+ {/*
*/}
+ {/* */}
+ {/*
*/}
+ {/* /!* username *!/*/}
+ {/* */} + {/* Brokln Simons*/} + {/*
*/} + {/**/}
+ {/*
*/}
+ {/* /!* items *!/*/}
+ {/* */} + {/* @broklinslam_75*/} + {/*
*/} + {/**/}
+ {/*
*/}
+ {/* */}
+ {/**/}
+ {/* */}
+ {/* */}
+ {/* 3435 Items*/}
+ {/*
*/}
+ {/*
+ {/* menus item */}
+
+ )}
+
{userDetails?.account_type !== "FAMILY" && (
<>
{!userDetails?.post_jobs ? (
diff --git a/src/components/Partials/Sidebar.jsx b/src/components/Partials/Sidebar.jsx
index a1b605b..d2cb1fd 100644
--- a/src/components/Partials/Sidebar.jsx
+++ b/src/components/Partials/Sidebar.jsx
@@ -4,7 +4,7 @@ import { NavLink } from "react-router-dom";
import {
default as logo,
default as logo3,
-} from "../../assets/images/wrenchboard.png"; //logo-2.svg";
+} from "../../assets/images/wrenchboard.png";
import DarkModeContext from "../Contexts/DarkModeContext";
import Icons from "../Helpers/Icons";
diff --git a/src/components/jobPopout/OfferJobPopout.jsx b/src/components/jobPopout/OfferJobPopout.jsx
new file mode 100644
index 0000000..c1e010b
--- /dev/null
+++ b/src/components/jobPopout/OfferJobPopout.jsx
@@ -0,0 +1,117 @@
+import React from 'react'
+import Detail from './popoutcomponent/Detail'
+import ModalCom from '../Helpers/ModalCom'
+
+
+function OfferJobPopout({details, onClose, situation}) {
+ return (
+
+
+
+
+
+
+ + Family +
+-
+
+
+
+
+ + Start Task +
+ +
+
+
+ {/* close button */}
+
+
+
+ {/* ACTION SECTION */}
+ Opportunity to make some money by introducing 10 of our recent stories from our
+ + {/* INPUT SECTION */} +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {/* end of close button */}
+