Merge branch 'unsed-api-removal' of WrenchBoard/Users-Wrench into master

src/components/Dashboards/AccountDashboard.jsx

@@ -179,11 +179,11 @@ const NewOfferCard = ({ datas, hidden = false, price, setOfferPopout, image }) =
             <button
               type="button"
               onClick={() =>
-                setOfferPopout({ show: true, data: { ...datas, price, image } })
+                setOfferPopout({ show: true, data: { ...datas, image } })
               }
               className="btn-shine w-2/3 h-[40px] text-white rounded-full text-sm bg-pink flex justify-center items-center"
             >
-              Start Task
+              Start Now
             </button>
           </div>
         </div>

src/components/Home/FullAccountDash.jsx

@@ -61,15 +61,14 @@ export default function FullAccountDash(props) {
           <AccountDashboard className="mb-4" bannerList={props.bannerList} offersList={props.offersList} imageServer={props.imageServer} />
         )}
 
-        {
+        {/* {props?.dashTypes !== "undefined" &&
-        // props?.dashTypes !== "undefined" &&
+        props.offersList?.data?.result_list?.length ? (
-        // props.offersList?.data?.result_list?.length ? (
+          <MyOffersTable
-        //   <MyOffersTable
+            MyActiveOffersList={props.offersList?.data}
-        //     MyActiveOffersList={props.offersList?.data}
+            className="mb-10"
-        //     className="mb-10"
+          />
-        //   />
+        ) 
-        // ) 
+        : 
-        // : 
         props.MyActiveJobList?.data?.length ? (
           <>
             <div className="w-full mb-5 flex justify-between items-center gap-1">
@@ -83,7 +82,7 @@ export default function FullAccountDash(props) {
               imageServer={props.offersList?.data?.session_image_server}
             />
           </>
-        ) : null}
+        ) : null} */}
       </div>
     </>
   );

src/components/Home/index.jsx

