WrenchBoard/Users-Wrench
3
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'familywaiting-offer-bug' of WrenchBoard/Users-Wrench into master

Browse Source
This commit is contained in:
Olusesan Ameye
2024-09-27 17:28:02 +00:00
committed by Gogs
parent 6815eea66c 7f631190dc
commit 27dc4090fb
2 changed files with 29 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/FamilyAcc/FamilyTableNew.jsx
+4 -4
View File
@@ -73,26 +73,26 @@ export default function FamilyTableNew() {
// Object that maps tab names to their corresponding components // Object that maps tab names to their corresponding components
const tabComponents = { const tabComponents = {
Tasks: ( tasks: (
<FamilyTasks <FamilyTasks
familyData={familyTasks} familyData={familyTasks}
action={familyAssignPopUpHandler} action={familyAssignPopUpHandler}
/> />
), ),
Waiting: ( waiting: (
<FamilyWaitlist <FamilyWaitlist
familyData={familyWaitList} familyData={familyWaitList}
setUpdatePage={setUpdatePage} setUpdatePage={setUpdatePage}
/> />
), ),
Pending: ( pending: (
<FamilyPending <FamilyPending
familyData={familyPending} familyData={familyPending}
/> />
), ),
}; };
const defaultTabComponent = tabComponents.Tasks; const defaultTabComponent = tabComponents.tasks;
// Selected tab component based on the current 'tab' // Selected tab component based on the current 'tab'
const selectedTabComponent = tabComponents[tab] || defaultTabComponent; const selectedTabComponent = tabComponents[tab] || defaultTabComponent;
src/components/jobPopout/OfferJobPopout.jsx
+25 -39
View File
@@ -145,48 +145,34 @@ function OfferJobPopout({ details, onClose, situation }) {
<div className="p-4 w-full md:col-span-3 md:border-r-2"> <div className="p-4 w-full md:col-span-3 md:border-r-2">
{/* INPUT SECTION */} {/* INPUT SECTION */}
<div className='grid md:grid-cols-2'> <div className='bg-[#FFFDEE]'>
<div className="my-2 md:flex"> <div className='grid md:grid-cols-2'>
{/* <Detail <div className="my-2 md:flex">
label="Date :" <label className='job-label w-full md:w-[150px] md:text-right'>Date :</label>
value={ <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white`}>
(details.offer_added && details.offer_added?.split(" ")[0]) || {
"default" (details.offer_added && details.offer_added?.split(" ")[0]) ||
} "default"
/> */} }
<label className='job-label w-full md:w-[150px] md:text-right'>Date :</label> </p>
<p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white`}> </div>
{
(details.offer_added && details.offer_added?.split(" ")[0]) || <div className="my-2 md:flex">
"default" <label className='job-label w-full md:w-[150px] md:text-right'>Expire :</label>
} <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white`}>{details.expire && details.expire.split(" ")[0]}</p>
</p> </div>
</div> </div>
<div className="my-2 md:flex"> <div className='grid md:grid-cols-2'>
{/* <Detail <div className="my-2 md:flex">
label="Offer Expire :" <label className='job-label w-full md:w-[150px] md:text-right'>Reward :</label>
value={details.expire && details.expire.split(" ")[0]} <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white`}>{thePrice}</p>
/> */} </div>
<label className='job-label w-full md:w-[150px] md:text-right'>Expire :</label>
<p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white`}>{details.expire && details.expire.split(" ")[0]}</p>
</div>
</div>
<div className='grid md:grid-cols-2'> <div className="my-2 md:flex">
<div className="my-2 md:flex"> <label className='job-label w-full md:w-[150px] md:text-right'>Duration :</label>
{/* <Detail label="Reward :" value={thePrice} /> */} <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white`}>{`${details.timeline_days} day(s)`}</p>
<label className='job-label w-full md:w-[150px] md:text-right'>Reward :</label> </div>
<p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white`}>{thePrice}</p>
</div>
<div className="my-2 md:flex">
{/* <Detail
label="Duration :"
value={`${details.timeline_days} day(s)`}
/> */}
<label className='job-label w-full md:w-[150px] md:text-right'>Duration :</label>
<p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white`}>{`${details.timeline_days} day(s)`}</p>
</div> </div>
</div> </div>