From 024c8bbed18ed5d0b7547e3ceca5c2a2b535910f Mon Sep 17 00:00:00 2001 From: Ebube Date: Sat, 3 Jun 2023 17:07:34 +0100 Subject: [PATCH 1/4] . --- src/components/Partials/Header.jsx | 2 +- .../jobPopout/PendingJobsPopout.jsx | 41 ++++++++++++------- 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/components/Partials/Header.jsx b/src/components/Partials/Header.jsx index 24b26c1..11a586b 100644 --- a/src/components/Partials/Header.jsx +++ b/src/components/Partials/Header.jsx @@ -100,7 +100,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) { // User Profile let { firstname, lastname, email, profile_pic } = userDetails; - let userEmail = email.split("@")[0]; + let userEmail = email?.split("@")[0]; return ( <> diff --git a/src/components/jobPopout/PendingJobsPopout.jsx b/src/components/jobPopout/PendingJobsPopout.jsx index a4f2681..5ec9a29 100644 --- a/src/components/jobPopout/PendingJobsPopout.jsx +++ b/src/components/jobPopout/PendingJobsPopout.jsx @@ -2,37 +2,39 @@ import React, { useMemo, useState } from "react"; import Detail from "./popoutcomponent/Detail"; import ModalCom from "../Helpers/ModalCom"; import usersService from "../../services/UsersService"; +import LoadingSpinner from "../Spinners/LoadingSpinner"; function PendingJobsPopout({ details, onClose, situation }) { - const [pendingJobLoader, setPendingJobLoader] = useState(false) + const [pendingJobLoader, setPendingJobLoader] = useState({ + extend: false, + offer: false, + }); const apiCall = useMemo(() => new usersService(), []); - + const handlePendingJobsBtn = async ({ target: { name } }) => { - setPendingJobLoader(true) let { job_uid, offer_code } = details; - let reqData; - let pendingData = { job_uid, offer_code }; + let reqData = { ...pendingData }; if (name === "extend") { try { - reqData = { ...pendingData }; + setPendingJobLoader({ extend: true }); let { data } = await apiCall.pendingJobExtend(reqData); console.log("This is for extend", data); - setPendingJobLoader(false) + setPendingJobLoader({ extend: false }); } catch (error) { - setPendingJobLoader(false) + setPendingJobLoader({ extend: false }); throw new Error(error); } } else if (name === "offer") { try { - reqData = { ...pendingData }; + setPendingJobLoader({ offer: true }); let { data } = await apiCall.pendingJobSendTome(reqData); console.log("This is for offer", data); - setPendingJobLoader(false) + setPendingJobLoader({ offer: false }); } catch (error) { - setPendingJobLoader(false) + setPendingJobLoader({ offer: false }); throw new Error(error); } } else return; @@ -159,7 +161,13 @@ function PendingJobsPopout({ details, onClose, situation }) { onClick={handlePendingJobsBtn} name="extend" > - Extend by a week + {pendingJobLoader.extend ? ( +
+ +
+ ) : ( + "Extend by a week" + )} @@ -169,10 +177,15 @@ function PendingJobsPopout({ details, onClose, situation }) { onClick={handlePendingJobsBtn} name="offer" > - Send to me + {pendingJobLoader.offer ? ( +
+ +
+ ) : ( + "Send to me" + )} -
-
@@ -38,902 +32,233 @@ export default function HomeActivities({ className }) { - - - + - {/* table heading end */} - {selectedCategory === "All Categories" ? ( - <> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ) : selectedCategory === "Explore" ? ( - <> - - - - - - - - - - - - - - - - - - - - ) : ( - - + - - + + + + + + + - - - - - - )} +
+

+ Mullican Computer Joy +

+ + Owned by Xoeyam + +
+ + + + + + +
Value USD24H%BitsTimeStatus
-
-
- data -
-
-

- Mullican Computer Joy -

- - Owned by Xoeyam - -
-
- 		-
- - - - - - - - - - - - - 7473 ETH - -
- 		-
- - - - - - - - - - 6392.99$ - -
- 		- - -24.75 (11.5%) - - - - 343 - - - - 2 Hours 1 min 30s - - - -
-
-
- data -
-
-

- Mullican Computer Joy -

- - Owned by Xoeyam - -
-
- 		-
- - - - - - - - - - - - - 7473 ETH - -
- 		-
- - - - - - - - - - 6392.99$ - -
- 		- - -24.75 (11.5%) - - - - 343 - - - - 2 Hours 1 min 30s - - - -
-
-
- data -
-
-

- Mullican Computer Joy -

- - Owned by Xoeyam - -
-
- 		-
- - - - - - - - - - - - - 7473 ETH - -
- 		-
- - - - - - - - - - 6392.99$ - -
- 		- - -24.75 (11.5%) - - - - 343 - - - - 2 Hours 1 min 30s - - - -
-
-
- data -
-
-

- Mullican Computer Joy -

- - Owned by Xoeyam - -
-
- 		-
- - - - - - - - - - - - - 7473 ETH - -
- 		-
- - - - - - - - - - 6392.99$ - -
- 		- - -24.75 (11.5%) - - - - 343 - - - - 2 Hours 1 min 30s - - - -
-
-
- data -
-
-

- Mullican Computer Joy -

- - Owned by Xoeyam - -
-
- 		-
- - - - - - - - - - - - - 7473 ETH - -
- 		-
- - - - - - - - - - 6392.99$ - -
- 		- - -24.75 (11.5%) - - - - 343 - - - - 2 Hours 1 min 30s - - - -
-
-
- data -
-
-

- Mullican Computer Joy -

- - Owned by Xoeyam - -
-
- 		-
- - - - - - - - - - - - - 7473 ETH - -
- 		-
- - - - - - - - - - 6392.99$ - -
- 		- - -24.75 (11.5%) - - - - 343 - - - - 2 Hours 1 min 30s - - - -
-
-
- data -
-
-

- Mullican Computer Joy -

- - Owned by Xoeyam - -
+
+
+
+ data
-
-
- - - - - - - - - - - - - 7473 ETH - +
+

+ Mullican Computer Joy +

+ + Owned by Xoeyam +
-
-
- - - - - - - - - - 6392.99$ - +
+ 		+
+ + + + + + + + + + + + + 7473 ETH + +
+ 		+
+ + + + + + + + + + 6392.99$ + +
+ 		+ +
+
+
+ data
-
- - -24.75 (11.5%) - - - - 343 - - - - 2 Hours 1 min 30s - - - -
+
+ + + + + + + + + + + + + 7473 ETH + +
+ 		+
+ + + + + + + + + + 6392.99$ + +
+ 		+ +
diff --git a/src/components/MyActiveJobs/ActiveJobMessage.jsx b/src/components/MyActiveJobs/ActiveJobMessage.jsx index c73ec45..8bc4abd 100644 --- a/src/components/MyActiveJobs/ActiveJobMessage.jsx +++ b/src/components/MyActiveJobs/ActiveJobMessage.jsx @@ -31,7 +31,13 @@ export default function ActiveJobMessage({ activeJobMesList }) { {currentActiveJobMesList.map((item, index) => ( - + +
+
{item.msg_date} {item.msg_firstname}
+ +
+ + ))} diff --git a/src/index.css b/src/index.css index c8f46b3..64f56ef 100644 --- a/src/index.css +++ b/src/index.css @@ -9,6 +9,17 @@ font-family: "Product Sans"; src: url("./assets/fonts/Product Sans Bold.ttf"); } +.msg_box{ + background-color: aliceblue; + margin: 5px; + padding: 5px; + border-radius: 15px; +} +.msg_header{ + background-color: #1a3544; + color: white; + font-weight: bold; +} .siderCardHeader{ margin: 40px 40px 10px 40px; font-size: 24px; -- 2.34.1 From 05eb1a020d0331314cb40c96a9f6d6b19fee59c7 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 4 Jun 2023 08:40:38 -0400 Subject: [PATCH 4/4] Activities on home page --- src/components/Home/HomeActivities.jsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/Home/HomeActivities.jsx b/src/components/Home/HomeActivities.jsx index 2d6ac1a..4615a86 100644 --- a/src/components/Home/HomeActivities.jsx +++ b/src/components/Home/HomeActivities.jsx @@ -17,7 +17,7 @@ export default function HomeActivities({ className }) {

- Activities + Recent Activities

@@ -26,15 +26,15 @@ export default function HomeActivities({ className }) { {/* table heading */} - - - - + {/**/} + {/* */} + {/* */} + {/* */} - - + {/* */} + {/**/}
- All Product - ValueUSD
*/} + {/* All Product*/} + {/* .Status
-- 2.34.1