Merge branch 'master' into withdraw_steps

.env

@@ -17,7 +17,8 @@ REACT_APP_USERS_ENDPOINT="https://apigate.lotus.g1.wrenchboard.com/svs/user"
 
 #"https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
 
-REACT_APP_SESSION_EXPIRE_MINUTES=5
+REACT_APP_SESSION_EXPIRE_MINUTES=300000
+REACT_APP_SESSION_EXPIRE_CHECKER=60000
 
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
 

src/components/AuthPages/SignUp/index.jsx

@@ -113,7 +113,7 @@ export default function SignUp() {
   return (
     <>
       <div className="layout-wrapper login">
-        <div className="main-wrapper w-full xl:h-screen h-full xl:py-10 py-12">
+        <div className="main-wrapper w-full xl:h-screen h-full xl:py-10 py-12 overflow-y-auto">
           <div className=" h-full">
             <div className="flex-1 flex justify-center items-center">
               <div className="w-full">
@@ -122,7 +122,7 @@ export default function SignUp() {
                     <img src={WrenchBoard} alt="wrenchboard" className="h-10 mx-auto" />
                   </Link>
                 </div>
-                <div className="content-wrapper login shadow-md w-full lg:max-w-[600px] mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px]  rounded-[0.475rem] sm:p-7 p-5">
+                <div className="content-wrapper login shadow-md w-full lg:max-w-[600px] mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px]  rounded-[0.475rem] sm:p-7 p-5 mb-7">
                   <div>
                     <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
                       <h1 className="text-[#181c32] font-semibold dark:text-white mb-3" style={{

src/components/Cards/ActiveJobsCard.jsx

@@ -77,26 +77,27 @@ export default function ActiveJobsCard({
                 </div>
                 <div className="details-area">
                     <div className="product-two-options flex justify-between mb-5 relative">
-                        <div className="status">
+
-                            {datas.isActive && (
+                  {/*      <div className="status">*/}
-                                <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">
+                  {/*          {datas.isActive && (*/}
-                    Active
+                  {/*              <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">*/}
-                  </span>
+                  {/*  Active*/}
-                            )}
+                  {/*</span>*/}
-                        </div>
+                  {/*          )}*/}
+                  {/*      </div>*/}
 
 
-                        <div className=" review flex space-x-2">
+                        {/*<div className=" review flex space-x-2">*/}
-                            <button
+                        {/*    <button*/}
-                                onClick={favoriteHandler}
+                        {/*        onClick={favoriteHandler}*/}
-                                type="button"
+                        {/*        type="button"*/}
-                                className={`w-7 h-7 bg-white    rounded-full flex justify-center items-center  ${
+                        {/*        className={`w-7 h-7 bg-white    rounded-full flex justify-center items-center  ${*/}
-                                    addFavorite ? "text-red-500" : "text-thin-light-gray"
+                        {/*            addFavorite ? "text-red-500" : "text-thin-light-gray"*/}
-                                }`}
+                        {/*        }`}*/}
-                            >
+                        {/*    >*/}
-                                <Icons name="star" />
+                        {/*        <Icons name="star" />*/}
-                            </button>
+                        {/*    </button>*/}
-                        </div>
+                        {/*</div>*/}
                     </div>
 
                     <div className="flex justify-between">

src/components/Cards/AvailableJobsCard.jsx

@@ -0,0 +1,127 @@
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import { toast } from "react-toastify";
+import localImgLoad from "../../lib/localImgLoad";
+import Icons from "../Helpers/Icons";
+
+export default function AvailableJobsCard({
+                                           className,
+                                           datas,
+                                           hidden = false,
+                                       }) {
+    //debugger;
+    const [addFavorite, setValue] = useState(datas.whishlisted);
+    const [options, setOption] = useState(false);
+    const favoriteHandler = () => {
+        if (!addFavorite) {
+            setValue(true);
+            toast.success("Added to Favorite List");
+        } else {
+            setValue(false);
+            toast.warn("Remove to Favorite List");
+        }
+    };
+    return (
+        <div
+            className={`card-style-two w-full h-[426px] p-[20px] bg-white dark:bg-dark-white   rounded-2xl section-shadow ${
+                className || ""
+            }`}
+        >
+            <div className="flex flex-col justify-between w-full h-full">
+                <Link to="/shop-details" className="mb-2.5">
+                    <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+                        {datas.title}
+                    </h1>
+                </Link>
+
+                <div className="card-two-info flex justify-between items-center">
+                    <div className="owned-by flex space-x-2 items-center">
+                        <div>
+                            <p className="text-thin-light-gray text-sm leading-3">Added</p>
+                            <p className="text-base   text-dark-gray dark:text-white">
+                                {datas.offer_added}
+                            </p>
+                        </div>
+                    </div>
+                    <div className="w-[1px] bg-light-purple dark:bg-dark-light-purple  h-7"></div>
+                    <div className="created-by flex space-x-2 items-center flex-row-reverse">
+                        <div>
+                            <p className="text-thin-light-gray text-sm leading-3 text-right">
+                                Expires
+                            </p>
+                            <p className="text-base text-dark-gray dark:text-white text-right">
+                                {datas.expire}
+                            </p>
+                        </div>
+                    </div>
+                </div>
+                <div className="thumbnail-area w-full">
+                    <div
+                        className="w-full h-[236px] p-6  rounded-xl overflow-hidden"
+                        style={{
+                            background: `url(${localImgLoad(
+                                `images/${datas.thumbnil}`
+                            )}) 0% 0% / cover no-repeat`,
+                        }}
+                    >
+                        <div className="flex justify-center">
+                            {datas.description}
+                        </div>
+
+
+
+
+
+                    </div>
+
+                </div>
+                <div className="details-area">
+                    <div className="product-two-options flex justify-between mb-5 relative">
+
+                        {/*      <div className="status">*/}
+                        {/*          {datas.isActive && (*/}
+                        {/*              <span className="text-xs px-3 py-1.5 tracking-wide rounded-full bg-gold text-white">*/}
+                        {/*  Active*/}
+                        {/*</span>*/}
+                        {/*          )}*/}
+                        {/*      </div>*/}
+
+
+                        {/*<div className=" review flex space-x-2">*/}
+                        {/*    <button*/}
+                        {/*        onClick={favoriteHandler}*/}
+                        {/*        type="button"*/}
+                        {/*        className={`w-7 h-7 bg-white    rounded-full flex justify-center items-center  ${*/}
+                        {/*            addFavorite ? "text-red-500" : "text-thin-light-gray"*/}
+                        {/*        }`}*/}
+                        {/*    >*/}
+                        {/*        <Icons name="star" />*/}
+                        {/*    </button>*/}
+                        {/*</div>*/}
+                    </div>
+
+                    <div className="flex justify-between">
+                        <div className="flex items-center space-x-2">
+                            <div>
+                                <p className="font-bold text-xl tracking-wide line-clamp-1   text-dark-gray dark:text-white">
+                                    {datas.price*0.01}{datas.currency} | {datas.timeline_days} day(s)
+                                </p>
+                                <p className="text-sm text-lighter-gray">
+                                    ( {datas.offer_code})
+                                </p>
+                            </div>
+                        </div>
+                        <div>
+                            <button
+                                type="button"
+                                className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
+                            >
+                                View
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    );
+}

src/components/MarketPlace/MainSection.jsx

@@ -1,8 +1,9 @@
 import React, { useEffect, useState } from "react";
 //import ProductCardStyleTwo from "../Cards/ProductCardStyleTwo";
 import DataIteration from "../Helpers/DataIteration";
-import SearchCom from "../Helpers/SearchCom";
+// import SearchCom from "../Helpers/SearchCom";
-import ActiveJobsCard from "../Cards/ActiveJobsCard";
+// import ActiveJobsCard from "../Cards/ActiveJobsCard";
+import AvailableJobsCard from "../Cards/AvailableJobsCard";
 
 export default function MainSection({ className, marketPlaceProduct }) {
   const [tab, setTab] = useState("explore");
@@ -98,7 +99,7 @@ export default function MainSection({ className, marketPlaceProduct }) {
               endLength={products?.length}
             >
               {({ datas }) => (
-                <ActiveJobsCard key={datas.id} datas={datas} />
+                <AvailableJobsCard key={datas.id} datas={datas} />
               )}
             </DataIteration>
           </div>

src/components/MyWallet/TransferFund.jsx

@@ -1,19 +1,58 @@
-import React, {useState} from 'react'
+import React, {useEffect, useState} from 'react'
 import { Link } from 'react-router-dom'
 import RecentActivityTable from './WalletComponent/RecentActivityTable'
 import LoadingSpinner from '../Spinners/LoadingSpinner'
 
-function TransferFund({payment}) {
+import usersService from '../../services/UsersService'
+
+function TransferFund({payment, wallet}) {
+    const apiCall = new usersService()
+
+    let [newFee, setNewFee] = useState(false)
+
+    let [recepients, setRecipients] = useState({ // FOR COUPON HISTORY
+        loading: true,
+        data: [],
+        error: false
+    })
+
+    let [sendMoneyFee, setSendMoneyFee] = useState({fee: 0, total: 0}) // HOLD THE VALUE FOR SEND MONEY FEE
 
     //STATE FOR CONTROLLED INPUTS
     let [inputs, setInputs] = useState({
         amount: '0',
-        fee: '0',
         recipient: '',
-        total: '0',
         comment: ''
     })
 
+    //FUNCTION TO GET RECIPIENT LIST
+    const getRecipients = ()=>{
+        apiCall.getRecipient().then((res)=>{
+            if(res.data.internal_return < 0){ // success but no data
+                setRecipients(prev => ({...prev, loading: false}))
+                return
+            }
+            setRecipients(prev => ({...prev, loading: false, data: res.data.result_list}))
+        }).catch((error)=>{
+            setRecipients(prev => ({...prev, loading: false, error: true}))
+        })
+    }
+
+    //FUNCTION TO GET SEND MONEY FEE
+    const getSendMoneyFee = ()=>{
+        let {amount} = inputs
+        if(Number(amount) <= 0 || amount=='' || isNaN(amount)){
+            setSendMoneyFee({fee: 0, total: 0})
+            return
+        }
+        apiCall.getSendMoneyFee(Number(amount)).then((res)=>{
+            setSendMoneyFee({fee: res.data.processing_fee, total: res.data.total_amount})
+        }).catch((error)=>{
+            setSendMoneyFee({fee: 0, total: 0})
+        })
+    }
+
+
     // FUNCTION TO HANDLE INPUT CHANGE
     const handleChange = ({target:{name, value}}) => {
         setInputs(prev => ({...prev, [name]:value}))
@@ -23,22 +62,41 @@ function TransferFund({payment}) {
     const handleSubmit = (e) => {
         e.preventDefault();
 
-        //valid inputs before submitting. Just for texting remove later
+        //valid inputs before submitting. Just for texting remove later. check amoutn to be number
     
         setInputs({
             amount: '0',
-            fee: '0',
             recipient: '',
-            total: '0',
             comment: ''
         })
     }
+
+    useEffect(()=>{
+        getRecipients()
+        getSendMoneyFee()
+    },[newFee])
     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 md:p-8 p-4 bg-white dark:bg-dark-white rounded-2xl shadow">
-                   <form className='transfer-fund-info'>
+                   <form className='transfer-fund-info' onSubmit={handleSubmit}>
-                        <h2 className='my-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Withdraw from Naira Wallet : &#8358;0.00</h2>
+                        {wallet.loading ?
+                        <LoadingSpinner size='8' color='sky-blue' />
+                        :
+                        wallet.data.length ? 
+                        <h2 className='my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>
+                        {wallet.data.map(item => {
+                            if(item.description == 'Naira'){
+                                return `Withdraw from Naira Wallet : ${item.symbol}${(item.amount*1).toFixed(2)}`
+                            }
+                        })}
+                        </h2>
+                        :
+                        wallet.error ? 
+                        <h2 className='my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Opps! An Error Occured</h2>
+                        :
+                        <h2 className='my-4 py-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>No Wallet Information Found!</h2>
+                        }
                         <div className='my-3 md:flex items-center justify-between space-x-2'>
                             <div className='transfer-input w-full md:w-1/2'>
                                 <label className='w-full text-slate-600 text-lg'>Amount <span className='text-red-500'>*</span></label>
@@ -49,31 +107,33 @@ function TransferFund({payment}) {
                                     placeholder='Amount' 
                                     required
                                     onChange={handleChange}
+                                    onMouseEnter={()=>{setNewFee(false)}}
+                                    onMouseLeave={()=>{setNewFee(true)}}
                                     />
                             </div>
                             <div className='transfer-input w-full md:w-1/2'>
                                 <label className='w-full text-slate-600 text-lg'>Fee <span className='text-red-500'>*</span></label>
-                                <input className='w-full p-3 text-lg text-right bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
+                                <input className='w-full p-3 text-lg text-right bg-slate-100 opacity-50 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                                    value={inputs.fee} 
+                                    value={sendMoneyFee.fee} 
                                     name='fee' 
                                     type="text" 
                                     placeholder='Fee' 
                                     required
-                                    onChange={handleChange}
+                                    disabled
                                     />
                             </div>
                         </div>
 
                         <div className='my-3 md:flex items-center justify-end space-x-2'>
                             <div className='transfer-input w-full md:w-1/2'>
-                                <label className='w-full text-slate-600 text-lg'>Amount <span className='text-red-500'>*</span></label>
+                                <label className='w-full text-slate-600 text-lg'>Total <span className='text-red-500'>*</span></label>
-                                <input className='w-full p-3 text-lg text-right bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
+                                <input className='w-full p-3 text-lg text-right bg-slate-100 opacity-50 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                                    value={inputs.total} 
+                                    value={sendMoneyFee.total} 
                                     name='total' 
                                     type="text" 
                                     placeholder='Total' 
                                     required
-                                    onChange={handleChange}
+                                    disabled
                                     />
                             </div>
                         </div>
@@ -87,8 +147,23 @@ function TransferFund({payment}) {
                                     </label>
                                     <Link to='add-recipient' className='mx-1 text-base text-white p-3 bg-[orange] rounded-md hover:opacity-80'>Add New</Link>
                                 </div>
-                                <select className='mt-2 w-full p-3 text-lg bg-white rounded-md border border-slate-300 outline-0' name='recipient' onChange={handleChange}>
+                                <select className='mt-2 w-full p-3 text-lg bg-white rounded-md border border-slate-300 outline-0' value={inputs.recipient} name='recipient' onChange={handleChange}>
-                                    <option className='text-slate-500 text-lg' value="">Select...</option>
+                                    {recepients.loading ?
+                                     <option className='text-slate-500 text-lg' value="">Loading...</option>
+                                     :
+                                     recepients.data.length ?
+                                     <> 
+                                     <option className='text-slate-500 text-lg' value="">Select...</option>
+                                     {recepients.data.map((item, index)=>(
+                                        <option key={index} value={item.account_no} className='text-slate-500 text-lg'>{item.recipient}</option>
+                                     ))}
+                                     </>
+                                     :
+                                     recepients.error ?
+                                     <option className='text-slate-500 text-lg' value="">Could'nt Load, try again!</option>
+                                     :
+                                     <option className='text-slate-500 text-lg' value="">No Recipient Found! Click Add to Add</option>
+                                    }
                                 </select>
                             </div>
                         </div>
@@ -108,7 +183,7 @@ function TransferFund({payment}) {
                         </div>
 
                         <div className='transfer-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>
+                            <button className='text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-md'>Continue</button>
                         </div>
                    </form>
                 </div>
@@ -118,22 +193,6 @@ function TransferFund({payment}) {
                 <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">
                     <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
                     <p className='text-base text-slate-500 dark:text-white'>Activity Report</p>
-                    {/* <table className="wallet-activity w-full table-auto border-collapse text-left">
-                        <thead className='border-b-2'>
-                            <tr className='text-slate-600'>
-                            <th className="py-3">Date</th>
-                            <th className="py-3">Recipient</th>
-                            <th className="py-3">Amount/FeeConf/Status</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr className='text-slate-500'>
-                                <td className="py-3">Item</td>
-                                <td className="py-3">Item</td>
-                                <td className="py-3">Item</td>
-                            </tr>
-                        </tbody>
-                    </table> */}
                     {payment.loading ?
                     <LoadingSpinner size='16' color='sky-blue' />
                     :

src/components/MyWallet/Wallet.jsx

@@ -55,7 +55,6 @@ const WalletRoutes = () => {
                 setWalletList(prev => ({...prev, loading: false}))
                 return
             }
-            console.log('wallet', res)
             setWalletList(prev => ({...prev, loading: false, data: res.data.result_list}))
         }).catch((error)=>{
             setWalletList(prev => ({...prev, loading: false, error: true}))
@@ -82,6 +81,7 @@ const WalletRoutes = () => {
                 setPurchaseHistory(prev => ({...prev, loading: false}))
                 return
             }
+            // console.log('purchase',res.data)
             setPurchaseHistory(prev => ({...prev, loading: false, data: res.data.result_list}))
         }).catch((error)=>{
             setPurchaseHistory(prev => ({...prev, loading: false, error: true}))
@@ -111,7 +111,7 @@ const WalletRoutes = () => {
         <Routes>
             <Route element={<Wallet />}>
                 <Route path='add-fund' element={<AddFund payment={paymentHistory} />} />
-                <Route path='transfer-fund' element={<TransferFund payment={paymentHistory} />} />
+                <Route path='transfer-fund' element={<TransferFund payment={paymentHistory} wallet={walletList} />} />
                 <Route index element={<Balance payment={paymentHistory} purchase={purchaseHistory} coupon={couponHistory} wallet={walletList} />} />
                 <Route path='*' element={<Navigate to='/' />} />
                 <Route path='transfer-fund/add-recipient' element={<AddRecipient />} />

src/components/MyWallet/WalletComponent/PurchasesTable.jsx

@@ -16,10 +16,10 @@ function PurchasesTable({purchase}) {
         <tbody>
             {purchase.data.map((item, index) => (
             <tr key={index} className='text-slate-500'>
-                <td className="p-2">{item.trx_date}</td>
+                <td className="p-2">{item.added_date}</td>
-                <td className="p-2" dangerouslySetInnerHTML={{__html:item.recipient}}></td>
+                <td className="p-2">{item.confirmation}</td>
                 <td className="p-2">{item.amount}</td>
-                <td className="p-2">{item.status}</td>
+                <td className="p-2">{item.fee}</td>
             </tr>
             ))}
         </tbody>

src/middleware/AuthRoute.jsx

@@ -1,7 +1,55 @@
-import { Navigate, Outlet } from "react-router-dom";
+import { useEffect, useState } from "react";
+import { Navigate, Outlet, useLocation, useNavigate } from "react-router-dom";
 
 const AuthRoute = ({ redirectPath = "/login", children }) => {
+  const [lastActivityTime, setLastActivityTime] = useState(Date.now());
   const isLogin = localStorage.getItem("email");
+
+  const navigate = useNavigate();
+  const { pathname } = useLocation();
+
+
+  //Removing Data stored at localStorage after session expires
+  const expireSession = () => {
+    localStorage.removeItem("email");
+    localStorage.removeItem('session_token');
+    localStorage.removeItem('firstname');
+    localStorage.removeItem('member_id');
+    localStorage.removeItem('lastname');
+    localStorage.removeItem('state');
+    localStorage.removeItem('last_login');
+    localStorage.removeItem('uid');
+    localStorage.removeItem('session');
+    localStorage.removeItem('city');
+    localStorage.removeItem('country');
+    localStorage.removeItem('loglevel');
+    localStorage.removeItem('zip_code');
+    localStorage.removeItem('added');
+    navigate("/login", { replace: true }); // redirects user to login page after session expires
+  };
+
+  const checkInactivity = setInterval(() => {
+    if (Date.now() - lastActivityTime > process.env.REACT_APP_SESSION_EXPIRE_MINUTES) {
+      expireSession()
+    }
+  }, process.env.REACT_APP_SESSION_EXPIRE_CHECKER) // Checks for inactivity every minute
+
+  // Reset last activity time on user input
+  const resetTime = () => {
+    setLastActivityTime(Date.now());
+  }
+  window.addEventListener('mousemove', resetTime)
+  window.addEventListener('keydown', resetTime)
+
+  useEffect(() => {
+    // cleaning up listeners
+    return () => {
+      clearInterval(checkInactivity)
+      window.removeEventListener('mousemove', resetTime)
+      window.removeEventListener('keydown', resetTime)
+    }
+  }, [pathname, lastActivityTime])
+
   if (!isLogin) {
     return <Navigate to={redirectPath} replace />;
   }

src/services/UsersService.js

@@ -140,6 +140,31 @@ class usersService {
         return this.postAuxEnd("/couponpending", postData);
     }
 
+    // API FUNCTION TO GET COUPON HISTORY
+    getRecipient(){
+        var postData = {
+            uid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            page:1,
+            limit :20,
+            action: 11175
+        };
+        return this.postAuxEnd("/recipients", postData);
+    }
+
+    // API FUNCTION TO GET SEND MONEY FEE
+    getSendMoneyFee(amount){
+        var postData = {
+            uid: localStorage.getItem("uid"),
+            member_id: localStorage.getItem("member_id"),
+            sessionid: localStorage.getItem("session_token"),
+            amount,
+            action: 33025
+        };
+        return this.postAuxEnd("/sendmoneyfee", postData);
+    }
+
     // API FUNCTION TO GET COUPON HISTORY
     getCouponHx(){
         var postData = {