@@ -39,7 +35,7 @@ export const Tooltip = ({
);
};
-interface graphProps {
+interface GraphProps {
title: string;
subtitle: string;
years: number[];
@@ -52,6 +48,11 @@ interface graphProps {
};
}
+interface CustomTooltipProps {
+ dataPointIndex: number;
+ w: { config: ApexOptions; globals: any };
+}
+
const Graph = ({
title,
subtitle,
@@ -59,7 +60,7 @@ const Graph = ({
series1Values,
series2Values,
tooltip,
-}: graphProps) => {
+}: GraphProps) => {
const xaxisOptions = years.map((year, index) => {
if (index === 1) {
return [2020, ' Project Launch'];
@@ -68,119 +69,116 @@ const Graph = ({
}
});
- const graphValues = {
- series: [
- {
- name: 'series1',
- data: series1Values,
- color: '#219653',
- zIndex: 2,
- },
- {
- name: 'series2',
- data: series2Values,
- color: '#BDBDBD',
- zIndex: 1,
- },
- ],
- options: {
- chart: {
- type: 'area',
- width: 300,
- toolbar: {
- show: false,
- },
+ const options = {
+ chart: {
+ type: 'area',
+ width: 300,
+ toolbar: {
+ show: false,
},
- tooltip: {
- custom: function ({ dataPointIndex, w }) {
- const getToolTip = () => {
- const year = Array.isArray(xaxisOptions[dataPointIndex])
- ? xaxisOptions[dataPointIndex][0]
- : xaxisOptions[dataPointIndex];
- return (
-
- );
- };
+ },
+ tooltip: {
+ custom: function ({ dataPointIndex, w }: CustomTooltipProps) {
+ const getToolTip = () => {
+ const dataPoint = xaxisOptions[dataPointIndex];
+ const year = Array.isArray(dataPoint) ? dataPoint[0] : dataPoint;
+ return (
+
+ );
+ };
- return ReactDOMServer.renderToString(getToolTip());
- },
+ return ReactDOMServer.renderToString(getToolTip());
},
- markers: {
- size: 0,
- colors: ['#fff', 'transparent'],
- strokeColors: ['#219653', 'transparent'],
- strokeOpacity: [1, 1],
- strokeWidth: 2.2,
- hover: {
- size: 6,
- },
+ },
+ markers: {
+ size: 0,
+ colors: ['#fff', 'transparent'],
+ strokeColors: ['#219653', 'transparent'],
+ strokeOpacity: [1, 1],
+ strokeWidth: 2.2,
+ hover: {
+ size: 6,
},
+ },
- dataLabels: {
- enabled: false,
- },
- stroke: {
- curve: 'smooth',
- width: 2.2,
- },
- xaxis: {
- type: 'year',
- labels: {
- formatter: function (index: number) {
- if (index === 2) {
- return xaxisOptions[1];
- } else if (index == xaxisOptions.length) {
- return xaxisOptions[index - 1];
- } else {
- return '';
- }
- },
- minHeight: 35,
- style: {
- colors: '#4F4F4F',
- fontSize: 10,
- },
- },
- show: false,
- axisTicks: {
- show: false,
- },
- tooltip: {
- enabled: false,
+ dataLabels: {
+ enabled: false,
+ },
+ stroke: {
+ curve: 'smooth',
+ width: 2.2,
+ },
+ xaxis: {
+ type: 'year',
+ labels: {
+ formatter: function (index: number) {
+ if (index === 2) {
+ return xaxisOptions[1];
+ } else if (index == xaxisOptions.length) {
+ return xaxisOptions[index - 1];
+ } else {
+ return '';
+ }
},
- axisBorder: {
- show: false,
+ minHeight: 35,
+ style: {
+ colors: '#4F4F4F',
+ fontSize: 10,
},
},
- yaxis: {
+ show: false,
+ axisTicks: {
show: false,
},
- grid: {
- show: false,
+ tooltip: {
+ enabled: false,
},
- legend: {
+ axisBorder: {
show: false,
},
- annotations: {
- xaxis: [
- {
- x: xaxisOptions[1],
- strokeDashArray: 1,
- borderColor: '#4F4F4F',
- },
- ],
- },
+ },
+ yaxis: {
+ show: false,
+ },
+ grid: {
+ show: false,
+ },
+ legend: {
+ show: false,
+ },
+ annotations: {
+ xaxis: [
+ {
+ x: xaxisOptions[1],
+ strokeDashArray: 1,
+ borderColor: '#4F4F4F',
+ },
+ ],
},
};
+ const series = [
+ {
+ name: 'series1',
+ data: series1Values,
+ color: '#219653',
+ zIndex: 2,
+ },
+ {
+ name: 'series2',
+ data: series2Values,
+ color: '#BDBDBD',
+ zIndex: 1,
+ },
+ ];
return (
@@ -192,8 +190,8 @@ const Graph = ({
Date: Wed, 21 Feb 2024 14:45:36 +0530
Subject: [PATCH 12/28] add chromatic workflow
---
.github/workflows/chromatic.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
index 1835eb970e..5778ac03aa 100644
--- a/.github/workflows/chromatic.yml
+++ b/.github/workflows/chromatic.yml
@@ -10,6 +10,7 @@ on:
- feature/storybook-update
- develop
- feature/redesign-explore-btn
+ - feature/design-capture-graph
# List of jobs
jobs:
chromatic-deployment:
From 905bef8409167a322d114cee7914245ad20f3e56 Mon Sep 17 00:00:00 2001
From: prachigarg19 <72646230+prachigarg19@users.noreply.github.com>
Date: Wed, 21 Feb 2024 15:12:14 +0530
Subject: [PATCH 13/28] add gradient in graph
---
src/temp/CarbonCapture/Graph.tsx | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index d1d5e1efb3..0ea0dc5d21 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -70,6 +70,14 @@ const Graph = ({
});
const options = {
+ fill: {
+ type: 'gradient',
+ gradient: {
+ shadeIntensity: 1,
+ opacityFrom: 0.58,
+ opacityTo: 0,
+ },
+ },
chart: {
type: 'area',
width: 300,
From 0c17009f2fcf7ef0bc25adf77b91a2196048d64e Mon Sep 17 00:00:00 2001
From: prachigarg19 <72646230+prachigarg19@users.noreply.github.com>
Date: Wed, 21 Feb 2024 16:06:27 +0530
Subject: [PATCH 14/28] add property to make tooltip follow cursor
---
src/temp/CarbonCapture/Graph.tsx | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index 0ea0dc5d21..c6ee55e2d6 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -106,6 +106,7 @@ const Graph = ({
return ReactDOMServer.renderToString(getToolTip());
},
+ followCursor: true,
},
markers: {
size: 0,
From e26e9fbee8a3b25fa7988231cd064e0b6c99ccbb Mon Sep 17 00:00:00 2001
From: prachigarg19 <72646230+prachigarg19@users.noreply.github.com>
Date: Wed, 21 Feb 2024 16:50:36 +0530
Subject: [PATCH 15/28] add styles for annotation
---
src/temp/CarbonCapture/Graph.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index c6ee55e2d6..567ece0602 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -168,8 +168,8 @@ const Graph = ({
xaxis: [
{
x: xaxisOptions[1],
- strokeDashArray: 1,
- borderColor: '#4F4F4F',
+ strokeDashArray: 0,
+ borderColor: '#219653',
},
],
},
From af864b812bf9370756602b2e7f03138b210026a9 Mon Sep 17 00:00:00 2001
From: prachigarg19 <72646230+prachigarg19@users.noreply.github.com>
Date: Wed, 21 Feb 2024 18:01:03 +0530
Subject: [PATCH 16/28] add translations
---
public/static/locales/en/projectDetails.json | 9 ++++++++-
src/temp/CarbonCapture/Graph.tsx | 20 +++++++++++++-------
src/temp/stories/Graph.stories.tsx | 8 ++++----
3 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/public/static/locales/en/projectDetails.json b/public/static/locales/en/projectDetails.json
index 88891f60e5..c397082898 100644
--- a/public/static/locales/en/projectDetails.json
+++ b/public/static/locales/en/projectDetails.json
@@ -1,3 +1,10 @@
{
- "satelliteAnalysis": "Satellite Analysis"
+ "satelliteAnalysis": "Satellite Analysis",
+ "co2CapturePerHa": "CO2 Captured (per ha.)",
+ "comparedToRegionalAverage": "Compared to regional average",
+ "co2Removed": "CO2 removed",
+ "biomass": "Biomass",
+ "yoy": "YoY",
+ "projectLaunch": "Project Launch",
+ "canopyCover": "Canopy Cover"
}
\ No newline at end of file
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index 567ece0602..78d09903eb 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -4,6 +4,7 @@ import styles from './Graph.module.scss';
import ReactDOMServer from 'react-dom/server';
import NewInfoIcon from '../icons/NewInfoIcon';
import { ApexOptions } from 'apexcharts';
+import { useTranslation } from 'next-i18next';
interface TooltipProps {
headerTitle: string;
@@ -18,6 +19,7 @@ export const Tooltip = ({
yoyValue,
date,
}: TooltipProps) => {
+ const { t } = useTranslation('projectDetails');
return (
@@ -26,8 +28,7 @@ export const Tooltip = ({
- {yoyValue}
- {' YoY'}
+ {yoyValue} {t('yoy')}
{date}
@@ -61,9 +62,10 @@ const Graph = ({
series2Values,
tooltip,
}: GraphProps) => {
+ const { t } = useTranslation('projectDetails');
const xaxisOptions = years.map((year, index) => {
if (index === 1) {
- return [2020, ' Project Launch'];
+ return [2020, ` ${t('projectLaunch')}`];
} else {
return year;
}
@@ -92,10 +94,14 @@ const Graph = ({
const year = Array.isArray(dataPoint) ? dataPoint[0] : dataPoint;
return (
- {title}
+ {t(`${title}`)}
-
{subtitle}
+
{t(`${subtitle}`)}
Date: Thu, 22 Feb 2024 15:13:12 +0530
Subject: [PATCH 17/28] add useEffect and useState
---
src/temp/CarbonCapture/Graph.tsx | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index 78d09903eb..2bf1548aa2 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
import ReactApexChart from 'react-apexcharts';
import styles from './Graph.module.scss';
import ReactDOMServer from 'react-dom/server';
@@ -63,13 +63,20 @@ const Graph = ({
tooltip,
}: GraphProps) => {
const { t } = useTranslation('projectDetails');
- const xaxisOptions = years.map((year, index) => {
- if (index === 1) {
- return [2020, ` ${t('projectLaunch')}`];
- } else {
- return year;
- }
- });
+ const [xaxisOptions, setXaxisOptions] = useState<
+ (number | (string | number)[])[]
+ >([]);
+
+ useEffect(() => {
+ const newOptions = years.map((year, index) => {
+ if (index === 1) {
+ return [2020, ` ${t('projectLaunch')}`];
+ } else {
+ return year;
+ }
+ });
+ setXaxisOptions(newOptions);
+ }, []);
const options = {
fill: {
From ee59f93ff70b497826a512fb07e0d5f115b28f73 Mon Sep 17 00:00:00 2001
From: prachigarg19 <72646230+prachigarg19@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:12:52 +0530
Subject: [PATCH 18/28] fix heading style
---
public/static/locales/en/projectDetails.json | 2 +-
src/temp/CarbonCapture/Graph.module.scss | 16 +++++++++++++---
src/temp/CarbonCapture/Graph.tsx | 14 +++++++++++---
3 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/public/static/locales/en/projectDetails.json b/public/static/locales/en/projectDetails.json
index c397082898..e320d10543 100644
--- a/public/static/locales/en/projectDetails.json
+++ b/public/static/locales/en/projectDetails.json
@@ -1,6 +1,6 @@
{
"satelliteAnalysis": "Satellite Analysis",
- "co2CapturePerHa": "CO2 Captured (per ha.)",
+ "co2CapturePerHa": "CO2 Captured (per ha.)
",
"comparedToRegionalAverage": "Compared to regional average",
"co2Removed": "CO2 removed",
"biomass": "Biomass",
diff --git a/src/temp/CarbonCapture/Graph.module.scss b/src/temp/CarbonCapture/Graph.module.scss
index 5701874120..09af4dede5 100644
--- a/src/temp/CarbonCapture/Graph.module.scss
+++ b/src/temp/CarbonCapture/Graph.module.scss
@@ -39,15 +39,18 @@
flex-direction: column;
justify-content: center;
align-items: center;
-
.graphHeading {
font-size: 10px;
color: #2F3336;
- font-weight: 700;
display: flex;
align-items: center;
- justify-content: space-between;
padding:0 15px;
+ gap: 2px;
+ font-weight: 700;
+ p {
+ font-weight: 400;
+ }
+
}
.graphSubheading {
color: #BDBDBD;
@@ -59,4 +62,11 @@
.titleContainer {
width: 299px;
+}
+.newInfoIcon {
+ margin-left: auto;
+ margin-right: 8px;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
}
\ No newline at end of file
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index 2bf1548aa2..8c684c9e38 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -4,7 +4,7 @@ import styles from './Graph.module.scss';
import ReactDOMServer from 'react-dom/server';
import NewInfoIcon from '../icons/NewInfoIcon';
import { ApexOptions } from 'apexcharts';
-import { useTranslation } from 'next-i18next';
+import { Trans, useTranslation } from 'next-i18next';
interface TooltipProps {
headerTitle: string;
@@ -205,8 +205,16 @@ const Graph = ({
- {t(`${title}`)}
-
+ {title === 'co2CapturePerHa' ? (
+
+ CO2 Captured(per ha.)
+
+ ) : (
+ t(`${title}`)
+ )}
+
+
+
{t(`${subtitle}`)}
From fa4dd154ad4e21d2b740bf234d26191bdc1bef76 Mon Sep 17 00:00:00 2001
From: prachigarg19 <72646230+prachigarg19@users.noreply.github.com>
Date: Tue, 27 Feb 2024 14:42:01 +0530
Subject: [PATCH 19/28] remove hard coded width
---
src/temp/CarbonCapture/Graph.module.scss | 8 +++++---
src/temp/CarbonCapture/Graph.tsx | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/temp/CarbonCapture/Graph.module.scss b/src/temp/CarbonCapture/Graph.module.scss
index 09af4dede5..948585c048 100644
--- a/src/temp/CarbonCapture/Graph.module.scss
+++ b/src/temp/CarbonCapture/Graph.module.scss
@@ -34,7 +34,8 @@
}
.container {
- width: 338px;
+ width: 100%;
+ max-width: 338px;
display: flex;
flex-direction: column;
justify-content: center;
@@ -61,11 +62,12 @@
}
.titleContainer {
- width: 299px;
+ width: 100%;
+ max-width: 300px;
}
.newInfoIcon {
margin-left: auto;
- margin-right: 8px;
+ margin-right: 6px;
display: flex;
align-items: center;
cursor: pointer;
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index 8c684c9e38..e8ffb3b27f 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -224,7 +224,7 @@ const Graph = ({
series={series}
type="area"
height={153}
- width={299}
+ width={'100%'}
style={{ display: 'flex', justifyContent: 'center' }}
/>
From 5b48d1f4deff27cfbe2e075213fe9b4217918934 Mon Sep 17 00:00:00 2001
From: prachigarg19 <72646230+prachigarg19@users.noreply.github.com>
Date: Tue, 5 Mar 2024 12:25:17 +0530
Subject: [PATCH 20/28] replace hardcoded colors and fonts
---
src/temp/CarbonCapture/Graph.module.scss | 26 +++++++++++++-----------
src/theme/_colors.scss | 1 +
src/theme/_fonts.scss | 1 +
src/theme/theme.ts | 3 +++
src/theme/themeProperties.ts | 4 +++-
5 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/temp/CarbonCapture/Graph.module.scss b/src/temp/CarbonCapture/Graph.module.scss
index 948585c048..144b206740 100644
--- a/src/temp/CarbonCapture/Graph.module.scss
+++ b/src/temp/CarbonCapture/Graph.module.scss
@@ -1,33 +1,35 @@
+@import '../../theme/theme';
+
.tooltipContainer {
min-width: 100px;
.header {
padding: 10px 10px 8px 10px;
.title {
- color: #333;
- font-size: 14px;
+ color: #333; //to be replaced
+ font-size: $fontSmall;
font-weight: 500;
margin-bottom: 5px;
}
.subtitle {
- font-size: 8px;
+ font-size: $fontXXXSmallNew;
font-weight: 400;
}
}
.body {
- background-color: rgba(33, 150, 83, 0.10);
+ background-color: rgba(var(--primary-color-new), 0.10);
padding: 4px 10px;
display: flex;
justify-content: space-between;
align-items: center;
.yoyValue {
- color: #377E36;
+ color: $secondaryColorNew;
font-weight: 700;
- font-size: 9px;
+ font-size: $fontXXSmallNew;
}
.date {
- font-size: 6px;
+ font-size: 6px; //to be replaced
font-weight: 500;
- color: #000;
+ color: $dark;
opacity: 0.5;
}
}
@@ -41,8 +43,8 @@
justify-content: center;
align-items: center;
.graphHeading {
- font-size: 10px;
- color: #2F3336;
+ font-size: $fontXXSmall;
+ color: #2F3336; //to be replaced
display: flex;
align-items: center;
padding:0 15px;
@@ -54,8 +56,8 @@
}
.graphSubheading {
- color: #BDBDBD;
- font-size: 8px;
+ color: #BDBDBD; //to be replaced
+ font-size: $fontXXXSmallNew;
text-transform: lowercase;
padding:0 15px;
}
diff --git a/src/theme/_colors.scss b/src/theme/_colors.scss
index 90b06f079d..80ab3b7773 100644
--- a/src/theme/_colors.scss
+++ b/src/theme/_colors.scss
@@ -17,3 +17,4 @@ $primaryLightColor: var(--primary-light-color);
$topProjectBackgroundColor: var(--top-project-background-color);
$nonDonatableProjectBackgroundColor: var(--non-donatable-project-background-color);
$primaryColorNew: var(--primary-color-new);
+$secondaryColorNew: var(--secondary-color-new)
diff --git a/src/theme/_fonts.scss b/src/theme/_fonts.scss
index 514d406266..ee9bb8fe69 100644
--- a/src/theme/_fonts.scss
+++ b/src/theme/_fonts.scss
@@ -10,3 +10,4 @@ $fontXXLarge: var(--font-xx-large);
$fontXXXLarge: var(--font-xxx-large);
$secondaryFontFamily: var(--secondary-font-family);
$fontXXXSmallNew: var(--font-xxx-extra-small-new);
+$fontXXSmallNew: var(--font-xx-extra-small-new);
diff --git a/src/theme/theme.ts b/src/theme/theme.ts
index 4519b256f9..543d0b47aa 100644
--- a/src/theme/theme.ts
+++ b/src/theme/theme.ts
@@ -14,6 +14,7 @@ const {
topProjectBackgroundColor,
nonDonatableProjectBackgroundColor,
primaryColorNew,
+ secondaryColorNew,
} = theme;
const globalStyles = css.global`
@@ -23,6 +24,7 @@ const globalStyles = css.global`
--secondary-font-family: ${config.font.secondaryFontFamily ||
defaultFontFamily};
--font-xxx-extra-small-new: ${fontSizes.fontXXXSmallNew};
+ --font-xx-extra-small-new: ${fontSizes.fontXXSmallNew};
--font-xx-extra-small: ${fontSizes.fontXXSmall};
--font-x-extra-small: ${fontSizes.fontXSmall};
--font-small: ${fontSizes.fontSmall};
@@ -38,6 +40,7 @@ const globalStyles = css.global`
--top-project-background-color: ${topProjectBackgroundColor};
--non-donatable-project-background-color: ${nonDonatableProjectBackgroundColor};
--primary-color-new: ${primaryColorNew};
+ --secondary-color-new: ${secondaryColorNew};
}
.theme-light {
--primary-font-color: ${light.primaryFontColor};
diff --git a/src/theme/themeProperties.ts b/src/theme/themeProperties.ts
index 1827f246c6..d24dba4ecc 100644
--- a/src/theme/themeProperties.ts
+++ b/src/theme/themeProperties.ts
@@ -3,6 +3,7 @@ const themeProperties = {
'-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"',
fontSizes: {
fontXXXSmallNew: '8px',
+ fontXXSmallNew: '9px',
fontXXSmall: '10px',
fontXSmall: '12px',
fontSmall: '14px',
@@ -23,7 +24,8 @@ const themeProperties = {
primaryLightColor: '#79AE4633',
topProjectBackgroundColor: '#F3BB44',
nonDonatableProjectBackgroundColor: '#828282',
- primaryColorNew: '#219653',
+ primaryColorNew: '33, 150, 83',
+ secondaryColorNew: '#377E36',
light: {
primaryFontColor: '#2f3336',
dividerColor: '#d5d5d5',
From 32dd91a5143e074691b755e5797466f5d0f7f099 Mon Sep 17 00:00:00 2001
From: prachigarg19 <72646230+prachigarg19@users.noreply.github.com>
Date: Thu, 14 Mar 2024 17:05:16 +0530
Subject: [PATCH 21/28] fix: fix heading
---
public/static/locales/en/projectDetails.json | 4 ++--
src/temp/CarbonCapture/Graph.tsx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/static/locales/en/projectDetails.json b/public/static/locales/en/projectDetails.json
index e320d10543..c3e536f0c3 100644
--- a/public/static/locales/en/projectDetails.json
+++ b/public/static/locales/en/projectDetails.json
@@ -1,8 +1,8 @@
{
"satelliteAnalysis": "Satellite Analysis",
- "co2CapturePerHa": "CO2 Captured (per ha.)
",
+ "co2CapturePerHa": "CO₂ Captured (per ha.)
",
"comparedToRegionalAverage": "Compared to regional average",
- "co2Removed": "CO2 removed",
+ "co2Removed": "CO₂ removed",
"biomass": "Biomass",
"yoy": "YoY",
"projectLaunch": "Project Launch",
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index e8ffb3b27f..a620f0d983 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -207,7 +207,7 @@ const Graph = ({
{title === 'co2CapturePerHa' ? (
- CO2 Captured(per ha.)
+ CO₂ Captured(per ha.)
) : (
t(`${title}`)
From 338075b4e8307a7607e807fa57f61166a4e9f534 Mon Sep 17 00:00:00 2001
From: sunilsabatp <101264823+sunilsabatp@users.noreply.github.com>
Date: Tue, 9 Jul 2024 16:19:52 +0530
Subject: [PATCH 22/28] fix: translation issue, code clean up, remove hardcode
value
---
public/static/locales/en/projectDetails.json | 2 +-
src/temp/CarbonCapture/Graph.module.scss | 4 +-
src/temp/CarbonCapture/Graph.tsx | 71 ++++++++++----------
src/temp/stories/Graph.stories.tsx | 4 +-
4 files changed, 42 insertions(+), 39 deletions(-)
diff --git a/public/static/locales/en/projectDetails.json b/public/static/locales/en/projectDetails.json
index 2736a60f2d..0643ce8bdd 100644
--- a/public/static/locales/en/projectDetails.json
+++ b/public/static/locales/en/projectDetails.json
@@ -21,7 +21,7 @@
"comparedToRegionalAverage": "Compared to regional average",
"co2Removed": "CO₂ removed",
"biomass": "Biomass",
- "yoy": "YoY",
+ "yoy": "+{value}% YoY",
"projectLaunch": "Project Launch",
"canopyCover": "Canopy Cover"
}
diff --git a/src/temp/CarbonCapture/Graph.module.scss b/src/temp/CarbonCapture/Graph.module.scss
index 4d84a7e56b..5c861bf394 100644
--- a/src/temp/CarbonCapture/Graph.module.scss
+++ b/src/temp/CarbonCapture/Graph.module.scss
@@ -49,8 +49,8 @@
align-items: center;
padding: 0 15px;
gap: 2px;
- p {
- font-weight: 400;
+ span {
+ font-weight: 700;
}
}
.graphSubheading {
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index 01661ea520..c6016b6b37 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -5,6 +5,7 @@ import ReactDOMServer from 'react-dom/server';
import NewInfoIcon from '../icons/NewInfoIcon';
import { ApexOptions } from 'apexcharts';
import { useTranslations } from 'next-intl';
+import themeProperties from '../../theme/themeProperties';
interface TooltipProps {
headerTitle: string;
@@ -19,7 +20,6 @@ export const Tooltip = ({
yoyValue,
date,
}: TooltipProps) => {
- const t = useTranslations('ProjectDetails');
return (
@@ -27,9 +27,7 @@ export const Tooltip = ({
{subTitle}
-
- {yoyValue} {t('yoy')}
-
+
{yoyValue}
{date}
@@ -40,8 +38,8 @@ interface GraphProps {
title: string;
subtitle: string;
years: number[];
- series1Values: number[];
- series2Values: number[];
+ carbonRemoved: number[];
+ biomass: number[];
tooltip: {
heading: string;
unit: string;
@@ -58,15 +56,15 @@ const Graph = ({
title,
subtitle,
years,
- series1Values,
- series2Values,
+ carbonRemoved,
+ biomass,
tooltip,
}: GraphProps) => {
const t = useTranslations('ProjectDetails');
const [xaxisOptions, setXaxisOptions] = useState<
(number | (string | number)[])[]
>([]);
-
+ const { light, primaryDarkColorX } = themeProperties;
useEffect(() => {
const newOptions = years.map((year, index) => {
if (index === 1) {
@@ -97,22 +95,26 @@ const Graph = ({
tooltip: {
custom: function ({ dataPointIndex, w }: CustomTooltipProps) {
const getToolTip = () => {
+ const headingTranslation = t(`${tooltip.heading}`);
+ const subHeadingTranslation = t(`${tooltip.subheading}`);
+ const yoyTranslation = t('yoy', {
+ value: 4,
+ });
const dataPoint = xaxisOptions[dataPointIndex];
const year = Array.isArray(dataPoint) ? dataPoint[0] : dataPoint;
+
+ const headerTitle = `${w.globals.series[0][dataPointIndex]}${tooltip.unit} ${headingTranslation}`;
+ const subTitle = subHeadingTranslation
+ ? `${w.globals.series[1][dataPointIndex]}${tooltip.unit} ${subHeadingTranslation}`
+ : '';
+ const date = year.toString();
+
return (
);
};
@@ -123,8 +125,8 @@ const Graph = ({
},
markers: {
size: 0,
- colors: ['#fff', 'transparent'],
- strokeColors: ['#219653', 'transparent'],
+ colors: [`${light.light}`, 'transparent'],
+ strokeColors: [`${primaryDarkColorX}`, 'transparent'],
strokeOpacity: [1, 1],
strokeWidth: 2.2,
hover: {
@@ -153,7 +155,7 @@ const Graph = ({
},
minHeight: 35,
style: {
- colors: '#4F4F4F',
+ colors: `${light.grayFontColorNew}`,
fontSize: 10,
},
},
@@ -182,7 +184,7 @@ const Graph = ({
{
x: xaxisOptions[1],
strokeDashArray: 0,
- borderColor: '#219653',
+ borderColor: `${primaryDarkColorX}`,
},
],
},
@@ -190,14 +192,14 @@ const Graph = ({
const series = [
{
name: 'series1',
- data: series1Values,
- color: '#219653',
+ data: carbonRemoved,
+ color: `${primaryDarkColorX}`,
zIndex: 2,
},
{
name: 'series2',
- data: series2Values,
- color: '#BDBDBD',
+ data: biomass,
+ color: `${light.dividerColorNew}`,
zIndex: 1,
},
];
@@ -207,13 +209,15 @@ const Graph = ({
{title === 'co2CapturePerHa'
? t.rich('co2CapturePerHa', {
- captureContainer: (chunk) => (
- {chunk}
- ),
+ captureContainer: (chunk) => {chunk},
})
: t(`${title}`)}
-
+
{t(`${subtitle}`)}
@@ -225,7 +229,6 @@ const Graph = ({
type="area"
height={153}
width={'100%'}
- style={{ display: 'flex', justifyContent: 'center' }}
/>
diff --git a/src/temp/stories/Graph.stories.tsx b/src/temp/stories/Graph.stories.tsx
index 37a5ee502c..3e1751a23a 100644
--- a/src/temp/stories/Graph.stories.tsx
+++ b/src/temp/stories/Graph.stories.tsx
@@ -15,8 +15,8 @@ export const Preview: Story = {
years: years,
title: 'co2CapturePerHa',
subtitle: 'comparedToRegionalAverage',
- series1Values: [21.4, 21.27, 20.78, 21.7, 21.78],
- series2Values: [22.54, 22.65, 21.8, 21.85, 22.03],
+ carbonRemoved: [23.4, 23.27, 23.78, 23.7, 23.78],
+ biomass: [22.54, 22.65, 21.8, 21.85, 22.03],
tooltip: {
heading: 'co2Removed',
unit: 't',
From ae8b71a6bad5c1191609dffb7c9edc0526a1a38a Mon Sep 17 00:00:00 2001
From: sunilsabatp <101264823+sunilsabatp@users.noreply.github.com>
Date: Fri, 12 Jul 2024 13:37:27 +0530
Subject: [PATCH 23/28] feat: story for canopy cover, minor code cleanup
---
public/static/locales/en/projectDetails.json | 4 +-
src/temp/CarbonCapture/Graph.tsx | 65 +++++++++++---------
src/temp/stories/Graph.stories.tsx | 23 ++++---
3 files changed, 51 insertions(+), 41 deletions(-)
diff --git a/public/static/locales/en/projectDetails.json b/public/static/locales/en/projectDetails.json
index 0643ce8bdd..0681d8a054 100644
--- a/public/static/locales/en/projectDetails.json
+++ b/public/static/locales/en/projectDetails.json
@@ -19,8 +19,8 @@
"progressReports": "progress reports",
"co2CapturePerHa": "CO₂ Captured(per ha.)",
"comparedToRegionalAverage": "Compared to regional average",
- "co2Removed": "CO₂ removed",
- "biomass": "Biomass",
+ "co2Removed": "{value}t CO₂ removed",
+ "biomass": "{value}t Biomass",
"yoy": "+{value}% YoY",
"projectLaunch": "Project Launch",
"canopyCover": "Canopy Cover"
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index c6016b6b37..fcb96d4e1f 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -12,6 +12,8 @@ interface TooltipProps {
subTitle: string;
yoyValue: string;
date: string;
+ type: 'canopyCover' | 'carbonCapture';
+ canopyCoverPercentage: number;
}
export const Tooltip = ({
@@ -19,12 +21,18 @@ export const Tooltip = ({
subTitle,
yoyValue,
date,
+ type,
+ canopyCoverPercentage,
}: TooltipProps) => {
return (
-
{headerTitle}
-
{subTitle}
+
+ {type === 'carbonCapture' ? headerTitle : `${canopyCoverPercentage}%`}
+
+ {type === 'carbonCapture' && (
+
{subTitle}
+ )}
{yoyValue}
@@ -38,13 +46,9 @@ interface GraphProps {
title: string;
subtitle: string;
years: number[];
- carbonRemoved: number[];
- biomass: number[];
- tooltip: {
- heading: string;
- unit: string;
- subheading: string;
- };
+ byProjectResult: number[];
+ regionalAverage: number[];
+ type: 'carbonCapture' | 'canopyCover';
}
interface CustomTooltipProps {
@@ -53,12 +57,10 @@ interface CustomTooltipProps {
}
const Graph = ({
- title,
- subtitle,
years,
- carbonRemoved,
- biomass,
- tooltip,
+ byProjectResult,
+ regionalAverage,
+ type,
}: GraphProps) => {
const t = useTranslations('ProjectDetails');
const [xaxisOptions, setXaxisOptions] = useState<
@@ -75,7 +77,6 @@ const Graph = ({
});
setXaxisOptions(newOptions);
}, []);
-
const options = {
fill: {
type: 'gradient',
@@ -95,26 +96,28 @@ const Graph = ({
tooltip: {
custom: function ({ dataPointIndex, w }: CustomTooltipProps) {
const getToolTip = () => {
- const headingTranslation = t(`${tooltip.heading}`);
- const subHeadingTranslation = t(`${tooltip.subheading}`);
+ const headingTranslation = t('co2Removed', {
+ value: w.globals.series[0][dataPointIndex],
+ });
+ const subHeadingTranslation = t('biomass', {
+ value: w.globals.series[1][dataPointIndex],
+ });
const yoyTranslation = t('yoy', {
value: 4,
});
+ const canopyCoverPercentage = 43;
const dataPoint = xaxisOptions[dataPointIndex];
const year = Array.isArray(dataPoint) ? dataPoint[0] : dataPoint;
-
- const headerTitle = `${w.globals.series[0][dataPointIndex]}${tooltip.unit} ${headingTranslation}`;
- const subTitle = subHeadingTranslation
- ? `${w.globals.series[1][dataPointIndex]}${tooltip.unit} ${subHeadingTranslation}`
- : '';
const date = year.toString();
return (
);
};
@@ -192,13 +195,13 @@ const Graph = ({
const series = [
{
name: 'series1',
- data: carbonRemoved,
+ data: byProjectResult,
color: `${primaryDarkColorX}`,
zIndex: 2,
},
{
name: 'series2',
- data: biomass,
+ data: regionalAverage,
color: `${light.dividerColorNew}`,
zIndex: 1,
},
@@ -207,11 +210,11 @@ const Graph = ({
- {title === 'co2CapturePerHa'
+ {type === 'carbonCapture'
? t.rich('co2CapturePerHa', {
captureContainer: (chunk) => {chunk},
})
- : t(`${title}`)}
+ : t('canopyCover')}
-
{t(`${subtitle}`)}
+ {type === 'carbonCapture' && (
+
+ {t('comparedToRegionalAverage')}
+
+ )}
;
const years = [2019, 2020, 2021, 2022, 2023];
-export const Preview: Story = {
+export const CarbonCapture: Story = {
args: {
years: years,
- title: 'co2CapturePerHa',
- subtitle: 'comparedToRegionalAverage',
- carbonRemoved: [23.4, 23.27, 23.78, 23.7, 23.78],
- biomass: [22.54, 22.65, 21.8, 21.85, 22.03],
- tooltip: {
- heading: 'co2Removed',
- unit: 't',
- subheading: 'biomass',
- },
+ byProjectResult: [23.4, 23.27, 23.78, 23.7, 23.78],
+ regionalAverage: [22.54, 22.65, 21.8, 21.85, 22.03],
+ type: 'carbonCapture',
+ },
+};
+
+export const CanopyCover: Story = {
+ args: {
+ years: years,
+ byProjectResult: [23, 24, 25, 26, 27],
+ regionalAverage: [19, 20, 21, 22, 23],
+ type: 'canopyCover',
},
};
From 40295164f010842f72f076c0801d85b057c8c5c3 Mon Sep 17 00:00:00 2001
From: sunilsabatp <101264823+sunilsabatp@users.noreply.github.com>
Date: Fri, 12 Jul 2024 14:23:35 +0530
Subject: [PATCH 24/28] refactor: increase the font-size
---
src/temp/CarbonCapture/Graph.module.scss | 6 +++---
src/temp/CarbonCapture/Graph.tsx | 2 ++
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/temp/CarbonCapture/Graph.module.scss b/src/temp/CarbonCapture/Graph.module.scss
index 5c861bf394..473066f34c 100644
--- a/src/temp/CarbonCapture/Graph.module.scss
+++ b/src/temp/CarbonCapture/Graph.module.scss
@@ -11,7 +11,7 @@
margin-bottom: 5px;
}
.subtitle {
- font-size: $fontXXXSmallNew;
+ font-size: $fontXXSmallNew;
font-weight: 400;
}
}
@@ -27,7 +27,7 @@
font-size: $fontXXSmallNew;
}
.date {
- font-size: 6px; //to be replaced
+ font-size: 10px;
font-weight: 500;
color: $dark;
opacity: 0.5;
@@ -55,7 +55,7 @@
}
.graphSubheading {
color: #bdbdbd; //to be replaced
- font-size: $fontXXXSmallNew;
+ font-size: $fontXXSmallNew;
text-transform: lowercase;
padding: 0 15px;
}
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index fcb96d4e1f..d12adf25bc 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -77,6 +77,7 @@ const Graph = ({
});
setXaxisOptions(newOptions);
}, []);
+
const options = {
fill: {
type: 'gradient',
@@ -206,6 +207,7 @@ const Graph = ({
zIndex: 1,
},
];
+
return (
From b6227d76d096eb4765d965761962afe284906df5 Mon Sep 17 00:00:00 2001
From: sunilsabatp <101264823+sunilsabatp@users.noreply.github.com>
Date: Fri, 12 Jul 2024 14:32:13 +0530
Subject: [PATCH 25/28] refactor: make text bold
---
public/static/locales/en/projectDetails.json | 2 +-
src/temp/CarbonCapture/Graph.module.scss | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/public/static/locales/en/projectDetails.json b/public/static/locales/en/projectDetails.json
index 0681d8a054..f1b5e55644 100644
--- a/public/static/locales/en/projectDetails.json
+++ b/public/static/locales/en/projectDetails.json
@@ -17,7 +17,7 @@
"privateProperty": "private property",
"publicProperty": "public property",
"progressReports": "progress reports",
- "co2CapturePerHa": "CO₂ Captured(per ha.)",
+ "co2CapturePerHa": "CO₂ Captured(per ha.)",
"comparedToRegionalAverage": "Compared to regional average",
"co2Removed": "{value}t CO₂ removed",
"biomass": "{value}t Biomass",
diff --git a/src/temp/CarbonCapture/Graph.module.scss b/src/temp/CarbonCapture/Graph.module.scss
index 473066f34c..178b9262de 100644
--- a/src/temp/CarbonCapture/Graph.module.scss
+++ b/src/temp/CarbonCapture/Graph.module.scss
@@ -49,8 +49,9 @@
align-items: center;
padding: 0 15px;
gap: 2px;
+ font-weight: 700;
span {
- font-weight: 700;
+ font-weight: 400;
}
}
.graphSubheading {
From c7de0b15b7556ed86c37d65b6903269b4ee90044 Mon Sep 17 00:00:00 2001
From: sunilsabatp <101264823+sunilsabatp@users.noreply.github.com>
Date: Fri, 12 Jul 2024 15:52:07 +0530
Subject: [PATCH 26/28] feat: dot notation for project launch verticle line
---
src/temp/CarbonCapture/Graph.tsx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index d12adf25bc..27c675fda1 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -66,7 +66,7 @@ const Graph = ({
const [xaxisOptions, setXaxisOptions] = useState<
(number | (string | number)[])[]
>([]);
- const { light, primaryDarkColorX } = themeProperties;
+ const { light, primaryDarkColorX, darkBlackColor } = themeProperties;
useEffect(() => {
const newOptions = years.map((year, index) => {
if (index === 1) {
@@ -187,8 +187,8 @@ const Graph = ({
xaxis: [
{
x: xaxisOptions[1],
- strokeDashArray: 0,
- borderColor: `${primaryDarkColorX}`,
+ strokeDashArray: 4,
+ borderColor: `${darkBlackColor}`,
},
],
},
From 09f4a45c4119959bb75529d8a26a053140cdf17a Mon Sep 17 00:00:00 2001
From: sunilsabatp <101264823+sunilsabatp@users.noreply.github.com>
Date: Fri, 12 Jul 2024 16:10:06 +0530
Subject: [PATCH 27/28] feat: include month in the graph tootip
---
src/temp/CarbonCapture/Graph.module.scss | 2 +-
src/temp/CarbonCapture/Graph.tsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/temp/CarbonCapture/Graph.module.scss b/src/temp/CarbonCapture/Graph.module.scss
index 178b9262de..5d60e0578f 100644
--- a/src/temp/CarbonCapture/Graph.module.scss
+++ b/src/temp/CarbonCapture/Graph.module.scss
@@ -1,7 +1,7 @@
@import '../../theme/theme';
.tooltipContainer {
- min-width: 100px;
+ min-width: 120px;
.header {
padding: 10px 10px 8px 10px;
.title {
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index 27c675fda1..797e0ac119 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -36,7 +36,7 @@ export const Tooltip = ({
{yoyValue}
-
{date}
+
Aug {date}
);
From 314a4e26fa66df3fd444ce7f9520e1b60f256491 Mon Sep 17 00:00:00 2001
From: sunilsabatp <101264823+sunilsabatp@users.noreply.github.com>
Date: Fri, 12 Jul 2024 16:15:43 +0530
Subject: [PATCH 28/28] feat: reduce stroke dash array
---
src/temp/CarbonCapture/Graph.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/temp/CarbonCapture/Graph.tsx b/src/temp/CarbonCapture/Graph.tsx
index 797e0ac119..3d859b2388 100644
--- a/src/temp/CarbonCapture/Graph.tsx
+++ b/src/temp/CarbonCapture/Graph.tsx
@@ -187,7 +187,7 @@ const Graph = ({
xaxis: [
{
x: xaxisOptions[1],
- strokeDashArray: 4,
+ strokeDashArray: 2,
borderColor: `${darkBlackColor}`,
},
],