Merge branch 'master' of https://gitlab.chiefsoft.net/WrenchBoard/Users-Wrench into task-layout

src/Routers.jsx

@@ -35,6 +35,8 @@ import MyActiveJobsPage from "./views/MyActiveJobsPage";
 import FamilyAccPage from "./views/FamilyAccPage";
 import StartJob from "./components/MyJobs/StartJob";
 import AddJobPage from "./views/AddJobPage";
+import MyPendingJobsPage from "./views/MyPendingJobsPage";
+import ManageActiveJobs from "./views/ManageActiveJobs";
 
 export default function Routers() {
   return (
@@ -79,8 +81,10 @@ export default function Routers() {
           <Route exact path="/myjobs" element={<MyJobsPage />} />
           <Route exact path="/add-job" element={<AddJobPage />} />
           <Route exact path="/my-active-jobs"  element={<MyActiveJobsPage />} />
+          <Route exact path="/my-pending-jobs"  element={<MyPendingJobsPage />} />
           <Route exact path="/acc-family"  element={<FamilyAccPage />} />
           <Route exact path="/start-job"  element={<StartJob />} />
+          <Route exact path="/manage-active-job"  element={<ManageActiveJobs />} />
           <Route
             exact
             path="/my-collection/collection-item"

src/components/AddJob/AddJob.jsx

@@ -13,7 +13,7 @@ const validationSchema = Yup.object().shape({
       .max(25, "Maximum 25 characters")
       .required("Country is required"),
     price: Yup.number()
-      .typeError("you must specify a number")
+    .typeError("you must specify a number")
       .min(1, "Price must be greater than 0")
       .required("Price is required"),
     title: Yup.string()
@@ -36,7 +36,7 @@ const validationSchema = Yup.object().shape({
 
   let initialValues = { // initial values for formik
     country: '',
-    price: '',
+    price: 0,
     title: '',
     description: '',
     job_detail: '',
@@ -137,8 +137,10 @@ function AddJob() {
                                 <select 
                                     id='country'
                                     name='country'
+                                    value={props.values.country}
                                     className={`input-field p-2 mt-3 rounded-md placeholder:text-base text-dark-gray dark:text-white w-full h-10 bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-none`}
                                     onChange={props.handleChange}
+                                    onBlur={props.handleBlur}
                                 >
                                     {country.loading ? (
                                         <option className="text-slate-500 text-lg" value="">
@@ -179,11 +181,13 @@ function AddJob() {
                                     label="Price"
                                     labelClass='tracking-wide'
                                     inputBg = 'bg-slate-100'
-                                    type="text"
+                                    type="number"
                                     name="price"
+                                    fieldClass='text-right'
                                     // placeholder="Please Enter Amount"
                                     value={props.values.price}
                                     inputHandler={props.handleChange}
+                                    blurHandler={props.handleBlur}
                                 />
                                 {props.errors.price && props.touched.price && (
                                     <p className="text-sm text-red-500">
@@ -206,6 +210,7 @@ function AddJob() {
                                 // placeholder="Enter Job Title"
                                 value={props.values.title}
                                 inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
                                 />
                                 {props.errors.title && props.touched.title && (
                                 <p className="text-sm text-red-500">
@@ -226,6 +231,7 @@ function AddJob() {
                                 // placeholder="Enter a description"
                                 value={props.values.description}
                                 inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
                                 />
                                 {props.errors.description && props.touched.description && (
                                 <p className="text-sm text-red-500">
@@ -258,6 +264,7 @@ function AddJob() {
                                 name='job_detail'
                                 value={props.values.job_detail}
                                 onChange={props.handleChange}
+                                onBlur={props.handleBlur}
                             />
                             {props.errors.job_detail && props.touched.job_detail && (
                                 <p className="text-sm text-red-500">
@@ -278,6 +285,7 @@ function AddJob() {
                                 // placeholder="Please Enter Detail Description of Job"
                                 value={props.values.timeline_days}
                                 inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
                             />
                             {props.errors.timeline_days && props.touched.timeline_days && (
                                 <p className="text-sm text-red-500">

src/components/FamilyAcc/index.jsx

@@ -134,7 +134,7 @@ export default function FamilyAcc() {
           {/* heading */}
           <div className="sm:flex justify-between items-center mb-6">
             <div className="mb-5 sm:mb-0">
-              <h1 className="text-26 font-bold inline-flex gap-2 text-dark-gray dark:text-white">
+              <h1 className="text-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
                 <span
                   className={`${selectTab === "today" ? "block" : "hidden"}`}
                 >
@@ -143,9 +143,9 @@ export default function FamilyAcc() {
                 <button
                   onClick={popUpHandler}
                   type="button"
-                  className="text-purple"
+                  className="text-white btn-gradient text-lg tracking-wide px-5 py-2 rounded-full"
                 >
-                  (Add)
+                  Add
                 </button>
               </h1>
             </div>
@@ -266,7 +266,8 @@ const FamilyForm = ({
             <button
               type="button"
               onClick={onClick}
-              className={`rounded-[0.475rem] text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center h-[42px] py-[0.8875rem] px-[1.81rem] text-[14.95px] btn-login`}
+              // className={`rounded-[0.475rem] text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center h-[42px] py-[0.8875rem] px-[1.81rem] text-[14.95px] btn-login`}
+              className="text-white btn-gradient text-lg tracking-wide px-6 py-2 rounded-full"
             >
               {loader ? (
                 <div className="signup btn-loader"></div>

src/components/Helpers/Inputs/InputCom/index.jsx

@@ -20,119 +20,28 @@ export default function InputCom({
   disable,
   blurHandler,
   spanTag,
-  inputBg
+  inputBg,
+  direction
 }) {
   const inputRef = useRef(null);
   // Entry Validation
   // for Min Length:
   const minLengthValidation = () => {
-    if (inputRef && inputRef?.current && inputRef?.current?.name === "email") {
-      return 7;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "first_name"
-    ) {
-      return 3;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "last_name"
-    ) {
-      return 3;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "address"
-    ) {
-      return 5;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "password"
-    ) {
-      return 8;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "state"
-    ) {
-      return 3;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "province"
-    ) {
-      return 3;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "city"
-    ) {
-      return 3;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "amount"
-    ) {
-      return 1;
-    }
+    const inputConfig = inputConfigs[inputRef?.current?.name]?.minLength;
+    return inputConfig || 0;
   };
 
   // for MaxLength
   const maxLengthValidation = () => {
-    if (inputRef && inputRef?.current && inputRef?.current?.name === "email") {
-      return 35;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "first_name"
-    ) {
-      return 25;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "last_name"
-    ) {
-      return 25;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "address"
-    ) {
-      return 49;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "password"
-    ) {
-      return 15;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "state"
-    ) {
-      return 25;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "province"
-    ) {
-      return 25;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "city"
-    ) {
-      return 25;
-    } else if (
-      inputRef &&
-      inputRef?.current &&
-      inputRef?.current?.name === "amount"
-    ) {
-      return 9;
-    }
+    const inputConfig = inputConfigs[inputRef?.current?.name]?.maxLength;
+    return inputConfig || 30;
   };
+
+  // for Patterns
+  const inputPatterns = () => {
+    const inputConfig = inputConfigs[inputRef?.current?.name]?.pattern;
+    return inputConfig || ""
+  }
   return (
     <div className={`input-com ${parentClass}`}>
       <div className={`flex items-center justify-between mb-2.5 ${labelClass}`}>
@@ -140,9 +49,13 @@ export default function InputCom({
           <label
             className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"
             htmlFor={name}
-            >
+          >
             {label}
-            {spanTag && <span className="text-green-700 text-sm tracking-wide">{spanTag}</span>}
+            {spanTag && (
+              <span className="text-green-700 text-sm tracking-wide">
+                {spanTag}
+              </span>
+            )}
           </label>
         )}
         {forgotPassword && (
@@ -161,15 +74,19 @@ export default function InputCom({
           placeholder={placeholder}
           value={value}
           onChange={inputHandler}
-          className={`input-field placeholder:text-base text-bese px-12 text-dark-gray w-full h-full ${inputBg ? inputBg: 'bg-[#FAFAFA]'} dark:bg-[#11131F] focus:ring-0 focus:outline-none ${fieldClass}`}
+          className={`input-field placeholder:text-base text-dark-gray w-full h-full ${
+            inputBg ? inputBg : "bg-[#FAFAFA]"
+          } dark:bg-[#11131F] focus:ring-0 focus:outline-none ${fieldClass}`}
           type={type}
           id={name}
           name={name}
           minLength={minLengthValidation()}
           maxLength={maxLengthValidation()}
+          pattern={() => inputPatterns}
           ref={inputRef}
           readOnly={disable}
           onBlur={blurHandler}
+          dir={direction}
         />
         {iconName && (
           <div className="absolute right-6 bottom-[10px] z-10">
@@ -188,3 +105,21 @@ export default function InputCom({
     </div>
   );
 }
+
+const inputConfigs = {
+  email: { minLength: 7, maxLength: 30 },
+  first_name: { minLength: 3, maxLength: 25, pattern: "[a-zA-Z]+" },
+  last_name: { minLength: 3, maxLength: 25, pattern: "[a-zA-Z]+" },
+  address: { minLength: 5, maxLength: 49, pattern: "[a-zA-Z0-9]+" },
+  password: { minLength: 8, maxLength: 15, pattern: ".{8,}" },
+  state: { minLength: 3, maxLength: 25, pattern: "[a-zA-Z]+" },
+  province: { minLength: 3, maxLength: 25, pattern: "[a-zA-Z]+" },
+  city: { minLength: 3, maxLength: 25, pattern: "[a-zA-Z]+" },
+  amount: { minLength: 1, maxLength: 9, pattern: "[0-9]+" },
+};
+
+/* Numbers Only: <input type="text" pattern="[0-9]*" /> strictly numbers
+Alphabets Only: <input type="text" pattern="[a-zA-Z]+" /> strictly alphabets
+Alphanumeric: <input type="text" pattern="[a-zA-Z0-9]+" /> mix
+Password: <input type="text" pattern=".{8,}" /> a minimum of 8 characters 
+*/

src/components/MyActiveJobs/ActiveJobs.jsx

@@ -0,0 +1,155 @@
+import React, { useEffect, useState } from "react";
+import { useSelector } from "react-redux";
+import ModalCom from "../Helpers/ModalCom";
+import Layout from "../Partials/Layout";
+import { useLocation, useNavigate } from "react-router-dom";
+import ActiveJobMessage from "./ActiveJobMessage";
+
+function ActiveJobs() {
+  let { userDetails } = useSelector((state) => state.userDetails);
+  let navigate = useNavigate()
+  let {state} = useLocation()
+
+  let [details, setDetails] = useState({})
+
+  // console.log(state, userDetails);
+
+  useEffect(()=>{
+    if(!state){
+      navigate('/my-active-jobs', {replace: true})
+    }
+    setDetails(state)
+  },[])
+  return (
+    <Layout>
+      {/* <div className="logout-modal-wrapper min-w-[850px] h-full lg:h-auto lg:rounded-2xl overflow-y-auto"> */}
+
+        <div className="p-4 lg:flex justify-between items-start space-y-4 lg:space-x-4 lg:space-y-0 rounded-lg shadow-lg bg-slate-100">
+          <div className="w-full lg:w-3/4">
+            <div className="py-[20px] bg-white px-4 rounded-md shadow-md">
+              {/* back btn and title */}
+              <div className="w-full flex justify-start space-x-3 items-center">
+                <button
+                  type="button"
+                  className="text-[#374557] border border-sky-blue p-1 rounded-full"
+                  onClick={() => navigate('/my-active-jobs', {replace: true})}
+                >
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="35"
+                    height="35"
+                    viewBox="0 0 24 24"
+                    fill="skyblue"
+                  >
+                    <path d="M19 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H19v-2z" />
+                  </svg>
+                </button>
+                <h1 className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">
+                  {details.title && details.title}
+                </h1>
+              </div>
+              {/* END of back btn and title */}
+
+              <div className="mt-2 w-full lg:flex lg:justify-between lg:items-center lg:space-x-2">
+                <div className="my-2 lg:my-0">
+                  <p className="text-base text-slate-700 dark:text-black">
+                    {details.contract && details.contract}
+                  </p>
+                  <p className="text-base text-slate-700 dark:text-black">
+                    <span className="font-semibold">Description: </span>
+                    {details.description && details.description}
+                  </p>
+                  <p className="text-base text-sky-blue">Delivery Detail</p>
+                </div>
+                <div className="">
+                  <p className="text-base text-sky-blue">
+                    {userDetails.firstname && userDetails.firstname}
+                  </p>
+                  <p className="text-base text-slate-700 dark:text-black">
+                    <span className="font-semibold">Due: </span>
+                    {details.delivery_date &&
+                      details.delivery_date.split(" ")[0]}
+                  </p>
+                  <p className="text-base text-slate-700 dark:text-black">
+                    {details.delivery_date &&
+                      details.delivery_date.split(" ")[1]}
+                  </p>
+                  <p className="text-base text-slate-700 dark:text-black">
+                    {details.timeline_days && details.timeline_days} day(s)
+                  </p>
+                </div>
+              </div>
+            </div>
+
+            <div className="mt-5 bg-white p-4 rounded-md shadow-md">
+              <div className="">
+                <p className="text-lg font-bold text-slate-600 dark:text-blask tracking-wide">Message(s)</p>
+                <textarea
+                  className="p-4 w-full text-base text-slate-600 border border-slate-300 outline-none rounded-md"
+                  rows="10"
+                  style={{ resize: "none" }}
+                />
+              </div>
+
+              {/* Buttons Sections */}
+              <div className="py-2 mb-8 sm:flex sm:justify-center sm:items-center">
+                <div className="w-full sm:w-3/4 mb-5 sm:mb-0">
+                  <button
+                    onClick={()=> console.log('working')}
+                    type="button"
+                    className="btn-gradient text-base tracking-wide px-4 py-2 rounded-md flex justify-center items-center"
+                  >
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" fill='white'>
+                      <path d="M12 2L2 12h3v8h14v-8h3L12 2zm0 16v-6h-2v6H7l5-5 5 5h-3z"/>
+                    </svg>
+
+                    <span className="text-white">Upload Files</span>
+                  </button>
+                </div>
+
+                <div className="w-full sm:w-1/4 flex justify-between items-center space-x-2">
+                  <button
+                      type="button"
+                      className="bg-red-600 text-base text-white tracking-wide px-4 py-2 rounded-md hover:opacity-90"
+                  >
+                      <span className="text-white">Clear</span>
+                  </button>
+                  <button
+                      type="button"
+                      className="btn-gradient text-base text-white tracking-wide px-4 py-2 rounded-md"
+                  >
+                      <span className="text-white">Send</span>
+                  </button>
+                </div>
+
+              </div>
+              {/* end of Buttons Sections  */}
+            </div>
+          </div>
+
+          {/* ACTION SECTION */}
+          <div className="w-full lg:w-1/4 h-full">
+            <div className="py-[20px] bg-white px-4 rounded-md shadow-md">
+              <h1 className="text-lg font-bold text-dark-gray dark:text-white tracking-wide">Actions</h1>
+
+              <p className="my-3 py-1 text-base">
+                Waiting for the completion message from the client before you can approve.
+              </p>
+            </div>
+
+            <div className="mt-5 bg-white p-4 rounded-md shadow-md">
+              <div className="">
+                <p className="text-lg font-bold text-dark-gray dark:text-black tracking-wide">Message</p>
+                <ActiveJobMessage />
+              </div>
+            </div>
+
+          </div>
+        </div>
+
+      {/* </div> */}
+    </Layout>
+  );
+}
+
+export default ActiveJobs;

src/components/MyActiveJobs/MyActiveJobTable.jsx

@@ -1,112 +1,136 @@
 import React, { useState } from "react";
-import dataImage1 from "../../assets/images/data-table-user-1.png";
 import dataImage2 from "../../assets/images/data-table-user-2.png";
-import dataImage3 from "../../assets/images/data-table-user-3.png";
-import dataImage4 from "../../assets/images/data-table-user-4.png";
-import SelectBox from "../Helpers/SelectBox";
-import ActiveJobsPopout from "../jobPopout/ActiveJobsPopout";
 
-import PaginatedList from "../Pagination/PaginatedList";
+import { useNavigate } from "react-router-dom";
+
 import { handlePagingFunc } from "../Pagination/HandlePagination";
+import PaginatedList from "../Pagination/PaginatedList";
 
-export default function MyActiveJobTable({MyJobList, className }) {
-    const filterCategories = ["All Categories", "Explore", "Featured"];
-    const [selectedCategory, setCategory] = useState(filterCategories[0]);
+export default function MyActiveJobTable({ MyJobList, className }) {
+  const navigate = useNavigate()
 
-    let [jobPopout,setJobPopout] = useState({show:false, data:{}}) // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
+  const filterCategories = ["All Categories", "Explore", "Featured"];
+  const [selectedCategory, setCategory] = useState(filterCategories[0]);
 
-    const [currentPage, setCurrentPage] = useState(0);
-    const indexOfFirstItem = Number(currentPage);
-    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
-    const currentActiveJobList = MyJobList?.result_list?.slice(indexOfFirstItem, indexOfLastItem);
-  
-    const handlePagination = (e) => {
-        handlePagingFunc(e,setCurrentPage)
-    }
+  const [currentPage, setCurrentPage] = useState(0);
+  const indexOfFirstItem = Number(currentPage);
+  const indexOfLastItem =
+    Number(indexOfFirstItem) + Number(process.env.REACT_APP_ITEM_PER_PAGE);
+  const currentActiveJobList = MyJobList?.result_list?.slice(
+    indexOfFirstItem,
+    indexOfLastItem
+  );
 
-    return (
-        <div
-            className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
-                className || ""
-            }`}
-        >
-            {MyJobList && MyJobList?.result_list &&
-            <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
-                <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
-                    <tbody>
-                    {/*<tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
-                    {/*    <td className="py-4">All Product</td>*/}
-                    {/*    <td className="py-4 text-right">.</td>*/}
-                    {/*</tr>*/}
+  const handlePagination = (e) => {
+    handlePagingFunc(e, setCurrentPage);
+  };
 
-                    {
-                        <>
-                            {MyJobList && MyJobList?.result_list &&
-                                MyJobList.result_list.length > 0 &&
-                                currentActiveJobList.map((value, index) => (
-                                    <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                                            <td className=" py-4">
-                                                <div className="flex space-x-2 items-center">
-                                                    <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                                                        <img
-                                                            src={dataImage2}
-                                                            alt="data"
-                                                            className="w-full h-full"
-                                                        />
-                                                    </div>
-                                                    <div className="flex flex-col">
-                                                        <h1 className="font-bold text-xl text-dark-gray dark:text-white">
-                                                            {value.title}
-                                                        </h1>
-                                                        <div>
-                                                            {value.description}
-                                                        </div>
-                                                        <span className="text-sm text-thin-light-gray">
-                                                        Price: <span className="text-purple">{value.price*0.01}</span>
-                                                        </span>
-                                                        <span className="text-sm text-thin-light-gray">
-                                                        Duration:   <span className="text-purple"> {value.timeline_days} day(s)</span>
-                                                        </span>
-                                                        <span className="text-sm text-thin-light-gray">
-                                                        Expire:   <span className="text-purple"> {value.expire}</span>
-                                                        </span>
-                                                        <span className="text-sm text-thin-light-gray">
-                                                        Send to:   <span className="text-purple"> {value.job_to}</span>
-                                                        </span>
+  return (
+    <div
+      className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
+        className || ""
+      }`}
+    >
+      {MyJobList && MyJobList?.result_list && (
+        <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
+          <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+            <tbody>
+              {/*<tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
+              {/*    <td className="py-4">All Product</td>*/}
+              {/*    <td className="py-4 text-right">.</td>*/}
+              {/*</tr>*/}
 
-                                                    </div>
-                                                </div>
-                                            </td>
+              {
+                <>
+                  {MyJobList &&
+                    MyJobList?.result_list &&
+                    MyJobList.result_list.length > 0 &&
+                    currentActiveJobList.map((value, index) => (
+                      <tr
+                        key={index}
+                        className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50"
+                      >
+                        <td className=" py-4">
+                          <div className="flex space-x-2 items-center">
+                            <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                              <img
+                                src={dataImage2}
+                                alt="data"
+                                className="w-full h-full"
+                              />
+                            </div>
+                            <div className="flex flex-col">
+                              <h1 className="font-bold text-xl text-dark-gray dark:text-white">
+                                {value.title}
+                              </h1>
+                              <div>{value.description}</div>
+                              <span className="text-sm text-thin-light-gray">
+                                Price:{" "}
+                                <span className="text-purple">
+                                  {value.price * 0.01}
+                                </span>
+                              </span>
+                              <span className="text-sm text-thin-light-gray">
+                                Duration:{" "}
+                                <span className="text-purple">
+                                  {" "}
+                                  {value.timeline_days} day(s)
+                                </span>
+                              </span>
+                              <span className="text-sm text-thin-light-gray">
+                                Expire:{" "}
+                                <span className="text-purple">
+                                  {" "}
+                                  {value.expire}
+                                </span>
+                              </span>
+                              <span className="text-sm text-thin-light-gray">
+                                Send to:{" "}
+                                <span className="text-purple">
+                                  {" "}
+                                  {value.job_to}
+                                </span>
+                              </span>
+                            </div>
+                          </div>
+                        </td>
 
-
-                                            <td className="text-right py-4 px-2">
-                                                <button
-                                                    type="button"
-                                                    onClick={()=>{setJobPopout({show:true, data:value})}}
-                                                    className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                                                >
-                                                    View
-                                                </button>
-                                            </td>
-                                        </tr>
-                                ))}
-
-
-                        </>
-                    }
-                    </tbody>
-                </table>
-                {/* PAGINATION BUTTON */}
-                <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= MyJobList?.result_list.length ? true : false} data={MyJobList?.result_list} start={indexOfFirstItem} stop={indexOfLastItem} />
-                {/* END OF PAGINATION BUTTON */}
-            </div>
+                        <td className="text-right py-4 px-2">
+                          <div className="flex justify-center items-center">
+                            <button
+                              type="button"
+                              onClick={() => {
+                                navigate('/manage-active-job', {state:value});
+                              }}
+                              className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            >
+                              View
+                            </button>
+                          </div>
+                        </td>
+                      </tr>
+                    ))}
+                </>
+              }
+            </tbody>
+          </table>
+          {/* PAGINATION BUTTON */}
+          <PaginatedList
+            onClick={handlePagination}
+            prev={currentPage == 0 ? true : false}
+            next={
+              currentPage + Number(process.env.REACT_APP_ITEM_PER_PAGE) >=
+              MyJobList?.result_list.length
+                ? true
+                : false
             }
-
-            {/* Active Job Popout */}
-            {jobPopout.show &&
-                <ActiveJobsPopout details={jobPopout.data} onClose={()=>{setJobPopout({show:false, data:{}})}} situation={jobPopout.show} />
-            }
-            {/* End of Active Job Popout */}
+            data={MyJobList?.result_list}
+            start={indexOfFirstItem}
+            stop={indexOfLastItem}
+          />
+          {/* END OF PAGINATION BUTTON */}
         </div>
-    );
+      )}
+    </div>
+  );
 }

src/components/MyActiveJobs/index.jsx

@@ -5,37 +5,37 @@ import CommonHead from "../UserHeader/CommonHead";
 import MyActiveJobTable from "./MyActiveJobTable";
 
 export default function MyActiveJobs(props) {
-    const [selectTab, setValue] = useState("today");
-    const filterHandler = (value) => {
-        setValue(value);
-    };
-    console.log("AMEYE LOC1", props.MyJobList);
-    return (
-        <Layout>
-            <CommonHead />
-            <div className="notification-page w-full mb-10">
-                <div className="notification-wrapper w-full">
-                    {/* heading */}
-                    <div className="sm:flex justify-between items-center mb-6">
-                        <div className="mb-5 sm:mb-0">
-                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+  const [selectTab, setValue] = useState("today");
+  const filterHandler = (value) => {
+    setValue(value);
+  };
+  console.log("AMEYE LOC1", props.MyJobList);
+  return (
+    <Layout>
+      <CommonHead />
+      <div className="notification-page w-full mb-10">
+        <div className="notification-wrapper w-full">
+          {/* heading */}
+          <div className="sm:flex justify-between items-center mb-6">
+            <div className="mb-5 sm:mb-0">
+              <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
                 <span
-                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                  className={`${selectTab === "today" ? "block" : "hidden"}`}
                 >
-                  Current Job(s)
+                  Active Job(s)
                 </span>
-
-                            </h1>
-                        </div>
-                        <div className="slider-btns flex space-x-4">
-                            <div onClick={() => filterHandler("today")} className="relative">
-
-                            </div>
-                        </div>
-                    </div>
-                    <MyActiveJobTable MyJobList={props.MyJobList} />
-                </div>
+              </h1>
             </div>
-        </Layout>
-    );
+            <div className="slider-btns flex space-x-4">
+              <div
+                onClick={() => filterHandler("today")}
+                className="relative"
+              ></div>
+            </div>
+          </div>
+          <MyActiveJobTable MyJobList={props.MyJobList} />
+        </div>
+      </div>
+    </Layout>
+  );
 }

src/components/MyJobs/MyJobTable.jsx

@@ -51,8 +51,8 @@ export default function MyJobTable({MyJobList, className }) {
                 <table className="table-auto min-w-full text-sm text-left text-gray-500 dark:text-gray-400">
                     <tbody>
                     <tr className="text-base text-thin-light-gray border-b  default-border-b dark:border-[#5356fb29] ottom ">
-                        <td className="py-8">.</td>
-                        <td className="py-4 text-right">.</td>
+                        <td className="py-1">.</td>
+                        <td className="py-1 text-right">.</td>
                     </tr>
 
                     {selectedCategory === "All Categories" ? (
@@ -62,43 +62,44 @@ export default function MyJobTable({MyJobList, className }) {
                                 currentJobList.map((value, index) => (
                                     <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
                                         <td className="py-9">
-                                            <div className="flex space-x-2 items-center job-items">
-
-                                                <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                                                    <img
-                                                        src={dataImage2}
-                                                        alt="data"
-                                                        className="w-full h-full"
-                                                    />
-                                                </div>
-                                                <div className="flex flex-col">
-                                                    <h1 className="font-bold text-xl text-dark-gray dark:text-white">
-                                                        {value.title}
-                                                    </h1>
-                                                    <div>
-                                                        {value.description}
+                                            <div className="sm:flex sm:space-x-2 sm:justify-between sm:items-center job-items">
+                                                <div className="flex space-x-2 items-center job-items">
+                                                    <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                                                        <img
+                                                            src={dataImage2}
+                                                            alt="data"
+                                                            className="w-full h-full"
+                                                        />
                                                     </div>
-                                                    <span className="text-sm text-thin-light-gray">
-                                                    Price: <span className="text-purple">{value.price*0.01}</span>
-                                                    </span>
-                                                    <span className="text-sm text-thin-light-gray">
-                                                    Duration:   <span className="text-purple"> {value.timeline_days} day(s)</span>
-                                                    </span>
+                                                    <div className="flex flex-col">
+                                                        <h1 className="font-bold text-xl text-dark-gray dark:text-white">
+                                                            {value.title}
+                                                        </h1>
+                                                        <div>
+                                                            {value.description}
+                                                        </div>
+                                                        <span className="text-sm text-thin-light-gray">
+                                                        Price: <span className="text-purple">{value.price*0.01}</span>
+                                                        </span>
+                                                        <span className="text-sm text-thin-light-gray">
+                                                        Duration:   <span className="text-purple"> {value.timeline_days} day(s)</span>
+                                                        </span>
 
+                                                    </div>
                                                 </div>
-                                                <div className="job-sub-menu">
-                                                    <button type="button" className="w-20 h-11" onClick={()=>{setDeleteJobPopout({show:true, data:value})}}>[Delete]</button> |
-                                                    <button  type="button" className="w-20 h-11">Edit</button>
+
+                                                <div className="min-w-[110px] max-w-[110px] bg-yellow-300 mx-2 rounded-md flex flex-nowrap space-x-2 justify-center items-center self-end">
+                                                    <button type="button" className="p-2 w-[60px] h-11" onClick={()=>{setDeleteJobPopout({show:true, data:value})}}>[Delete]</button>
+                                                    <span>|</span> 
+                                                    <button  type="button" className="p-2 w-[40px] h-11">Edit</button>
                                                 </div>
                                             </div>
 
                                         </td>
 
-
-                                        <td className="text-right py-3 px-2">
+                                        <td className="text-right py-9 px-2">
                                             <button
                                                 type="button"
-                                                // onClick={()=>{setJobPopout({show:true, data:value})}}
                                                 onClick={()=>{setJobPopout({show:true, data:value})}}
                                                 className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                                             >

src/components/MyJobs/index.jsx

@@ -5,40 +5,44 @@ import MyJobTable from "./MyJobTable";
 import CommonHead from "../UserHeader/CommonHead";
 
 export default function MyJobs(props) {
-    const [selectTab, setValue] = useState("today");
-    const filterHandler = (value) => {
-        setValue(value);
-    };
-    console.log("AMEYE LOC1", props.MyJobList);
-    return (
-        <Layout>
-            <CommonHead />
-            <div className="notification-page w-full mb-10">
-                <div className="notification-wrapper w-full">
-                    {/* heading */}
-                    <div className="sm:flex justify-between items-center mb-6">
-                        <div className="mb-5 sm:mb-0">
-                            <h1 className="text-26 font-bold flex items-center space-x-1  text-dark-gray dark:text-white">
-                                <span
-                                    className={`${selectTab === "today" ? "block" : "hidden"}`}
-                                >
-                                My Jobs
-                                </span>
+  const [selectTab, setValue] = useState("today");
+  const filterHandler = (value) => {
+    setValue(value);
+  };
+  console.log("AMEYE LOC1", props.MyJobList);
+  return (
+    <Layout>
+      <CommonHead />
+      <div className="notification-page w-full mb-10">
+        <div className="notification-wrapper w-full">
+          {/* heading */}
+          <div className="sm:flex justify-between items-center mb-6">
+            <div className="mb-5 sm:mb-0">
+              <h1 className="text-26 font-bold flex items-center space-x-1  text-dark-gray dark:text-white">
+                <span
+                  className={`${selectTab === "today" ? "block" : "hidden"}`}
+                >
+                  My Jobs
+                </span>
 
-                                <Link to='/add-job' className='w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white'>
-                                    Add Job
-                                </Link>
-                            </h1>
-                        </div>
-                        <div className="slider-btns flex space-x-4">
-                            <div onClick={() => filterHandler("today")} className="relative">
-
-                        </div>
-                    </div>
-                    </div>
-                    <MyJobTable MyJobList={props.MyJobList} />
-                </div>
+                <Link
+                  to="/add-job"
+                  className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                >
+                  Add Job
+                </Link>
+              </h1>
             </div>
-        </Layout>
-    );
+            <div className="slider-btns flex space-x-4">
+              <div
+                onClick={() => filterHandler("today")}
+                className="relative"
+              ></div>
+            </div>
+          </div>
+          <MyJobTable MyJobList={props.MyJobList} />
+        </div>
+      </div>
+    </Layout>
+  );
 }

src/components/MyPendingJobs/MyPendingJobTable.jsx

@@ -0,0 +1,112 @@
+import React, { useState } from "react";
+import dataImage1 from "../../assets/images/data-table-user-1.png";
+import dataImage2 from "../../assets/images/data-table-user-2.png";
+import dataImage3 from "../../assets/images/data-table-user-3.png";
+import dataImage4 from "../../assets/images/data-table-user-4.png";
+import SelectBox from "../Helpers/SelectBox";
+import PendingJobsPopout from "../jobPopout/PendingJobsPopout";
+
+import PaginatedList from "../Pagination/PaginatedList";
+import { handlePagingFunc } from "../Pagination/HandlePagination";
+
+export default function MyPendingJobTable({MyJobList, className }) {
+    const filterCategories = ["All Categories", "Explore", "Featured"];
+    const [selectedCategory, setCategory] = useState(filterCategories[0]);
+
+    let [jobPopout,setJobPopout] = useState({show:false, data:{}}) // STATE TO HOLD THE VALUE OF THE ALERT DETAILS AND DETERMINE WHEN TO SHOW
+
+    const [currentPage, setCurrentPage] = useState(0);
+    const indexOfFirstItem = Number(currentPage);
+    const indexOfLastItem = Number(indexOfFirstItem)+Number(process.env.REACT_APP_ITEM_PER_PAGE);
+    const currentActiveJobList = MyJobList?.result_list?.slice(indexOfFirstItem, indexOfLastItem);
+  
+    const handlePagination = (e) => {
+        handlePagingFunc(e,setCurrentPage)
+    }
+
+    return (
+        <div
+            className={`update-table w-full p-8 bg-white dark:bg-dark-white   overflow-hidden rounded-2xl section-shadow ${
+                className || ""
+            }`}
+        >
+            {MyJobList && MyJobList?.result_list &&
+            <div className="relative w-full overflow-x-auto sm:rounded-lg flex flex-col justify-between h-full">
+                <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
+                    <tbody>
+                    {/*<tr className="text-base text-thin-light-gray border-b dark:border-[#5356fb29]  default-border-b dark:border-[#5356fb29] ottom ">*/}
+                    {/*    <td className="py-4">All Product</td>*/}
+                    {/*    <td className="py-4 text-right">.</td>*/}
+                    {/*</tr>*/}
+
+                    {
+                        <>
+                            {MyJobList && MyJobList?.result_list &&
+                                MyJobList.result_list.length > 0 &&
+                                currentActiveJobList.map((value, index) => (
+                                    <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
+                                            <td className=" py-4">
+                                                <div className="flex space-x-2 items-center">
+                                                    <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                                                        <img
+                                                            src={dataImage2}
+                                                            alt="data"
+                                                            className="w-full h-full"
+                                                        />
+                                                    </div>
+                                                    <div className="flex flex-col">
+                                                        <h1 className="font-bold text-xl text-dark-gray dark:text-white">
+                                                            {value.title}
+                                                        </h1>
+                                                        <div>
+                                                            {value.description}
+                                                        </div>
+                                                        <span className="text-sm text-thin-light-gray">
+                                                        Price: <span className="text-purple">{value.price*0.01}</span>
+                                                        </span>
+                                                        <span className="text-sm text-thin-light-gray">
+                                                        Duration:   <span className="text-purple"> {value.timeline_days} day(s)</span>
+                                                        </span>
+                                                        <span className="text-sm text-thin-light-gray">
+                                                        Expire:   <span className="text-purple"> {value.expire}</span>
+                                                        </span>
+                                                        <span className="text-sm text-thin-light-gray">
+                                                        Send to:   <span className="text-purple"> {value.job_to}</span>
+                                                        </span>
+
+                                                    </div>
+                                                </div>
+                                            </td>
+
+
+                                            <td className="text-right py-4 px-2">
+                                                <button
+                                                    type="button"
+                                                    onClick={()=>{setJobPopout({show:true, data:value})}}
+                                                    className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                                                >
+                                                    View
+                                                </button>
+                                            </td>
+                                        </tr>
+                                ))}
+
+
+                        </>
+                    }
+                    </tbody>
+                </table>
+                {/* PAGINATION BUTTON */}
+                <PaginatedList onClick={handlePagination} prev={currentPage == 0 ? true : false} next={currentPage+Number(process.env.REACT_APP_ITEM_PER_PAGE) >= MyJobList?.result_list.length ? true : false} data={MyJobList?.result_list} start={indexOfFirstItem} stop={indexOfLastItem} />
+                {/* END OF PAGINATION BUTTON */}
+            </div>
+            }
+
+            {/* Active Job Popout */}
+            {jobPopout.show &&
+                <PendingJobsPopout details={jobPopout.data} onClose={()=>{setJobPopout({show:false, data:{}})}} situation={jobPopout.show} />
+            }
+            {/* End of Active Job Popout */}
+        </div>
+    );
+}

src/components/MyPendingJobs/index.jsx

@@ -0,0 +1,41 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import Layout from "../Partials/Layout";
+import CommonHead from "../UserHeader/CommonHead";
+import MyPendingJobTable from "./MyPendingJobTable";
+
+export default function MyPendingJobs(props) {
+    const [selectTab, setValue] = useState("today");
+    const filterHandler = (value) => {
+        setValue(value);
+    };
+    console.log("AMEYE LOC1", props.MyJobList);
+    return (
+        <Layout>
+            <CommonHead />
+            <div className="notification-page w-full mb-10">
+                <div className="notification-wrapper w-full">
+                    {/* heading */}
+                    <div className="sm:flex justify-between items-center mb-6">
+                        <div className="mb-5 sm:mb-0">
+                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+                <span
+                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                >
+                  Pending Job(s)
+                </span>
+
+                            </h1>
+                        </div>
+                        <div className="slider-btns flex space-x-4">
+                            <div onClick={() => filterHandler("today")} className="relative">
+
+                            </div>
+                        </div>
+                    </div>
+                    <MyPendingJobTable MyJobList={props.MyJobList} />
+                </div>
+            </div>
+        </Layout>
+    );
+}

src/components/MyTasks/index.jsx

@@ -5,36 +5,36 @@ import MyJobTable from "./MyJobTable";
 import CommonHead from "../UserHeader/CommonHead";
 
 export default function MyTasks() {
-    const [selectTab, setValue] = useState("today");
-    const filterHandler = (value) => {
-        setValue(value);
-    };
-    return (
-        <Layout>
-            <CommonHead />
-            <div className="notification-page w-full mb-10">
-                <div className="notification-wrapper w-full">
-                    {/* heading */}
-                    <div className="sm:flex justify-between items-center mb-6">
-                        <div className="mb-5 sm:mb-0">
-                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
+  const [selectTab, setValue] = useState("today");
+  const filterHandler = (value) => {
+    setValue(value);
+  };
+  return (
+    <Layout>
+      <CommonHead />
+      <div className="notification-page w-full mb-10">
+        <div className="notification-wrapper w-full">
+          {/* heading */}
+          <div className="sm:flex justify-between items-center mb-6">
+            <div className="mb-5 sm:mb-0">
+              <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
                 <span
-                    className={`${selectTab === "today" ? "block" : "hidden"}`}
+                  className={`${selectTab === "today" ? "block" : "hidden"}`}
                 >
                   My Tasks
                 </span>
-
-                            </h1>
-                        </div>
-                        <div className="slider-btns flex space-x-4">
-                            <div onClick={() => filterHandler("today")} className="relative">
-
-                        </div>
-                    </div>
-                    </div>
-                    <MyJobTable />
-                </div>
+              </h1>
             </div>
-        </Layout>
-    );
+            <div className="slider-btns flex space-x-4">
+              <div
+                onClick={() => filterHandler("today")}
+                className="relative"
+              ></div>
+            </div>
+          </div>
+          <MyJobTable />
+        </div>
+      </div>
+    </Layout>
+  );
 }

src/components/MyWallet/TransferFund.jsx

@@ -110,6 +110,7 @@ function TransferFund({ payment, wallet }) {
   useEffect(() => {
     getRecipients();
   }, []);
+  
   return (
     <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
       <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
@@ -136,21 +137,25 @@ function TransferFund({ payment, wallet }) {
                     </h2>
                   ) : wallet.error ? (
                     <h2 className="my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
-                      Opps! An Error Occured
+                      Opps! An Error Occurred
                     </h2>
                   ) : (
                     <h2 className="my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium">
                       No Wallet Information Found!
                     </h2>
                   )}
-                  <div className="xl:flex xl:space-x-7 mb-6">
-                    <div className="field w-full mb-6 xl:mb-0">
+                  <div className=" mb-6 gap-4 flex flex-col">
+                    <div className="field w-full">
                       <InputCom
-                        fieldClass="px-6"
-                        label="Amount"
-                        type="text"
+                        fieldClass="px-4"
+                        parentClass="flex items-center gap-1 justify-between"
+                        labelClass="flex-[0.2] mb-0"
+                        inputClass="flex-[0.8] max-w-[12rem]"
+                        label="Amount:"
+                        type="number"
                         name="amount"
                         placeholder="0"
+                        direction="rtl"
                         value={props.values.amount}
                         inputHandler={props.handleChange}
                         blurHandler={(e) => {
@@ -160,7 +165,7 @@ function TransferFund({ payment, wallet }) {
                         // onMouseLeave={(e)=>{getSendMoneyFee(e)}}
                       />
                       {props.errors.amount && props.touched.amount && (
-                        <p className="text-sm text-red-500">
+                        <p className="sm:text-sm text-[12px] text-red-500 sm:text-left text-right sm:translate-y-0 translate-y-1">
                           {props.errors.amount}
                         </p>
                       )}
@@ -168,25 +173,31 @@ function TransferFund({ payment, wallet }) {
 
                     <div className="field w-full">
                       <InputCom
-                        fieldClass="px-6"
-                        label="Fee"
+                        fieldClass="px-4 transfer-field"
+                        parentClass="flex items-center gap-1 justify-between"
+                        labelClass="flex-[0.2] mb-0"
+                        inputClass="flex-[0.8] transfer-field max-w-[12rem]"
+                        label="Fee:"
                         type="text"
                         name="fee"
+                        direction="rtl"
                         value={
                           sendMoneyFee.loading ? "loading" : sendMoneyFee.fee
                         }
                         disable={true}
                       />
                     </div>
-                  </div>
 
-                  <div className="md:flex items-center justify-end">
-                    <div className="field w-full lg:w-1/2 mb-6">
+                    <div className="field w-full mb-6">
                       <InputCom
-                        fieldClass="px-6"
-                        label="Total"
+                        fieldClass="px-4 transfer-field"
+                        parentClass="flex items-center gap-1 justify-between"
+                        labelClass="flex-[0.2] mb-0"
+                        inputClass="flex-[0.8] transfer-field max-w-[12rem]"
+                        label="Total:"
                         type="text"
                         name="total"
+                        direction="rtl"
                         value={
                           sendMoneyFee.loading ? "loading" : sendMoneyFee.total
                         }
@@ -197,87 +208,85 @@ function TransferFund({ payment, wallet }) {
 
                   <div className="w-full">
                     <div className="relative my-3 md:flex items-center">
-                      <div className="transfer-input w-full">
-                        <div className="flex items-center justify-start py-2">
-                          <label className="text-[#181c32] dark:text-white text-base font-semibold block mb-2.5">
-                            Recipient
-                            <span className="text-red-500 mx-2">*</span>
-                            <span
-                              title="Transfer Recipient"
-                              className={`text-white text-sm bg-slate-500 w-1 h-1 rounded-full px-3 py-1 cursor-pointer`}
-                            >
-                              !
-                            </span>
-                          </label>
-                          <Link
-                            to="add-recipient"
-                            className="mx-1 text-base text-white p-2 bg-[orange] rounded-md hover:opacity-80"
+                      <div className="transfer-input w-full flex items-start gap-1 justify-between">
+                        <label className="text-[#181c32] dark:text-white text-base font-semibold block flex-[0.2] mb-0 mt-3">
+                          Recipient:
+                        </label>
+                        <div className="flex flex-col gap-3 flex-[0.8] sm:items-start items-end">
+                          <select
+                            className="sm:w-full w-48 text-base p-2 text-dark-gray dark:text-white rounded-md border border-slate-300 outline-0 flex-[0.8]"
+                            value={props.values.recipientID}
+                            name="recipientID"
+                            onChange={props.handleChange}
+                            onBlur={props.handleBlur}
                           >
-                            Add New
-                          </Link>
-                        </div>
-                        <select
-                          className="w-full text-base p-2 text-dark-gray dark:text-white rounded-md border border-slate-300 outline-0"
-                          value={props.values.recipientID}
-                          name="recipientID"
-                          onChange={props.handleChange}
-                          onBlur={props.handleBlur}
-                        >
-                          {recipients.loading ? (
-                            <option className="text-slate-500 text-lg" value="">
-                              Loading...
-                            </option>
-                          ) : recipients.data.length ? (
-                            <>
+                            {recipients.loading ? (
                               <option
                                 className="text-slate-500 text-lg"
                                 value=""
                               >
-                                Select...
+                                Loading...
                               </option>
-                              {recipients.data.map((item, index) => (
+                            ) : recipients.data.length ? (
+                              <>
                                 <option
-                                  key={index}
-                                  value={item.recipient_id}
                                   className="text-slate-500 text-lg"
+                                  value=""
                                 >
-                                  {item.recipient}
+                                  Select...
                                 </option>
-                              ))}
-                            </>
-                          ) : recipients.error ? (
-                            <option className="text-slate-500 text-lg" value="">
-                              Could'nt Load, try again!
-                            </option>
-                          ) : (
-                            <option className="text-slate-500 text-lg" value="">
-                              No Recipient Found! Click Add to Add
-                            </option>
-                          )}
-                        </select>
+                                {recipients.data.map((item, index) => (
+                                  <option
+                                    key={index}
+                                    value={item.recipient_id}
+                                    className="text-slate-500 text-lg"
+                                  >
+                                    {item.recipient}
+                                  </option>
+                                ))}
+                              </>
+                            ) : recipients.error ? (
+                              <option
+                                className="text-slate-500 text-lg"
+                                value=""
+                              >
+                                Could'nt load, try again!
+                              </option>
+                            ) : (
+                              <option
+                                className="text-slate-500 text-lg"
+                                value=""
+                              >
+                                No Recipient Found!
+                              </option>
+                            )}
+                          </select>
+                          <div className="flex justify-end relative w-full">
+                            {props.errors.recipientID &&
+                              props.touched.recipientID && (
+                                <p className="sm:text-sm text-[12px] text-red-500 absolute sm:top-1 -top-20 sm:left-0 left-[160px]">
+                                  {props.errors.recipientID}
+                                </p>
+                              )}
+                            <Link
+                              to="add-recipient"
+                              className="mx-1 text-base text-white p-2 bg-[orange] rounded-md hover:opacity-80 max-w-[5rem]"
+                            >
+                              Add New
+                            </Link>
+                          </div>
+                        </div>
                       </div>
                     </div>
-                    {props.errors.recipientID && props.touched.recipientID && (
-                      <p className="text-sm text-red-500">
-                        {props.errors.recipientID}
-                      </p>
-                    )}
                   </div>
 
-                  <div className="field w-full mb-6">
-                    {/* <InputCom fieldClass="px-6"
-                                            label="Comment"
-                                            type="text"
-                                            name="comment"
-                                            value={inputs.comment}
-                                            inputHandler={handleChange}
-                                        /> */}
-                    <label className="text-[#181c32] dark:text-white text-base font-semibold block mb-2.5">
-                      Comment
+                  <div className="field w-full mb-6 flex gap-1 justify-between">
+                    <label className="text-[#181c32] dark:text-white text-base font-semibold flex flex-[0.2] mt-2.5">
+                      Comment:
                     </label>
                     <textarea
                       style={{ resize: "none" }}
-                      className="text-base px-6 text-dark-gray dark:text-white w-full bg-slate-100 dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
+                      className="text-base px-4 py-2 rounded-md min-h-[100px] sm:max-w-[550px] max-w-[250px] text-dark-gray dark:text-white w-full bg-slate-100 dark:bg-[#11131F]  focus:ring-0 focus:outline-none flex-[0.8]"
                       name="comment"
                       value={props.values.comment}
                       onChange={props.handleChange}

src/components/MyWallet/WalletHeader.jsx

@@ -1,4 +1,4 @@
-import {Link} from 'react-router-dom'
+import { Link, useLocation, useNavigate } from "react-router-dom";
 import Icons from "../Helpers/Icons";
 import bank1 from "../../assets/images/bank-1.png";
 import bank2 from "../../assets/images/bank-2.png";
@@ -8,180 +8,194 @@ import Accordion from "../Helpers/Accordion";
 
 export default function WalletHeader(props) {
   //  debugger;
-    //props.myWalletList.result_list
-    return (
-        <>
-            <div
-                className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]  items-center rounded-full relative  bg-purple pr-1.5 pl-4">
-                <div
-                    onClick={() => props.handlerBalance()}
-                    className="flex items-center lg:justify-between justify-center w-full h-full"
-                >
-                <span className="lg:block hidden">
-                  <Icons name="wallet"/>
-                </span>
-                    <p className="lg:text-xl text-lg font-bold text-white">
-                        Wallet
-                    </p>
-                    <span className="lg:block hidden">
-                  <Icons name="deep-plus"/>
-                </span>
-                </div>
-                <div
-                    className={`balance-dropdown w-96 z-30 bg-white dark:bg-dark-white   absolute -left-24 rounded-lg cursor-pointer ${
-                        props.balanceDropdown ? "active" : ""
-                    }`}
-                >
-                    <div className="heading border-b dark:border-[#5356fb29]  border-light-purple px-7 py-6">
-                        <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
-                            Wallet
-                        </h3>
+  //props.myWalletList.result_list
+  let { pathname } = useLocation();
+  let navigate = useNavigate();
+  return (
+    <>
+      <div className="lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]  items-center rounded-full relative  bg-purple pr-1.5 pl-4">
+        <div
+          onClick={() => props.handlerBalance()}
+          className="flex items-center lg:justify-between justify-center w-full h-full"
+        >
+          <span className="lg:block hidden">
+            <Icons name="wallet" />
+          </span>
+          <p className="lg:text-xl text-lg font-bold text-white">Wallet</p>
+          <span className="lg:block hidden">
+            <Icons name="deep-plus" />
+          </span>
+        </div>
+        <div
+          className={`balance-dropdown w-96 z-30 bg-white dark:bg-dark-white   absolute -left-24 rounded-lg cursor-pointer ${
+            props.balanceDropdown ? "active" : ""
+          }`}
+        >
+          <div className="heading border-b dark:border-[#5356fb29]  border-light-purple px-7 py-6">
+            <h3 className="text-xl font-bold   text-dark-gray dark:text-white">
+              Wallet
+            </h3>
+          </div>
+          <div className="content px-7 pb-7">
+            <ul>
+              {props.myWalletList &&
+                props.myWalletList?.result_list?.length > 0 &&
+                props.myWalletList.result_list.map((value, index) => (
+                  <li
+                    key={index}
+                    className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple"
+                  >
+                    <div className="sm:flex justify-between items-center">
+                      <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">
+                        <div className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">
+                          <img src={bank1} alt="" />
+                        </div>
+                        <div className="name">
+                          <p className="text-base text-dark-gray dark:text-white font-medium">
+                            {value.description}
+                          </p>
+                        </div>
+                      </div>
+                      <div>
+                        <p className="eth text-xl font-bold text-purple">
+                          {(value.amount * 0.01).toFixed(2)} {value.code}
+                        </p>
+                        <p className="usd text-base text-thin-light-gray text-right">
+                          {/*(773.69 USD)*/}
+                        </p>
+                      </div>
                     </div>
-                    <div className="content px-7 pb-7">
-                        <ul>
+                  </li>
+                ))}
 
-                            {props.myWalletList &&
-                                props.myWalletList?.result_list?.length > 0 &&
-                                props.myWalletList.result_list.map((value, index) => (
-                                    <li key={index} className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">
-                                        <div className="sm:flex justify-between items-center">
-                                            <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">
-                                                <div
-                                                    className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">
-                                                    <img src={bank1} alt=""/>
-                                                </div>
-                                                <div className="name">
-                                                    <p className="text-base text-dark-gray dark:text-white font-medium">
-                                                        {value.description}
-                                                    </p>
-                                                </div>
-                                            </div>
-                                            <div>
-                                                <p className="eth text-xl font-bold text-purple">
-                                                    {(value.amount*0.01).toFixed(2)} {value.code}
-                                                </p>
-                                                <p className="usd text-base text-thin-light-gray text-right">
-                                                    {/*(773.69 USD)*/}
-                                                </p>
-                                            </div>
-                                        </div>
-                                    </li>
-                                ))}
-
-                            {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
-                            {/*    <div className="sm:flex justify-between items-center">*/}
-                            {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
-                            {/*            <div*/}
-                            {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
-                            {/*                <img src={bank1} alt=""/>*/}
-                            {/*            </div>*/}
-                            {/*            <div className="name">*/}
-                            {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
-                            {/*                    MetaMask*/}
-                            {/*                </p>*/}
-                            {/*            </div>*/}
-                            {/*        </div>*/}
-                            {/*        <div>*/}
-                            {/*            <p className="eth text-xl font-bold text-purple">*/}
-                            {/*                75,320 ETH*/}
-                            {/*            </p>*/}
-                            {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
-                            {/*                (773.69 USD)*/}
-                            {/*            </p>*/}
-                            {/*        </div>*/}
-                            {/*    </div>*/}
-                            {/*</li>*/}
-                            {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
-                            {/*    <div className="sm:flex justify-between items-center">*/}
-                            {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
-                            {/*            <div*/}
-                            {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
-                            {/*                <img src={bank2} alt=""/>*/}
-                            {/*            </div>*/}
-                            {/*            <div className="name">*/}
-                            {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
-                            {/*                    Coinbase Wallet*/}
-                            {/*                </p>*/}
-                            {/*            </div>*/}
-                            {/*        </div>*/}
-                            {/*        <div>*/}
-                            {/*            <p className="eth text-xl font-bold text-purple">*/}
-                            {/*                56,124 ETH*/}
-                            {/*            </p>*/}
-                            {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
-                            {/*                (773.69 USD)*/}
-                            {/*            </p>*/}
-                            {/*        </div>*/}
-                            {/*    </div>*/}
-                            {/*</li>*/}
-                            {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
-                            {/*    <div className="sm:flex justify-between items-center">*/}
-                            {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
-                            {/*            <div*/}
-                            {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
-                            {/*                <img src={bank3} alt=""/>*/}
-                            {/*            </div>*/}
-                            {/*            <div className="name">*/}
-                            {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
-                            {/*                    Bitski*/}
-                            {/*                </p>*/}
-                            {/*            </div>*/}
-                            {/*        </div>*/}
-                            {/*        <div>*/}
-                            {/*            <p className="eth text-xl font-bold text-purple">*/}
-                            {/*                99,123 ETH*/}
-                            {/*            </p>*/}
-                            {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
-                            {/*                (773.69 USD)*/}
-                            {/*            </p>*/}
-                            {/*        </div>*/}
-                            {/*    </div>*/}
-                            {/*</li>*/}
-                            {/*<li className="content-item py-5">*/}
-                            {/*    <div className="sm:flex justify-between items-center">*/}
-                            {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
-                            {/*            <div*/}
-                            {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
-                            {/*                <img src={bank4} alt=""/>*/}
-                            {/*            </div>*/}
-                            {/*            <div className="name">*/}
-                            {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
-                            {/*                    WalletConnect*/}
-                            {/*                </p>*/}
-                            {/*            </div>*/}
-                            {/*        </div>*/}
-                            {/*        <div>*/}
-                            {/*            <p className="eth text-xl font-bold text-purple">*/}
-                            {/*                43,728 ETH*/}
-                            {/*            </p>*/}
-                            {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
-                            {/*                (773.69 USD)*/}
-                            {/*            </p>*/}
-                            {/*        </div>*/}
-                            {/*    </div>*/}
-                            {/*</li>*/}
-                        </ul>
-                        <div className="add-money-btn flex justify-center items-center mt-3">
-                            {/* <button
-                                onClick={() => props.addMoneyHandler()}
+              {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
+              {/*    <div className="sm:flex justify-between items-center">*/}
+              {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
+              {/*            <div*/}
+              {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+              {/*                <img src={bank1} alt=""/>*/}
+              {/*            </div>*/}
+              {/*            <div className="name">*/}
+              {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
+              {/*                    MetaMask*/}
+              {/*                </p>*/}
+              {/*            </div>*/}
+              {/*        </div>*/}
+              {/*        <div>*/}
+              {/*            <p className="eth text-xl font-bold text-purple">*/}
+              {/*                75,320 ETH*/}
+              {/*            </p>*/}
+              {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
+              {/*                (773.69 USD)*/}
+              {/*            </p>*/}
+              {/*        </div>*/}
+              {/*    </div>*/}
+              {/*</li>*/}
+              {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
+              {/*    <div className="sm:flex justify-between items-center">*/}
+              {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
+              {/*            <div*/}
+              {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+              {/*                <img src={bank2} alt=""/>*/}
+              {/*            </div>*/}
+              {/*            <div className="name">*/}
+              {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
+              {/*                    Coinbase Wallet*/}
+              {/*                </p>*/}
+              {/*            </div>*/}
+              {/*        </div>*/}
+              {/*        <div>*/}
+              {/*            <p className="eth text-xl font-bold text-purple">*/}
+              {/*                56,124 ETH*/}
+              {/*            </p>*/}
+              {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
+              {/*                (773.69 USD)*/}
+              {/*            </p>*/}
+              {/*        </div>*/}
+              {/*    </div>*/}
+              {/*</li>*/}
+              {/*<li className="content-item py-4 border-b dark:border-[#5356fb29]  border-light-purple hover:border-purple dark:hover:border-purple">*/}
+              {/*    <div className="sm:flex justify-between items-center">*/}
+              {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
+              {/*            <div*/}
+              {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+              {/*                <img src={bank3} alt=""/>*/}
+              {/*            </div>*/}
+              {/*            <div className="name">*/}
+              {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
+              {/*                    Bitski*/}
+              {/*                </p>*/}
+              {/*            </div>*/}
+              {/*        </div>*/}
+              {/*        <div>*/}
+              {/*            <p className="eth text-xl font-bold text-purple">*/}
+              {/*                99,123 ETH*/}
+              {/*            </p>*/}
+              {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
+              {/*                (773.69 USD)*/}
+              {/*            </p>*/}
+              {/*        </div>*/}
+              {/*    </div>*/}
+              {/*</li>*/}
+              {/*<li className="content-item py-5">*/}
+              {/*    <div className="sm:flex justify-between items-center">*/}
+              {/*        <div className="account-name flex space-x-4 items-center mb-2 sm:mb-0">*/}
+              {/*            <div*/}
+              {/*                className="icon w-14 h-14 transition duration-300 ease-in-out rounded-full flex justify-center items-center bg-light-purple dark:bg-dark-light-purple ">*/}
+              {/*                <img src={bank4} alt=""/>*/}
+              {/*            </div>*/}
+              {/*            <div className="name">*/}
+              {/*                <p className="text-base text-dark-gray dark:text-white font-medium">*/}
+              {/*                    WalletConnect*/}
+              {/*                </p>*/}
+              {/*            </div>*/}
+              {/*        </div>*/}
+              {/*        <div>*/}
+              {/*            <p className="eth text-xl font-bold text-purple">*/}
+              {/*                43,728 ETH*/}
+              {/*            </p>*/}
+              {/*            <p className="usd text-base text-thin-light-gray text-right">*/}
+              {/*                (773.69 USD)*/}
+              {/*            </p>*/}
+              {/*        </div>*/}
+              {/*    </div>*/}
+              {/*</li>*/}
+            </ul>
+            <div className="add-money-btn flex justify-center items-center mt-3">
+              {/* <button
+                                onClick={() => {
+                                if(pathname == '/my-wallet') props.setBalanceDropdown.toggle()
+                                else navigate('/my-wallet', {replace: true})
+                                }}
                                 type="button"
                                 className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                             >
                                 Manage
                             </button> */}
-                            <Link to='/my-wallet' className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white">Manage</Link>
-                        </div>
-                    </div>
-                </div>
+              <Link
+                to="/my-wallet"
+                onClick={() => {
+                  if (pathname == "/my-wallet")
+                    props.setBalanceDropdown.toggle();
+                  else navigate("/my-wallet", { replace: true });
+                }}
+                className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+              >
+                Manage
+              </Link>
             </div>
-            {/*<div*/}
-            {/*    className="lg:hidden flex user-balance cursor-pointer lg:w-[252px] w-[150px] h-[48px]  items-center rounded-full relative  bg-purple">*/}
-            {/*    <div className="flex items-center lg:justify-between justify-center w-full h-full">*/}
-            {/*        <p className="lg:text-xl text-lg font-bold text-white">*/}
-            {/*            $ 234,435.34*/}
-            {/*        </p>*/}
-            {/*    </div>*/}
-            {/*</div>*/}
-            <div className="lg:hidden block"></div>
-        </>);
+          </div>
+        </div>
+      </div>
+      {/*<div*/}
+      {/*    className="lg:hidden flex user-balance cursor-pointer lg:w-[252px] w-[150px] h-[48px]  items-center rounded-full relative  bg-purple">*/}
+      {/*    <div className="flex items-center lg:justify-between justify-center w-full h-full">*/}
+      {/*        <p className="lg:text-xl text-lg font-bold text-white">*/}
+      {/*            $ 234,435.34*/}
+      {/*        </p>*/}
+      {/*    </div>*/}
+      {/*</div>*/}
+      <div className="lg:hidden block"></div>
+    </>
+  );
 }

src/components/Partials/Header.jsx

@@ -1,5 +1,5 @@
 import React, { useContext,useState, useEffect } from "react";
-import { Link } from "react-router-dom";
+import { Link, useLocation } from "react-router-dom";
 import bank1 from "../../assets/images/bank-1.png";
 import bank2 from "../../assets/images/bank-2.png";
 import bank3 from "../../assets/images/bank-3.png";
@@ -91,6 +91,15 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
     setToggleNotification.toggle()
   }
 
+  // getting the location of head
+  let {pathname} = useLocation()
+  
+  const handleWalletBtn = () => {
+    if (pathname === "/my-wallet"){
+      setbalanceValue.set(false)
+    } else return balanceDropdown
+  }
+
   // User Profile
   let {firstname, lastname, email, profile_pic} = userDetails
   let userEmail = email.split('@')[0]
@@ -234,7 +243,8 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                 myWalletList={myWalletList}
                 handlerBalance={handlerBalance}
                 balanceDropdown={balanceDropdown}
-                addMoneyHandler={addMoneyHandler} />
+                addMoneyHandler={addMoneyHandler}
+                setBalanceDropdown = {setbalanceValue} />
             {/* notification */}
             <div className="user-notification lg:block hidden relative">
               <div

src/components/Partials/MobileSideBar.jsx

@@ -12,7 +12,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
 
   let { jobLists } = useSelector((state) => state.jobLists);
   const marketData = jobLists?.result_list;
-  let noOfJobs = marketData?.length;
+  let noOfJobs = marketData?.length <= 0 ? "0" : marketData?.length;
 
   return (
     <div className="w-full h-full">
@@ -163,19 +163,20 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
           </div>
         </div>
 
-        {!userDetails.post_jobs ? 
+        {!userDetails.post_jobs ? (
           <div className="setting-item">
-          <div className="top-platform bg-pink dark:bg-dark-white   rounded-2xl p-16 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border ">
-            <NavLink to="/start-job" className="nav-item flex items-center justify-start space-x-3.5">
-              <span className="item-content relative group-hover:text-purple text-xl transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">
-                Enable Job Post
-              </span>
-            </NavLink>
+            <div className="top-platform bg-pink dark:bg-dark-white   rounded-2xl p-16 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border ">
+              <NavLink
+                to="/start-job"
+                className="nav-item flex items-center justify-start space-x-3.5"
+              >
+                <span className="item-content relative group-hover:text-purple text-xl transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">
+                  Enable Job Post
+                </span>
+              </NavLink>
+            </div>
           </div>
-        </div>
-        :
-        jobLists?.result_list?.length ?
-          (
+        ) : jobLists?.result_list?.length ? (
           <div className="setting-item">
             <div className="heading mb-5">
               <h1 className="title text-xl font-bold text-purple">My Jobs</h1>
@@ -224,33 +225,30 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
               </ul>
             </div>
           </div>
-          )
-          :
-          (
-            <div className="setting-item">
-              <div className="heading mb-5">
-                <h1 className="title text-xl font-bold text-purple">My Jobs</h1>
-              </div>
-              <div className="items">
-                <ul className="flex flex-col space-y-6">
-                  <li className="item group">
-                    <NavLink
-                      to="/add-job"
-                      className="nav-item flex items-center justify-start space-x-3.5"
-                    >
-                      <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
-                        <Icons name="people-two" />
-                      </span>
-                      <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
-                        My Jobs
-                      </span>
-                    </NavLink>
-                  </li>
-                </ul>
-              </div>
+        ) : (
+          <div className="setting-item">
+            <div className="heading mb-5">
+              <h1 className="title text-xl font-bold text-purple">My Jobs</h1>
             </div>
-            )
-      }
+            <div className="items">
+              <ul className="flex flex-col space-y-6">
+                <li className="item group">
+                  <NavLink
+                    to="/add-job"
+                    className="nav-item flex items-center justify-start space-x-3.5"
+                  >
+                    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full   text-dark-gray dark:text-white">
+                      <Icons name="people-two" />
+                    </span>
+                    <span className="item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium active flex-1">
+                      My Jobs
+                    </span>
+                  </NavLink>
+                </li>
+              </ul>
+            </div>
+          </div>
+        )}
       </div>
       {/* signout area */}
       {sidebar ? (
@@ -345,4 +343,4 @@ const ListItem = ({ sidebar, route, title, bubble }) => {
       </NavLink>
     </li>
   );
-};
+};

src/components/Partials/Sidebar.jsx

@@ -13,7 +13,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
 
   let { jobLists } = useSelector((state) => state.jobLists);
   const marketData = jobLists?.result_list;
-  let noOfJobs = marketData?.length;
+  let noOfJobs = marketData?.length <= 0 ? "0" : marketData?.length;
 
   useEffect(() => {
     const title = document.querySelectorAll(".menu-setting-items .heading");
@@ -233,168 +233,164 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
         <div className="setting-item">
           <div className="heading mb-5 bg-dark-blue   rounded-2xl p-2 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border">
             <NavLink to="/acc-family">
-               <h1 className="title text-xl font-bold text-purple">Family Corner</h1>
+              <h1 className="title text-xl font-bold text-purple">
+                Family Corner
+              </h1>
             </NavLink>
           </div>
         </div>
 
-        {!userDetails.post_jobs ? 
-        <div className="setting-item">
-          <div className="top-platform bg-pink dark:bg-dark-white   rounded-2xl p-16 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border ">
-            <NavLink to="/start-job">
-              <span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">
-                Enable Job Post
-              </span>
-            </NavLink>
+        {!userDetails.post_jobs ? (
+          <div className="setting-item">
+            <div className="top-platform bg-pink dark:bg-dark-white   rounded-2xl p-16 2xl:w-[180px] w-full 2xl:mb-10 2xl:border-none  border ">
+              <NavLink to="/start-job">
+                <span className="item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium active flex-1">
+                  Enable Job Post
+                </span>
+              </NavLink>
+            </div>
           </div>
-        </div>
-        :
-        jobLists?.result_list?.length ?
-          (
-            <div className="setting-item">
-              <div className="heading mb-5">
-                <h1 className="title text-xl font-bold text-purple">My Jobs</h1>
-              </div>
-              <div className="items">
-                <ul className="flex flex-col space-y-6">
-                  <li className="item group">
-                    <NavLink
-                      to="/myjobs"
-                      className={`nav-item flex items-center ${
-                        ((navData) => (navData.isActive ? "active" : ""),
-                        sidebar ? "justify-start space-x-3.5" : "justify-center")
-                      }`}
-                    >
-                      <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                        <Icons name="people-two" />
-                      </span>
-                      <span
-                        className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                          sidebar ? "active flex-1" : "w-0"
-                        }`}
-                      >
-                        List
-                      </span>
-                    </NavLink>
-                  </li>
-                  <li className="item group">
-                    <NavLink
-                      to="/my-active-jobs"
-                      className={`nav-item flex items-center ${
-                        ((navData) => (navData.isActive ? "active" : ""),
-                        sidebar ? "justify-start space-x-3.5" : "justify-center")
-                      }`}
-                    >
-                      <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                        <Icons name="people-two" />
-                      </span>
-                      <span
-                        className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                          sidebar ? "active flex-1" : "w-0"
-                        }`}
-                      >
-                        Pending
-                      </span>
-                    </NavLink>
-                  </li>
-                  <li className="item group">
-                    <NavLink
-                      to="/my-active-jobs"
-                      className={`nav-item flex items-center ${
-                        ((navData) => (navData.isActive ? "active" : ""),
-                        sidebar ? "justify-start space-x-3.5" : "justify-center")
-                      }`}
-                    >
-                      <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                        <Icons name="people-two" />
-                      </span>
-                      <span
-                        className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                          sidebar ? "active flex-1" : "w-0"
-                        }`}
-                      >
-                        Active
-                      </span>
-                    </NavLink>
-                  </li>
-                  {/*<li className="item group">*/}
-                  {/*  <NavLink*/}
-                  {/*    to="/profile"*/}
-                  {/*    className={`nav-item flex items-center ${*/}
-                  {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
-                  {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
-                  {/*    }`}*/}
-                  {/*  >*/}
-                  {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
-                  {/*      <Icons name="people-two" />*/}
-                  {/*    </span>*/}
-                  {/*    <span*/}
-                  {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
-                  {/*        sidebar ? "active flex-1" : "w-0"*/}
-                  {/*      }`}*/}
-                  {/*    >*/}
-                  {/*      My Profile*/}
-                  {/*    </span>*/}
-                  {/*  </NavLink>*/}
-                  {/*</li>*/}
-                  {/*<li className="item group">*/}
-                  {/*  <NavLink*/}
-                  {/*    to="/settings"*/}
-                  {/*    className={`nav-item flex items-center ${*/}
-                  {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
-                  {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
-                  {/*    }`}*/}
-                  {/*  >*/}
-                  {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
-                  {/*      <Icons name="setting" />*/}
-                  {/*    </span>*/}
-                  {/*    <span*/}
-                  {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
-                  {/*        sidebar ? "active flex-1" : "w-0"*/}
-                  {/*      }`}*/}
-                  {/*    >*/}
-                  {/*      Settings*/}
-                  {/*    </span>*/}
-                  {/*  </NavLink>*/}
-                  {/*</li>*/}
-                </ul>
-              </div>
+        ) : jobLists?.result_list?.length ? (
+          <div className="setting-item">
+            <div className="heading mb-5">
+              <h1 className="title text-xl font-bold text-purple">My Jobs</h1>
             </div>
-          )
-          :
-          (
-            <div className="setting-item">
-              <div className="heading mb-5">
-                <h1 className="title text-xl font-bold text-purple">My Jobs</h1>
-              </div>
-              <div className="items">
-                <ul className="flex flex-col space-y-6">
-                  <li className="item group">
-                    <NavLink
-                      to="/add-job"
-                      className={`nav-item flex items-center ${
-                        ((navData) => (navData.isActive ? "active" : ""),
-                        sidebar ? "justify-start space-x-3.5" : "justify-center")
+            <div className="items">
+              <ul className="flex flex-col space-y-6">
+                <li className="item group">
+                  <NavLink
+                    to="/myjobs"
+                    className={`nav-item flex items-center ${
+                      ((navData) => (navData.isActive ? "active" : ""),
+                      sidebar ? "justify-start space-x-3.5" : "justify-center")
+                    }`}
+                  >
+                    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+                      <Icons name="people-two" />
+                    </span>
+                    <span
+                      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                        sidebar ? "active flex-1" : "w-0"
                       }`}
                     >
-                      <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                        <Icons name="people-two" />
-                      </span>
-                      <span
-                        className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                          sidebar ? "active flex-1" : "w-0"
-                        }`}
-                      >
-                        Add Job
-                      </span>
-                    </NavLink>
-                  </li>
-                </ul>
-              </div>
+                      List
+                    </span>
+                  </NavLink>
+                </li>
+                <li className="item group">
+                  <NavLink
+                    to="/my-pending-jobs"
+                    className={`nav-item flex items-center ${
+                      ((navData) => (navData.isActive ? "active" : ""),
+                      sidebar ? "justify-start space-x-3.5" : "justify-center")
+                    }`}
+                  >
+                    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+                      <Icons name="people-two" />
+                    </span>
+                    <span
+                      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                        sidebar ? "active flex-1" : "w-0"
+                      }`}
+                    >
+                      Pending
+                    </span>
+                  </NavLink>
+                </li>
+                <li className="item group">
+                  <NavLink
+                    to="/my-active-jobs"
+                    className={`nav-item flex items-center ${
+                      ((navData) => (navData.isActive ? "active" : ""),
+                      sidebar ? "justify-start space-x-3.5" : "justify-center")
+                    }`}
+                  >
+                    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+                      <Icons name="people-two" />
+                    </span>
+                    <span
+                      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                        sidebar ? "active flex-1" : "w-0"
+                      }`}
+                    >
+                      Active
+                    </span>
+                  </NavLink>
+                </li>
+                {/*<li className="item group">*/}
+                {/*  <NavLink*/}
+                {/*    to="/profile"*/}
+                {/*    className={`nav-item flex items-center ${*/}
+                {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
+                {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
+                {/*    }`}*/}
+                {/*  >*/}
+                {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
+                {/*      <Icons name="people-two" />*/}
+                {/*    </span>*/}
+                {/*    <span*/}
+                {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
+                {/*        sidebar ? "active flex-1" : "w-0"*/}
+                {/*      }`}*/}
+                {/*    >*/}
+                {/*      My Profile*/}
+                {/*    </span>*/}
+                {/*  </NavLink>*/}
+                {/*</li>*/}
+                {/*<li className="item group">*/}
+                {/*  <NavLink*/}
+                {/*    to="/settings"*/}
+                {/*    className={`nav-item flex items-center ${*/}
+                {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
+                {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
+                {/*    }`}*/}
+                {/*  >*/}
+                {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
+                {/*      <Icons name="setting" />*/}
+                {/*    </span>*/}
+                {/*    <span*/}
+                {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
+                {/*        sidebar ? "active flex-1" : "w-0"*/}
+                {/*      }`}*/}
+                {/*    >*/}
+                {/*      Settings*/}
+                {/*    </span>*/}
+                {/*  </NavLink>*/}
+                {/*</li>*/}
+              </ul>
             </div>
-          )
-        }
-
+          </div>
+        ) : (
+          <div className="setting-item">
+            <div className="heading mb-5">
+              <h1 className="title text-xl font-bold text-purple">My Jobs</h1>
+            </div>
+            <div className="items">
+              <ul className="flex flex-col space-y-6">
+                <li className="item group">
+                  <NavLink
+                    to="/add-job"
+                    className={`nav-item flex items-center ${
+                      ((navData) => (navData.isActive ? "active" : ""),
+                      sidebar ? "justify-start space-x-3.5" : "justify-center")
+                    }`}
+                  >
+                    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
+                      <Icons name="people-two" />
+                    </span>
+                    <span
+                      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                        sidebar ? "active flex-1" : "w-0"
+                      }`}
+                    >
+                      Add Job
+                    </span>
+                  </NavLink>
+                </li>
+              </ul>
+            </div>
+          </div>
+        )}
       </div>
       {/* signout area */}
       {sidebar ? (

src/components/jobPopout/DeleteJobPopout.jsx

@@ -10,14 +10,15 @@ function DeleteJobPopout({details, onClose, situation}) {
 
     let [requestStatus, setRequestStatus] = useState({laoding: false, status:false, message: ''}) // STATE FOR KNOWING WHEN A REQUEST IS MADE TO THE SERVER
 
+    // FUNCTION CALLED ONCE USER CONFIRM DELETE JOB
     const deleteJob = (details) => {
         setRequestStatus({laoding: true, status:false, message: ''})
-        const {job_id} = details
         let reqData = {
-            job_id: details.job_id
+            job_id: details.job_id,
+            job_uid: details.job_uid
         } // DATA NEEDED BY THE API
-        console.log(reqData)
-
+  
+        // API CALL TO DELETE A JOB
         ApiCall.deleteJob(reqData).then(res => {
             if(res.data.internal_return < 0){
                 setRequestStatus({laoding: false, status:false, message: 'Could not perform the request, try again!'})
@@ -26,6 +27,8 @@ function DeleteJobPopout({details, onClose, situation}) {
             setRequestStatus({laoding: false, status:true, message: 'Job deleted successfully'})
             setTimeout(()=>{
                 navigate('/myjobs', {replace: true})
+                onClose()
+                window.location.reload()
             }, 1000)
         }).catch(error => {
             setRequestStatus({laoding: false, status:false, message: 'Opps! something went wrong, try again'})

src/components/jobPopout/PendingJobsPopout.jsx

@@ -3,7 +3,7 @@ import Detail from './popoutcomponent/Detail'
 import ModalCom from '../Helpers/ModalCom'
 
 
-function ActiveJobsPopout({details, onClose, situation}) {
+function PendingJobsPopout({details, onClose, situation}) {
   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">
@@ -66,7 +66,7 @@ function ActiveJobsPopout({details, onClose, situation}) {
             <div className='my-2 md:flex'>
               <Detail 
                   label='Offer Expire' 
-                  value={`${details.expire.split(' ')[0]} ${details.expire.split(' ')[1].split('.')[0]}`} 
+                  value={details.expire && `${details.expire.split(' ')[0]} ${details.expire.split(' ')[1].split('.')[0]}`}
               />
             </div>
   
@@ -139,4 +139,4 @@ function ActiveJobsPopout({details, onClose, situation}) {
     )
 }
 
-export default ActiveJobsPopout
+export default PendingJobsPopout

src/index.css

@@ -105,6 +105,11 @@ input::-webkit-inner-spin-button {
 input[type="number"] {
   -moz-appearance: textfield;
 }
+
+input[type="text"][dir="rtl"] {
+  text-align: right;
+}
+
 .default-border-bottom {
   border-bottom: 1px solid #d3d2fe;
 }
@@ -364,6 +369,13 @@ input[type="number"] {
   margin: 0 16px;
 }
 
+.transfer-field, .transfer-field:focus, .transfer-field:focus-within{
+  background: #FFF !important;
+  border: none !important;
+  outline: none !important;
+  box-shadow: none !important;
+}
+
 /* the parent */
 .trending-products .slick-list {
   margin: 0 -16px;

src/services/UsersService.js

@@ -107,17 +107,17 @@ class usersService {
     /*
     getMyActiveJobList  - List of jobs active under this user
      */
-    getMyActiveJobList(){
-        var postData = {
-            uuid: localStorage.getItem("uid"),
-            member_id: localStorage.getItem("member_id"),
-            sessionid: localStorage.getItem("session_token"),
-            page:0,
-            offset:0,
-            limit :100
-        };
-        return this.postAuxEnd("/getjobsdata", postData);
-    }
+    // getMyActiveJobList(){
+    //     var postData = {
+    //         uuid: localStorage.getItem("uid"),
+    //         member_id: localStorage.getItem("member_id"),
+    //         sessionid: localStorage.getItem("session_token"),
+    //         page:0,
+    //         offset:0,
+    //         limit :100
+    //     };
+    //     return this.postAuxEnd("/getjobsdata", postData);
+    // }
     getHeroJBanners(){
         var postData = {
             uuid: localStorage.getItem("uid"),
@@ -198,7 +198,31 @@ class usersService {
         return this.postAuxEnd("/sendmoneyfee", postData);
     }
 
+    // Task for the person doing the job
+    getMyActiveTaskList(){
+        var postData = {
+            uuid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:0,
+            offset:0,
+            limit :100
+        };
+        return this.postAuxEnd("/activetaskslist", postData);
+    }
     getMyActiveJobList(){
+        var postData = {
+            uuid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:0,
+            offset:0,
+            limit :100
+        };
+        return this.postAuxEnd("/jobmanageractive", postData);
+    }
+
+    getMyPendingJobList(){
         var postData = {
             uuid: localStorage.getItem("uid"),
             member_id: localStorage.getItem("member_id"),
@@ -209,7 +233,6 @@ class usersService {
         };
         return this.postAuxEnd("/jobmanageroffers", postData);
     }
-
     getMyJobList(){
         var postData = {
             uuid: localStorage.getItem("uid"),

src/views/ManageActiveJobs.jsx

@@ -0,0 +1,10 @@
+import React from 'react'
+import ActiveJobs from '../components/MyActiveJobs/ActiveJobs'
+
+function ManageActiveJobs() {
+  return (
+    <ActiveJobs />
+  )
+}
+
+export default ManageActiveJobs

src/views/MyActiveJobsPage.jsx

@@ -7,7 +7,7 @@ export default function MyActiveJobsPage() {
 
     const [MyJobList, setMyJobList] = useState([]);
     const api = new usersService();
-
+//TARGET ENDPOINT[POST]http://10.204.5.100:9083/en/wrench/api/v1/jobmanageractive
     const getMyJobList = async () => {
         try {
             const res = await api.getMyActiveJobList();

src/views/MyPendingJobsPage.jsx

@@ -0,0 +1,30 @@
+import React, { useContext,useState, useEffect } from "react";
+import usersService from "../services/UsersService";
+//import MyJobs from "../components/MyJobs";
+import MyActiveJobs from "../components/MyActiveJobs";
+import MyPendingJobs from "../components/MyPendingJobs";
+
+export default function MyPendingJobsPage() {
+
+    const [MyJobList, setMyJobList] = useState([]);
+    const api = new usersService();
+
+    const getMyJobList = async () => {
+        try {
+            const res = await api.getMyPendingJobList();
+            setMyJobList(res.data);
+        } catch (error) {
+            console.log("Error getting mode");
+        }
+    };
+    useEffect(() => {
+        getMyJobList();
+    }, []);
+
+    // debugger;
+    return (
+        <>
+            <MyPendingJobs MyJobList={MyJobList} />
+        </>
+    );
+}

src/views/MyTaskPage.jsx

@@ -10,7 +10,7 @@ export default function MyTaskPage() {
 
     const getMyActiveJobList = async () => {
         try {
-            const res = await api.getMyActiveJobList();
+            const res = await api.getMyActiveTaskList();
             setMyActiveJobList(res.data);
         } catch (error) {
             console.log("Error getting mode");