From 4224be46bcb1757df8eaf7f52c7fe677f3ebd40f Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sat, 8 Jul 2023 23:19:23 -0400 Subject: [PATCH] banner issues --- src/components/AuthPages/AuthRedirect/Redirect.jsx | 6 +++++- src/components/Cards/FamilyActiveJobsCard.jsx | 5 +++-- src/services/UsersService.js | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/components/AuthPages/AuthRedirect/Redirect.jsx b/src/components/AuthPages/AuthRedirect/Redirect.jsx index 4f45717..1f752b4 100644 --- a/src/components/AuthPages/AuthRedirect/Redirect.jsx +++ b/src/components/AuthPages/AuthRedirect/Redirect.jsx @@ -39,8 +39,12 @@ function Redirect() { if (res.status != 200 || res.internal_return < 0) { return; } + + userApi.CompleteOauthLogin(res.data).then( (logRes)=>{ + console.log("OUATH FROm BACKEND",logRes); + } ) // "{"message":"Endpoint not found.","URI":"http:\/\/localhost:9083\/index.php\/en\/wrench\/api\/v1\/authstart"}[]" - alert(JSON.stringify(res.data)); + //alert(JSON.stringify(res.data)); }) .catch((error) => { console.log(error); diff --git a/src/components/Cards/FamilyActiveJobsCard.jsx b/src/components/Cards/FamilyActiveJobsCard.jsx index d652b71..291ed52 100644 --- a/src/components/Cards/FamilyActiveJobsCard.jsx +++ b/src/components/Cards/FamilyActiveJobsCard.jsx @@ -21,7 +21,8 @@ export default function FamilyActiveJobsCard({ datas, hidden = false }) { toast.warn("Remove to Favorite List"); } }; - +//debugger; + const bannerName = datas.banner == null ?'default.jpg':datas.banner; return (
@@ -32,7 +33,7 @@ export default function FamilyActiveJobsCard({ datas, hidden = false }) { className="thumbnail w-full h-full rounded-xl overflow-hidden px-4 pt-4" style={{ background: `url(${localImgLoad( - `images/taskbanners/${datas.banner}` + `images/taskbanners/${bannerName}` )}) center / contain no-repeat`, }} > diff --git a/src/services/UsersService.js b/src/services/UsersService.js index 2656169..4134519 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -10,6 +10,10 @@ class usersService { return this.postAuxEnd("/createuser", reqData); } + CompleteOauthLogin(reqData) { + localStorage.setItem("session_token", ``); + return this.postAuxEnd("/authlogin", reqData); + } CompleteSignUp(reqData) { localStorage.setItem("session_token", ``); return this.postAuxEnd("/completesignuplink", reqData);