Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Skeleton for Country Insights in Country View on mobile #147

Merged
merged 1 commit into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/components/Accordions/AccordionModalSkeleton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { Skeleton } from '@nextui-org/skeleton';

export default function AccordionModalSkeleton() {
return (
<div className="absolute bottom-10 right-28 z-9999">
{/* For screens smaller than 450px */}
<div className="block sm450:hidden sm700:hidden">
<Skeleton className="rounded-full w-[40px] h-[40px] bg-content1 dark:bg-content1" />
</div>

{/* For screens between 450px and 700px */}
<div className="hidden sm450:block sm700:hidden">
<Skeleton className="rounded-xl w-[112px] h-[40px] bg-content1 dark:bg-content1" />
</div>
</div>
);
}
14 changes: 9 additions & 5 deletions src/components/Map/FcsChoropleth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import FcsChoroplethProps from '@/domain/props/FcsChoroplethProps';
import FcsChoroplethOperations from '@/operations/map/FcsChoroplethOperations';
import { MapOperations } from '@/operations/map/MapOperations';

import AccordionModalSkeleton from '../Accordions/AccordionModalSkeleton';
import CountryLoadingLayer from './CountryLoading';
import FscCountryChoropleth from './FcsCountryChoropleth';

Expand Down Expand Up @@ -65,11 +66,14 @@ export default function FcsChoropleth({
)}
{/* Animated GeoJSON layer for the selected country */}
{selectedCountryId && (!regionData || !regionLabelData) && (
<CountryLoadingLayer
data={data}
selectedCountryId={selectedCountryId}
color="hsl(var(--nextui-fcsAnimation))"
/>
<>
<CountryLoadingLayer
data={data}
selectedCountryId={selectedCountryId}
color="hsl(var(--nextui-fcsAnimation))"
/>
<AccordionModalSkeleton />
</>
)}
{regionData && countryId === selectedCountryId && regionLabelData && (
<FscCountryChoropleth
Expand Down
24 changes: 14 additions & 10 deletions src/components/Map/IpcMap/IpcChoropleth.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { FeatureCollection, GeoJsonProperties, Geometry } from 'geojson';
import React from 'react';

import AccordionModalSkeleton from '@/components/Accordions/AccordionModalSkeleton';
import CountryLoadingLayer from '@/components/Map/CountryLoading';
import { useSelectedCountryId } from '@/domain/contexts/SelectedCountryIdContext';
import { useIpcQuery } from '@/domain/hooks/globalHooks';
Expand All @@ -24,16 +25,19 @@ function IpcChoropleth({ countries, countryData, ipcRegionData, selectedCountryN
/>
)}
{!ipcRegionData && selectedCountryId && (
<CountryLoadingLayer
data={
{
type: 'FeatureCollection',
features: countries.features.filter((feature) => feature?.properties?.adm0_id === selectedCountryId),
} as FeatureCollection<Geometry, GeoJsonProperties>
}
selectedCountryId={selectedCountryId}
color="hsl(var(--nextui-ipcAnimation))"
/>
<>
<CountryLoadingLayer
data={
{
type: 'FeatureCollection',
features: countries.features.filter((feature) => feature?.properties?.adm0_id === selectedCountryId),
} as FeatureCollection<Geometry, GeoJsonProperties>
}
selectedCountryId={selectedCountryId}
color="hsl(var(--nextui-ipcAnimation))"
/>
<AccordionModalSkeleton />
</>
)}

{ipcRegionData && (
Expand Down
14 changes: 9 additions & 5 deletions src/components/Map/NutritionChoropleth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import NutritionChoroplethProps from '@/domain/props/NutritionChoroplethProps';
import { MapOperations } from '@/operations/map/MapOperations';
import NutritionChoroplethOperations from '@/operations/map/NutritionChoroplethOperations';

import AccordionModalSkeleton from '../Accordions/AccordionModalSkeleton';
import CountryLoadingLayer from './CountryLoading';
import NutritionStateChoropleth from './NutritionStateChoropleth';

Expand Down Expand Up @@ -69,11 +70,14 @@ export default function NutritionChoropleth({
)}
{/* Animated GeoJSON layer for the selected country */}
{selectedCountryId && (!regionNutritionData || !regionLabelData) && (
<CountryLoadingLayer
data={data}
selectedCountryId={selectedCountryId}
color="hsl(var(--nextui-nutritionAnimation))"
/>
<>
<CountryLoadingLayer
data={data}
selectedCountryId={selectedCountryId}
color="hsl(var(--nextui-nutritionAnimation))"
/>
<AccordionModalSkeleton />
</>
)}
{
// if this country ('countryId') is selected and data is loaded ('regionNutritionData') show Choropleth for all states
Expand Down
1 change: 1 addition & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ const config = {
},
screens: {
sm700: '700px',
sm450: '450px',
},
width: {
'215px': '215px',
Expand Down
Loading