Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into enable-and-active-jobs

This commit is contained in:
Ebube
2023-05-29 23:59:18 +01:00
12 changed files with 153 additions and 95 deletions
+7 -16
View File
@@ -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 => {
@@ -95,7 +91,7 @@ function OfferJobPopout({details, onClose, situation}) {
</div>
<div className='md:flex bg-white rounded-lg shadow-lg'>
<div className='p-4 w-full md:w-3/4 md:border-r-2'>
<p className='text-lg my-5 font-semibold text-slate-900 tracking-wide'>Opportunity to make some money by introducing 10 of our recent stories from our</p>
<p className='text-lg my-5 font-semibold text-slate-900 tracking-wide'>{details.title}</p>
{/* INPUT SECTION */}
<div className='my-2 md:flex'>
@@ -152,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
</button>
}
@@ -166,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
</button>
}
@@ -191,19 +187,14 @@ function OfferJobPopout({details, onClose, situation}) {
{/* close button */}
<div className="p-6 flex justify-end">
{requestStatus.loading && requestStatus.trigger == 'cancel' ?
<LoadingSpinner size={8} color='sky-blue' />
:
<button
onClick={handleOffer}
<button
onClick={onClose}
disabled={requestStatus.loading}
type="button"
name='cancel'
className="border border-red-500 text-red-500 text-18 tracking-wide px-2 py-2 rounded-full"
className="border-gradient text-18 tracking-wide px-2 py-2 rounded-full"
>
Cancel
<span className="text-gradient">Cancel</span>
</button>
}
</div>
{/* end of close button */}
</div>
@@ -39,7 +39,7 @@ function PendingJobsPopout({details, onClose, situation}) {
</div>
<div className='md:flex bg-white rounded-lg shadow-lg'>
<div className='p-4 w-full md:w-3/4 md:border-r-2'>
<p className='text-base font-semibold text-slate-900 tracking-wide'>Opportunity to make some money by introducing 10 of our recent stories from our</p>
<p className='text-base font-semibold text-slate-900 tracking-wide'>{details.title}</p>
<div className='my-2 p-2 flex justify-start items-center space-x-2 bg-red-100 border-2 border-red-300'>
<span className='w-8 h-8 text-center text-sm rounded-full flex justify-center items-center text-red-300 bg-yellow-100'>!</span>
<div className=''>
@@ -110,15 +110,15 @@ function PendingJobsPopout({details, onClose, situation}) {
</div>
<div className='my-3'>
<button className='px-2 py-1 text-sm text-white btn-gradient tracking-wide rounded-md'>Extend by a week</button>
<button className='px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white'>Extend by a week</button>
</div>
<div className='my-3'>
<button className='px-2 py-1 text-sm text-white btn-gradient tracking-wide rounded-md'>Send to me</button>
<button className='px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white'>Send to me</button>
</div>
<div className='mt-10 md:mt-32 md:flex md:justify-center'>
<button className='px-2 py-1 text-sm text-white bg-red-500 hover:opacity-90 rounded-md'>Cancel Offer</button>
<button className='px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white'>Cancel Offer</button>
</div>
</div>
</div>