From 120f2c186633756ec9757a273b85b1d7462e848a Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 11 Jun 2023 17:59:04 -0400 Subject: [PATCH 1/7] formatingf actoion section --- .../MyActiveJobs/JobActions/CurrentJobAction.jsx | 2 +- .../MyActiveJobs/JobActions/CurrentTaskAction.jsx | 14 ++++++++------ .../MyActiveJobs/JobActions/ReviewJobAction.jsx | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/components/MyActiveJobs/JobActions/CurrentJobAction.jsx b/src/components/MyActiveJobs/JobActions/CurrentJobAction.jsx index 89276c2..79f540e 100644 --- a/src/components/MyActiveJobs/JobActions/CurrentJobAction.jsx +++ b/src/components/MyActiveJobs/JobActions/CurrentJobAction.jsx @@ -7,7 +7,7 @@ function CurrentJobAction() { -
+

diff --git a/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx b/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx index 83fd99b..afbed5f 100644 --- a/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx +++ b/src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx @@ -37,14 +37,16 @@ function CurrentTaskAction({jobDetails}) { - + diff --git a/src/components/MyActiveJobs/JobActions/ReviewJobAction.jsx b/src/components/MyActiveJobs/JobActions/ReviewJobAction.jsx index 7f4bc9b..ca752cc 100644 --- a/src/components/MyActiveJobs/JobActions/ReviewJobAction.jsx +++ b/src/components/MyActiveJobs/JobActions/ReviewJobAction.jsx @@ -7,7 +7,7 @@ function ReviewJobAction() {
+
-
-

- I completed this task and ready for review and acceptance. -

-
+

+ I completed this task and ready for review and acceptance. +

+ {/*
*/} + + {/*
*/}
-
+

From b4ff0b5ecaad7a1534b30867733ba1c3dc7e1c12 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 11 Jun 2023 18:39:05 -0400 Subject: [PATCH 2/7] adjust colors --- src/index.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/index.css b/src/index.css index 8a07166..e4c7fcb 100644 --- a/src/index.css +++ b/src/index.css @@ -55,13 +55,16 @@ background-color: transparent; } .lr{ - background-color: lightpink; + background-color: #e1cace; } .lg{ - background-color: lightgreen; + background-color: #a7dca7; } .lb{ - background-color: lightblue; + background-color: #b3ccd7; +} +.ly{ + background-color: #eeee67; } .offer-slide-item{ background: rgb(2,0,36); From 8255eedb0091175e28cc166e63b8b02b5e92603b Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 11 Jun 2023 21:25:17 -0400 Subject: [PATCH 3/7] offer interst starter --- src/Routers.jsx | 2 ++ src/views/OffersInterestPage.jsx | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 src/views/OffersInterestPage.jsx diff --git a/src/Routers.jsx b/src/Routers.jsx index f48638f..460a8b1 100644 --- a/src/Routers.jsx +++ b/src/Routers.jsx @@ -43,6 +43,7 @@ import AuthRedirect from "./views/AuthRedirect"; import MyPastDueJobsPage from "./views/MyPastDueJobsPage"; import BlogPage from "./views/BlogPage"; import MyReviewDueJobsPage from "./views/MyReviewDueJobsPage"; +import OffersInterestPage from "./views/OffersInterestPage"; export default function Routers() { return ( @@ -97,6 +98,7 @@ export default function Routers() { } /> } /> } /> + } /> state.commonHeadBanner) + + return ( + <> + + + ); +} \ No newline at end of file From f5c3922a02e4b56a2365a38a3e9337a08b19abf6 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Mon, 12 Jun 2023 03:31:58 +0100 Subject: [PATCH 4/7] view all message popup added --- src/components/MyActiveJobs/ActiveJobs.jsx | 130 ++++++++++++++++++++- src/index.css | 14 +++ 2 files changed, 142 insertions(+), 2 deletions(-) diff --git a/src/components/MyActiveJobs/ActiveJobs.jsx b/src/components/MyActiveJobs/ActiveJobs.jsx index db690aa..e6a3701 100644 --- a/src/components/MyActiveJobs/ActiveJobs.jsx +++ b/src/components/MyActiveJobs/ActiveJobs.jsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from "react"; +import React, { useEffect, useState, useRef, forwardRef } from "react"; import { useSelector } from "react-redux"; import Layout from "../Partials/Layout"; import { useNavigate } from "react-router-dom"; @@ -6,6 +6,8 @@ import ActiveJobMessage from "./ActiveJobMessage"; import LoadingSpinner from "../Spinners/LoadingSpinner"; import CountDown from "../Helpers/CountDown"; import IndexJobActions from "./JobActions/IndexJobActions"; +import ModalCom from "../Helpers/ModalCom"; +import { useReactToPrint } from "react-to-print"; import usersService from "../../services/UsersService"; @@ -25,6 +27,18 @@ function ActiveJobs(props) { let [requestStatus, setRequestStatus] = useState({loading: false, status: false, message: ''}) + let [popUp, setPopUp] = useState(false) // STATE FOR POPOUT MODAL + + const printRef = useRef(); + // to handle printing + const handlePrint = useReactToPrint({ + content: () => printRef.current, + }); + + const popUpHandler = () => { // FUNCTION TO HANDLE POPOUT + setPopUp(prev => !prev) + } + // FUNCTION TO HANDLE MESSAGE CHANGE const handleMessageChange = ({target:{value}}) => { setMessageToSend(value) @@ -395,7 +409,12 @@ function ActiveJobs(props) { {/* MESSAGE SECTION */}
-

Message

+
+

Message

+ +
{props.activeJobMesList.loading ? : @@ -405,6 +424,12 @@ function ActiveJobs(props) { {/* END OF MESSAGE */}
+ {/* POPOUT SECTION */} + {popUp && + + } + {/* END OF POPOUT SECTION */} + ); } @@ -429,3 +454,104 @@ function convertFileToBase64(file) { }); } +//POPOUT COMPONENT FUNCTION +const PopModal = ({popUpHandler, popUp, details, activeJobMesList, handlePrint, myRef}) => { + return ( + +
+
+

+ {details?.contract} +

+ +
+
+
+ {activeJobMesList.loading ? + + : +
+ + + + + + + {activeJobMesList?.data?.length ? + ( + + {activeJobMesList?.data?.map((item, index) => ( + + + + ))} + + ) + : + activeJobMesList.error ? + ( + + + + + + ) + : + + + + + + } +
+
+
{item.msg_date} {item.msg_firstname}
+ +
+ +
Opps! an error occurred. Please try again!
No Message Found!
+
+ } +
+ + {/* btn */} +
+
+ + +
+
+
+
+ + ) +} + diff --git a/src/index.css b/src/index.css index e4c7fcb..93c3d14 100644 --- a/src/index.css +++ b/src/index.css @@ -621,6 +621,20 @@ input[type="text"][dir="rtl"] { .modal-com { transition: all 0.1s ease-in-out; } + +@media print { + body .modal-com{ + height: 100%; + overflow: hidden; + } + .job-action-modal-body button, .message-modal-header button { + display: none; + } + .message-modal-wrapper .message-table{ + height: 100%; + overflow-y: hidden; + } +} /* TODO: =================================modal end================================= */ /* TODO: =================================login ================================= */ .btn-login { From c01cfa104c3bc19d4d234189b7946fdb652b9ff1 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Mon, 12 Jun 2023 03:52:30 +0100 Subject: [PATCH 5/7] Interest count data update --- src/components/MarketPlace/PopUp/MarketPopUp.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/MarketPlace/PopUp/MarketPopUp.jsx b/src/components/MarketPlace/PopUp/MarketPopUp.jsx index 0150037..a68d67a 100644 --- a/src/components/MarketPlace/PopUp/MarketPopUp.jsx +++ b/src/components/MarketPlace/PopUp/MarketPopUp.jsx @@ -245,7 +245,7 @@ const MarketPopUp = ({ details, onClose, situation, marketInt }) => {

- Interest: {marketInt?.public_view} + Interest: {details.interest_count}

Expire: {expireIntDate}

From 1cc0c314a249f17300ad6c497da72dcdb2542f6c Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Mon, 12 Jun 2023 04:12:23 +0100 Subject: [PATCH 6/7] banner link aligned --- src/components/UserHeader/RecomendedSliders.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/UserHeader/RecomendedSliders.jsx b/src/components/UserHeader/RecomendedSliders.jsx index 38573bd..dd999ae 100644 --- a/src/components/UserHeader/RecomendedSliders.jsx +++ b/src/components/UserHeader/RecomendedSliders.jsx @@ -102,7 +102,7 @@ export default function RecomendedSliders({ className,bannerData }) { {bannerData.map((item, index) => (
-
+
{/* title */}

From e76b589e4d76b4b2b5fee2550d1d623dc3765380 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Mon, 12 Jun 2023 04:25:27 +0100 Subject: [PATCH 7/7] popout top amended --- src/components/MyActiveJobs/ActiveJobs.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/MyActiveJobs/ActiveJobs.jsx b/src/components/MyActiveJobs/ActiveJobs.jsx index e6a3701..53f000b 100644 --- a/src/components/MyActiveJobs/ActiveJobs.jsx +++ b/src/components/MyActiveJobs/ActiveJobs.jsx @@ -457,7 +457,7 @@ function convertFileToBase64(file) { //POPOUT COMPONENT FUNCTION const PopModal = ({popUpHandler, popUp, details, activeJobMesList, handlePrint, myRef}) => { return ( - +