From 8016d1bd12b998e52e40c5edacfa5111af33532e Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Sat, 15 Jul 2023 18:59:22 +0100 Subject: [PATCH 01/12] assign to family hidden --- src/components/jobPopout/JobListPopout.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/jobPopout/JobListPopout.jsx b/src/components/jobPopout/JobListPopout.jsx index 2dc28ca..2af5c52 100644 --- a/src/components/jobPopout/JobListPopout.jsx +++ b/src/components/jobPopout/JobListPopout.jsx @@ -253,7 +253,7 @@ function JobListPopout({ details, onClose, situation }) { > {(props) => { return ( -
+ {/* Assign to Family */} Date: Sat, 15 Jul 2023 19:21:28 +0100 Subject: [PATCH 02/12] changed job message tab --- .../MyActiveJobs/ActiveJobMessage.jsx | 80 ++++++++++--------- src/components/MyActiveJobs/ActiveJobs.jsx | 18 +++-- 2 files changed, 51 insertions(+), 47 deletions(-) diff --git a/src/components/MyActiveJobs/ActiveJobMessage.jsx b/src/components/MyActiveJobs/ActiveJobMessage.jsx index 9feb091..75bd1d5 100644 --- a/src/components/MyActiveJobs/ActiveJobMessage.jsx +++ b/src/components/MyActiveJobs/ActiveJobMessage.jsx @@ -19,46 +19,48 @@ export default function ActiveJobMessage({ activeJobMesList }) { } return ( -
- - - - - - - {activeJobMesList.data.length ? - ( - - {currentActiveJobMesList.map((item, index) => ( - - + + ))} + + ) + : + activeJobMesList.error ? + ( + + + + + + ) + : + + + + + + } +
-
-
{item.msg_date} {item.msg_firstname}
- -
+
+
+ + + + + + + {activeJobMesList.data.length ? + ( + + {currentActiveJobMesList.map((item, index) => ( + + - - ))} - - ) - : - activeJobMesList.error ? - ( - - - - - - ) - : - - - - - - } -
+
+
{item.msg_date} {item.msg_firstname}
+ +
-
Opps! an error occurred. Please try again!
No Message Found!
+
Opps! an error occurred. Please try again!
No Message Found!
+
{/* PAGINATION BUTTON */} = activeJobMesList?.data?.length ? true : false} data={activeJobMesList?.data} start={indexOfFirstItem} stop={indexOfLastItem} /> diff --git a/src/components/MyActiveJobs/ActiveJobs.jsx b/src/components/MyActiveJobs/ActiveJobs.jsx index cfab6a6..baa7a21 100644 --- a/src/components/MyActiveJobs/ActiveJobs.jsx +++ b/src/components/MyActiveJobs/ActiveJobs.jsx @@ -367,23 +367,25 @@ function ActiveJobs(props) { {/* TEXTAREA SECTION */}
- {/*

Message(s)

*/} -
+
-- 2.34.1 From 608d5b92f1921b703d0eeab91d125a895770ba70 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Sat, 15 Jul 2023 22:24:38 +0100 Subject: [PATCH 03/12] history tab style changed --- src/components/History/index.jsx | 14 ++++++------- .../MyActiveJobs/ActiveJobMessage.jsx | 20 +++++++++---------- src/components/MyActiveJobs/ActiveJobs.jsx | 4 ++-- .../WalletComponent/RecentActivityTable.jsx | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/components/History/index.jsx b/src/components/History/index.jsx index 2fec60b..cb6a4a8 100644 --- a/src/components/History/index.jsx +++ b/src/components/History/index.jsx @@ -217,22 +217,22 @@ export default function History() { {/* */}
{/* switch button */} -
+
diff --git a/src/components/MyActiveJobs/ActiveJobMessage.jsx b/src/components/MyActiveJobs/ActiveJobMessage.jsx index 75bd1d5..2b39dc3 100644 --- a/src/components/MyActiveJobs/ActiveJobMessage.jsx +++ b/src/components/MyActiveJobs/ActiveJobMessage.jsx @@ -9,14 +9,14 @@ import PaginatedList from "../Pagination/PaginatedList"; import { handlePagingFunc } from "../Pagination/HandlePagination"; export default function ActiveJobMessage({ activeJobMesList }) { - const [currentPage, setCurrentPage] = useState(0); - const indexOfFirstItem = Number(currentPage); - const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE); - const currentActiveJobMesList = activeJobMesList?.data?.slice(indexOfFirstItem, indexOfLastItem); + // const [currentPage, setCurrentPage] = useState(0); + // const indexOfFirstItem = Number(currentPage); + // const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE); + // const currentActiveJobMesList = activeJobMesList?.data?.slice(indexOfFirstItem, indexOfLastItem); - const handlePagination = (e) => { - handlePagingFunc(e,setCurrentPage) - } + // const handlePagination = (e) => { + // handlePagingFunc(e,setCurrentPage) + // } return (
@@ -27,10 +27,10 @@ export default function ActiveJobMessage({ activeJobMesList }) { - {activeJobMesList.data.length ? + {activeJobMesList?.data?.length ? ( - {currentActiveJobMesList.map((item, index) => ( + {activeJobMesList.data.map((item, index) => (
@@ -63,7 +63,7 @@ export default function ActiveJobMessage({ activeJobMesList }) {
{/* PAGINATION BUTTON */} - = activeJobMesList?.data?.length ? true : false} data={activeJobMesList?.data} start={indexOfFirstItem} stop={indexOfLastItem} /> + {/* = activeJobMesList?.data?.length ? true : false} data={activeJobMesList?.data} start={indexOfFirstItem} stop={indexOfLastItem} /> */} {/* END OF PAGINATION BUTTON */}
) diff --git a/src/components/MyActiveJobs/ActiveJobs.jsx b/src/components/MyActiveJobs/ActiveJobs.jsx index baa7a21..c022744 100644 --- a/src/components/MyActiveJobs/ActiveJobs.jsx +++ b/src/components/MyActiveJobs/ActiveJobs.jsx @@ -353,7 +353,7 @@ function ActiveJobs(props) {
-
+

Actions @@ -459,7 +459,7 @@ function ActiveJobs(props) { {/* Buttons Sections */}
-
+