fix: remove the extra accordion files and fix chronic nutrition svg

jst-seminar-rostlab-tum · Dec 19, 2024 · 1f5b2ad · 1f5b2ad
1 parent be3ca0d
commit 1f5b2ad
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 49 deletions.
diff --git a/src/components/Map/FcsMap/FcsAccordion.tsx b/src/components/Map/FcsMap/FcsAccordion.tsx
@@ -1,14 +1,14 @@
 import FcsAccordionProps from '@/domain/props/FcsAccordionProps';
+import { getFcsFoodSecurityAccordionItems } from '@/operations/map/FcsFoodSecurityOperations';
+import { getMacroEconomicAccordionOperations } from '@/operations/map/FcsMacroEconomicOperations';
 import { useMediaQuery } from '@/utils/resolution.ts';
 
 import AccordionContainer from '../../Accordions/AccordionContainer';
-import FcsFoodSecurityAccordion from './FcsFoodSecurityAccordion';
-import FcsMacroEconomicAccordion from './FcsMacroEconomicAccordion';
 
 export default function FcsAccordion({ countryData, loading, countryIso3Data, countryName }: FcsAccordionProps) {
   const isMobile = useMediaQuery('(max-width: 700px)');
-  const foodSecurityAccordion = FcsFoodSecurityAccordion({ countryData, countryIso3Data });
-  const macroEconomicAccordion = FcsMacroEconomicAccordion({ countryData, countryIso3Data });
+  const foodSecurityAccordion = getFcsFoodSecurityAccordionItems(countryData, countryIso3Data);
+  const macroEconomicAccordion = getMacroEconomicAccordionOperations(countryData, countryIso3Data);
 
   return (
     <>

diff --git a/src/components/Map/FcsMap/FcsFoodSecurityAccordion.tsx b/src/components/Map/FcsMap/FcsFoodSecurityAccordion.tsx
diff --git a/src/components/Map/FcsMap/FcsMacroEconomicAccordion.tsx b/src/components/Map/FcsMap/FcsMacroEconomicAccordion.tsx
diff --git a/src/components/Map/IpcMap/IpcAccordion.tsx b/src/components/Map/IpcMap/IpcAccordion.tsx
@@ -1,20 +1,18 @@
 import AccordionContainer from '@/components/Accordions/AccordionContainer';
 import IpcAccordionProps from '@/domain/props/IpcAccordionProps';
+import { IpcFoodSecurityAccordionOperations } from '@/operations/map/IpcFoodSecurityOperations';
 import { useMediaQuery } from '@/utils/resolution.ts';
 
-import IpcFoodSecurityAccordion from './IpcFoodSecurityAccordion';
-import IpcNutritionAccordion from './IpcNutritionAccordion';
-
 export default function IpcAccordion({ countryData, countryName, countryIso3Data }: IpcAccordionProps) {
   const deltaOneMonth = countryData?.fcsMinus1 ? countryData.fcs - countryData.fcsMinus1 : null;
   const deltaThreeMonth = countryData?.fcsMinus3 ? countryData.fcs - countryData.fcsMinus3 : null;
 
-  const ipcFoodSecurityAccordion = IpcFoodSecurityAccordion({
+  const ipcFoodSecurityAccordion = IpcFoodSecurityAccordionOperations.getFoodSecurityAccordionItems(
     countryData,
     deltaOneMonth,
-    deltaThreeMonth,
-  });
-  const ipcNutrititonAccordion = IpcNutritionAccordion({ countryIso3Data });
+    deltaThreeMonth
+  );
+  const ipcNutrititonAccordion = IpcFoodSecurityAccordionOperations.getNutritionAccordion(countryIso3Data);
   const isMobile = useMediaQuery('(max-width: 700px)');
 
   return (

diff --git a/src/components/Map/IpcMap/IpcFoodSecurityAccordion.tsx b/src/components/Map/IpcMap/IpcFoodSecurityAccordion.tsx
diff --git a/src/components/Map/IpcMap/IpcNutritionAccordion.tsx b/src/components/Map/IpcMap/IpcNutritionAccordion.tsx
diff --git a/src/operations/map/FcsFoodSecurityOperations.tsx b/src/operations/map/FcsFoodSecurityOperations.tsx
@@ -96,7 +96,7 @@ export function getFcsFoodSecurityAccordionItems(
                 title="Chronic Nutrition"
                 content={[
                   {
-                    svgIcon: <Nutrition className="w-[30px] h-[30px] object-contain" />,
+                    svgIcon: <Nutrition className="w-[40px] h-[40px] object-contain" />,
                     text: (
                       <NutritionAccordionText
                         nutritionValue={`${nutritionData.Chronic} %`}

diff --git a/src/operations/map/IpcFoodSecurityOperations.tsx b/src/operations/map/IpcFoodSecurityOperations.tsx
@@ -100,7 +100,7 @@ export const IpcFoodSecurityAccordionOperations = {
                 title="Chronic Nutrition"
                 content={[
                   {
-                    svgIcon: <Nutrition className="w-[50px] h-[50px] object-contain" />,
+                    svgIcon: <Nutrition className="w-[40px] h-[40px] object-contain" />,
                     text: (
                       <NutritionAccordionText
                         nutritionValue={`${nutritionData.Chronic} %`}