disabled assign btn after task is assigned

src/components/AddJob/AddJob.jsx

@@ -92,13 +92,13 @@ function AddJob({ popUpHandler, categories }) {
       >
         {(props) => {
           return (
-            <Form>
-              <div className="add-job p-5 w-full bg-white dark:bg-dark-white dark:text-white rounded-md flex flex-col justify-between">
+            <Form className='contents'>
+              <div className="add-job p-5 w-full h-full rounded-md flex flex-col justify-between overflow-y-auto">
                 <div className="flex flex-col-reverse sm:flex-row">
                   <div className="fields w-full">
                     {/* inputs starts here */}
                     <div className="xl:flex xl:space-x-7 mb-[5px]">
-                      <div className="field w-full mb-6 xl:mb-0">
+                      <div className="field w-full mb-[5px] xl:mb-0">
                         <label
                           htmlFor="country"
                           className="job-label job-label-flex"
@@ -114,7 +114,7 @@ function AddJob({ popUpHandler, categories }) {
                           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 border`}
+                          className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border`}
                           onChange={props.handleChange}
                           onBlur={props.handleBlur}
                           disabled={walletDetails.data.length == 1}
@@ -159,7 +159,7 @@ function AddJob({ popUpHandler, categories }) {
                       </div>
 
                       {/* Price */}
-                      <div className="field w-full">
+                      <div className="field w-full mb-[5px] xl:mb-0">
                         <InputCom
                           fieldClass="px-6 text-right flex"
                           label="Price"
@@ -177,6 +177,42 @@ function AddJob({ popUpHandler, categories }) {
                           }
                         />
                       </div>
+
+                      {/* Timeline */}
+                      <div className="field w-full mb-[5px] xl:mb-0">
+                        <label
+                            className="job-label job-label-flex"
+                            htmlFor="timeline_days"
+                          >
+                            Timeline
+                            <span className="text-green-700 text-[12px] tracking-wide">
+                              - Duration
+                            </span>
+                          </label>
+
+                        <Field
+                          component="select"
+                          name="timeline_days"
+                          className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border ${
+                            props.errors.timeline_days &&
+                            props.touched.timeline_days
+                              ? "border-[#ff0a0a63] shadow-red-500 animate-shake"
+                              : "dark:border-[#5e6278]"
+                          }`}
+                          value={props.values.timeline_days}
+                        >
+                          <option value="" className='text-slate-500 text-lg'>Select Duration</option>
+                          {publicArray.map(({ name, duration }, idx) => (
+                            <option
+                              key={idx}
+                              className="text-slate-500 text-lg"
+                              value={duration}
+                            >
+                              {name}
+                            </option>
+                          ))}
+                        </Field>
+                      </div>
                     </div>
 
                     {/* Title  */}
@@ -288,7 +324,7 @@ function AddJob({ popUpHandler, categories }) {
                       </div>
                     </div>
 
-                    <div className="field w-full mb-[5px]">
+                    {/* <div className="field w-full mb-[5px]">
                       <div className={`flex items-center justify-between mb-2.5`}>
                         <label
                           className="job-label"
@@ -323,7 +359,7 @@ function AddJob({ popUpHandler, categories }) {
                           </option>
                         ))}
                       </Field>
-                    </div>
+                    </div> */}
                     {/* inputs ends here */}
                   </div>
                 </div>

src/components/AuthPages/AuthLayout2.jsx

@@ -18,14 +18,14 @@ export default function LoginLayout({ slogan, children }) {
         backgroundImage: `url(${countryMode == "NG" ? bgImgNig : bgImgCom})`,
       }}
     >
-      <div className={`w-full grid grid-cols-1 lg:grid-cols-2`}>
+      <div className={`w-full grid grid-cols-1 xl:grid-cols-2`}>
         {/* <div 
-            className={`auth-bg hidden lg:block bg-blue-50 relative bg-cover bg-no-repeat border-0 after:content-[''] after:absolute after:inset-0`} 
+            className={`auth-bg hidden xl:block bg-blue-50 relative bg-cover bg-no-repeat border-0 after:content-[''] after:absolute after:inset-0`} 
             style={{backgroundImage: `url(${bgImg})`}}
         >
         </div> */}
-        <div className="p-5 sm:p-7 flex place-content-center lg:col-start-2">
-          <div className="py-5 w-full sm:w-11/12 max-w-[550px] shadow-md bg-slate-50 rounded-[0.475rem]">
+        <div className="p-5 sm:p-7 flex place-content-center xl:col-start-2">
+          <div className="py-5 w-full sm:w-11/12 max-w-[550px] shadow-md bg-slate-50 dark:bg-dark-white rounded-[0.475rem]">
             <div className="w-full flex justify-center items-center">
               {children && children}
             </div>

src/components/AuthPages/Login/index2.jsx

@@ -4,7 +4,7 @@ import linkedInLogo from "../../../assets/images/Linkedin.png";
 import appleLogo from "../../../assets/images/apple-black.svg";
 import facebookLogo from "../../../assets/images/facebook.svg";
 import googleLogo from "../../../assets/images/google-logo.svg";
-import WrenchBoard from "../../../assets/images/wrenchboard-logo-text.png";
+import WrenchBoard from "../../../assets/images/wrenchboard-logo-text_new.png";
 import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout2";

src/components/AuthPages/SignUp/index2.jsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from "react";
 import { Link, useLocation, useNavigate } from "react-router-dom";
-import WrenchBoard from "../../../assets/images/wrenchboard-logo-text.png";
+import WrenchBoard from "../../../assets/images/wrenchboard-logo-text_new.png";
 import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout2";
@@ -180,11 +180,11 @@ export default function SignUp() {
                 </span>
               </div>
               <div className="w-full flex items-center gap-2">
-                <div className="border-b border-[#eff2f5] max-w-[50%] w-full"></div>
-                <span className="text-[#b5b5c3] font-medium text-[0.7rem] w-[2%]">
+                <div className="border-b border-[#eff2f5] w-[48%]"></div>
+                <span className="text-[#b5b5c3] font-medium text-[0.7rem]">
                   OR
                 </span>
-                <div className="border-b border-[#eff2f5] max-w-[50%] w-full"></div>
+                <div className="border-b border-[#eff2f5] w-[48%]"></div>
               </div>
               <div className="input-area">
                 <SelectOption
@@ -413,7 +413,7 @@ const SelectOption = ({
           disabled={disable}
           name={name}
           id={name}
-          className="input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-gray-100 bg-[#f5f8fa] dark:bg-[#5e6278] text-base focus-visible:border-transparent focus-visible:outline-0 focus-visible:ring-transparent "
+          className="px-6 input-wrapper border border-[#f5f8fa] dark:border-[#5e6278] w-full rounded-full h-[42px] overflow-hidden relative font-medium leading-6 bg-clip-padding text-[#5e6278] dark:text-dark-gray bg-[#f5f8fa] dark:bg-[#FAFAFA] text-base focus-visible:border-transparent focus-visible:outline-0 focus-visible:ring-transparent "
           onChange={inputHandler}
           value={value}
         >

src/components/Dashboards/AccountDashboard.jsx

@@ -45,7 +45,7 @@ const AccountDashboard = ({ className, bannerList }) => {
         {getLowerBanner?.map((props, idx) => {
           let image = getImage(props);
 
-          let { short_title, short_description, short_button_text, link_path } =
+          let { short_title, short_description, short_button_text, link_path, card_type, blog_id } =
             props;
 
           return (
@@ -56,6 +56,8 @@ const AccountDashboard = ({ className, bannerList }) => {
                 title={short_title}
                 desc={short_description}
                 link_path={link_path}
+                card_type={card_type}
+                blog_id={blog_id}
               />
             </div>
           );
@@ -102,24 +104,26 @@ const TopBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
   );
 };
 
-const LowerBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
+const LowerBanner = ({ image, title = "", desc = "", btn, link_path, card_type, blog_id, key }) => {
+  const newLinkPath = card_type == 'BLOG' ? `${link_path}?blog_id=${blog_id}` : link_path
+
   return (
     <div
       key={key}
       className="flex flex-col bg-white shadow-md h-full rounded-xl dark:border-[#5356fb29] dark:bg-dark-white"
     >
-      <div className="w-full flex justify-between border-b border-slate-300 p-2">
-        <div className="h-[130px] flex justify-between items-center">
+      <div className="w-full xxs:flex justify-between items-center border-b border-slate-300 p-2">
+        <div className="min-h-[150px] sm:min-h-[130px] flex justify-between items-center">
           <div className="px-2 flex flex-col gap-2 dark:text-white">
-            <Link to={link_path} className="text-lg font-bold">
+            <Link to={newLinkPath} className="text-lg font-bold">
               {title}
             </Link>
-            <p to={link_path} className="text-sm">
+            <p to={newLinkPath} className="text-sm">
               {desc}
             </p>
           </div>
         </div>
-        <Link to={link_path} className="w-[150px] h-[100px]">
+        <Link to={newLinkPath} className="w-[150px] h-[100px]">
           <img
             src={image}
             alt="banner-img"
@@ -129,7 +133,7 @@ const LowerBanner = ({ image, title = "", desc = "", btn, link_path, key }) => {
         </Link>
       </div>
       <div className="flex justify-between w-full px-2 items-center">
-        <Link to={link_path} className="text-slate-300 font-semibold text-sm">
+        <Link to={newLinkPath} className="text-slate-300 font-semibold text-sm">
           {btn}
         </Link>
         <button className="flex items-center justify-center gap-2">

src/components/FamilyAcc/FamilyManageTabs.jsx

@@ -176,6 +176,9 @@ export default function FamilyManageTabs({
         familyData={familyWaitList}
         accountDetails={accountDetails}
         setUpdatePage={setUpdatePage}
+        jobList={jobList}
+        setActiveTask={setActiveTask}
+        activeTask={activeTask}
       />
     ),
     Pending: (

src/components/FamilyAcc/FamilyPopout/AssignMediaTask.jsx

@@ -85,13 +85,13 @@ export default function AssignMediaTask({
               >
                 {(props) => {
                   return (
-                        <Form>
+                        <Form className='contents'>
                             <>
                                 <div
-                                className={`job-action-modal-body w-full min-h-[450px] max-h-[450px] overflow-y-auto md:grid md:grid-cols-2`}
+                                className={`job-action-modal-body w-full h-full overflow-y-auto md:grid md:grid-cols-2`}
                                 >
                                 <div className="p-4 pt-0">
-                                    <div className="p-4 w-full min-h-[410px] max-h-[410px] overflow-y-auto bg-slate-100 rounded-md dark:bg-[#11131f] dark:text-white">
+                                    <div className="p-4 w-full h-[450px] overflow-y-auto bg-slate-100 rounded-md dark:bg-[#11131f] dark:text-white">
                                         {commonMedia?.data?.length ? (
                                         commonMedia?.data?.map((item, index) => (
                                             <div
@@ -124,7 +124,7 @@ export default function AssignMediaTask({
                                 {/*Right Hand Side for details && Task Type === select */}
                                     <>
                                     {commonMedia?.data?.length > 0 ? (
-                                        <div className="p-4 py-0 h-full">
+                                        <div className="p-4 py-0 h-auto">
                                         <div className="w-full">
                                             <div className="mb-3 w-full">
                                             <label className="job-label">

src/components/FamilyAcc/FamilyPopout/AssignPrevNewTask.jsx

@@ -3,6 +3,7 @@ import LoadingSpinner from '../../Spinners/LoadingSpinner'
 import { NewTasks } from './forms'
 import { PriceFormatter } from '../../Helpers/PriceFormatter'
 import { useSelector } from 'react-redux';
+import AttachFile from '../../attachmentCom/AttachFile';
 
 export default function AssignPrevNewTask({
     jobList,
@@ -21,7 +22,7 @@ export default function AssignPrevNewTask({
 
 
   let imageSrc = (localStorage.getItem("session_token")
-  ? `${userDetails?.session_image_server}${localStorage.getItem("session_token")}/job/${activeTask.data.job_uid}` : ""); // FOR GETTING JOB IMAGE
+  ? `${userDetails?.session_image_server}${localStorage.getItem("session_token")}/job/${activeTask?.data?.job_uid}` : ""); // FOR GETTING JOB IMAGE
 
   return (
     <>
@@ -32,7 +33,7 @@ export default function AssignPrevNewTask({
             ) : (
               <>
                 <div
-                  className={`job-action-modal-body w-full min-h-[450px] max-h-[450px] overflow-y-auto md:grid ${
+                  className={`job-action-modal-body w-full h-full overflow-y-auto md:grid ${
                     taskType !== "new" ? "md:grid-cols-2" : "md:grid-cols-1"
                   }`}
                 >
@@ -63,7 +64,7 @@ export default function AssignPrevNewTask({
                     </div>
                     {/* Task Type === select */}
                     {taskType == "select" && (
-                      <div className="p-4 w-full h-[400px] overflow-y-auto bg-slate-100 rounded-md dark:bg-[#11131f] dark:text-white">
+                      <div className="p-4 w-full h-[450px] overflow-y-auto bg-slate-100 rounded-md dark:bg-[#11131f] dark:text-white">
                         {jobList?.data?.length ? (
                           jobList?.data?.map((item, index) => (
                             <div
@@ -120,68 +121,67 @@ export default function AssignPrevNewTask({
                                 value={activeTask?.data?.description}
                               />
                             </div> */}
-                            <div className="my-3 w-full">
-                              <label className="job-label">
-                                Description
-                              </label>
-                              <p className="p-1 text-sm text-slate-900 dark:text-white max-h-[100px] overflow-y-auto">
-                                {activeTask?.data?.description}
-                              </p>
-                            </div>
-                            <div className="grid grid-cols-2">
-                              <div className="w-full">
-                                <div className="my-3 w-full flex items-center gap-1">
-                                  <label className="job-label">
-                                    Reward
-                                  </label>
-                                  <p className="p-1 text-sm text-slate-900 dark:text-white">
-                                    {PriceFormatter(
-                                      activeTask?.data?.price * 0.01,
-                                      activeTask?.data?.currency,
-                                      activeTask?.data?.curreny_code
-                                    )}
-                                  </p>
-                                </div>
+                            <div className='flex flex-col gap-2'>
+                              <div className="my-1 w-full">
+                                <label className="job-label">
+                                  Description
+                                </label>
+                                <p className="p-1 text-sm text-slate-900 dark:text-white max-h-[100px] overflow-y-auto">
+                                  {activeTask?.data?.description}
+                                </p>
+                              </div>
+                              <div className="w-full grid grid-cols-2">
+                                <div className="w-full">
+                                  <div className="w-full flex items-center gap-1">
+                                    <label className="job-label">
+                                      Reward
+                                    </label>
+                                    <p className="p-1 text-sm text-slate-900 dark:text-white">
+                                      {PriceFormatter(
+                                        activeTask?.data?.price * 0.01,
+                                        activeTask?.data?.currency,
+                                        activeTask?.data?.curreny_code
+                                      )}
+                                    </p>
+                                  </div>
 
-                                <div className="my-3 w-full flex items-center gap-1">
-                                  <label className="job-label">
-                                    Timeline
-                                  </label>
-                                  <p className="p-1 text-sm text-slate-900 dark:text-white">{`${activeTask?.data?.timeline_days} day(s)`}</p>
+                                  <div className="w-full flex items-center gap-1">
+                                    <label className="job-label">
+                                      Timeline
+                                    </label>
+                                    <p className="p-1 text-sm text-slate-900 dark:text-white">{`${activeTask?.data?.timeline_days} day(s)`}</p>
+                                  </div>
+                                </div>
+                                <div className="w-full flex items-center justify-center">
+                                  <div className="mb-1 w-24 max-h-24 rounded-2xl flex items-center justify-center">
+                                      <img 
+                                        className="w-full h-auto"
+                                        loading="lazy"
+                                        src={imageSrc} 
+                                        alt='job image' 
+                                      />
+                                  </div>
                                 </div>
                               </div>
-                              <div className="w-full flex items-center justify-center">
-                                <div className="w-28 h-28 rounded-2xl flex items-center justify-center">
-                                    <img 
-                                      className="w-full h-auto"
-                                      loading="lazy"
-                                      src={imageSrc} 
-                                      alt='job image' 
-                                    />
-                                </div>
+                              
+                              {/* ATTACHMENT SECTION*/}
+                              <div className="w-full max-h-28">
+                                  <AttachFile data={activeTask.data} />
                               </div>
-                            </div>
-                            
-                            {/* Dummy, no value found for created! thus commented*/}
-                            {/* <div className="my-3 sm:flex items-center">
-                              <Detail
-                                label="Created"
-                                value={`Dummy, no value found for created!`}
-                              />
-                            </div> */}
 
-                            <div className="my-3">
-                              <label className="w-full job-label">
-                                Delivery Detail
-                              </label>
-                              <textarea
-                                className={`p-1 w-full text-sm text-slate-900 dark:text-white bg-transparent outline-none border border-slate-300 rounded-md`}
-                                rows="5"
-                                style={{ resize: "none" }}
-                                value={activeTask?.data?.job_detail}
-                                readOnly
-                                // onChange={handleInputChange}
-                              />
+                              <div className="my-3">
+                                <label className="w-full job-label">
+                                  Delivery Detail
+                                </label>
+                                <textarea
+                                  className={`p-1 w-full text-sm text-slate-900 dark:text-white bg-transparent outline-none border border-slate-300 rounded-md`}
+                                  rows="5"
+                                  style={{ resize: "none" }}
+                                  value={activeTask?.data?.job_detail}
+                                  readOnly
+                                  // onChange={handleInputChange}
+                                />
+                              </div>
                             </div>
                           </div>
                         </div>
@@ -230,9 +230,9 @@ export default function AssignPrevNewTask({
                       ) : (
                         <button
                           type="button"
-                          disabled={requestStatus.loading}
+                          disabled={requestStatus.loading || requestStatus.status}
                           onClick={assignFamilyTask}
-                          className="custom-btn btn-gradient text-white"
+                          className={`custom-btn btn-gradient text-white ${requestStatus.status && 'opacity-50'}`}
                         >
                           Assign
                         </button>

src/components/FamilyAcc/FamilyPopout/AssignTaskPopout.jsx

@@ -311,7 +311,7 @@ const AssignTaskPopout = ({
   return (
     <>
       <ModalCom action={action} situation={situation}>
-        <div className="w-11/12 lg:w-[700px] bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+        <div className="modal-container">
           <div className="modal-header-con">
             <h1 className="modal-title">
               {details ? (
@@ -364,7 +364,7 @@ const AssignTaskPopout = ({
               </svg>
             </button>
           </div>
-          <div className="modal-body">
+          <div className="modal-body-wrapper p-[0!important]">
             <div className="px-4 py-2 w-full flex items-center gap-4">
               <button
                 name='task'
@@ -383,7 +383,7 @@ const AssignTaskPopout = ({
               Media
               </button>
             </div>
-            <div className="">
+            <div className="contents">
               {assignType == 'task' ?
                 <AssignPrevNewTask 
                   jobList={jobList}

src/components/FamilyAcc/Tabs/FamilyWaitlist.jsx

@@ -5,7 +5,7 @@ import LoadingSpinner from "../../Spinners/LoadingSpinner";
 import AssignTaskPopout from "../FamilyPopout/AssignTaskPopout";
 
 const FamilyWaitlist = memo(
-  ({ familyData, className, accountDetails, setUpdatePage }) => {
+  ({ familyData, className, accountDetails, setUpdatePage, jobList, setActiveTask, activeTask }) => {
     const [popUp, setPopUp] = useState({ show: false, data: {} });
     const [continueTaskPopup, setContinueTaskPopup] = useState({
       show: false,
@@ -93,9 +93,9 @@ const FamilyWaitlist = memo(
                                 </div>
                               </div>
                               <div className="px-2 flex flex-col items-center justify-center">
-                                <p className="text-sm font-bold text-dark-gray dark:text-white">
+                                {/* <p className="text-sm font-bold text-dark-gray dark:text-white">
                                   {addedDate}
-                                </p>
+                                </p> */}
                                 <p className="text-xs py-1.5 w-[70px] cursor-default tracking-wide rounded-full bg-gold text-white flex justify-center items-center">
                                   {value.status_text}
                                 </p>
@@ -144,6 +144,9 @@ const FamilyWaitlist = memo(
             action={closeContinueTaskPopup}
             situation={continueTaskPopup.show}
             setUpdatePage={setUpdatePage}
+            jobList={jobList}
+            setActiveTask={setActiveTask}
+            activeTask={activeTask}
           />
         )}
       </div>

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

@@ -95,8 +95,7 @@ export default function InputCom({
           value={value}
           onChange={inputHandler}
           className={`input-field placeholder:text-base text-dark-gray w-full h-full ${
-            inputBg ? inputBg : "bg-[#FAFAFA] dark:bg-[#11131F] dark:text-white tracking-wide"
-          } focus:ring-0 focus:outline-none ${fieldClass}`}
+            inputBg && inputBg} tracking-wide focus:ring-0 focus:outline-none ${fieldClass}`}
           type={type}
           id={name}
           name={name}

src/components/Helpers/ModalCom.jsx

@@ -14,9 +14,9 @@ export default function ModalCom({ action, children, situation, isOpen, classNam
     <div className="modal-com">
       <div
         onClick={action || isOpen}
-        className="fixed top-0 left-0 w-full lg:h-[100vh] h-full bg-black bg-opacity-40 backdrop-filter backdrop-blur-sm z-50"
+        className="fixed top-0 left-0 bottom-0 w-full bg-black bg-opacity-40 backdrop-filter backdrop-blur-sm z-50"
       ></div>
-      <div className={`fixed lg:h-100vh h-full z-[99999999999999] w-full lg:w-auto inset-0 flex flex-col justify-center items-center ${className}`}>
+      <div className={`fixed h-full z-[99999999999999] w-full lg:w-auto inset-0 flex flex-col justify-center items-center ${className}`}>
         {children && children}
       </div>
     </div>

src/components/JobGroups/AddGroup.jsx

@@ -88,7 +88,7 @@ export default function AddGroup({ action, situation, setUpdateList }) {
 
   return (
     <ModalCom action={action} situation={situation}>
-      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
+      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
         <div className="modal-header-con">
           <h1 className="modal-title">
             Add Group
@@ -135,28 +135,6 @@ export default function AddGroup({ action, situation, setUpdateList }) {
               />
             </div>
           </div>
-          <div className="w-full flex justify-between items-center gap-4">
-            <button
-              onClick={action}
-              type="button"
-              className="w-[152px] h-[46px] flex justify-center items-center rounded-full text-base text-light-red tracking-wide border border-light-red"
-            >
-              <span className="">
-                Cancel
-              </span>
-            </button>
-            {requestStatus.loading ? (
-              <LoadingSpinner size="8" color="sky-blue" />
-            ) : (
-              <button
-                onClick={() => addGroup()}
-                type="button"
-                className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
-              >
-                Add Group
-              </button>
-            )}
-          </div>
 
           {/* ERROR DISPLAY AND SUBMIT BUTTON */}
           {requestStatus.message != "" &&
@@ -177,6 +155,29 @@ export default function AddGroup({ action, situation, setUpdateList }) {
             ))}
           {/* End of error or success display */}
         </div>
+
+        <div className="modal-footer-wrapper">
+            <button
+              onClick={action}
+              type="button"
+              className="custom-btn text-light-red border border-light-red"
+            >
+              <span className="">
+                Cancel
+              </span>
+            </button>
+            {requestStatus.loading ? (
+              <LoadingSpinner size="8" color="sky-blue" />
+            ) : (
+              <button
+                onClick={() => addGroup()}
+                type="button"
+                className="custom-btn btn-gradient text-white"
+              >
+                Add Group
+              </button>
+            )}
+          </div>
       </div>
     </ModalCom>
   );

src/components/JobGroups/DeleteGroup.jsx

@@ -20,14 +20,14 @@ export default function DeleteGroup({action, situation, details}) {
         action={action}
         situation={situation}
     >
-      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
-        <div className="logout-modal-header w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] border-b border-light-purple dark:border-[#5356fb29] ">
-          <h1 className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
+        <div className="modal-header-con">
+          <h1 className="modal-title">
             Delete Group
           </h1>
           <button
             type="button"
-            className="text-[#374557] dark:text-red-500"
+            className="modal-close-btn"
             onClick={action}
           >
             <svg
@@ -76,26 +76,6 @@ export default function DeleteGroup({action, situation, details}) {
               Are you sure, you want to delete <br /> <span>'{details?.group_name}'</span> group?
             </p>
           </div>
-          <div className="flex space-x-2.5">
-            <button
-              onClick={action}
-              type="button"
-              className=" border-gradient text-18 tracking-wide px-4 py-3 rounded-full"
-            >
-              <span className="text-gradient">Cancel</span>
-            </button>
-            {requestStatus.laoding ? (
-              <LoadingSpinner size="8" color="sky-blue" />
-            ) : (
-              <button
-                onClick={() => deleteGroup()}
-                type="button"
-                className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full"
-              >
-                Confirm Delete
-              </button>
-            )}
-          </div>
 
           {/* ERROR DISPLAY AND SUBMIT BUTTON */}
           {requestStatus.message != "" &&
@@ -116,6 +96,26 @@ export default function DeleteGroup({action, situation, details}) {
             ))}
           {/* End of error or success display */}
         </div>
+        <div className="modal-footer-wrapper">
+            <button
+              onClick={action}
+              type="button"
+              className="custom-btn border-gradient"
+            >
+              <span className="text-gradient">Cancel</span>
+            </button>
+            {requestStatus.laoding ? (
+              <LoadingSpinner size="8" color="sky-blue" />
+            ) : (
+              <button
+                onClick={() => deleteGroup()}
+                type="button"
+                className="custom-btn primary-gradient text-white"
+              >
+                Confirm Delete
+              </button>
+            )}
+          </div>
       </div>
     </ModalCom>
   )

src/components/JobGroups/DeleteMember.jsx

@@ -20,7 +20,7 @@ export default function DeleteMember({action, situation, details}) {
         action={action}
         situation={situation}
     >
-      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl">
+      <div className="logout-modal-wrapper lg:w-[500px] h-full lg:h-auto bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
         <div className="modal-header-con">
           <h1 className="modal-title">
             Remove Member
@@ -76,26 +76,6 @@ export default function DeleteMember({action, situation, details}) {
               Are you sure, you want to remove <br /> <span>'{details?.firstname} {details.lastname}'</span>
             </p>
           </div>
-          <div className="flex space-x-2.5">
-            <button
-              onClick={action}
-              type="button"
-              className=" border-gradient text-18 tracking-wide px-4 py-3 rounded-full"
-            >
-              <span className="text-gradient">Cancel</span>
-            </button>
-            {requestStatus.laoding ? (
-              <LoadingSpinner size="8" color="sky-blue" />
-            ) : (
-              <button
-                onClick={() => deleteMember()}
-                type="button"
-                className="text-white primary-gradient text-18 tracking-wide px-4 py-3 rounded-full"
-              >
-                Remove
-              </button>
-            )}
-          </div>
 
           {/* ERROR DISPLAY AND SUBMIT BUTTON */}
           {requestStatus.message != "" &&
@@ -115,7 +95,27 @@ export default function DeleteMember({action, situation, details}) {
               )
             ))}
           {/* End of error or success display */}
-        </div>
+        </div>          
+        <div className="modal-footer-wrapper">
+            <button
+              onClick={action}
+              type="button"
+              className="custom-btn border-gradient"
+            >
+              <span className="text-gradient">Cancel</span>
+            </button>
+            {requestStatus.laoding ? (
+              <LoadingSpinner size="8" color="sky-blue" />
+            ) : (
+              <button
+                onClick={() => deleteMember()}
+                type="button"
+                className="custom-btn primary-gradient text-white"
+              >
+                Remove
+              </button>
+            )}
+          </div>
       </div>
     </ModalCom>
   )

src/components/MyActiveJobs/ActiveJobMessage.jsx

@@ -20,7 +20,7 @@ export default function ActiveJobMessage({ activeJobMesList }) {
 
   return (
     <div className='flex flex-col justify-between'>
-    <div className="w-full h-full min-h-[400px] max-h-[400px] overflow-y-auto">
+    <div className="w-full h-full min-h-[250px] max-h-[300px] overflow-y-auto">
         <table className="wallet-activity w-full table-auto border-collapse text-left">
             <thead className='border-b-2'>
                 <tr className='text-slate-600'>

src/components/MyActiveJobs/ActiveJobs.jsx

@@ -12,6 +12,8 @@ import IndexJobActions from "./JobActions/IndexJobActions";
 import usersService from "../../services/UsersService";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 import { SocketValues } from "../Contexts/SocketIOContext";
+import TabButton from "../customTabs/TabButton";
+import AttachFile from "../attachmentCom/AttachFile";
 
 function ActiveJobs(props) {
   let {sendMessage, joinRoom} = SocketValues() // destructures 'SEND MESSAGE' and 'JOIN ROOM' FUNCTIONS FROM SOCKET
@@ -29,7 +31,9 @@ function ActiveJobs(props) {
 
   const [filesToSend, setFilesToSend] = useState([]); // State to hold the value of files to be sent
 
-  const [tab, setTab] = useState("message");
+  // const [tab, setTab] = useState("message");
+  const tabs = ["Send Message", "Send Files",] //STATE FOR SWITCHING BETWEEN TABS
+  const [selectedTab, setSelectedTab] = useState(tabs[0]);
 
   const [requestStatus, setRequestStatus] = useState({
     loading: false,
@@ -93,9 +97,9 @@ function ActiveJobs(props) {
 
   // FUNCTION TO CLEAR ALL TYPED MESSAGE OR FILES
   const handleClearAll = ({ target: { name } }) => {
-    if (tab == "message") {
+    if (selectedTab == "Send Message") {
       setMessageToSend("");
-    } else if (tab == "files") {
+    } else if (selectedTab == "Send Files") {
       setFilesToSend([]);
     } else {
       return;
@@ -269,9 +273,9 @@ function ActiveJobs(props) {
 
   return (
     <Layout>
-      <div className="py-[20px] bg-white dark:bg-black dark:text-white px-4 rounded-2xl shadow-md md:flex justify-between items-start gap-16">
+      <div className="py-[20px] bg-white dark:bg-black dark:text-white px-4 rounded-2xl shadow-md md:flex justify-between items-start gap-8">
         {/* job title */}
-        <div className="w-full md:w-8/12">
+        <div className="w-full">
           <div className="w-full flex justify-start space-x-3 items-start">
             <button
               type="button"
@@ -320,7 +324,7 @@ function ActiveJobs(props) {
         {/* end of job title */}
 
         {/* job details */}
-        <div className="w-full md:w-4/12">
+        <div className="min-w-[150px]">
           <p className="text-base text-sky-blue">Delivery Detail</p>
           {passDue ? (
             <div className="my-1">
@@ -394,78 +398,119 @@ function ActiveJobs(props) {
 
           {/* TEXTAREA SECTION */}
           <div className="mt-5">
-            <div className="">
-              <div
-                className="pl-7 my-2 flex items-center border-b border-slate-300 gap-3"
-                // className='ml-7 flex justify-start items-center gap-3'
-              >
-                <button
-                  name="message"
-                  onClick={(e) => setTab(e.target.name)}
-                  className={`px-4 py-1 rounded-t-2xl ${
-                    tab == "message"
-                      ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white"
-                      : "bg-white text-[#000] border-t-[2px]"
-                  }`}
-                >
-                  Send Message
-                </button>
-                <button
-                  name="files"
-                  onClick={(e) => setTab(e.target.name)}
-                  className={`px-4 py-1 rounded-t-2xl ${
-                    tab == "files"
-                      ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white"
-                      : "bg-white text-[#000] border-t-[2px]"
-                  }`}
-                >
-                  Send Files
-                </button>
-              </div>
-              {tab == "message" ? (
-                <textarea
-                  className="p-4 w-full h-[200px] text-base text-slate-600 dark:text-white bg-white dark:bg-black border border-slate-300 outline-none"
-                  // rows="10"
-                  style={{ resize: "none" }}
-                  name="message"
-                  onChange={handleMessageChange}
-                  value={messageToSend}
-                  autoFocus
-                />
-              ) : (
-                <div className="p-4 w-full h-[200px] text-base text-slate-600 border border-slate-300">
-                  <div className="files">
-                    <label
-                      htmlFor="file"
-                      className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer"
-                    >
-                      Select Files to Upload
-                    </label>
-                    <input
-                      type="file"
-                      id="file"
-                      accept="image/*"
-                      style={{ display: "none" }}
-                      onChange={handleFileChange}
+            <div className="w-full">
+                {/* switch button */}
+                <div className="grid grid-cols-2">
+                {tabs.map((item) => (
+                    <TabButton 
+                        key={item}
+                        item={item}
+                        selectedTab={selectedTab}
+                        setSelectedTab={setSelectedTab}
                     />
-                  </div>
-                  <div className="selected_file my-2">
-                    {filesToSend.length > 0 &&
-                      filesToSend.map((item, index) => (
-                        <p key={index} className="flex items-center space-x-2">
-                          <span>{item.name}</span>
-                          <button
-                            name="remove"
-                            onClick={() => handleRemoveImage(item)}
-                            className="px-2 flex justify-center items-center rounded-full border border-red-500 text-red-500"
-                          >
-                            x
-                          </button>
-                        </p>
-                      ))}
-                  </div>
+                ))}
+                </div>
+                {/* switch button */}
+                <div className="w-full bg-red-50 overflow-x-auto">
+                  {selectedTab == "Send Message" ? (
+                    <div className="p-2 w-full">
+                      <textarea
+                          className="p-4 w-full h-[150px] text-base text-slate-600 dark:text-white bg-white dark:bg-black outline-none"
+                          // rows="10"
+                          style={{ resize: "none" }}
+                          name="message"
+                          onChange={handleMessageChange}
+                          value={messageToSend}
+                          autoFocus
+                      />
+                    </div>
+                  ) : (
+                  <div className="p-2 w-full">
+                    <div className="p-4 mb-2 h-[150px] text-base text-slate-600">
+                        <div className="files flex">
+                        <label
+                            htmlFor="file"
+                            className="custom-btn btn-gradient text-base text-white"
+                        >
+                            Select Files to Upload
+                        </label>
+                        <input
+                            type="file"
+                            id="file"
+                            accept="image/*"
+                            style={{ display: "none" }}
+                            onChange={handleFileChange}
+                        />
+                        </div>
+                        <div className="selected_file my-2 overflow-y-auto">
+                        {filesToSend.length > 0 &&
+                            filesToSend.map((item, index) => (
+                            <p key={index} className="flex items-center space-x-2">
+                                <span>{item.name}</span>
+                                <button
+                                name="remove"
+                                onClick={() => handleRemoveImage(item)}
+                                className="px-2 flex justify-center items-center rounded-full border border-red-500 text-red-500"
+                                >
+                                x
+                                </button>
+                            </p>
+                            ))}
+                        </div>
+                    </div>
+                  </div>
+                  )}
+                  {/* Buttons Sections */}
+                  <div className="p-2 grid grid-cols-1 xxs:grid-cols-3">
+                      <div className="w-full col-span-3 col-start-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center gap-4">
+                          <button
+                              type="button"
+                              onClick={handleClearAll}
+                              className="custom-btn border-gradient"
+                          >
+                              <span className="text-gradient">Clear</span>
+                          </button>
+                          {selectedTab == "Send Files" ? (
+                              <button
+                              onClick={sendFile}
+                              type="button"
+                              className="custom-btn btn-gradient text-white"
+                              >
+                              {requestStatus.loading ? (
+                                  <LoadingSpinner size="6" color="sky-blue" />
+                              ) : (
+                                  <>
+                                  <svg
+                                      xmlns="http://www.w3.org/2000/svg"
+                                      viewBox="0 0 24 24"
+                                      width="20"
+                                      height="20"
+                                      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>
+                          ) : (
+                              <button
+                              onClick={sendTaskMessage}
+                              type="button"
+                              className="custom-btn btn-gradient text-white"
+                              >
+                              {requestStatus.loading ? (
+                                  <LoadingSpinner size="6" color="sky-blue" />
+                              ) : (
+                                  <span className="text-white">Send</span>
+                              )}
+                              </button>
+                          )}
+                      </div>
+                  </div>
+                  {/* end of Buttons Sections  */}
                 </div>
-              )}
             </div>
 
             {/* ERROR DISPLAY AND SUBMIT BUTTON */}
@@ -489,63 +534,19 @@ function ActiveJobs(props) {
                 ))}
             </div>
             {/* End of error or success display */}
-
-            {/* Buttons Sections */}
-            <div className="py-2 sm:flex sm:justify-end sm:items-center">
-              <div className="w-full sm:w-3/4 flex justify-between items-center space-x-2">
-                <button
-                  type="button"
-                  onClick={handleClearAll}
-                  className="border-gradient text-base tracking-wide px-4 py-2 rounded-full"
-                >
-                  <span className="text-gradient">Clear</span>
-                </button>
-                {tab == "files" ? (
-                  <button
-                    onClick={sendFile}
-                    type="button"
-                    className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer flex justify-center items-center"
-                  >
-                    {requestStatus.loading ? (
-                      <LoadingSpinner size="6" color="sky-blue" />
-                    ) : (
-                      <>
-                        <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>
-                ) : (
-                  <button
-                    onClick={sendTaskMessage}
-                    type="button"
-                    className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer"
-                  >
-                    {requestStatus.loading ? (
-                      <LoadingSpinner size="6" color="sky-blue" />
-                    ) : (
-                      <span className="text-white">Send</span>
-                    )}
-                  </button>
-                )}
-              </div>
-            </div>
-            {/* end of Buttons Sections  */}
           </div>
           {/* END OF TEXTAREA */}
         </div>
 
         {/* MESSAGE SECTION */}
         <div className="w-full lg:w-1/2">
+          <div className="mb-4">
+            <AttachFile
+              data={props.details}
+              showOnData={true}
+              fontSize={'text-lg'}
+            />
+          </div>
           <div className="flex justify-between items-center gap-5">
             <p className="w-full text-lg font-bold text-dark-gray dark:text-white tracking-wide flex items-center gap-2 justify-between"> 
               <span>Message</span>

src/components/MyActiveJobs/ActiveJobsMedia.jsx

@@ -15,6 +15,7 @@ const VideoElement = lazy(() => import("../VideoCom/VideoElement"));
 import usersService from "../../services/UsersService";
 import { PriceFormatter } from "../Helpers/PriceFormatter";
 import { SocketValues } from "../Contexts/SocketIOContext";
+import TabButton from "../customTabs/TabButton";
 
 function ActiveJobsMedia(props) {
   let {sendMessage, joinRoom} = SocketValues() // destructures 'SEND MESSAGE' and 'JOIN ROOM' FUNCTIONS FROM SOCKET
@@ -32,7 +33,9 @@ function ActiveJobsMedia(props) {
 
   const [filesToSend, setFilesToSend] = useState([]); // State to hold the value of files to be sent
 
-  const [tab, setTab] = useState("message");
+  // const [tab, setTab] = useState("message");
+  const tabs = ["Send Message", "Send Files",] //STATE FOR SWITCHING BETWEEN TABS
+  const [selectedTab, setSelectedTab] = useState(tabs[0]);
 
   const [requestStatus, setRequestStatus] = useState({
     loading: false,
@@ -96,9 +99,9 @@ function ActiveJobsMedia(props) {
 
   // FUNCTION TO CLEAR ALL TYPED MESSAGE OR FILES
   const handleClearAll = ({ target: { name } }) => {
-    if (tab == "message") {
+    if (selectedTab == "Send Message") {
       setMessageToSend("");
-    } else if (tab == "files") {
+    } else if (selectedTab == "Send Files") {
       setFilesToSend([]);
     } else {
       return;
@@ -275,314 +278,288 @@ function ActiveJobsMedia(props) {
         backpath={props.details.pathname}
         title={props.details?.title ? props.details.title : ''}
     >
-        {/* job title */}
-            {/* <div className="py-[20px] bg-white dark:bg-black dark:text-white px-4 rounded-2xl shadow-md md:flex justify-between items-start gap-16">
-                <div className="w-full">
-                    <div className="w-full flex justify-start space-x-3 items-start">
-                        <button
-                        type="button"
-                        className="min-w-[45px] h-auto text-[#374557] border border-sky-blue p-1 rounded-full"
-                        onClick={() => {
-                            if (props.details.pathname == "/manage-family") {
-                            navigate(
-                                props.details.pathname,
-                                { state: { ...props.details.accountDetails } },
-                                { replace: true }
-                            );
-                            } else {
-                            navigate(props.details.pathname, { 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-base md:text-[20px] font-bold text-dark-gray dark:text-white tracking-wide">
-                        {props.details?.title && props.details.title}
-                        </h1>
-                    </div>
-                </div>
-            </div> */}
-        {/* end of job title */}
-
-        <div className="my-4 lg:flex justify-between items-start space-y-4 lg:space-x-4 lg:space-y-0">
-            <div className="w-full mb-4 border-b pb-4 lg:pb-0 lg:mb-0 lg:border-b-0">
-            
+      <div className="my-4 lg:flex justify-between items-start space-y-4 lg:space-x-4 lg:space-y-0">
+          <div className="w-full mb-4 border-b pb-4 lg:pb-0 lg:mb-0 lg:border-b-0">
             <div className="mb-4 w-full h-auto">
                 <VideoElement videoId={props?.details?.media_uid} />
             </div>
 
-            <div className="w-full p-4 bg-white dark:bg-black rounded-2xl shadow-md md:flex md:justify-between gap-8">
+            <div className="w-full p-4 bg-white dark:bg-black rounded-2xl shadow-md xl:flex xl:justify-between gap-4">
                 <div className="w-full flex flex-col justify-between">
-                    <div className="w-full">
-                        <p className="w-full text-base text-right text-sky-blue">
-                        {props?.details && props.details.job_to}
-                        </p>
-                        <div className="text-base tracking-wide">
-                            <p className="font-semibold text-black dark:text-white tracking-wider">
-                                Description:{" "}
-                            </p>
-                            <p className="p-2 ml-8 border-b border-sky-blue">
-                                {props?.details && props.details.description}
-                            </p>
-                        </div>
-                        <div className="mt-6 w-full lg:flex gap-8">
-                            <div className="w-full text-base tracking-wide">
-                                <p className="font-semibold text-black dark:text-white tracking-wider">
-                                    Delivery Detail:{" "}
-                                </p>
-                                <p className="p-2 ml-8">
-                                    {props?.details && props.details.job_description}
-                                </p>
-                            </div>
-                            <div className="my-2 lg:my-0">
-                                <IndexJobActions details={props.details} />
-                            </div>
-                        </div>
-                    </div>
+                  {/* <p className="w-full text-base text-right text-sky-blue">
+                  {props?.details && props.details.job_to}
+                  </p> */}
+                  <div className="text-base tracking-wide">
+                      <p className="font-semibold text-black dark:text-white tracking-wider">
+                          Description:{" "}
+                      </p>
+                      <p className="p-2 ml-8 border-b border-sky-blue">
+                          {props?.details && props.details.description}
+                      </p>
+                  </div>
+                  <div className="mt-6 w-full">
+                      <div className="w-full text-base tracking-wide">
+                          <p className="font-semibold text-black dark:text-white tracking-wider">
+                              Delivery Detail:{" "}
+                          </p>
+                          <p className="p-2 ml-8">
+                              {props?.details && props.details.job_description}
+                          </p>
+                      </div>
+                      {/* <div className="my-2 xl:my-0">
+                          <IndexJobActions details={props.details} />
+                      </div> */}
+                  </div>
                 </div>
 
-                {/* job details */}
-                <div className="w-full md:w-[200px] flex flex-col justify-center gap-4">
-                    {/* <p className="text-base text-sky-blue">Delivery Detail</p> */}
-                    {passDue ? (
-                        <div className="my-1">
-                            <p className="text-base text-slate-700">
-                                <span className="font-semibold">Due: </span>
-                                {props?.details && props.details.delivery_date.split(" ")[0]}
-                            </p>
-                            {props?.delivery_date && (
-                                <p className="py-2 text-base text-slate-700">
-                                {props.details.delivery_date.split(" ")[1]}
-                                </p>
-                            )}
-                        </div>
-                    ) : (
-                        <div className="my-1 flex items-start gap-3">
-                            <p className="font-semibold">Due: </p>
-                            <div className="flex flex-col justify-between">
-                                <p className="text-base text-slate-700 tracking-wide">
-                                <CountDown
-                                    lastDate={props?.details && props.details.delivery_date}
-                                />
-                                </p>
-                                <div className="text-base text-slate-700 tracking-wide flex gap-[5px]">
-                                <span>Hrs</span>
-                                <span>Min</span>
-                                <span>Sec</span>
-                                </div>
-                            </div>
-                        </div>
-                    )}
+                <div className="flex justify-between items-center gap-1 xl:min-w-[350px]">
+                  <div className="h-[150px] xl:h-full w-[150px] xl:min-w-[150px]">
+                      <IndexJobActions details={props.details} />
+                  </div>
+                  {/* job details */}
+                  <div className="min-w-[170px] flex flex-col justify-center gap-2">
+                      {/* <p className="text-base text-sky-blue">Delivery Detail</p> */}
+                      {passDue ? (
+                          <div className="my-1">
+                              <p className="text-base text-slate-700">
+                                  <span className="font-semibold">Due: </span>
+                                  {props?.details && props.details.delivery_date.split(" ")[0]}
+                              </p>
+                              {props?.delivery_date && (
+                                  <p className="py-2 text-base text-slate-700">
+                                  {props.details.delivery_date.split(" ")[1]}
+                                  </p>
+                              )}
+                          </div>
+                      ) : (
+                          <div className="my-1 flex items-start gap-3">
+                              <p className="font-semibold">Due: </p>
+                              <div className="flex flex-col justify-between">
+                                  <p className="text-base text-slate-700 tracking-wide">
+                                  <CountDown
+                                      lastDate={props?.details && props.details.delivery_date}
+                                  />
+                                  </p>
+                                  <div className="text-base text-slate-700 tracking-wide flex gap-[5px]">
+                                  <span>Hrs</span>
+                                  <span>Min</span>
+                                  <span>Sec</span>
+                                  </div>
+                              </div>
+                          </div>
+                      )}
 
-                    <div className="my-1 text-base text-slate-700 tracking-wide flex items-center gap-3">
-                        <span className="font-semibold text-black dark:text-white">
-                        Reward:{" "}
-                        </span>
-                        <span className="">{thePrice}</span>
-                    </div>
+                      <div className="my-1 text-base text-slate-700 tracking-wide flex items-center gap-3">
+                          <span className="font-semibold text-black dark:text-white">
+                          Reward:{" "}
+                          </span>
+                          <span className="">{thePrice}</span>
+                      </div>
 
-                    <div className="my-1 text-base text-slate-700 tracking-wide flex items-center gap-3">
-                        <span className="font-semibold text-black dark:text-white">
-                        Duration:{" "}
-                        </span>
-                        <span className="">
-                        {props.details?.timeline_days && props.details.timeline_days}{" "}
-                        day(s)
-                        </span>
-                    </div>
-                    {/* <div className="my-1 text-base text-slate-700 tracking-wide flex items-center gap-3">
-                        <span className="font-semibold text-black dark:text-white">
-                        No:{" "}
-                        </span>
-                        <span className="">
-                        {props.details?.contract && props.details.contract}
-                        </span>
-                    </div> */}
+                      <div className="my-1 text-base text-slate-700 tracking-wide flex items-center gap-3">
+                          <span className="font-semibold text-black dark:text-white">
+                          Duration:{" "}
+                          </span>
+                          <span className="">
+                          {props.details?.timeline_days && props.details.timeline_days}{" "}
+                          day(s)
+                          </span>
+                      </div>
+                  </div>
+                  {/* end of job details */}
                 </div>
-                {/* end of job details */}
-            </div>
             </div>
+          </div>
 
-            <div className="w-full lg:w-2/5 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-1 gap-4">
-                {/* TEXTAREA SECTION */}
-                <div className="w-full mb-3">
-                    <div className="w-full">
-                        <div className="pl-7 flex items-center gap-3">
-                            <button
+          <div className="w-full lg:w-2/5 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-1 gap-4">
+              {/* TEXTAREA SECTION */}
+              <div className="w-full mb-3">
+                  <div className="w-full">
+                      {/* <div className="pl-7 flex items-center gap-3">
+                          <button
+                              name="message"
+                              onClick={(e) => setTab(e.target.name)}
+                              className={`px-4 xl:px-1 xxl:px-4 text-sm py-1 rounded-t-2xl ${
+                              tab == "message"
+                                  ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white"
+                                  : "bg-white text-[#000] border-t-[2px]"
+                              }`}
+                          >
+                              Send Message
+                          </button>
+                          <button
+                              name="files"
+                              onClick={(e) => setTab(e.target.name)}
+                              className={`px-4 xl:px-1 xxl:px-4 text-sm py-1 rounded-t-2xl ${
+                              tab == "files"
+                                  ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white"
+                                  : "bg-white text-[#000] border-t-[2px]"
+                              }`}
+                          >
+                              Send Files
+                          </button>
+                      </div> */}
+                      {/* switch button */}
+                      <div className="grid grid-cols-2">
+                      {tabs.map((item) => (
+                          <TabButton 
+                              key={item}
+                              item={item}
+                              selectedTab={selectedTab}
+                              setSelectedTab={setSelectedTab}
+                          />
+                      ))}
+                      </div>
+                      {/* switch button */}
+                      <div className="w-full bg-red-50 overflow-x-auto">
+                        {selectedTab == "Send Message" ? (
+                          <div className="p-2 w-full">
+                            <textarea
+                                className="p-4 w-full h-[150px] text-base text-slate-600 dark:text-white bg-white dark:bg-black outline-none"
+                                // rows="10"
+                                style={{ resize: "none" }}
                                 name="message"
-                                onClick={(e) => setTab(e.target.name)}
-                                className={`px-4 xl:px-1 xxl:px-4 text-sm py-1 rounded-t-2xl ${
-                                tab == "message"
-                                    ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white"
-                                    : "bg-white text-[#000] border-t-[2px]"
-                                }`}
-                            >
-                                Send Message
-                            </button>
-                            <button
-                                name="files"
-                                onClick={(e) => setTab(e.target.name)}
-                                className={`px-4 xl:px-1 xxl:px-4 text-sm py-1 rounded-t-2xl ${
-                                tab == "files"
-                                    ? "bg-[#4687ba] border-[2px] border-[#4687ba] text-white"
-                                    : "bg-white text-[#000] border-t-[2px]"
-                                }`}
-                            >
-                                Send Files
-                            </button>
-                        </div>
-                        {tab == "message" ? (
-                        <textarea
-                            className="p-4 w-full h-[150px] text-base text-slate-600 dark:text-white bg-white dark:bg-black border-4 border-[#4687ba] outline-none"
-                            // rows="10"
-                            style={{ resize: "none" }}
-                            name="message"
-                            onChange={handleMessageChange}
-                            value={messageToSend}
-                            autoFocus
-                        />
-                        ) : (
-                        <div className="p-4 mb-2 h-[150px] text-base text-slate-600 border-4 border-[#4687ba]">
-                            <div className="files flex">
-                            <label
-                                htmlFor="file"
-                                className="custom-btn btn-gradient text-base text-white"
-                            >
-                                Select Files to Upload
-                            </label>
-                            <input
-                                type="file"
-                                id="file"
-                                accept="image/*"
-                                style={{ display: "none" }}
-                                onChange={handleFileChange}
+                                onChange={handleMessageChange}
+                                value={messageToSend}
+                                autoFocus
                             />
-                            </div>
-                            <div className="selected_file my-2 overflow-y-auto">
-                            {filesToSend.length > 0 &&
-                                filesToSend.map((item, index) => (
-                                <p key={index} className="flex items-center space-x-2">
-                                    <span>{item.name}</span>
-                                    <button
-                                    name="remove"
-                                    onClick={() => handleRemoveImage(item)}
-                                    className="px-2 flex justify-center items-center rounded-full border border-red-500 text-red-500"
-                                    >
-                                    x
-                                    </button>
-                                </p>
-                                ))}
-                            </div>
+                          </div>
+                        ) : (
+                        <div className="p-2 w-full">
+                          <div className="p-4 mb-2 h-[150px] text-base text-slate-600">
+                              <div className="files flex">
+                              <label
+                                  htmlFor="file"
+                                  className="custom-btn btn-gradient text-base text-white"
+                              >
+                                  Select Files to Upload
+                              </label>
+                              <input
+                                  type="file"
+                                  id="file"
+                                  accept="image/*"
+                                  style={{ display: "none" }}
+                                  onChange={handleFileChange}
+                              />
+                              </div>
+                              <div className="selected_file my-2 overflow-y-auto">
+                              {filesToSend.length > 0 &&
+                                  filesToSend.map((item, index) => (
+                                  <p key={index} className="flex items-center space-x-2">
+                                      <span>{item.name}</span>
+                                      <button
+                                      name="remove"
+                                      onClick={() => handleRemoveImage(item)}
+                                      className="px-2 flex justify-center items-center rounded-full border border-red-500 text-red-500"
+                                      >
+                                      x
+                                      </button>
+                                  </p>
+                                  ))}
+                              </div>
+                          </div>
                         </div>
                         )}
-                    </div>
-
-                    {/* ERROR DISPLAY AND SUBMIT BUTTON */}
-                    <div className="w-full">
-                        {/* error or success display */}
-                        {requestStatus.message != "" &&
-                        (!requestStatus.status ? (
-                            <div
-                            className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
-                            >
-                            {requestStatus.message}
-                            </div>
-                        ) : (
-                            requestStatus.status && (
-                            <div
-                                className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
-                            >
-                                {requestStatus.message}
-                            </div>
-                            )
-                        ))}
-                    </div>
-                    {/* End of error or success display */}
-
-                    {/* Buttons Sections */}
-                    <div className="py-1 grid grid-cols-1 xxs:grid-cols-3">
-                        <div className="w-full col-span-3 col-start-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center gap-4">
-                            <button
-                                type="button"
-                                onClick={handleClearAll}
-                                className="custom-btn border-gradient"
-                            >
-                                <span className="text-gradient">Clear</span>
-                            </button>
-                            {tab == "files" ? (
+                        {/* Buttons Sections */}
+                        <div className="p-2 grid grid-cols-1 xxs:grid-cols-3">
+                            <div className="w-full col-span-3 col-start-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center gap-4">
                                 <button
-                                onClick={sendFile}
-                                type="button"
-                                className="custom-btn btn-gradient text-white"
+                                    type="button"
+                                    onClick={handleClearAll}
+                                    className="custom-btn border-gradient"
                                 >
-                                {requestStatus.loading ? (
-                                    <LoadingSpinner size="6" color="sky-blue" />
-                                ) : (
-                                    <>
-                                    <svg
-                                        xmlns="http://www.w3.org/2000/svg"
-                                        viewBox="0 0 24 24"
-                                        width="20"
-                                        height="20"
-                                        fill="white"
+                                    <span className="text-gradient">Clear</span>
+                                </button>
+                                {selectedTab == "Send Files" ? (
+                                    <button
+                                    onClick={sendFile}
+                                    type="button"
+                                    className="custom-btn btn-gradient text-white"
                                     >
-                                        <path d="M12 2L2 12h3v8h14v-8h3L12 2zm0 16v-6h-2v6H7l5-5 5 5h-3z" />
-                                    </svg>
+                                    {requestStatus.loading ? (
+                                        <LoadingSpinner size="6" color="sky-blue" />
+                                    ) : (
+                                        <>
+                                        <svg
+                                            xmlns="http://www.w3.org/2000/svg"
+                                            viewBox="0 0 24 24"
+                                            width="20"
+                                            height="20"
+                                            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>
-                            ) : (
-                                <button
-                                onClick={sendTaskMessage}
-                                type="button"
-                                className="custom-btn btn-gradient text-white"
-                                >
-                                {requestStatus.loading ? (
-                                    <LoadingSpinner size="6" color="sky-blue" />
+                                        <span className="text-white">Upload Files</span>
+                                        </>
+                                    )}
+                                    </button>
                                 ) : (
-                                    <span className="text-white">Send</span>
+                                    <button
+                                    onClick={sendTaskMessage}
+                                    type="button"
+                                    className="custom-btn btn-gradient text-white"
+                                    >
+                                    {requestStatus.loading ? (
+                                        <LoadingSpinner size="6" color="sky-blue" />
+                                    ) : (
+                                        <span className="text-white">Send</span>
+                                    )}
+                                    </button>
                                 )}
-                                </button>
-                            )}
+                            </div>
                         </div>
-                    </div>
-                    {/* end of Buttons Sections  */}
-                </div>
-                {/* END OF TEXTAREA */}
+                        {/* end of Buttons Sections  */}
+                      </div>
+                  </div>
 
-                {/* MESSAGE SECTION */}
-                <div className="w-full p-4 bg-white dark:bg-black rounded-2xl shadow-md">
-                    <div className="flex justify-between items-center gap-5">
-                        <p className="w-full text-lg font-bold text-dark-gray dark:text-white tracking-wide flex items-center gap-2 justify-between"> 
-                        <span>Message</span>
-                        <button
-                        type="button"
-                        onClick={popUpHandler}
-                        className="text-[12px] tracking-wider text-gray-400 dark:text-slate-400"
-                        >
-                        View all
-                        </button>
-                        </p>
-                    </div>
-                    {props.activeJobMesList.loading ? (
-                        <LoadingSpinner size="16" color="sky-blue" />
-                    ) : (
-                        <ActiveJobMessageMedia activeJobMesList={props.activeJobMesList} />
-                    )}
-                </div>
-                {/* END OF MESSAGE */}
-            </div>
-        </div>
+                  {/* ERROR DISPLAY AND SUBMIT BUTTON */}
+                  <div className="w-full">
+                      {/* error or success display */}
+                      {requestStatus.message != "" &&
+                      (!requestStatus.status ? (
+                          <div
+                          className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                          >
+                          {requestStatus.message}
+                          </div>
+                      ) : (
+                          requestStatus.status && (
+                          <div
+                              className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                          >
+                              {requestStatus.message}
+                          </div>
+                          )
+                      ))}
+                  </div>
+                  {/* End of error or success display */}
+              </div>
+              {/* END OF TEXTAREA */}
+
+              {/* MESSAGE SECTION */}
+              <div className="w-full p-4 bg-white dark:bg-black rounded-2xl shadow-md">
+                  <div className="flex justify-between items-center gap-5">
+                      <p className="w-full text-lg font-bold text-dark-gray dark:text-white tracking-wide flex items-center gap-2 justify-between"> 
+                      <span>Message</span>
+                      <button
+                      type="button"
+                      onClick={popUpHandler}
+                      className="text-[12px] tracking-wider text-gray-400 dark:text-slate-400"
+                      >
+                      View all
+                      </button>
+                      </p>
+                  </div>
+                  {props.activeJobMesList.loading ? (
+                      <LoadingSpinner size="16" color="sky-blue" />
+                  ) : (
+                      <ActiveJobMessageMedia activeJobMesList={props.activeJobMesList} />
+                  )}
+              </div>
+              {/* END OF MESSAGE */}
+          </div>
+      </div>
 
       {/* POPOUT SECTION */}
       {popUp && (

src/components/MyActiveJobs/JobActions/CurrentTaskAction.jsx

@@ -60,12 +60,12 @@ function CurrentTaskAction({jobDetails}) {
     }
 
   return (
-    <div className='dark:bg-black'>
+    <div className='h-full dark:bg-black'>
 
-          <div className="w-full text-sm text-left text-gray-500">
+          <div className="h-full w-full text-sm text-left text-gray-500">
             {jobDetails.job_type == 'MEDIA' ?
-            <div className="flex justify-center items-center">
-                <button onClick={popUpHandler} type="button" className="btn-gradient text-white p-1 lg:p-2 border-4 border-slate-300 text-lg lg:text-xl font-medium rounded-2xl">
+            <div className="h-full flex justify-center items-center">
+                <button onClick={popUpHandler} type="button" className="btn-gradient h-full text-white p-1 lg:p-2 border-4 border-slate-300 text-lg lg:text-xl font-medium rounded-2xl">
                     I have completed this task
                 </button>
             </div>

src/components/MyJobs/MyJobTable.jsx

@@ -7,13 +7,14 @@ import { handlePagingFunc } from "../Pagination/HandlePagination";
 import PaginatedList from "../Pagination/PaginatedList";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import DeleteJobPopout from "../jobPopout/DeleteJobPopout";
-import EditJobPopOut from "../jobPopout/EditJobPopout";
+// import EditJobPopOut from "../jobPopout/EditJobPopout";
 
 import DeleteIcon from "../../assets/images/icon-delete.svg";
 import EditIcon from "../../assets/images/icon-edit.svg";
 import { tableReload } from "../AddJob/settings";
 import CreditPopup from "../MyWallet/Popup/CreditPopup";
 import JobListPopout from "../jobPopout/JobListPopout";
+import EditJobPopoutNew from "../jobPopout/EditJobPopoutNew";
 
 export default function MyJobTable({ MyJobList, reloadJobList, className }) {
   const dispatch = useDispatch();
@@ -182,7 +183,7 @@ export default function MyJobTable({ MyJobList, reloadJobList, className }) {
       {/* END of Delete Job Popout */}
 
       {editJob.show && (
-        <EditJobPopOut
+        <EditJobPopoutNew
           details={editJob.data}
           onClose={() => {
             setEditJob({

src/components/Partials/Layout.jsx

@@ -67,7 +67,7 @@ export default function Layout({ children }) {
       </div>
       {logoutModal && (
         <ModalCom action={logoutModalHandler} situation={logoutModal}>
-          <div className="logout-modal-wrapper w-11/12 sm:w-[460px] bg-white dark:bg-dark-white lg:rounded-2xl">
+          <div className="logout-modal-wrapper w-11/12 sm:w-[460px] bg-white dark:bg-dark-white lg:rounded-2xl overflow-y-auto">
             <div className="modal-header-con">
               <h1 className="modal-title">
                 Confirm

src/components/Partials/MediaLayout.jsx

@@ -53,22 +53,11 @@ export default function MediaLayout({backpath, title, children }) {
 
     return (
         <>
-            <div className="nft-main-wrapper-layout media container mx-auto">
-                <div className={`nft-wrapper-layout-container 2xl:pr-20 md:pr-10 pr-2 pl-2 md:pl-0 w-full min-h-screen flex`}>
-                    {/* sidebar */}
-                    {/*<div className={`nft-sidebar xl:block hidden section-shadow ${drawer ? "2xl:w-[335px] w-[280px] 2xl:pl-20 pl-10 pr-6 " : "w-[70px]"} bg-white dark:bg-dark-white h-full overflow-y-scroll overflow-style-none fixed left-0 top-0 pt-[30px]`}>*/}
-                    {/*    <Sidebar logoutModalHandler={logoutModalHandler} sidebar={drawer} action={() => dispatch(drawerToggle())} myJobList={userJobList} />*/}
-                    {/*</div>*/}
-                    {/*{MobileSideBar && (*/}
-                    {/*    <div onClick={() => setMobileSidebar.toggle()} className="bg-black bg-opacity-20 fixed left-0 top-0 w-full h-full z-[50] block xl:hidden"></div>*/}
-                    {/*)}*/}
-                    {/*<div className={`nft-sidebar block xl:hidden section-shadow w-[280px] pl-3 bg-white dark:bg-dark-white h-full overflow-y-scroll overflow-style-none fixed z-[60] top-0 pt-8 ${MobileSideBar ? "left-0" : "-left-[290px]"}`}>*/}
-                    {/*    <MobileSidebar logoutModalHandler={logoutModalHandler} sidebar={MobileSideBar} action={() => setMobileSidebar.toggle()} myJobList={userJobList} />*/}
-                    {/*</div>*/}
-                    {/* end sidebar */}
-                    <div className={`nft-header-container-wrapper flex-1 md:ml-12 xl:ml-[110px]  h-full`}>
+            <div className="relative w-full max-w-[2000px] nft-main-wrapper-layout mx-auto">
+                <div className={`nft-wrapper-layout-container w-full min-h-screen flex`}>
+                    <div className={`w-full nft-header-container-wrapper h-full 2xl:px-10 px-8`}>
                         {/* header */}
-                        <div className="nft-header w-full lg:h-[100px] h-[70px] default-border-bottom dark:border-[#292967] z-40 xl:sticky fixed top-0 left-0 ">
+                        <div className="nft-header w-full lg:h-[100px] h-[70px] default-border-bottom dark:border-[#292967] z-40 xl:sticky fixed top-0 left-0">
                             <MediaHeader backpath={backpath} title={title} sidebarHandler={() => setMobileSidebar.toggle()} logoutModalHandler={logoutModalHandler} />
                         </div>
                         {/* container */}
@@ -76,9 +65,6 @@ export default function MediaLayout({backpath, title, children }) {
                             <div className="nft-main-container_media flex-[100%] w-full">
                                 {children && children}
                             </div>
-                            {/*<div className="nft-right-side-content 2xl:w-[270px] w-full h-full 2xl:flex justify-center relative flex-[20%]">*/}
-                            {/*    <RightSideBar myJobList={userJobList} />*/}
-                            {/*</div>*/}
                         </div>
                     </div>
                 </div>

src/components/attachmentCom/AttachFile.jsx

@@ -0,0 +1,173 @@
+import React, { useEffect, useRef, useState } from 'react'
+import LoadingSpinner from '../Spinners/LoadingSpinner'
+import axios from 'axios'
+
+import usersService from '../../services/UsersService'
+
+export default function AttachFile({data='', fontSize='text-sm', showOnData=false}) {
+
+    const apiCall = new usersService()
+
+    let [uploadedList, setUploadedList] = useState({loading: true, data:{}})
+    let [reloadList, setReloadList] = useState(false) // Triggers list of upload reload
+
+    const [requestStatus, setRequestStatus] = useState({loading: false, status:false, message:''})
+
+    const inputFile = useRef()
+
+    const upload = (event) => {
+        let inputs = {
+            file: event.target.files[0],
+            job_uid: data?.job_uid,
+            uid: localStorage.getItem("uid"),
+            // member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+          };
+        setRequestStatus({loading: true, status:false, message:''})
+        if(!inputs.file){
+            setRequestStatus({loading: false, status:false, message:'Please select a file'})
+            setTimeout(()=>{
+                setRequestStatus({loading: false, status:false, message:''})
+            }, 3000)
+            return 
+        }
+        const formData = new FormData()
+        for (let input in inputs) {
+            formData.append(input, inputs[input]);
+        }
+
+        axios.post(`${process.env.REACT_APP_MEDIA_LINK}/upload/task`,formData).then(res => {
+            if(res.data.internal_return < 0){
+                inputFile.current.value = null
+                setRequestStatus({loading: false, status:false, message:'upload failed'})
+                setTimeout(()=>{
+                    setRequestStatus({loading: false, status:false, message:''})
+                }, 3000)
+                return 
+            }
+            setRequestStatus({loading: false, status:true, message:'uploaded'})
+            inputFile.current.value = null
+            setReloadList(prev => !prev) // Triggers list of upload reload
+            setTimeout(()=>{
+                setRequestStatus({loading: false, status:false, message:''})
+            }, 3000)
+        }).catch(err => {
+            inputFile.current.value = null
+            setRequestStatus({loading: false, status:false, message:'upload failed'})
+            setTimeout(()=>{
+                setRequestStatus({loading: false, status:false, message:''})
+            }, 3000)
+            return 
+        })
+    }
+
+    useEffect(()=>{
+        apiCall.jobManagerFiles({job_uid:data?.job_uid || data?.origin_job_uid}).then(res => {
+            setUploadedList({loading: false, data:res.data})
+        }).catch(err => {
+            console.log(err)
+            setUploadedList({loading: false, data:{}})
+        })
+    },[data, reloadList])
+
+    return (
+        <>
+        {!showOnData ?
+            <div className='w-full h-full flex flex-col justify-center items-center'>
+                <div className='w-full flex flex-col items-start gap-1 overflow-hidden'>
+                    <div className='w-full flex justify-between items-center gap-1'>
+                        <div className='job-label job-label-flex'>
+                            Files {
+                            requestStatus.loading ? 
+                                <LoadingSpinner size='6' /> 
+                                : 
+                                <span className={`text-[10px] ${requestStatus.status ? 'text-emerald-600' : 'text-red-500'}`}>{requestStatus.message}</span>
+                            } 
+                        </div>
+                        <label htmlFor='file' className={`text-black bg-[#f8ffd4] cursor-pointer text-[12px] py-1 px-2 rounded-full border ${ requestStatus.loading && 'pointer-events-none'}`}>+ Add Files</label>
+                    </div>
+                    <div className='w-full p-2 rounded-2xl bg-slate-100'>
+                        <div className='text-[12px] w-full h-20 overflow-y-auto flex flex-col gap-2'>
+                            {uploadedList.loading ?
+                            <div className='w-full h-full justify-center items-center'>
+                                <LoadingSpinner size='6' height='h-full' />
+                            </div>
+                            :
+                            Object.keys(uploadedList.data).length > 0 ?
+                            uploadedList.data.result_list.length > 0 ? 
+                                uploadedList.data.result_list.map((item, index) => {
+                                    let fileNameExt = item.originalname.split('.')[item.originalname.split('.').length - 1]
+                                    return(
+                                        <div key={item.file_uid} className={`my-[6px] flex justify-start gap-2 ${fontSize}`}>
+                                            <span>{index + 1}:</span>
+                                            <a 
+                                                target='_blank' 
+                                                alt='download-link' 
+                                                className='' 
+                                                href={`${uploadedList?.data?.session_image_server}/${localStorage.getItem("session_token")}/jobfile/${item.file_uid}`}
+                                            >
+                                                {(item.originalname).toString().length > 30 ? (item.originalname).toString().slice(0, 26) + '..._.' + fileNameExt : (item.originalname).toString()}
+                                            </a>
+                                        </div>
+                                    )
+                                })
+                                : 
+                                <p className='text-sm'>No Uploaded files yet</p>
+                            :
+                            <></>
+                            }
+                        </div>
+                    </div>
+                    <input 
+                        type="file" 
+                        id='file' 
+                        ref={inputFile} 
+                        className='hidden file:rounded-full job-label p-1' 
+                        onChange={upload}
+                    />
+                </div>
+            </div>
+        :showOnData && uploadedList?.data?.result_list?.length > 0 ?
+            <div className='w-full h-full flex flex-col justify-center items-center'>
+                <div className='w-full flex flex-col items-start gap-1 overflow-hidden'>
+                    <div className='w-full flex justify-between items-center gap-1'>
+                        <div className='job-label job-label-flex'>
+                            Files
+                        </div>
+                    </div>
+                    <div className='w-full p-2 rounded-2xl bg-slate-100'>
+                        <div className='text-[12px] w-full p-2 h-20 overflow-y-auto flex flex-col gap-2'>
+                            {uploadedList.data.result_list.map((item, index) => {
+                                let fileNameExt = item.originalname.split('.')[item.originalname.split('.').length - 1]
+                                return(
+                                    <div key={item.file_uid} className={`my-[6px] flex justify-start gap-2 ${fontSize}`}>
+                                        <span>{index + 1}:</span>
+                                        <a 
+                                            target='_blank' 
+                                            alt='download-link'
+                                            className='' 
+                                            href={`${uploadedList?.data?.session_image_server}/${localStorage.getItem("session_token")}/jobfile/${item.file_uid}`}
+                                        >
+                                            {(item.originalname).toString().length > 30 ? (item.originalname).toString().slice(0, 26) + '..._.' + fileNameExt : (item.originalname).toString()}
+                                        </a>
+                                    </div>
+                                )
+                            })
+                            }
+                        </div>
+                    </div>
+                    <input 
+                        type="file" 
+                        id='file' 
+                        ref={inputFile} 
+                        className='hidden file:rounded-full job-label p-1' 
+                        onChange={upload}
+                    />
+                </div>
+            </div>
+        :
+            <></>
+        }
+        </>
+    )
+}

src/components/countdown/CustomTimer.jsx

@@ -6,12 +6,14 @@ export default function CustomTimer({className='text-emerald-500'}) {
 
     useEffect(()=>{
         const timer = setInterval(()=>{
-            setTime(prev => prev - 1)
+            if(time > 0 ){
+                setTime(prev => prev - 1)
+            }
         },1000)
         return ()=>{
             clearInterval(timer)
         }
-    },[])
+    },[time])
 
     let minutes = time == 0 ? 0 : Math.floor(time/60)
     let seconds = time == 0 ? 0 :time - (minutes * 60)

src/components/jobPopout/DeleteJobPopout.jsx

@@ -145,7 +145,7 @@ function DeleteJobPopout({ details, onClose, situation }) {
           {/* End of error or success display */}
         </div>
         <div className="modal-footer-wrapper grid grid-cols-1 xxs:grid-cols-3">
-          <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center">
+          <div className="w-full col-span-1 xxs:col-span-2 xxs:col-start-2 flex justify-between items-center gap-4">
             <button
               onClick={onClose}
               type="button"

src/components/jobPopout/EditJobPopout.jsx

@@ -211,315 +211,314 @@ const EditJobPopOut = ({
 
   return (
     <ModalCom action={onClose} situation={situation}>
-      <div className="logout-modal-wrapper w-11/12 lg:w-[600px] bg-white dark:bg-dark-white lg:rounded-2xl">
-        <div className="modal-header-con">
-          <h1 className="modal-title">
-            Edit Job
-          </h1>
-          <button
-            type="button"
-            className="modal-close-btn"
-            onClick={onClose}
-          >
-            <svg
-              width="36"
-              height="36"
-              viewBox="0 0 36 36"
-              fill="none"
-              className="fill-current"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
-                fill=""
-                fillOpacity="0.6"
-              />
-              <path
-                d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
-                fill="#"
-                fillOpacity="0.6"
-              />
-            </svg>
-          </button>
-        </div>
           <Formik
             initialValues={initialValues}
             validationSchema={validationSchema}
             onSubmit={handleEditJob}
           >
             {(props) => (
-              <Form className="w-full">
-                <div className="logout-modal-body w-full flex flex-col items-center px-10 pb-8 pt-2">
-                  <div className="flex flex-col-reverse sm:flex-row">
-                    <div className="fields w-full">
-                      <div className="xl:flex xl:space-x-7 mb-[0.5rem]">
-                        <div className="field w-full mb-6 xl:mb-0">
+              <Form className="">
+                <div className="modal-container">
+                  <div className="modal-header-con">
+                    <h1 className="modal-title">
+                      Edit Job
+                    </h1>
+                    <button
+                      type="button"
+                      className="modal-close-btn"
+                      onClick={onClose}
+                    >
+                      <svg
+                        width="36"
+                        height="36"
+                        viewBox="0 0 36 36"
+                        fill="none"
+                        className="fill-current"
+                        xmlns="http://www.w3.org/2000/svg"
+                      >
+                        <path
+                          d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                          fill=""
+                          fillOpacity="0.6"
+                        />
+                        <path
+                          d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                          fill="#"
+                          fillOpacity="0.6"
+                        />
+                      </svg>
+                    </button>
+                  </div>
+                  <div className="modal-body-wrapper">
+                    <div className="flex flex-col-reverse sm:flex-row">
+                      <div className="fields w-full">
+                        <div className="xl:flex xl:space-x-7 mb-[0.5rem]">
+                          <div className="field w-full mb-6 xl:mb-0">
+                            <InputCom
+                              fieldClass="px-6 cursor-default"
+                              label="Currency"
+                              labelClass="tracking-wide"
+                              inputBg="bg-slate-100"
+                              inputClass="input-curve lg border border-light-purple"
+                              type="text"
+                              name="country"
+                              value={props.values.country}
+                              inputHandler={props.handleChange}
+                              blurHandler={props.handleBlur}
+                              disable={true}
+                            />
+                          </div>
+
+                          {/* Price */}
+                          <div className="field w-full">
+                            <InputCom
+                              fieldClass="px-6 text-right"
+                              label="Price"
+                              labelClass="tracking-wide"
+                              inputBg="bg-slate-100"
+                              inputClass="input-curve lg border border-light-purple"
+                              type="number"
+                              name="price"
+                              value={props.values.price}
+                              inputHandler={props.handleChange}
+                              blurHandler={props.handleBlur}
+                              errorBorder={
+                                props.errors.price && props.touched.price
+                              }
+                            />
+                          </div>
+                        </div>
+                        {/* Title  */}
+                        <div className="field w-full mb-[0.5rem]">
                           <InputCom
-                            fieldClass="px-6 cursor-default"
-                            label="Currency"
+                            fieldClass="px-6"
+                            label="Title"
                             labelClass="tracking-wide"
                             inputBg="bg-slate-100"
-                            inputClass="input-curve lg border border-light-purple"
+                            inputClass=" input-curve lg border border-light-purple"
                             type="text"
-                            name="country"
-                            value={props.values.country}
+                            name="title"
+                            value={props.values.title}
                             inputHandler={props.handleChange}
                             blurHandler={props.handleBlur}
-                            disable={true}
+                            errorBorder={props.errors.title && props.touched.title}
                           />
                         </div>
 
-                        {/* Price */}
-                        <div className="field w-full">
+                        {/* Description  */}
+                        <div className="field w-full mb-[0.5rem]">
                           <InputCom
-                            fieldClass="px-6 text-right"
-                            label="Price"
+                            fieldClass="px-6"
+                            label="Description"
                             labelClass="tracking-wide"
                             inputBg="bg-slate-100"
-                            inputClass="input-curve lg border border-light-purple"
-                            type="number"
-                            name="price"
-                            value={props.values.price}
+                            inputClass=" input-curve lg border border-light-purple"
+                            type="text"
+                            name="description"
+                            value={props.values.description}
                             inputHandler={props.handleChange}
                             blurHandler={props.handleBlur}
                             errorBorder={
-                              props.errors.price && props.touched.price
+                              props.errors.description && props.touched.description
                             }
                           />
                         </div>
-                      </div>
-                      {/* Title  */}
-                      <div className="field w-full mb-[0.5rem]">
-                        <InputCom
-                          fieldClass="px-6"
-                          label="Title"
-                          labelClass="tracking-wide"
-                          inputBg="bg-slate-100"
-                          inputClass=" input-curve lg border border-light-purple"
-                          type="text"
-                          name="title"
-                          value={props.values.title}
-                          inputHandler={props.handleChange}
-                          blurHandler={props.handleBlur}
-                          errorBorder={props.errors.title && props.touched.title}
-                        />
-                      </div>
 
-                      {/* Description  */}
-                      <div className="field w-full mb-[0.5rem]">
-                        <InputCom
-                          fieldClass="px-6"
-                          label="Description"
-                          labelClass="tracking-wide"
-                          inputBg="bg-slate-100"
-                          inputClass=" input-curve lg border border-light-purple"
-                          type="text"
-                          name="description"
-                          value={props.values.description}
-                          inputHandler={props.handleChange}
-                          blurHandler={props.handleBlur}
-                          errorBorder={
-                            props.errors.description && props.touched.description
-                          }
-                        />
-                      </div>
-
-                      {/* Details */}
-                      <div className="field flex flex-col sm:flex-row w-full mb-[5px] gap-2">
-                        <div className="sm:w-[60%] w-full">
-                          <label
-                            htmlFor="job-label"
-                            className='job-label'
-                          >
-                            Job Delivery Details
-                          </label>
-                          <textarea
-                            id="Job Delivery Details"
-                            rows="5"
-                            className={`input-field px-6 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] ${
-                              props.errors.job_detail && props.touched.job_detail
-                                ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
-                                : "border border-[#f5f8fa] dark:border-[#5e6278]"
-                            } rounded-[10px]`}
-                            style={{ resize: "none" }}
-                            name="job_detail"
-                            value={props.values.job_detail}
-                            onChange={props.handleChange}
-                            onBlur={props.handleBlur}
-                          />
-                        </div>
-
-                        <div className="sm:w-[35%] w-full">
-                          <div
-                            htmlFor="Job Categories"
-                            className='job-label'
-                            id="checked-group"
-                          >
-                            Categories
+                        {/* Details */}
+                        <div className="field flex flex-col sm:flex-row w-full mb-[5px] gap-2">
+                          <div className="sm:w-[60%] w-full">
+                            <label
+                              htmlFor="job-label"
+                              className='job-label'
+                            >
+                              Job Delivery Details
+                            </label>
+                            <textarea
+                              id="Job Delivery Details"
+                              rows="5"
+                              className={`input-field px-6 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] ${
+                                props.errors.job_detail && props.touched.job_detail
+                                  ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
+                                  : "border border-[#f5f8fa] dark:border-[#5e6278]"
+                              } rounded-[10px]`}
+                              style={{ resize: "none" }}
+                              name="job_detail"
+                              value={props.values.job_detail}
+                              onChange={props.handleChange}
+                              onBlur={props.handleBlur}
+                            />
                           </div>
-                          <div
-                            className="sm:flex-col flex flex-wrap px-3 mt-3"
-                            role="group"
-                            aria-labelledby="checked-group"
-                          >
-                            {categories &&
-                              Object.entries(categories)?.map(([key, value]) => (
-                                <label
-                                  key={key}
-                                  className="flex gap-1 w-full items-center dark:text-white"
-                                >
-                                  <Field
-                                    type="checkbox"
-                                    name="category"
-                                    value={key}
-                                  />
-                                  <span className="text-[13.975px]">{value}</span>
-                                </label>
-                              ))}
-                            <span className="h-5 text-sm italic text-[#cf3917]">
-                              {props.errors.category &&
-                                props.touched.category &&
-                                "please select a category"}
-                            </span>
-                          </div>
-                        </div>
-                      </div>
-                      <div className="w-full flex items-center gap-2 mb-2">
-                        {/* FOR TASK IMAGE */}
-                        <div className="w-1/2 relative max-h-[130px] min-h-[130px]">
-                          <input
-                            id="task_image"
-                            className="hidden"
-                            type="file"
-                            accept="image/*"
-                            onChange={taskImgChangeHandler}
-                          />
-                          {taskImage ? (
-                            <div className="w-full absolute -top-5">
-                              <img
-                                src={taskImage}
-                                className="max-h-[150px] min-h-[150px] w-full object-cover"
-                                alt="uploaded task"
-                              />
-                              <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
+
+                          <div className="sm:w-[35%] w-full">
+                            <div
+                              htmlFor="Job Categories"
+                              className='job-label'
+                              id="checked-group"
+                            >
+                              Categories
+                            </div>
+                            <div
+                              className="sm:flex-col flex flex-wrap px-3 mt-3"
+                              role="group"
+                              aria-labelledby="checked-group"
+                            >
+                              {categories &&
+                                Object.entries(categories)?.map(([key, value]) => (
+                                  <label
+                                    key={key}
+                                    className="flex gap-1 w-full items-center dark:text-white"
+                                  >
+                                    <Field
+                                      type="checkbox"
+                                      name="category"
+                                      value={key}
+                                    />
+                                    <span className="text-[13.975px]">{value}</span>
+                                  </label>
+                                ))}
+                              <span className="h-5 text-sm italic text-[#cf3917]">
+                                {props.errors.category &&
+                                  props.touched.category &&
+                                  "please select a category"}
                               </span>
                             </div>
-                          ) : (
-                            <label
-                              className="absolute -top-5 h-[150px] w-full flex flex-col justify-center items-center bg-slate-100 dark:bg-[#11131F] cursor-pointer input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold"
-                              htmlFor="task_image"
-                            >
-                              Select Task Image
-                            </label>
-                          )}
-                        </div>
-                        {/* END OF TASK IMAGE */}
-
-                        <div className="field w-1/2">
-                          <div className={`flex items-center justify-between`}>
-                            <label
-                              className="job-label flex flex-col"
-                              htmlFor="timeline_days"
-                            >
-                              Timeline -
-                              <span className="w-full text-center text-green-700 text-sm tracking-wide">
-                                Expected duration of this task
-                              </span>
-                            </label>
                           </div>
-
-                          <Field
-                            component="select"
-                            name="timeline_days"
-                            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 ${
-                              props.errors.timeline_days &&
-                              props.touched.timeline_days
-                                ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
-                                : "border border-[#f5f8fa] dark:border-[#5e6278]"
-                            }`}
-                            value={props.values.timeline_days}
-                          >
-                            <option value="">Select Duration</option>
-                            {publicArray.map(({ name, duration }, idx) => (
-                              <option
-                                key={duration}
-                                className="text-slate-500 text-lg"
-                                value={duration}
+                        </div>
+                        <div className="w-full flex items-center gap-2 mb-2">
+                          {/* FOR TASK IMAGE */}
+                          <div className="w-1/2 relative max-h-[130px] min-h-[130px]">
+                            <input
+                              id="task_image"
+                              className="hidden"
+                              type="file"
+                              accept="image/*"
+                              onChange={taskImgChangeHandler}
+                            />
+                            {taskImage ? (
+                              <div className="w-full absolute -top-5">
+                                <img
+                                  src={taskImage}
+                                  className="max-h-[150px] min-h-[150px] w-full object-cover"
+                                  alt="uploaded task"
+                                />
+                                <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
+                                className="absolute -top-5 h-[150px] w-full flex flex-col justify-center items-center bg-slate-100 dark:bg-[#11131F] cursor-pointer input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold"
+                                htmlFor="task_image"
                               >
-                                {name}
-                              </option>
-                            ))}
-                          </Field>
+                                Select Task Image
+                              </label>
+                            )}
+                          </div>
+                          {/* END OF TASK IMAGE */}
+
+                          <div className="field w-1/2">
+                            <div className={`flex items-center justify-between`}>
+                              <label
+                                className="job-label flex flex-col"
+                                htmlFor="timeline_days"
+                              >
+                                Timeline -
+                                <span className="w-full text-center text-green-700 text-sm tracking-wide">
+                                  Expected duration of this task
+                                </span>
+                              </label>
+                            </div>
+
+                            <Field
+                              component="select"
+                              name="timeline_days"
+                              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 ${
+                                props.errors.timeline_days &&
+                                props.touched.timeline_days
+                                  ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
+                                  : "border border-[#f5f8fa] dark:border-[#5e6278]"
+                              }`}
+                              value={props.values.timeline_days}
+                            >
+                              <option value="">Select Duration</option>
+                              {publicArray.map(({ name, duration }, idx) => (
+                                <option
+                                  key={duration}
+                                  className="text-slate-500 text-lg"
+                                  value={duration}
+                                >
+                                  {name}
+                                </option>
+                              ))}
+                            </Field>
+                          </div>
                         </div>
+                        {/* inputs ends here */}
                       </div>
-                      {/* inputs ends here */}
                     </div>
-                  </div>
-                  {/* ERROR DISPLAY AND SUBMIT BUTTON */}
-                  <div className="content-footer w-full">
-                    {/* error or success display */}
-                    {requestStatus.message != "" &&
-                      (!requestStatus.status ? (
-                        <div
-                          className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
-                        >
-                          {requestStatus.message}
-                        </div>
-                      ) : (
-                        requestStatus.status && (
+                    {/* ERROR DISPLAY AND SUBMIT BUTTON */}
+                    <div className="content-footer w-full">
+                      {/* error or success display */}
+                      {requestStatus.message != "" &&
+                        (!requestStatus.status ? (
                           <div
-                            className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                            className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
                           >
                             {requestStatus.message}
                           </div>
-                        )
-                      ))}
-                    {/* End of error or success display */}
+                        ) : (
+                          requestStatus.status && (
+                            <div
+                              className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                            >
+                              {requestStatus.message}
+                            </div>
+                          )
+                        ))}
+                      {/* End of error or success display */}
+
+                      {/* DISPLAYS TASK IMAGE UPLOADING STATUS */}
+                      <div className="w-full">
+                        {uploadStatus.message && !uploadStatus.loading && (
+                          <p
+                            className={`text-center ${
+                              uploadStatus.status
+                                ? "text-green-500"
+                                : "text-red-500"
+                            }`}
+                          >
+                            {uploadStatus.message}
+                          </p>
+                        )}
+                        {uploadStatus.loading && (
+                          <p className="text-center">{uploadStatus.message}</p>
+                        )}
+                      </div>
 
-                    {/* DISPLAYS TASK IMAGE UPLOADING STATUS */}
-                    <div className="w-full">
-                      {uploadStatus.message && !uploadStatus.loading && (
-                        <p
-                          className={`text-center ${
-                            uploadStatus.status
-                              ? "text-green-500"
-                              : "text-red-500"
-                          }`}
-                        >
-                          {uploadStatus.message}
-                        </p>
-                      )}
-                      {uploadStatus.loading && (
-                        <p className="text-center">{uploadStatus.message}</p>
-                      )}
                     </div>
-
                   </div>
-                </div>
-                <div className="modal-footer-wrapper justify-end">
-                    {requestStatus.loading ? (
-                      <LoadingSpinner size="6" color="sky-blue" />
-                    ) : (
-                      <button
-                        type="submit"
-                        className="w-[120px] h-[40px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                        // className='w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white'
-                        disabled={
-                          requestStatus.loading || uploadStatus.loading
-                        }
-                      >
-                        Save
-                      </button>
-                    )}
+                  <div className="modal-footer-wrapper justify-end">
+                      {requestStatus.loading ? (
+                        <LoadingSpinner size="6" color="sky-blue" />
+                      ) : (
+                        <button
+                          type="submit"
+                          className="custom-btn btn-gradient text-white"
+                          disabled={
+                            requestStatus.loading || uploadStatus.loading
+                          }
+                        >
+                          Save
+                        </button>
+                      )}
+                  </div>
                 </div>
               </Form>
             )}
           </Formik>
-      </div>
     </ModalCom>
   );
 };

src/components/jobPopout/EditJobPopoutNew.jsx

@@ -0,0 +1,541 @@
+import { Field, Form, Formik } from "formik";
+import React, { useCallback, useMemo, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { useNavigate } from "react-router-dom";
+import * as Yup from "yup";
+import usersService from "../../services/UsersService";
+import { tableReload } from "../../store/TableReloads";
+import InputCom from "../Helpers/Inputs/InputCom";
+import ModalCom from "../Helpers/ModalCom";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
+import { apiConst } from "../../lib/apiConst";
+import AttachFile from "../attachmentCom/AttachFile";
+
+const validationSchema = Yup.object().shape({
+  country: Yup.string()
+    .min(1, "Minimum 3 characters")
+    .max(25, "Maximum 25 characters")
+    .required("Country is required"),
+  price: Yup.string()
+    .typeError("Invalid number")
+    .min(1, "Price must be greater than 0")
+    .test("no-e", "Invalid number", (value) => {
+      if (value && /\d+e/.test(value)) {
+        return false;
+      }
+      return true;
+    })
+    .required("Price is required"),
+  title: Yup.string()
+    .min(5, "Minimum 5 characters")
+    .max(149, "Maximum 149 characters")
+    .required("Title is required"),
+  description: Yup.string()
+    .min(5, "Minimum 5 characters")
+    .max(299, "Maximum 299 characters")
+    .required("Description is required"),
+  job_detail: Yup.string()
+    .min(3, "Minimum 3 characters")
+    .max(1440, "Maximum 1440 characters")
+    .required("Details is required"),
+  timeline_days: Yup.number()
+    .typeError("you must specify a number")
+    .min(1, "Price must be greater than 0")
+    .required("Timeline is required"),
+  category: Yup.array().min(1, "Select at least one checkbox"),
+});
+
+const EditJobPopoutNew = ({
+  details,
+  onClose,
+  situation,
+  country,
+  categories,
+}) => {
+  const dispatch = useDispatch();
+  const { userDetails } = useSelector((state) => state.userDetails);
+  const { walletDetails } = useSelector((state) => state.walletDetails);
+
+  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
+
+  let [requestStatus, setRequestStatus] = useState({
+    loading: false,
+    status: false,
+    message: "",
+  }); // Holds state when submit button is pressed
+
+  let initialValues = {
+    // initial values for formik
+    country: details.currency,
+    price: details?.price * 0.01,
+    title: details?.title,
+    description: details?.description,
+    job_detail: details?.job_detail,
+    timeline_days: details?.timeline_days,
+    category: details?.category,
+  };
+
+  const jobApi = useMemo(() => new usersService(), []);
+  const navigate = useNavigate();
+
+  const handleEditJob = useCallback(
+    async (values) => {
+      let reqData = {
+        country: values?.country,
+        price: Number(values.price) * 100,
+        title: values?.title,
+        description: values?.description,
+        job_detail: values?.job_detail,
+        timeline_days: values?.timeline_days,
+        category: values.category?.join("@"),
+        job_id: details.job_id,
+        job_uid: details.job_uid,
+      };
+      setRequestStatus({ loading: true, message: "" });
+
+      try {
+        let res = await jobApi.jobManagerUpdateJob(reqData);
+        let { data } = await res;
+        if (data?.internal_return < 0) return;
+        setRequestStatus({ loading: false, message: null });
+        setTimeout(() => {
+          dispatch(tableReload({ type: "JOBTABLE" }));
+          navigate("/myjobs", { replace: true });
+          onClose();
+        }, 1000);
+      } catch (error) {
+        setRequestStatus({ loading: false, message: error });
+        throw new Error(error);
+      }
+    },
+    [jobApi, navigate, onClose, details]
+  );
+
+  const taskImgChangeHandler = (e) => {
+    setUploadStatus({ loading: false, status: false, message: "" });
+    let acceptedFormat = ["jpeg", "jpg", "png", "bmp", "gif"]; // ARRAY OF SUPPORTED FORMATS
+    let uploadedFile = e.target.files[0]; //UPLOADED FILE
+
+    const fileFormat = uploadedFile?.type?.split("/")[1]?.toLowerCase();
+    if (!acceptedFormat.includes(fileFormat)) {
+      //CHECKING FOR CORRECT UPLOAD FORMAT
+      const msg = `Please select ${acceptedFormat
+        .slice(0, -1)
+        .join(", ")} or ${acceptedFormat.slice(-1)}`;
+      setUploadStatus({ loading: false, status: false, message: msg });
+      return setTimeout(() => {
+        // profileImgInput.current.value = '' // clear the input
+        setUploadStatus({ loading: false, status: false, message: "" });
+      }, 5000);
+    }
+
+    if (uploadedFile.size > 5 * 1048576) {
+      // CHECKING FOR CORRECT FILE SIZE
+      setUploadStatus({
+        loading: false,
+        status: false,
+        message: "File must not exceed 5MB",
+      });
+      return setTimeout(() => {
+        // profileImgInput.current.value = '' // clear the input
+        setUploadStatus({ loading: false, status: false, message: "" });
+      }, 5000);
+    }
+
+    if (e.target.value !== "") {
+      const imgReader = new FileReader();
+      imgReader.onload = (event) => {
+        let base64Img = imgReader.result.split(",")[1];
+        let reqData = {
+          // PAYLOAD FOR API CALL
+          job_uid: details?.job_uid,
+          file_name: uploadedFile?.name.slice(0, 19),
+          file_size: uploadedFile?.size,
+          file_type: uploadedFile?.type?.split("/")[0]?.toLowerCase(),
+          file_data: base64Img,
+          msg_type: "FILE",
+          action: apiConst.WRENCHBOARD_PICTURE_JOB,
+        };
+        setUploadStatus({
+          loading: true,
+          status: false,
+          message: "Loading...",
+        });
+        jobApi
+          .sendFiles(reqData)
+          .then((res) => {
+            if (res.status != 200 || res.data.internal_return < 0) {
+              return setUploadStatus({
+                loading: false,
+                status: false,
+                message: "Something went wrong, try again",
+              });
+            }
+            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(() => {
+            setTimeout(() => {
+              setUploadStatus({ loading: false, status: false, message: "" });
+            }, 5000);
+          });
+      };
+      imgReader.readAsDataURL(e.target.files[0]);
+    }
+  };
+
+  return (
+    <ModalCom action={onClose} situation={situation}>
+          <Formik
+            initialValues={initialValues}
+            validationSchema={validationSchema}
+            onSubmit={handleEditJob}
+          >
+            {(props) => (
+              <Form className="">
+                <div className="modal-container">
+                    <div className="modal-header-con">
+                        <h1 className="modal-title">
+                            Edit Job
+                        </h1>
+                        <button
+                            type="button"
+                            className="modal-close-btn"
+                            onClick={onClose}
+                        >
+                            <svg
+                            width="36"
+                            height="36"
+                            viewBox="0 0 36 36"
+                            fill="none"
+                            className="fill-current"
+                            xmlns="http://www.w3.org/2000/svg"
+                            >
+                            <path
+                                d="M36 16.16C36 17.4399 36 18.7199 36 20.0001C35.7911 20.0709 35.8636 20.2554 35.8385 20.4001C34.5321 27.9453 30.246 32.9248 22.9603 35.2822C21.9006 35.6251 20.7753 35.7657 19.6802 35.9997C18.4003 35.9997 17.1204 35.9997 15.8401 35.9997C15.5896 35.7086 15.2189 35.7732 14.9034 35.7093C7.77231 34.2621 3.08728 30.0725 0.769671 23.187C0.435002 22.1926 0.445997 21.1199 0 20.1599C0 18.7198 0 17.2798 0 15.8398C0.291376 15.6195 0.214408 15.2656 0.270759 14.9808C1.71321 7.69774 6.02611 2.99691 13.0428 0.700951C14.0118 0.383805 15.0509 0.386897 15.9999 0C17.2265 0 18.4532 0 19.6799 0C19.7156 0.124041 19.8125 0.136067 19.9225 0.146719C27.3 0.868973 33.5322 6.21922 35.3801 13.427C35.6121 14.3313 35.7945 15.2484 36 16.16ZM33.011 18.0787C33.0433 9.77105 26.3423 3.00309 18.077 2.9945C9.78479 2.98626 3.00344 9.658 2.98523 17.8426C2.96667 26.1633 9.58859 32.9601 17.7602 33.0079C26.197 33.0577 32.9787 26.4186 33.011 18.0787Z"
+                                fill=""
+                                fillOpacity="0.6"
+                            />
+                            <path
+                                d="M15.9309 18.023C13.9329 16.037 12.007 14.1207 10.0787 12.2072C9.60071 11.733 9.26398 11.2162 9.51996 10.506C9.945 9.32677 11.1954 9.0811 12.1437 10.0174C13.9067 11.7585 15.6766 13.494 17.385 15.2879C17.9108 15.8401 18.1633 15.7487 18.6375 15.258C20.3586 13.4761 22.1199 11.7327 23.8822 9.99096C24.8175 9.06632 26.1095 9.33639 26.4967 10.517C26.7286 11.2241 26.3919 11.7413 25.9133 12.2178C24.1757 13.9472 22.4477 15.6855 20.7104 17.4148C20.5228 17.6018 20.2964 17.7495 20.0466 17.9485C22.0831 19.974 24.0372 21.8992 25.9689 23.8468C26.9262 24.8119 26.6489 26.1101 25.4336 26.4987C24.712 26.7292 24.2131 26.3441 23.7455 25.8757C21.9945 24.1227 20.2232 22.3892 18.5045 20.6049C18.0698 20.1534 17.8716 20.2269 17.4802 20.6282C15.732 22.4215 13.9493 24.1807 12.1777 25.951C11.7022 26.4262 11.193 26.7471 10.4738 26.4537C9.31345 25.9798 9.06881 24.8398 9.98589 23.8952C11.285 22.5576 12.6138 21.2484 13.9387 19.9355C14.5792 19.3005 15.2399 18.6852 15.9309 18.023Z"
+                                fill="#"
+                                fillOpacity="0.6"
+                            />
+                            </svg>
+                        </button>
+                    </div>
+                    <div className="modal-body-wrapper">
+                        <div className="flex flex-col-reverse sm:flex-row">
+                            <div className="fields w-full">
+                            <div className="sm:flex sm:space-x-7 mb-[0.5rem]">
+                                <div className="field w-full mb-[0.5rem] sm:mb-0">
+                                <InputCom
+                                    fieldClass="px-6 cursor-default"
+                                    label="Currency"
+                                    labelClass="tracking-wide"
+                                    inputBg="bg-slate-100"
+                                    inputClass="input-curve lg border border-light-purple"
+                                    type="text"
+                                    name="country"
+                                    value={props.values.country}
+                                    inputHandler={props.handleChange}
+                                    blurHandler={props.handleBlur}
+                                    disable={true}
+                                />
+                                </div>
+
+                                {/* Price */}
+                                <div className="field w-full mb-[0.5rem] sm:mb-0">
+                                <InputCom
+                                    fieldClass="px-6 text-right"
+                                    label="Price"
+                                    labelClass="tracking-wide"
+                                    inputBg="bg-slate-100"
+                                    inputClass="input-curve lg border border-light-purple"
+                                    type="number"
+                                    name="price"
+                                    value={props.values.price}
+                                    inputHandler={props.handleChange}
+                                    blurHandler={props.handleBlur}
+                                    errorBorder={
+                                    props.errors.price && props.touched.price
+                                    }
+                                />
+                                </div>
+
+                                <div className="field w-full mb-[0.5rem] sm:mb-0">
+                                <label
+                                    className="job-label"
+                                    htmlFor="timeline_days"
+                                >
+                                    Timeline -
+                                    {/* <span className="w-full text-center text-green-700 text-sm tracking-wide">
+                                    Expected duration of this task
+                                    </span> */}
+                                </label>
+                                <Field
+                                    component="select"
+                                    name="timeline_days"
+                                    className={`input-field p-2 mt-3 rounded-full placeholder:text-base text-dark-gray w-full h-[42px] bg-slate-100 focus:ring-0 focus:outline-none border ${
+                                    props.errors.timeline_days &&
+                                    props.touched.timeline_days
+                                        ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
+                                        : "dark:border-[#5e6278]"
+                                    }`}
+                                    value={props.values.timeline_days}
+                                >
+                                    <option value="" className='text-slate-500 text-lg'>Select Duration</option>
+                                    {publicArray.map(({ name, duration }, idx) => (
+                                    <option
+                                        key={duration}
+                                        className="text-slate-500 text-lg"
+                                        value={duration}
+                                    >
+                                        {name}
+                                    </option>
+                                    ))}
+                                </Field>
+                                </div>
+                            </div>
+
+                            {/* Title  */}
+                            <div className="field w-full mb-[0.5rem]">
+                                <InputCom
+                                fieldClass="px-6"
+                                label="Title"
+                                labelClass="tracking-wide"
+                                inputBg="bg-slate-100"
+                                inputClass=" input-curve lg border border-light-purple"
+                                type="text"
+                                name="title"
+                                value={props.values.title}
+                                inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
+                                errorBorder={props.errors.title && props.touched.title}
+                                />
+                            </div>
+
+                            {/* Description  */}
+                            <div className="field w-full mb-[0.5rem]">
+                                <InputCom
+                                fieldClass="px-6"
+                                label="Description"
+                                labelClass="tracking-wide"
+                                inputBg="bg-slate-100"
+                                inputClass=" input-curve lg border border-light-purple"
+                                type="text"
+                                name="description"
+                                value={props.values.description}
+                                inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
+                                errorBorder={
+                                    props.errors.description && props.touched.description
+                                }
+                                />
+                            </div>
+
+                            {/* Details */}
+                            <div className="field flex flex-col sm:flex-row w-full mb-[2px] gap-2">
+                                <div className="sm:w-[60%] w-full">
+                                <label
+                                    htmlFor="job-label"
+                                    className='job-label'
+                                >
+                                    Job Delivery Details
+                                </label>
+                                <textarea
+                                    id="Job Delivery Details"
+                                    rows="5"
+                                    className={`input-field px-6 py-2 placeholder:text-base text-dark-gray dark:text-white w-full h-[100px] bg-slate-100 dark:bg-[#11131F] focus:ring-0 focus:outline-[#dce4e9] ${
+                                    props.errors.job_detail && props.touched.job_detail
+                                        ? "border-[#ff0a0a63] shadow-red-500 border-[0.5px] animate-shake"
+                                        : "border border-[#f5f8fa] dark:border-[#5e6278]"
+                                    } rounded-[10px]`}
+                                    style={{ resize: "none" }}
+                                    name="job_detail"
+                                    value={props.values.job_detail}
+                                    onChange={props.handleChange}
+                                    onBlur={props.handleBlur}
+                                />
+                                </div>
+
+                                <div className="sm:w-[35%] w-full">
+                                <div
+                                    htmlFor="Job Categories"
+                                    className='job-label'
+                                    id="checked-group"
+                                >
+                                    Categories
+                                </div>
+                                <div
+                                    className="sm:flex-col flex flex-wrap px-3 mt-3"
+                                    role="group"
+                                    aria-labelledby="checked-group"
+                                >
+                                    {categories &&
+                                    Object.entries(categories)?.map(([key, value]) => (
+                                        <label
+                                        key={key}
+                                        className="flex gap-1 w-full items-center dark:text-white"
+                                        >
+                                        <Field
+                                            type="checkbox"
+                                            name="category"
+                                            value={key}
+                                        />
+                                        <span className="text-[13.975px]">{value}</span>
+                                        </label>
+                                    ))}
+                                    <span className="h-5 text-sm italic text-[#cf3917]">
+                                    {props.errors.category &&
+                                        props.touched.category &&
+                                        "please select a category"}
+                                    </span>
+                                </div>
+                                </div>
+                            </div>
+                            <div className="w-full flex items-center justify-center gap-2 mb-2">
+                                {/* FOR TASK IMAGE */}
+                                <div className="w-1/3 relative flex flex-col max-h-[130px] min-h-[130px]">
+                                <div className="w-full flex gap-2">
+                                    <label
+                                        className={`w-full job-label cursor-pointer ${uploadStatus.loading && 'pointer-events-none'}`}
+                                        htmlFor="task_image"
+                                        >
+                                        Banner
+                                    </label>
+                                    {uploadStatus.loading ? 
+                                        <LoadingSpinner size='6' /> 
+                                        : 
+                                        <span className={`text-[10px] ${uploadStatus.status ? 'text-emerald-600' : 'text-red-500'}`}>{uploadStatus.message}</span>
+                                    } 
+                                </div>
+                                <input
+                                    id="task_image"
+                                    className="hidden"
+                                    type="file"
+                                    accept="image/*"
+                                    onChange={taskImgChangeHandler}
+                                />
+                                {taskImage ? (
+                                    <div className="w-full relative h-full">
+                                    <img
+                                        src={taskImage}
+                                        className="h-32 w-full object-cover"
+                                        alt="uploaded task"
+                                    />
+                                    <div className="absolute inset-0 flex flex-col justify-center items-center">
+                                        <span
+                                        onClick={() => setTaskImage("")}
+                                        className="p-2 bg-white/80 hover:bg-white hover:shadow-md transition-all duration-500 cursor-pointer text-slate-800"
+                                        >
+                                        Remove Image
+                                        </span>
+                                    </div>
+                                    </div>
+                                ) : (
+                                    <div className="absolute inset-0 flex flex-col justify-center items-center">
+                                    <label
+                                        className="p-2 bg-slate-100 dark:bg-[#11131F] cursor-pointer input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold"
+                                        htmlFor="task_image"
+                                    >
+                                        Select Task Image
+                                    </label>
+                                    </div>
+                                )}
+                                </div>
+                                {/* END OF TASK IMAGE */}
+
+                                <div className="field w-2/3">
+                                    <AttachFile data={details} />
+                                </div>
+
+                            </div>
+                            {/* inputs ends here */}
+                            </div>
+                        </div>
+                        {/* ERROR DISPLAY AND SUBMIT BUTTON */}
+                        <div className="content-footer w-full">
+                            {/* error or success display */}
+                            {requestStatus.message != "" &&
+                            (!requestStatus.status ? (
+                                <div
+                                className={`relative p-4 my-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                >
+                                {requestStatus.message}
+                                </div>
+                            ) : (
+                                requestStatus.status && (
+                                <div
+                                    className={`relative p-4 my-4 text-green-700 bg-slate-200 border-slate-800 mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]`}
+                                >
+                                    {requestStatus.message}
+                                </div>
+                                )
+                            ))}
+                            {/* End of error or success display */}
+                        </div>
+                    </div>
+                    <div className="modal-footer-wrapper justify-end">
+                        {requestStatus.loading ? (
+                        <LoadingSpinner size="6" color="sky-blue" />
+                        ) : (
+                        <button
+                            type="submit"
+                            className="custom-btn btn-gradient text-white"
+                            disabled={
+                            requestStatus.loading || uploadStatus.loading
+                            }
+                        >
+                            Save
+                        </button>
+                        )}
+                    </div>
+                </div>
+              </Form>
+            )}
+          </Formik>
+    </ModalCom>
+  );
+};
+
+export default EditJobPopoutNew;
+
+const publicArray = [
+  { duration: 1, name: "1 day" },
+  { duration: 2, name: "2 days" },
+  { duration: 3, name: "3 days" },
+  { duration: 4, name: "4 days" },
+  { duration: 5, name: "5 days" },
+  { duration: 6, name: "6 days" },
+  { duration: 7, name: "1 week" },
+  { duration: 14, name: "2 weeks" },
+  { duration: 21, name: "3 weeks" },
+  { duration: 28, name: "4 weeks" },
+];

src/components/jobPopout/FamilyOfferJobPopout.jsx

@@ -11,6 +11,7 @@ import { tableReload } from "../../store/TableReloads";
 import { useDispatch } from "react-redux";
 
 import { SocketValues } from "../Contexts/SocketIOContext";
+import AttachFile from "../attachmentCom/AttachFile";
 
 const VideoElement = lazy(() => import("../VideoCom/VideoElement"));
 const ImageElement = lazy(() => import("../ImageCon/ImageElement"));
@@ -206,11 +207,11 @@ function FamilyOfferJobPopout({ details, onClose, situation }) {
           </div>
 
           {/* ACTION SECTION */}
-          <div className="p-4 w-full md:w-2/5 h-full flex flex-col justify-between">
+          <div className="p-4 w-full md:w-2/5 h-full flex flex-col gap-4 justify-between">
             { details.job_type == 'TASK' ?
               <div className="image-wrapper w-full h-40 flex justify-center items-center">
                 <Suspense fallback={<p className="w-full text-center">Loading...</p>}>
-                  <ImageElement src={details?.image} alt='banner' className='w-auto h-full' />
+                  <ImageElement src={details?.image} alt='banner' className='w-full h-auto' />
                 </Suspense>
               </div>
               :
@@ -222,6 +223,9 @@ function FamilyOfferJobPopout({ details, onClose, situation }) {
                 </div>
               </div>
             }
+            <div className="w-full">
+              <AttachFile data={details} showOnData={true} />
+            </div>
             <div className="my-3 md:flex md:justify-center">
               {requestStatus.loading && requestStatus.trigger == "offer" ? (
                 <LoadingSpinner size={8} color="sky-blue" />

src/components/jobPopout/JobListPopout.jsx

@@ -560,7 +560,7 @@ const JobFieldInput = ({
               <Field
                 component="select"
                 name={inputName}
-                className={`input-field placeholder:text-base text-dark-gray w-full h-full bg-white outline-none px-2`}
+                className={`options-default`}
                 value={value}
               >
                 {/* <option value="">{optionText}</option> */}

src/components/jobPopout/popoutcomponent/Detail.jsx

@@ -3,7 +3,7 @@ import React from 'react'
 function Detail({label, value, bg,}) {
   return (
     <>
-        <label className='job-label w-full md:w-1/4'>{label}</label>
+        <label className='job-label w-full md:w-[150px]'>{label}</label>
         <p className={`p-1 w-full md:w-3/4 text-sm text-slate-900 dark:text-white ${bg ? bg : null}`}>{value}</p>
     </>
   )

src/index.css

@@ -160,8 +160,12 @@
     @apply flex items-center gap-2
   }
 
-  /* STYLES FOR MODAL */
-  /* Modal Header */
+  /* STYLES FOR MODAL 'NOTE => VIEW JOB EDIT MODAL/ADD JOB MODAL FOR SAMPLE USAGE'*/
+  .modal-container {
+    @apply w-11/12 md:w-[700px] mx-auto h-auto max-h-full flex flex-col bg-white dark:bg-dark-white lg:rounded-2xl overflow-hidden
+  }
+
+  /* Modal Header section*/
   .modal-header-con{
     @apply w-full flex items-center justify-between lg:px-10 lg:py-8 px-[30px] py-[23px] bg-sky-blue/50 border-b dark:border-[#5356fb29]  border-light-purple
   }
@@ -172,9 +176,14 @@
     @apply text-[#000] dark:text-red-500
   }
 
+  /* Modal Body section */
+  .modal-body-wrapper {
+    @apply w-full h-full overflow-y-auto flex flex-col items-center px-10 p-2
+  }
+
   /* modal footer */
   .modal-footer-wrapper{
-    @apply p-4 border-t-2 flex justify-between items-center
+    @apply p-4 border-t-2 flex justify-between items-center w-full
   }
   /* END OF STYLES FOR MODAL BOX */
 
@@ -185,6 +194,9 @@
   .logout-btn {
     @apply px-4 min-w-[80px] h-[52px] flex justify-center items-center text-xl font-bold rounded-full cursor-pointer
   }
+  .options-default {
+    @apply px-2 placeholder:text-sm w-full h-full bg-white outline-none text-sm text-slate-900 dark:text-white
+  }
 }
 
 /* =====================  EXTRA ===================== */

src/lib/apiConst.js

@@ -44,6 +44,7 @@ export const apiConst = {
     WRENCH_FILE_FAMILY:     400,
     WRENCH_FILE_FAMILYBANNER:    410,
     WRENCH_FILE_JOB :    500,
+    JOB_MANAGER_FILES: 13012,
     WRENCHBOARD_BKO_START: 10000,
     WRENCHBOARD_BKO_LOGIN: 10010,
     WRENCHBOARD_BKO_CREATEUSER: 10015,

src/services/UsersService.js

@@ -1356,6 +1356,18 @@ class usersService {
     return this.postAuxEnd("/assignmediatask", postData);
   }
 
+  // API FUNCTION FOR LISTING JOB MANAGER FILES (TASK FILE UPLAOD)
+  jobManagerFiles(reqData) {
+    var postData = {
+      member_uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: apiConst.JOB_MANAGER_FILES,
+      ...reqData
+    };
+    return this.postAuxEnd("/jobmanagerfiles", postData);
+  }
+
   /*
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(username)
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(password)

src/views/AddJobPage.jsx

@@ -5,7 +5,7 @@ import ModalCom from "../components/Helpers/ModalCom";
 function AddJobPage({ action, situation, categories }) {
   return (
     <ModalCom action={action} situation={situation}>
-      <div className="lg:w-[600px] w-11/12 lg:overflow-hidden lg:rounded-2xl bg-white dark:bg-dark-white dark:text-white">
+      <div className="modal-container">
         <div className="modal-header-con">
           <h1 className="modal-title">
             New Job