From 6c68c2361cf14f72d8515465938040f4823ca592 Mon Sep 17 00:00:00 2001 From: Ebube Date: Wed, 26 Apr 2023 13:09:57 +0100 Subject: [PATCH] adding verification --- src/Routers.jsx | 4 +- src/components/AuthPages/Login/index.jsx | 2 +- src/components/AuthPages/VerifyLink/index.jsx | 101 +++++++++ src/components/AuthPages/VerifyYou/index.jsx | 62 ++++-- src/services/UsersService.js | 198 +++++++++--------- src/views/SignupPage.jsx | 1 + src/views/VerifyLinkPages.jsx | 7 + 7 files changed, 260 insertions(+), 115 deletions(-) create mode 100644 src/components/AuthPages/VerifyLink/index.jsx create mode 100644 src/views/VerifyLinkPages.jsx diff --git a/src/Routers.jsx b/src/Routers.jsx index a19959c..14bcbd8 100644 --- a/src/Routers.jsx +++ b/src/Routers.jsx @@ -22,7 +22,7 @@ import UpdatePasswordPages from "./views/UpdatePasswordPages"; import UploadProductPage from "./views/UploadProductPage"; import UserProfilePage from "./views/UserProfilePage"; import VerifyYouPages from "./views/VerifyYouPages"; - +import VerifyLinkPages from "./views/VerifyLinkPages"; import RemindersPage from './views/RemindersPage'; import TrackingPage from "./views/TrackingPage"; import CalendarPage from "./views/CalendarPage"; @@ -49,6 +49,8 @@ export default function Routers() { element={} /> } /> + } /> + } /> {/* private route */} }> diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index 71f8c34..98d90f7 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -97,7 +97,7 @@ export default function Login() { wrenchboard -
+

{ + const userApi = new usersService() + + try { + const verifyRes = await userApi.verifyEmail(code) + console.log(verifyRes) + if(verifyRes.internal_return === 0) { + let {data} = verifyRes + + } else { + + } + } catch (error) { + console.log(error) + throw new Error(error) + } + } + + useEffect(() => { + verifyEmail(token) + }, []) + + console.log(token) + + return ( + <> + +
+
+
+

+ Sign In to WrenchBoard +

+
+
+ {/* INPUT */} +
+ +
+
+ +
+
+ + {/* + Continue + */} +
+
+
+
+ + + ) +} \ No newline at end of file diff --git a/src/components/AuthPages/VerifyYou/index.jsx b/src/components/AuthPages/VerifyYou/index.jsx index 66607f0..37b7878 100644 --- a/src/components/AuthPages/VerifyYou/index.jsx +++ b/src/components/AuthPages/VerifyYou/index.jsx @@ -9,33 +9,57 @@ export default function VerifyYou() { -
-
-
-

- Verification Code +
+
+
+

+ Sign In to WrenchBoard

-
- shape -
- + {/* INPUT */} +
+ +
+
+ +
-
-

- Dont’t have an aceount ? - - Please resend - -

+ */}
diff --git a/src/services/UsersService.js b/src/services/UsersService.js index f3910cf..757181a 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -6,12 +6,12 @@ class usersService { console.log("WRB Service Entry"); } - CreateUser(reqData){ + CreateUser(reqData) { localStorage.setItem("session_token", ``); return this.postAuxEnd("/createuser", reqData); } - getHomeDate(){ + getHomeDate() { var postData = { uuid: localStorage.getItem("uuid"), member_id: localStorage.getItem("member_id"), @@ -31,8 +31,8 @@ class usersService { }; return this.postAuxEnd("/getjobsdata", postData); } -// - getUserBankList(reqData){ + // + getUserBankList(reqData) { var postData = { uuid: localStorage.getItem("uuid"), member_id: localStorage.getItem("member_id"), @@ -40,7 +40,7 @@ class usersService { }; return this.postAuxEnd("/mybanklist", postData); } - getUserWallets(reqData){ + getUserWallets(reqData) { var postData = { uuid: localStorage.getItem("uuid"), member_id: localStorage.getItem("member_id"), @@ -48,113 +48,114 @@ class usersService { }; 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, - limit :100 + page: 0, + 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, - limit :100 + 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); - } - - getActiveJobList(){ + getPendingJob() { var postData = { uuid: localStorage.getItem("uid"), member_id: localStorage.getItem("member_id"), sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 + page: 0, + limit: 100 + }; + return this.postAuxEnd("/pendingjob", 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); } - getMyJobList(){ + getMyJobList() { var postData = { uuid: localStorage.getItem("uid"), member_id: localStorage.getItem("member_id"), sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 + page: 0, + limit: 100 }; return this.postAuxEnd("/myjobs", postData); } - getGetPendingJobs(){ + getGetPendingJobs() { var postData = { uuid: localStorage.getItem("uid"), member_id: localStorage.getItem("member_id"), sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 + page: 0, + limit: 100 }; return this.postAuxEnd("/getpendingjobs", postData); } - getUsersCards(){ - var postData = { - uuid: localStorage.getItem("uid"), + getUsersCards() { + var postData = { + uuid: localStorage.getItem("uid"), member_id: localStorage.getItem("member_id"), sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 - }; + page: 0, + limit: 100 + }; return this.postAuxEnd("/userscards", postData); } - getCouponPending(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 - }; + 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); } // 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, - limit :20, + page: 1, + limit: 20, action: 11175 }; return this.postAuxEnd("/recipients", postData); } // API FUNCTION TO GET SEND MONEY FEE - getSendMoneyFee(amount){ + getSendMoneyFee(amount) { var postData = { uid: localStorage.getItem("uid"), member_id: localStorage.getItem("member_id"), @@ -166,95 +167,95 @@ class usersService { } // 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, - limit :20, + page: 1, + limit: 20, 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, - limit :20, + page: 1, + limit: 20, 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, - limit :20, + page: 1, + limit: 20, action: 15046 }; return this.postAuxEnd("/paymenthx", 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, - action: 11064 + 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){ + updateProfile(post) { var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - action: 5031, - ...post + 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){ + loadProfile(post) { var postData = { - uid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), + uid: localStorage.getItem("uid"), + member_id: localStorage.getItem("member_id"), + sessionid: localStorage.getItem("session_token"), }; return this.postAuxEnd("/loadprofile", 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) } - getCouponRedeem(){ - var postData = { - uuid: localStorage.getItem("uid"), - member_id: localStorage.getItem("member_id"), - sessionid: localStorage.getItem("session_token"), - page:0, - limit :100 - }; + 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); } @@ -310,9 +311,17 @@ class usersService { */ - getUserReminders(){ + getUserReminders() { return this.getAuxEnd("/reminders", null); } + + verifyEmail(code) { + const reqData = { + verify_link: code, + action: 11015 + } + return this.postAuxEnd("/verifysignuplink", reqData); + } //---------------------------------------- ----- //---------------------------------------- ----- // Unified call below @@ -328,10 +337,11 @@ class usersService { } }; const endPoint = process.env.REACT_APP_USERS_ENDPOINT + uri; - return Axios.get(endPoint,{ + return Axios.get(endPoint, { params: { reqData - }}) + } + }) .then((response) => { console.log("~~~~~~~ Toks2 GET ~~~~~~~~"); return response; @@ -354,22 +364,22 @@ class usersService { 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 : ''; + // 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', + '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; + // Axios.defaults.headers.post['Access-Control-Allow-Origin'] = '*'; //,axiosConfig + // Axios.defaults.withCredentials = true; + //debugger; return Axios.post(endPoint, reqData) .then((response) => { console.log(response); diff --git a/src/views/SignupPage.jsx b/src/views/SignupPage.jsx index a58fbdd..102f0fa 100644 --- a/src/views/SignupPage.jsx +++ b/src/views/SignupPage.jsx @@ -2,6 +2,7 @@ import React from "react"; import SignUp from "../components/AuthPages/SignUp"; function SignupPage() { + return ( <> diff --git a/src/views/VerifyLinkPages.jsx b/src/views/VerifyLinkPages.jsx new file mode 100644 index 0000000..14b1a6e --- /dev/null +++ b/src/views/VerifyLinkPages.jsx @@ -0,0 +1,7 @@ +import React from "react"; +import VerifyLink from "../components/AuthPages/VerifyLink"; + +export default function VerifyYouPages() { + + return ; +}