diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index 85826fd..43ed0b7 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/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}}) => { - if(name == 'user'){ - setLoginCom({[name]: true, family: false}) - }else{ - setLoginCom({[name]: false, family: true}) + const handleLoginCom = ({ target: { name } }) => { + if (name == "user") { + setLoginCom({ [name]: true, family: false }); + } else { + setLoginCom({ [name]: false, family: true }); } - } + }; // email const [email, setMail] = useState(""); @@ -129,162 +129,176 @@ export default function Login() { {/* switch login component */}
- -
{/* END of switch login component */} {/* for login component */} - {loginCom.user ? - //user login compoenent -
-
- -
+ { + loginCom.user ? ( + //user login compoenent +
+
+ +
-
- -
- {loginError && ( -
- Invalid username or password- Please{" "} - - reset your password - {" "} - or{" "} - - create a new account - +
+
- )} - {msgError && ( -
- {msgError} + {loginError && ( +
+ Invalid username or password- Please{" "} + + reset your password + {" "} + or{" "} + + create a new account + +
+ )} + {msgError && ( +
+ {msgError} +
+ )} +
+
+ +
+ + +
- )} -
-
- +
+ ) : ( + // END of user login compoenent + // family login compoenent +
+
+
- - - -
-
- // END of user login compoenent - : - // family login compoenent -
-
- -
-
- -
- {loginError && ( -
- Invalid username or password{" "} - {/* +
+ +
+ {loginError && ( +
+ Invalid username or password{" "} + {/* reset your password {" "} or{" "} create a new account */} -
- )} - {msgError && ( -
- {msgError} -
- )} -
-
- +
+ )} + {msgError && ( +
+ {msgError} +
+ )} +
+
+ +
-
+ ) // END of family login compoenent } {/* END of login component */}
- This site is protected by hCaptcha and the our Privacy Policy - and Terms of Service apply. + This site is protected by hCaptcha and the our Privacy Policy + and Terms of Service apply.
@@ -295,10 +309,9 @@ export default function Login() { } const BrandBtn = ({ link, imgSrc, brand }) => { - - const doGoogle = async ()=>{ - alert('start google'); - } + const doGoogle = async () => { + alert("start google"); + }; // onSuccess: (codeResponse) => setUser(codeResponse), @@ -307,19 +320,19 @@ const BrandBtn = ({ link, imgSrc, brand }) => { // onError: (error) => console.log('Login Failed:', error) // }); - const doApple = async ()=>{ - alert('start apple'); - } + const doApple = async () => { + alert("start apple"); + }; - const doFacebook = async ()=>{ - alert('start facebook'); - } + const doFacebook = async () => { + alert("start facebook"); + }; return (
logo-icon(s) diff --git a/src/components/FamilyAcc/FamilyManage.jsx b/src/components/FamilyAcc/FamilyManage.jsx index bc4c47e..6d80804 100644 --- a/src/components/FamilyAcc/FamilyManage.jsx +++ b/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 ( diff --git a/src/components/FamilyAcc/FamilyManageTabs.jsx b/src/components/FamilyAcc/FamilyManageTabs.jsx index 6de5c56..9c1760b 100644 --- a/src/components/FamilyAcc/FamilyManageTabs.jsx +++ b/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 (
))} -
{/* Your content here */}
+
+ {/* Your content here */} + {tabs.map(({ name, id }) => { + return ( +
+ {manageLoader ? ( + + ) : ( + <> + {name === "Tasks" && } + {name === "Account" && ( + + )} + {name === "Profile" && } + + )} +
+ ); + })} +
@@ -150,3 +210,26 @@ function ProfileInfo({
); } + +function Tasks() { + return <>Tasks; +} + +function Account({ familyDetails }) { + return ( +
+
+

+ Username: {familyDetails?.username} +

+

+ Pin: {familyDetails?.pin} +

+
+
+ ); +} + +function Profile() { + return <>Profile; +} diff --git a/src/components/FamilyAcc/FamilyTable.jsx b/src/components/FamilyAcc/FamilyTable.jsx index 9c40177..f1e8d91 100644 --- a/src/components/FamilyAcc/FamilyTable.jsx +++ b/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 (
diff --git a/src/services/UsersService.js b/src/services/UsersService.js index 75aaaac..e95ea7b 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -2,523 +2,536 @@ import React from "react"; import Axios from "axios"; class usersService { - constructor() { - console.log("WRB Service Entry"); - } + constructor() { + console.log("WRB Service Entry"); + } - CreateUser(reqData){ - localStorage.setItem("session_token", ``); - return this.postAuxEnd("/createuser", reqData); - } + CreateUser(reqData) { + localStorage.setItem("session_token", ``); + return this.postAuxEnd("/createuser", reqData); + } - CompleteSignUp(reqData){ - localStorage.setItem("session_token", ``); - return this.postAuxEnd("/completesignuplink", reqData); - } + CompleteSignUp(reqData) { + localStorage.setItem("session_token", ``); + return this.postAuxEnd("/completesignuplink", reqData); + } - getHomeDate(){ - var postData = { - uuid: localStorage.getItem("uuid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token") - }; - return this.postAuxEnd("/dashdata", postData); - } - logInUser(reqData) { - localStorage.setItem("session_token", ``); - return this.postAuxEnd("/userlogin", reqData); - } - marketJobData(reqData) { - var postData = { - uuid: localStorage.getItem("uuid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token") - }; - return this.postAuxEnd("/getjobsdata", postData); - } -// - getUserBankList(reqData){ - var postData = { - uuid: localStorage.getItem("uuid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token") - }; - return this.postAuxEnd("/mybanklist", postData); - } - getUserWallets(reqData){ - var postData = { - uuid: localStorage.getItem("uuid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token") - }; - return this.postAuxEnd("/getwallets", postData); - } - getApiGate(){ - // localStorage.setItem("session_token", ``); - return this.postAuxEnd("/apigate", null); - } + getHomeDate() { + var postData = { + uuid: localStorage.getItem("uuid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + }; + return this.postAuxEnd("/dashdata", postData); + } + logInUser(reqData) { + localStorage.setItem("session_token", ``); + return this.postAuxEnd("/userlogin", reqData); + } + marketJobData(reqData) { + var postData = { + uuid: localStorage.getItem("uuid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + }; + return this.postAuxEnd("/getjobsdata", postData); + } + // + getUserBankList(reqData) { + var postData = { + uuid: localStorage.getItem("uuid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + }; + return this.postAuxEnd("/mybanklist", postData); + } + getUserWallets(reqData) { + var postData = { + uuid: localStorage.getItem("uuid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + }; + return this.postAuxEnd("/getwallets", postData); + } + getApiGate() { + // localStorage.setItem("session_token", ``); + return this.postAuxEnd("/apigate", null); + } - getLoadProfile(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 - }; - return this.postAuxEnd("/loadprofile", null); - } + getLoadProfile() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + limit: 100, + }; + return this.postAuxEnd("/loadprofile", null); + } - getOffersList(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 - }; - return this.postAuxEnd("/offerslist", null); - } + getOffersList() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + limit: 100, + }; + return this.postAuxEnd("/offerslist", null); + } - getPendingJob(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100}; - return this.postAuxEnd("/pendingjob", postData); - } + getPendingJob() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + limit: 100, + }; + return this.postAuxEnd("/pendingjob", postData); + } - /* + /* getActiveJobList - All available Jobs */ - getActiveJobList(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 - }; - return this.postAuxEnd("/getjobsdata", postData); - } + getActiveJobList() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + limit: 100, + }; + return this.postAuxEnd("/getjobsdata", postData); + } - /* + /* getMyActiveJobList - List of jobs active under this user */ - // getMyActiveJobList(){ - // var postData = { - // uuid: localStorage.getItem("uid"), - // member_id: localStorage.getItem("member_id"), - // sessionid: localStorage.getItem("session_token"), - // page:0, - // offset:0, - // limit :100 - // }; - // return this.postAuxEnd("/getjobsdata", postData); - // } - getHeroJBanners(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 - }; - return this.postAuxEnd("/homebanners", postData); - } - - getGetPendingJobs(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 - }; - return this.postAuxEnd("/getpendingjobs", postData); - } - - getUsersCards(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 - }; - return this.postAuxEnd("/userscards", postData); - } - - getCouponPending(){ + // getMyActiveJobList(){ + // var postData = { + // uuid: localStorage.getItem("uid"), + // member_id: localStorage.getItem("member_id"), + // sessionid: localStorage.getItem("session_token"), + // page:0, + // offset:0, + // limit :100 + // }; + // return this.postAuxEnd("/getjobsdata", postData); + // } + getHeroJBanners() { var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + limit: 100, }; - return this.postAuxEnd("/couponpending", postData); - } + return this.postAuxEnd("/homebanners", 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); - } - - //END POINT CALL FOR UPDATE PROFILE - addRecipient(data){ - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - ...data - }; - return this.postAuxEnd("/addrecipient", 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); - } - - // Task for the person doing the job - getMyActiveTaskList(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - offset:0, - limit :100 - }; - return this.postAuxEnd("/activetaskslist", postData); - } - getMyActiveJobList(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - offset:0, - limit :100 - }; - return this.postAuxEnd("/jobmanageractive", postData); - } - - getMyPendingJobList(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - offset:0, - limit :100 - }; - return this.postAuxEnd("/jobmanageroffers", postData); - } - getMyJobList(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - offset:0, - limit :100 - }; - return this.postAuxEnd("/jobmanagerlist", postData); - } - // API FUNCTION TO GET COUPON HISTORY - getCouponHx(){ - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:1, - limit :20, - action: 85025 - }; - return this.postAuxEnd("/couponhx", postData); - } - - getPurchaseHx(){ - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:1, - limit :20, - action: 15049 - }; - return this.postAuxEnd("/purchasehx", postData); - } - - // API FUNCTION TO GET PAYMENT HISTORY - getPaymentHx(){ - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:1, - limit :20, - action: 15046 - }; - return this.postAuxEnd("/paymenthx", postData); - } - - // API FUNCTION TO GET PAYMENT HISTORY - 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 - }; - return this.postAuxEnd("/sendmoney", postData); - } - - //END POINT CALL FOR REFERRAL HISTORY - getReferralHx(){ - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - offset: 1, - limit :100, - action: 11064 - }; - return this.postAuxEnd("/refferhx", postData); - } - - //END POINT CALL FOR UPDATE PROFILE - updateProfile(post){ - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - action: 5031, - ...post - }; - return this.postAuxEnd("/updateprofile", postData); - } - - //END POINT CALL FOR GETTING USER PROFILE - loadProfile(post){ - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - }; - return this.postAuxEnd("/loadprofile", postData); - } - - getFamilyList(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 - }; - return this.postAuxEnd("/familylist", postData); - } - - getFamilyAdd(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 - }; - return this.postAuxEnd("/familyadd", postData); - } - - getFamilyUpdate(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 - }; - return this.postAuxEnd("/familyupdate", postData); - } - - getFamilyManage(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 - }; - return this.postAuxEnd("/familymanage", postData); - } - - //END POINT CALL FOR ACCOUNT TOP - startTopUp(post){ - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - action: 11062, - ...post - }; - return this.postAuxEnd("/starttopup", postData); - } - - //END POINT CALL FOR SENDING REFERRAL MESSAGE - sendReferralMsg(postData){ - return this.postAuxEnd("/sendreferral", postData); - } - - StartResetPassword(reqData){ - return this.postAuxEnd("/startresetpasword", reqData) - } - - CompleteResetPassword(reqData){ - return this.postAuxEnd("/stepresetpass", reqData) - } - - getCouponRedeem(){ + getGetPendingJobs() { var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + limit: 100, }; - return this.postAuxEnd("/couponredeem", postData); - } + return this.postAuxEnd("/getpendingjobs", postData); + } - // Country Data {GET} - getSignupCountryData() { - return this.postAuxEnd("/signupcountry", null); - } + getUsersCards() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + limit: 100, + }; + return this.postAuxEnd("/userscards", postData); + } - // END POINT TO GET BANK NAME - getCountryBank() { - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - action: 11183, - country: 'NG' - }; - return this.postAuxEnd("/countrybanks", postData); - } + getCouponPending() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + limit: 100, + }; + return this.postAuxEnd("/couponpending", postData); + } - // END POINT TO GET ACCOUNT TYPE - getAccountTypes() { - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - action: 11177 - }; - return this.postAuxEnd("/accounttypes", 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); + } - // END POINT TO ACCEPT TERMS AND AGREEMENT - jobManagerAgree() { - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - action: 13002 - }; - return this.postAuxEnd("/jobmanageragree", postData); - } + //END POINT CALL FOR UPDATE PROFILE + addRecipient(data) { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + ...data, + }; + return this.postAuxEnd("/addrecipient", postData); + } - // END POINT TO TO CREATE A JOB - jobManagerCreateJob(reqData) { - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - action: 13010, - ...reqData - }; - return this.postAuxEnd("/jobmanagercreatejob", 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); + } - jobManagerUpdateJob(reqData) { - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - action: 13010, - ...reqData - }; - return this.postAuxEnd("/jobmanagerupdatejob", 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); + } - // FUNCTION TO GET ACTIVE JOB MESSAGE LIST - activeJobMesList(reqData) { - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - limit: 30, - action: 14011, - offset: 0, - ...reqData - }; - return this.postAuxEnd("/activejobmsglist", postData); - } + // Task for the person doing the job + getMyActiveTaskList() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + offset: 0, + limit: 100, + }; + return this.postAuxEnd("/activetaskslist", postData); + } + getMyActiveJobList() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + offset: 0, + limit: 100, + }; + return this.postAuxEnd("/jobmanageractive", postData); + } - // FUNCTION TO SEND ACTIVE JOB TASK MESSAGE - sendTaskMessage(reqData) { - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - action: 14010, - ...reqData - }; - return this.postAuxEnd("/sendtaskmessage", postData); - } + getMyPendingJobList() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + offset: 0, + limit: 100, + }; + return this.postAuxEnd("/jobmanageroffers", postData); + } + getMyJobList() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + offset: 0, + limit: 100, + }; + return this.postAuxEnd("/jobmanagerlist", postData); + } + // API FUNCTION TO GET COUPON HISTORY + getCouponHx() { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 1, + limit: 20, + action: 85025, + }; + return this.postAuxEnd("/couponhx", postData); + } - // END POINT TO DELETE A JOB - deleteJob(reqData) { - var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - action: 13011, - ...reqData - }; - return this.postAuxEnd("/jobmanagerdeletejob", postData); - } + getPurchaseHx() { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 1, + limit: 20, + action: 15049, + }; + return this.postAuxEnd("/purchasehx", postData); + } - verifyEmail(code) { - const reqData = { - verify_link: code, - action: 11015 - } - return this.postAuxEnd("/verifysignuplink", reqData); - } + // API FUNCTION TO GET PAYMENT HISTORY + getPaymentHx() { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 1, + limit: 20, + action: 15046, + }; + return this.postAuxEnd("/paymenthx", postData); + } - /* + // API FUNCTION TO GET PAYMENT HISTORY + 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, + }; + return this.postAuxEnd("/sendmoney", postData); + } + + //END POINT CALL FOR REFERRAL HISTORY + getReferralHx() { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + offset: 1, + limit: 100, + action: 11064, + }; + return this.postAuxEnd("/refferhx", postData); + } + + //END POINT CALL FOR UPDATE PROFILE + updateProfile(post) { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + action: 5031, + ...post, + }; + return this.postAuxEnd("/updateprofile", postData); + } + + //END POINT CALL FOR GETTING USER PROFILE + loadProfile(post) { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + }; + return this.postAuxEnd("/loadprofile", postData); + } + + getFamilyList() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + limit: 100, + }; + return this.postAuxEnd("/familylist", postData); + } + + getFamilyAdd() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + limit: 100, + }; + return this.postAuxEnd("/familyadd", postData); + } + + getFamilyUpdate() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + limit: 100, + }; + return this.postAuxEnd("/familyupdate", postData); + } + + getFamilyManage() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + limit: 100, + }; + return this.postAuxEnd("/familymanage", postData); + } + + //END POINT CALL FOR ACCOUNT TOP + startTopUp(post) { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + action: 11062, + ...post, + }; + return this.postAuxEnd("/starttopup", postData); + } + + //END POINT CALL FOR SENDING REFERRAL MESSAGE + sendReferralMsg(postData) { + return this.postAuxEnd("/sendreferral", postData); + } + + StartResetPassword(reqData) { + return this.postAuxEnd("/startresetpasword", reqData); + } + + CompleteResetPassword(reqData) { + return this.postAuxEnd("/stepresetpass", reqData); + } + + getCouponRedeem() { + var postData = { + uuid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + page: 0, + limit: 100, + }; + return this.postAuxEnd("/couponredeem", postData); + } + + // Country Data {GET} + getSignupCountryData() { + return this.postAuxEnd("/signupcountry", null); + } + + // END POINT TO GET BANK NAME + getCountryBank() { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + action: 11183, + country: "NG", + }; + return this.postAuxEnd("/countrybanks", postData); + } + + // END POINT TO GET ACCOUNT TYPE + getAccountTypes() { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + action: 11177, + }; + return this.postAuxEnd("/accounttypes", postData); + } + + // END POINT TO ACCEPT TERMS AND AGREEMENT + jobManagerAgree() { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + action: 13002, + }; + return this.postAuxEnd("/jobmanageragree", postData); + } + + // END POINT TO TO CREATE A JOB + jobManagerCreateJob(reqData) { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + action: 13010, + ...reqData, + }; + return this.postAuxEnd("/jobmanagercreatejob", postData); + } + + jobManagerUpdateJob(reqData) { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + action: 13010, + ...reqData, + }; + return this.postAuxEnd("/jobmanagerupdatejob", postData); + } + + // FUNCTION TO GET ACTIVE JOB MESSAGE LIST + activeJobMesList(reqData) { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + limit: 30, + action: 14011, + offset: 0, + ...reqData, + }; + return this.postAuxEnd("/activejobmsglist", postData); + } + + // FUNCTION TO SEND ACTIVE JOB TASK MESSAGE + sendTaskMessage(reqData) { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + action: 14010, + ...reqData, + }; + return this.postAuxEnd("/sendtaskmessage", postData); + } + + // END POINT TO DELETE A JOB + deleteJob(reqData) { + var postData = { + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), + action: 13011, + ...reqData, + }; + return this.postAuxEnd("/jobmanagerdeletejob", postData); + } + + verifyEmail(code) { + const reqData = { + verify_link: code, + action: 11015, + }; + return this.postAuxEnd("/verifysignuplink", reqData); + } + + /* - 20:27:30.118 FLOG_MAX [757411]: REQ_STRING(username) - 20:27:30.118 FLOG_MAX [757411]: REQ_STRING(password) - 20:27:30.118 FLOG_MAX [757411]: REQ_STRING(sessionid) @@ -565,92 +578,104 @@ class usersService { */ - getUserReminders(){ - return this.getAuxEnd("/reminders", null); - } - //---------------------------------------- ----- - //---------------------------------------- ----- - // Unified call below - //---------------------------------------- ----- - //---------------------------------------- ----- - getAuxEnd(uri, reqData) { - const session_token = localStorage.getItem("session_token"); - let axiosConfig = { - headers: { - 'Accept': 'application/json', - 'Content-Type': 'application/json;charset=UTF-8', - 'Authorization': `Basic ${session_token}`, - } - }; - const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri; - return Axios.get(endPoint,{ - params: { - reqData - }}) - .then((response) => { - console.log("~~~~~~~ Toks2 GET ~~~~~~~~"); - return response; - }) - .catch((error) => { - if (error.response) { - //response status is an error code - console.log(error.response.status); - } else if (error.request) { - //response not received though the request was sent - console.log(error.request); - } else { - //an error occurred when setting up the request - console.log(error.message); - } - }); - } + getUserReminders() { + return this.getAuxEnd("/reminders", null); + } + //---------------------------------------- ----- + //---------------------------------------- ----- + // Unified call below + //---------------------------------------- ----- + //---------------------------------------- ----- + getAuxEnd(uri, reqData) { + const session_token = localStorage.getItem("session_token"); + let axiosConfig = { + headers: { + Accept: "application/json", + "Content-Type": "application/json;charset=UTF-8", + Authorization: `Basic ${session_token}`, + }, + }; + const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri; + return Axios.get(endPoint, { + params: { + reqData, + }, + }) + .then((response) => { + console.log("~~~~~~~ Toks2 GET ~~~~~~~~"); + return response; + }) + .catch((error) => { + if (error.response) { + //response status is an error code + console.log(error.response.status); + } else if (error.request) { + //response not received though the request was sent + console.log(error.request); + } else { + //an error occurred when setting up the request + console.log(error.message); + } + }); + } - - postAuxEnd(uri, reqData) { - const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri; - const session_token = localStorage.getItem("session_token"); - // session_token = session_token !=null ?session_token : ''; - // 'Authorization': `Basic ${(session_token !=null) ?session_token : ''}`, - let axiosConfig = { - headers: { - 'Accept': 'application/json', - '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', - '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; - return Axios.post(endPoint, reqData) - .then((response) => { - console.log(response); - // res = response; - console.log("~~~~~~~ Toks2 POST ~~~~~~~~"); - return response; - }) - .catch((error) => { - if (error.response) { - //response status is an error code - console.log("ERROR-------------------------------------------------------"); - console.log(error.response.status); - console.log("ERROR-------------------------------------------------------"); - } else if (error.request) { - //response not received though the request was sent - console.log("ERROR2-------------------------------------------------------"); - console.log(error?.request); - console.log("ERROR2-------------------------------------------------------"); - } else { - //an error occurred when setting up the request - console.log("ERROR3-------------------------------------------------------"); - console.log(error); - console.log("ERROR3-------------------------------------------------------"); - } - }); - } + postAuxEnd(uri, reqData) { + const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri; + const session_token = localStorage.getItem("session_token"); + // session_token = session_token !=null ?session_token : ''; + // 'Authorization': `Basic ${(session_token !=null) ?session_token : ''}`, + let axiosConfig = { + headers: { + Accept: "application/json", + "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", + "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; + return Axios.post(endPoint, reqData) + .then((response) => { + console.log(response); + // res = response; + console.log("~~~~~~~ Toks2 POST ~~~~~~~~"); + return response; + }) + .catch((error) => { + if (error.response) { + //response status is an error code + console.log( + "ERROR-------------------------------------------------------" + ); + console.log(error.response.status); + console.log( + "ERROR-------------------------------------------------------" + ); + } else if (error.request) { + //response not received though the request was sent + console.log( + "ERROR2-------------------------------------------------------" + ); + console.log(error?.request); + console.log( + "ERROR2-------------------------------------------------------" + ); + } else { + //an error occurred when setting up the request + console.log( + "ERROR3-------------------------------------------------------" + ); + console.log(error); + console.log( + "ERROR3-------------------------------------------------------" + ); + } + }); + } } export default usersService;