Compare commits

..

5 Commits

Author SHA1 Message Date
victorAnumudu e113f40c5c btn name changed based on job owner status 2023-09-27 14:13:04 +01:00
ameye 3fb996887b Merge branch 'send-to-group' of WrenchBoard/Users-Wrench into master 2023-09-27 07:52:15 +00:00
victorAnumudu 6d2794dd2f displays send to group based on env variable 2023-09-27 06:57:51 +01:00
CHIEFSOFT\ameye 8e683f12a2 env update 2023-09-26 17:07:16 -04:00
ameye 1910ea2bb6 Merge branch 'home-active-task-display' of WrenchBoard/Users-Wrench into master 2023-09-26 20:36:17 +00:00
9 changed files with 29 additions and 17 deletions
+3 -1
View File
@@ -82,4 +82,6 @@ REACT_APP_MAX_CREDIT_CARDS=4
REACT_APP_MAX_CREDIT_BANK_ACCOUNT=4
#Family
REACT_APP_MAX_FAMILY_MEMBERS=8
REACT_APP_MAX_FAMILY_MEMBERS=8
REACT_APP_SHOW_OFFER_GROUP_JOB=0
+3 -1
View File
@@ -50,4 +50,6 @@ REACT_APP_LINKEDIN_SOCIAL_LOGIN=0
REACT_APP_MAX_CREDIT_CARDS=4
REACT_APP_MAX_CREDIT_BANK_ACCOUNT=4
REACT_APP_MAX_FAMILY_MEMBERS=8
REACT_APP_MAX_FAMILY_MEMBERS=8
REACT_APP_SHOW_OFFER_GROUP_JOB=0
+3 -1
View File
@@ -56,4 +56,6 @@ REACT_APP_LINKEDIN_SOCIAL_LOGIN=0
REACT_APP_MAX_CREDIT_CARDS=4
REACT_APP_MAX_CREDIT_BANK_ACCOUNT=4
REACT_APP_MAX_FAMILY_MEMBERS=8
REACT_APP_MAX_FAMILY_MEMBERS=8
REACT_APP_SHOW_OFFER_GROUP_JOB=0
+1 -1
View File
@@ -67,7 +67,7 @@ export default function Home(props) {
useEffect(() => {
getMyActiveJobList();
}, []);
console.log('MyActiveJobList',MyActiveJobList)
return (
<Layout>
<div className="home-page-wrapper">
@@ -405,6 +405,7 @@ function ActiveJobs(props) {
name="message"
onChange={handleMessageChange}
value={messageToSend}
autoFocus
/>
) : (
<div className="p-4 w-full h-[300px] text-base text-slate-600 border border-slate-300">
@@ -113,9 +113,9 @@ export default function MyActiveJobTable({ MyJobList, className }) {
state: { ...value, pathname },
});
}}
className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
className="px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
>
View
{value.owner_status == 'OWNER' ? 'Manage' : 'Send Updates'}
</button>
</div>
</td>
@@ -18,7 +18,7 @@ export default function MyPendingJobTable({ MyJobList, className }) {
indexOfFirstItem,
indexOfLastItem
);
const handlePagination = (e) => {
handlePagingFunc(e, setCurrentPage);
};
@@ -103,9 +103,9 @@ export default function MyPendingJobTable({ MyJobList, className }) {
onClick={() => {
setJobPopout({ show: true, data: value });
}}
className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
className="px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
>
View
{value.owner_status == 'OWNER' ? 'Manage' : 'Send Updates'}
</button>
</td>
</tr>
+2 -2
View File
@@ -128,9 +128,9 @@ export default function MyJobTable({ className, ActiveJobList, Account }) {
state: { ...task, pathname },
});
}}
className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
className="px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
>
Manage
{task.owner_status == 'OWNER' ? 'Manage' : 'Send Updates'}
</button>
</div>
</div>
+11 -6
View File
@@ -168,7 +168,6 @@ function JobListPopout({ details, onClose, situation }) {
};
// console.log("Job List P >> ", details)
return (
<ModalCom action={onClose} situation={situation} className="job-popup">
<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">
@@ -338,7 +337,8 @@ function JobListPopout({ details, onClose, situation }) {
);
}}
</Formik>
{ process.env.REACT_APP_SHOW_OFFER_GROUP_JOB != 0 &&
<Formik
initialValues={initialValues}
validationSchema={validationSchema.fields.group}
@@ -368,6 +368,7 @@ function JobListPopout({ details, onClose, situation }) {
);
}}
</Formik>
}
</div>
{/* END OF ACTION SECTION */}
</div>
@@ -468,10 +469,14 @@ const JobFieldInput = ({
type="submit"
name={inputName}
onClick={errorHandler}
className={`px-2 py-1 text-sm text-white btn-gradient tracking-wide rounded-md ${
!value && "disabled:grayscale-[65%] transition duration-300"
}`}
disabled={!value}
// className={`px-2 py-1 text-sm text-white btn-gradient tracking-wide rounded-md ${
// !value && "disabled:grayscale-[65%] transition duration-300"
// }`}
className={`px-4 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white ${
!value && ""
}
`}
// disabled={!value}
>
{loader ? <LoadingSpinner size={5} /> : btnText}
</button>