diff --git a/frontend/client-portal/src/pages/EmployeeData/UserProfile.tsx b/frontend/client-portal/src/pages/EmployeeData/UserProfile.tsx index 1741e268..deb6a215 100644 --- a/frontend/client-portal/src/pages/EmployeeData/UserProfile.tsx +++ b/frontend/client-portal/src/pages/EmployeeData/UserProfile.tsx @@ -25,6 +25,7 @@ export default function UserProfile() { const { themeStretch } = useSettings(); const navigate = useNavigate(); const [data, setData] = useState(); + const [loading, setLoading] = useState(true); const { corporateValue } = useContext(UserCurrentCorporateContext); const { id } = useParams(); @@ -35,8 +36,8 @@ export default function UserProfile() { .get(corporateValue + '/members/' + id) .then((response) => { setTimeout(() => { - console.log(response.data); setData(response.data); + setLoading(false); }, 1000); }) .catch((error) => { @@ -64,7 +65,7 @@ export default function UserProfile() { - + diff --git a/frontend/client-portal/src/sections/employee-data/user-profile/CardFamilyInformation.tsx b/frontend/client-portal/src/sections/employee-data/user-profile/CardFamilyInformation.tsx index 35902c4e..f8090586 100644 --- a/frontend/client-portal/src/sections/employee-data/user-profile/CardFamilyInformation.tsx +++ b/frontend/client-portal/src/sections/employee-data/user-profile/CardFamilyInformation.tsx @@ -1,6 +1,7 @@ /* ------------------------------- material ui ------------------------------ */ import { Card, Typography, Grid, Skeleton, Stack } from '@mui/material'; import { fDateBirth } from '../../../utils/formatTime'; +import { Fragment } from 'react'; type CardFamilyInformationProps = { data?: { @@ -11,88 +12,20 @@ type CardFamilyInformationProps = { phoneNumber: string; status: string; }[]; + loading: boolean; }; -export default function CardFamilyInformation({ data }: CardFamilyInformationProps) { - console.log(data); - - return ( - - - - - {data ? 'Beneficiary / Family' : } - - - - {data && data.length > 0 ? ( - data.map((familyMember, index) => ( - - - - - - - {familyMember.name ? familyMember.name : '-'} - - - {familyMember.relationship ? familyMember.relationship : '-'} - - - - - - - Date Of Birth - - - - - {familyMember.dateOfBirth ? fDateBirth(familyMember.dateOfBirth) : '-'} - - - - - - - Email - - - - - {familyMember.email ? familyMember.email : '-'} - - - - - - - Phone Number - - - - - {familyMember.phoneNumber ? familyMember.phoneNumber : '-'} - - - - - - - Status - - - - - {familyMember.status ? familyMember.status : '-'} - - - - - - - )) - ) : ( +export default function CardFamilyInformation({ data, loading }: CardFamilyInformationProps) { + if (loading) { + return ( + + + + + + + + @@ -157,9 +90,91 @@ export default function CardFamilyInformation({ data }: CardFamilyInformationPro - )} + - - - ); + + ); + } else { + return data && data.length > 0 ? ( + + + + + Beneficiary / Family + + + + {data.map((familyMember, index) => ( + + + + + + + {familyMember.name ? familyMember.name : '-'} + + + {familyMember.relationship ? familyMember.relationship : '-'} + + + + + + + Date Of Birth + + + + + {familyMember.dateOfBirth ? fDateBirth(familyMember.dateOfBirth) : '-'} + + + + + + + Email + + + + + {familyMember.email ? familyMember.email : '-'} + + + + + + + Phone Number + + + + + {familyMember.phoneNumber ? familyMember.phoneNumber : '-'} + + + + + + + Status + + + + + {familyMember.status ? familyMember.status : '-'} + + + + + + + ))} + + + + ) : ( + + ); + } }