Merge pull request #101 from globalfund/develop

Release

Author: stephanoshadjipetrou

.husky/pre-commit

@@ -1,5 +1,4 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
+
 
 yarn prettier src/app --check
 npx eslint src --ext .js,.jsx,.tsx,ts --max-warnings 0

cypress/e2e/datasets/annual-results.cy.ts

@@ -34,7 +34,9 @@ describe("Testing The Location page", () => {
         "be.visible",
       );
       cy.contains("People with TB treated in 2022").should("be.visible");
-      cy.contains("Mosquito nets distributed in 2022").should("be.visible");
+      cy.contains(
+        "Insecticide-treated mosquito nets distributed in 2022",
+      ).should("be.visible");
     });
 
     it("Can filter page data", { scrollBehavior: false }, () => {

eslint.config.js

@@ -61,5 +61,5 @@ export default tseslint.config(
       "no-case-declarations": "off",
       "jsx-a11y/no-autofocus": "off",
     },
-  }
+  },
 );

package.json

@@ -23,13 +23,13 @@
     "@types/react-router-hash-link": "^2.4.9",
     "@types/tabulator-tables": "^5.7.0",
     "@vitejs/plugin-react": "^4.7.0",
-    "axios": "^1.6.8",
+    "axios": "^1.13.2",
     "detect-it": "^4.0.1",
     "dom-to-image": "^2.6.0",
     "dotenv": "^16.4.6",
     "easy-peasy": "^6.1.0",
     "echarts": "^5.5.0",
-    "jspdf": "^3.0.1",
+    "jspdf": "^3.0.4",
     "lodash": "^4.17.21",
     "p-limit": "^6.2.0",
     "react": "^18.3.1",
@@ -42,7 +42,7 @@
     "styled-components": "^6.1.8",
     "tabulator-tables": "^6.2.1",
     "typescript": "^5.4.5",
-    "vite": "^7.0.6",
+    "vite": "^7.2.4",
     "web-vitals": "^3.3.1"
   },
   "devDependencies": {

public/gflogo.png

@@ -196,7 +196,7 @@ export const InfoPanel: React.FC<InfoPanelProps> = (props: InfoPanelProps) => {
       <Box display="flex" justifyContent="space-between" alignItems="center">
         <Typography
           color="#495057"
-          fontSize="12px"
+          fontSize="14px"
           fontWeight="700"
           marginBottom="8px"
         >
@@ -217,7 +217,7 @@ export const InfoPanel: React.FC<InfoPanelProps> = (props: InfoPanelProps) => {
         className="scrollbar"
         style={{
           color: "#495057",
-          fontSize: "12px",
+          fontSize: "14px",
           overflowY: "auto",
           maxHeight: "270px",
         }}

src/app/components/chart-block/components/button-toolbar/data.tsx

@@ -76,7 +76,7 @@ export const ChartBlockButtonToolbar: React.FC<ChartBlockButtonToolbarProps> = (
             "& > button": {
               padding: "0",
               width: "40px",
-              height: "30px",
+              height: "35px",
               borderRadius: "4px",
               background: "transparent",
               border: "1px solid #DFE3E5",
@@ -105,10 +105,10 @@ export const ChartBlockButtonToolbar: React.FC<ChartBlockButtonToolbarProps> = (
                 flexDirection="row"
                 sx={{
                   "& > button": {
-                    height: "30px",
+                    height: "35px",
                     fontSize: "14px",
                     fontWeight: "400",
-                    padding: "7px 12px",
+                    padding: "9px 12px",
                     borderRadius: "4px",
                     textTransform: "none",
                     color: appColors.CHART_BLOCK_CYCLES.BUTTON_TEXT_COLOR,
@@ -124,10 +124,10 @@ export const ChartBlockButtonToolbar: React.FC<ChartBlockButtonToolbarProps> = (
                     },
                   },
                   "& > div": {
-                    height: "30px",
+                    height: "35px",
                     fontSize: "14px",
                     fontWeight: "400",
-                    padding: "7px 12px",
+                    padding: "9px 12px",
                     borderRadius: "4px",
                     color: appColors.COMMON.WHITE,
                     background: appColors.COMMON.BLACK,

src/app/components/chart-block/components/button-toolbar/index.tsx

@@ -24,10 +24,10 @@ export const ChartBlockCycles: React.FC<ChartBlockCyclesProps> = (
       position="relative"
       sx={{
         "& > button": {
-          height: "32px",
+          height: "35px",
           fontSize: "14px",
           fontWeight: "400",
-          padding: "7px 12px",
+          padding: "9px 12px",
           borderRadius: "4px",
           textTransform: "none",
           border: "1px solid #DFE3E5",

src/app/components/chart-block/components/cycles/index.tsx

@@ -2,14 +2,14 @@ import React from "react";
 import Box from "@mui/material/Box";
 import uniqueId from "lodash/uniqueId";
 import Divider from "@mui/material/Divider";
+import { useCMSData } from "app/hooks/useCMSData";
 import Typography from "@mui/material/Typography";
 import { Dropdown } from "app/components/dropdown";
+import { getCMSDataField } from "app/utils/getCMSDataField";
 import CircularProgress from "@mui/material/CircularProgress";
 import { ChartBlockProps } from "app/components/chart-block/data";
 import { ChartBlockCycles } from "app/components/chart-block/components/cycles";
 import { ChartBlockButtonToolbar } from "app/components/chart-block/components/button-toolbar";
-import { useCMSData } from "app/hooks/useCMSData";
-import { getCMSDataField } from "app/utils/getCMSDataField";
 
 export const ChartBlock: React.FC<ChartBlockProps> = (
   props: ChartBlockProps,
@@ -82,7 +82,12 @@ export const ChartBlock: React.FC<ChartBlockProps> = (
         {props.subtitle}
       </Typography>
       {props.text && props.text.length > 0 && (
-        <Typography variant="subtitle2" lineHeight="normal" marginBottom="20px">
+        <Typography
+          fontSize="18px"
+          variant="subtitle2"
+          lineHeight="normal"
+          marginBottom="20px"
+        >
           <Box
             sx={{
               a: { textDecoration: "none", fontWeight: "700", color: "#000" },
@@ -181,7 +186,7 @@ export const ChartBlock: React.FC<ChartBlockProps> = (
         justifyContent={props.latestUpdate ? "space-between" : "flex-end"}
       >
         {props.latestUpdate && (
-          <Typography variant="overline">
+          <Typography variant="overline" fontSize="14px">
             {getCMSDataField(
               cmsData,
               "pagesHome.latestUpdateText",

src/app/components/chart-block/index.tsx

@@ -174,7 +174,7 @@ export const BarSeriesChart: React.FC<BarSeriesChartProps> = (
             show: false,
           },
           nameTextStyle: {
-            fontSize: "10px",
+            fontSize: "12px",
             fontFamily: "Inter, sans-serif",
             color: appColors.TIME_CYCLE.AXIS_TEXT_COLOR,
           },
@@ -215,7 +215,7 @@ export const BarSeriesChart: React.FC<BarSeriesChartProps> = (
           align: "left",
           itemGap: 20,
           textStyle: {
-            fontSize: "12px",
+            fontSize: "14px",
             fontFamily: "Inter, sans-serif",
             color: appColors.TIME_CYCLE.AXIS_TEXT_COLOR,
           },