diff --git a/src/Routers.jsx b/src/Routers.jsx index 47ef7e2..e51461b 100644 --- a/src/Routers.jsx +++ b/src/Routers.jsx @@ -38,6 +38,7 @@ import AddJobPage from "./views/AddJobPage"; import MyPendingJobsPage from "./views/MyPendingJobsPage"; import ManageActiveJobs from "./views/ManageActiveJobs"; import FamilyManagePage from "./views/FamilyManagePage"; +import MyCouponPage from "./views/MyCouponPage"; export default function Routers() { return ( @@ -74,6 +75,7 @@ export default function Routers() { } /> } /> } /> + } /> } /> } /> } /> diff --git a/src/assets/images/Linkedin.png b/src/assets/images/Linkedin.png new file mode 100644 index 0000000..e835143 Binary files /dev/null and b/src/assets/images/Linkedin.png differ diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index 17e0818..c72d73b 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -3,6 +3,7 @@ import { Link, useNavigate } from "react-router-dom"; import appleLogo from "../../../assets/images/apple-black.svg"; import facebookLogo from "../../../assets/images/facebook-4.svg"; import googleLogo from "../../../assets/images/google-logo.svg"; +import linkedInLogo from "../../../assets/images/Linkedin.png"; import WrenchBoard from "../../../assets/images/wrenchboard.png"; import usersService from "../../../services/UsersService"; import InputCom from "../../Helpers/Inputs/InputCom"; @@ -232,13 +233,14 @@ export default function Login() { )} - - - +
+ + +
+
+ + +
) : ( @@ -346,7 +348,7 @@ const BrandBtn = ({ link, imgSrc, brand }) => { }; return ( -
+
) : ( <> - {name === "Tasks" && } + {name === "Tasks" && } {name === "Account" && ( )} diff --git a/src/components/FamilyAcc/FamilyTasks.jsx b/src/components/FamilyAcc/FamilyTasks.jsx new file mode 100644 index 0000000..93d03a4 --- /dev/null +++ b/src/components/FamilyAcc/FamilyTasks.jsx @@ -0,0 +1,31 @@ +import React, { useState } from "react"; +import dataImage1 from "../../assets/images/data-table-user-1.png"; +import LoadingSpinner from "../Spinners/LoadingSpinner"; +import { useNavigate, useLocation, Link } from "react-router-dom"; + +export default function FamilyTasks({ className, loader }) { + return ( +
+
+ {loader ? ( +
+ +
+ ) : ( + + + + + + + +
Yes This are my tasks
+ )} +
+
+ ); +} diff --git a/src/components/MarketPlace/index.jsx b/src/components/MarketPlace/index.jsx index 11891e6..eb4e78d 100644 --- a/src/components/MarketPlace/index.jsx +++ b/src/components/MarketPlace/index.jsx @@ -6,7 +6,7 @@ import MainSection from "./MainSection"; import CommonHead from "../UserHeader/CommonHead"; import { useSelector } from "react-redux"; -export default function MarketPlace() { +export default function MarketPlace({commonHeadData}) { let { jobLists } = useSelector((state) => state.jobLists); const marketData = jobLists?.result_list; @@ -14,7 +14,7 @@ export default function MarketPlace() { return ( <> - + diff --git a/src/components/MyActiveJobs/index.jsx b/src/components/MyActiveJobs/index.jsx index 2380e6c..35ecdf7 100644 --- a/src/components/MyActiveJobs/index.jsx +++ b/src/components/MyActiveJobs/index.jsx @@ -12,7 +12,9 @@ export default function MyActiveJobs(props) { console.log("AMEYE LOC1", props.MyJobList); return ( - +
{/* heading */} diff --git a/src/components/MyJobs/index.jsx b/src/components/MyJobs/index.jsx index c1ef1a0..1afa52c 100644 --- a/src/components/MyJobs/index.jsx +++ b/src/components/MyJobs/index.jsx @@ -12,7 +12,9 @@ export default function MyJobs(props) { console.log("AMEYE LOC1", props.MyJobList); return ( - +
{/* heading */} @@ -40,7 +42,10 @@ export default function MyJobs(props) { >
- +
diff --git a/src/components/MyPendingJobs/index.jsx b/src/components/MyPendingJobs/index.jsx index 3c40e12..8298ce6 100644 --- a/src/components/MyPendingJobs/index.jsx +++ b/src/components/MyPendingJobs/index.jsx @@ -12,7 +12,9 @@ export default function MyPendingJobs(props) { console.log("AMEYE LOC1", props.MyJobList); return ( - +
{/* heading */} diff --git a/src/components/MyTasks/index.jsx b/src/components/MyTasks/index.jsx index 39e0612..f373593 100644 --- a/src/components/MyTasks/index.jsx +++ b/src/components/MyTasks/index.jsx @@ -4,14 +4,14 @@ import Layout from "../Partials/Layout"; import MyJobTable from "./MyJobTable"; import CommonHead from "../UserHeader/CommonHead"; -export default function MyTasks() { +export default function MyTasks({commonHeadData}) { const [selectTab, setValue] = useState("today"); const filterHandler = (value) => { setValue(value); }; return ( - +
{/* heading */} diff --git a/src/components/MyWallet/MyCoupons.jsx b/src/components/MyWallet/MyCoupons.jsx new file mode 100644 index 0000000..e69de29 diff --git a/src/components/Partials/Header.jsx b/src/components/Partials/Header.jsx index 5a4590b..43c91a2 100644 --- a/src/components/Partials/Header.jsx +++ b/src/components/Partials/Header.jsx @@ -502,9 +502,9 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {

- Fullname + {`${firstname} ${lastname}`}

-

{`${firstname} ${lastname}`}

+ {/*

{`${firstname} ${lastname}`}

*/}
    diff --git a/src/components/UserHeader/CommonHead.jsx b/src/components/UserHeader/CommonHead.jsx index 987a398..2426423 100644 --- a/src/components/UserHeader/CommonHead.jsx +++ b/src/components/UserHeader/CommonHead.jsx @@ -1,7 +1,9 @@ import React from "react"; import { Link } from "react-router-dom"; -export default function CommonHead({ className }) { +export default function CommonHead({ className,commonHeadData }) { + const vvv= commonHeadData(); + console.log("UUUUUUUU-",vvv); return (
    { + console.log("COMMON HEAD DATA ----------------=====---------------------"); + return 0; + } + return ( <> - + ); } diff --git a/src/views/MyActiveJobsPage.jsx b/src/views/MyActiveJobsPage.jsx index 1350c1f..fd86b65 100644 --- a/src/views/MyActiveJobsPage.jsx +++ b/src/views/MyActiveJobsPage.jsx @@ -4,7 +4,10 @@ import usersService from "../services/UsersService"; import MyActiveJobs from "../components/MyActiveJobs"; export default function MyActiveJobsPage() { - + const commonHeadData =()=>{ + console.log("COMMON HEAD DATA ----------------=====---------------------"); + return 0; + } const [MyJobList, setMyJobList] = useState([]); const api = new usersService(); //TARGET ENDPOINT[POST]http://10.204.5.100:9083/en/wrench/api/v1/jobmanageractive @@ -23,7 +26,10 @@ export default function MyActiveJobsPage() { // debugger; return ( <> - + ); } diff --git a/src/views/MyCouponPage.jsx b/src/views/MyCouponPage.jsx new file mode 100644 index 0000000..49f2574 --- /dev/null +++ b/src/views/MyCouponPage.jsx @@ -0,0 +1,10 @@ +import React from "react"; +import WalletRoutes from "../components/MyWallet/Wallet"; + +export default function MyCouponPage() { + return ( + <> + + + ); +} diff --git a/src/views/MyJobsPage.jsx b/src/views/MyJobsPage.jsx index 6faea5e..a2a335b 100644 --- a/src/views/MyJobsPage.jsx +++ b/src/views/MyJobsPage.jsx @@ -8,6 +8,11 @@ import { useSelector } from "react-redux"; export default function MyJobsPage() { + const commonHeadData =()=>{ + console.log("COMMON HEAD DATA ----------------=====---------------------"); + return 0; + } + const {jobListTable} = useSelector((state) => state.tableReload) // const userApi = new usersService(); @@ -33,7 +38,9 @@ export default function MyJobsPage() { // debugger; return ( <> - + ); } diff --git a/src/views/MyPendingJobsPage.jsx b/src/views/MyPendingJobsPage.jsx index 653a692..3d7b4cc 100644 --- a/src/views/MyPendingJobsPage.jsx +++ b/src/views/MyPendingJobsPage.jsx @@ -5,7 +5,10 @@ import MyActiveJobs from "../components/MyActiveJobs"; import MyPendingJobs from "../components/MyPendingJobs"; export default function MyPendingJobsPage() { - + const commonHeadData =()=>{ + console.log("COMMON HEAD DATA ----------------=====---------------------"); + return 0; + } const [MyJobList, setMyJobList] = useState([]); const api = new usersService(); @@ -24,7 +27,10 @@ export default function MyPendingJobsPage() { // debugger; return ( <> - + ); } diff --git a/src/views/MyTaskPage.jsx b/src/views/MyTaskPage.jsx index 08e2af8..dd37cbd 100644 --- a/src/views/MyTaskPage.jsx +++ b/src/views/MyTaskPage.jsx @@ -7,7 +7,10 @@ export default function MyTaskPage() { const [MyActiveJobList, setMyActiveJobList] = useState([]); const api = new usersService(); - + const commonHeadData =()=>{ + console.log("COMMON HEAD DATA ----------------=====---------------------"); + return 0; + } const getMyActiveJobList = async () => { try { const res = await api.getMyActiveTaskList(); @@ -23,7 +26,8 @@ export default function MyTaskPage() { //debugger; return ( <> - + ); }