From 6d2794dd2f0f4855d46048f130319318e8dc4997 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Wed, 27 Sep 2023 06:57:51 +0100 Subject: [PATCH 1/2] displays send to group based on env variable --- .env | 2 +- .env.development | 2 +- .env.production | 2 +- src/components/jobPopout/JobListPopout.jsx | 17 +++++++++++------ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 8809860..2a65daa 100644 --- a/.env +++ b/.env @@ -84,4 +84,4 @@ REACT_APP_MAX_CREDIT_BANK_ACCOUNT=4 #Family REACT_APP_MAX_FAMILY_MEMBERS=8 -REACT_SHOW_OFFER_GROUP_JOB=0 \ No newline at end of file +REACT_APP_SHOW_OFFER_GROUP_JOB=0 \ No newline at end of file diff --git a/.env.development b/.env.development index b42cb73..32ca334 100644 --- a/.env.development +++ b/.env.development @@ -52,4 +52,4 @@ REACT_APP_MAX_CREDIT_BANK_ACCOUNT=4 REACT_APP_MAX_FAMILY_MEMBERS=8 -REACT_SHOW_OFFER_GROUP_JOB=0 \ No newline at end of file +REACT_APP_SHOW_OFFER_GROUP_JOB=0 \ No newline at end of file diff --git a/.env.production b/.env.production index 9b9c31d..3b22bb1 100644 --- a/.env.production +++ b/.env.production @@ -58,4 +58,4 @@ REACT_APP_MAX_CREDIT_BANK_ACCOUNT=4 REACT_APP_MAX_FAMILY_MEMBERS=8 -REACT_SHOW_OFFER_GROUP_JOB=0 +REACT_APP_SHOW_OFFER_GROUP_JOB=0 diff --git a/src/components/jobPopout/JobListPopout.jsx b/src/components/jobPopout/JobListPopout.jsx index 2226b6a..527ec22 100644 --- a/src/components/jobPopout/JobListPopout.jsx +++ b/src/components/jobPopout/JobListPopout.jsx @@ -168,7 +168,6 @@ function JobListPopout({ details, onClose, situation }) { }; // console.log("Job List P >> ", details) - return (
@@ -338,7 +337,8 @@ function JobListPopout({ details, onClose, situation }) { ); }} - + + { process.env.REACT_APP_SHOW_OFFER_GROUP_JOB != 0 && + }
{/* END OF ACTION SECTION */} @@ -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 ? : btnText} From e113f40c5c1a2b91cd5ecfbb536602247afee619 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Wed, 27 Sep 2023 14:13:04 +0100 Subject: [PATCH 2/2] btn name changed based on job owner status --- src/components/Home/index.jsx | 2 +- src/components/MyActiveJobs/ActiveJobs.jsx | 1 + src/components/MyActiveJobs/MyActiveJobTable.jsx | 4 ++-- src/components/MyPendingJobs/MyPendingJobTable.jsx | 6 +++--- src/components/MyTasks/MyJobTable.jsx | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/components/Home/index.jsx b/src/components/Home/index.jsx index cbb7a83..9e9046e 100644 --- a/src/components/Home/index.jsx +++ b/src/components/Home/index.jsx @@ -67,7 +67,7 @@ export default function Home(props) { useEffect(() => { getMyActiveJobList(); }, []); -console.log('MyActiveJobList',MyActiveJobList) + return (
diff --git a/src/components/MyActiveJobs/ActiveJobs.jsx b/src/components/MyActiveJobs/ActiveJobs.jsx index 53dcc6f..0b1b93a 100644 --- a/src/components/MyActiveJobs/ActiveJobs.jsx +++ b/src/components/MyActiveJobs/ActiveJobs.jsx @@ -405,6 +405,7 @@ function ActiveJobs(props) { name="message" onChange={handleMessageChange} value={messageToSend} + autoFocus /> ) : (
diff --git a/src/components/MyActiveJobs/MyActiveJobTable.jsx b/src/components/MyActiveJobs/MyActiveJobTable.jsx index 0de00fc..f716a0c 100644 --- a/src/components/MyActiveJobs/MyActiveJobTable.jsx +++ b/src/components/MyActiveJobs/MyActiveJobTable.jsx @@ -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'}
diff --git a/src/components/MyPendingJobs/MyPendingJobTable.jsx b/src/components/MyPendingJobs/MyPendingJobTable.jsx index cdc1bd8..7b0d06d 100644 --- a/src/components/MyPendingJobs/MyPendingJobTable.jsx +++ b/src/components/MyPendingJobs/MyPendingJobTable.jsx @@ -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'} diff --git a/src/components/MyTasks/MyJobTable.jsx b/src/components/MyTasks/MyJobTable.jsx index cd82762..2c2bdf0 100644 --- a/src/components/MyTasks/MyJobTable.jsx +++ b/src/components/MyTasks/MyJobTable.jsx @@ -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'}