From fc4a7d5dc7107a8ae9c4372ef9c4d55854afdca1 Mon Sep 17 00:00:00 2001 From: Rishith25 Date: Sun, 5 Jan 2025 18:04:42 +0530 Subject: [PATCH] Skeleton loader for organization and user of facility --- src/components/Facility/FacilityUsers.tsx | 47 ++++++++++++++++++- .../FacilityOrganizationIndex.tsx | 32 +++++++------ .../components/FacilityOrganizationLayout.tsx | 3 +- .../components/OrganizationLayout.tsx | 40 +++++++++++++++- 4 files changed, 101 insertions(+), 21 deletions(-) diff --git a/src/components/Facility/FacilityUsers.tsx b/src/components/Facility/FacilityUsers.tsx index e890af1b381..ccbdd17407b 100644 --- a/src/components/Facility/FacilityUsers.tsx +++ b/src/components/Facility/FacilityUsers.tsx @@ -4,7 +4,6 @@ import { useTranslation } from "react-i18next"; import CountBlock from "@/CAREUI/display/Count"; -import Loading from "@/components/Common/Loading"; import Page from "@/components/Common/Page"; import UserListView from "@/components/Users/UserListAndCard"; @@ -14,6 +13,8 @@ import routes from "@/Utils/request/api"; import query from "@/Utils/request/query"; import useTanStackQueryInstead from "@/Utils/request/useQuery"; +import { Card, CardContent } from "../ui/card"; + export default function FacilityUsers(props: { facilityId: number }) { const { t } = useTranslation(); const { qParams, updateQuery, Pagination } = useFilters({ @@ -42,7 +43,49 @@ export default function FacilityUsers(props: { facilityId: number }) { }); if (userListLoading) { - return ; + return ( +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {Array.from({ length: 6 }).map((_, i) => ( + + +
+
{" "} +
+
+
+
{" "} +
{" "} +
+
{" "} +
+
+
+
+
+
+
+
+
+ ))} +
+
+ ); } if (!userListData) { return
No users found
; diff --git a/src/pages/FacilityOrganization/FacilityOrganizationIndex.tsx b/src/pages/FacilityOrganization/FacilityOrganizationIndex.tsx index 38baf3787d1..5f5977f1dbe 100644 --- a/src/pages/FacilityOrganization/FacilityOrganizationIndex.tsx +++ b/src/pages/FacilityOrganization/FacilityOrganizationIndex.tsx @@ -12,7 +12,6 @@ import { CardHeader, CardTitle, } from "@/components/ui/card"; -import { Skeleton } from "@/components/ui/skeleton"; import Page from "@/components/Common/Page"; @@ -37,25 +36,28 @@ export default function FacilityOrganizationIndex({ if (isLoading) { return ( - +
+
+
+
+
+
+
+
- {Array.from({ length: 3 }).map((_, i) => ( - - - - - - - - + {Array.from({ length: 6 }).map((_, i) => ( + + +
+
+
+
+
- - - ))}
- +
); } diff --git a/src/pages/FacilityOrganization/components/FacilityOrganizationLayout.tsx b/src/pages/FacilityOrganization/components/FacilityOrganizationLayout.tsx index 74259cb460d..f975d5e2cdd 100644 --- a/src/pages/FacilityOrganization/components/FacilityOrganizationLayout.tsx +++ b/src/pages/FacilityOrganization/components/FacilityOrganizationLayout.tsx @@ -12,7 +12,6 @@ import { } from "@/components/ui/breadcrumb"; import { Menubar, MenubarMenu, MenubarTrigger } from "@/components/ui/menubar"; -import Loading from "@/components/Common/Loading"; import Page from "@/components/Common/Page"; import routes from "@/Utils/request/api"; @@ -62,7 +61,7 @@ export default function FacilityOrganizationLayout({ }); if (isLoading) { - return ; + return
Loading...
; } // add loading state if (!org) { diff --git a/src/pages/Organization/components/OrganizationLayout.tsx b/src/pages/Organization/components/OrganizationLayout.tsx index a7b91b31566..746afcaafb1 100644 --- a/src/pages/Organization/components/OrganizationLayout.tsx +++ b/src/pages/Organization/components/OrganizationLayout.tsx @@ -10,9 +10,9 @@ import { BreadcrumbList, BreadcrumbSeparator, } from "@/components/ui/breadcrumb"; +import { Card, CardContent } from "@/components/ui/card"; import { Menubar, MenubarMenu, MenubarTrigger } from "@/components/ui/menubar"; -import Loading from "@/components/Common/Loading"; import Page from "@/components/Common/Page"; import query from "@/Utils/request/query"; @@ -77,7 +77,43 @@ export default function OrganizationLayout({ }); if (isLoading) { - return ; + return ( +
+
+
+
+ {[...Array(4)].map((_, index) => ( +
+ ))} +
+ +
+
+
+ {Array.from({ length: 6 }).map((_, i) => ( + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + ))} +
+
+ ); } // add loading state if (!org) {