profile bug fixed

src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx

@@ -63,7 +63,7 @@ const  AssignTaskPopout = React.memo(({ action, details, situation, familyDetail
         // API PAYLOADS
         job_id: activeTask.data?.job_id,
         job_uid: activeTask.data?.job_uid,
-        family_uid: familyDetails.uid,
+        family_uid: familyDetails?.uid || details?.family_uid,
         job_description: activeTask.data?.description,
         assign_mode: 110011,
       };

src/components/MyTasks/MyOffersFamilyTable.jsx

@@ -2,7 +2,7 @@ import { useRef, useState } from "react";
 import OfferCard from "../Cards/OfferCard";
 import Icons from "../Helpers/Icons";
 import SliderCom from "../Helpers/SliderCom";
-import OfferJobPopout from "../jobPopout/OfferJobPopout";
+import FamilyOfferJobPopout from "../jobPopout/FamilyOfferJobPopout";
 
 export default function MyOffersFamilyTable({ className, familyOffers }) {
   let [offerPopout, setOfferPopout] = useState({ show: false, data: {} }); // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
@@ -127,7 +127,7 @@ export default function MyOffersFamilyTable({ className, familyOffers }) {
 
         {/* Offer Job Popout */}
         {offerPopout.show && (
-          <OfferJobPopout
+          <FamilyOfferJobPopout
             details={offerPopout.data}
             onClose={() => {
               setOfferPopout({ show: false, data: {} });

src/components/OffersInterest/ManageInterestOffer.jsx

@@ -166,22 +166,22 @@ export default function ManageInterestOffer(props) {
 
                                 <div className="w-full">
                                     {/* switch button */}
-                                    <div className="my-1 flex items-center border-b border-slate-300">
+                                    <div className="pl-7 my-2 flex items-center border-b border-slate-300 gap-3">
                                         <button
                                         name="info"
                                         onClick={(e) => setTab(e.target.name)}
-                                        className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
-                                            tab == "info" ? "border-sky-blue" : "border-slate-300"
-                                        } tracking-wide transition duration-200`}
+                                        className={`px-4 py-1 rounded-t-2xl ${
+                                            tab == "info" ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
+                                          }`}
                                         >
                                         Info
                                         </button>
                                         <button
                                         name="message"
                                         onClick={(e) => setTab(e.target.name)}
-                                        className={`p-2 text-lg font-bold text-slate-600 dark:text-white border ${
-                                            tab == "message" ? "border-sky-blue" : "border-slate-300"
-                                        }  tracking-wide transition duration-200`}
+                                        className={`px-4 py-1 rounded-t-2xl ${
+                                            tab == "message" ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white" : "bg-white text-[#000] border-t-[2px]"
+                                          }`}
                                         >
                                         Messages ({messageList.data.length})
                                         </button>

src/components/Partials/Header.jsx

@@ -472,10 +472,10 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
               </Link>
             </div>
             {/* profile */}
-            <div className="user-profile relative lg:block hidden">
+            <div className="user-profile relative">
               <div
                 onClick={() => handlerProfile()}
-                className="flex items-center space-x-3.5"
+                className="hidden lg:flex items-center space-x-3.5"
               >
                 {/* profile-image */}
                 <div className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden">
@@ -492,6 +492,17 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                  {userDetails && userDetails?.account_type !== "FAMILY" && <p className="text-sm text-thin-light-gray">@{userEmail}</p>}
                 </div>
               </div>
+
+              <div className="for-mobile-profile lg:hidden block">
+                <div
+                  // to="/profile"
+                  onClick={() => handlerProfile()}
+                  className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden block"
+                >
+                  <img src={profileImg} alt="profile" className="w-full h-full" />
+                </div>
+              </div>
+
               <div
                 className={`profile-dropdown w-[293px] z-30 bg-white dark:bg-dark-white   absolute lg:right-16 -right-[16px]  rounded-lg ${
                   userProfileDropdown ? "active" : ""
@@ -684,14 +695,15 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                 </div>
               </div>
             </div>
-            <div className="for-mobile-profile lg:hidden block">
-              <Link
-                to="/profile"
+            {/* <div className="for-mobile-profile lg:hidden block">
+              <div
+                // to="/profile"
+                onClick={() => handlerProfile()}
                 className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden block"
               >
                 <img src={profileImg} alt="profile" className="w-full h-full" />
-              </Link>
-            </div>
+              </div>
+            </div> */}
           </div>
         </div>
       </div>

src/components/jobPopout/FamilyOfferJobPopout.jsx

@@ -0,0 +1,261 @@
+import React, { useState } from "react";
+import Detail from "./popoutcomponent/Detail";
+import ModalCom from "../Helpers/ModalCom";
+import { useNavigate } from "react-router-dom";
+
+import usersService from "../../services/UsersService";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import localImgLoad from "../../lib/localImgLoad";
+
+import { tableReload } from "../../store/TableReloads";
+import { useDispatch } from "react-redux";
+
+function FamilyOfferJobPopout({ details, onClose, situation }) {
+  const apiUrl = new usersService();
+  const navigate = useNavigate();
+  const dispatch = useDispatch();
+
+  const [requestStatus, setRequestStatus] = useState({
+    loading: false,
+    status: false,
+    message: "",
+    trigger: "",
+  });
+
+  //FUNCTION TO HANDLE AN OFFER
+  const handleOffer = ({ target: { name } }) => {
+    const reqData = {
+      // offer_result: 100,
+      offer_code: details.contract,
+      contract: details.contract,
+    };
+
+    //logic to determine the button pressed and set reqDate accordingly
+    if (name == "accept") {
+      setRequestStatus({
+        loading: true,
+        status: false,
+        message: "",
+        trigger: "offer",
+      });
+      reqData.offer_result = 100;
+    }
+    if (name == "reject") {
+      setRequestStatus({
+        loading: true,
+        status: false,
+        message: "",
+        trigger: "reject",
+      });
+      reqData.offer_result = 333;
+    }
+
+    // API CALL
+    apiUrl
+      .offersResponse(reqData)
+      .then((response) => {
+        if (response.status != 200 || response.data.internal_return < 0) {
+          setRequestStatus({
+            loading: false,
+            status: false,
+            message: `Unable to ${name} Offer, try again later`,
+            trigger: "",
+          });
+          return;
+        }
+        setRequestStatus({
+          loading: false,
+          status: true,
+          message: `Offer ${name}ed Successfully`,
+          trigger: "",
+        });
+        setTimeout(() => {
+          onClose();
+          dispatch(tableReload({ type: "MYTASKTABLE" }));
+          navigate("/mytask", { replace: true });
+          setRequestStatus({
+            loading: false,
+            status: false,
+            message: "",
+            trigger: "",
+          });
+        }, 2000);
+      })
+      .catch((error) => {
+        setRequestStatus({
+          loading: false,
+          status: false,
+          message: `Opps! An Error Occurred`,
+          trigger: "",
+        });
+      })
+      .finally(() => {
+        setTimeout(() => {
+          setRequestStatus({
+            loading: false,
+            status: false,
+            message: "",
+            trigger: "",
+          });
+        }, 5000);
+      });
+  };
+
+  return (
+    <ModalCom action={onClose} situation={situation}>
+      <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">
+        <div className="logout-modal-header w-full flex items-center justify-between lg:p-6 px-[30px] py-[23px] border-b dark:border-[#5356fb29]  border-light-purple">
+          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+            Start Task
+          </h1>
+          <button
+            type="button"
+            className="text-[#374557] dark:text-red-500"
+            onClick={onClose}
+          >
+            <svg
+              width="36"
+              height="36"
+              viewBox="0 0 36 36"
+              fill="none"
+              className="fill-current"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                fill=""
+                fillOpacity="0.6"
+              />
+              <path
+                d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                fill="#"
+                fillOpacity="0.6"
+              />
+            </svg>
+          </button>
+        </div>
+        <div className="md:flex bg-white rounded-lg shadow-lg">
+          <div className="p-4 w-full md:w-3/4 md:border-r-2">
+            <div className="flex gap-2">
+                <div className="image-wrapper w-32">
+                    <img className="w-full h-auto" src={localImgLoad(`images/taskbanners/${details.banner}`)} alt='Banner-Image' />
+                </div>
+                <div className="details-wrapper">
+                    <p className="text-lg my-5 font-semibold text-slate-900 tracking-wide">
+                    {details.title}
+                    </p>
+
+                    {/* INPUT SECTION */}
+                    <div className="my-2 md:flex">
+                    <Detail
+                        label="Date"
+                        value={
+                        (details.offer_added && details.offer_added?.split(" ")[0]) ||
+                        "default"
+                        }
+                    />
+                    </div>
+
+                    <div className="my-2 md:flex">
+                    <Detail label="Description" value={details.description} />
+                    </div>
+
+                    <div className="my-2 md:flex">
+                    <Detail
+                        label="Offer Expire"
+                        value={details.expire && details.expire.split(" ")[0]}
+                    />
+                    </div>
+
+                    <div className="my-2 md:flex">
+                    <Detail label="Price" value={details.thePrice} />
+                    </div>
+
+                    <div className="my-2 md:flex">
+                    <Detail
+                        label="Duration"
+                        value={`${details.timeline_days} day(s)`}
+                    />
+                    </div>
+
+                    <div className="my-2 md:flex">
+                    <Detail
+                        label="Detail"
+                        value={details.job_description || details.description}
+                    />
+                    </div>
+                </div>
+            </div>
+          </div>
+
+          {/* ACTION SECTION */}
+          <div className="p-4 w-full md:w-1/4 h-full">
+            <div className="my-3 md:flex md:justify-center">
+              {requestStatus.loading && requestStatus.trigger == "offer" ? (
+                <LoadingSpinner size={8} color="sky-blue" />
+              ) : (
+                <button
+                  name="accept"
+                  onClick={handleOffer}
+                  disabled={requestStatus.loading}
+                  className="px-2 py-2 w-20 flex justify-center items-center border-2 border-green-900 bg-green-500 text-base rounded-2xl text-white"
+                >
+                  I am ready to start
+                </button>
+              )}
+            </div>
+
+            {/* <div className="mt-10 md:mt-20 md:flex md:justify-center">
+              {requestStatus.loading && requestStatus.trigger == "reject" ? (
+                <LoadingSpinner size={8} color="sky-blue" />
+              ) : (
+                <button
+                  name="reject"
+                  onClick={handleOffer}
+                  disabled={requestStatus.loading}
+                  className="px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                >
+                  Reject Offer
+                </button>
+              )}
+            </div> */}
+
+            {/* ERROR DISPLAY AND SUBMIT BUTTON */}
+            {requestStatus.message != "" &&
+              (!requestStatus.status ? (
+                <div
+                  className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                >
+                  {requestStatus.message}
+                </div>
+              ) : (
+                requestStatus.status && (
+                  <div
+                    className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                  >
+                    {requestStatus.message}
+                  </div>
+                )
+              ))}
+            {/* End of error or success display */}
+          </div>
+        </div>
+
+        {/* close button */}
+        <div className="p-6 flex justify-end">
+          <button
+            onClick={onClose}
+            disabled={requestStatus.loading}
+            type="button"
+            className="border-gradient text-18 tracking-wide px-2 py-2 rounded-full"
+          >
+            <span className="text-gradient">Cancel</span>
+          </button>
+        </div>
+        {/* end of close button */}
+      </div>
+    </ModalCom>
+  );
+}
+
+export default FamilyOfferJobPopout;