Compare commits

...

6 Commits

Author SHA1 Message Date
Chief Bube d2d6ccca15 Updated the layout 2023-11-01 07:17:19 -07:00
Chief Bube 237ce13a6c . 2023-11-01 06:40:13 -07:00
Chief Bube 4253174494 . 2023-11-01 06:31:05 -07:00
ameye 466175c49d Merge branch 'fixing-height-in-intrest-popup' of WrenchBoard/Users-Wrench into master 2023-11-01 10:39:10 +00:00
Chief Bube ed148ce267 Fixed Family Profile Break 2023-10-31 21:42:15 -07:00
ameye 6de795c07b Merge branch 'error-page' of WrenchBoard/Users-Wrench into master 2023-10-31 21:29:49 +00:00
5 changed files with 32 additions and 10 deletions
+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 20" id="Arrow"><path fill-rule="evenodd" d="M.366 19.708c.405.39 1.06.39 1.464 0l8.563-8.264a1.95 1.95 0 0 0 0-2.827L1.768.292A1.063 1.063 0 0 0 .314.282a.976.976 0 0 0-.011 1.425l7.894 7.617a.975.975 0 0 1 0 1.414L.366 18.295a.974.974 0 0 0 0 1.413" fill="#4687ba" class="color000000 svgShape"></path></svg>

After

Width:  |  Height:  |  Size: 364 B

@@ -6,6 +6,7 @@ import InputCom from "../../Helpers/Inputs/InputCom";
import AuthLayout from "../AuthLayout"; import AuthLayout from "../AuthLayout";
export default function SignUp() { export default function SignUp() {
// eslint-disable-next-line no-restricted-globals
const queryParams = new URLSearchParams(location?.search); const queryParams = new URLSearchParams(location?.search);
const country = queryParams.get("cnt")?.toUpperCase(); const country = queryParams.get("cnt")?.toUpperCase();
@@ -54,6 +54,8 @@ export default function VerifyLink() {
localStorage.setItem("member_id", `${data?.member_id}`); localStorage.setItem("member_id", `${data?.member_id}`);
localStorage.setItem("session_token", `${data?.session}`); localStorage.setItem("session_token", `${data?.session}`);
localStorage.setItem("session", `${data?.session}`); localStorage.setItem("session", `${data?.session}`);
localStorage.setItem("uid", data?.uid)
navigate("/", { replace: true }); navigate("/", { replace: true });
setLinkLoader(false); setLinkLoader(false);
+22 -4
View File
@@ -53,6 +53,7 @@ export default function FamilyTable({
family_uid, family_uid,
banner, banner,
enable_traking, enable_traking,
profile_picture,
}) => { }) => {
// Check for valid dates // Check for valid dates
const addedDate = added ? added.split(" ")[0] : "N/A"; const addedDate = added ? added.split(" ")[0] : "N/A";
@@ -60,7 +61,11 @@ export default function FamilyTable({
const key = `family-${family_uid}`; // Assign a unique key const key = `family-${family_uid}`; // Assign a unique key
const trackingStatus = const trackingStatus =
enable_traking === "0" ? "Stopped" : enable_traking === "100" ? "Active" : ""; enable_traking === "0"
? "Stopped"
: enable_traking === "100"
? "Active"
: "";
return ( return (
<tr <tr
@@ -71,7 +76,8 @@ export default function FamilyTable({
<div className="flex space-x-2 items-center w-full"> <div className="flex space-x-2 items-center w-full">
<div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1]"> <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center flex-[0.1]">
<img <img
src={localImgLoad(`images/icons/${banner}`)} src={profile_picture}
// src={profile_picture || localImgLoad(`images/icons/${banner}`)}
alt={`Avatar of ${firstname} ${lastname}`} alt={`Avatar of ${firstname} ${lastname}`}
className="w-full h-full" className="w-full h-full"
/> />
@@ -130,9 +136,21 @@ export default function FamilyTable({
}) })
} }
type="button" type="button"
className="w-20 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white" className="w-12 h-11 flex justify-center items-center btn-gradient text-base rounded-full text-white"
> >
Manage <svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 11 20"
id="Arrow"
className="w-[0.7rem]"
>
<path
fill-rule="evenodd"
d="M.366 19.708c.405.39 1.06.39 1.464 0l8.563-8.264a1.95 1.95 0 0 0 0-2.827L1.768.292A1.063 1.063 0 0 0 .314.282a.976.976 0 0 0-.011 1.425l7.894 7.617a.975.975 0 0 1 0 1.414L.366 18.295a.974.974 0 0 0 0 1.413"
fill="#4687ba"
className="color000000 svgShape"
></path>
</svg>
</button> </button>
</td> </td>
</tr> </tr>
@@ -49,12 +49,12 @@ export default function FamilyProfile({ familyData, className }) {
// initial values for formik // initial values for formik
let initialValues = { let initialValues = {
family_uid: familyData.uid, family_uid: familyData?.uid,
firstname: familyData.firstname, firstname: familyData?.firstname,
lastname: familyData.lastname, lastname: familyData?.lastname,
year: familyData.year, year: familyData?.year,
month: familyData.month, month: familyData?.month,
enable_traking: familyData.enable_traking, enable_traking: familyData?.enable_traking,
action: 22020, action: 22020,
}; };