Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Move logos and color palette source files to core/assets directory

Leendert de Borstd403eae93c0f
diff --git a/.github/actions/build-core-libraries/action.yml b/.github/actions/build-core-libraries/action.yml
index 3c7e45cee..e6669612e 100644
--- a/.github/actions/build-core-libraries/action.yml
+++ b/.github/actions/build-core-libraries/action.yml
@@ -74,6 +74,10 @@ runs:
"apps/server/Shared/AliasVault.Shared/Models/Enums/ManifestKeyType.cs"
"apps/server/Shared/AliasVault.Shared/Models/Enums/VaultKeyAlgorithm.cs"
"core/models/src/icons"
+ "core/models/src/colors"
+ "apps/mobile-app/ios/VaultUI/ColorConstants.swift"
+ "apps/mobile-app/android/app/src/main/res/values/av_colors.xml"
+ "apps/mobile-app/android/app/src/main/res/values-night/av_colors.xml"
"apps/server/AliasVault.Admin/Main/Components/Icons/UiIcons.cs"
"apps/mobile-app/components/items/ItemTypeIconComponents.tsx"
"apps/mobile-app/components/items/BuiltinLogoComponents.tsx"
diff --git a/apps/browser-extension/eslint.config.js b/apps/browser-extension/eslint.config.js
index c03eef8cd..0e79604e2 100644
--- a/apps/browser-extension/eslint.config.js
+++ b/apps/browser-extension/eslint.config.js
@@ -167,11 +167,11 @@ export default [
ignores: ["src/entrypoints/popup/components/Icons/Icon.tsx", "src/entrypoints/popup/components/Logo.tsx", "src/utils/constants/logo.ts", "src/**/__tests__/**"],
rules: {
"no-restricted-syntax": ["error",
- { selector: "JSXOpeningElement[name.name='svg']", message: "Use the Icon component with an icon from core/models/src/icons instead of inline SVG." },
+ { selector: "JSXOpeningElement[name.name='svg']", message: "Use the Icon component with an icon from core/assets/icons instead of inline SVG." },
{ selector: "TemplateElement[value.raw=/<svg/]", message: "Use uiIconSvg() from @aliasvault/models/icons instead of inline SVG markup." },
{ selector: "Literal[value=/<svg/]", message: "Use uiIconSvg() from @aliasvault/models/icons instead of inline SVG markup." },
- { selector: "Literal[value=/(orange|indigo)-[0-9]/]", message: "Use the primary-* brand colors (core/models/src/colors) instead of Tailwind orange or indigo; use amber for warnings." },
- { selector: "TemplateElement[value.raw=/(orange|indigo)-[0-9]/]", message: "Use the primary-* brand colors (core/models/src/colors) instead of Tailwind orange or indigo; use amber for warnings." },
+ { selector: "Literal[value=/(orange|indigo)-[0-9]/]", message: "Use the primary-* brand colors (core/assets/colors) instead of Tailwind orange or indigo; use amber for warnings." },
+ { selector: "TemplateElement[value.raw=/(orange|indigo)-[0-9]/]", message: "Use the primary-* brand colors (core/assets/colors) instead of Tailwind orange or indigo; use amber for warnings." },
],
},
},
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/BuiltinLogos.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/BuiltinLogos.kt
index a085141bc..7606f9c2f 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/BuiltinLogos.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/BuiltinLogos.kt
@@ -1,5 +1,5 @@
// <auto-generated />
-// This file is auto-generated from core/models/src/icons/svg by core/models/scripts/generate-icons.cjs.
+// This file is auto-generated from core/assets/icons by core/models/scripts/generate-icons.cjs.
// Do not edit this file directly. Run 'node core/models/scripts/generate-icons.cjs' to regenerate.
@file:Suppress("MaxLineLength")
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/ItemTypeIcons.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/ItemTypeIcons.kt
index 28011188a..ed93c93a6 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/ItemTypeIcons.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/models/ItemTypeIcons.kt
@@ -1,5 +1,5 @@
// <auto-generated />
-// This file is auto-generated from core/models/src/icons/svg by core/models/scripts/generate-icons.cjs.
+// This file is auto-generated from core/assets/icons by core/models/scripts/generate-icons.cjs.
// Do not edit this file directly. Run 'node core/models/scripts/generate-icons.cjs' to regenerate.
@file:Suppress("MaxLineLength")
diff --git a/apps/mobile-app/android/app/src/main/res/values-night/av_colors.xml b/apps/mobile-app/android/app/src/main/res/values-night/av_colors.xml
index 7c059cf11..a3bd6edbf 100644
--- a/apps/mobile-app/android/app/src/main/res/values-night/av_colors.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-night/av_colors.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<auto-generated />
- This file is auto-generated from core/models/src/colors/palette.json by core/models/scripts/generate-colors.cjs.
+ This file is auto-generated from core/assets/colors/palette.json by core/models/scripts/generate-colors.cjs.
Do not edit this file directly. Run 'node core/models/scripts/generate-colors.cjs' to regenerate.
-->
<resources>
diff --git a/apps/mobile-app/android/app/src/main/res/values-night/colors.xml b/apps/mobile-app/android/app/src/main/res/values-night/colors.xml
index 4782bbe78..701705246 100644
--- a/apps/mobile-app/android/app/src/main/res/values-night/colors.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-night/colors.xml
@@ -1,5 +1,5 @@
<resources>
- <!-- The theme colors (av_*) are generated into av_colors.xml from core/models/src/colors/palette.json. -->
+ <!-- The theme colors (av_*) are generated into av_colors.xml from core/assets/colors/palette.json. -->
<color name="splashscreen_background">#202020</color>
<color name="av_loading_overlay">#CC000000</color>
</resources>
diff --git a/apps/mobile-app/android/app/src/main/res/values/av_colors.xml b/apps/mobile-app/android/app/src/main/res/values/av_colors.xml
index 44f887786..bf554d826 100644
--- a/apps/mobile-app/android/app/src/main/res/values/av_colors.xml
+++ b/apps/mobile-app/android/app/src/main/res/values/av_colors.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<auto-generated />
- This file is auto-generated from core/models/src/colors/palette.json by core/models/scripts/generate-colors.cjs.
+ This file is auto-generated from core/assets/colors/palette.json by core/models/scripts/generate-colors.cjs.
Do not edit this file directly. Run 'node core/models/scripts/generate-colors.cjs' to regenerate.
-->
<resources>
diff --git a/apps/mobile-app/android/app/src/main/res/values/colors.xml b/apps/mobile-app/android/app/src/main/res/values/colors.xml
index 358fdd9bd..230c6222d 100644
--- a/apps/mobile-app/android/app/src/main/res/values/colors.xml
+++ b/apps/mobile-app/android/app/src/main/res/values/colors.xml
@@ -1,5 +1,5 @@
<resources>
- <!-- The theme colors (av_*) are generated into av_colors.xml from core/models/src/colors/palette.json. -->
+ <!-- The theme colors (av_*) are generated into av_colors.xml from core/assets/colors/palette.json. -->
<color name="splashscreen_background">#ffffff</color>
<color name="ic_launcher_background">#FFFFFF</color>
<color name="av_loading_overlay">#CCFFFFFF</color>
diff --git a/apps/mobile-app/components/items/BuiltinLogoComponents.tsx b/apps/mobile-app/components/items/BuiltinLogoComponents.tsx
index 8595c340b..942b0aac5 100644
--- a/apps/mobile-app/components/items/BuiltinLogoComponents.tsx
+++ b/apps/mobile-app/components/items/BuiltinLogoComponents.tsx
@@ -1,5 +1,5 @@
// <auto-generated />
-// This file is auto-generated from core/models/src/icons/svg by core/models/scripts/generate-icons.cjs.
+// This file is auto-generated from core/assets/icons by core/models/scripts/generate-icons.cjs.
// Do not edit this file directly. Run 'node core/models/scripts/generate-icons.cjs' to regenerate.
import React from 'react';
diff --git a/apps/mobile-app/components/items/ItemTypeIconComponents.tsx b/apps/mobile-app/components/items/ItemTypeIconComponents.tsx
index bc11b34b4..51d3261df 100644
--- a/apps/mobile-app/components/items/ItemTypeIconComponents.tsx
+++ b/apps/mobile-app/components/items/ItemTypeIconComponents.tsx
@@ -1,5 +1,5 @@
// <auto-generated />
-// This file is auto-generated from core/models/src/icons/svg by core/models/scripts/generate-icons.cjs.
+// This file is auto-generated from core/assets/icons by core/models/scripts/generate-icons.cjs.
// Do not edit this file directly. Run 'node core/models/scripts/generate-icons.cjs' to regenerate.
import React from 'react';
diff --git a/apps/mobile-app/constants/Colors.ts b/apps/mobile-app/constants/Colors.ts
index e49bd0434..5ad3dcb9c 100644
--- a/apps/mobile-app/constants/Colors.ts
+++ b/apps/mobile-app/constants/Colors.ts
@@ -1,7 +1,7 @@
import { ThemeColors as SharedColors } from '@aliasvault/models/colors';
/**
- * The colors used in the app, per color scheme. The shared theme colors come from core/models/src/colors/palette.json,
+ * The colors used in the app, per color scheme. The shared theme colors come from core/assets/colors/palette.json,
* the keys below them are specific to the React Native app.
*/
export const Colors = {
diff --git a/apps/mobile-app/ios/VaultModels/BuiltinLogos.swift b/apps/mobile-app/ios/VaultModels/BuiltinLogos.swift
index 8baca41f0..5493f9933 100644
--- a/apps/mobile-app/ios/VaultModels/BuiltinLogos.swift
+++ b/apps/mobile-app/ios/VaultModels/BuiltinLogos.swift
@@ -1,5 +1,5 @@
// <auto-generated />
-// This file is auto-generated from core/models/src/icons/svg by core/models/scripts/generate-icons.cjs.
+// This file is auto-generated from core/assets/icons by core/models/scripts/generate-icons.cjs.
// Do not edit this file directly. Run 'node core/models/scripts/generate-icons.cjs' to regenerate.
// swiftlint:disable line_length
diff --git a/apps/mobile-app/ios/VaultModels/ItemTypeIcons.swift b/apps/mobile-app/ios/VaultModels/ItemTypeIcons.swift
index 583126bcb..4b3384f6d 100644
--- a/apps/mobile-app/ios/VaultModels/ItemTypeIcons.swift
+++ b/apps/mobile-app/ios/VaultModels/ItemTypeIcons.swift
@@ -1,5 +1,5 @@
// <auto-generated />
-// This file is auto-generated from core/models/src/icons/svg by core/models/scripts/generate-icons.cjs.
+// This file is auto-generated from core/assets/icons by core/models/scripts/generate-icons.cjs.
// Do not edit this file directly. Run 'node core/models/scripts/generate-icons.cjs' to regenerate.
// swiftlint:disable line_length
diff --git a/apps/mobile-app/ios/VaultUI/ColorConstants.swift b/apps/mobile-app/ios/VaultUI/ColorConstants.swift
index e9d99951c..123714045 100644
--- a/apps/mobile-app/ios/VaultUI/ColorConstants.swift
+++ b/apps/mobile-app/ios/VaultUI/ColorConstants.swift
@@ -1,5 +1,5 @@
// <auto-generated />
-// This file is auto-generated from core/models/src/colors/palette.json by core/models/scripts/generate-colors.cjs.
+// This file is auto-generated from core/assets/colors/palette.json by core/models/scripts/generate-colors.cjs.
// Do not edit this file directly. Run 'node core/models/scripts/generate-colors.cjs' to regenerate.
import SwiftUI
diff --git a/apps/server/AliasVault.Admin/Main/Components/Icons/UiIcons.cs b/apps/server/AliasVault.Admin/Main/Components/Icons/UiIcons.cs
index 3acc099b4..f3ce846c2 100644
--- a/apps/server/AliasVault.Admin/Main/Components/Icons/UiIcons.cs
+++ b/apps/server/AliasVault.Admin/Main/Components/Icons/UiIcons.cs
@@ -1,5 +1,5 @@
// <auto-generated />
-// This file is auto-generated from core/models/src/icons/svg by core/models/scripts/generate-icons.cjs.
+// This file is auto-generated from core/assets/icons by core/models/scripts/generate-icons.cjs.
// Do not edit this file directly. Run 'node core/models/scripts/generate-icons.cjs' to regenerate.
namespace AliasVault.Admin.Main.Components.Icons;
diff --git a/apps/web/eslint.config.js b/apps/web/eslint.config.js
index 6de9d9f08..40d3e69d0 100644
--- a/apps/web/eslint.config.js
+++ b/apps/web/eslint.config.js
@@ -154,11 +154,11 @@ export default [
ignores: ["src/components/shared/Icon.tsx", "src/**/__tests__/**"],
rules: {
"no-restricted-syntax": ["error",
- { selector: "JSXOpeningElement[name.name='svg']", message: "Use the Icon component with an icon from core/models/src/icons instead of inline SVG." },
+ { selector: "JSXOpeningElement[name.name='svg']", message: "Use the Icon component with an icon from core/assets/icons instead of inline SVG." },
{ selector: "TemplateElement[value.raw=/<svg/]", message: "Use uiIconSvg() from @aliasvault/models/icons instead of inline SVG markup." },
{ selector: "Literal[value=/<svg/]", message: "Use uiIconSvg() from @aliasvault/models/icons instead of inline SVG markup." },
- { selector: "Literal[value=/(orange|indigo)-[0-9]/]", message: "Use the primary-* brand colors (core/models/src/colors) instead of Tailwind orange or indigo; use amber for warnings." },
- { selector: "TemplateElement[value.raw=/(orange|indigo)-[0-9]/]", message: "Use the primary-* brand colors (core/models/src/colors) instead of Tailwind orange or indigo; use amber for warnings." },
+ { selector: "Literal[value=/(orange|indigo)-[0-9]/]", message: "Use the primary-* brand colors (core/assets/colors) instead of Tailwind orange or indigo; use amber for warnings." },
+ { selector: "TemplateElement[value.raw=/(orange|indigo)-[0-9]/]", message: "Use the primary-* brand colors (core/assets/colors) instead of Tailwind orange or indigo; use amber for warnings." },
],
},
},
diff --git a/core/assets/README.md b/core/assets/README.md
index c4ca488d5..8a55458c5 100644
--- a/core/assets/README.md
+++ b/core/assets/README.md
@@ -1,11 +1,15 @@
# Shared image assets
-Source images for the apps. `sync.sh` copies each file to the destinations listed in `targets.txt`; the copies stay in the app folders so each app builds on its own. This ensures that all apps share the same base brand assets, and any future changes can be easily synced to all apps.
+Source images, icons and colors for the apps. `sync.sh` copies each image to the destinations listed in `targets.txt`; the copies stay in the app folders so each app builds on its own. This ensures that all apps share the same base brand assets, and any future changes can be easily synced to all apps.
Edit a file here (and add a `<source> <destination>` line to `targets.txt` when you add one), then run the script from this folder:
```bash
-./sync.sh # copy sources to their destinations
+./sync.sh # copy sources to their destinations and run the icon and color generators
./sync.sh --check # fail if a copy is missing, stale, or unmanaged
./sync.sh --list # print each source and where it is copied
```
+
+`icons/` and `colors/` are not copied as-is: `sync.sh` runs their generators in `core/models/scripts`, which write the
+platform catalogs (TypeScript, Tailwind, C#, Swift, Kotlin, Android resources). See [icons/README.md](icons/README.md) and
+[colors/README.md](colors/README.md).
diff --git a/core/models/src/colors/README.md b/core/assets/colors/README.md
similarity index 65%
rename from core/models/src/colors/README.md
rename to core/assets/colors/README.md
index 029b2a1e9..d920548a2 100644
--- a/core/models/src/colors/README.md
+++ b/core/assets/colors/README.md
@@ -5,11 +5,11 @@
- `primary`: the brand color scale (`primary-50` to `primary-900`), used for every primary action, link, active state and brand accent.
- `theme.light` / `theme.dark`: the semantic theme colors of the mobile apps. A value is a `#rrggbb` color or a `primary.<shade>` reference.
-Run `node core/models/scripts/generate-colors.cjs` (also part of `core/models/build.sh`) after a change. It writes:
+Run `core/assets/sync.sh` (or `node core/models/scripts/generate-colors.cjs`) after a change. It writes:
| Output | Used by |
|--------|---------|
-| `Palette.ts` | TypeScript, as `@aliasvault/models/colors` (mobile `constants/Colors.ts`) |
-| `tailwind-preset.cjs` | the Tailwind configs of the web app, browser extension and admin |
+| `core/models/src/colors/Palette.ts` | TypeScript, as `@aliasvault/models/colors` (mobile `constants/Colors.ts`) |
+| `core/models/src/colors/tailwind-preset.cjs` | the Tailwind configs of the web app, browser extension and admin |
| `apps/mobile-app/ios/VaultUI/ColorConstants.swift` | native iOS screens (autofill, passkeys) |
| `apps/mobile-app/android/app/src/main/res/values{,-night}/av_colors.xml` | native Android screens, as `@color/av_*` |
diff --git a/core/models/src/colors/palette.json b/core/assets/colors/palette.json
similarity index 100%
rename from core/models/src/colors/palette.json
rename to core/assets/colors/palette.json
diff --git a/core/assets/icons/README.md b/core/assets/icons/README.md
new file mode 100644
index 000000000..4fe798e9b
--- /dev/null
+++ b/core/assets/icons/README.md
@@ -0,0 +1,17 @@
+# Icons
+
+All icons of the AliasVault apps, one source of truth for every platform.
+
+- `ui/`: UI icons, drawn in `currentColor` so they take the text color.
+- `item/`: item type icons (placeholder, note, card brands).
+- `builtin-logo/`: built-in logos a user can pick for an item. The PascalCase form of the file name (`shopping.svg` is `Shopping`) is stored in the vault, never rename one.
+- `sources.json`: where each icon comes from. Every icon needs an entry.
+
+Run `core/assets/sync.sh` (or `node core/models/scripts/generate-icons.cjs`) after editing an icon to generate the catalogs for all platforms
+(`core/models/src/icons`, `@aliasvault/models/icons` for TypeScript).
+
+## Sources
+
+See `sources.json` for the full list of the source of each icon.
+
+Licenses that apply: heroicons, Feather, Lucide and Zondicons are MIT or ISC licensed, Material Symbols is Apache 2.0.
diff --git a/core/models/src/icons/svg/builtin-logo/bank.svg b/core/assets/icons/builtin-logo/bank.svg
similarity index 100%
rename from core/models/src/icons/svg/builtin-logo/bank.svg
rename to core/assets/icons/builtin-logo/bank.svg
diff --git a/core/models/src/icons/svg/builtin-logo/dev.svg b/core/assets/icons/builtin-logo/dev.svg
similarity index 100%
rename from core/models/src/icons/svg/builtin-logo/dev.svg
rename to core/assets/icons/builtin-logo/dev.svg
diff --git a/core/models/src/icons/svg/builtin-logo/game.svg b/core/assets/icons/builtin-logo/game.svg
similarity index 100%
rename from core/models/src/icons/svg/builtin-logo/game.svg
rename to core/assets/icons/builtin-logo/game.svg
diff --git a/core/models/src/icons/svg/builtin-logo/health.svg b/core/assets/icons/builtin-logo/health.svg
similarity index 100%
rename from core/models/src/icons/svg/builtin-logo/health.svg
rename to core/assets/icons/builtin-logo/health.svg
diff --git a/core/models/src/icons/svg/builtin-logo/mail.svg b/core/assets/icons/builtin-logo/mail.svg
similarity index 100%
rename from core/models/src/icons/svg/builtin-logo/mail.svg
rename to core/assets/icons/builtin-logo/mail.svg
diff --git a/core/models/src/icons/svg/builtin-logo/media.svg b/core/assets/icons/builtin-logo/media.svg
similarity index 100%
rename from core/models/src/icons/svg/builtin-logo/media.svg
rename to core/assets/icons/builtin-logo/media.svg
diff --git a/core/models/src/icons/svg/builtin-logo/shopping.svg b/core/assets/icons/builtin-logo/shopping.svg
similarity index 100%
rename from core/models/src/icons/svg/builtin-logo/shopping.svg
rename to core/assets/icons/builtin-logo/shopping.svg
diff --git a/core/models/src/icons/svg/builtin-logo/social.svg b/core/assets/icons/builtin-logo/social.svg
similarity index 100%
rename from core/models/src/icons/svg/builtin-logo/social.svg
rename to core/assets/icons/builtin-logo/social.svg
diff --git a/core/models/src/icons/svg/builtin-logo/travel.svg b/core/assets/icons/builtin-logo/travel.svg
similarity index 100%
rename from core/models/src/icons/svg/builtin-logo/travel.svg
rename to core/assets/icons/builtin-logo/travel.svg
diff --git a/core/models/src/icons/svg/builtin-logo/work.svg b/core/assets/icons/builtin-logo/work.svg
similarity index 100%
rename from core/models/src/icons/svg/builtin-logo/work.svg
rename to core/assets/icons/builtin-logo/work.svg
diff --git a/core/models/src/icons/svg/item/amex.svg b/core/assets/icons/item/amex.svg
similarity index 100%
rename from core/models/src/icons/svg/item/amex.svg
rename to core/assets/icons/item/amex.svg
diff --git a/core/models/src/icons/svg/item/credit-card.svg b/core/assets/icons/item/credit-card.svg
similarity index 100%
rename from core/models/src/icons/svg/item/credit-card.svg
rename to core/assets/icons/item/credit-card.svg
diff --git a/core/models/src/icons/svg/item/discover.svg b/core/assets/icons/item/discover.svg
similarity index 100%
rename from core/models/src/icons/svg/item/discover.svg
rename to core/assets/icons/item/discover.svg
diff --git a/core/models/src/icons/svg/item/mastercard.svg b/core/assets/icons/item/mastercard.svg
similarity index 100%
rename from core/models/src/icons/svg/item/mastercard.svg
rename to core/assets/icons/item/mastercard.svg
diff --git a/core/models/src/icons/svg/item/note.svg b/core/assets/icons/item/note.svg
similarity index 100%
rename from core/models/src/icons/svg/item/note.svg
rename to core/assets/icons/item/note.svg
diff --git a/core/models/src/icons/svg/item/placeholder.svg b/core/assets/icons/item/placeholder.svg
similarity index 100%
rename from core/models/src/icons/svg/item/placeholder.svg
rename to core/assets/icons/item/placeholder.svg
diff --git a/core/models/src/icons/svg/item/visa.svg b/core/assets/icons/item/visa.svg
similarity index 100%
rename from core/models/src/icons/svg/item/visa.svg
rename to core/assets/icons/item/visa.svg
diff --git a/core/models/src/icons/sources.json b/core/assets/icons/sources.json
similarity index 100%
rename from core/models/src/icons/sources.json
rename to core/assets/icons/sources.json
diff --git a/core/models/src/icons/svg/ui/archive.svg b/core/assets/icons/ui/archive.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/archive.svg
rename to core/assets/icons/ui/archive.svg
diff --git a/core/models/src/icons/svg/ui/arrow-circle-down.svg b/core/assets/icons/ui/arrow-circle-down.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/arrow-circle-down.svg
rename to core/assets/icons/ui/arrow-circle-down.svg
diff --git a/core/models/src/icons/svg/ui/arrow-left.svg b/core/assets/icons/ui/arrow-left.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/arrow-left.svg
rename to core/assets/icons/ui/arrow-left.svg
diff --git a/core/models/src/icons/svg/ui/arrow-narrow-down.svg b/core/assets/icons/ui/arrow-narrow-down.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/arrow-narrow-down.svg
rename to core/assets/icons/ui/arrow-narrow-down.svg
diff --git a/core/models/src/icons/svg/ui/arrow-narrow-up.svg b/core/assets/icons/ui/arrow-narrow-up.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/arrow-narrow-up.svg
rename to core/assets/icons/ui/arrow-narrow-up.svg
diff --git a/core/models/src/icons/svg/ui/arrow-right.svg b/core/assets/icons/ui/arrow-right.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/arrow-right.svg
rename to core/assets/icons/ui/arrow-right.svg
diff --git a/core/models/src/icons/svg/ui/arrows-expand.svg b/core/assets/icons/ui/arrows-expand.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/arrows-expand.svg
rename to core/assets/icons/ui/arrows-expand.svg
diff --git a/core/models/src/icons/svg/ui/backspace.svg b/core/assets/icons/ui/backspace.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/backspace.svg
rename to core/assets/icons/ui/backspace.svg
diff --git a/core/models/src/icons/svg/ui/chart-bar.svg b/core/assets/icons/ui/chart-bar.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/chart-bar.svg
rename to core/assets/icons/ui/chart-bar.svg
diff --git a/core/models/src/icons/svg/ui/check-circle.svg b/core/assets/icons/ui/check-circle.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/check-circle.svg
rename to core/assets/icons/ui/check-circle.svg
diff --git a/core/models/src/icons/svg/ui/check.svg b/core/assets/icons/ui/check.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/check.svg
rename to core/assets/icons/ui/check.svg
diff --git a/core/models/src/icons/svg/ui/chevron-down.svg b/core/assets/icons/ui/chevron-down.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/chevron-down.svg
rename to core/assets/icons/ui/chevron-down.svg
diff --git a/core/models/src/icons/svg/ui/chevron-left.svg b/core/assets/icons/ui/chevron-left.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/chevron-left.svg
rename to core/assets/icons/ui/chevron-left.svg
diff --git a/core/models/src/icons/svg/ui/chevron-right.svg b/core/assets/icons/ui/chevron-right.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/chevron-right.svg
rename to core/assets/icons/ui/chevron-right.svg
diff --git a/core/models/src/icons/svg/ui/clipboard-list.svg b/core/assets/icons/ui/clipboard-list.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/clipboard-list.svg
rename to core/assets/icons/ui/clipboard-list.svg
diff --git a/core/models/src/icons/svg/ui/clipboard.svg b/core/assets/icons/ui/clipboard.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/clipboard.svg
rename to core/assets/icons/ui/clipboard.svg
diff --git a/core/models/src/icons/svg/ui/clock.svg b/core/assets/icons/ui/clock.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/clock.svg
rename to core/assets/icons/ui/clock.svg
diff --git a/core/models/src/icons/svg/ui/cloud-upload.svg b/core/assets/icons/ui/cloud-upload.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/cloud-upload.svg
rename to core/assets/icons/ui/cloud-upload.svg
diff --git a/core/models/src/icons/svg/ui/cog.svg b/core/assets/icons/ui/cog.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/cog.svg
rename to core/assets/icons/ui/cog.svg
diff --git a/core/models/src/icons/svg/ui/collection.svg b/core/assets/icons/ui/collection.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/collection.svg
rename to core/assets/icons/ui/collection.svg
diff --git a/core/models/src/icons/svg/ui/color-swatch.svg b/core/assets/icons/ui/color-swatch.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/color-swatch.svg
rename to core/assets/icons/ui/color-swatch.svg
diff --git a/core/models/src/icons/svg/ui/credit-card.svg b/core/assets/icons/ui/credit-card.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/credit-card.svg
rename to core/assets/icons/ui/credit-card.svg
diff --git a/core/models/src/icons/svg/ui/database.svg b/core/assets/icons/ui/database.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/database.svg
rename to core/assets/icons/ui/database.svg
diff --git a/core/models/src/icons/svg/ui/desktop-computer.svg b/core/assets/icons/ui/desktop-computer.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/desktop-computer.svg
rename to core/assets/icons/ui/desktop-computer.svg
diff --git a/core/models/src/icons/svg/ui/device-mobile.svg b/core/assets/icons/ui/device-mobile.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/device-mobile.svg
rename to core/assets/icons/ui/device-mobile.svg
diff --git a/core/models/src/icons/svg/ui/document-duplicate.svg b/core/assets/icons/ui/document-duplicate.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/document-duplicate.svg
rename to core/assets/icons/ui/document-duplicate.svg
diff --git a/core/models/src/icons/svg/ui/document-text.svg b/core/assets/icons/ui/document-text.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/document-text.svg
rename to core/assets/icons/ui/document-text.svg
diff --git a/core/models/src/icons/svg/ui/dots-vertical-narrow.svg b/core/assets/icons/ui/dots-vertical-narrow.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/dots-vertical-narrow.svg
rename to core/assets/icons/ui/dots-vertical-narrow.svg
diff --git a/core/models/src/icons/svg/ui/download.svg b/core/assets/icons/ui/download.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/download.svg
rename to core/assets/icons/ui/download.svg
diff --git a/core/models/src/icons/svg/ui/duplicate.svg b/core/assets/icons/ui/duplicate.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/duplicate.svg
rename to core/assets/icons/ui/duplicate.svg
diff --git a/core/models/src/icons/svg/ui/exclamation.svg b/core/assets/icons/ui/exclamation.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/exclamation.svg
rename to core/assets/icons/ui/exclamation.svg
diff --git a/core/models/src/icons/svg/ui/external-link.svg b/core/assets/icons/ui/external-link.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/external-link.svg
rename to core/assets/icons/ui/external-link.svg
diff --git a/core/models/src/icons/svg/ui/eye-off.svg b/core/assets/icons/ui/eye-off.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/eye-off.svg
rename to core/assets/icons/ui/eye-off.svg
diff --git a/core/models/src/icons/svg/ui/eye.svg b/core/assets/icons/ui/eye.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/eye.svg
rename to core/assets/icons/ui/eye.svg
diff --git a/core/models/src/icons/svg/ui/folder-check.svg b/core/assets/icons/ui/folder-check.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/folder-check.svg
rename to core/assets/icons/ui/folder-check.svg
diff --git a/core/models/src/icons/svg/ui/folder-filled.svg b/core/assets/icons/ui/folder-filled.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/folder-filled.svg
rename to core/assets/icons/ui/folder-filled.svg
diff --git a/core/models/src/icons/svg/ui/folder.svg b/core/assets/icons/ui/folder.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/folder.svg
rename to core/assets/icons/ui/folder.svg
diff --git a/core/models/src/icons/svg/ui/globe-alt.svg b/core/assets/icons/ui/globe-alt.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/globe-alt.svg
rename to core/assets/icons/ui/globe-alt.svg
diff --git a/core/models/src/icons/svg/ui/grip-vertical.svg b/core/assets/icons/ui/grip-vertical.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/grip-vertical.svg
rename to core/assets/icons/ui/grip-vertical.svg
diff --git a/core/models/src/icons/svg/ui/hashtag.svg b/core/assets/icons/ui/hashtag.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/hashtag.svg
rename to core/assets/icons/ui/hashtag.svg
diff --git a/core/models/src/icons/svg/ui/home.svg b/core/assets/icons/ui/home.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/home.svg
rename to core/assets/icons/ui/home.svg
diff --git a/core/models/src/icons/svg/ui/information-circle.svg b/core/assets/icons/ui/information-circle.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/information-circle.svg
rename to core/assets/icons/ui/information-circle.svg
diff --git a/core/models/src/icons/svg/ui/key.svg b/core/assets/icons/ui/key.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/key.svg
rename to core/assets/icons/ui/key.svg
diff --git a/core/models/src/icons/svg/ui/keyboard.svg b/core/assets/icons/ui/keyboard.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/keyboard.svg
rename to core/assets/icons/ui/keyboard.svg
diff --git a/core/models/src/icons/svg/ui/lock-closed.svg b/core/assets/icons/ui/lock-closed.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/lock-closed.svg
rename to core/assets/icons/ui/lock-closed.svg
diff --git a/core/models/src/icons/svg/ui/logout.svg b/core/assets/icons/ui/logout.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/logout.svg
rename to core/assets/icons/ui/logout.svg
diff --git a/core/models/src/icons/svg/ui/mail.svg b/core/assets/icons/ui/mail.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/mail.svg
rename to core/assets/icons/ui/mail.svg
diff --git a/core/models/src/icons/svg/ui/menu-alt-3.svg b/core/assets/icons/ui/menu-alt-3.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/menu-alt-3.svg
rename to core/assets/icons/ui/menu-alt-3.svg
diff --git a/core/models/src/icons/svg/ui/menu.svg b/core/assets/icons/ui/menu.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/menu.svg
rename to core/assets/icons/ui/menu.svg
diff --git a/core/models/src/icons/svg/ui/moon.svg b/core/assets/icons/ui/moon.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/moon.svg
rename to core/assets/icons/ui/moon.svg
diff --git a/core/models/src/icons/svg/ui/paper-clip.svg b/core/assets/icons/ui/paper-clip.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/paper-clip.svg
rename to core/assets/icons/ui/paper-clip.svg
diff --git a/core/models/src/icons/svg/ui/pencil-alt.svg b/core/assets/icons/ui/pencil-alt.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/pencil-alt.svg
rename to core/assets/icons/ui/pencil-alt.svg
diff --git a/core/models/src/icons/svg/ui/pencil.svg b/core/assets/icons/ui/pencil.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/pencil.svg
rename to core/assets/icons/ui/pencil.svg
diff --git a/core/models/src/icons/svg/ui/pin-material.svg b/core/assets/icons/ui/pin-material.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/pin-material.svg
rename to core/assets/icons/ui/pin-material.svg
diff --git a/core/models/src/icons/svg/ui/plus-sm.svg b/core/assets/icons/ui/plus-sm.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/plus-sm.svg
rename to core/assets/icons/ui/plus-sm.svg
diff --git a/core/models/src/icons/svg/ui/plus.svg b/core/assets/icons/ui/plus.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/plus.svg
rename to core/assets/icons/ui/plus.svg
diff --git a/core/models/src/icons/svg/ui/qrcode.svg b/core/assets/icons/ui/qrcode.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/qrcode.svg
rename to core/assets/icons/ui/qrcode.svg
diff --git a/core/models/src/icons/svg/ui/question-mark-circle.svg b/core/assets/icons/ui/question-mark-circle.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/question-mark-circle.svg
rename to core/assets/icons/ui/question-mark-circle.svg
diff --git a/core/models/src/icons/svg/ui/refresh.svg b/core/assets/icons/ui/refresh.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/refresh.svg
rename to core/assets/icons/ui/refresh.svg
diff --git a/core/models/src/icons/svg/ui/reply.svg b/core/assets/icons/ui/reply.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/reply.svg
rename to core/assets/icons/ui/reply.svg
diff --git a/core/models/src/icons/svg/ui/search.svg b/core/assets/icons/ui/search.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/search.svg
rename to core/assets/icons/ui/search.svg
diff --git a/core/models/src/icons/svg/ui/shield-check.svg b/core/assets/icons/ui/shield-check.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/shield-check.svg
rename to core/assets/icons/ui/shield-check.svg
diff --git a/core/models/src/icons/svg/ui/shield-exclamation.svg b/core/assets/icons/ui/shield-exclamation.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/shield-exclamation.svg
rename to core/assets/icons/ui/shield-exclamation.svg
diff --git a/core/models/src/icons/svg/ui/sort-descending.svg b/core/assets/icons/ui/sort-descending.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/sort-descending.svg
rename to core/assets/icons/ui/sort-descending.svg
diff --git a/core/models/src/icons/svg/ui/spinner-flowbite.svg b/core/assets/icons/ui/spinner-flowbite.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/spinner-flowbite.svg
rename to core/assets/icons/ui/spinner-flowbite.svg
diff --git a/core/models/src/icons/svg/ui/spinner.svg b/core/assets/icons/ui/spinner.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/spinner.svg
rename to core/assets/icons/ui/spinner.svg
diff --git a/core/models/src/icons/svg/ui/square-check.svg b/core/assets/icons/ui/square-check.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/square-check.svg
rename to core/assets/icons/ui/square-check.svg
diff --git a/core/models/src/icons/svg/ui/square-feather.svg b/core/assets/icons/ui/square-feather.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/square-feather.svg
rename to core/assets/icons/ui/square-feather.svg
diff --git a/core/models/src/icons/svg/ui/status-offline.svg b/core/assets/icons/ui/status-offline.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/status-offline.svg
rename to core/assets/icons/ui/status-offline.svg
diff --git a/core/models/src/icons/svg/ui/sun.svg b/core/assets/icons/ui/sun.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/sun.svg
rename to core/assets/icons/ui/sun.svg
diff --git a/core/models/src/icons/svg/ui/switch-horizontal.svg b/core/assets/icons/ui/switch-horizontal.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/switch-horizontal.svg
rename to core/assets/icons/ui/switch-horizontal.svg
diff --git a/core/models/src/icons/svg/ui/translate.svg b/core/assets/icons/ui/translate.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/translate.svg
rename to core/assets/icons/ui/translate.svg
diff --git a/core/models/src/icons/svg/ui/trash.svg b/core/assets/icons/ui/trash.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/trash.svg
rename to core/assets/icons/ui/trash.svg
diff --git a/core/models/src/icons/svg/ui/upload.svg b/core/assets/icons/ui/upload.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/upload.svg
rename to core/assets/icons/ui/upload.svg
diff --git a/core/models/src/icons/svg/ui/user-group.svg b/core/assets/icons/ui/user-group.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/user-group.svg
rename to core/assets/icons/ui/user-group.svg
diff --git a/core/models/src/icons/svg/ui/user.svg b/core/assets/icons/ui/user.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/user.svg
rename to core/assets/icons/ui/user.svg
diff --git a/core/models/src/icons/svg/ui/users.svg b/core/assets/icons/ui/users.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/users.svg
rename to core/assets/icons/ui/users.svg
diff --git a/core/models/src/icons/svg/ui/view-grid-add.svg b/core/assets/icons/ui/view-grid-add.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/view-grid-add.svg
rename to core/assets/icons/ui/view-grid-add.svg
diff --git a/core/models/src/icons/svg/ui/x-circle.svg b/core/assets/icons/ui/x-circle.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/x-circle.svg
rename to core/assets/icons/ui/x-circle.svg
diff --git a/core/models/src/icons/svg/ui/x.svg b/core/assets/icons/ui/x.svg
similarity index 100%
rename from core/models/src/icons/svg/ui/x.svg
rename to core/assets/icons/ui/x.svg
diff --git a/core/assets/sync.sh b/core/assets/sync.sh
index ba0cfc9f3..83fbffe5f 100755
--- a/core/assets/sync.sh
+++ b/core/assets/sync.sh
@@ -1,9 +1,10 @@
#!/bin/bash
#
-# Copies the shared image assets in core/assets to every app folder listed in targets.txt.
+# Copies the shared image assets in core/assets to every app folder listed in targets.txt, then runs the generators for
+# the icon catalogs (icons/) and the color palette (colors/), which are not copied as-is.
#
# Usage:
-# ./sync.sh Copy every source to its destinations (only files that differ are written)
+# ./sync.sh Copy every source to its destinations (only files that differ are written) and run the generators
# ./sync.sh --check Change nothing; exit 1 when a copy is missing or differs, or an image is unmanaged
# ./sync.sh --list Print each source with the destinations it is copied to
#
@@ -119,7 +120,7 @@ done
# Sources that no mapping uses.
SOURCES="$(printf '%s\n' "${PAIRS[@]}" | cut -d' ' -f1 | sed 's/^paths://' | sort -u)"
-for f in $(cd "$ASSETS_DIR" && find . -type f | sed 's|^\./||' | grep -iE "$IMAGE_PATTERN" | sort); do
+for f in $(cd "$ASSETS_DIR" && find . -type f -not -path './icons/*' | sed 's|^\./||' | grep -iE "$IMAGE_PATTERN" | sort); do
if ! printf '%s\n' "$SOURCES" | grep -qxF "$f"; then echo "unused source: core/assets/$f"; PROBLEMS=$((PROBLEMS + 1)); fi
done
@@ -129,4 +130,6 @@ if [ "$MODE" = "check" ]; then
else
echo "$WRITTEN file(s) written."
if [ "$PROBLEMS" -gt 0 ]; then echo "$PROBLEMS problem(s) above need a manual fix."; exit 1; fi
+ node core/models/scripts/generate-icons.cjs
+ node core/models/scripts/generate-colors.cjs
fi
diff --git a/core/models/README.md b/core/models/README.md
index 2a7078652..ee3a179e9 100644
--- a/core/models/README.md
+++ b/core/models/README.md
@@ -19,8 +19,8 @@ Automatically generates platform-specific models from TypeScript sources:
| `src/vault/FieldKey.ts` | `apps/mobile-app/ios/VaultModels/FieldKey.swift` | Swift |
| `src/vault/FieldKey.ts` | `apps/mobile-app/android/.../vaultstore/models/FieldKey.kt` | Kotlin |
-Icons (UI, item type and built-in logos) are generated from the SVG files in `src/icons/svg` by
-`scripts/generate-icons.cjs`; see [src/icons/README.md](src/icons/README.md) for more details.
+Icons (UI, item type and built-in logos) are generated from the SVG files in `core/assets/icons` by
+`scripts/generate-icons.cjs`; see [core/assets/icons/README.md](../assets/icons/README.md) for more details.
### 3. Registry and Vocabulary Generators
@@ -29,7 +29,7 @@ Icons (UI, item type and built-in logos) are generated from the SVG files in `sr
| `scripts/generate-vault-table-registry.cjs` | `src/vault/VaultTableRegistry.ts` | the Rust codec's datamodel registry, the C# `VaultTableRegistry`, and `VaultDataBucketCategory` (C#, Swift, Kotlin) |
| `scripts/generate-key-vocabulary.cjs` | the `VOCABULARIES` table inside the script | `UnlockMethodType`, `ManifestKeyType`, `VaultKeyAlgorithm` |
| `scripts/generate-app-defaults.cjs` | `src/defaults/AppDefaults.ts` | the Swift and Kotlin `AppInfo` (minimum server version, default URLs) |
-| `scripts/generate-colors.cjs` | `src/colors/palette.json` | the TS palette, the Tailwind preset, Swift `ColorConstants` and Android `av_colors.xml`; see [src/colors/README.md](src/colors/README.md) |
+| `scripts/generate-colors.cjs` | `core/assets/colors/palette.json` | the TS palette, the Tailwind preset, Swift `ColorConstants` and Android `av_colors.xml`; see [core/assets/colors/README.md](../assets/colors/README.md) |
The key vocabulary is the set of tokens naming how a vault key is protected, which unlock method encrypts a
user's Account Key, how a manifest's VEK reaches a given user, and which algorithm a piece of key ciphertext
diff --git a/core/models/scripts/generate-colors.cjs b/core/models/scripts/generate-colors.cjs
index ed9c948f7..c5a8fcb18 100644
--- a/core/models/scripts/generate-colors.cjs
+++ b/core/models/scripts/generate-colors.cjs
@@ -2,7 +2,7 @@
/**
* Generates the AliasVault color palette for every platform.
*
- * Input: core/models/src/colors/palette.json
+ * Input: core/assets/colors/palette.json
* Outputs:
* - core/models/src/colors/Palette.ts (TypeScript, imported as `@aliasvault/models/colors`)
* - core/models/src/colors/tailwind-preset.cjs (Tailwind preset for the web app, browser extension and admin)
@@ -14,7 +14,7 @@ const fs = require('fs');
const path = require('path');
const REPO_ROOT = path.join(__dirname, '../../..');
-const SOURCE_REL = 'core/models/src/colors/palette.json';
+const SOURCE_REL = 'core/assets/colors/palette.json';
const COLORS_DIR = path.join(REPO_ROOT, 'core/models/src/colors');
const TS_OUTPUT = path.join(COLORS_DIR, 'Palette.ts');
const TAILWIND_OUTPUT = path.join(COLORS_DIR, 'tailwind-preset.cjs');
@@ -202,11 +202,14 @@ ${colors.join('\n')}
`;
}
-/** Write a generated file, creating its directory when missing. */
+/** Write a generated file when its contents changed, creating its directory when missing. */
function writeFile(filePath, contents) {
+ if (fs.existsSync(filePath) && fs.readFileSync(filePath, 'utf8') === contents) {
+ return;
+ }
fs.mkdirSync(path.dirname(filePath), { recursive: true });
fs.writeFileSync(filePath, contents);
- console.log(` ✓ Generated ${path.relative(REPO_ROOT, filePath)}`);
+ console.log(`Generated: ${path.relative(REPO_ROOT, filePath)}`);
}
function main() {
diff --git a/core/models/scripts/generate-icons.cjs b/core/models/scripts/generate-icons.cjs
index 55933b8f6..14ef8205d 100644
--- a/core/models/scripts/generate-icons.cjs
+++ b/core/models/scripts/generate-icons.cjs
@@ -1,6 +1,6 @@
#!/usr/bin/env node
/**
- * Generates the icon catalogs for every platform from the SVG sources in core/models/src/icons/svg.
+ * Generates the icon catalogs for every platform from the SVG sources in core/assets/icons.
*/
const fs = require('fs');
@@ -9,9 +9,10 @@ const { readIconFolder, serializeIconSvg, serializeIconBody, toCamelCase } = req
const REPO_ROOT = path.join(__dirname, '../../..');
const ICONS_DIR = path.join(REPO_ROOT, 'core/models/src/icons');
-const SOURCES_FILE = path.join(ICONS_DIR, 'sources.json');
+const ICON_SOURCES_DIR = path.join(REPO_ROOT, 'core/assets/icons');
+const SOURCES_FILE = path.join(ICON_SOURCES_DIR, 'sources.json');
-const GENERATED_HEADER = 'This file is auto-generated from core/models/src/icons/svg by core/models/scripts/generate-icons.cjs.';
+const GENERATED_HEADER = 'This file is auto-generated from core/assets/icons by core/models/scripts/generate-icons.cjs.';
const REGENERATE_HINT = "Do not edit this file directly. Run 'node core/models/scripts/generate-icons.cjs' to regenerate.";
const TS_HEADER = `/*\n * <auto-generated />\n * ${GENERATED_HEADER}\n * ${REGENERATE_HINT}\n */`;
@@ -60,7 +61,7 @@ const UI_CSHARP_OUTPUT = path.join(REPO_ROOT, 'apps/server/AliasVault.Admin/Main
* Load one catalog in the order of sources.json, failing when a source file and its provenance entry don't line up.
*/
function loadCatalog(key, sources) {
- const icons = readIconFolder(path.join(ICONS_DIR, 'svg', key));
+ const icons = readIconFolder(path.join(ICON_SOURCES_DIR, key));
const listed = Object.keys(sources[key] ?? {});
const missingSource = Object.keys(icons).filter((name) => !listed.includes(name));
const missingFile = listed.filter((name) => !(name in icons));
diff --git a/core/models/scripts/lib/svg-icons.cjs b/core/models/scripts/lib/svg-icons.cjs
index 7802ec6b3..33d529f93 100644
--- a/core/models/scripts/lib/svg-icons.cjs
+++ b/core/models/scripts/lib/svg-icons.cjs
@@ -1,5 +1,5 @@
/**
- * Reads the icon SVG sources in core/models/src/icons/svg and serializes them back to SVG markup.
+ * Reads the icon SVG sources in core/assets/icons and serializes them back to SVG markup.
*/
const fs = require('fs');
diff --git a/core/models/src/colors/Palette.ts b/core/models/src/colors/Palette.ts
index 1c4ab16fe..94f8b6630 100644
--- a/core/models/src/colors/Palette.ts
+++ b/core/models/src/colors/Palette.ts
@@ -1,6 +1,6 @@
/*
* <auto-generated />
- * This file is auto-generated from core/models/src/colors/palette.json by core/models/scripts/generate-colors.cjs.
+ * This file is auto-generated from core/assets/colors/palette.json by core/models/scripts/generate-colors.cjs.
* Do not edit this file directly. Run 'node core/models/scripts/generate-colors.cjs' to regenerate.
*/
diff --git a/core/models/src/colors/index.ts b/core/models/src/colors/index.ts
index 9131a1178..616989633 100644
--- a/core/models/src/colors/index.ts
+++ b/core/models/src/colors/index.ts
@@ -1,5 +1,5 @@
/**
- * The color palette shared by all apps, generated from ./palette.json (see README.md).
+ * The color palette shared by all apps, generated from core/assets/colors/palette.json.
*/
export { PrimaryColors, ThemeColors } from './Palette';
export type { ThemeColorKey } from './Palette';
diff --git a/core/models/src/colors/tailwind-preset.cjs b/core/models/src/colors/tailwind-preset.cjs
index ae3d68b73..c9fccf0f4 100644
--- a/core/models/src/colors/tailwind-preset.cjs
+++ b/core/models/src/colors/tailwind-preset.cjs
@@ -1,6 +1,6 @@
/*
* <auto-generated />
- * This file is auto-generated from core/models/src/colors/palette.json by core/models/scripts/generate-colors.cjs.
+ * This file is auto-generated from core/assets/colors/palette.json by core/models/scripts/generate-colors.cjs.
* Do not edit this file directly. Run 'node core/models/scripts/generate-colors.cjs' to regenerate.
*/
diff --git a/core/models/src/icons/BuiltinLogos.ts b/core/models/src/icons/BuiltinLogos.ts
index 794b8d102..89cf00252 100644
--- a/core/models/src/icons/BuiltinLogos.ts
+++ b/core/models/src/icons/BuiltinLogos.ts
@@ -1,6 +1,6 @@
/*
* <auto-generated />
- * This file is auto-generated from core/models/src/icons/svg by core/models/scripts/generate-icons.cjs.
+ * This file is auto-generated from core/assets/icons by core/models/scripts/generate-icons.cjs.
* Do not edit this file directly. Run 'node core/models/scripts/generate-icons.cjs' to regenerate.
*/
diff --git a/core/models/src/icons/ItemTypeIcons.ts b/core/models/src/icons/ItemTypeIcons.ts
index 085170482..d71107ca8 100644
--- a/core/models/src/icons/ItemTypeIcons.ts
+++ b/core/models/src/icons/ItemTypeIcons.ts
@@ -1,6 +1,6 @@
/*
* <auto-generated />
- * This file is auto-generated from core/models/src/icons/svg by core/models/scripts/generate-icons.cjs.
+ * This file is auto-generated from core/assets/icons by core/models/scripts/generate-icons.cjs.
* Do not edit this file directly. Run 'node core/models/scripts/generate-icons.cjs' to regenerate.
*/
diff --git a/core/models/src/icons/README.md b/core/models/src/icons/README.md
deleted file mode 100644
index 5e822cc8d..000000000
--- a/core/models/src/icons/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Icons
-
-All icons of the AliasVault apps, one source of truth for every platform.
-
-- `svg/ui/`: UI icons, drawn in `currentColor` so they take the text color.
-- `svg/item/`: item type icons (placeholder, note, card brands).
-- `svg/builtin-logo/`: built-in logos a user can pick for an item. The PascalCase form of the file name (`shopping.svg` is `Shopping`) is stored in the vault, never rename one.
-- `sources.json`: where each icon comes from. Every icon needs an entry.
-
-Run `node core/models/scripts/generate-icons.cjs` after editing an icon to make it push to all platforms.
-
-## Sources
-
-See `sources.json` for the full list of the source of each icon.
-
-Licenses that apply: heroicons, Feather, Lucide and Zondicons are MIT or ISC licensed, Material Symbols is Apache 2.0.
diff --git a/core/models/src/icons/UiIcons.ts b/core/models/src/icons/UiIcons.ts
index c534b54ff..fd8fd02a7 100644
--- a/core/models/src/icons/UiIcons.ts
+++ b/core/models/src/icons/UiIcons.ts
@@ -1,6 +1,6 @@
/*
* <auto-generated />
- * This file is auto-generated from core/models/src/icons/svg by core/models/scripts/generate-icons.cjs.
+ * This file is auto-generated from core/assets/icons by core/models/scripts/generate-icons.cjs.
* Do not edit this file directly. Run 'node core/models/scripts/generate-icons.cjs' to regenerate.
*/
diff --git a/core/models/src/icons/index.ts b/core/models/src/icons/index.ts
index 56398891f..604cf63d1 100644
--- a/core/models/src/icons/index.ts
+++ b/core/models/src/icons/index.ts
@@ -1,5 +1,5 @@
/**
- * The icon catalogs shared by all apps, generated from the SVG sources in ./svg (see README.md).
+ * The icon catalogs shared by all apps, generated from the SVG sources in core/assets/icons.
*/
export {