From 2aa1219ea90311c15c933a4a0afd5925b73b11c3 Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Mon, 24 Jul 2023 06:15:22 +0100
Subject: [PATCH 1/7] updated payload for new account

---
 .../MyWallet/Popup/ConfirmNairaWithdraw.jsx   | 31 +++++++++++++------
 .../MyWallet/Popup/NairaWithdraw.jsx          |  2 --
 src/services/UsersService.js                  |  1 -
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx b/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx
index 0452182..8b392a0 100644
--- a/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx
+++ b/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx
@@ -22,7 +22,6 @@ function ConfirmNairaWithdraw({
     loading: false,
     status: false,
   });
-  let [pageLoading, setPageLoading] = useState(true);
 
   //FUNCTION TO HANDLE SUBMIT
   const handleSubmit = () => {
@@ -35,15 +34,17 @@ function ConfirmNairaWithdraw({
 
     if (state?.choice === "prev") {
       reqData.recipient_uid = state.details?.recipient_uid;
+      reqData.mode = 100;
     }
 
     if (state?.choice === "new") {
-      reqData.account_no = state?.accountNumber;
-      reqData.account_type = state?.accountType;
-      reqData.bank_uid = state?.bank_uid;
-      reqData.country = state?.country;
-      reqData.state = state?.state;
-      reqData.city = state?.city;
+      reqData.account_no = state?.details?.accountNumber;
+      reqData.account_type = Number(state?.details?.accountType);
+      reqData.bank_uid = state?.details?.bank_uid;
+      reqData.country = state?.details?.country;
+      reqData.state = state?.details?.state;
+      reqData.city = state?.details?.city;
+      reqData.mode = 500;
     }
 
     apiURL
@@ -64,6 +65,16 @@ function ConfirmNairaWithdraw({
               loading: false,
               status: false,
             });
+          } else if (
+            res.data?.status_message
+              ?.toLowerCase()
+              .includes("recipient_add_error")
+          ) {
+            setRequestStatus({
+              message: res.data?.error,
+              loading: false,
+              status: false,
+            });
           } else {
             setRequestStatus({
               message: "Could not perform transaction",
@@ -105,7 +116,7 @@ function ConfirmNairaWithdraw({
     action();
     setShowNairaWithdraw({
       show: true,
-      data: state,
+      data: {},
     });
   };
 
@@ -249,7 +260,9 @@ function ConfirmNairaWithdraw({
                 onClick={state?.choice === "prev" ? getBack : action}
                 className="border-gradient text-base tracking-wide px-4 py-2 rounded-full"
               >
-                <span className="text-gradient">{state?.choice === "prev" ? "Back" : "Cancel"}</span>
+                <span className="text-gradient">
+                  {state?.choice === "prev" ? "Back" : "Cancel"}
+                </span>
               </button>
               <button
                 onClick={handleSubmit}
diff --git a/src/components/MyWallet/Popup/NairaWithdraw.jsx b/src/components/MyWallet/Popup/NairaWithdraw.jsx
index 6cbeb1b..585bb9b 100644
--- a/src/components/MyWallet/Popup/NairaWithdraw.jsx
+++ b/src/components/MyWallet/Popup/NairaWithdraw.jsx
@@ -243,8 +243,6 @@ function NairaWithdraw({
           (item) => item.bank_uid === bank
         );
 
-        console.log(bankDetails);
-
         // Ensure bankDetails is not empty
         if (!bankDetails || bankDetails.length === 0) {
           // Handle the case when bankDetails is empty or undefined
diff --git a/src/services/UsersService.js b/src/services/UsersService.js
index a15fd0a..4236f24 100644
--- a/src/services/UsersService.js
+++ b/src/services/UsersService.js
@@ -480,7 +480,6 @@ class usersService {
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
       action: 33020,
-      mode: 100,
       ...reqData,
     };
     return this.postAuxEnd("/sendmoney", postData);

From 4f8edc399837d6408185eaf212bf96e8ed24b092 Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Mon, 24 Jul 2023 06:28:48 +0100
Subject: [PATCH 2/7] Improved solution for the credit refresh bug

---
 src/components/MyWallet/Popup/CompleteConfirmCredit.jsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
index 6b9d24d..0624c88 100644
--- a/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
+++ b/src/components/MyWallet/Popup/CompleteConfirmCredit.jsx
@@ -2,6 +2,11 @@ import React from "react";
 
 function CompleteConfirmCredit({ onClose, confirmCredit }) {
   const { data } = confirmCredit;
+
+  const backToWallet = () => {
+    onClose();
+    window.location.reload(true);
+  };
   return (
     <div className="logout-modal-body w-full flex flex-col items-center">
       <div className="content-wrapper w-full h-[32rem]">
@@ -99,7 +104,7 @@ function CompleteConfirmCredit({ onClose, confirmCredit }) {
             <div className="md:p-8 p-4 add-fund-btn flex justify-end items-center py-4 gap-4">
               <button
                 className="px-4 h-11 flex justify-center items-center btn-gradient text-white text-base rounded-full w-[100px]"
-                onClick={onClose}
+                onClick={backToWallet}
               >
                 Ok
               </button>

From 6b473b5dc6b1209a7b755483cf1989b3d1abb66a Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Mon, 24 Jul 2023 11:58:09 +0100
Subject: [PATCH 3/7] wallet refresh

---
 .../MyWallet/Popup/ConfirmAddFund.jsx         | 27 ++++++++----
 src/components/MyWallet/Wallet.jsx            | 42 +++++++++----------
 src/components/Partials/Header.jsx            |  3 +-
 3 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
index 10a672a..9f402b3 100644
--- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx
+++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
@@ -1,6 +1,6 @@
 import { FlutterWaveButton, closePaymentModal } from "flutterwave-react-v3";
 import React, { useState } from "react";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import usersService from "../../../services/UsersService";
@@ -99,6 +99,9 @@ function ConfirmAddFund({
       : __confirmData.card;
 
   const apiURL = new usersService();
+
+  const { userDetails } = useSelector((state) => state?.userDetails);
+
   const navigate = useNavigate();
   const dispatch = useDispatch();
 
@@ -112,7 +115,13 @@ function ConfirmAddFund({
     public_key: process.env.REACT_APP_FLUTTERWAVE_APIKEY,
     tx_ref: Date.now(),
     currency: "NGN",
+    amount: Number(__confirmData.amount),
     payment_options: "card,mobilemoney,ussd",
+    customer: {
+      email: userDetails.email,
+      phone_number: userDetails.phone,
+      name: `${userDetails.lastname} ${userDetails.firstname}`,
+    },
     customizations: {
       title: "WrenchBoard",
       description: "Topup Payment",
@@ -132,7 +141,7 @@ function ConfirmAddFund({
 
   const onSuccessPayment = () => {
     setRequestStatus({ message: "", loading: true, status: false });
-    const reqData = { amount: __confirmData?.account, currency: "NGN" };
+    const reqData = { amount: Number(__confirmData?.amount), currency: "NGN" };
 
     apiURL
       .startTopUp(reqData)
@@ -151,9 +160,12 @@ function ConfirmAddFund({
             status: true,
           });
           toast.success("Account Topup was successful");
-          setTimeout(() => {
-            navigate("/my-wallet", { replace: true });
-          }, 1000);
+          onClose()
+          dispatch(tableReload({ type: "WALLETTABLE" }));
+          navigate("/my-wallet", { replace: true });
+          // setTimeout(() => {
+          //   navigate("/my-wallet", { replace: true });
+          // }, 1000);
         }
       })
       .catch((err) => {
@@ -205,6 +217,7 @@ function ConfirmAddFund({
           },
           data: _response,
         }));
+        dispatch(tableReload({ type: "WALLETTABLE" }));
       }, 1500);
     } catch (error) {
       setConfirmCredit((prev) => ({
@@ -256,7 +269,6 @@ function ConfirmAddFund({
       }
       
       setTimeout(() => {
-        dispatch(tableReload({ type: "WALLETTABLE" }));
         setConfirmCredit((prev) => ({
           ...prev,
           show: {
@@ -265,6 +277,7 @@ function ConfirmAddFund({
           },
           data: _response,
         }));
+        dispatch(tableReload({ type: "WALLETTABLE" }));
       }, 1500);
     } catch (error) {
       setConfirmCredit((prev) => ({
@@ -278,8 +291,6 @@ function ConfirmAddFund({
     }
   };
 
-  // console.log(confirmCredit?.data);
-
   return (
     <div className="content-wrapper w-full h-[32rem]">
       <div className="w-full mb-10">
diff --git a/src/components/MyWallet/Wallet.jsx b/src/components/MyWallet/Wallet.jsx
index 0826462..01dcc96 100644
--- a/src/components/MyWallet/Wallet.jsx
+++ b/src/components/MyWallet/Wallet.jsx
@@ -13,7 +13,7 @@ import LoadingSpinner from "../Spinners/LoadingSpinner";
 const WalletBox = lazy(() => import("./WalletBox"));
 
 const WalletRoutes = () => {
-  const apiCall = useMemo(() => new usersService(), []);
+  const apiCall = new usersService();
   const { walletTable } = useSelector((state) => state.tableReload);
   const [walletList, setWalletList] = useState({
     loading: true,
@@ -25,29 +25,23 @@ const WalletRoutes = () => {
     data: [],
   });
 
-  const getWalletList = useCallback(() => {
-    return apiCall
+  const getWalletList = () => {
+    apiCall
       .getUserWallets()
       .then((res) => {
         if (res.data.internal_return < 0) {
           setWalletList({ loading: false, data: [] });
         } else {
-          setWalletList({ loading: true, data: [] });
-
-          setTimeout(
-            () =>
-              setWalletList({ loading: false, data: res.data?.result_list }),
-            500
-          );
+          setWalletList({ loading: false, data: res.data?.result_list });
         }
       })
       .catch(() => {
         setWalletList({ loading: false, data: [] });
       });
-  }, [apiCall]);
+  }
 
-  const getPaymentHistory = useCallback(() => {
-    return apiCall
+  const getPaymentHistory = () => {
+    apiCall
       .getPaymentHx()
       .then((res) => {
         if (res.data.internal_return < 0) {
@@ -59,19 +53,23 @@ const WalletRoutes = () => {
       .catch(() => {
         setPaymentHistory({ loading: false, data: [] });
       });
-  }, [apiCall]);
+  }
 
   useEffect(() => {
-    const fetchData = async () => {
-      await Promise.all([getWalletList(), getPaymentHistory()]);
-    };
+    // const fetchData = async () => {
+    //   await Promise.all([getWalletList(), getPaymentHistory()]);
+    // };
 
-    if (walletList.loading) {
-      fetchData();
-    }
-  }, [walletTable, walletList.loading]);
+    // if (walletList.loading) {
+    //   fetchData();
+    // }
+    getWalletList()
+    getPaymentHistory()
+  }, [walletTable]);
 
-  console.log(walletTable);
+
+
+  console.log('TESTING',walletTable);
   return (
     <Layout>
       <Suspense fallback={<LoadingSpinner size="16" color="sky-blue" />}>
diff --git a/src/components/Partials/Header.jsx b/src/components/Partials/Header.jsx
index cbb8156..8a9e4f4 100644
--- a/src/components/Partials/Header.jsx
+++ b/src/components/Partials/Header.jsx
@@ -26,6 +26,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
   const [moneyPopup, setPopup] = useToggle(false);
   const darkMode = useContext(DarkModeContext);
   const { userDetails } = useSelector((state) => state?.userDetails);
+  const { walletTable } = useSelector((state) => state.tableReload); // DETERMINES WHEN WALLET RELOADS
   const [myWalletList, setMyWalletList] = useState([]);
   const api = useMemo(() => new usersService(), []);
   const dispatch = useDispatch();
@@ -44,7 +45,7 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
   };
   useEffect(() => {
     getMyWalletList();
-  }, []);
+  }, [walletTable]);
 
   const handlerBalance = () => {
     setbalanceValue.toggle();

From 71f799d157261a0a5450f0973cc7ae0b5a577c9e Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Mon, 24 Jul 2023 15:01:03 +0100
Subject: [PATCH 4/7] Checked Errors in Wallet Page and made some tiny fixes

---
 src/components/MyWallet/Popup/AddFundDollars.jsx    |  4 ++--
 src/components/MyWallet/Popup/ConfirmAddFund.jsx    | 13 ++++++++++++-
 .../MyWallet/Popup/ConfirmNairaWithdraw.jsx         |  4 ++--
 src/components/MyWallet/Popup/ConfirmTransfer.jsx   |  8 --------
 src/components/MyWallet/Popup/NairaWithdraw.jsx     |  7 ++++---
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/components/MyWallet/Popup/AddFundDollars.jsx b/src/components/MyWallet/Popup/AddFundDollars.jsx
index c933d58..3cc0dd2 100644
--- a/src/components/MyWallet/Popup/AddFundDollars.jsx
+++ b/src/components/MyWallet/Popup/AddFundDollars.jsx
@@ -487,7 +487,7 @@ function AddFundDollars(props) {
 
                             {/* Postal Code and State */}
                             <div className="sm:grid gap-5 grid-cols-3 my-2">
-                              <div className="field w-full mb-6 xl:mb-0 col-span-1">
+                              <div className="field w-full xl:mb-0 col-span-1">
                                 <InputCom
                                   fieldClass="px-6"
                                   spanTag="*"
@@ -521,7 +521,7 @@ function AddFundDollars(props) {
                         </div>
                       </div>
 
-                      <div className="md:px-8 md:pt-4 px-4 pt-2 add-fund-btn flex justify-end items-center gap-3">
+                      <div className="md:px-8 add-fund-btn flex justify-end items-center gap-3">
                         <button
                           className="px-4 py-1 h-11 max-w-[100px] w-full flex justify-center items-center border-gradient text-base rounded-full"
                           onClick={handleClose}
diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
index 9f402b3..b1f12ff 100644
--- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx
+++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
@@ -291,6 +291,17 @@ function ConfirmAddFund({
     }
   };
 
+  const getBack = () => {
+    setConfirmCredit((prev) => ({
+      ...prev,
+      show: {
+        awaitConfirm: { loader: false, state: false },
+        acceptConfirm: { loader: false, state: false },
+      },
+      data: {},
+    }));
+  }
+
   return (
     <div className="content-wrapper w-full h-[32rem]">
       <div className="w-full mb-10">
@@ -359,7 +370,7 @@ function ConfirmAddFund({
           <div className="md:p-8 p-4 add-fund-btn flex justify-end items-center py-4 gap-4">
             <button
               className="px-4 h-11 flex justify-center items-center border-gradient text-base rounded-full"
-              onClick={onClose}
+              onClick={getBack}
             >
               Cancel
             </button>
diff --git a/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx b/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx
index 8b392a0..16d3ffe 100644
--- a/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx
+++ b/src/components/MyWallet/Popup/ConfirmNairaWithdraw.jsx
@@ -89,11 +89,11 @@ function ConfirmNairaWithdraw({
                 loading: false,
                 status: false,
               }),
-            1500
+            5000
           );
         }
         setRequestStatus({
-          message: "transfer successful",
+          message: "Transfer Successful!",
           loading: false,
           status: true,
         });
diff --git a/src/components/MyWallet/Popup/ConfirmTransfer.jsx b/src/components/MyWallet/Popup/ConfirmTransfer.jsx
index 95a4f4c..d6c772e 100644
--- a/src/components/MyWallet/Popup/ConfirmTransfer.jsx
+++ b/src/components/MyWallet/Popup/ConfirmTransfer.jsx
@@ -60,14 +60,6 @@ function ConfirmTransfer({ payment, wallet }) {
       });
   };
 
-  useEffect(() => {
-    // what happens if not state redirect user
-    if (!state) {
-      navigate("/my-wallet/transfer-fund", { replace: true });
-    } else {
-      setPageLoading(false);
-    }
-  }, []);
   return (
     <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
       {pageLoading ? (
diff --git a/src/components/MyWallet/Popup/NairaWithdraw.jsx b/src/components/MyWallet/Popup/NairaWithdraw.jsx
index 585bb9b..6e52033 100644
--- a/src/components/MyWallet/Popup/NairaWithdraw.jsx
+++ b/src/components/MyWallet/Popup/NairaWithdraw.jsx
@@ -1,6 +1,5 @@
 import { Form, Formik } from "formik";
 import React, { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
 import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import ModalCom from "../../Helpers/ModalCom";
@@ -13,7 +12,7 @@ function NairaWithdraw({
   state,
   setShowConfirmNairaWithdraw,
 }) {
-  const apiCall = new usersService(); 
+  const apiCall = new usersService();
   const [tab, setTab] = useState("previous");
   let [requestStatus, setRequestStatus] = useState(false);
 
@@ -630,7 +629,9 @@ function NairaWithdraw({
                                       className="text-slate-500 text-lg"
                                       value=""
                                     >
-                                      No Options Found!
+                                      {allCountries.data?.length
+                                        ? "Select..."
+                                        : "No Options Found!"}
                                     </option>
                                   )}
                                 </select>

From 4876ba80c1b6291a592891554cf240dea4b6dfb4 Mon Sep 17 00:00:00 2001
From: Ebube <ebube.ojinta@chiefsoft.com>
Date: Mon, 24 Jul 2023 15:07:22 +0100
Subject: [PATCH 5/7] Changed name to back

---
 src/components/MyWallet/Popup/ConfirmAddFund.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/MyWallet/Popup/ConfirmAddFund.jsx b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
index b1f12ff..b826916 100644
--- a/src/components/MyWallet/Popup/ConfirmAddFund.jsx
+++ b/src/components/MyWallet/Popup/ConfirmAddFund.jsx
@@ -372,7 +372,7 @@ function ConfirmAddFund({
               className="px-4 h-11 flex justify-center items-center border-gradient text-base rounded-full"
               onClick={getBack}
             >
-              Cancel
+              Back
             </button>
             {__confirmCountry === "US" && (
               <button

From 11dc8fc6591eedee7a3f1ee056323b77e9ab4027 Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Mon, 24 Jul 2023 15:34:29 +0100
Subject: [PATCH 6/7] resource ask question implemented

---
 src/components/Blogs/index.jsx                | 69 ++++++++++----
 src/components/Helpers/SearchCom.jsx          |  2 +
 .../Resources/tabs/QuestionsTab.jsx           | 92 +++++++++++++++++--
 .../UserHeader/RecomendedSliders.jsx          |  2 +-
 src/services/UsersService.js                  | 25 +++++
 5 files changed, 161 insertions(+), 29 deletions(-)

diff --git a/src/components/Blogs/index.jsx b/src/components/Blogs/index.jsx
index 7d10246..d5c952b 100644
--- a/src/components/Blogs/index.jsx
+++ b/src/components/Blogs/index.jsx
@@ -1,38 +1,67 @@
-import React, { useState } from "react";
-import { Link } from "react-router-dom";
+import React, { useEffect, useState } from "react";
+import { Link, useNavigate } from "react-router-dom";
 import Layout from "../Partials/Layout";
 import CommonHead from "../UserHeader/CommonHead";
+import usersService from "../../services/UsersService";
+import LoadingSpinner from "../Spinners/LoadingSpinner";
 
 export default function BlogItem(props) {
+
+    const apiCall = new usersService()
+    const navigate = useNavigate()
+
+    const [blogdata, setBlogdata] = useState({loading: true, data:{}})
+
     const [selectTab, setValue] = useState("today");
     const filterHandler = (value) => {
         setValue(value);
     };
+    const queryParams = new URLSearchParams(location?.search);
+    const blog_id = queryParams.get("blog_id");
+    
+    useEffect(()=>{
+        if(!blog_id){
+            navigate('/',{replace:true})
+        }
+        apiCall.getSingleBlogData({blog_id}).then(res => {
+            setBlogdata({loading: false, data:res.data})
+        }).catch(error => {
+            setBlogdata({loading: false, data:{}})
+            console.log('ERROR', error)
+        })
+    },[blog_id])
     return (
         <Layout>
             <CommonHead
                 commonHeadData={props.commonHeadData}
             />
             <div className="notification-page w-full mb-10">
-                <div className="notification-wrapper w-full">
-                    {/* heading */}
-                    <div className="sm:flex justify-between items-center mb-6">
-                        <div className="mb-5 sm:mb-0">
-                            <h1 className="text-26 font-bold   text-dark-gray dark:text-white">
-                <span
-                    className={`${selectTab === "today" ? "block" : "hidden"}`}
-                >
-                  Title of this Blog Items
-                </span>
-                            </h1>
-                        </div>
-                        <div className="slider-btns flex space-x-4">
-
-                        </div>
+                <div className="notification-wrapper w-full bg-white p-8">
+                    {blogdata.loading ? 
+                        <LoadingSpinner size='8' color='sky-blue' height='h-[100px]' />
+                    :
+                        blogdata?.data?.blogdata && blogdata.data?.blogdata.length ?
+                        <div className="w-full">
+                            {/* heading */}
+                            <div className="sm:flex justify-between items-center mb-6">
+                                <div className="mb-5 sm:mb-0">
+                                    <h1 className="text-26 font-bold text-dark-gray dark:text-white">
+                                        <span
+                                            className={`${selectTab === "today" ? "block" : "hidden"}`}
+                                        >
+                                        {blogdata.data?.blogdata?.[0]?.post_title}
+                                        </span>
+                                    </h1>
+                                </div>
+                                {/* <div className="slider-btns flex space-x-4">
+                                </div> */}
+                            </div>
+                            <div dangerouslySetInnerHTML={{__html: blogdata.data?.blogdata?.[0]?.post_content}}>
+                            </div>
                     </div>
-                   <div>
-                       Blog Items Details need implenet
-                   </div>
+                    :
+                    <h1 className="text-26 font-bold text-dark-gray dark:text-white">No Blog Found!</h1>
+                    }  
                 </div>
             </div>
         </Layout>
diff --git a/src/components/Helpers/SearchCom.jsx b/src/components/Helpers/SearchCom.jsx
index 107bbaf..62fb7f3 100644
--- a/src/components/Helpers/SearchCom.jsx
+++ b/src/components/Helpers/SearchCom.jsx
@@ -7,6 +7,7 @@ export default function SearchCom({
   placeholder,
   handleSearch,
   value,
+  name,
 }) {
   return (
     <div
@@ -22,6 +23,7 @@ export default function SearchCom({
           className={`w-full h-full focus:outline-0 focus:ring-0 dark:bg-dark-white dark:text-white ${
             inputClasses || ""
           }`}
+          name={name}
           type="text"
           onInput={handleSearch}
           value={value}
diff --git a/src/components/Resources/tabs/QuestionsTab.jsx b/src/components/Resources/tabs/QuestionsTab.jsx
index 9791028..606e276 100644
--- a/src/components/Resources/tabs/QuestionsTab.jsx
+++ b/src/components/Resources/tabs/QuestionsTab.jsx
@@ -1,9 +1,65 @@
+import { useEffect, useState } from "react";
+
 import ProductCardStyleTwo from "../../Cards/ProductCardStyleTwo";
 import DataIteration from "../../Helpers/DataIteration";
 import SearchCom from "../../Helpers/SearchCom";
 import localImgLoad from "../../../lib/localImgLoad";
 
+import usersService from "../../../services/UsersService";
+import LoadingSpinner from "../../Spinners/LoadingSpinner";
+
 export default function QuestionsTab({ className, products }) {
+    const apiCall = new usersService()
+
+    const [requestStatus, setRequestStatus] = useState({loading: false, status: false, message: ''})
+
+    const [error, setError] = useState({question: '', searchPhrase: ''})
+
+    const [questions, setQuestions] = useState({loading: true, data: []})
+
+    const [askQuestion, setAskQuestion] = useState({question: '', searchPhrase: ''})
+
+    const changeAskQuestion = ({target: {name, value}}) => {
+        setAskQuestion(prev => ({...prev, [name]: value}))
+        setRequestStatus({loading: false, status: false, message: ''})
+    }
+
+    const onSearch = () => {
+        setError({question: '', searchPhrase: ''}) // sets error to false
+        if(!askQuestion.question){
+            return setError(prev => ({...prev, question: 'Select a question'}))
+        }
+        if(!askQuestion.searchPhrase){
+            return setError(prev => ({...prev, searchPhrase: 'Enter search parameter'}))
+        }
+        if(askQuestion.searchPhrase.length > 60){
+            return setError(prev => ({...prev, searchPhrase: 'Max of 60 characters'}))
+        }
+        
+        setRequestStatus({loading: true, status: false, message: ''})
+        let reqData = {
+            question_key: '',
+            question: ''
+        }
+        apiCall.askResourcesResult().then(res => {
+            console.log(res.data.choices[0].text)
+            if(!res.data || res.data?.choices?.length < 1){
+            setRequestStatus({loading: false, status: false, message: 'No result found!'})
+            }
+            setRequestStatus({loading: false, status: false, message: res.data?.choices[0].text})
+        }).catch(error => {
+            setRequestStatus({loading: false, status: false, message: 'No result found!'})
+        })
+    }
+   
+    useEffect(()=>{
+        apiCall.getResourceList().then(res => {
+            setQuestions({loading: false, data: res.data?.ask_categories?.data})
+        }).catch(error => {
+            setQuestions({loading: false, data: []})
+            console.log('ERROR', error)
+        })
+    }, [])
     return (
         <>
             <div className={`onsale-tab-wrapper w-full ${className || ""}`}>
@@ -16,29 +72,49 @@ export default function QuestionsTab({ className, products }) {
                             </div>
                             <div className="p-8 bg-white rounded-2xl h-full">
                                 <div 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">
-                                    <select className="input-field px-2 placeholder:text-base text-dark-gray w-full h-full tracking-wide dark:bg-[#11131F] bg-[#fafafa] focus:ring-0 focus:outline-none">
-                                        <option className="rounded-full">Find answer on:</option>
+                                    <select value={askQuestion.question} name='question' onChange={changeAskQuestion} className="input-field px-2 placeholder:text-base text-dark-gray w-full h-full tracking-wide dark:bg-[#11131F] bg-[#fafafa] focus:ring-0 focus:outline-none">
+                                        {questions.loading ? 
+                                            <option value='' className="">Loading...</option>
+                                            :
+                                            <>
+                                            <option value='' className="">Find answer on:</option>
+                                            {questions.data.length > 0 && questions.data.map((item, index)=>(
+                                                <option key={index} value={item.question_key} className="">{item.name}</option>
+                                                ))}
+                                            </>
+                                        }
+                                        
                                     </select>
                                 </div>
+                                {error.question && <p className="text-red-500 text-[12px]">{error.question}</p>} 
                                 {/* filter-search */}
                                 <div className="w-full my-5 border-2 rounded-full">
-                                    <SearchCom />
+                                    <SearchCom 
+                                        name={'searchPhrase'}
+                                        value={askQuestion.searchPhrase}
+                                        handleSearch={changeAskQuestion}
+                                        />
                                 </div>
+                                {error.searchPhrase && <p className="text-red-500 text-[12px]">{error.searchPhrase}</p>}
                                 <div className="w-full flex justify-end items-center border-b-2 pb-4">
                                     <button
+                                        onClick={onSearch}
+                                        disabled={requestStatus.loading}
                                         className="btn-gradient text-base tracking-wide px-4 py-2 rounded-full text-white cursor-pointer"
                                         >
                                         Search
                                     </button>
                                 </div>
+                                <div className="search_result my-2 max-h-[400px] overflow-auto">
+                                {requestStatus.loading ?
+                                    <LoadingSpinner size='8' color='sky-blue' height='h-[100px]' />
+                                    :
+                                    <p className="py-2 text-sm font-bold text-dark-gray dark:text-white tracking-wide">{requestStatus.message}</p>
+                                    }
+                                </div>
                             </div>
                         </div>
-
                     </div>
-                    {/* <div className="content-section w-full-width">
-                        <div className="grid lg:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-[30px]">
-                        </div>
-                    </div> */}
                 </div>
             </div>
         </>
diff --git a/src/components/UserHeader/RecomendedSliders.jsx b/src/components/UserHeader/RecomendedSliders.jsx
index cec4982..223fbee 100644
--- a/src/components/UserHeader/RecomendedSliders.jsx
+++ b/src/components/UserHeader/RecomendedSliders.jsx
@@ -100,7 +100,7 @@ export default function RecomendedSliders({ className, bannerData }) {
       <div className="slider-content">
         <SliderCom settings={settings} selector={sellSlider}>
           {bannerData.map((item, index) => (
-            <Link key={index} to={`/${item.link_path}`}>
+            <Link key={index} to={item.link_path == 'blog-page' ? `/${item.link_path}?blog_id=${item.blog_id}` : `/${item.link_path}`}>
               <div className="item">
                 <div
                   className={`commonHeaderSliderItem flex gap-1 flex-col justify-between items-center ${item.short_style}`}
diff --git a/src/services/UsersService.js b/src/services/UsersService.js
index 4236f24..a0db05a 100644
--- a/src/services/UsersService.js
+++ b/src/services/UsersService.js
@@ -411,6 +411,19 @@ class usersService {
     };
     return this.postAuxEnd("/resources", postData);
   }
+
+  // ASK QUESTION RESOURCES
+  askResourcesResult(reqData) {
+    var postData = {
+      uuid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: 22010,
+      ...reqData,
+    };
+    return this.postAuxEnd("/askresources", postData);
+  }
+
   getMyWiatingJobList() {
     // jobs you have shown inteterest in
     var postData = {
@@ -991,6 +1004,18 @@ class usersService {
       return this.postAuxEnd("/payremcard", postData);
     }
 
+    // FUNCTION TO GET SINGLE BLOG ITEM
+    getSingleBlogData(reqData) {
+      var postData = {
+        uid: localStorage.getItem("uid"),
+        member_id: localStorage.getItem("member_id"),
+        sessionid: localStorage.getItem("session_token"),
+        limit: 4,
+        ...reqData,
+      };
+      return this.postAuxEnd("/blogdata", postData);
+    }
+
   /*
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(username)
     - 20:27:30.118 FLOG_MAX [757411]: 	REQ_STRING(password)

From 4ac799f8c9f5ae11e984ea61a829e22c455ff419 Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Mon, 24 Jul 2023 20:06:25 +0100
Subject: [PATCH 7/7] links to blog page added

---
 src/components/Blogs/index.jsx                | 15 ++++++++++++---
 src/components/Cards/HomeBannerOffersCard.jsx |  3 ++-
 src/components/Cards/ResourceBlogCard.jsx     | 13 +++++++------
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/components/Blogs/index.jsx b/src/components/Blogs/index.jsx
index d5c952b..0876ce8 100644
--- a/src/components/Blogs/index.jsx
+++ b/src/components/Blogs/index.jsx
@@ -36,7 +36,16 @@ export default function BlogItem(props) {
                 commonHeadData={props.commonHeadData}
             />
             <div className="notification-page w-full mb-10">
-                <div className="notification-wrapper w-full bg-white p-8">
+                <div className="mb-5">
+                    <h1 className="text-26 font-bold text-dark-gray dark:text-white">
+                        <span
+                            className={`${selectTab === "today" ? "block" : "hidden"}`}
+                        >
+                        {blogdata.data?.blogdata?.[0]?.post_title}
+                        </span>
+                    </h1>
+                </div>
+                <div className="notification-wrapper w-full bg-white p-8 rounded-2xl">
                     {blogdata.loading ? 
                         <LoadingSpinner size='8' color='sky-blue' height='h-[100px]' />
                     :
@@ -44,7 +53,7 @@ export default function BlogItem(props) {
                         <div className="w-full">
                             {/* heading */}
                             <div className="sm:flex justify-between items-center mb-6">
-                                <div className="mb-5 sm:mb-0">
+                                {/* <div className="mb-5">
                                     <h1 className="text-26 font-bold text-dark-gray dark:text-white">
                                         <span
                                             className={`${selectTab === "today" ? "block" : "hidden"}`}
@@ -52,7 +61,7 @@ export default function BlogItem(props) {
                                         {blogdata.data?.blogdata?.[0]?.post_title}
                                         </span>
                                     </h1>
-                                </div>
+                                </div> */}
                                 {/* <div className="slider-btns flex space-x-4">
                                 </div> */}
                             </div>
diff --git a/src/components/Cards/HomeBannerOffersCard.jsx b/src/components/Cards/HomeBannerOffersCard.jsx
index 72f4a58..1532d2a 100644
--- a/src/components/Cards/HomeBannerOffersCard.jsx
+++ b/src/components/Cards/HomeBannerOffersCard.jsx
@@ -16,7 +16,8 @@ export default function HomeBannerOffersCard(props) {
 
   return (
     <Link
-      to={link_result}
+      // to={link_result}
+      to={link_result == '/blog-page' ? `${link_result}?blog_id=${props.itemData.blog_id}` : `${link_result}`}
       className="item p-2 w-full flex items-center min-h-[340px] bg-alice-blue bg-cover bg-center"
       style={{
         backgroundImage: `url('${imageUrl}')`,
diff --git a/src/components/Cards/ResourceBlogCard.jsx b/src/components/Cards/ResourceBlogCard.jsx
index 666b5ef..d74dbf5 100644
--- a/src/components/Cards/ResourceBlogCard.jsx
+++ b/src/components/Cards/ResourceBlogCard.jsx
@@ -50,22 +50,23 @@ export default function ProductCardStyleTwo({
         </div>
         <div className="details-area">
           {/* title */}
-          <a href={datas.guid} target="_blank" className="mb-2.5" rel="noreferrer">
+          <Link to={`/blog-page?blog_id=${datas.ID}`} className="mb-2.5" rel="noreferrer">
             <h1 className="font-bold text-xl tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
               {datas.post_title || "dummy title..."}
             </h1>
-          </a>
+          </Link>
           <div className="flex justify-between">
             <div className="flex items-center space-x-2"></div>
             <div className="my-1">
-              <a
-                href={datas.guid}
-                target="_blank"
+              <Link
+                // href={datas.guid}
+                // target="_blank"
+                to={`/blog-page?blog_id=${datas.ID}`}
                 className="px-4 py-2.5 text-white text-sm bg-pink rounded-full tracking-wide"
                 rel="noreferrer"
               >
                 View
-              </a>
+              </Link>
             </div>
           </div>
         </div>