margin added to offer interest table

src/components/AddJob/AddJob.jsx

@@ -1,12 +1,12 @@
 import React, { useState, useEffect } from "react";
-import { Link, useNavigate } from "react-router-dom";
+import { Link } from "react-router-dom";
 import InputCom from "../Helpers/Inputs/InputCom";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import usersService from "../../services/UsersService";
 
 import { useSelector, useDispatch } from "react-redux";
 
-import { tableReload } from '../../store/TableReloads'
+import { tableReload } from "../../store/TableReloads";
 
 import { Field, Form, Formik } from "formik";
 import * as Yup from "yup";
@@ -38,16 +38,12 @@ const validationSchema = Yup.object().shape({
     .required("Timeline is required"),
 });
 
-function AddJob() {
+function AddJob({ popUpHandler }) {
   const ApiCall = new usersService();
-  const navigate = useNavigate();
-
-  let dispatch = useDispatch()
+  let dispatch = useDispatch();
 
   let { userDetails } = useSelector((state) => state.userDetails);
 
-  let [pageLoading, setPageLoading] = useState(true); // State used for knowing when the page is mounting
-
   let [country, setCountry] = useState({
     loading: true,
     status: false,
@@ -109,8 +105,8 @@ function AddJob() {
           message: "Job Added Successfully",
         });
         setTimeout(() => {
-          dispatch(tableReload({type:'JOBTABLE'}))
-          navigate("/myjobs", { replace: true });
+          dispatch(tableReload({ type: "JOBTABLE" }));
+          popUpHandler()
         }, 1000);
       })
       .catch((err) => {
@@ -129,16 +125,9 @@ function AddJob() {
 
   useEffect(() => {
     getUserCountry();
-    setPageLoading(false);
   }, []);
 
-  return pageLoading.loading ? (
-    <div className="personal-info-tab w-full flex flex-col justify-between">
-      <div className="p-3">
-        <LoadingSpinner size="32" color="sky-blue" />
-      </div>
-    </div>
-  ) : (
+  return (
     <div className="add-job p-5 w-full bg-white rounded-md flex flex-col justify-between">
       <Formik
         initialValues={initialValues}
@@ -148,27 +137,12 @@ function AddJob() {
         {(props) => {
           return (
             <Form>
-              <h1 className="py-2 my-4 text-lg md:text-xl font-bold tracking-wide">
-                Create New Job
-              </h1>
               <div className="flex flex-col-reverse sm:flex-row">
                 <div className="fields w-full">
                   {/* inputs starts here */}
                   {/* country */}
                   <div className="xl:flex xl:space-x-7 mb-6">
                     <div className="field w-full mb-6 xl:mb-0">
-                      {/* <InputCom
-                          fieldClass="px-6 cursor-not-allowed"
-                          label="Country"
-                          labelClass='tracking-wide'
-                          inputBg = 'bg-slate-100'
-                          type="text"
-                          name="country"
-                          disable={true}
-                          value={country.loading ? 'loading' : country.data ? country.data : 'no country found!'}
-                          inputHandler={(e)=> setCountry((prev) => ({...prev, data:e.target.value}))}
-
-                      /> */}
                       <label
                         htmlFor="country"
                         className="input-label text-[#181c32] dark:text-white text-[13.975px] leading-[20.9625px] font-semibold block"

src/components/AuthPages/Login/index.jsx

@@ -131,7 +131,7 @@ export default function Login() {
     ux_mode:'redirect',
     redirect_uri: process.env.REACT_APP_GOOGLE_REDIRECT_URL,
     onSuccess: async (codeResponse) => {
-      console.log(codeResponse);
+      console.log("GOOGLE LOGIN GOOD --- ",codeResponse);
     },
     onError: (errorResponse) => console.log(errorResponse),
   });

src/components/MyJobs/index.jsx

@@ -3,11 +3,12 @@ import { Link } from "react-router-dom";
 import Layout from "../Partials/Layout";
 import MyJobTable from "./MyJobTable";
 import CommonHead from "../UserHeader/CommonHead";
+import AddJobPage from "../../views/AddJobPage";
 
 export default function MyJobs(props) {
-  const [selectTab, setValue] = useState("today");
-  const filterHandler = (value) => {
-    setValue(value);
+  const [popUp, setPopUp] = useState(false);
+  const popUpHandler = () => {
+    setPopUp((prev) => !prev);
   };
 
   return (
@@ -16,33 +17,27 @@ export default function MyJobs(props) {
       <div className="notification-page w-full mb-10">
         <div className="notification-wrapper w-full">
           {/* heading */}
-          <div className="sm:flex justify-between items-center mb-6">
+          <div className="sm:flex items-center mb-6">
             <div className="mb-5 sm:mb-0">
               <h1 className="text-26 font-bold flex items-center space-x-1  text-dark-gray dark:text-white gap-2">
-                <span
-                  className={`${selectTab === "today" ? "block" : "hidden"}`}
-                >
-                  My Jobs
-                </span>
+                <span>My Jobs</span>
 
-                <Link
-                  to="/add-job"
+                <button
                   className="text-white btn-gradient text-lg tracking-wide px-5 py-2 rounded-full"
+                  onClick={popUpHandler}
                 >
                   Add Job
-                </Link>
+                </button>
               </h1>
             </div>
-            <div className="slider-btns flex space-x-4">
-              <div
-                onClick={() => filterHandler("today")}
-                className="relative"
-              ></div>
-            </div>
           </div>
           <MyJobTable MyJobList={props.MyJobList} />
         </div>
       </div>
+
+      {/* Add Job List Popout */}
+      {popUp && <AddJobPage action={popUpHandler} situation={popUp} />}
+      {/* End of Add Job List Popout */}
     </Layout>
   );
 }

src/components/MyWallet/AddFund.jsx

@@ -2,6 +2,7 @@ import React, {useState} from 'react'
 import RecentActivityTable from './WalletComponent/RecentActivityTable'
 import LoadingSpinner from '../Spinners/LoadingSpinner'
 import { useNavigate } from 'react-router-dom'
+import InputCom from '../Helpers/Inputs/InputCom'
 
 function AddFund({payment}) {
    
@@ -36,49 +37,84 @@ function AddFund({payment}) {
         setInput('')
     }
     return (
-        <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
-            <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl shadow">
-                    <h2 className='md:p-8 p-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Add Credit with Account Deposit</h2>
-                    <hr />
-                   <form className='md:p-8 p-4 add-fund-info'>
-                        <div className='md:flex items-center'>
-                            <label className='w-full md:w-2/4 text-slate-600 text-lg'>Amount(Naira) <span className='text-red-500'>*</span></label>
-                            <input className='w-full md:w-2/4 p-3 text-lg text-right bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                                value={input} 
-                                name='amount' 
-                                type="text" 
-                                placeholder='Amount' 
-                                required
-                                onChange={handleChange}
-                                />
-                        </div>
-                        {inputError && <p className='text-base text-red-500'>{inputError}</p>}
-                   </form>
-                        <hr />
-                        <div className='md:p-8 p-4 add-fund-btn flex justify-end items-center py-4'>
-                            <button onClick={handleSubmit} className='text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-md'>Continue</button>
-                        </div>
+        <div>
+            {/* heading */}
+            <div className="sm:flex justify-between items-center mb-6">
+                <div className="w-full flex justify-start space-x-3 items-center">
+                    <button
+                    type="button"
+                    className="min-w-[45px] h-auto text-[#374557] border border-sky-blue p-1 rounded-full"
+                    onClick={() =>
+                        navigate('/my-wallet', { 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-26 font-bold inline-flex gap-3 text-dark-gray dark:text-white items-center">
+                    Add Credit
+                    </h1>
                 </div>
-                <div className="add-fund py-4 my-2 w-full bg-white dark:bg-dark-white rounded-2xl shadow">
-                    <h2 className='md:px-8 px-4 py-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Add Credit with Account Deposit</h2>
-                    <hr />
-                    <p className='md:px-8 px-4 py-2 text-slate-600 dark:text-white text-base lg:text-xl font-medium'>Transfer fund to WrenchBoard GTB Account 0250869867</p>
-                    <p className='md:px-8 px-4 py-2 text-slate-500 dark:text-white text-sm lg:text-base font-medium'>
-                    Make sure you add your account username in the notes part of the transfer for prompt processing. When the transfer is complete notify here <a className='text-sky-blue' href='#'>Contact us</a>
-                    </p>
+                <div className="slider-btns flex space-x-4">
+                    <div
+                        onClick={() => filterHandler("today")}
+                        className="relative"
+                    ></div>
                 </div>
             </div>
-    
-            <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-                <div className="wallet w-full  md:p-8 p-4 h-full max-h-[590px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
-                    <h2 className='text-gray-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
-                    {/* <p className='text-base text-gray-600 dark:text-white'>Activity Report</p> */}
-                    {payment.loading ?
-                    <LoadingSpinner size='16' color='sky-blue' />
-                    :
-                    <RecentActivityTable  payment={payment}/>
-                    }
+
+            <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
+                <div className="lg:w-2/2 w-full mb-10 lg:mb-0">
+                    <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl shadow">
+                        {/*<h2 className='md:p-8 p-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Add Credit with Account Deposit</h2>*/}
+                        {/*<hr />*/}
+                        <form className='md:p-8 p-4 add-fund-info'>
+                            <div className="field w-full mb-6">
+                                <InputCom
+                                    fieldClass="px-6"
+                                    label="Amount(Naira)"
+                                    type="text"
+                                    name="amount"
+                                    placeholder="Amount"
+                                    value={input}
+                                    inputHandler={handleChange}
+                                    // blurHandler={props.handleBlur}
+                                />
+                                {inputError && <p className='text-base text-red-500'>{inputError}</p>}
+                            </div>
+                        </form>
+                        <hr />
+                        <div className='md:p-8 p-4 add-fund-btn flex justify-end items-center py-4'>
+                            <button
+                                onClick={handleSubmit}
+                                type="button"
+                                className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                            >
+                                <span className="text-white">Continue</span>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
+                <div className="lg:w-2/2 w-full mb-10 lg:mb-0">
+                    <div className="wallet w-full md:p-8 p-4 h-full min-h-[590px] bg-white dark:bg-dark-white rounded-2xl shadow">
+                        <h2 className='text-gray-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
+                        {/* <p className='text-base text-gray-600 dark:text-white'>Activity Report</p> */}
+                        {payment.loading ?
+                            <LoadingSpinner size='16' color='sky-blue' />
+                            :
+                            <RecentActivityTable  payment={payment}/>
+                        }
+                    </div>
                 </div>
             </div>
         </div>

src/components/MyWallet/Balance.jsx

@@ -33,32 +33,39 @@ function Balance({wallet, coupon}) {
                         :
                         wallet.data.length ?
                         wallet.data.map((item, index)=> (
-                        <div key={index} className="md:flex items-center flex-wrap my-3 border-t-2 border-slate-400">
-                            <div className='text-slate-900 w-full md:w-1/2 flex space-x-3 items-start justify-start'>
-                                <div className='balance-info'>
-                                    <p className='py-2'></p>
-                                    <span className='text-xl text-dark-gray dark:text-white'>{item.description}</span>
-                                    <p className='text-base text-slate-500'>{item.symbol}</p>
+                        <div key={index} className="p-3 md:flex items-center flex-wrap my-3 border-t-2 border-slate-400 wallet-box">
+                                <div className='text-slate-900 w-full md:w-1/2 flex space-x-3 items-start justify-start'>
+                                    <div className='balance-info bal-col1'>
+                                        <p className='py-2'></p>
+                                        <span className='text-xl text-dark-gray dark:text-white'><b>{item.description}</b></span>
+                                        <p className='text-base text-slate-500'>{item.symbol}</p>
+                                    </div>
+                                    <div className='balance-info'>
+                                        <p className='py-2'>Balance</p>
+                                        <span className='py-1 px-2 bg-green-100 text-green-500 rounded-lg'>{item.symbol}{(item.amount*0.01).toFixed(2)}</span>
+                                    </div>
+                                    <div className='balance-info'>
+                                        <p className='py-2'>Escrow</p>
+                                        <span className='py-1 px-2 bg-red-100 text-red-500 rounded-lg'>{item.symbol}{(item.escrow*0.01).toFixed(2)}</span>
+                                    </div>
                                 </div>
-                                <div className='balance-info'>
-                                    <p className='py-2'>Balance</p>
-                                    <span className='text-sm py-1 px-2 bg-green-100 text-green-500 rounded-lg'>{item.symbol}{(item.amount*0.01).toFixed(2)}</span>
-                                </div>
-                                <div className='balance-info'>
-                                    <p className='py-2'>Escrow</p>
-                                    <span className='text-sm py-1 px-2 bg-red-100 text-red-500 rounded-lg'>{item.symbol}{(item.escrow*0.01).toFixed(2)}</span>
-                                </div>
-                            </div>
 
-                            <div className='w-full my-2 md:my-0 md:w-1/2 flex space-x-2 items-center justify-start md:justify-end'>
-                                {
-                                    item.action_type != 'AC_AD_FD_ONLY' ?
-                                        <Link to='transfer-fund' className='lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]
-                                                                   items-center rounded-full relative  bg-purple pr-1.5 pl-4 lg:text-xl text-lg font-bold text-white'>Transfer</Link>:''
-                                }
-                                <Link to='add-fund' className='lg:flex hidden user-balance cursor-pointer lg:w-[152px] w-[150px] h-[48px]
-                                                                   items-center rounded-full relative  bg-purple pr-1.5 pl-4 lg:text-xl text-lg font-bold text-white'>+Add Credit</Link>
-                            </div>
+                                <div className='w-full my-2 md:my-0 md:w-1/2 flex space-x-2 items-center justify-start md:justify-end'>
+                                    {
+                                        item.action_type != 'AC_AD_FD_ONLY' ?
+                                            <Link to='transfer-fund' className='px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[48px] rounded-full relative  bg-purple lg:text-xl text-lg font-bold text-white'>Transfer</Link>:''
+                                    }
+                                    <Link to='add-fund' className='px-2 py-1 flex items-center gap-2 user-balance cursor-pointer h-[48px] rounded-full relative  bg-green lg:text-xl text-lg font-bold text-white'>
+                                        <span className="">
+                                            <svg xmlns="http://www.w3.org/2000/svg" width="38"
+                                                height="38" viewBox="0 0 42 42" fill="none"><path
+                                                d="M21 0C16.8466 0 12.7865 1.23163 9.33303 3.53914C5.8796 5.84665 3.18798 9.1264 1.59854 12.9636C0.00909901 16.8009 -0.406771 21.0233 0.403518 25.0969C1.21381 29.1705 3.21386 32.9123 6.15077 35.8492C9.08767 38.7861 12.8295 40.7862 16.9031 41.5965C20.9767 42.4068 25.1991 41.9909 29.0364 40.4015C32.8736 38.812 36.1534 36.1204 38.4609 32.667C40.7684 29.2135 42 25.1534 42 21C41.994 15.4323 39.7796 10.0944 35.8426 6.15741C31.9056 2.22045 26.5677 0.00602189 21 0ZM28 22.75H22.75V28C22.75 28.4641 22.5656 28.9092 22.2374 29.2374C21.9093 29.5656 21.4641 29.75 21 29.75C20.5359 29.75 20.0908 29.5656 19.7626 29.2374C19.4344 28.9092 19.25 28.4641 19.25 28V22.75H14C13.5359 22.75 13.0908 22.5656 12.7626 22.2374C12.4344 21.9092 12.25 21.4641 12.25 21C12.25 20.5359 12.4344 20.0907 12.7626 19.7626C13.0908 19.4344 13.5359 19.25 14 19.25H19.25V14C19.25 13.5359 19.4344 13.0908 19.7626 12.7626C20.0908 12.4344 20.5359 12.25 21 12.25C21.4641 12.25 21.9093 12.4344 22.2374 12.7626C22.5656 13.0908 22.75 13.5359 22.75 14V19.25H28C28.4641 19.25 28.9093 19.4344 29.2374 19.7626C29.5656 20.0907 29.75 20.5359 29.75 21C29.75 21.4641 29.5656 21.9092 29.2374 22.2374C28.9093 22.5656 28.4641 22.75 28 22.75Z"
+                                                fill="white"></path>
+                                            </svg>
+                                        </span>
+                                        <span className='text-white'>Add Credit</span>
+                                    </Link>
+                                </div>
                         </div>
                         ))
                         :

src/components/MyWallet/ConfirmAddFund.jsx

@@ -129,7 +129,7 @@ function ConfirmAddFund({ payment }) {
             <div className="md:p-8 p-4 add-fund-btn flex justify-end items-center py-4">
               <FlutterWaveButton
                 {...fwConfig}
-                className="text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-md"
+                className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
               />
             </div>
           </div>
@@ -137,7 +137,7 @@ function ConfirmAddFund({ payment }) {
       )}
 
       <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
-        <div className="wallet w-full  md:p-8 p-4 h-full max-h-[600px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+        <div className="wallet w-full  md:p-8 p-4 h-full min-h-[600px] bg-white dark:bg-dark-white rounded-2xl shadow">
           <h2 className="text-gray-900 dark:text-white text-xl lg:text-2xl font-medium">
             Recent Activity
           </h2>

src/components/OffersInterest/ManageInterestOffer.jsx

@@ -1,18 +1,24 @@
 import React, { useEffect, useState } from "react";
+import { useNavigate } from "react-router-dom";
 import Layout from "../Partials/Layout";
 import CommonHead from "../UserHeader/CommonHead";
-import { useNavigate } from "react-router-dom";
 
+import usersService from "../../services/UsersService";
 import { handlePagingFunc } from "../Pagination/HandlePagination";
 import PaginatedList from "../Pagination/PaginatedList";
-
+import LoadingSpinner from "../Spinners/LoadingSpinner";
 import OthersInterestedTable from "./OthersInterestedTable";
 
 export default function ManageInterestOffer(props) {
     const navigate = useNavigate()
+    const apiCall = new usersService()
+
+    let [redirectTime, setRedirectTime] = useState(5)
 
     let [tab, setTab] = useState("info"); //message STATE FOR SWITCHING BETWEEN TABS
 
+    let [requestStatus, setRequestStatus] = useState({loading: false, status: false, message: '', processType: ''})
+
     const messageList = {data: [1,2,3,4,5,6]} // TO BE REMOVED AND REPLACE WITH REAL MESSAGE FROM API CALL
     const [currentPage, setCurrentPage] = useState(0);
     const indexOfFirstItem = Number(currentPage);
@@ -28,6 +34,36 @@ export default function ManageInterestOffer(props) {
         setValue(value);
     };
 
+    //FUNCTION TO ACCEPT/REJECT OFFER INTEREST
+    const interestOfferProcess = ({target:{name}}) => {
+        setRequestStatus(prev => ({...prev, loading: true, processType: name}))
+        let reqData = { // API PAYLOADS
+            proc: name.toUpperCase(),
+            client_uid : props.offerDetails?.client_uid,
+            offer_code : props.offerDetails?.offer_code,
+            offer_uid: props.offerDetails?.offer_uid,
+        }
+        apiCall.offersInterestProc(reqData).then(res => {
+            if(res.status != 200 || res.data.internal_return < 0){
+                setRequestStatus({loading: false, status: false, message: 'Unable to complete request', processType: ''})
+                return
+            }
+            setInterval(() => {  // SETS REDIRECT COUNT DOWN
+                setRedirectTime(prev => prev - 1)
+            }, 1000);
+            setRequestStatus({loading: false, status: true, message: `Offer ${name}ed`, processType: ''})
+            setTimeout(()=>{
+                navigate('/offer-interest', {replace: true})
+            },5000)
+        }).catch(err => {
+            setRequestStatus({loading: false, status: false, message: 'Opps! something went wrong. Try again', processType: ''})
+        }).finally(()=>{
+            setTimeout(()=>{
+                setRequestStatus({loading: false, status: false, message: '', processType: ''})
+            },5000)
+        })
+    }
+
     useEffect(()=>{
         // run API to get message to replace message array above, add reload variable as dependence array
     },[])
@@ -188,19 +224,58 @@ export default function ManageInterestOffer(props) {
 
                             {/* BUTTON section */}
                             <div className="p-4 w-full min-h-full bg-sky-100 dark:bg-dark-gray col-span-1">
-                                <div className="w-full h-full flex flex-col justify-center items-center gap-10">
-                                    <button
-                                        type="button"
-                                        className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                                    >
-                                        <span className="text-white">Accept</span>
-                                    </button>
-                                    <button
-                                        type="button"
-                                        className="px-2 py-1 h-11 flex justify-center items-center border-gradient text-base rounded-full text-white"
-                                    >
-                                        <span className="text-gradient">Reject</span>
-                                    </button>
+                                <div className="w-full h-full">
+                                    <div className="mt-0 sm:mt-10 flex sm:flex-col justify-center items-center gap-10">
+                                        {requestStatus.loading && requestStatus.processType == 'accept' ?
+                                            <LoadingSpinner color='sky-blue' size='10' />
+                                        :    
+                                            <button
+                                                type="button"
+                                                name='accept'
+                                                disabled={requestStatus.loading}
+                                                onClick={interestOfferProcess}
+                                                className="px-2 py-1 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                                            >
+                                            Accept
+                                            </button>
+                                        }
+
+                                        {requestStatus.loading && requestStatus.processType == 'reject' ?
+                                            <LoadingSpinner color='sky-blue' size='10' />
+                                        :
+                                            <button
+                                                type="button"
+                                                name='reject'
+                                                disabled={requestStatus.loading}
+                                                onClick={interestOfferProcess}
+                                                className="px-2 py-1 h-11 flex justify-center items-center border-gradient text-base rounded-full text-black"
+                                            >
+                                            Reject
+                                            </button>
+                                        }
+                                    </div>
+
+                                    {/* ERROR DISPLAY */}
+                                    <div className="w-full">
+                                    {/* error or success display */}
+                                    {requestStatus.message != "" && requestStatus.processType != 'sendmeassge' &&
+                                        (!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} redirecting.... ${redirectTime}sec`}
+                                            </div>
+                                        )
+                                        ))}
+                                    </div>
+                                    {/* End of error or success display */}
                                 </div>
                             </div>
                             {/* END of BUTTON section */}

src/components/OffersInterest/OffersInterestTable.jsx

@@ -29,7 +29,7 @@ export default function OffersInterestTable({offerInterestList, className}) {
 
     return (
         <div
-            className={`update-table w-full p-8 bg-white dark:bg-dark-white rounded-2xl section-shadow min-h-[520px] ${
+            className={`update-table w-full my-8 p-8 bg-white dark:bg-dark-white rounded-2xl section-shadow min-h-[520px] ${
                 className || ""
             }`}
         >

src/components/Partials/Header.jsx

@@ -827,7 +827,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                         type="button"
                         className="w-[122px] h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
                       >
-                        Cannected
+                        Connected
                       </button>
                     </div>
                   </div>

src/index.css

@@ -9,7 +9,16 @@
   font-family: "Product Sans";
   src: url("./assets/fonts/Product Sans Bold.ttf");
 }
-
+.wallet-box{
+  background-color: aliceblue;
+  border-radius: 20px;
+}
+.bal-col1{
+  width: 110px;
+}
+.bg-green{
+  background-color: darkgreen;
+}
 .referral{
   margin-bottom: 20px
 }
@@ -883,4 +892,9 @@ TODO: Responsive ===========================
 
 .job-popup{
   top: 55px;
+}
+
+.addJob-popup{
+  top: 30px;
+  height: 55rem !important;
 }

src/services/UsersService.js

@@ -666,6 +666,18 @@ class usersService {
     return this.postAuxEnd("/offersinterestlist", postData);
   }
 
+    // END POINT FOR PROCESSING OFFER INTEREST
+    offersInterestProc(reqData) {
+      var postData = {
+        uid: localStorage.getItem("uid"),
+        member_id: localStorage.getItem("member_id"),
+        sessionid: localStorage.getItem("session_token"),
+        action: 13034,
+        ...reqData
+      };
+      return this.postAuxEnd("/offersinterestproc", postData);
+    }
+
    // END POINT FOR WORKER TO MARK TASK AS COMPLETED
    workerJobAction(reqData) {
     var postData = {

src/views/AddJobPage.jsx

@@ -1,14 +1,40 @@
-import React from 'react'
-import AddJob from '../components/AddJob/AddJob'
-import Layout from '../components/Partials/Layout'
+import React from "react";
+import AddJob from "../components/AddJob/AddJob";
+import ModalCom from "../components/Helpers/ModalCom";
 
-
-function AddJobPage() {
+function AddJobPage({ action, situation }) {
   return (
-    <Layout>
-        <AddJob />
-    </Layout>
-  )
+    <ModalCom action={action} situation={situation} className="addJob-popup">
+      <div className="lg:w-[600px] w-full h-full lg:overflow-hidden lg:rounded-2xl bg-white dark:bg-dark-white  ">
+        <div className="heading flex justify-between items-center py-6  md:px-[30px] px-[23px] border-b dark:border-[#5356fb29]  border-light-purple dark:border-[#5356fb29] ">
+          <p className="text-26 font-bold text-dark-gray dark:text-white tracking-wide">
+            Create New Job
+          </p>
+          <button type="button" onClick={action}>
+            <svg
+              width="32"
+              height="32"
+              viewBox="0 0 32 32"
+              fill="none"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                d="M32 14.3645C32 15.5022 32 16.6399 32 17.7779C31.8143 17.8408 31.8787 18.0048 31.8565 18.1334C30.6952 24.8402 26.8853 29.2664 20.4091 31.362C19.4672 31.6668 18.4669 31.7917 17.4935 31.9997C16.3558 31.9997 15.2181 31.9997 14.0801 31.9997C13.8574 31.741 13.5279 31.7984 13.2475 31.7416C6.90872 30.4552 2.74424 26.7311 0.684152 20.6107C0.386668 19.7268 0.396442 18.7733 0 17.9199C0 16.6399 0 15.3598 0 14.0798C0.259 13.884 0.190585 13.5694 0.240675 13.3162C1.52285 6.84244 5.35655 2.66392 11.5936 0.623067C12.4549 0.34116 13.3785 0.343909 14.2221 0C15.3125 0 16.4029 0 17.4932 0C17.525 0.110258 17.6111 0.120948 17.7089 0.130417C24.2666 0.77242 29.8064 5.52819 31.449 11.9351C31.6552 12.739 31.8174 13.5542 32 14.3645ZM29.3431 16.0699C29.3718 8.68538 23.4154 2.66942 16.0684 2.66178C8.69759 2.65445 2.66972 8.58489 2.65353 15.8601C2.63704 23.2563 8.52319 29.2979 15.7868 29.3404C23.2862 29.3846 29.3144 23.4832 29.3431 16.0699Z"
+                fill="#374557"
+                fillOpacity="0.6"
+              />
+              <path
+                d="M14.1604 16.0221C12.3843 14.2567 10.6724 12.5534 8.95837 10.8525C8.53353 10.431 8.23421 9.97162 8.46175 9.34031C8.83956 8.29209 9.95101 8.07371 10.794 8.906C12.3611 10.4536 13.9344 11.9963 15.4529 13.5909C15.9202 14.0817 16.1447 14.0005 16.5662 13.5643C18.0961 11.9804 19.6617 10.4307 21.2282 8.88248C22.0596 8.06058 23.208 8.30064 23.5522 9.35008C23.7584 9.97865 23.459 10.4383 23.0336 10.8619C21.489 12.3991 19.9531 13.9443 18.4088 15.4815C18.2421 15.6476 18.0408 15.779 17.8188 15.9558C19.629 17.7563 21.366 19.4676 23.0831 21.1987C23.934 22.0567 23.6875 23.2106 22.6072 23.556C21.9658 23.761 21.5223 23.4186 21.1067 23.0023C19.5502 21.444 17.9757 19.9031 16.448 18.3171C16.0616 17.9157 15.8854 17.9811 15.5375 18.3378C13.9835 19.9318 12.399 21.4956 10.8242 23.0692C10.4015 23.4916 9.94887 23.7768 9.30961 23.516C8.27819 23.0948 8.06073 22.0814 8.87591 21.2418C10.0307 20.0528 11.2118 18.8891 12.3895 17.7221C12.9588 17.1577 13.5462 16.6106 14.1604 16.0221Z"
+                fill="#374557"
+                fillOpacity="0.6"
+              />
+            </svg>
+          </button>
+        </div>
+        <AddJob popUpHandler={action} />
+      </div>
+    </ModalCom>
+  );
 }
 
-export default AddJobPage
+export default AddJobPage;

src/views/MyJobsPage.jsx

@@ -4,7 +4,6 @@ import { useSelector } from "react-redux";
 export default function MyJobsPage() {
   let { commonHeadBanner } = useSelector((state) => state.commonHeadBanner);
   const { userJobList } = useSelector((state) => state.userJobList);
-
   return (
     <>
       <MyJobs
@@ -13,4 +12,4 @@ export default function MyJobsPage() {
       />
     </>
   );
-}
+}