Compare commits

...

4 Commits

6 changed files with 50 additions and 46 deletions
@@ -252,7 +252,7 @@ function NewJobListPopout({
]; ];
return ( return (
<div className="px-4 pb-3 w-full md:border-r-2 flex flex-col justify-between"> <div className="px-4 pb-3 w-full h-full md:border-r-2 flex flex-col justify-between">
{/* <p className='text-lg font-semibold text-slate-900 tracking-wide'>{details.title}</p> */} {/* <p className='text-lg font-semibold text-slate-900 tracking-wide'>{details.title}</p> */}
{/* INPUT SECTION */} {/* INPUT SECTION */}
@@ -320,7 +320,7 @@ function NewJobListPopout({
<> <>
{/* ACTION SECTION */} {/* ACTION SECTION */}
{+taskWalletSelector.amount > +details.price ? ( {+taskWalletSelector.amount > +details.price ? (
<div className="px-4 pb-3 w-full flex flex-col justify-between"> <div className="px-4 pb-3 w-full flex flex-col justify-between h-auto md:min-h-[450px]">
<h1 className="text-lg mt-3 font-medium tracking-wide text-black dark:text-white"> <h1 className="text-lg mt-3 font-medium tracking-wide text-black dark:text-white">
Send this Task to: Send this Task to:
</h1> </h1>
@@ -344,11 +344,11 @@ function NewJobListPopout({
{selectedTab == 'family' ? {selectedTab == 'family' ?
'Assign to family' 'Assign to family'
: selectedTab == 'public' ? : selectedTab == 'public' ?
'Offer this job to public' 'Place in Market'
: selectedTab == 'individual' ? : selectedTab == 'individual' ?
'Offer this job to individual' 'Assign to individual'
: selectedTab == 'group' ? : selectedTab == 'group' ?
'Offer this job to your Group' 'Preferred List'
: :
null null
} }
@@ -28,7 +28,7 @@ export default function AssignToFamily({
> >
{(props) => { {(props) => {
return ( return (
<Form className="w-full"> <Form className="w-full h-auto md:h-full flex flex-col justify-between">
<div className='w-full'> <div className='w-full'>
<div className='hidden w-full'> <div className='hidden w-full'>
<JobFieldInput <JobFieldInput
@@ -48,7 +48,7 @@ export default function AssignToFamily({
</div> </div>
<div className="mt-3 mb-1 flex justify-end items-center"> <div className="mt-3 mb-1 flex justify-end items-center">
<button <button
className={`px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white`} className={`uppercase px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white`}
type="submit" type="submit"
name='family' name='family'
> >
@@ -28,7 +28,7 @@ export default function AssignToGroup({
> >
{(props) => { {(props) => {
return ( return (
<Form className="w-full"> <Form className="w-full h-auto md:h-full flex flex-col justify-between">
<div className='w-full'> <div className='w-full'>
<div className='w-full'> <div className='w-full'>
<JobFieldInput <JobFieldInput
@@ -48,14 +48,14 @@ export default function AssignToGroup({
</div> </div>
<div className="mt-3 mb-1 flex justify-end items-center"> <div className="mt-3 mb-1 flex justify-end items-center">
<button <button
className={`px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white`} className={`uppercase px-4 h-11 flex justify-center items-center btn-gradient text-sm rounded-full text-white`}
type="submit" type="submit"
name='group' name='group'
> >
{loader?.jobFields ? {loader?.jobFields ?
<LoadingSpinner size={5} /> <LoadingSpinner size={5} />
: :
'Send Order to Group' 'Send Task to Group'
} }
</button> </button>
</div> </div>
@@ -32,7 +32,7 @@ export default function AssignToIndividual({
> >
{(props) => { {(props) => {
return ( return (
<Form className="w-full"> <Form className="w-full h-auto md:h-full flex flex-col justify-between">
<div className='w-full'> <div className='w-full'>
<div className='w-full'> <div className='w-full'>
<JobFieldInput <JobFieldInput
@@ -41,7 +41,8 @@ export default function AssignToIndividual({
value={props?.values.individual} value={props?.values.individual}
placeholder="Enter email of individual" placeholder="Enter email of individual"
inputHandler={props?.handleChange} inputHandler={props?.handleChange}
parentClass="w-full flex flex-col gap-4" parentClass="w-full"
labelClass="mb-0"
/> />
<p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide"> <p className="h-4 text-[13px] font-light italic text-red-600 tracking-wide">
{(props.errors.individual && props.touched.individual) && ( {(props.errors.individual && props.touched.individual) && (
@@ -52,7 +53,7 @@ export default function AssignToIndividual({
</div> </div>
<div className="mt-3 mb-1 flex justify-end items-center"> <div className="mt-3 mb-1 flex justify-end items-center">
<button <button
className={`px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white`} className={`uppercase px-4 h-11 flex justify-center items-center btn-gradient text-sm rounded-full text-white`}
type="submit" type="submit"
name='individual' name='individual'
> >
@@ -15,8 +15,8 @@ const validationSchema = Yup.object().shape({
let initialValues = { let initialValues = {
public: "", public: "",
depend_uid: '', depend_uid: "",
timeline: '' timeline: "0"
}; };
export default function AssignToPublic({ export default function AssignToPublic({
@@ -36,7 +36,7 @@ export default function AssignToPublic({
> >
{(props) => { {(props) => {
return ( return (
<Form className="w-full"> <Form className="w-full h-auto md:h-full flex flex-col justify-between">
<div className='w-full'> <div className='w-full'>
<div className='mb-3 w-full flex flex-col xxs:flex-row items-center gap-1'> <div className='mb-3 w-full flex flex-col xxs:flex-row items-center gap-1'>
<label className='w-full xxs:max-w-[120px] xxs:text-right'>Depends on:</label> <label className='w-full xxs:max-w-[120px] xxs:text-right'>Depends on:</label>
@@ -102,14 +102,14 @@ export default function AssignToPublic({
</div> </div>
<div className="mt-3 mb-1 flex justify-end items-center"> <div className="mt-3 mb-1 flex justify-end items-center">
<button <button
className={`px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white`} className={`uppercase px-4 h-11 flex justify-center items-center btn-gradient text-sm rounded-full text-white`}
type="submit" type="submit"
name='public' name='public'
> >
{loader?.jobFields ? {loader?.jobFields ?
<LoadingSpinner size={5} /> <LoadingSpinner size={5} />
: :
'Show Task to Public' 'Place Task to the Market'
} }
</button> </button>
</div> </div>
@@ -36,7 +36,9 @@ export default function JobFieldInput({
{(inputName == "family" || inputName == "public" || inputName == "timeline") && {(inputName == "family" || inputName == "public" || inputName == "timeline") &&
Array.isArray(data) && ( Array.isArray(data) && (
<> <>
{inputName != "timeline" &&
<option value="">{optionText}</option> <option value="">{optionText}</option>
}
{data?.map((item, idx) => ( {data?.map((item, idx) => (
<React.Fragment key={idx}> <React.Fragment key={idx}>
{inputName === "family" && {inputName === "family" &&
@@ -98,6 +100,7 @@ export default function JobFieldInput({
inputBg="bg-white" inputBg="bg-white"
parentClass={`${parentClass}`} parentClass={`${parentClass}`}
disable={disabled} disable={disabled}
labelClass={labelClass}
/> />
)} )}
</div> </div>