refactor: weather svgs

e-picsa · Jan 21, 2024 · 6ff12e0 · 6ff12e0
1 parent 236f6e1
commit 6ff12e0
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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/...option-tool/src/assets/svgs/rain-high.svg → .../shared-assets/svgs/weather/rain_high.svg b/...option-tool/src/assets/svgs/rain-high.svg → .../shared-assets/svgs/weather/rain_high.svg
diff --git a/...-tool/src/assets/svgs/rain-high-label.svg → ...d-assets/svgs/weather/rain_high_label.svg b/...-tool/src/assets/svgs/rain-high-label.svg → ...d-assets/svgs/weather/rain_high_label.svg
diff --git a/.../option-tool/src/assets/svgs/rain-low.svg → libs/shared-assets/svgs/weather/rain_low.svg b/.../option-tool/src/assets/svgs/rain-low.svg → libs/shared-assets/svgs/weather/rain_low.svg
diff --git a/...n-tool/src/assets/svgs/rain-low-label.svg → ...ed-assets/svgs/weather/rain_low_label.svg b/...n-tool/src/assets/svgs/rain-low-label.svg → ...ed-assets/svgs/weather/rain_low_label.svg
diff --git a/...tion-tool/src/assets/svgs/rain-medium.svg → ...hared-assets/svgs/weather/rain_medium.svg b/...tion-tool/src/assets/svgs/rain-medium.svg → ...hared-assets/svgs/weather/rain_medium.svg
diff --git a/...ool/src/assets/svgs/rain-medium-label.svg → ...assets/svgs/weather/rain_medium_label.svg b/...ool/src/assets/svgs/rain-medium-label.svg → ...assets/svgs/weather/rain_medium_label.svg