From da24c8a5352602e75b6f69eb052bb46dce9ac2fe Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Mon, 29 May 2023 14:47:08 -0400 Subject: [PATCH 1/8] History tabnles --- .../MyWallet/WalletComponent/PurchasesTable.jsx | 8 ++++---- .../MyWallet/WalletComponent/RecentActivityTable.jsx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx index 58fdc74..93d2a22 100644 --- a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx +++ b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx @@ -19,8 +19,7 @@ function PurchasesTable({purchase}) { - - + @@ -30,8 +29,9 @@ function PurchasesTable({purchase}) { {currentPurchase.map((item, index) => ( - - + diff --git a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx index 3dfee83..8d3fc87 100644 --- a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx +++ b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx @@ -20,9 +20,9 @@ function RecentActivityTable({payment}) { - + - + {payment.data.length ? From 02d29023d909f8f3cb25b45b3811e082cb24a604 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Mon, 29 May 2023 19:50:49 +0100 Subject: [PATCH 2/8] made cancel btn to close the popout modal --- src/components/jobPopout/OfferJobPopout.jsx | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/components/jobPopout/OfferJobPopout.jsx b/src/components/jobPopout/OfferJobPopout.jsx index 10f3c5d..639f354 100644 --- a/src/components/jobPopout/OfferJobPopout.jsx +++ b/src/components/jobPopout/OfferJobPopout.jsx @@ -33,10 +33,6 @@ function OfferJobPopout({details, onClose, situation}) { setRequestStatus({loading: true, status: false, message: '', trigger: 'reject'}) reqData.offer_result = 333 } - if(name == 'cancel'){ - setRequestStatus({loading: true, status: false, message: '', trigger: 'cancel'}) - reqData.offer_result = 222 - } // API CALL apiUrl.offersResponse(reqData).then(response => { @@ -191,19 +187,14 @@ function OfferJobPopout({details, onClose, situation}) { {/* close button */}
- {requestStatus.loading && requestStatus.trigger == 'cancel' ? - - : - - }
{/* end of close button */} From 7d3d5eb8c2e341621b033fc6411eab141f82fa13 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Mon, 29 May 2023 14:56:56 -0400 Subject: [PATCH 3/8] Hx page --- .../MyWallet/WalletComponent/PurchasesTable.jsx | 2 +- .../MyWallet/WalletComponent/RecentActivityTable.jsx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx index 93d2a22..1295ec5 100644 --- a/src/components/MyWallet/WalletComponent/PurchasesTable.jsx +++ b/src/components/MyWallet/WalletComponent/PurchasesTable.jsx @@ -29,7 +29,7 @@ function PurchasesTable({purchase}) { {currentPurchase.map((item, index) => ( - diff --git a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx index 8d3fc87..1e1a842 100644 --- a/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx +++ b/src/components/MyWallet/WalletComponent/RecentActivityTable.jsx @@ -20,8 +20,8 @@ function RecentActivityTable({payment}) { - - + + @@ -31,8 +31,8 @@ function RecentActivityTable({payment}) { {currentActivity.map((item, index) => ( - - + + ))} From d1e9c21dbb92625439fee032fae5634022bd378b Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Mon, 29 May 2023 20:03:13 +0100 Subject: [PATCH 4/8] Button display name changed --- src/components/jobPopout/OfferJobPopout.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/jobPopout/OfferJobPopout.jsx b/src/components/jobPopout/OfferJobPopout.jsx index 639f354..ad4a8d8 100644 --- a/src/components/jobPopout/OfferJobPopout.jsx +++ b/src/components/jobPopout/OfferJobPopout.jsx @@ -193,7 +193,7 @@ function OfferJobPopout({details, onClose, situation}) { type="button" className=" border-gradient text-18 tracking-wide px-2 py-2 rounded-full" > - Close + Cancel {/* end of close button */} From b7b09fca66c3bf09ffd86208f15480d5a9e789d0 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Mon, 29 May 2023 20:36:42 +0100 Subject: [PATCH 5/8] button style changed --- src/components/jobPopout/OfferJobPopout.jsx | 8 ++++---- src/components/jobPopout/PendingJobsPopout.jsx | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/jobPopout/OfferJobPopout.jsx b/src/components/jobPopout/OfferJobPopout.jsx index ad4a8d8..43e38f2 100644 --- a/src/components/jobPopout/OfferJobPopout.jsx +++ b/src/components/jobPopout/OfferJobPopout.jsx @@ -91,7 +91,7 @@ function OfferJobPopout({details, onClose, situation}) {
-

Opportunity to make some money by introducing 10 of our recent stories from our

+

{details.title}

{/* INPUT SECTION */}
@@ -148,7 +148,7 @@ function OfferJobPopout({details, onClose, situation}) { name='accept' onClick={handleOffer} disabled={requestStatus.loading} - className='px-2 py-1 text-sm text-white btn-gradient tracking-wide rounded-md'> + className='px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white'> Accept Offer } @@ -162,7 +162,7 @@ function OfferJobPopout({details, onClose, situation}) { name='reject' onClick={handleOffer} disabled={requestStatus.loading} - className='px-2 py-1 text-sm text-white bg-red-500 hover:opacity-90 rounded-md'> + className='px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white'> Reject Offer } @@ -191,7 +191,7 @@ function OfferJobPopout({details, onClose, situation}) { onClick={onClose} disabled={requestStatus.loading} type="button" - className=" border-gradient text-18 tracking-wide px-2 py-2 rounded-full" + className="border-gradient text-18 tracking-wide px-2 py-2 rounded-full" > Cancel diff --git a/src/components/jobPopout/PendingJobsPopout.jsx b/src/components/jobPopout/PendingJobsPopout.jsx index 2e09051..ed55f5b 100644 --- a/src/components/jobPopout/PendingJobsPopout.jsx +++ b/src/components/jobPopout/PendingJobsPopout.jsx @@ -39,7 +39,7 @@ function PendingJobsPopout({details, onClose, situation}) {
-

Opportunity to make some money by introducing 10 of our recent stories from our

+

{details.title}

!
@@ -110,15 +110,15 @@ function PendingJobsPopout({details, onClose, situation}) {
- +
- +
- +
From f4e5ba1586f36ea5b229aa2be34343407fe9d286 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Mon, 29 May 2023 20:53:17 +0100 Subject: [PATCH 6/8] reverted offerlist to display only when there is offer --- src/components/MyTasks/MyOffersTable.jsx | 31 +++++------------------- src/views/MyTaskPage.jsx | 8 +++--- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/src/components/MyTasks/MyOffersTable.jsx b/src/components/MyTasks/MyOffersTable.jsx index 562045f..e3cd4db 100644 --- a/src/components/MyTasks/MyOffersTable.jsx +++ b/src/components/MyTasks/MyOffersTable.jsx @@ -50,9 +50,9 @@ export default function MyOffersTable({ className, MyActiveOffersList}) { // } }; -// if ( !MyActiveOffersList || MyActiveOffersList?.result_list?.length == 0 ){ -// return(''); // want blank or no appear when no items -// } + if ( !MyActiveOffersList || MyActiveOffersList?.result_list?.length == 0 ){ + return(''); // want blank or no appear when no items + } return ( <> @@ -113,11 +113,9 @@ export default function MyOffersTable({ className, MyActiveOffersList}) {
- { MyActiveOffersList.loading ? - - : - MyActiveOffersList?.data?.length > 0 ? - MyActiveOffersList.data.map((value, index) => ( + { + MyActiveOffersList && MyActiveOffersList?.result_list?.length > 0 && + MyActiveOffersList?.result_list?.map((value, index) => (
{/* title */} @@ -155,23 +153,6 @@ export default function MyOffersTable({ className, MyActiveOffersList}) {
)) - : - MyActiveOffersList.status ? - ( -
-
- No Tasks! -
-
- ) - : - ( -
-

- Error Occurred! Unable to display Tasks! -

-
- ) } diff --git a/src/views/MyTaskPage.jsx b/src/views/MyTaskPage.jsx index 8b5ac2b..68840c1 100644 --- a/src/views/MyTaskPage.jsx +++ b/src/views/MyTaskPage.jsx @@ -9,7 +9,7 @@ export default function MyTaskPage() { const {jobListTable} = useSelector((state) => state.tableReload) const [MyActiveJobList, setMyActiveJobList] = useState({loading: true, status:false, data:[]}); - const [MyActiveOffersList, setMyActiveOffersList] = useState({loading: true, status:false, data:[]}); + const [MyActiveOffersList, setMyActiveOffersList] = useState([]); const api = new usersService(); const commonHeadData =()=>{ console.log("COMMON HEAD DATA ----------------=====---------------------"); @@ -26,12 +26,12 @@ export default function MyTaskPage() { } }; const getMyActiveOffersList = async () => { - setMyActiveOffersList({loading: true, status:false, data:[]}); + // setMyActiveOffersList({loading: true, status:false, data:[]}); try { const res = await api.getOffersList(); - setMyActiveOffersList({loading: false, status:true, data:res.data.result_list}); + setMyActiveOffersList(res.data); } catch (error) { - setMyActiveOffersList({loading: false, status:false, data:[]}); + // setMyActiveOffersList({loading: false, status:false, data:[]}); console.log("Error getting offers"); } }; From 4d9f0adf0caeba3e03222e81c8bdc8ac4fd71da4 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Mon, 29 May 2023 22:41:29 +0100 Subject: [PATCH 7/8] side menu display bug fixed --- src/components/Partials/Layout.jsx | 4 +++- src/components/Partials/MobileSideBar.jsx | 6 +++--- src/components/Partials/Sidebar.jsx | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/components/Partials/Layout.jsx b/src/components/Partials/Layout.jsx index eafa97c..9d7e04a 100644 --- a/src/components/Partials/Layout.jsx +++ b/src/components/Partials/Layout.jsx @@ -36,7 +36,7 @@ export default function Layout({ children }) { //--------------------------------------- /* LET U DEAL WITH JOB LIST - we need to centralize this list */ const {jobListTable} = useSelector((state) => state.tableReload) - const [MyJobList, setMyJobList] = useState({loading: true, data:[]}); + const [myJobList, setMyJobList] = useState({loading: true, data:[]}); const api = new usersService(); const getMyJobList = async () => { @@ -75,6 +75,7 @@ export default function Layout({ children }) { logoutModalHandler={logoutModalHandler} sidebar={drawer} action={() => dispatch(drawerToggle())} + myJobList={myJobList} />
{MobileSideBar && ( @@ -92,6 +93,7 @@ export default function Layout({ children }) { logoutModalHandler={logoutModalHandler} sidebar={MobileSideBar} action={() => setMobileSidebar.toggle()} + myJobList={myJobList} />
{/* end sidebar */} diff --git a/src/components/Partials/MobileSideBar.jsx b/src/components/Partials/MobileSideBar.jsx index d0d393b..3f29ba7 100644 --- a/src/components/Partials/MobileSideBar.jsx +++ b/src/components/Partials/MobileSideBar.jsx @@ -8,7 +8,7 @@ import { import DarkModeContext from "../Contexts/DarkModeContext"; import Icons from "../Helpers/Icons"; -export default function MobileSidebar({ sidebar, action, logoutModalHandler }) { +export default function MobileSidebar({ sidebar, action, logoutModalHandler, myJobList }) { let { userDetails } = useSelector((state) => state.userDetails); const darkMode = useContext(DarkModeContext); @@ -180,7 +180,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
- ) : jobLists?.result_list?.length ? ( + ) : myJobList?.data?.result_list?.length ? (

@@ -213,7 +213,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {

- ) : ( + ) : !myJobList?.loading && (

diff --git a/src/components/Partials/Sidebar.jsx b/src/components/Partials/Sidebar.jsx index d2cb1fd..2da2c50 100644 --- a/src/components/Partials/Sidebar.jsx +++ b/src/components/Partials/Sidebar.jsx @@ -8,7 +8,7 @@ import { import DarkModeContext from "../Contexts/DarkModeContext"; import Icons from "../Helpers/Icons"; -export default function Sidebar({ sidebar, action, logoutModalHandler }) { +export default function Sidebar({ sidebar, action, logoutModalHandler, myJobList }) { const darkMode = useContext(DarkModeContext); let { userDetails } = useSelector((state) => state.userDetails); @@ -200,7 +200,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {

- ) : jobLists?.result_list?.length ? ( + ) : myJobList?.data?.result_list?.length ? ( <>
@@ -239,7 +239,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
- ) : ( + ) : !myJobList?.loading && (

From 918575d8028561becab319eabb63ef0e2ceb4fd5 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Mon, 29 May 2023 18:23:57 -0400 Subject: [PATCH 8/8] Family member task layout --- src/components/FamilyAcc/FamilyTasks.jsx | 128 ++++++++++++++++++++--- src/components/History/HistoryTable.jsx | 12 --- src/components/History/index.jsx | 4 +- 3 files changed, 114 insertions(+), 30 deletions(-) diff --git a/src/components/FamilyAcc/FamilyTasks.jsx b/src/components/FamilyAcc/FamilyTasks.jsx index 93d03a4..2f246fb 100644 --- a/src/components/FamilyAcc/FamilyTasks.jsx +++ b/src/components/FamilyAcc/FamilyTasks.jsx @@ -1,31 +1,127 @@ 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"; +import dataImage2 from "../../assets/images/data-table-user-2.png"; +import dataImage3 from "../../assets/images/data-table-user-3.png"; +import dataImage4 from "../../assets/images/data-table-user-4.png"; +import SelectBox from "../Helpers/SelectBox"; + +import PaginatedList from "../Pagination/PaginatedList"; +import { handlePagingFunc } from "../Pagination/HandlePagination"; + +export default function FamilyTasks({ className }) { + const filterCategories = ["All Categories", "Explore", "Featured"]; + const [selectedCategory, setCategory] = useState(filterCategories[0]); + + let data = ['1', '2', '3', '4', '5', '6'] // to be replaced later by result from API CALL + + const [currentPage, setCurrentPage] = useState(0); + const indexOfFirstItem = Number(currentPage); + const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE); + const currentTask = data.slice(indexOfFirstItem, indexOfLastItem); + + const handlePagination = (e) => { + handlePagingFunc(e,setCurrentPage) + } -export default function FamilyTasks({ className, loader }) { return (
-
- {loader ? ( -
- -
- ) : ( -

DateDescriptionTrx. Amount Fee
{item.added_date}{item.confirmation}{item.added_date}
+ {item.confirmation} + 		{item.amount} {item.fee}
DateRecipientTrx. Amount/FeeConf/StatusStatus
{item.added_date}
+ 		{item.added_date}
{item.confirmation} 		{item.amount}
DateTrx.Amount/FeeTrx.Amnt./Fee Status
{item.trx_date}{item.amount}/{item.fee}{item.amount}
{item.fee}		 {item.status}
- - - + {data.length && +
+
Yes This are my tasks
+ + + + + + + { + currentTask.map((item,index)=>( + + + + + + + )) + } +
All ProductValueUSDStatus
+
+
+ data +
+
+

+ Mullican Computer Joy +

+ + Owned by Xoeyam + +
+
+ 		+
+ + 7473 ETH + +
+ 		+
+ + + + + + + + + + 6392.99$ + +
+ 		+ +
- )} - + + {/* PAGINATION BUTTON */} + = data.length ? true : false} data={data} start={indexOfFirstItem} stop={indexOfLastItem} /> + {/* END OF PAGINATION BUTTON */} + + } ); } diff --git a/src/components/History/HistoryTable.jsx b/src/components/History/HistoryTable.jsx index efde971..835d7de 100644 --- a/src/components/History/HistoryTable.jsx +++ b/src/components/History/HistoryTable.jsx @@ -51,8 +51,6 @@ export default function HistoryTable({ className }) { Value USD 24H% - Bits - Time Status @@ -165,16 +163,6 @@ export default function HistoryTable({ className }) { -24.75 (11.5%) - - - 343 - - - - - 2 Hours 1 min 30s - -