Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 victorAnumudu
|
c01cfa104c | ||
|
CHIEFSOFT\ameye
|
8255eedb00 | ||
|
CHIEFSOFT\ameye
|
b4ff0b5eca | ||
|
CHIEFSOFT\ameye
|
120f2c1866 | ||
|
CHIEFSOFT\ameye
|
7389cf164c | ||
|
CHIEFSOFT\ameye
|
3700fe066f | ||
|
CHIEFSOFT\ameye
|
5e85697c82 | ||
|
CHIEFSOFT\ameye
|
5f87c5f36c | ||
|
CHIEFSOFT\ameye
|
66b7d20e43 | ||
|
CHIEFSOFT\ameye
|
c389e06ae6 | ||
 ameye
|
0b83682da7 | ||
|
victorAnumudu
|
78b14ec797 | ||
|
CHIEFSOFT\ameye
|
8b0954c28c | ||
|
CHIEFSOFT\ameye
|
15ef592252 | ||
|
ameye
|
4d74946f0d |
@@ -43,6 +43,7 @@ import AuthRedirect from "./views/AuthRedirect";
|
||||
import MyPastDueJobsPage from "./views/MyPastDueJobsPage";
|
||||
import BlogPage from "./views/BlogPage";
|
||||
import MyReviewDueJobsPage from "./views/MyReviewDueJobsPage";
|
||||
import OffersInterestPage from "./views/OffersInterestPage";
|
||||
|
||||
export default function Routers() {
|
||||
return (
|
||||
@@ -97,6 +98,7 @@ export default function Routers() {
|
||||
<Route exact path="/start-job" element={<StartJob />} />
|
||||
<Route exact path="/manage-active-job" element={<ManageActiveJobs />} />
|
||||
<Route exact path="/blog-page" element={<BlogPage />} />
|
||||
<Route exact path="/offer-interest" element={<OffersInterestPage />} />
|
||||
|
||||
|
||||
<Route
|
||||
|
||||
@@ -245,7 +245,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {
|
||||
|
||||
<div className="">
|
||||
<p className="flex items-center tracking-wide">
|
||||
Interest: <b className="ml-1">{marketInt?.public_view}</b>
|
||||
Interest: <b className="ml-1">{details.interest_count}</b>
|
||||
</p>
|
||||
<hr />
|
||||
<p className="my-1">Expire: {expireIntDate}</p>
|
||||
|
||||
@@ -6,11 +6,11 @@ function CurrentJobAction() {
|
||||
<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">
|
||||
<td className=" py-4">
|
||||
<tr className=" border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td className=" py-1">
|
||||
<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">
|
||||
<h1 className="text-xl text-dark-gray dark:text-white">
|
||||
Waiting for the completion message from the client before you can approve.
|
||||
</h1>
|
||||
</div>
|
||||
|
||||
@@ -34,23 +34,27 @@ function CurrentTaskAction({jobDetails}) {
|
||||
|
||||
return (
|
||||
<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">
|
||||
<tr className=" border-b">
|
||||
<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">
|
||||
If you have completed this task and ready for review and acceptance, click "Set Status" button.
|
||||
</h1>
|
||||
</div>
|
||||
<h1 className="text-xl text-dark-gray dark:text-white">
|
||||
I completed this task and ready for review and acceptance.
|
||||
</h1>
|
||||
{/*<div className="flex flex-col flex-[0.9]">*/}
|
||||
|
||||
{/*</div>*/}
|
||||
</div>
|
||||
</td>
|
||||
|
||||
<td className="text-right px-2">
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<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
|
||||
<button onClick={popUpHandler} type="button" className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
|
||||
Send of Review
|
||||
</button>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
@@ -3,9 +3,31 @@ import React from 'react'
|
||||
function PastDueJobAction() {
|
||||
return (
|
||||
<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>
|
||||
|
||||
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 owner-pastdue">
|
||||
<tbody>
|
||||
<tr className="border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td>
|
||||
<div className="flex space-x-2 items-center w-full">
|
||||
<div className="flex flex-col flex-[0.9]">
|
||||
<h1 className="text-xl text-dark-gray dark:text-white">
|
||||
Time allocated has passed
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<div className="flex justify-center items-center">
|
||||
<button type="button" className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
|
||||
Cancel or Extend Timeline
|
||||
</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -3,9 +3,31 @@ import React from 'react'
|
||||
function PastDueTaskAction() {
|
||||
return (
|
||||
<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>
|
||||
|
||||
<table className="w-full text-sm text-left text-gray-500 dark:text-gray-400 worker-pastdue">
|
||||
<tbody>
|
||||
<tr className=" border-b dark:border-[#5356fb29] hover:bg-gray-50">
|
||||
<td>
|
||||
<div className="flex space-x-2 items-center w-full">
|
||||
<div className="flex flex-col flex-[0.9]">
|
||||
<h1 className="text-xl text-dark-gray dark:text-white">
|
||||
You have missed the allocated time
|
||||
</h1>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<div className="flex justify-center items-center">
|
||||
<button type="button" className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
|
||||
Request Extension
|
||||
</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -6,21 +6,22 @@ function ReviewJobAction() {
|
||||
<p className="my-3 py-1 text-base">
|
||||
<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">
|
||||
<tr className="border-b dark:border-[#5356fb29]">
|
||||
<td className=" py-1">
|
||||
<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">
|
||||
<h1 className="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">
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<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 type="button" className="w-120 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">
|
||||
Reject or Accept
|
||||
</button>
|
||||
</div>
|
||||
</td>
|
||||
|
||||
@@ -8,13 +8,24 @@ import LoadingSpinner from '../Spinners/LoadingSpinner'
|
||||
function Balance({wallet, coupon}) {
|
||||
return (
|
||||
<div className="content-wrapper">
|
||||
{/* 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">
|
||||
Wallet
|
||||
</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'>
|
||||
{/* WALLET SECTION */}
|
||||
<div className="lg:w-3/4 w-full mb-10 lg:mb-0">
|
||||
<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 bg-white dark:bg-dark-white rounded-2xl shadow">
|
||||
<div className='flex items-baseline justify-between'>
|
||||
<h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Wallet</h2>
|
||||
<p className='text-base text-slate-500 dark:text-white'>Add New Wallet</p>
|
||||
{/*<h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Wallet</h2>*/}
|
||||
{/*<p className='text-base text-slate-500 dark:text-white'>Add New Wallet</p>*/}
|
||||
</div>
|
||||
{/* wallet balance */}
|
||||
{wallet.loading ?
|
||||
@@ -26,7 +37,7 @@ function Balance({wallet, coupon}) {
|
||||
<div className='text-slate-900 w-full md:w-1/2 flex space-x-3 items-start justify-start'>
|
||||
<div className='balance-info'>
|
||||
<p className='py-2'></p>
|
||||
<span className='text-base'>{item.description}</span>
|
||||
<span className='text-xl text-dark-gray dark:text-white'>{item.description}</span>
|
||||
<p className='text-base text-slate-500'>{item.symbol}</p>
|
||||
</div>
|
||||
<div className='balance-info'>
|
||||
@@ -43,10 +54,10 @@ function Balance({wallet, coupon}) {
|
||||
{
|
||||
item.action_type != 'AC_AD_FD_ONLY' ?
|
||||
<Link to='transfer-fund' className='lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]
|
||||
items-center rounded-full relative bg-purple pr-1.5 pl-4'>Transfer</Link>:''
|
||||
items-center rounded-full relative bg-purple pr-1.5 pl-4 lg:text-xl text-lg font-bold text-white'>Transfer</Link>:''
|
||||
}
|
||||
<Link to='add-fund' className='lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]
|
||||
items-center rounded-full relative bg-purple pr-1.5 pl-4'>+Add Credit</Link>
|
||||
items-center rounded-full relative bg-purple pr-1.5 pl-4 lg:text-xl text-lg font-bold text-white'>+Add Credit</Link>
|
||||
</div>
|
||||
</div>
|
||||
))
|
||||
@@ -73,22 +84,22 @@ function Balance({wallet, coupon}) {
|
||||
|
||||
</div>
|
||||
|
||||
<div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
|
||||
{/*<div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>*/}
|
||||
|
||||
{/* COUPON SECTION */}
|
||||
<div className="lg:w-3/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">
|
||||
<h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Coupons</h2>
|
||||
{coupon.loading ?
|
||||
<LoadingSpinner size='16' color='sky-blue' />
|
||||
:
|
||||
<CouponTable coupon={coupon} />
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
{/* END OF COUPON SECTION */}
|
||||
{/* /!* COUPON SECTION *!/*/}
|
||||
{/* <div className="lg:w-3/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">*/}
|
||||
{/* <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Coupons</h2>*/}
|
||||
{/* {coupon.loading ?*/}
|
||||
{/* <LoadingSpinner size='16' color='sky-blue' />*/}
|
||||
{/* :*/}
|
||||
{/* <CouponTable coupon={coupon} />*/}
|
||||
{/* }*/}
|
||||
{/* </div>*/}
|
||||
{/* </div>*/}
|
||||
{/* /!* END OF COUPON SECTION *!/*/}
|
||||
|
||||
</div>
|
||||
{/*</div>*/}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ export default function RecomendedSliders({ className,bannerData }) {
|
||||
{bannerData.map((item, index) => (
|
||||
<Link key={index} to={`/${item.link_path}`}>
|
||||
<div className="item">
|
||||
<div className="commonHeaderSliderItem">
|
||||
<div className={`commonHeaderSliderItem ${item.short_style}`}>
|
||||
{/* title */}
|
||||
<div className="flex justify-center">
|
||||
<p className="text-base font-bold text-dark-gray dark:text-white">
|
||||
|
||||
@@ -9,6 +9,9 @@
|
||||
font-family: "Product Sans";
|
||||
src: url("./assets/fonts/Product Sans Bold.ttf");
|
||||
}
|
||||
|
||||
|
||||
|
||||
.job-action{
|
||||
background-color: lightgoldenrodyellow;
|
||||
height: 100px;
|
||||
@@ -47,6 +50,22 @@
|
||||
height: 95px;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
.short_style{
|
||||
background-color: transparent;
|
||||
}
|
||||
.lr{
|
||||
background-color: #e1cace;
|
||||
}
|
||||
.lg{
|
||||
background-color: #a7dca7;
|
||||
}
|
||||
.lb{
|
||||
background-color: #b3ccd7;
|
||||
}
|
||||
.ly{
|
||||
background-color: #eeee67;
|
||||
}
|
||||
.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%);
|
||||
|
||||
@@ -3,12 +3,10 @@ import usersService from "../services/UsersService";
|
||||
//import MyJobs from "../components/MyJobs";
|
||||
//import MyActiveJobs from "../components/MyActiveJobs";
|
||||
import MyPastDueJobs from "../components/MyActiveJobs/MyPastDueJobs";
|
||||
import { useSelector } from "react-redux";
|
||||
|
||||
export default function MyPastDueJobsPage() {
|
||||
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
|
||||
@@ -29,7 +27,7 @@ export default function MyPastDueJobsPage() {
|
||||
<>
|
||||
<MyPastDueJobs
|
||||
MyJobList={MyJobList}
|
||||
commonHeadData={commonHeadData}
|
||||
commonHeadData={commonHeadBanner?.result_list}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
import React, { useContext, useState, useEffect } from "react";
|
||||
import BlogItem from "../components/Blogs";
|
||||
import { useSelector } from "react-redux";
|
||||
|
||||
export default function OffersInterestPage() {
|
||||
let {commonHeadBanner} = useSelector(state => state.commonHeadBanner)
|
||||
|
||||
return (
|
||||
<>
|
||||
<BlogItem commonHeadData={commonHeadBanner.result_list} />
|
||||
</>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user