Merge branch 'manage-family-page' of WrenchBoard/Users-Wrench into master

src/components/AuthPages/Login/index.jsx

@@ -16,7 +16,7 @@ import { updateUserDetails } from "../../../store/UserDetails";
 export default function Login() {
   const dispatch = useDispatch();
 
-  let [loginCom, setLoginCom] = useState({user: true, family: false})
+  let [loginCom, setLoginCom] = useState({ user: true, family: false });
 
   const [checked, setValue] = useState(false);
   const [loginLoading, setLoginLoading] = useState(false);
@@ -31,13 +31,13 @@ export default function Login() {
   };
 
   //FUNCTION TO DETERMINE/CHANGE LOGIN COMPONENT
-  const handleLoginCom = ({target:{name}}) => {
+  const handleLoginCom = ({ target: { name } }) => {
-    if(name == 'user'){
+    if (name == "user") {
-      setLoginCom({[name]: true, family: false})
+      setLoginCom({ [name]: true, family: false });
-    }else{
+    } else {
-      setLoginCom({[name]: false, family: true})
+      setLoginCom({ [name]: false, family: true });
-    }
     }
+  };
 
   // email
   const [email, setMail] = useState("");
@@ -52,58 +52,49 @@ export default function Login() {
   const navigate = useNavigate();
   const userApi = new usersService();
 
-  // FUNCTION TO HANDLE USER LOGIN
+  const doLogin = async () => {
-  const doLogin = ({target:{name}}) => {
+    try {
-    setLoginLoading(true);
+      if (email !== "" && password !== "") {
-    let postData = {}; // Post Data for API
+        var postData = {
-    if(!email || !password){
-      setLoginLoading(false);
-      setMsgError("Please fill in the fields");
-      return
-    }
-
-    if(name == 'userlogin'){ // Post Data Info for normal Login
-      postData = {
           username: email,
           password: password,
           sessionid: "STARTING",
         };
-    }else{
+        const loginResult = await userApi.logInUser(postData); // just for a test
-      postData = { // Post Data Info for family Login
+        //debugger;
-        username: email,
+        // if (email === "support@mermsemr.com") {
-        pin: password,
+        if (
-        sessionid: "20067A92714",
+          loginResult.data.status > 0 &&
-        login_mode: 1105,
+          loginResult.data.internal_return == 100 &&
-        action: 11025
+          loginResult.data.session != ""
-      };
+        ) {
-    }
+          // just for a start
-
+          localStorage.setItem("member_id", `${loginResult.data.member_id}`);
-    userApi.logInUser(postData).then((res)=>{
+          localStorage.setItem("uid", `${loginResult.data.uid}`);
-      if(res.status != 200 || res.data.internal_return < 0){
+          localStorage.setItem("session_token", `${loginResult.data.session}`);
-        // setMsgError("Wrong, email/password");
+          localStorage.setItem("session", `${loginResult.data.session}`);
-        setLoginError(true);
+          setLoginLoading(true);
-        setLoginLoading(false);
+          // userApi.getUserReminders(); //testing
-        return
+          dispatch(updateUserDetails(loginResult.data));
-      }
-      localStorage.setItem("member_id", `${res.data.member_id}`);
-      localStorage.setItem("uid", `${res.data.uid}`);
-      localStorage.setItem("session_token", `${res.data.session}`);
-      // localStorage.setItem("session", `${res.data.session}`);
-      dispatch(updateUserDetails(res.data));
           setTimeout(() => {
             navigate("/", { replace: true });
             setLoginLoading(false);
           }, 2000);
-    }).catch(error => {
+        } else {
-      setMsgError("Unable to login, try again");
+          // toast.error("Invalid Credential");
-      setLoginLoading(false);
+          setLoginError(true);
-    }).finally(()=>{
+        }
+      } else {
+        setMsgError("Please fill in the fields");
+      }
+    } catch (error) {
+      setMsgError("An error occurred");
+    } finally {
       setTimeout(() => {
         setLoginError(false);
         setMsgError(null);
-        setLoginLoading(false);
       }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT));
-    })
+    }
   };
 
   return (
@@ -139,28 +130,35 @@ export default function Login() {
               {/* switch login component */}
               <div className="flex justify-start items-end">
                 <button
-                  name='user'
+                  name="user"
-                  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]'}`}
+                  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]"
+                  }`}
                   onClick={handleLoginCom}
-                >Sign in
+                >
+                  Sign in
                 </button>
                 <button
-                  name='family'
+                  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]'}`}
+                  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]"
+                  }`}
                   onClick={handleLoginCom}
-                >Family
+                >
+                  Family
                 </button>
               </div>
 
               {/* END  of switch login component */}
 
               {/* for login component */}
-              {loginCom.user ?
+              {
+                loginCom.user ? (
                   //user login compoenent
                   <div className="p-2 input-area border-2 border-[#4687ba]">
                     <div className="input-item mb-5">
                       <InputCom
-                      labelClass='tracking-wider'
+                        labelClass="tracking-wider"
                         fieldClass="px-6"
                         value={email}
                         inputHandler={handleEmail}
@@ -174,7 +172,7 @@ export default function Login() {
 
                     <div className="input-item mb-5">
                       <InputCom
-                      labelClass='tracking-wider'
+                        labelClass="tracking-wider"
                         fieldClass="px-6"
                         value={password}
                         inputHandler={handlePassword}
@@ -206,10 +204,8 @@ export default function Login() {
                     <div className="signin-area mb-3.5">
                       <div className="flex justify-center">
                         <button
-                        name='userlogin'
                           onClick={doLogin}
                           type="button"
-                        disabled={loginLoading}
                           className={`btn-login  rounded-[0.475rem] mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
                         >
                           {loginLoading ? (
@@ -220,17 +216,21 @@ export default function Login() {
                         </button>
                       </div>
                       <BrandBtn link="#" imgSrc={googleLogo} brand="Google" />
-                    <BrandBtn link="#" imgSrc={facebookLogo} brand="Facebook" />
+                      <BrandBtn
+                        link="#"
+                        imgSrc={facebookLogo}
+                        brand="Facebook"
+                      />
                       <BrandBtn link="#" imgSrc={appleLogo} brand="Apple" />
                     </div>
                   </div>
+                ) : (
                   // END of user login compoenent
-                :
                   // family login compoenent
                   <div className="p-2 input-area border-2 border-[#4687ba]">
                     <div className="input-item mb-5">
                       <InputCom
-                      labelClass='tracking-wider'
+                        labelClass="tracking-wider"
                         fieldClass="px-6"
                         value={email}
                         inputHandler={handleEmail}
@@ -244,7 +244,7 @@ export default function Login() {
 
                     <div className="input-item mb-5">
                       <InputCom
-                      labelClass='tracking-wider'
+                        labelClass="tracking-wider"
                         fieldClass="px-6"
                         value={password}
                         inputHandler={handlePassword}
@@ -276,9 +276,9 @@ export default function Login() {
                     <div className="signin-area mb-1.5">
                       <div className="flex justify-center">
                         <button
-                        name='familylogin'
+                          onClick={() => {
-                        onClick={doLogin}
+                            console.log("working");
-                        disabled={loginLoading}
+                          }}
                           type="button"
                           className={`btn-login  rounded-[0.475rem] text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
                         >
@@ -291,6 +291,7 @@ export default function Login() {
                       </div>
                     </div>
                   </div>
+                )
                 // END of family login compoenent
               }
               {/* END of login component */}
@@ -308,10 +309,9 @@ export default function Login() {
 }
 
 const BrandBtn = ({ link, imgSrc, brand }) => {
-
+  const doGoogle = async () => {
-  const doGoogle = async ()=>{
+    alert("start google");
-    alert('start google');
+  };
-  }
 
   //  onSuccess: (codeResponse) => setUser(codeResponse),
 
@@ -320,13 +320,13 @@ const BrandBtn = ({ link, imgSrc, brand }) => {
   //   onError: (error) => console.log('Login Failed:', error)
   // });
 
-  const doApple = async ()=>{
+  const doApple = async () => {
-    alert('start apple');
+    alert("start apple");
-  }
+  };
 
-  const doFacebook = async ()=>{
+  const doFacebook = async () => {
-    alert('start facebook');
+    alert("start facebook");
-  }
+  };
 
   return (
     <div className="flex justify-center bottomMargin">

src/components/FamilyAcc/FamilyManage.jsx

@@ -69,7 +69,7 @@ export default function FamilyManage() {
     memberList();
   }, [listReload, memberList]);
 
-//   console.log('Ebueb', familyList)
+  console.log('Ebueb', familyList)
 
   return (
     <Layout>

src/components/FamilyAcc/FamilyManageTabs.jsx

@@ -1,13 +1,23 @@
-import React, { useRef, useState } from "react";
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 import LoadingSpinner from "../Spinners/LoadingSpinner";
 import cover from "../../assets/images/profile-info-cover.png";
 import profile from "../../assets/images/profile-info-profile.png";
+import usersService from "../../services/UsersService";
 
 export default function FamilyManageTabs({
   className,
   accountDetails,
   loader,
 }) {
+  const [familyDetails, setFamilyDetails] = useState(null);
+  const [errMsg, setErrMsg] = useState("");
+  // List of tabs
   const tabs = [
     {
       id: 1,
@@ -23,9 +33,11 @@ export default function FamilyManageTabs({
     },
   ];
   const [tab, setTab] = useState(tabs[0].name);
+  const [manageLoader, setManageLoader] = useState(false);
   const tabHandler = (value) => {
     setTab(value);
   };
+  //   For profile uploads
   const [profileImg, setProfileImg] = useState(profile);
   // profile img
   const profileImgInput = useRef(null);
@@ -41,6 +53,30 @@ export default function FamilyManageTabs({
       imgReader.readAsDataURL(e.target.files[0]);
     }
   };
+  //   Api call
+  const apiCall = useMemo(() => new usersService(), []);
+  // function for manage family
+  const familyManageHandler = useCallback(async () => {
+    setManageLoader(true);
+    try {
+      let { family_uid } = accountDetails;
+      let reqData = { family_uid };
+      let res = await apiCall.ManageFamily(reqData);
+      let { data } = await res;
+      if (data?.internal_return < 0) return;
+      setFamilyDetails(data);
+      setManageLoader(false);
+    } catch (error) {
+      setErrMsg("An error occurred");
+      throw new Error(error);
+    }
+  }, [apiCall, accountDetails]);
+
+  useEffect(() => {
+    familyManageHandler();
+  }, []);
+
+  console.log(familyDetails);
   return (
     <div
       className={`update-table w-full bg-white dark:bg-dark-white overflow-y-auto rounded-2xl section-shadow min-h-[520px] max-h-[600px] ${
@@ -80,7 +116,31 @@ export default function FamilyManageTabs({
                     </li>
                   ))}
                 </ul>
-                <div className="flex-[0.9]">{/* Your content here */}</div>
+                <div className="flex-[0.9] lg:min-h-[450px] h-full">
+                  {/* Your content here */}
+                  {tabs.map(({ name, id }) => {
+                    return (
+                      <div
+                        className={`${
+                          tab === name ? "block" : "hidden"
+                        } h-full p-4 border border-[#dbd9d9]`}
+                        key={id}
+                      >
+                        {manageLoader ? (
+                          <LoadingSpinner size="8" color="sky-blue" />
+                        ) : (
+                          <>
+                            {name === "Tasks" && <Tasks />}
+                            {name === "Account" && (
+                              <Account familyDetails={familyDetails} />
+                            )}
+                            {name === "Profile" && <Profile />}
+                          </>
+                        )}
+                      </div>
+                    );
+                  })}
+                </div>
               </div>
             </div>
           </div>
@@ -150,3 +210,26 @@ function ProfileInfo({
     </div>
   );
 }
+
+function Tasks() {
+  return <>Tasks</>;
+}
+
+function Account({ familyDetails }) {
+  return (
+    <div className="w-full lg:min-h-[400px] h-full flex items-center justify-center">
+      <div className="flex flex-col">
+        <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+          Username: <span className="ml-2 normal-case">{familyDetails?.username}</span>
+        </h2>
+        <h2 className="font-bold text-lg tracking-wide line-clamp-1 text-dark-gray dark:text-white capitalize">
+          Pin: <span className="ml-2 normal-case">{familyDetails?.pin}</span>
+        </h2>
+      </div>
+    </div>
+  );
+}
+
+function Profile() {
+  return <>Profile</>;
+}

src/components/FamilyAcc/FamilyTable.jsx

@@ -41,14 +41,14 @@ export default function FamilyTable({ className, familyList, loader }) {
                         added,
                         last_login,
                         task_count,
-                        uid,
+                        family_uid,
                       } = props;
                       let addedDate = added?.split(" ")[0];
                       let LoginDate = last_login?.split(" ")[0];
                       return (
                         <tr
                           className="bg-white dark:bg-dark-white border-b dark:border-[#5356fb29]  hover:bg-gray-50"
-                          key={uid}
+                          key={family_uid}
                         >
                           <td className=" py-4">
                             <div className="flex space-x-2 items-center w-full">

src/services/UsersService.js

@@ -6,21 +6,21 @@ class usersService {
     console.log("WRB Service Entry");
   }
 
-    CreateUser(reqData){
+  CreateUser(reqData) {
     localStorage.setItem("session_token", ``);
     return this.postAuxEnd("/createuser", reqData);
   }
 
-    CompleteSignUp(reqData){
+  CompleteSignUp(reqData) {
     localStorage.setItem("session_token", ``);
     return this.postAuxEnd("/completesignuplink", reqData);
   }
 
-    getHomeDate(){
+  getHomeDate() {
     var postData = {
       uuid: localStorage.getItem("uuid"),
       member_id: localStorage.getItem("member_id"),
-            sessionid: localStorage.getItem("session_token")
+      sessionid: localStorage.getItem("session_token"),
     };
     return this.postAuxEnd("/dashdata", postData);
   }
@@ -32,74 +32,75 @@ class usersService {
     var postData = {
       uuid: localStorage.getItem("uuid"),
       member_id: localStorage.getItem("member_id"),
-            sessionid: localStorage.getItem("session_token")
+      sessionid: localStorage.getItem("session_token"),
     };
     return this.postAuxEnd("/getjobsdata", postData);
   }
-//
+  //
-    getUserBankList(reqData){
+  getUserBankList(reqData) {
     var postData = {
       uuid: localStorage.getItem("uuid"),
       member_id: localStorage.getItem("member_id"),
-            sessionid: localStorage.getItem("session_token")
+      sessionid: localStorage.getItem("session_token"),
     };
     return this.postAuxEnd("/mybanklist", postData);
   }
-    getUserWallets(reqData){
+  getUserWallets(reqData) {
     var postData = {
       uuid: localStorage.getItem("uuid"),
       member_id: localStorage.getItem("member_id"),
-            sessionid: localStorage.getItem("session_token")
+      sessionid: localStorage.getItem("session_token"),
     };
     return this.postAuxEnd("/getwallets", postData);
   }
-    getApiGate(){
+  getApiGate() {
     // localStorage.setItem("session_token", ``);
     return this.postAuxEnd("/apigate", null);
   }
 
-    getLoadProfile(){
+  getLoadProfile() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/loadprofile", null);
   }
 
-    getOffersList(){
+  getOffersList() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/offerslist", null);
   }
 
-    getPendingJob(){
+  getPendingJob() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            limit :100};
+      limit: 100,
+    };
     return this.postAuxEnd("/pendingjob", postData);
   }
 
   /*
     getActiveJobList -  All available Jobs
      */
-    getActiveJobList(){
+  getActiveJobList() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/getjobsdata", postData);
   }
@@ -118,210 +119,222 @@ class usersService {
   //     };
   //     return this.postAuxEnd("/getjobsdata", postData);
   // }
-    getHeroJBanners(){
+  getHeroJBanners() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/homebanners", postData);
   }
 
-    getGetPendingJobs(){
+  getGetPendingJobs() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/getpendingjobs", postData);
   }
 
-    getUsersCards(){
+  getUsersCards() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/userscards", postData);
   }
 
-    getCouponPending(){
+  getCouponPending() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-        page:0,
+      page: 0,
-        limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/couponpending", postData);
   }
 
   // API FUNCTION TO GET COUPON HISTORY
-    getRecipient(){
+  getRecipient() {
     var postData = {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:1,
+      page: 1,
-            limit :20,
+      limit: 20,
-            action: 11175
+      action: 11175,
     };
     return this.postAuxEnd("/recipients", postData);
   }
 
   //END POINT CALL FOR UPDATE PROFILE
-    addRecipient(data){
+  addRecipient(data) {
     var postData = {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-        ...data
+      ...data,
     };
     return this.postAuxEnd("/addrecipient", postData);
   }
 
   // API FUNCTION TO GET SEND MONEY FEE
-    getSendMoneyFee(amount){
+  getSendMoneyFee(amount) {
     var postData = {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
       amount,
-            action: 33025
+      action: 33025,
     };
     return this.postAuxEnd("/sendmoneyfee", postData);
   }
 
+  // Family Manage
+  ManageFamily(reqData) {
+    var postData = {
+      uid: localStorage.getItem("uid"),
+      member_id: localStorage.getItem("member_id"),
+      sessionid: localStorage.getItem("session_token"),
+      action: 22025,
+      ...reqData
+    };
+    return this.postAuxEnd("/familymanage", postData);
+  }
+
   // Task for the person doing the job
-    getMyActiveTaskList(){
+  getMyActiveTaskList() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            offset:0,
+      offset: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/activetaskslist", postData);
   }
-    getMyActiveJobList(){
+  getMyActiveJobList() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            offset:0,
+      offset: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/jobmanageractive", postData);
   }
 
-    getMyPendingJobList(){
+  getMyPendingJobList() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            offset:0,
+      offset: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/jobmanageroffers", postData);
   }
-    getMyJobList(){
+  getMyJobList() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            offset:0,
+      offset: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/jobmanagerlist", postData);
   }
   // API FUNCTION TO GET COUPON HISTORY
-    getCouponHx(){
+  getCouponHx() {
     var postData = {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:1,
+      page: 1,
-            limit :20,
+      limit: 20,
-            action: 85025
+      action: 85025,
     };
     return this.postAuxEnd("/couponhx", postData);
   }
 
-    getPurchaseHx(){
+  getPurchaseHx() {
     var postData = {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:1,
+      page: 1,
-            limit :20,
+      limit: 20,
-            action: 15049
+      action: 15049,
     };
     return this.postAuxEnd("/purchasehx", postData);
   }
 
   // API FUNCTION TO GET PAYMENT HISTORY
-    getPaymentHx(){
+  getPaymentHx() {
     var postData = {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:1,
+      page: 1,
-            limit :20,
+      limit: 20,
-            action: 15046
+      action: 15046,
     };
     return this.postAuxEnd("/paymenthx", postData);
   }
 
   // API FUNCTION TO GET PAYMENT HISTORY
-    sendMoney(reqData){
+  sendMoney(reqData) {
     var postData = {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
       senderid: localStorage.getItem("member_id"),
       action: 33020,
-            ...reqData
+      ...reqData,
     };
     return this.postAuxEnd("/sendmoney", postData);
   }
 
   //END POINT CALL FOR REFERRAL HISTORY
-    getReferralHx(){
+  getReferralHx() {
     var postData = {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
       offset: 1,
-        limit :100,
+      limit: 100,
-        action: 11064
+      action: 11064,
     };
     return this.postAuxEnd("/refferhx", postData);
   }
 
   //END POINT CALL FOR UPDATE PROFILE
-    updateProfile(post){
+  updateProfile(post) {
     var postData = {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
       action: 5031,
-        ...post
+      ...post,
     };
     return this.postAuxEnd("/updateprofile", postData);
   }
 
   //END POINT CALL FOR GETTING USER PROFILE
-    loadProfile(post){
+  loadProfile(post) {
     var postData = {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
@@ -330,82 +343,82 @@ class usersService {
     return this.postAuxEnd("/loadprofile", postData);
   }
 
-    getFamilyList(){
+  getFamilyList() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/familylist", postData);
   }
 
-    getFamilyAdd(){
+  getFamilyAdd() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/familyadd", postData);
   }
 
-    getFamilyUpdate(){
+  getFamilyUpdate() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/familyupdate", postData);
   }
 
-    getFamilyManage(){
+  getFamilyManage() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            page:0,
+      page: 0,
-            limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/familymanage", postData);
   }
 
   //END POINT CALL FOR ACCOUNT TOP
-     startTopUp(post){
+  startTopUp(post) {
     var postData = {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
       action: 11062,
-        ...post
+      ...post,
     };
     return this.postAuxEnd("/starttopup", postData);
   }
 
   //END POINT CALL FOR SENDING REFERRAL MESSAGE
-    sendReferralMsg(postData){
+  sendReferralMsg(postData) {
     return this.postAuxEnd("/sendreferral", postData);
   }
 
-    StartResetPassword(reqData){
+  StartResetPassword(reqData) {
-        return this.postAuxEnd("/startresetpasword", reqData)
+    return this.postAuxEnd("/startresetpasword", reqData);
   }
 
-    CompleteResetPassword(reqData){
+  CompleteResetPassword(reqData) {
-        return this.postAuxEnd("/stepresetpass", reqData)
+    return this.postAuxEnd("/stepresetpass", reqData);
   }
 
-    getCouponRedeem(){
+  getCouponRedeem() {
     var postData = {
       uuid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-        page:0,
+      page: 0,
-        limit :100
+      limit: 100,
     };
     return this.postAuxEnd("/couponredeem", postData);
   }
@@ -422,7 +435,7 @@ class usersService {
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
       action: 11183,
-            country: 'NG'
+      country: "NG",
     };
     return this.postAuxEnd("/countrybanks", postData);
   }
@@ -433,7 +446,7 @@ class usersService {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            action: 11177
+      action: 11177,
     };
     return this.postAuxEnd("/accounttypes", postData);
   }
@@ -444,7 +457,7 @@ class usersService {
       uid: localStorage.getItem("uid"),
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
-            action: 13002
+      action: 13002,
     };
     return this.postAuxEnd("/jobmanageragree", postData);
   }
@@ -456,7 +469,7 @@ class usersService {
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
       action: 13010,
-            ...reqData
+      ...reqData,
     };
     return this.postAuxEnd("/jobmanagercreatejob", postData);
   }
@@ -467,7 +480,7 @@ class usersService {
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
       action: 13010,
-            ...reqData
+      ...reqData,
     };
     return this.postAuxEnd("/jobmanagerupdatejob", postData);
   }
@@ -481,7 +494,7 @@ class usersService {
       limit: 30,
       action: 14011,
       offset: 0,
-            ...reqData
+      ...reqData,
     };
     return this.postAuxEnd("/activejobmsglist", postData);
   }
@@ -493,7 +506,7 @@ class usersService {
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
       action: 14010,
-            ...reqData
+      ...reqData,
     };
     return this.postAuxEnd("/sendtaskmessage", postData);
   }
@@ -505,7 +518,7 @@ class usersService {
       member_id: localStorage.getItem("member_id"),
       sessionid: localStorage.getItem("session_token"),
       action: 13011,
-            ...reqData
+      ...reqData,
     };
     return this.postAuxEnd("/jobmanagerdeletejob", postData);
   }
@@ -513,8 +526,8 @@ class usersService {
   verifyEmail(code) {
     const reqData = {
       verify_link: code,
-            action: 11015
+      action: 11015,
-        }
+    };
     return this.postAuxEnd("/verifysignuplink", reqData);
   }
 
@@ -565,7 +578,7 @@ class usersService {
 
     */
 
-    getUserReminders(){
+  getUserReminders() {
     return this.getAuxEnd("/reminders", null);
   }
   //----------------------------------------  -----
@@ -577,16 +590,17 @@ class usersService {
     const session_token = localStorage.getItem("session_token");
     let axiosConfig = {
       headers: {
-                'Accept': 'application/json',
+        Accept: "application/json",
-                'Content-Type': 'application/json;charset=UTF-8',
+        "Content-Type": "application/json;charset=UTF-8",
-                'Authorization': `Basic ${session_token}`,
+        Authorization: `Basic ${session_token}`,
-            }
+      },
     };
     const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri;
-        return Axios.get(endPoint,{
+    return Axios.get(endPoint, {
       params: {
-                reqData
+        reqData,
-            }})
+      },
+    })
       .then((response) => {
         console.log("~~~~~~~ Toks2 GET ~~~~~~~~");
         return response;
@@ -605,7 +619,6 @@ class usersService {
       });
   }
 
-
   postAuxEnd(uri, reqData) {
     const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri;
     const session_token = localStorage.getItem("session_token");
@@ -613,18 +626,18 @@ class usersService {
     //   'Authorization': `Basic ${(session_token !=null) ?session_token : ''}`,
     let axiosConfig = {
       headers: {
-                'Accept': 'application/json',
+        Accept: "application/json",
-                'Access-Control-Allow-Origin': '*',
+        "Access-Control-Allow-Origin": "*",
-                'Access-Control-Expose-Headers': 'Access-Control-Allow-Origin',
+        "Access-Control-Expose-Headers": "Access-Control-Allow-Origin",
-                'Access-Control-Allow-Headers':'Origin, X-API-KEY, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method, Access-Control-Allow-Headers, Authorization, observe, enctype, Content-Length, X-Csrf-Token',
+        "Access-Control-Allow-Headers":
-                'Content-Type': 'application/json;charset=UTF-8',
+          "Origin, X-API-KEY, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method, Access-Control-Allow-Headers, Authorization, observe, enctype, Content-Length, X-Csrf-Token",
-
+        "Content-Type": "application/json;charset=UTF-8",
-            }
+      },
     };
     //  Axios.defaults.headers.post['Content-Type'] ='application/json;charset=utf-8';
     //     Axios.defaults.headers.post['Access-Control-Allow-Origin'] = '*'; //,axiosConfig
     //     Axios.defaults.withCredentials = true;
-//debugger;
+    //debugger;
     return Axios.post(endPoint, reqData)
       .then((response) => {
         console.log(response);
@@ -635,19 +648,31 @@ class usersService {
       .catch((error) => {
         if (error.response) {
           //response status is an error code
-                    console.log("ERROR-------------------------------------------------------");
+          console.log(
+            "ERROR-------------------------------------------------------"
+          );
           console.log(error.response.status);
-                    console.log("ERROR-------------------------------------------------------");
+          console.log(
+            "ERROR-------------------------------------------------------"
+          );
         } else if (error.request) {
           //response not received though the request was sent
-                    console.log("ERROR2-------------------------------------------------------");
+          console.log(
+            "ERROR2-------------------------------------------------------"
+          );
           console.log(error?.request);
-                    console.log("ERROR2-------------------------------------------------------");
+          console.log(
+            "ERROR2-------------------------------------------------------"
+          );
         } else {
           //an error occurred when setting up the request
-                    console.log("ERROR3-------------------------------------------------------");
+          console.log(
+            "ERROR3-------------------------------------------------------"
+          );
           console.log(error);
-                    console.log("ERROR3-------------------------------------------------------");
+          console.log(
+            "ERROR3-------------------------------------------------------"
+          );
         }
       });
   }