Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 393b4e7b37 | |||
| b2411285bc | |||
| 091faec9bd | |||
| 15fc2e6c9b | |||
| 3ef68adf7e |
@@ -77,7 +77,7 @@ export default function FamilyTable({
|
|||||||
>
|
>
|
||||||
<td className="py-4">
|
<td className="py-4">
|
||||||
<div className="flex space-x-2 items-center w-full">
|
<div className="flex space-x-2 items-center w-full">
|
||||||
<div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1]">
|
<div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
|
||||||
<img
|
<img
|
||||||
// src={profile_picture}
|
// src={profile_picture}
|
||||||
src={image || profile_picture || localImgLoad(`images/icons/${banner}`)}
|
src={image || profile_picture || localImgLoad(`images/icons/${banner}`)}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ export default function ModalCom({ action, children, situation, isOpen, classNam
|
|||||||
onClick={action || isOpen}
|
onClick={action || isOpen}
|
||||||
className="fixed top-0 left-0 w-full lg:h-[100vh] h-full bg-black bg-opacity-40 backdrop-filter backdrop-blur-sm z-50"
|
className="fixed top-0 left-0 w-full lg:h-[100vh] h-full bg-black bg-opacity-40 backdrop-filter backdrop-blur-sm z-50"
|
||||||
></div>
|
></div>
|
||||||
<div className={`children-element fixed lg:h-100vh h-full z-[99999999999999] w-full lg:w-auto ${className}`}>
|
<div className={`fixed lg:h-100vh h-full z-[99999999999999] w-full lg:w-auto inset-0 flex flex-col justify-center items-center ${className}`}>
|
||||||
{children && children}
|
{children && children}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ export default function Layout({ children }) {
|
|||||||
</div>
|
</div>
|
||||||
{logoutModal && (
|
{logoutModal && (
|
||||||
<ModalCom action={logoutModalHandler} situation={logoutModal}>
|
<ModalCom action={logoutModalHandler} situation={logoutModal}>
|
||||||
<div className="logout-modal-wrapper lg:w-[460px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
|
<div className="logout-modal-wrapper w-11/12 sm:w-[460px] bg-white dark:bg-dark-white lg:rounded-2xl">
|
||||||
<div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29] border-light-purple dark:border-[#5356fb29] ">
|
<div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b dark:border-[#5356fb29] border-light-purple dark:border-[#5356fb29] ">
|
||||||
<h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
|
<h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
|
||||||
Confirm
|
Confirm
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ function DeleteJobPopout({ details, onClose, situation }) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<ModalCom action={onClose} situation={situation}>
|
<ModalCom action={onClose} situation={situation}>
|
||||||
<div className="logout-modal-wrapper lg:w-[600px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
|
<div className="logout-modal-wrapper lg:w-[600px] bg-white dark:bg-dark-white lg:rounded-2xl">
|
||||||
<div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
|
<div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
|
||||||
<h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
|
<h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
|
||||||
Delete Job
|
Delete Job
|
||||||
|
|||||||
@@ -215,8 +215,8 @@ const EditJobPopOut = ({
|
|||||||
const isWindows = /Windows/.test(navigator.userAgent);
|
const isWindows = /Windows/.test(navigator.userAgent);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ModalCom action={onClose} situation={situation} className="edit-popup">
|
<ModalCom action={onClose} situation={situation}>
|
||||||
<div className="logout-modal-wrapper lg:w-[600px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
|
<div className="logout-modal-wrapper w-11/12 lg:w-[600px] bg-white dark:bg-dark-white lg:rounded-2xl">
|
||||||
<div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
|
<div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
|
||||||
<h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
|
<h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
|
||||||
Edit Job
|
Edit Job
|
||||||
|
|||||||
@@ -23,6 +23,10 @@ const validationSchema = Yup.object().shape({
|
|||||||
});
|
});
|
||||||
|
|
||||||
function JobListPopout({ details, onClose, situation }) {
|
function JobListPopout({ details, onClose, situation }) {
|
||||||
|
|
||||||
|
const [selectedTab, setSelectedTab] = useState('public')
|
||||||
|
const tabs = ['public', 'individual', 'group']
|
||||||
|
|
||||||
const dispatch = useDispatch()
|
const dispatch = useDispatch()
|
||||||
|
|
||||||
const [requestStatus, setRequestStatus] = useState({message:'', status:false})
|
const [requestStatus, setRequestStatus] = useState({message:'', status:false})
|
||||||
@@ -170,6 +174,7 @@ const [requestStatus, setRequestStatus] = useState({message:'', status:false})
|
|||||||
if(status != 200 || data.internal_return < 0){
|
if(status != 200 || data.internal_return < 0){
|
||||||
setRequestStatus({message:'Unable to complete', status:false})
|
setRequestStatus({message:'Unable to complete', status:false})
|
||||||
return setTimeout(()=>{
|
return setTimeout(()=>{
|
||||||
|
setLoader({ jobFields: false });
|
||||||
setRequestStatus({message:'', status:false})
|
setRequestStatus({message:'', status:false})
|
||||||
},3000)
|
},3000)
|
||||||
}
|
}
|
||||||
@@ -213,8 +218,8 @@ const [requestStatus, setRequestStatus] = useState({message:'', status:false})
|
|||||||
|
|
||||||
// console.log("Job List P >> ", details)
|
// console.log("Job List P >> ", details)
|
||||||
return (
|
return (
|
||||||
<ModalCom action={onClose} situation={situation} className="job-popup">
|
<ModalCom action={onClose} situation={situation} className="">
|
||||||
<div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
|
<div className="logout-modal-wrapper w-[90%] md:w-[768px] bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
|
||||||
<div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29] border-light-purple">
|
<div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29] border-light-purple">
|
||||||
<h1 className="text-base md:text-lg font-bold text-dark-gray dark:text-white tracking-wide">
|
<h1 className="text-base md:text-lg font-bold text-dark-gray dark:text-white tracking-wide">
|
||||||
{details.title}
|
{details.title}
|
||||||
@@ -285,14 +290,24 @@ const [requestStatus, setRequestStatus] = useState({message:'', status:false})
|
|||||||
/>
|
/>
|
||||||
<p>{errMsg.deliveryDetail}</p>
|
<p>{errMsg.deliveryDetail}</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{requestStatus.message &&
|
|
||||||
<p className={`w-full text-lg ${requestStatus.status ? 'text-emerald-600' : 'text-red-600'}`}>{requestStatus.message}</p>
|
|
||||||
}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* ACTION SECTION */}
|
{/* ACTION SECTION */}
|
||||||
<div className="p-4 w-full md:w-2/4 h-full">
|
<div className="p-4 w-full md:w-2/4 h-full">
|
||||||
|
<div className="grid grid-cols-3 my-4 border-b-2">
|
||||||
|
{tabs.map(item => (
|
||||||
|
<button
|
||||||
|
className={`px-4 py-1 rounded-t-2xl ${selectedTab == item ? 'btn-gradient border-[2px] text-white' : 'bg-white text-[#000] border-t-[2px]'}`}
|
||||||
|
value={item}
|
||||||
|
name={item}
|
||||||
|
onClick={()=>setSelectedTab(item)}
|
||||||
|
>
|
||||||
|
{item[0].toUpperCase() + item.slice(1)}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{selectedTab == 'family' &&
|
||||||
<Formik
|
<Formik
|
||||||
initialValues={initialValues}
|
initialValues={initialValues}
|
||||||
validationSchema={validationSchema.fields.family}
|
validationSchema={validationSchema.fields.family}
|
||||||
@@ -323,7 +338,9 @@ const [requestStatus, setRequestStatus] = useState({message:'', status:false})
|
|||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
</Formik>
|
</Formik>
|
||||||
|
}
|
||||||
|
|
||||||
|
{selectedTab == 'public' &&
|
||||||
<Formik
|
<Formik
|
||||||
initialValues={initialValues}
|
initialValues={initialValues}
|
||||||
validationSchema={validationSchema.fields.public}
|
validationSchema={validationSchema.fields.public}
|
||||||
@@ -354,7 +371,9 @@ const [requestStatus, setRequestStatus] = useState({message:'', status:false})
|
|||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
</Formik>
|
</Formik>
|
||||||
|
}
|
||||||
|
|
||||||
|
{selectedTab == 'individual' &&
|
||||||
<Formik
|
<Formik
|
||||||
initialValues={initialValues}
|
initialValues={initialValues}
|
||||||
validationSchema={validationSchema.fields.individual}
|
validationSchema={validationSchema.fields.individual}
|
||||||
@@ -385,8 +404,10 @@ const [requestStatus, setRequestStatus] = useState({message:'', status:false})
|
|||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
</Formik>
|
</Formik>
|
||||||
|
}
|
||||||
|
|
||||||
{ process.env.REACT_APP_SHOW_OFFER_GROUP_JOB != 0 &&
|
{/* { process.env.REACT_APP_SHOW_OFFER_GROUP_JOB != 0 && } */}
|
||||||
|
{selectedTab == 'group' &&
|
||||||
<Formik
|
<Formik
|
||||||
initialValues={initialValues}
|
initialValues={initialValues}
|
||||||
validationSchema={validationSchema.fields.group}
|
validationSchema={validationSchema.fields.group}
|
||||||
@@ -418,6 +439,10 @@ const [requestStatus, setRequestStatus] = useState({message:'', status:false})
|
|||||||
}}
|
}}
|
||||||
</Formik>
|
</Formik>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{requestStatus.message &&
|
||||||
|
<p className={`mt-4 w-full text-lg ${requestStatus.status ? 'text-emerald-600' : 'text-red-600'}`}>{requestStatus.message}</p>
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
{/* END OF ACTION SECTION */}
|
{/* END OF ACTION SECTION */}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -133,8 +133,8 @@ function PendingJobsPopout({ details, onClose, situation }) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ModalCom action={onClose} situation={situation} className="edit-popup">
|
<ModalCom action={onClose} situation={situation}>
|
||||||
<div className="logout-modal-wrapper lw-[90%] md:w-[768px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
|
<div className="logout-modal-wrapper w-[90%] md:w-[768px] bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
|
||||||
<div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29] border-light-purple">
|
<div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29] border-light-purple">
|
||||||
<h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
|
<h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
|
||||||
Manage Pending Item
|
Manage Pending Item
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ import ModalCom from "../components/Helpers/ModalCom";
|
|||||||
|
|
||||||
function AddJobPage({ action, situation, categories }) {
|
function AddJobPage({ action, situation, categories }) {
|
||||||
return (
|
return (
|
||||||
<ModalCom action={action} situation={situation} className="edit-popup">
|
<ModalCom action={action} situation={situation}>
|
||||||
<div className="lg:w-[600px] w-full lg:overflow-hidden lg:rounded-2xl bg-white dark:bg-dark-white dark:text-white">
|
<div className="lg:w-[600px] w-11/12 lg:overflow-hidden lg:rounded-2xl bg-white dark:bg-dark-white dark:text-white">
|
||||||
<div className="heading flex justify-between items-center py-6 md:px-[30px] px-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
|
<div className="heading flex justify-between items-center py-6 md:px-[30px] px-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
|
||||||
<p className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
|
<p className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
|
||||||
Create New Job
|
Create New Job
|
||||||
|
|||||||
Reference in New Issue
Block a user