From aa1547cc245ad59e63f08d34b89907991e8f133d Mon Sep 17 00:00:00 2001 From: Bartosz Prusinowski Date: Tue, 17 Oct 2023 11:09:20 +0200 Subject: [PATCH 1/4] chore: Update icons --- app/icons/components/IcChartColumnLine.tsx | 22 +++++++++++++++ app/icons/components/IcChartDualAxisLine.tsx | 28 ++++++++++++++++++++ app/icons/components/IcChartMultiLine.tsx | 24 +++++++++++++++++ app/icons/components/IcTwitter.tsx | 17 +++++------- app/icons/components/index.tsx | 8 ++++++ app/icons/svg/ic_chart-column-line.svg | 1 + app/icons/svg/ic_chart-dual-axis-line.svg | 1 + app/icons/svg/ic_chart-multi-line.svg | 1 + app/icons/svg/ic_twitter.svg | 2 +- 9 files changed, 92 insertions(+), 12 deletions(-) create mode 100644 app/icons/components/IcChartColumnLine.tsx create mode 100644 app/icons/components/IcChartDualAxisLine.tsx create mode 100644 app/icons/components/IcChartMultiLine.tsx create mode 100644 app/icons/svg/ic_chart-column-line.svg create mode 100644 app/icons/svg/ic_chart-dual-axis-line.svg create mode 100644 app/icons/svg/ic_chart-multi-line.svg diff --git a/app/icons/components/IcChartColumnLine.tsx b/app/icons/components/IcChartColumnLine.tsx new file mode 100644 index 000000000..4e34f434e --- /dev/null +++ b/app/icons/components/IcChartColumnLine.tsx @@ -0,0 +1,22 @@ +import * as React from "react"; +function SvgIcChartColumnLine(props: React.SVGProps) { + return ( + + + + + + + ); +} +export default SvgIcChartColumnLine; diff --git a/app/icons/components/IcChartDualAxisLine.tsx b/app/icons/components/IcChartDualAxisLine.tsx new file mode 100644 index 000000000..8d677bfe0 --- /dev/null +++ b/app/icons/components/IcChartDualAxisLine.tsx @@ -0,0 +1,28 @@ +import * as React from "react"; +function SvgIcChartDualAxisLine(props: React.SVGProps) { + return ( + + + + + + + ); +} +export default SvgIcChartDualAxisLine; diff --git a/app/icons/components/IcChartMultiLine.tsx b/app/icons/components/IcChartMultiLine.tsx new file mode 100644 index 000000000..207cff85c --- /dev/null +++ b/app/icons/components/IcChartMultiLine.tsx @@ -0,0 +1,24 @@ +import * as React from "react"; +function SvgIcChartMultiLine(props: React.SVGProps) { + return ( + + + + + + + ); +} +export default SvgIcChartMultiLine; diff --git a/app/icons/components/IcTwitter.tsx b/app/icons/components/IcTwitter.tsx index d69ba6dd0..fdfae0bb5 100644 --- a/app/icons/components/IcTwitter.tsx +++ b/app/icons/components/IcTwitter.tsx @@ -1,23 +1,18 @@ import * as React from "react"; - function SvgIcTwitter(props: React.SVGProps) { return ( - - - - + ); } - export default SvgIcTwitter; diff --git a/app/icons/components/index.tsx b/app/icons/components/index.tsx index 75ff31002..4f9e6b6c5 100644 --- a/app/icons/components/index.tsx +++ b/app/icons/components/index.tsx @@ -18,8 +18,11 @@ import { default as Categories } from "@/icons/components/IcCategories"; import { default as ChartArea } from "@/icons/components/IcChartArea"; import { default as ChartBar } from "@/icons/components/IcChartBar"; import { default as ChartColumn } from "@/icons/components/IcChartColumn"; +import { default as ChartColumnLine } from "@/icons/components/IcChartColumnLine"; +import { default as ChartDualAxisLine } from "@/icons/components/IcChartDualAxisLine"; import { default as ChartLine } from "@/icons/components/IcChartLine"; import { default as ChartMap } from "@/icons/components/IcChartMap"; +import { default as ChartMultiLine } from "@/icons/components/IcChartMultiLine"; import { default as ChartPie } from "@/icons/components/IcChartPie"; import { default as ChartScatterplot } from "@/icons/components/IcChartScatterplot"; import { default as Check } from "@/icons/components/IcCheck"; @@ -49,6 +52,7 @@ import { default as Dragndrop } from "@/icons/components/IcDragndrop"; import { default as Edit } from "@/icons/components/IcEdit"; import { default as Embed } from "@/icons/components/IcEmbed"; import { default as Excel } from "@/icons/components/IcExcel"; +import { default as Exclamation } from "@/icons/components/IcExclamation"; import { default as Eye } from "@/icons/components/IcEye"; import { default as Facebook } from "@/icons/components/IcFacebook"; import { default as Feed } from "@/icons/components/IcFeed"; @@ -156,9 +160,12 @@ export const Icons = { categories: Categories, chartArea: ChartArea, chartBar: ChartBar, + chartColumnLine: ChartColumnLine, chartColumn: ChartColumn, + chartDualAxisLine: ChartDualAxisLine, chartLine: ChartLine, chartMap: ChartMap, + chartMultiLine: ChartMultiLine, chartPie: ChartPie, chartScatterplot: ChartScatterplot, check: Check, @@ -188,6 +195,7 @@ export const Icons = { edit: Edit, embed: Embed, excel: Excel, + exclamation: Exclamation, eye: Eye, facebook: Facebook, feed: Feed, diff --git a/app/icons/svg/ic_chart-column-line.svg b/app/icons/svg/ic_chart-column-line.svg new file mode 100644 index 000000000..7aa472ec0 --- /dev/null +++ b/app/icons/svg/ic_chart-column-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/icons/svg/ic_chart-dual-axis-line.svg b/app/icons/svg/ic_chart-dual-axis-line.svg new file mode 100644 index 000000000..38740b59f --- /dev/null +++ b/app/icons/svg/ic_chart-dual-axis-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/icons/svg/ic_chart-multi-line.svg b/app/icons/svg/ic_chart-multi-line.svg new file mode 100644 index 000000000..d2c71b0d2 --- /dev/null +++ b/app/icons/svg/ic_chart-multi-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/icons/svg/ic_twitter.svg b/app/icons/svg/ic_twitter.svg index 35accbb08..72bc916e0 100644 --- a/app/icons/svg/ic_twitter.svg +++ b/app/icons/svg/ic_twitter.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From 9f2b0a729f9967b5818a1fb028db9b5a84ff9de7 Mon Sep 17 00:00:00 2001 From: Bartosz Prusinowski Date: Tue, 17 Oct 2023 11:14:12 +0200 Subject: [PATCH 2/4] style: Use correct combo chart icons --- app/configurator/components/ui-helpers.ts | 5 +++-- app/icons/index.tsx | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/configurator/components/ui-helpers.ts b/app/configurator/components/ui-helpers.ts index 3ad1984c1..27e4ab4cf 100644 --- a/app/configurator/components/ui-helpers.ts +++ b/app/configurator/components/ui-helpers.ts @@ -165,10 +165,11 @@ export const getIconName = (name: string): IconName => { case "map": return "chartMap"; case "comboLineSingle": + return "chartMultiLine"; case "comboLineDual": + return "chartDualAxisLine"; case "comboLineColumn": - // FIXME: Use a proper icon. - return "star"; + return "chartColumnLine"; case "baseLayer": return "mapMaptype"; case "areaLayer": diff --git a/app/icons/index.tsx b/app/icons/index.tsx index 38f9f9215..961515556 100644 --- a/app/icons/index.tsx +++ b/app/icons/index.tsx @@ -51,11 +51,12 @@ export const getChartIcon = (chartType: ChartType): IconName => { return "chartScatterplot"; case "table": return "table"; - // FIXME: use proper icons case "comboLineSingle": + return "chartMultiLine"; case "comboLineDual": + return "chartDualAxisLine"; case "comboLineColumn": - return "star"; + return "chartColumnLine"; default: const _exhaustiveCheck: never = chartType; return _exhaustiveCheck; From 8251a3548e06e97e969d943db44a25846b51d042 Mon Sep 17 00:00:00 2001 From: Bartosz Prusinowski Date: Tue, 17 Oct 2023 11:48:02 +0200 Subject: [PATCH 3/4] fix: Highlighting of combo chart column icons --- app/icons/components/IcChartColumnLine.tsx | 13 ++++++++-- app/icons/components/IcChartDualAxisLine.tsx | 26 +++++++++++++++----- app/icons/components/IcChartMultiLine.tsx | 14 +++++++++-- 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/app/icons/components/IcChartColumnLine.tsx b/app/icons/components/IcChartColumnLine.tsx index 4e34f434e..05c7f43bb 100644 --- a/app/icons/components/IcChartColumnLine.tsx +++ b/app/icons/components/IcChartColumnLine.tsx @@ -8,12 +8,21 @@ function SvgIcChartColumnLine(props: React.SVGProps) { height="1em" {...props} > + + + - + diff --git a/app/icons/components/IcChartDualAxisLine.tsx b/app/icons/components/IcChartDualAxisLine.tsx index 8d677bfe0..51419010b 100644 --- a/app/icons/components/IcChartDualAxisLine.tsx +++ b/app/icons/components/IcChartDualAxisLine.tsx @@ -8,20 +8,34 @@ function SvgIcChartDualAxisLine(props: React.SVGProps) { height="1em" {...props} > + + + - - + + ); } diff --git a/app/icons/components/IcChartMultiLine.tsx b/app/icons/components/IcChartMultiLine.tsx index 207cff85c..ddd5c2b27 100644 --- a/app/icons/components/IcChartMultiLine.tsx +++ b/app/icons/components/IcChartMultiLine.tsx @@ -8,14 +8,24 @@ function SvgIcChartMultiLine(props: React.SVGProps) { height="1em" {...props} > + + + From cf45f7b134ad3492280d04a8b076517cfa5f7fe6 Mon Sep 17 00:00:00 2001 From: Bartosz Prusinowski Date: Tue, 17 Oct 2023 11:48:13 +0200 Subject: [PATCH 4/4] style: Update chart type selection section style --- app/configurator/components/chart-type-selector.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/configurator/components/chart-type-selector.tsx b/app/configurator/components/chart-type-selector.tsx index a4de153d2..e5595cccb 100644 --- a/app/configurator/components/chart-type-selector.tsx +++ b/app/configurator/components/chart-type-selector.tsx @@ -225,8 +225,8 @@ const ChartTypeSelectorMenu = (props: ChartTypeSelectorMenuProps) => { props; return ( - - + + {title}