From 6ff12e016c5b009f674734b574b9640b12ff615c Mon Sep 17 00:00:00 2001 From: chrismclarke Date: Sat, 20 Jan 2024 18:56:38 -0800 Subject: [PATCH] refactor: weather svgs --- apps/picsa-tools/option-tool/project.json | 6 ++++++ .../src/app/components/material.module.ts | 13 +++++++------ .../picsa-tools/seasonal-calendar-tool/project.json | 5 +++++ .../shared-assets/svgs/weather/rain_high.svg | 0 .../shared-assets/svgs/weather/rain_high_label.svg | 0 .../shared-assets/svgs/weather/rain_low.svg | 0 .../shared-assets/svgs/weather/rain_low_label.svg | 0 .../shared-assets/svgs/weather/rain_medium.svg | 0 .../svgs/weather/rain_medium_label.svg | 0 9 files changed, 18 insertions(+), 6 deletions(-) rename apps/picsa-tools/option-tool/src/assets/svgs/rain-high.svg => libs/shared-assets/svgs/weather/rain_high.svg (100%) rename apps/picsa-tools/option-tool/src/assets/svgs/rain-high-label.svg => libs/shared-assets/svgs/weather/rain_high_label.svg (100%) rename apps/picsa-tools/option-tool/src/assets/svgs/rain-low.svg => libs/shared-assets/svgs/weather/rain_low.svg (100%) rename apps/picsa-tools/option-tool/src/assets/svgs/rain-low-label.svg => libs/shared-assets/svgs/weather/rain_low_label.svg (100%) rename apps/picsa-tools/option-tool/src/assets/svgs/rain-medium.svg => libs/shared-assets/svgs/weather/rain_medium.svg (100%) rename apps/picsa-tools/option-tool/src/assets/svgs/rain-medium-label.svg => libs/shared-assets/svgs/weather/rain_medium_label.svg (100%) diff --git a/apps/picsa-tools/option-tool/project.json b/apps/picsa-tools/option-tool/project.json index aed9c05f4..7593f3cfb 100644 --- a/apps/picsa-tools/option-tool/project.json +++ b/apps/picsa-tools/option-tool/project.json @@ -18,6 +18,12 @@ "assets": [ "apps/picsa-tools/option-tool/src/favicon.ico", "apps/picsa-tools/option-tool/src/assets", + + { + "glob": "*.svg", + "input": "libs/assets/shared-assets/svgs/weather", + "output": "assets/svgs/weather" + }, { "glob": "*.json", "input": "libs/i18n/assets", diff --git a/apps/picsa-tools/option-tool/src/app/components/material.module.ts b/apps/picsa-tools/option-tool/src/app/components/material.module.ts index 432f8afa5..c3c7b5458 100644 --- a/apps/picsa-tools/option-tool/src/app/components/material.module.ts +++ b/apps/picsa-tools/option-tool/src/app/components/material.module.ts @@ -25,12 +25,13 @@ export class OptionMaterialModule { close: 'close', female: 'female', male: 'male', - rain_high: 'rain-high', - rain_low: 'rain-low', - rain_medium: 'rain-medium', - rain_high_label: 'rain-high-label', - rain_low_label: 'rain-low-label', - rain_medium_label: 'rain-medium-label', + // NOTE - weather icons are copied from shared-assets via project.json + rain_high: 'weather/rain_high', + rain_low: 'weather/rain_low', + rain_medium: 'weather/rain_medium', + rain_high_label: 'weather/rain_high_label', + rain_low_label: 'weather/rain_low_label', + rain_medium_label: 'weather/rain_medium_label', risks: 'risks', }; for (const [key, value] of Object.entries(icons)) { diff --git a/apps/picsa-tools/seasonal-calendar-tool/project.json b/apps/picsa-tools/seasonal-calendar-tool/project.json index 18578c930..a1f6acf7f 100644 --- a/apps/picsa-tools/seasonal-calendar-tool/project.json +++ b/apps/picsa-tools/seasonal-calendar-tool/project.json @@ -18,6 +18,11 @@ "assets": [ "apps/picsa-tools/seasonal-calendar-tool/src/favicon.ico", "apps/picsa-tools/seasonal-calendar-tool/src/assets", + { + "glob": "**/*", + "input": "libs/shared-assets/svgs/weather", + "output": "assets/svgs/weather" + }, { "glob": "*.json", "input": "libs/i18n/assets", diff --git a/apps/picsa-tools/option-tool/src/assets/svgs/rain-high.svg b/libs/shared-assets/svgs/weather/rain_high.svg similarity index 100% rename from apps/picsa-tools/option-tool/src/assets/svgs/rain-high.svg rename to libs/shared-assets/svgs/weather/rain_high.svg diff --git a/apps/picsa-tools/option-tool/src/assets/svgs/rain-high-label.svg b/libs/shared-assets/svgs/weather/rain_high_label.svg similarity index 100% rename from apps/picsa-tools/option-tool/src/assets/svgs/rain-high-label.svg rename to libs/shared-assets/svgs/weather/rain_high_label.svg diff --git a/apps/picsa-tools/option-tool/src/assets/svgs/rain-low.svg b/libs/shared-assets/svgs/weather/rain_low.svg similarity index 100% rename from apps/picsa-tools/option-tool/src/assets/svgs/rain-low.svg rename to libs/shared-assets/svgs/weather/rain_low.svg diff --git a/apps/picsa-tools/option-tool/src/assets/svgs/rain-low-label.svg b/libs/shared-assets/svgs/weather/rain_low_label.svg similarity index 100% rename from apps/picsa-tools/option-tool/src/assets/svgs/rain-low-label.svg rename to libs/shared-assets/svgs/weather/rain_low_label.svg diff --git a/apps/picsa-tools/option-tool/src/assets/svgs/rain-medium.svg b/libs/shared-assets/svgs/weather/rain_medium.svg similarity index 100% rename from apps/picsa-tools/option-tool/src/assets/svgs/rain-medium.svg rename to libs/shared-assets/svgs/weather/rain_medium.svg diff --git a/apps/picsa-tools/option-tool/src/assets/svgs/rain-medium-label.svg b/libs/shared-assets/svgs/weather/rain_medium_label.svg similarity index 100% rename from apps/picsa-tools/option-tool/src/assets/svgs/rain-medium-label.svg rename to libs/shared-assets/svgs/weather/rain_medium_label.svg