From 69fb6ba913b2af5cb36abe4c17f27e3d77eb4b84 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Wed, 24 May 2023 17:23:16 -0400
Subject: [PATCH 1/4] fix wallets

---
 src/components/Home/FamilyActiveLSlde.jsx |  2 +-
 src/components/Home/index.jsx             | 16 +++-----------
 src/components/MyWallet/Balance.jsx       | 26 +++++++++++++++--------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/components/Home/FamilyActiveLSlde.jsx b/src/components/Home/FamilyActiveLSlde.jsx
index 90c5cf3..56d4e5c 100644
--- a/src/components/Home/FamilyActiveLSlde.jsx
+++ b/src/components/Home/FamilyActiveLSlde.jsx
@@ -47,7 +47,7 @@ export default function FamilyActiveLSlde({ className, trending }) {
                 <div>
                     <h1 className="text-26 font-bold   text-dark-gray dark:text-white">Current Tasks</h1>
                 </div>
-                <div className="slider-btns flex space-x-4">
+                <div className="slider-btns flex space-x-3">
                     <button onClick={nextHandler} type="button">
                         <div className="trending-slider-left-btn relative text-white w-10 h-10 flex justify-center items-center rounded-full overflow-hidden">
                             <svg
diff --git a/src/components/Home/index.jsx b/src/components/Home/index.jsx
index df331ef..ac5617a 100644
--- a/src/components/Home/index.jsx
+++ b/src/components/Home/index.jsx
@@ -1,14 +1,6 @@
 import React from "react";
 import datas from "../../data/product_data.json";
 import Layout from "../Partials/Layout";
-import CreateNft from "./CreateNft";
-import Hero from "./Hero";
-import SellHistoryMarketVisitorAnalytic from "./SellHistoryMarketVisitorAnalytic";
-import TopSellerTopBuyerSliderSection from "./TopSellerTopBuyerSliderSection";
-import TrendingSection from "./TrendingSection";
-import UpdateTable from "./UpdateTable";
-import HomeTaskDisplay from "./HomeTaskDisplay";
-import UsersService from "../../services/UsersService";
 import usersService from "../../services/UsersService";
 import { useSelector } from "react-redux";
 import FamilyDash from "./FamilyDash";
@@ -19,12 +11,10 @@ export default function Home(props) {
 
     console.log("PROPS IN HOME->",props);
 
-    const trending = datas.datas;
-    const jobData =  datas.datas; // api calls or cache
-    //getHomeDate
+//    const trending = datas.datas;
+//    const jobData =  datas.datas; // api calls or cache
     const userApi = new usersService();
-    const homeData = userApi.getHomeDate();
-
+//    const homeData = userApi.getHomeDate();
     const {userDetails} = useSelector((state) => state?.userDetails)
 
     const commonHeadData =()=>{
diff --git a/src/components/MyWallet/Balance.jsx b/src/components/MyWallet/Balance.jsx
index 7c3bbd4..aeee136 100644
--- a/src/components/MyWallet/Balance.jsx
+++ b/src/components/MyWallet/Balance.jsx
@@ -10,7 +10,7 @@ function Balance({wallet, coupon}) {
         <div className="content-wrapper">
             <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
                 {/* WALLET SECTION */}
-                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+                <div className="lg:w-3/4 w-full mb-10 lg:mb-0">
                     <div className="wallet w-full  md:p-8 p-4 h-full bg-white dark:bg-dark-white rounded-2xl shadow">
                         <div className='flex items-baseline justify-between'>
                             <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Wallet</h2>
@@ -42,9 +42,11 @@ function Balance({wallet, coupon}) {
                             <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='text-base text-white px-3 py-1 bg-purple rounded-md hover:opacity-80'>Transfer</Link>:''
+                                        <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'>Transfer</Link>:''
                                 }
-                                <Link to='add-fund' className='text-base text-white px-3 py-1 bg-[orange] rounded-md hover:opacity-80'>Top Up</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'>+Add Credit</Link>
                             </div>
                         </div>
                         ))
@@ -68,19 +70,25 @@ function Balance({wallet, coupon}) {
                 {/* END OF WALLET SECTION */}
 
 
+
+            </div>
+
+            <div className='w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin'>
+
                 {/* COUPON SECTION */}
-                <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+                <div className="lg:w-3/4 w-full mb-10 lg:mb-0">
                     <div className="wallet w-full  md:p-8 p-4 h-full max-h-[500px] 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'>Coupons</h2>
-                        {coupon.loading ? 
-                        <LoadingSpinner size='16' color='sky-blue' />
-                        :
-                        <CouponTable coupon={coupon} />
+                        {coupon.loading ?
+                            <LoadingSpinner size='16' color='sky-blue' />
+                            :
+                            <CouponTable coupon={coupon} />
                         }
                     </div>
                 </div>
                 {/* END OF COUPON SECTION */}
-            </div>            
+
+            </div>
         </div>
       )
 }

From 8b99ec1ab8899959df935c63467d7ebb82dcd525 Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Wed, 24 May 2023 22:29:04 +0100
Subject: [PATCH 2/4] login type bug fixed

---
 src/components/AuthPages/Login/index.jsx | 47 +++++++++++++-----------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx
index ffa0d35..81213a5 100644
--- a/src/components/AuthPages/Login/index.jsx
+++ b/src/components/AuthPages/Login/index.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Link, useNavigate } from "react-router-dom";
 import linkedInLogo from "../../../assets/images/Linkedin.png";
 import appleLogo from "../../../assets/images/apple-black.svg";
@@ -17,7 +17,7 @@ import { updateUserDetails } from "../../../store/UserDetails";
 export default function Login() {
   const dispatch = useDispatch();
 
-  let [loginCom, setLoginCom] = useState({ user: true, family: false });
+  let [loginType, setLoginType] = useState({ full: true, family: false });
 
   const [checked, setValue] = useState(false);
   const [loginLoading, setLoginLoading] = useState(false);
@@ -32,11 +32,11 @@ export default function Login() {
   };
 
   //FUNCTION TO DETERMINE/CHANGE LOGIN COMPONENT
-  const handleLoginCom = ({ target: { name } }) => {
-    if (name == "user") {
-      setLoginCom({ [name]: true, family: false });
-    } else {
-      setLoginCom({ [name]: false, family: true });
+  const handleLoginType = ({ target: { name } }) => {
+    if (name == "full") {
+      setLoginType({ [name]: true, family: false });
+    } else if(name='family') {
+      setLoginType({ [name]: false, family: true });
     }
   };
 
@@ -57,7 +57,7 @@ export default function Login() {
   const doLogin = ({ target: { name } }) => {
     setMsgError("");
     setLoginLoading(true);
-    let postData = {}; // Post Data for API
+    let postData; // Post Data for API
     if (!email || !password) {
       setLoginLoading(false);
       setMsgError("Please fill all the fields");
@@ -67,14 +67,15 @@ export default function Login() {
       return;
     }
 
-    if (name == "userlogin") { // Post Data Info for normal Login
+    if (name == "loginfull") { // Post Data Info for normal Login
       postData = {
         username: email,
         password: password,
         sessionid: "STARTING",
+        login_mode: 1100,
         action: 11025,
       };
-    } else if (name == "familylogin") { // Post Data Info for family Login
+    } else if (name == "loginfamily") { // Post Data Info for family Login
       postData = {
         username: email,
         pin: password,
@@ -83,7 +84,6 @@ export default function Login() {
         action: 11025,
       };
     }
-
     userApi.logInUser(postData).then((res) => {
         if (res.status != 200 || res.data.internal_return < 0) {
           // setMsgError("Wrong, email/password");
@@ -112,6 +112,11 @@ export default function Login() {
       });
   };
 
+  useEffect(()=>{
+    setMail('')
+    setPassword('')
+  },[loginType.full, loginType.family])
+
   return (
     <>
       <AuthLayout slogan="Welcome to WrenchBoard">
@@ -145,20 +150,20 @@ export default function Login() {
               {/* switch login component */}
               <div className="flex justify-start items-end">
                 <button
-                  name="user"
+                  name="full"
                   className={`px-2 py-1 w-[100px] text-left h-[40px] text-lg font-bold text-[#4687ba] hover:text-[#009ef7] tracking-wide transition outline-none border-2 border-b-0 border-r-0 border-[#4687ba] ${
-                    loginCom.user && "border-r-2 h-[45px]"
+                    loginType.full && "border-r-2 h-[45px]"
                   }`}
-                  onClick={handleLoginCom}
+                  onClick={handleLoginType}
                 >
                   Sign in
                 </button>
                 <button
                   name="family"
                   className={`px-2 py-1 w-[100px] text-left h-[40px] text-lg font-bold text-[#4687ba] hover:text-[#009ef7] tracking-wide transition outline-none border-2 border-b-0 border-l-0 border-[#4687ba] ${
-                    loginCom.family && "border-l-2 h-[45px]"
+                    loginType.family && "border-l-2 h-[45px]"
                   }`}
-                  onClick={handleLoginCom}
+                  onClick={handleLoginType}
                 >
                   Family
                 </button>
@@ -168,7 +173,7 @@ export default function Login() {
 
               {/* for login component */}
               {
-                loginCom.user ? (
+                loginType.full ? (
                   //user login compoenent
                   <div className="p-2 input-area border-2 border-[#4687ba]">
                     <div className="input-item mb-5">
@@ -219,7 +224,7 @@ export default function Login() {
                     <div className="signin-area mb-3.5">
                       <div className="flex justify-center">
                         <button
-                          name="userlogin"
+                          name="loginfull"
                           onClick={doLogin}
                           type="button"
                           disabled={loginLoading}
@@ -228,7 +233,7 @@ export default function Login() {
                           {loginLoading ? (
                             <div className="signup btn-loader"></div>
                           ) : (
-                            <span>Continue</span>
+                            <>Continue</>
                           )}
                         </button>
                       </div>
@@ -302,7 +307,7 @@ export default function Login() {
                     <div className="signin-area mb-1.5">
                       <div className="flex justify-center">
                         <button
-                          name="familylogin"
+                          name="loginfamily"
                           onClick={doLogin}
                           disabled={loginLoading}
                           type="button"
@@ -311,7 +316,7 @@ export default function Login() {
                           {loginLoading ? (
                             <div className="signup btn-loader"></div>
                           ) : (
-                            <span>Continue</span>
+                            <>Continue</>
                           )}
                         </button>
                       </div>

From fec464430064881e1f71ba1bcd478232018e50fd Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Wed, 24 May 2023 22:34:47 +0100
Subject: [PATCH 3/4] login type bug fixed

---
 src/components/AuthPages/Login/index.jsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx
index 81213a5..5cc6bf5 100644
--- a/src/components/AuthPages/Login/index.jsx
+++ b/src/components/AuthPages/Login/index.jsx
@@ -83,6 +83,13 @@ export default function Login() {
         login_mode: 1105,
         action: 11025,
       };
+    }else{
+      setLoginLoading(false);
+      setMsgError("Invalid Login Type. Consider refreshing the page");
+      setTimeout(() => {
+        setMsgError("");
+      }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT));
+      return;
     }
     userApi.logInUser(postData).then((res) => {
         if (res.status != 200 || res.data.internal_return < 0) {

From 65b58a6e6f050d3d1c1f75c2899f2b32e915a4a1 Mon Sep 17 00:00:00 2001
From: victorAnumudu <anumuduchukwuebuka@gmail.com>
Date: Wed, 24 May 2023 22:39:12 +0100
Subject: [PATCH 4/4] set login error to false once continue btn is clicked

---
 src/components/AuthPages/Login/index.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx
index 5cc6bf5..dd37fb5 100644
--- a/src/components/AuthPages/Login/index.jsx
+++ b/src/components/AuthPages/Login/index.jsx
@@ -56,6 +56,7 @@ export default function Login() {
   // FUNCTION TO HANDLE USER LOGIN
   const doLogin = ({ target: { name } }) => {
     setMsgError("");
+    setLoginError(false)
     setLoginLoading(true);
     let postData; // Post Data for API
     if (!email || !password) {