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.

Sign up for GitHub

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

bug: [ON-3450] fix table styling #1144

Merged
merged 2 commits into from
Feb 21, 2025
Merged

bug: [ON-3450] fix table styling #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d084188
bug: [ON-3450] fix table styling
Feb 20, 2025
34e00c0
bug: [ON-3450] korbit review
Feb 20, 2025
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
5 changes: 3 additions & 2 deletions app/src/app/[lng]/[inventory]/InventoryResultTab/EmissionsForecast/CustomLegend.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from "react";
import { Flex, Text, Badge } from "@chakra-ui/react";
import { Flex, Text, Badge, Box } from "@chakra-ui/react";
import { getColorForSeries } from "./EmissionsForecastChart";
import { ColoredCircle } from "@/components/ColoredCircle";

interface CustomLegendProps {
data: { id: string; color: string }[];
Expand All @@ -12,7 +13,7 @@ const CustomLegend: React.FC<CustomLegendProps> = ({ data, t }) => {
<Flex wrap="wrap" justifyContent="center" marginBottom={4}>
{data.map((series) => (
<Flex key={series.id} alignItems="center" mx={2}>
<Badge boxSize="10px" bg={getColorForSeries(series.id)} mr={2} />
<ColoredCircle size="10px" color={getColorForSeries(series.id)} />
<Text>{t(series.id)}</Text>
</Flex>
))}
Expand Down
44 changes: 30 additions & 14 deletions ...src/app/[lng]/[inventory]/InventoryResultTab/EmissionsForecast/EmissionsForecastChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@ import {
getSubSectorByReferenceNumber,
ISector,
} from "@/util/constants";
import { Badge, Box, Card, Heading, Table, Text } from "@chakra-ui/react";
import { Box, Card, Heading, HStack, Table, Text } from "@chakra-ui/react";
import { convertKgToTonnes, toKebabCase } from "@/util/helpers";
import { ResponsiveLine } from "@nivo/line";
import CustomLegend from "@/app/[lng]/[inventory]/InventoryResultTab/EmissionsForecast/CustomLegend";
import { ColoredCircle } from "@/components/ColoredCircle";
import { ButtonSmall } from "@/components/Texts/Button";
import { TitleMedium } from "@/components/Texts/Title";

interface LineChartData {
id: string;
Expand Down Expand Up @@ -112,14 +115,22 @@ export const EmissionsForecastChart = ({
</Text>
</Box>
<Box padding="4">
<Table.Root unstyled size={"sm"}>
<Table.Root size={"sm"}>
<Table.Header>
<Table.Row>
<Table.ColumnHeader>{t("sector")}</Table.ColumnHeader>
<Table.ColumnHeader>{t("rate")}</Table.ColumnHeader>
<Table.ColumnHeader>%</Table.ColumnHeader>
<Table.ColumnHeader>
{t("total-emissions")}
<ButtonSmall>{t("sector").toUpperCase()}</ButtonSmall>
</Table.ColumnHeader>
<Table.ColumnHeader>
<ButtonSmall>{t("rate").toUpperCase()}</ButtonSmall>
</Table.ColumnHeader>
<Table.ColumnHeader>
<ButtonSmall>%</ButtonSmall>
</Table.ColumnHeader>
<Table.ColumnHeader>
<ButtonSmall>
{t("total-emissions").toUpperCase()}
</ButtonSmall>
</Table.ColumnHeader>
</Table.Row>
</Table.Header>
Expand All @@ -146,12 +157,13 @@ export const EmissionsForecastChart = ({
return (
<Table.Row key={id}>
<Table.Cell>
<Badge
boxSize="10px"
bg={getColorForSeries(id)}
marginRight="8px"
/>
{t(id)}
<HStack>
<ColoredCircle
size="10px"
color={getColorForSeries(id)}
/>
{t(id)}
</HStack>
</Table.Cell>
<Table.Cell>{growthRate}</Table.Cell>
<Table.Cell>{percentage}%</Table.Cell>
Expand All @@ -164,10 +176,14 @@ export const EmissionsForecastChart = ({
);
})}
<Table.Row>
<Table.ColumnHeader>{t("total")}</Table.ColumnHeader>
<Table.ColumnHeader>
<TitleMedium>{t("total").toUpperCase()}</TitleMedium>
</Table.ColumnHeader>
<Table.ColumnHeader></Table.ColumnHeader>
<Table.ColumnHeader>
{convertKgToTonnes(sumOfYs)}
<TitleMedium>
{convertKgToTonnes(sumOfYs)}
</TitleMedium>
</Table.ColumnHeader>
</Table.Row>
</Table.Body>
Expand Down
20 changes: 10 additions & 10 deletions app/src/app/[lng]/[inventory]/InventoryResultTab/TopEmissionsWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
ProgressCircleRing,
ProgressCircleRoot,
} from "@/components/ui/progress-circle";
import { ButtonSmall } from "@/components/Texts/Button";

const EmissionsTable = ({
topEmissions,
Expand All @@ -39,20 +40,19 @@ const EmissionsTable = ({
t: TFunction;
}) => {
return (
<Table.Root unstyled my={4}>
<Table.Root my={4}>
<Table.Header>
<Table.Row>
<Table.ColumnHeader
css={{ font: "bold", color: "black" }}
width={"50%"}
>
{t("subsector")}
<Table.ColumnHeader>
<ButtonSmall>{t("subsector").toUpperCase()}</ButtonSmall>
</Table.ColumnHeader>
<Table.ColumnHeader css={{ font: "bold", color: "black" }}>
{t("total-emissions-CO2eq")}
<Table.ColumnHeader>
<ButtonSmall>
{t("total-emissions-CO2eq").toUpperCase()}
</ButtonSmall>
</Table.ColumnHeader>
<Table.ColumnHeader css={{ font: "bold", color: "black" }}>
{t("%-of-emissions")}
<Table.ColumnHeader>
<ButtonSmall>{t("%-of-emissions").toUpperCase()}</ButtonSmall>
</Table.ColumnHeader>
</Table.Row>
</Table.Header>
Expand Down
22 changes: 22 additions & 0 deletions app/src/components/ColoredCircle/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { Box, BoxProps } from "@chakra-ui/react";

interface ColoredCircleProps extends BoxProps {
color: string;
size: string;
}
export const ColoredCircle = ({
color,
size,
...props
}: ColoredCircleProps) => {
return (
<Box
width={size}
height={size}
bg={color}
borderRadius="50%"
mr={2}
{...props}
/>
);
};
4 changes: 3 additions & 1 deletion app/src/i18n/locales/en/dashboard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,5 +171,7 @@
"invite-error-toast-text": "There was an error sending your invitations",
"afolu-other-agriculture": "Other agriculture",
"afolu-livestock": "Live stock",
"afolu-land": "Land"
"afolu-land": "Land",
"rate": "rate",
"sector": "sector"
}
Loading