Merge master into default-icon

src/components/Cards/AvailableJobsCard.jsx

@@ -1,5 +1,4 @@
 import { useEffect, useState } from "react";
-import dataImage2 from "../../assets/images/taskbanners/default.jpg";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 import MarketPopUp from "../MarketPlace/PopUp/MarketPopUp";
 
@@ -8,6 +7,7 @@ export default function AvailableJobsCard({
   datas,
   hidden = false,
   contentDisplay,
+  image_server,
 }) {
   //debugger;
   const [marketPopUp, setMarketPopUp] = useState({ show: false, data: {} });
@@ -23,6 +23,11 @@ export default function AvailableJobsCard({
     const imagePath = require(`../../assets/images/${datas.thumbnil}`); // Replace with your directory path for local images
     setImageUrl(imagePath);
   }, []);
+
+  const image = `${image_server}${localStorage.getItem(
+    "session_token"
+  )}/job/${datas.job_uid}`;
+  
   return (
     <>
       {contentDisplay == "grid" ? (
@@ -131,7 +136,7 @@ export default function AvailableJobsCard({
         <div className="card-style-two w-full p-8 my-2 flex items-center gap-4 bg-white dark:bg-dark-white rounded-2xl section-shadow">
           <div className="flex gap-5 items-center w-full">
             <div className="w-full h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1] min-w-[60px] max-w-[60px]">
-              <img src={dataImage2} alt="data" className="w-full h-full" />
+              <img src={image} alt="data" className="w-full h-full" />
             </div>
             <div className="flex flex-col flex-[0.9]">
               <h1

src/components/MarketPlace/MainSection.jsx

@@ -8,6 +8,7 @@ import SelectBox from "../Helpers/SelectBox";
 export default function MainSection({
   className,
   marketPlaceProduct,
+  image_server,
   categories,
 }) {
   // Creating All cart..
@@ -110,6 +111,7 @@ export default function MainSection({
               {({ datas }) => (
                 <AvailableJobsCard
                   contentDisplay={contentDisplay}
+                  image_server={image_server}
                   key={datas.id}
                   datas={datas}
                 />

src/components/MarketPlace/index.jsx

@@ -7,6 +7,7 @@ export default function MarketPlace({ commonHeadData }) {
   let { jobLists } = useSelector((state) => state.jobLists);
   const marketData = jobLists?.result_list;
   const categories = jobLists?.categories;
+  const image_server = jobLists?.session_image_server;
 
   return (
     <>
@@ -15,6 +16,7 @@ export default function MarketPlace({ commonHeadData }) {
         <MainSection
           marketPlaceProduct={marketData}
           categories={categories}
+          image_server={image_server}
           className="mb-10"
         />
       </Layout>

src/components/MyActiveJobs/MyActiveJobTable.jsx

@@ -6,6 +6,7 @@ import { handlePagingFunc } from "../Pagination/HandlePagination";
 import PaginatedList from "../Pagination/PaginatedList";
 
 export default function MyActiveJobTable({ MyJobList, className }) {
+
   const navigate = useNavigate();
   let { pathname } = useLocation();
 
@@ -44,6 +45,7 @@ export default function MyActiveJobTable({ MyJobList, className }) {
                         value?.currency_code,
                         value?.currency
                       );
+                      let image = `${MyJobList.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}`
                       return (
                         <tr
                           key={index}
@@ -51,11 +53,9 @@ export default function MyActiveJobTable({ MyJobList, className }) {
                         >
                           <td className=" py-4">
                             <div className="flex space-x-2 items-center w-full">
-                              <div className="w-[60px] h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
+                              <div className="max-w-[60px] max-h-[60px] min-w-[60px] min-h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
                                 <img
-                                  src={localImgLoad(
+                                  src={image}
-                                    `images/taskbanners/${value.banner}`
-                                  )}
                                   alt="data"
                                   className="w-full h-full rounded-full"
                                 />

src/components/MyJobs/MyJobTable.jsx

@@ -11,8 +11,8 @@ import PaginatedList from "../Pagination/PaginatedList";
 import EditJobPopOut from "../jobPopout/EditJobPopout";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 
-import EditIcon from '../../assets/images/icon-edit.svg'
+import EditIcon from "../../assets/images/icon-edit.svg";
-import DeleteIcon from '../../assets/images/icon-delete.svg'
+import DeleteIcon from "../../assets/images/icon-delete.svg";
 import localImgLoad from "../../lib/localImgLoad";
 
 export default function MyJobTable({ MyJobList, reloadJobList, className }) {
@@ -101,12 +101,17 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
     }
   };
 
-  const JobListItem = ({ value, index }) => {
+  const JobListItem = ({ value, index, image_server }) => {
     let thePrice = PriceFormatter(
       value?.price * 0.01,
       value?.currency_code,
       value?.currency
     );
+
+    const image = `${image_server}${localStorage.getItem(
+      "session_token"
+    )}/job/${value.job_uid}`;
+
     return (
       <tr
         key={index}
@@ -116,7 +121,11 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
           <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 w-full">
               <div className="w-[60px] h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
-                <img src={localImgLoad(`images/taskbanners/${value.banner ? value.banner : 'default.jpg'}`)} alt="data" className="w-full h-full rounded-full" />
+                <img
+                  src={image}
+                  alt="data"
+                  className="w-full h-full rounded-full"
+                />
               </div>
               <div className="flex flex-col flex-[0.9]">
                 <h1 className="font-bold text-xl text-dark-gray dark:text-white">
@@ -147,7 +156,11 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
                   });
                 }}
               >
-                <img className="w-[21px] h-[21px]" src={DeleteIcon} alt='delete-icon' />
+                <img
+                  className="w-[21px] h-[21px]"
+                  src={DeleteIcon}
+                  alt="delete-icon"
+                />
               </button>
               <div className="mx-[4px] h-full w-[1px] bg-black dark:bg-dark-gray"></div>
               <button
@@ -160,7 +173,11 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
                   });
                 }}
               >
-                <img className="w-[21px] h-[21px]" src={EditIcon} alt='edit-icon' />
+                <img
+                  className="w-[21px] h-[21px]"
+                  src={EditIcon}
+                  alt="edit-icon"
+                />
                 <span className="text-sm text-sky-blue">Edit</span>
               </button>
             </div>
@@ -193,7 +210,7 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
           <h1 className="text-xl font-bold text-dark-gray dark:text-white tracking-wide">
             {filterCategories[selectedCategory]} Jobs
           </h1>
-        </div>  
+        </div>
         <SelectBox
           action={handleSetCategory}
           datas={Object.values(filterCategories)}
@@ -213,7 +230,12 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
                 MyJobList.data?.result_list.length > 0 ? (
                   filteredCurrentJobList?.length ? (
                     filteredCurrentJobList.map((value, index) => (
-                      <JobListItem index={index} key={index} value={value} />
+                      <JobListItem
+                        index={index}
+                        key={index}
+                        value={value}
+                        image_server={MyJobList?.data.session_image_server}
+                      />
                     ))
                   ) : (
                     <tr className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">

src/components/MyPendingJobs/MyPendingJobTable.jsx

@@ -8,6 +8,7 @@ import localImgLoad from "../../lib/localImgLoad";
 
 
 export default function MyPendingJobTable({ MyJobList, className }) {
+
   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);
@@ -45,6 +46,7 @@ export default function MyPendingJobTable({ MyJobList, className }) {
                         value?.currency_code,
                         value?.currency
                       );
+                      let image = `${MyJobList.session_image_server}${localStorage.getItem('session_token')}/job/${value.job_uid}`
                       return (
                         <tr
                           key={index}
@@ -54,7 +56,7 @@ export default function MyPendingJobTable({ MyJobList, className }) {
                             <div className="flex space-x-2 items-center w-full">
                               <div className="w-[60px] h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
                                 <img
-                                  src={localImgLoad(`images/taskbanners/${value.banner || "default.jpg"}`)}
+                                  src={image}
                                   alt="data"
                                   className="w-full h-full rounded-full"
                                 />

src/components/MyWaitingJobs/MyWaitingJobTable.jsx

@@ -44,7 +44,7 @@ export default function MyWaitingJobTable({ MyJobList, className }) {
                         value?.currency_code,
                         value?.currency
                       );
-                      let image = value.banner ? value.banner : 'default.jpg'
+                      let image = `${MyJobList.session_image_server}${localStorage.getItem('session_token')}/job/${value.offer_uid}`
                       return (
                         <tr
                           key={index}
@@ -52,9 +52,9 @@ export default function MyWaitingJobTable({ MyJobList, className }) {
                         >
                           <td className=" py-4">
                             <div className="flex space-x-2 items-center w-full">
-                              <div className="w-[60px] h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
+                              <div className="max-w-[60px] max-h-[60px] min-w-[60px] min-h-[60px] p-2 bg-alice-blue rounded-full overflow-hidden flex justify-center items-center">
                                 <img
-                                  src={localImgLoad(`images/taskbanners/${image}`)}
+                                  src={image}
                                   alt="data"
                                   className="w-full h-full rounded-full"
                                 />

src/components/jobPopout/EditJobPopout.jsx

@@ -53,7 +53,8 @@ const EditJobPopOut = ({
   const dispatch = useDispatch();
   const { userDetails } = useSelector((state) => state.userDetails);
   
-  const uploadedImage = localStorage.getItem('session_token') ? `${userDetails.session_image_server}${localStorage.getItem('session_token')}/jobs/${details?.job_uid}` : ''
+  const uploadedImage = `${userDetails.session_image_server}${localStorage.getItem('session_token')}/job/${details?.job_uid}`
+
   const [taskImage, setTaskImage] = useState(uploadedImage)
 
   let [uploadStatus, setUploadStatus] = useState({loading: false, status: false, message:''}) // HOLDS STATE FOR UPLOAD PROFILE PICTURE STATUS
@@ -140,7 +141,7 @@ const EditJobPopOut = ({
         let base64Img = imgReader.result.split(",")[1];
         let reqData = { // PAYLOAD FOR API CALL
           job_uid: details?.job_uid,
-          file_name: uploadedFile?.name,
+          file_name: uploadedFile?.name.slice(0,19),
           file_size: uploadedFile?.size,
           file_type: uploadedFile?.type?.split("/")[0]?.toLowerCase(),
           file_data: base64Img,
@@ -154,6 +155,11 @@ const EditJobPopOut = ({
           }
           setUploadStatus({loading: false, status: true, message: 'Uploaded successfully'})
           setTaskImage(event.target.result);
+          setTimeout(() => {
+            dispatch(tableReload({ type: "JOBTABLE" }));
+            navigate("/myjobs", { replace: true });
+            onClose();
+          }, 1000);
         }).catch(error=>{
           setUploadStatus({loading: false, status: false, message: 'Network error, try again'})
         }).finally(()=>{
@@ -319,7 +325,7 @@ const EditJobPopOut = ({
                           role="group"
                           aria-labelledby="checked-group"
                         >
-                          {Object.entries(categories).map(([key, value]) => (
+                          {categories && Object.entries(categories)?.map(([key, value]) => (
                             <label
                               key={key}
                               className="flex gap-1 w-full items-center"
@@ -353,7 +359,7 @@ const EditJobPopOut = ({
                         {taskImage ?
                         <div className="w-full absolute -top-5">
                           <img src={taskImage} className="max-h-[150px] min-h-[150px] w-full object-cover" alt="uplaoded task image" />
-                          <span onClick={()=>setTaskImage('')} className="p-2 absolute text-sm top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 bg-white/20 hover:bg-white/70 hover:shadow-md transition-all duration-500 cursor-pointer text-slate-800">Remove Image</span>
+                          <span onClick={()=>setTaskImage('')} className="p-2 absolute text-sm top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 bg-white/80 hover:bg-white hover:shadow-md transition-all duration-500 cursor-pointer text-slate-800">Remove Image</span>
                         </div>
                         :
                         <label 
@@ -393,6 +399,7 @@ const EditJobPopOut = ({
                           <option value="">Select Duration</option>
                           {publicArray.map(({ name, duration }, idx) => (
                             <option
+                              key={duration}
                               className="text-slate-500 text-lg"
                               value={duration}
                             >