@@ -14,19 +14,19 @@ export default function Home(props) {
 
   const { userDetails } = useSelector((state) => state?.userDetails);
 
-  const [MyActiveJobList, setMyActiveJobList] = useState({loading:true, data:[]}); // STATE TO HOLD ACTIVE/CURRENT TASKS
+  // const [MyActiveJobList, setMyActiveJobList] = useState({loading:true, data:[]}); // STATE TO HOLD ACTIVE/CURRENT TASKS
 
-  const getMyActiveJobList = async () => { // FUNCTION TO POPULATE ACTIVE/CURRENT TASK LIST
+  // const getMyActiveJobList = async () => { // FUNCTION TO POPULATE ACTIVE/CURRENT TASK LIST
-    try {
+  //   try {
-      const res = await userApi.getMyActiveTaskList();
+  //     const res = await userApi.getMyActiveTaskList();
-      setMyActiveJobList({loading:false, data:res?.data?.result_list});
+  //     setMyActiveJobList({loading:false, data:res?.data?.result_list});
-      // setMyActiveJobList(res?.data?.result_list);
+  //     // setMyActiveJobList(res?.data?.result_list);
-    } catch (error) {
+  //   } catch (error) {
-      setMyActiveJobList({loading:false, data:[]});
+  //     setMyActiveJobList({loading:false, data:[]});
-      // setMyActiveJobList([]);
+  //     // setMyActiveJobList([]);
-      console.log("Error getting tasks");
+  //     console.log("Error getting tasks");
-    }
+  //   }
-  };
+  // };
 
   // FUNCTION TO GET DASH DATA TO DETERMINE CURRENT TASK DUE TIME
   // const getHomeDate = () => {
@@ -53,11 +53,11 @@ export default function Home(props) {
   //   }
   // };
 
-  useEffect(() => {
+  // useEffect(() => {
-    if(userDetails?.account_type == 'FULL'){
+  //   if(userDetails?.account_type == 'FULL'){
-      getMyActiveJobList();
+  //     getMyActiveJobList();
-    }
+  //   }
-  }, []);
+  // }, []);
 
   return (
     <Layout>
@@ -78,7 +78,7 @@ export default function Home(props) {
             bannerList={props.bannerList}
             dashTypes={props.dashTypes}
             // offersList={MyOffersList}
-            MyActiveJobList={MyActiveJobList}
+            // MyActiveJobList={MyActiveJobList}
             offersList={props.offersList}
             imageServer={props.imageServer}
           />

src/components/jobPopout/OfferJobPopout.jsx

@@ -8,6 +8,7 @@ import LoadingSpinner from "../Spinners/LoadingSpinner";
 
 import { tableReload } from "../../store/TableReloads";
 import { useDispatch } from "react-redux";
+import { PriceFormatter } from "../Helpers/PriceFormatter";
 
 function OfferJobPopout({ details, onClose, situation }) {
   const apiUrl = new usersService();
@@ -21,6 +22,12 @@ function OfferJobPopout({ details, onClose, situation }) {
     trigger: "",
   });
 
+  let thePrice = PriceFormatter(
+    details?.price * 0.01,
+    details?.currency_code,
+    details?.currency
+  );
+
   //FUNCTION TO HANDLE AN OFFER
   const handleOffer = ({ target: { name } }) => {
     const reqData = {
@@ -135,54 +142,60 @@ function OfferJobPopout({ details, onClose, situation }) {
         </div>
         <div className="md:flex bg-white dark:bg-dark-white rounded-lg">
           <div className="p-4 w-full md:w-3/4 md:border-r-2">
-            <p className="text-lg my-5 font-semibold text-slate-900 dark:text-white tracking-wide">
-              {details.title}
-            </p>
 
             {/* INPUT SECTION */}
-            <div className="my-2 md:flex">
+            <div className='grid md:grid-cols-2'>
-              <Detail
+              <div className="my-2 md:flex">
-                label="Date"
+                <Detail
-                value={
+                  label="Date"
-                  (details.offer_added && details.offer_added?.split(" ")[0]) ||
+                  value={
-                  "default"
+                    (details.offer_added && details.offer_added?.split(" ")[0]) ||
-                }
+                    "default"
-              />
+                  }
+                />
+              </div>
+
+              <div className="my-2 md:flex">
+                <Detail
+                  label="Offer Expire"
+                  value={details.expire && details.expire.split(" ")[0]}
+                />
+              </div>
             </div>
 
+            <div className='grid md:grid-cols-2'>
+              <div className="my-2 md:flex">
+                <Detail label="Reward" value={thePrice} />
+              </div>
+
+              <div className="my-2 md:flex">
+                <Detail
+                  label="Duration"
+                  value={`${details.timeline_days} day(s)`}
+                />
+              </div>
+            </div>
+
+            <p className="text-lg my-5 font-semibold text-slate-900 dark:text-white tracking-wide line-clamp-1">
+              {details.title}
+            </p>
+
             <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="Reward" value={details.thePrice} />
+              <label className='job-label w-full md:w-[150px]'>Detail</label>
-            </div>
+              <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white min-h-[100px] max-h-[200px] overflow-y-auto border boder-2 rounded-md`}>{details.job_description || details.job_detail}</p>
-
-            <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>
 
           {/* ACTION SECTION */}
           <div className="p-4 w-full md:w-1/4 h-full">
-            <div className="my-3 md:flex md:justify-center">
+            <div className="my-3 md:flex flex-col md:justify-center">
+              <h1 className='mb-2 text-base font-semibold text-slate-900 dark:text-white tracking-wide'>I understand the task</h1>
               {requestStatus.loading && requestStatus.trigger == "offer" ? (
                 <LoadingSpinner size={8} color="sky-blue" />
               ) : (
@@ -190,9 +203,9 @@ function OfferJobPopout({ details, onClose, situation }) {
                   name="accept"
                   onClick={handleOffer}
                   disabled={requestStatus.loading}
-                  className="px-2 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                  className="px-2 h-28 flex justify-center items-center btn-gradient text-2xl rounded-xl text-white"
                 >
-                  Accept Offer
+                  Start Now
                 </button>
               )}
             </div>
@@ -205,9 +218,10 @@ function OfferJobPopout({ details, onClose, situation }) {
                   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"
+                  className="group relative px-2 h-11 flex justify-center items-center text-base text-black dark:text-white"
                 >
                   Reject Offer
+                  <div className='absolute bottom-1 w-full h-[1px] bg-black hidden group-hover:block'></div>
                 </button>
               )}
             </div>

src/middleware/AuthRoute.jsx

@@ -111,8 +111,8 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
     }
   }, []);
 
-  useEffect(() => {
+  useEffect(() => { // FUNCTION TO GET NOTIFICATIONS LIST
-    const getNotifications = () => {
+    const notifications = () => {
       // function to load user notification
       dispatch(updateNotifications({ loading: true }));
       apiCall
@@ -168,7 +168,9 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
           dispatch(updateNotifications({ loading: false, data: null }));
         });
     };
-    getNotifications();
+      // delay verify requests by 10000ms
+    const delay15secs = setTimeout(notifications, 15000)
+    return ()=> clearTimeout(delay15secs)
   }, []);
 
   useEffect(() => {
@@ -248,23 +250,23 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   }, [isLogin.status]);
 
   //FUNCTION TO GET COMMON HEAD DATA
-  useEffect(() => {
+  // useEffect(() => {
-    if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
+  //   if((!loggedIn && !isLogin.status) || account_type == 'FAMILY'){ // DO NOT CALL THIS, IF USER ACCOUNT TYPE IS FAMILY
-      return
+  //     return
-    }
+  //   }
-    apiCall
+  //   apiCall
-      .getRecentActivitiedData()
+  //     .getRecentActivitiedData()
-      .then((res) => {
+  //     .then((res) => {
-        //   debugger;
+  //       //   debugger;
-        if (res?.data?.internal_return < 0) {
+  //       if (res?.data?.internal_return < 0) {
-          return;
+  //         return;
-        }
+  //       }
-        dispatch(recentActivitiesData(res.data));
+  //       dispatch(recentActivitiesData(res.data));
-      })
+  //     })
-      .catch((error) => {
+  //     .catch((error) => {
-        console.log("ERROR ", error);
+  //       console.log("ERROR ", error);
-      });
+  //     });
-  }, [isLogin.status]);
+  // }, [isLogin.status]);
 
 
   //FUNCTION TO GET FAMILY BANNERS