Compare commits

...

17 Commits

Author SHA1 Message Date
victorAnumudu 78ee32efcc added slash to link href 2023-06-10 22:05:56 +01:00
ameye a2ef201cfd Merge branch 'common-home-banner' of WrenchBoard/Users-Wrench into master 2023-06-10 20:48:08 +00:00
victorAnumudu 746cd00ec4 common home banner head implemented 2023-06-10 21:32:37 +01:00
victorAnumudu 3461b828dd common home banner head implemented 2023-06-10 21:30:31 +01:00
CHIEFSOFT\ameye d0e1a7acd0 Coupon format 2023-06-10 12:33:22 -04:00
CHIEFSOFT\ameye c5d84655a9 Coupon page 2023-06-10 12:29:41 -04:00
CHIEFSOFT\ameye 796f220c1d coupon table 2023-06-10 11:49:43 -04:00
CHIEFSOFT\ameye 99ea92ae99 coupons 2023-06-10 11:14:31 -04:00
CHIEFSOFT\ameye d279e707dc Job actions 2023-06-10 10:38:22 -04:00
CHIEFSOFT\ameye ba8213d120 banner data 2023-06-10 09:07:20 -04:00
CHIEFSOFT\ameye 0933dc8925 fix space 2023-06-09 22:45:05 -04:00
CHIEFSOFT\ameye fe48c962b2 Job filters 2023-06-09 22:21:24 -04:00
CHIEFSOFT\ameye d2738f28d5 header iotem reformat 2023-06-09 22:12:03 -04:00
CHIEFSOFT\ameye 0f17783ab5 Home top slider 2023-06-09 21:55:13 -04:00
CHIEFSOFT\ameye 83f2339a17 top sliders 2023-06-09 21:09:57 -04:00
CHIEFSOFT\ameye 13c0571b92 Review accept 2023-06-08 16:21:01 -04:00
ameye a3e53afd99 Merge branch 'active-worker-job-action' of WrenchBoard/Users-Wrench into master 2023-06-08 20:07:58 +00:00
26 changed files with 415 additions and 99 deletions
+2 -2
View File
@@ -22,8 +22,8 @@ export default function HomeSliders(props) {
{/*<div className="item w-full h-full bg-white dark:bg-dark-white rounded-2xl overflow-hidden">*/}
{/* <img src={slider3} alt="slider" className="w-full h-full" />*/}
{/*</div>*/}
{props.bannerList.map((item, index) => (
<div className="item w-full h-full bg-white dark:bg-dark-white rounded-2xl overflow-hidden">
{props.bannerList?.length && props.bannerList.map((item, index) => (
<div key={index} className="item w-full h-full bg-white dark:bg-dark-white rounded-2xl overflow-hidden">
<HomeBannerOffersCard
itemData={item}
/>
+2 -5
View File
@@ -17,10 +17,7 @@ export default function Home(props) {
const {userDetails} = useSelector((state) => state?.userDetails)
const commonHeadData =()=>{
console.log("COMMON HEAD DATA INDEX ----------------=====---------------------");
return 0;
}
const {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
// FUNCTION TO GET DASH DATA TO DETERMINE CURRENT TASK DUE TIME
const getHomeDate = () => {
@@ -42,7 +39,7 @@ export default function Home(props) {
<Layout>
<div className="home-page-wrapper">
{userDetails && userDetails?.account_type == "FAMILY" && (
<FamilyDash commonHeadData={commonHeadData} />
<FamilyDash commonHeadData={props.bannerList} />
)}
{userDetails && userDetails?.account_type == "FULL" && (
<FullAccountDash nextDueTask={nextDueTask} bannerList={props.bannerList} />
+8 -4
View File
@@ -3,7 +3,7 @@ import DataIteration from "../Helpers/DataIteration";
import AvailableJobsCard from "../Cards/AvailableJobsCard";
export default function MainSection({ className, marketPlaceProduct }) {
const [tab, setTab] = useState("explore");
const [tab, setTab] = useState("all");
const [products, setProducts] = useState(marketPlaceProduct);
const tabHandler = (value) => {
setTab(value);
@@ -29,15 +29,17 @@ export default function MainSection({ className, marketPlaceProduct }) {
<div className="tab-item lg:mb-0 mb-5">
<div className="md:flex md:space-x-8 space-x-2">
<span
onClick={() => tabHandler("explore")}
onClick={() => tabHandler("all")}
className={`md:text-[18px] text-md text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
tab === "explore"
tab === "all"
? "text-pink border-pink"
: " border-transparent"
}`}
>
Explore
All
</span>
<span
onClick={() => tabHandler("artist")}
className={`md:text-[18px] text-md text-dark-gray dark:text-white hover:text-pink border-b hover:border-pink font-medium cursor-pointer ${
@@ -78,6 +80,8 @@ export default function MainSection({ className, marketPlaceProduct }) {
>
Game Assets
</span>
</div>
</div>
@@ -2,8 +2,8 @@ import React from 'react'
function CurrentJobAction() {
return (
<div className=''>
<p className="my-3 py-1 text-base">
<div className='job-action'>
<p className="my-3 py-1 text-base active-owner">
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
<tbody>
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
@@ -33,12 +33,11 @@ function CurrentTaskAction({jobDetails}) {
}
return (
<div className=''>
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
<div className='job-action'>
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 active-worker">
<tbody>
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
<td className=" py-4">
<td>
<div className="flex space-x-2 items-center w-full">
<div className="flex flex-col flex-[0.9]">
<h1 className="font-bold text-xl text-dark-gray dark:text-white">
@@ -48,7 +47,7 @@ function CurrentTaskAction({jobDetails}) {
</div>
</td>
<td className="text-right py-4 px-2">
<td className="text-right px-2">
<div className="flex justify-center items-center">
<button onClick={popUpHandler} type="button" className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
Set Status
@@ -2,7 +2,7 @@ import React from 'react'
function PastDueJobAction() {
return (
<div className=''>
<div className='job-action'>
<p className="my-3 py-1 text-base">
Waiting for the completion message from the client before you can approve. Owner True & PastDue
</p>
@@ -2,7 +2,7 @@ import React from 'react'
function PastDueTaskAction() {
return (
<div className=''>
<div className='job-action'>
<p className="my-3 py-1 text-base">
Waiting for the completion message from the client before you can approve. Worker True & PastDue
</p>
@@ -2,9 +2,31 @@ import React from 'react'
function ReviewJobAction() {
return (
<div className=''>
<div className='job-action'>
<p className="my-3 py-1 text-base">
Waiting for the completion message from the client before you can approve. Owner True & Review Job
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 review-owner">
<tbody>
<tr className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] hover:bg-gray-50">
<td className=" py-4">
<div className="flex space-x-2 items-center w-full">
<div className="flex flex-col flex-[0.9]">
<h1 className="font-bold text-xl text-dark-gray dark:text-white">
This Job is Ready for your review
</h1>
</div>
</div>
</td>
<td className="text-right py-4 px-2">
<div className="flex justify-center items-center">
<button type="button" className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
Reject/Accepts
</button>
</div>
</td>
</tr>
</tbody>
</table>
</p>
</div>
)
@@ -2,7 +2,7 @@ import React from 'react'
function ReviewTaskAction() {
return (
<div className=''>
<div className='job-action'>
<p className="my-3 py-1 text-base">
Waiting for the completion message from the client before you can approve. Worker True & Review Job
</p>
+67
View File
@@ -0,0 +1,67 @@
import React, {useState} from 'react'
//import PaginatedList from '../../Pagination/PaginatedList'
import PaginatedList from '../Pagination/PaginatedList';
import { handlePagingFunc } from '../Pagination/HandlePagination';
function CouponTable({coupon}) {
const [currentPage, setCurrentPage] = useState(0);
const indexOfFirstItem = Number(currentPage);
const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
const currentCoupon = coupon?.data?.slice(indexOfFirstItem, indexOfLastItem);
const handlePagination = (e) => {
handlePagingFunc(e,setCurrentPage)
}
return (
<div className='flex flex-col justify-between h-full'>
<table className="wallet-activity w-full table-auto border-collapse text-left">
<thead className='border-b-2'>
<tr className='text-slate-600'>
<th className="p-2">Coupon</th>
{/*<th className="p-2">Description</th>*/}
{/*<th className="p-2">Amount</th>*/}
<th className="p-2">Status</th>
</tr>
</thead>
{coupon.data.length ?
(
<tbody>
{currentCoupon.map((item, index) => (
<tr key={index} className='text-slate-500'>
<td className="p-2">{item.added} <br /> {item.code} <br />{item.amount}</td>
{/*<td className="p-2"></td>*/}
{/*<td className="p-2"></td>*/}
<td className="p-2">{item.status}</td>
</tr>
))}
</tbody>
)
:
coupon.error ?
(
<tbody>
<tr className='text-slate-500'>
<td className="p-2" colSpan={4}>Opps! an error occurred. Please try again!</td>
</tr>
</tbody>
)
:
<tbody>
<tr className='text-slate-500'>
<td className="p-2" colSpan={4}>No Purchase History Found!</td>
</tr>
</tbody>
}
</table>
{/* PAGINATION BUTTON */}
<PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= coupon?.data?.length ? true : false} data={coupon?.data} start={indexOfFirstItem} stop={indexOfLastItem} />
{/* END OF PAGINATION BUTTON */}
</div>
)
}
export default CouponTable
+69
View File
@@ -0,0 +1,69 @@
import React, { useEffect, useState } from 'react'
import Layout from "../Partials/Layout";
import LoadingSpinner from "../Spinners/LoadingSpinner";
import CouponTable from "./CouponTable";
import usersService from '../../services/UsersService'
export default function MyCoupons() {
const apiCall = new usersService()
let [couponHistory, setCouponHistory] = useState({ // FOR COUPON HISTORY
loading: true,
data: [],
error: false
})
//FUNCTION TO GET COUPON HISTORY
const getCouponHistory = ()=>{
apiCall.getCouponHx().then((res)=>{
if(res.data.internal_return < 0){ // success but no data
setCouponHistory(prev => ({...prev, loading: false}))
return
}
setCouponHistory(prev => ({...prev, loading: false, data: res.data.result_list}))
}).catch((error)=>{
setCouponHistory(prev => ({...prev, loading: false, error: true}))
})
}
useEffect(()=>{
getCouponHistory()
}, [])
return (
<>
<Layout>
<div className="my-wallet-wrapper w-full mb-10">
{/* heading */}
<div className="sm:flex justify-between items-center mb-6">
<div className="mb-5 sm:mb-0">
<h1 className="text-26 font-bold text-dark-gray dark:text-white">
Coupons
</h1>
</div>
<div className="slider-btns flex space-x-4">
</div>
</div>
<div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
{/* COUPON SECTION */}
<div className="lg:w-4/4 w-full mb-10 lg:mb-0">
<div className="wallet w-full md:p-8 p-4 h-full max-h-[500px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
{couponHistory.loading ?
<LoadingSpinner size='16' color='sky-blue' />
:
<CouponTable coupon={couponHistory} />
}
</div>
</div>
{/* END OF COUPON SECTION */}
</div>
</div>
</Layout>
</>
);
}
+22 -21
View File
@@ -1,34 +1,35 @@
import React from "react";
import { Link } from "react-router-dom";
import RecomendedSliders from "./RecomendedSliders";
export default function CommonHead({ className,commonHeadData }) {
const vvv= commonHeadData();
console.log("UUUUUUUU-",vvv);
return (
<div
className={`create-nft w-full lg:h-[140px] shadow lg:flex rounded-lg justify-between items-center md:p-9 p-4 bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] -2 border-pink mb-10 ${
className={`create-nft w-full lg:h-[140px] shadow lg:flex rounded-lg justify-between items-center md:p-2 p-2 bg-white dark:bg-dark-white border-b dark:border-[#5356fb29] -2 border-pink mb-10 ${
className || ""
}`}
>
<div className="lg:w-8/12 w-full mb-8 lg:mb-0">
<h1 className="text-2xl text-dark-gray dark:text-white font-bold mb-2">
This is common head which will appear as needed , will take many shape
</h1>
<p className="text-base text-thin-light-gray tracking-wide">
some space for extra texts here
</p>
</div>
<div className="flex-1 flex lg:justify-end">
<div className="flex items-center space-x-5">
<Link
to="/mytask"
className="w-40 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
>
View Task
</Link>
{commonHeadData?.length > 0 && <RecomendedSliders bannerData={commonHeadData} /> }
{/*<div className="lg:w-8/12 w-full mb-8 lg:mb-0">*/}
{/* /!*<h1 className="text-2xl text-dark-gray dark:text-white font-bold mb-2">*!/*/}
{/* /!* This is common head which will appear as needed , will take many shape*!/*/}
{/* /!*</h1>*!/*/}
{/* /!*<p className="text-base text-thin-light-gray tracking-wide">*!/*/}
{/* /!* some space for extra texts here*!/*/}
{/* /!*</p>*!/*/}
{/* */}
{/*</div>*/}
{/*<div className="flex-1 flex lg:justify-end">*/}
{/* <div className="flex items-center space-x-5">*/}
{/* <Link*/}
{/* to="/mytask"*/}
{/* className="w-40 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"*/}
{/* >*/}
{/* View Task*/}
{/* </Link>*/}
</div>
</div>
{/* </div>*/}
{/*</div>*/}
</div>
);
}
@@ -0,0 +1,132 @@
import React, { useRef } from "react";
import top from "../../assets/images/top-buyer-1png.png";
import top2 from "../../assets/images/top-buyer-2.png";
import top3 from "../../assets/images/top-buyer-3.png";
import top4 from "../../assets/images/top-buyer-4.png";
import Icons from "../Helpers/Icons";
import SliderCom from "../Helpers/SliderCom";
import { Link } from "react-router-dom";
export default function RecomendedSliders({ className,bannerData }) {
const settings = {
arrows: false,
dots: false,
infinite: bannerData.length > 4 ? true : false,
autoplay: true,
slidesToShow: bannerData.length > 4 ? 4 : bannerData.length,
slidesToScroll: 1,
responsive: [
{
breakpoint: 426,
settings: {
infinite: bannerData.length > 2 ? true : false,
slidesToShow: bannerData.length > 2 ? 2 : bannerData.length,
slidesToScroll: 1,
},
},
],
};
const sellSlider = useRef(null);
const buySlider = useRef(null);
const prevHandler = (value) => {
if (value === "sell") {
sellSlider.current.slickPrev();
}
if (value === "buy") {
buySlider.current.slickPrev();
}
};
const nextHandler = (value) => {
if (value === "sell") {
sellSlider.current.slickNext();
}
if (value === "buy") {
buySlider.current.slickNext();
}
};
return (
<>
{/*<div className="heading flex justify-between items-center mb-4">*/}
{/* <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">*/}
{/* Top Seller*/}
{/* </h1>*/}
{/* <div className="slider-btns flex space-x-4">*/}
{/* <button*/}
{/* onClick={() => nextHandler("sell")}*/}
{/* type="button"*/}
{/* className="transform rotate-180 text-dark-gray dark:text-white dark:opacity-25"*/}
{/* >*/}
{/* <Icons name="arrows" />*/}
{/* </button>*/}
{/* <button*/}
{/* onClick={() => prevHandler("sell")}*/}
{/* type="button"*/}
{/* className="transform rotate-180"*/}
{/* >*/}
{/* <div className=" text-dark-gray dark:text-white">*/}
{/* <svg*/}
{/* width="11"*/}
{/* height="19"*/}
{/* viewBox="0 0 11 19"*/}
{/* fill="none"*/}
{/* xmlns="http://www.w3.org/2000/svg"*/}
{/* >*/}
{/* <path*/}
{/* d="M9.09766 1.1499L1.13307 9.11449L9.09766 17.0791"*/}
{/* stroke="url(#paint0_linear_220_23410)"*/}
{/* strokeWidth="2"*/}
{/* strokeLinecap="round"*/}
{/* strokeLinejoin="round"*/}
{/* />*/}
{/* <defs>*/}
{/* <linearGradient*/}
{/* id="paint0_linear_220_23410"*/}
{/* x1="9.09766"*/}
{/* y1="1.1499"*/}
{/* x2="-4.2474"*/}
{/* y2="7.96749"*/}
{/* gradientUnits="userSpaceOnUse"*/}
{/* >*/}
{/* <stop stopColor="#F539F8" />*/}
{/* <stop offset="0.416763" stopColor="#C342F9" />*/}
{/* <stop offset="1" stopColor="#5356FB" />*/}
{/* </linearGradient>*/}
{/* </defs>*/}
{/* </svg>*/}
{/* </div>*/}
{/* </button>*/}
{/* </div>*/}
{/*</div>*/}
<div className="slider-content">
<SliderCom settings={settings} selector={sellSlider}>
{bannerData.map((item, index) => (
<Link key={index} to={`/${item.link_path}`}>
<div className="item">
<div className="commonHeaderSliderItem">
{/* title */}
<div className="flex justify-center">
<p className="text-base font-bold text-dark-gray dark:text-white">
{item.short_title}
</p>
</div>
{/* username */}
<div className="flex justify-center mb-1">
<p className="text-xs text-thin-light-gray">
{item.short_description}
</p>
</div>
{/* items */}
<div className="flex justify-center">
<div className="flex space-x-1 items-center text-purple text-xs">
<span>{item.short_button_text}</span>
</div>
</div>
</div>
</div>
</Link>
))}
</SliderCom>
</div>
</>
);
}
+13
View File
@@ -9,6 +9,12 @@
font-family: "Product Sans";
src: url("./assets/fonts/Product Sans Bold.ttf");
}
.job-action{
background-color: lightgoldenrodyellow;
height: 100px;
border-radius: 15px;
}
.msg_box{
background-color: aliceblue;
margin: 5px;
@@ -34,6 +40,13 @@
width: 100%;
text-align: center;
}
.commonHeaderSliderItem{
background-color: aliceblue;
border-radius: 10px;
margin: 0px 5px 0px 5px;
height: 95px;
padding: 5px;
}
.offer-slide-item{
background: rgb(2,0,36);
background: radial-gradient(circle, rgba(2,0,36,1) 0%, rgba(3,51,2,0.782125350140056) 0%, rgba(0,212,255,0.07904411764705888) 0%, rgba(153,182,201,1) 99%);
+14
View File
@@ -6,6 +6,7 @@ import { useDispatch, useSelector } from "react-redux";
import { updateUserDetails } from "../store/UserDetails";
import { updateJobs } from "../store/jobLists";
import { updateUserJobList } from "../store/userJobList";
import { commonHeadBanner } from "../store/CommonHeadBanner";
const AuthRoute = ({ redirectPath = "/login", children }) => {
const apiCall = useMemo(() => new usersService(), []);
@@ -120,6 +121,19 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
getMarketActiveJobList();
}, [apiCall, dispatch]);
//FUNCTION TO GET COMMON HEAD DATA
useEffect(()=>{
apiCall.getHeroJBanners().then((res) => {
if (res.data.internal_return < 0) {
return;
}
dispatch(commonHeadBanner(res.data));
})
.catch((error) => {
console.log('ERROR ', error)
});
},[])
return isLogin.loading ? (
<LoadingSpinner size="32" color="sky-blue" height="h-screen" />
) : // Stills needs fixing
+20
View File
@@ -0,0 +1,20 @@
import { createSlice } from "@reduxjs/toolkit";
const initialState = {
commonHeadBanner: {}
};
export const commonHeadBannerSlice = createSlice({
name: "commonHeadBanner",
initialState,
reducers: {
commonHeadBanner: (state,action) => {
state.commonHeadBanner = {...action.payload}
},
},
});
// Action creators are generated for each case reducer function
export const { commonHeadBanner } = commonHeadBannerSlice.actions;
export default commonHeadBannerSlice.reducer;
+3 -1
View File
@@ -5,6 +5,7 @@ import userDetailReducer from "./UserDetails";
import jobReducer from "./jobLists";
import tableReloadReducer from "./TableReloads";
import userJobListReducer from './userJobList'
import commonHeadBannerReducer from './CommonHeadBanner'
export default configureStore({
reducer: {
@@ -12,6 +13,7 @@ export default configureStore({
userDetails: userDetailReducer,
jobLists: jobReducer,
tableReload: tableReloadReducer,
userJobList: userJobListReducer
userJobList: userJobListReducer,
commonHeadBanner: commonHeadBannerReducer
},
});
+3 -5
View File
@@ -1,15 +1,13 @@
import React, { useContext, useState, useEffect } from "react";
import BlogItem from "../components/Blogs";
import { useSelector } from "react-redux";
export default function BlogPage() {
const commonHeadData = () => {
console.log("COMMON HEAD DATA ----------------=====---------------------");
return 0;
};
let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
return (
<>
<BlogItem commonHeadData={commonHeadData} />
<BlogItem commonHeadData={commonHeadBanner.result_list} />
</>
);
}
+5 -17
View File
@@ -1,29 +1,17 @@
import React, {useState, useEffect} from 'react'
import Home from "../components/Home";
import usersService from "../services/UsersService";
import { useSelector } from 'react-redux';
export default function HomePages() {
// const [marketActiveJobList, setMarketActiveJobList] = useState([]);
const [bannerList, setBannerList] = useState([]);
const api = new usersService();
const getHeroJBannersList = async () => {
try {
const res = await api.getHeroJBanners();
// console.log("BANNERS->",res.data);
setBannerList(res.data?.result_list);
} catch (error) {
console.log("Error getting BANNERS....");
}
};
useEffect(() => {
getHeroJBannersList();
}, []);
const {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
return (
<>
<Home
bannerList={bannerList}
bannerList={commonHeadBanner?.result_list}
/>
</>
);
+4 -5
View File
@@ -1,16 +1,15 @@
import MarketPlace from "../components/MarketPlace";
import { useSelector } from "react-redux";
export default function MarketPlacePage() {
const commonHeadData =()=>{
console.log("COMMON HEAD DATA ----------------=====---------------------");
return 0;
}
let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
return (
<>
<MarketPlace
commonHeadData={commonHeadData} />
commonHeadData={commonHeadBanner?.result_list} />
</>
);
}
+3 -5
View File
@@ -2,12 +2,10 @@ import React, { useContext,useState, useEffect } from "react";
import usersService from "../services/UsersService";
//import MyJobs from "../components/MyJobs";
import MyActiveJobs from "../components/MyActiveJobs";
import { useSelector } from "react-redux";
export default function MyActiveJobsPage() {
const commonHeadData =()=>{
console.log("COMMON HEAD DATA ----------------=====---------------------");
return 0;
}
let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
const [MyJobList, setMyJobList] = useState([]);
const api = new usersService();
//TARGET ENDPOINT[POST]http://10.204.5.100:9083/en/wrench/api/v1/jobmanageractive
@@ -28,7 +26,7 @@ export default function MyActiveJobsPage() {
<>
<MyActiveJobs
MyJobList={MyJobList}
commonHeadData={commonHeadData}
commonHeadData={commonHeadBanner.result_list}
/>
</>
);
+3 -2
View File
@@ -1,10 +1,11 @@
import React from "react";
import WalletRoutes from "../components/MyWallet/Wallet";
//import WalletRoutes from "../components/MyWallet/Wallet";
import MyCoupons from "../components/MyCoupons/MyCoupons";
export default function MyCouponPage() {
return (
<>
<WalletRoutes />
<MyCoupons />
</>
);
}
+2 -5
View File
@@ -7,10 +7,7 @@ import MyJobs from "../components/MyJobs";
import { useSelector } from "react-redux";
export default function MyJobsPage() {
const commonHeadData = () => {
console.log("COMMON HEAD DATA ----------------=====---------------------");
return 0;
};
let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
const {userJobList} = useSelector((state) => state.userJobList)
@@ -38,7 +35,7 @@ export default function MyJobsPage() {
// debugger;
return (
<>
<MyJobs MyJobList={userJobList} commonHeadData={commonHeadData} />
<MyJobs MyJobList={userJobList} commonHeadData={commonHeadBanner.result_list} />
</>
);
}
+3 -5
View File
@@ -3,12 +3,10 @@ import usersService from "../services/UsersService";
//import MyJobs from "../components/MyJobs";
import MyActiveJobs from "../components/MyActiveJobs";
import MyPendingJobs from "../components/MyPendingJobs";
import { useSelector } from "react-redux";
export default function MyPendingJobsPage() {
const commonHeadData =()=>{
console.log("COMMON HEAD DATA ----------------=====---------------------");
return 0;
}
let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
const [MyJobList, setMyJobList] = useState([]);
const api = new usersService();
@@ -29,7 +27,7 @@ export default function MyPendingJobsPage() {
<>
<MyPendingJobs
MyJobList={MyJobList}
commonHeadData={commonHeadData}
commonHeadData={commonHeadBanner.result_list}
/>
</>
);
+3 -5
View File
@@ -1,12 +1,10 @@
import React, { useContext,useState, useEffect } from "react";
import usersService from "../services/UsersService";
import MyReviewDueJobs from "../components/MyActiveJobs/MyReviewDueJobs";
import { useSelector } from "react-redux";
export default function MyReviewDueJobsPage() {
const commonHeadData =()=>{
console.log("COMMON HEAD DATA ----------------=====---------------------");
return 0;
}
let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
const [MyJobList, setMyJobList] = useState([]);
const api = new usersService();
const getMyJobList = async () => {
@@ -26,7 +24,7 @@ export default function MyReviewDueJobsPage() {
<>
<MyReviewDueJobs
MyJobList={MyJobList}
commonHeadData={commonHeadData}
commonHeadData={commonHeadBanner.result_list}
/>
</>
);
+4 -5
View File
@@ -8,6 +8,8 @@ import { useSelector } from "react-redux";
export default function MyTaskPage() {
const { myTaskTable } = useSelector((state) => state.tableReload);
let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
const [MyActiveJobList, setMyActiveJobList] = useState({
loading: true,
status: false,
@@ -15,10 +17,7 @@ export default function MyTaskPage() {
});
const [MyActiveOffersList, setMyActiveOffersList] = useState([]);
const api = new usersService();
const commonHeadData = () => {
console.log("COMMON HEAD DATA ----------------=====---------------------");
return 0;
};
const getMyActiveJobList = async () => {
setMyActiveJobList({ loading: true, status: false, data: [] });
try {
@@ -53,7 +52,7 @@ export default function MyTaskPage() {
<MyTasks
ActiveJobList={MyActiveJobList}
MyActiveOffersList={MyActiveOffersList}
commonHeadData={commonHeadData}
commonHeadData={commonHeadBanner?.result_list}
/>
);
}