From e112c7776b5b406084947ec2dc13755d8d96e549 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 21 May 2023 21:26:49 -0400 Subject: [PATCH 1/4] Common head data --- src/Routers.jsx | 2 ++ src/components/MarketPlace/index.jsx | 4 ++-- src/components/MyActiveJobs/index.jsx | 4 +++- src/components/MyJobs/index.jsx | 9 +++++++-- src/components/MyPendingJobs/index.jsx | 4 +++- src/components/MyTasks/index.jsx | 4 ++-- src/components/MyWallet/MyCoupons.jsx | 0 src/components/UserHeader/CommonHead.jsx | 4 +++- src/views/MarketPlacePage.jsx | 9 ++++++++- src/views/MyActiveJobsPage.jsx | 10 ++++++++-- src/views/MyCouponPage.jsx | 10 ++++++++++ src/views/MyJobsPage.jsx | 9 ++++++++- src/views/MyPendingJobsPage.jsx | 10 ++++++++-- src/views/MyTaskPage.jsx | 8 ++++++-- 14 files changed, 70 insertions(+), 17 deletions(-) create mode 100644 src/components/MyWallet/MyCoupons.jsx create mode 100644 src/views/MyCouponPage.jsx 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/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/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 ( <> - + ); } From e56eac3ae13bef3dce2ccf032d74600a5d0a22bb Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Mon, 22 May 2023 09:35:19 +0100 Subject: [PATCH 2/4] login rearranged with linkedin login btn addition --- src/assets/images/Linkedin.png | Bin 0 -> 958 bytes src/components/AuthPages/Login/index.jsx | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 src/assets/images/Linkedin.png diff --git a/src/assets/images/Linkedin.png b/src/assets/images/Linkedin.png new file mode 100644 index 0000000000000000000000000000000000000000..e8351436f2d045d65f9b1a0510f592b8b687ea70 GIT binary patch literal 958 zcmV;v13~1J&H!?@cBs$9+UkL?(*Sn2D~P~3i^06r=xw3Qo33EJ0009SNkl`FoIsJN^D|6iWs9U48zo~E5MeZTCCW#Ji;Hfd~R(M@TU)Eh>k zO`TNf{lV<|H!nbO02%}UuAsO|_3GDi@0lr9N1LJ&m-p+_3NNbe1Nk0MZ7f@df~)Dj{H_Xr-m z1#C|0y+5HZs0u|mQqG7Iia?rax0o}eq(Oow2*QCjPN}s)uqV!(z?c*}^4tw3i*!z1 zh&nU$k2O;C4hXaqJ6x=hmm6n$Z!TN*&06Vr=k0jQ8}uKDtFyS9*{mNgS#jv9uIrO6 zm&@wwAWgyh@!QM=rB>B*q|K@?ElG)7oM5J(6FKrCSoVU0y$jwJQ=5YR77urF8aA(YsiF@Lm&aKP@&kyY9r0-B0o zmE?dB5CTF#2nYcoAOwVf5D)@FKnMr{As_?|vHL@TNnwC6h-SVJ;&4V^R51JW0XzBE!vDJh2ULTsAJ!tjzq2b+!w*Sb3 gA3qr6>?a`p0M5TNyW|tR7XSbN07*qoM6N<$f*NAGy#N3J literal 0 HcmV?d00001 diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index b67f13a..823b680 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 ( -
+

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

-

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

+ {/*

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

*/}
    From e96b9475ce59442c2c5e032081bdef5f1b46e8fa Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Mon, 22 May 2023 10:54:08 -0400 Subject: [PATCH 4/4] Family Tasks --- src/components/FamilyAcc/FamilyManageTabs.jsx | 3 +- src/components/FamilyAcc/FamilyTasks.jsx | 31 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 src/components/FamilyAcc/FamilyTasks.jsx diff --git a/src/components/FamilyAcc/FamilyManageTabs.jsx b/src/components/FamilyAcc/FamilyManageTabs.jsx index 9c1760b..590af79 100644 --- a/src/components/FamilyAcc/FamilyManageTabs.jsx +++ b/src/components/FamilyAcc/FamilyManageTabs.jsx @@ -9,6 +9,7 @@ import LoadingSpinner from "../Spinners/LoadingSpinner"; import cover from "../../assets/images/profile-info-cover.png"; import profile from "../../assets/images/profile-info-profile.png"; import usersService from "../../services/UsersService"; +import FamilyTasks from "./FamilyTasks"; export default function FamilyManageTabs({ className, @@ -130,7 +131,7 @@ export default function FamilyManageTabs({ ) : ( <> - {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
    + )} +
    +
    + ); +}