From 14a0596a25a48d334ec9de6ffd0c2462c64e1aa6 Mon Sep 17 00:00:00 2001 From: Joscha Date: Mon, 3 Mar 2025 19:40:30 +0100 Subject: [PATCH] Simplify font setup Now, when I update the unifont files, I only need to change files in the showbits-assets crate and update the CSS in the UI. I no longer have to remember to update any symlinks. --- .vscode/settings.json | 2 +- .../{data/egg_bad => eggs/bad}/cover_00.png | Bin .../{data/egg_bad => eggs/bad}/egg.xcf | Bin .../{data/egg_bad => eggs/bad}/pattern_00.png | Bin .../{data/egg_bad => eggs/bad}/pattern_01.png | Bin .../{data/egg_bad => eggs/bad}/pattern_02.png | Bin .../{data/egg_bad => eggs/bad}/pattern_03.png | Bin .../{data/egg_bad => eggs/bad}/pattern_04.png | Bin .../{data/egg_bad => eggs/bad}/pattern_05.png | Bin .../{data/egg_bad => eggs/bad}/pattern_06.png | Bin .../{data/egg => eggs/good}/cover_00.png | Bin .../{data/egg => eggs/good}/cover_01.png | Bin .../{data/egg => eggs/good}/cover_02.png | Bin .../{data/egg => eggs/good}/cover_03.png | Bin .../{data/egg => eggs/good}/cover_04.png | Bin .../{data/egg => eggs/good}/cover_05.png | Bin .../{data/egg => eggs/good}/cover_06.png | Bin .../{data/egg => eggs/good}/ei.kra | Bin .../{data/egg => eggs/good}/pattern_00.png | Bin .../{data/egg => eggs/good}/pattern_01.png | Bin .../{data/egg => eggs/good}/pattern_02.png | Bin .../{data/egg => eggs/good}/pattern_03.png | Bin .../{data/egg => eggs/good}/pattern_04.png | Bin .../{data/egg => eggs/good}/pattern_05.png | Bin .../{data/egg => eggs/good}/pattern_06.png | Bin .../{data/egg => eggs/good}/pattern_07.png | Bin .../{data/egg => eggs/good}/pattern_08.png | Bin .../{data/egg => eggs/good}/pattern_09.png | Bin .../{data/egg => eggs/good}/pattern_10.png | Bin .../{data/egg => eggs/good}/pattern_11.png | Bin .../{data/egg => eggs/good}/pattern_12.png | Bin .../{data/egg => eggs/good}/pattern_13.png | Bin .../{data/egg => eggs/good}/pattern_14.png | Bin .../{data/egg => eggs/good}/pattern_15.png | Bin .../{data/egg => eggs/good}/pattern_16.png | Bin .../{data/egg => eggs/good}/pattern_17.png | Bin .../{data/egg => eggs/good}/pattern_18.png | Bin .../{data/egg => eggs/good}/pattern_19.png | Bin .../{data/egg => eggs/good}/pattern_20.png | Bin .../{data/egg => eggs/good}/pattern_21.png | Bin .../{data/egg => eggs/good}/pattern_22.png | Bin .../{data/egg => eggs/good}/pattern_23.png | Bin .../{data/egg => eggs/good}/pattern_24.png | Bin .../{data/egg => eggs/good}/pattern_25.png | Bin .../{data/egg => eggs/good}/pattern_26.png | Bin .../{data/egg => eggs/good}/pattern_27.png | Bin .../{data/egg => eggs/good}/pattern_28.png | Bin .../{data/egg => eggs/good}/pattern_29.png | Bin .../{data/egg => eggs/good}/pattern_30.png | Bin .../{data/egg => eggs/good}/pattern_31.png | Bin .../{data/egg => eggs/good}/pattern_32.png | Bin .../{data/egg => eggs/good}/pattern_33.png | Bin .../{data/egg => eggs/good}/pattern_34.png | Bin .../{data/egg => eggs/good}/pattern_35.png | Bin .../{data/egg => eggs/good}/pattern_36.png | Bin .../{data/egg => eggs/good}/pattern_37.png | Bin .../{data/egg => eggs/good}/pattern_38.png | Bin .../{data/egg => eggs/good}/pattern_39.png | Bin .../{data/egg => eggs/good}/pattern_40.png | Bin .../{data => fonts}/unifont-15.1.05.otf | Bin .../{data => fonts}/unifont_jp-15.1.05.otf | Bin .../{data => fonts}/unifont_upper-15.1.05.otf | Bin showbits-assets/src/lib.rs | 118 +++++++++--------- showbits-thermal-printer-ui/public/fonts | 1 + .../public/fonts/unifont-15.1.05.otf | 1 - .../public/fonts/unifont_jp-15.1.05.otf | 1 - .../public/fonts/unifont_upper-15.1.05.otf | 1 - 67 files changed, 61 insertions(+), 63 deletions(-) rename showbits-assets/{data/egg_bad => eggs/bad}/cover_00.png (100%) rename showbits-assets/{data/egg_bad => eggs/bad}/egg.xcf (100%) rename showbits-assets/{data/egg_bad => eggs/bad}/pattern_00.png (100%) rename showbits-assets/{data/egg_bad => eggs/bad}/pattern_01.png (100%) rename showbits-assets/{data/egg_bad => eggs/bad}/pattern_02.png (100%) rename showbits-assets/{data/egg_bad => eggs/bad}/pattern_03.png (100%) rename showbits-assets/{data/egg_bad => eggs/bad}/pattern_04.png (100%) rename showbits-assets/{data/egg_bad => eggs/bad}/pattern_05.png (100%) rename showbits-assets/{data/egg_bad => eggs/bad}/pattern_06.png (100%) rename showbits-assets/{data/egg => eggs/good}/cover_00.png (100%) rename showbits-assets/{data/egg => eggs/good}/cover_01.png (100%) rename showbits-assets/{data/egg => eggs/good}/cover_02.png (100%) rename showbits-assets/{data/egg => eggs/good}/cover_03.png (100%) rename showbits-assets/{data/egg => eggs/good}/cover_04.png (100%) rename showbits-assets/{data/egg => eggs/good}/cover_05.png (100%) rename showbits-assets/{data/egg => eggs/good}/cover_06.png (100%) rename showbits-assets/{data/egg => eggs/good}/ei.kra (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_00.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_01.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_02.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_03.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_04.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_05.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_06.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_07.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_08.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_09.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_10.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_11.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_12.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_13.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_14.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_15.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_16.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_17.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_18.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_19.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_20.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_21.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_22.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_23.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_24.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_25.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_26.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_27.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_28.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_29.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_30.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_31.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_32.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_33.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_34.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_35.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_36.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_37.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_38.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_39.png (100%) rename showbits-assets/{data/egg => eggs/good}/pattern_40.png (100%) rename showbits-assets/{data => fonts}/unifont-15.1.05.otf (100%) rename showbits-assets/{data => fonts}/unifont_jp-15.1.05.otf (100%) rename showbits-assets/{data => fonts}/unifont_upper-15.1.05.otf (100%) create mode 120000 showbits-thermal-printer-ui/public/fonts delete mode 120000 showbits-thermal-printer-ui/public/fonts/unifont-15.1.05.otf delete mode 120000 showbits-thermal-printer-ui/public/fonts/unifont_jp-15.1.05.otf delete mode 120000 showbits-thermal-printer-ui/public/fonts/unifont_upper-15.1.05.otf diff --git a/.vscode/settings.json b/.vscode/settings.json index 7caf5f8..66756b7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,5 +5,5 @@ "[typst]": { "editor.defaultFormatter": "myriad-dreamin.tinymist" }, "editor.defaultFormatter": "esbenp.prettier-vscode", "eslint.workingDirectories": ["showbits-thermal-printer-ui"], - "tinymist.fontPaths": ["showbits-assets/data"] + "tinymist.fontPaths": ["showbits-assets/fonts"] } diff --git a/showbits-assets/data/egg_bad/cover_00.png b/showbits-assets/eggs/bad/cover_00.png similarity index 100% rename from showbits-assets/data/egg_bad/cover_00.png rename to showbits-assets/eggs/bad/cover_00.png diff --git a/showbits-assets/data/egg_bad/egg.xcf b/showbits-assets/eggs/bad/egg.xcf similarity index 100% rename from showbits-assets/data/egg_bad/egg.xcf rename to showbits-assets/eggs/bad/egg.xcf diff --git a/showbits-assets/data/egg_bad/pattern_00.png b/showbits-assets/eggs/bad/pattern_00.png similarity index 100% rename from showbits-assets/data/egg_bad/pattern_00.png rename to showbits-assets/eggs/bad/pattern_00.png diff --git a/showbits-assets/data/egg_bad/pattern_01.png b/showbits-assets/eggs/bad/pattern_01.png similarity index 100% rename from showbits-assets/data/egg_bad/pattern_01.png rename to showbits-assets/eggs/bad/pattern_01.png diff --git a/showbits-assets/data/egg_bad/pattern_02.png b/showbits-assets/eggs/bad/pattern_02.png similarity index 100% rename from showbits-assets/data/egg_bad/pattern_02.png rename to showbits-assets/eggs/bad/pattern_02.png diff --git a/showbits-assets/data/egg_bad/pattern_03.png b/showbits-assets/eggs/bad/pattern_03.png similarity index 100% rename from showbits-assets/data/egg_bad/pattern_03.png rename to showbits-assets/eggs/bad/pattern_03.png diff --git a/showbits-assets/data/egg_bad/pattern_04.png b/showbits-assets/eggs/bad/pattern_04.png similarity index 100% rename from showbits-assets/data/egg_bad/pattern_04.png rename to showbits-assets/eggs/bad/pattern_04.png diff --git a/showbits-assets/data/egg_bad/pattern_05.png b/showbits-assets/eggs/bad/pattern_05.png similarity index 100% rename from showbits-assets/data/egg_bad/pattern_05.png rename to showbits-assets/eggs/bad/pattern_05.png diff --git a/showbits-assets/data/egg_bad/pattern_06.png b/showbits-assets/eggs/bad/pattern_06.png similarity index 100% rename from showbits-assets/data/egg_bad/pattern_06.png rename to showbits-assets/eggs/bad/pattern_06.png diff --git a/showbits-assets/data/egg/cover_00.png b/showbits-assets/eggs/good/cover_00.png similarity index 100% rename from showbits-assets/data/egg/cover_00.png rename to showbits-assets/eggs/good/cover_00.png diff --git a/showbits-assets/data/egg/cover_01.png b/showbits-assets/eggs/good/cover_01.png similarity index 100% rename from showbits-assets/data/egg/cover_01.png rename to showbits-assets/eggs/good/cover_01.png diff --git a/showbits-assets/data/egg/cover_02.png b/showbits-assets/eggs/good/cover_02.png similarity index 100% rename from showbits-assets/data/egg/cover_02.png rename to showbits-assets/eggs/good/cover_02.png diff --git a/showbits-assets/data/egg/cover_03.png b/showbits-assets/eggs/good/cover_03.png similarity index 100% rename from showbits-assets/data/egg/cover_03.png rename to showbits-assets/eggs/good/cover_03.png diff --git a/showbits-assets/data/egg/cover_04.png b/showbits-assets/eggs/good/cover_04.png similarity index 100% rename from showbits-assets/data/egg/cover_04.png rename to showbits-assets/eggs/good/cover_04.png diff --git a/showbits-assets/data/egg/cover_05.png b/showbits-assets/eggs/good/cover_05.png similarity index 100% rename from showbits-assets/data/egg/cover_05.png rename to showbits-assets/eggs/good/cover_05.png diff --git a/showbits-assets/data/egg/cover_06.png b/showbits-assets/eggs/good/cover_06.png similarity index 100% rename from showbits-assets/data/egg/cover_06.png rename to showbits-assets/eggs/good/cover_06.png diff --git a/showbits-assets/data/egg/ei.kra b/showbits-assets/eggs/good/ei.kra similarity index 100% rename from showbits-assets/data/egg/ei.kra rename to showbits-assets/eggs/good/ei.kra diff --git a/showbits-assets/data/egg/pattern_00.png b/showbits-assets/eggs/good/pattern_00.png similarity index 100% rename from showbits-assets/data/egg/pattern_00.png rename to showbits-assets/eggs/good/pattern_00.png diff --git a/showbits-assets/data/egg/pattern_01.png b/showbits-assets/eggs/good/pattern_01.png similarity index 100% rename from showbits-assets/data/egg/pattern_01.png rename to showbits-assets/eggs/good/pattern_01.png diff --git a/showbits-assets/data/egg/pattern_02.png b/showbits-assets/eggs/good/pattern_02.png similarity index 100% rename from showbits-assets/data/egg/pattern_02.png rename to showbits-assets/eggs/good/pattern_02.png diff --git a/showbits-assets/data/egg/pattern_03.png b/showbits-assets/eggs/good/pattern_03.png similarity index 100% rename from showbits-assets/data/egg/pattern_03.png rename to showbits-assets/eggs/good/pattern_03.png diff --git a/showbits-assets/data/egg/pattern_04.png b/showbits-assets/eggs/good/pattern_04.png similarity index 100% rename from showbits-assets/data/egg/pattern_04.png rename to showbits-assets/eggs/good/pattern_04.png diff --git a/showbits-assets/data/egg/pattern_05.png b/showbits-assets/eggs/good/pattern_05.png similarity index 100% rename from showbits-assets/data/egg/pattern_05.png rename to showbits-assets/eggs/good/pattern_05.png diff --git a/showbits-assets/data/egg/pattern_06.png b/showbits-assets/eggs/good/pattern_06.png similarity index 100% rename from showbits-assets/data/egg/pattern_06.png rename to showbits-assets/eggs/good/pattern_06.png diff --git a/showbits-assets/data/egg/pattern_07.png b/showbits-assets/eggs/good/pattern_07.png similarity index 100% rename from showbits-assets/data/egg/pattern_07.png rename to showbits-assets/eggs/good/pattern_07.png diff --git a/showbits-assets/data/egg/pattern_08.png b/showbits-assets/eggs/good/pattern_08.png similarity index 100% rename from showbits-assets/data/egg/pattern_08.png rename to showbits-assets/eggs/good/pattern_08.png diff --git a/showbits-assets/data/egg/pattern_09.png b/showbits-assets/eggs/good/pattern_09.png similarity index 100% rename from showbits-assets/data/egg/pattern_09.png rename to showbits-assets/eggs/good/pattern_09.png diff --git a/showbits-assets/data/egg/pattern_10.png b/showbits-assets/eggs/good/pattern_10.png similarity index 100% rename from showbits-assets/data/egg/pattern_10.png rename to showbits-assets/eggs/good/pattern_10.png diff --git a/showbits-assets/data/egg/pattern_11.png b/showbits-assets/eggs/good/pattern_11.png similarity index 100% rename from showbits-assets/data/egg/pattern_11.png rename to showbits-assets/eggs/good/pattern_11.png diff --git a/showbits-assets/data/egg/pattern_12.png b/showbits-assets/eggs/good/pattern_12.png similarity index 100% rename from showbits-assets/data/egg/pattern_12.png rename to showbits-assets/eggs/good/pattern_12.png diff --git a/showbits-assets/data/egg/pattern_13.png b/showbits-assets/eggs/good/pattern_13.png similarity index 100% rename from showbits-assets/data/egg/pattern_13.png rename to showbits-assets/eggs/good/pattern_13.png diff --git a/showbits-assets/data/egg/pattern_14.png b/showbits-assets/eggs/good/pattern_14.png similarity index 100% rename from showbits-assets/data/egg/pattern_14.png rename to showbits-assets/eggs/good/pattern_14.png diff --git a/showbits-assets/data/egg/pattern_15.png b/showbits-assets/eggs/good/pattern_15.png similarity index 100% rename from showbits-assets/data/egg/pattern_15.png rename to showbits-assets/eggs/good/pattern_15.png diff --git a/showbits-assets/data/egg/pattern_16.png b/showbits-assets/eggs/good/pattern_16.png similarity index 100% rename from showbits-assets/data/egg/pattern_16.png rename to showbits-assets/eggs/good/pattern_16.png diff --git a/showbits-assets/data/egg/pattern_17.png b/showbits-assets/eggs/good/pattern_17.png similarity index 100% rename from showbits-assets/data/egg/pattern_17.png rename to showbits-assets/eggs/good/pattern_17.png diff --git a/showbits-assets/data/egg/pattern_18.png b/showbits-assets/eggs/good/pattern_18.png similarity index 100% rename from showbits-assets/data/egg/pattern_18.png rename to showbits-assets/eggs/good/pattern_18.png diff --git a/showbits-assets/data/egg/pattern_19.png b/showbits-assets/eggs/good/pattern_19.png similarity index 100% rename from showbits-assets/data/egg/pattern_19.png rename to showbits-assets/eggs/good/pattern_19.png diff --git a/showbits-assets/data/egg/pattern_20.png b/showbits-assets/eggs/good/pattern_20.png similarity index 100% rename from showbits-assets/data/egg/pattern_20.png rename to showbits-assets/eggs/good/pattern_20.png diff --git a/showbits-assets/data/egg/pattern_21.png b/showbits-assets/eggs/good/pattern_21.png similarity index 100% rename from showbits-assets/data/egg/pattern_21.png rename to showbits-assets/eggs/good/pattern_21.png diff --git a/showbits-assets/data/egg/pattern_22.png b/showbits-assets/eggs/good/pattern_22.png similarity index 100% rename from showbits-assets/data/egg/pattern_22.png rename to showbits-assets/eggs/good/pattern_22.png diff --git a/showbits-assets/data/egg/pattern_23.png b/showbits-assets/eggs/good/pattern_23.png similarity index 100% rename from showbits-assets/data/egg/pattern_23.png rename to showbits-assets/eggs/good/pattern_23.png diff --git a/showbits-assets/data/egg/pattern_24.png b/showbits-assets/eggs/good/pattern_24.png similarity index 100% rename from showbits-assets/data/egg/pattern_24.png rename to showbits-assets/eggs/good/pattern_24.png diff --git a/showbits-assets/data/egg/pattern_25.png b/showbits-assets/eggs/good/pattern_25.png similarity index 100% rename from showbits-assets/data/egg/pattern_25.png rename to showbits-assets/eggs/good/pattern_25.png diff --git a/showbits-assets/data/egg/pattern_26.png b/showbits-assets/eggs/good/pattern_26.png similarity index 100% rename from showbits-assets/data/egg/pattern_26.png rename to showbits-assets/eggs/good/pattern_26.png diff --git a/showbits-assets/data/egg/pattern_27.png b/showbits-assets/eggs/good/pattern_27.png similarity index 100% rename from showbits-assets/data/egg/pattern_27.png rename to showbits-assets/eggs/good/pattern_27.png diff --git a/showbits-assets/data/egg/pattern_28.png b/showbits-assets/eggs/good/pattern_28.png similarity index 100% rename from showbits-assets/data/egg/pattern_28.png rename to showbits-assets/eggs/good/pattern_28.png diff --git a/showbits-assets/data/egg/pattern_29.png b/showbits-assets/eggs/good/pattern_29.png similarity index 100% rename from showbits-assets/data/egg/pattern_29.png rename to showbits-assets/eggs/good/pattern_29.png diff --git a/showbits-assets/data/egg/pattern_30.png b/showbits-assets/eggs/good/pattern_30.png similarity index 100% rename from showbits-assets/data/egg/pattern_30.png rename to showbits-assets/eggs/good/pattern_30.png diff --git a/showbits-assets/data/egg/pattern_31.png b/showbits-assets/eggs/good/pattern_31.png similarity index 100% rename from showbits-assets/data/egg/pattern_31.png rename to showbits-assets/eggs/good/pattern_31.png diff --git a/showbits-assets/data/egg/pattern_32.png b/showbits-assets/eggs/good/pattern_32.png similarity index 100% rename from showbits-assets/data/egg/pattern_32.png rename to showbits-assets/eggs/good/pattern_32.png diff --git a/showbits-assets/data/egg/pattern_33.png b/showbits-assets/eggs/good/pattern_33.png similarity index 100% rename from showbits-assets/data/egg/pattern_33.png rename to showbits-assets/eggs/good/pattern_33.png diff --git a/showbits-assets/data/egg/pattern_34.png b/showbits-assets/eggs/good/pattern_34.png similarity index 100% rename from showbits-assets/data/egg/pattern_34.png rename to showbits-assets/eggs/good/pattern_34.png diff --git a/showbits-assets/data/egg/pattern_35.png b/showbits-assets/eggs/good/pattern_35.png similarity index 100% rename from showbits-assets/data/egg/pattern_35.png rename to showbits-assets/eggs/good/pattern_35.png diff --git a/showbits-assets/data/egg/pattern_36.png b/showbits-assets/eggs/good/pattern_36.png similarity index 100% rename from showbits-assets/data/egg/pattern_36.png rename to showbits-assets/eggs/good/pattern_36.png diff --git a/showbits-assets/data/egg/pattern_37.png b/showbits-assets/eggs/good/pattern_37.png similarity index 100% rename from showbits-assets/data/egg/pattern_37.png rename to showbits-assets/eggs/good/pattern_37.png diff --git a/showbits-assets/data/egg/pattern_38.png b/showbits-assets/eggs/good/pattern_38.png similarity index 100% rename from showbits-assets/data/egg/pattern_38.png rename to showbits-assets/eggs/good/pattern_38.png diff --git a/showbits-assets/data/egg/pattern_39.png b/showbits-assets/eggs/good/pattern_39.png similarity index 100% rename from showbits-assets/data/egg/pattern_39.png rename to showbits-assets/eggs/good/pattern_39.png diff --git a/showbits-assets/data/egg/pattern_40.png b/showbits-assets/eggs/good/pattern_40.png similarity index 100% rename from showbits-assets/data/egg/pattern_40.png rename to showbits-assets/eggs/good/pattern_40.png diff --git a/showbits-assets/data/unifont-15.1.05.otf b/showbits-assets/fonts/unifont-15.1.05.otf similarity index 100% rename from showbits-assets/data/unifont-15.1.05.otf rename to showbits-assets/fonts/unifont-15.1.05.otf diff --git a/showbits-assets/data/unifont_jp-15.1.05.otf b/showbits-assets/fonts/unifont_jp-15.1.05.otf similarity index 100% rename from showbits-assets/data/unifont_jp-15.1.05.otf rename to showbits-assets/fonts/unifont_jp-15.1.05.otf diff --git a/showbits-assets/data/unifont_upper-15.1.05.otf b/showbits-assets/fonts/unifont_upper-15.1.05.otf similarity index 100% rename from showbits-assets/data/unifont_upper-15.1.05.otf rename to showbits-assets/fonts/unifont_upper-15.1.05.otf diff --git a/showbits-assets/src/lib.rs b/showbits-assets/src/lib.rs index acb7b98..dfa1dd0 100644 --- a/showbits-assets/src/lib.rs +++ b/showbits-assets/src/lib.rs @@ -1,71 +1,71 @@ -pub const UNIFONT: &[u8] = include_bytes!("../data/unifont-15.1.05.otf"); -pub const UNIFONT_JP: &[u8] = include_bytes!("../data/unifont_jp-15.1.05.otf"); -pub const UNIFONT_UPPER: &[u8] = include_bytes!("../data/unifont_upper-15.1.05.otf"); +pub const UNIFONT: &[u8] = include_bytes!("../fonts/unifont-15.1.05.otf"); +pub const UNIFONT_JP: &[u8] = include_bytes!("../fonts/unifont_jp-15.1.05.otf"); +pub const UNIFONT_UPPER: &[u8] = include_bytes!("../fonts/unifont_upper-15.1.05.otf"); pub const UNIFONT_NAME: &str = "unifont-15.1.05.otf"; pub const UNIFONT_JP_NAME: &str = "unifont_jp-15.1.05.otf"; pub const UNIFONT_UPPER_NAME: &str = "unifont_upper-15.1.05.otf"; -pub const EGG_BAD_COVERS: &[&[u8]] = &[include_bytes!("../data/egg_bad/cover_00.png")]; +pub const EGG_BAD_COVERS: &[&[u8]] = &[include_bytes!("../eggs/bad/cover_00.png")]; pub const EGG_BAD_PATTERNS: &[&[u8]] = &[ - include_bytes!("../data/egg_bad/pattern_00.png"), - include_bytes!("../data/egg_bad/pattern_01.png"), - include_bytes!("../data/egg_bad/pattern_02.png"), - include_bytes!("../data/egg_bad/pattern_03.png"), - include_bytes!("../data/egg_bad/pattern_04.png"), - include_bytes!("../data/egg_bad/pattern_05.png"), - include_bytes!("../data/egg_bad/pattern_06.png"), + include_bytes!("../eggs/bad/pattern_00.png"), + include_bytes!("../eggs/bad/pattern_01.png"), + include_bytes!("../eggs/bad/pattern_02.png"), + include_bytes!("../eggs/bad/pattern_03.png"), + include_bytes!("../eggs/bad/pattern_04.png"), + include_bytes!("../eggs/bad/pattern_05.png"), + include_bytes!("../eggs/bad/pattern_06.png"), ]; pub const EGG_COVERS: &[&[u8]] = &[ - include_bytes!("../data/egg/cover_00.png"), - include_bytes!("../data/egg/cover_01.png"), - include_bytes!("../data/egg/cover_02.png"), - include_bytes!("../data/egg/cover_03.png"), - include_bytes!("../data/egg/cover_04.png"), - include_bytes!("../data/egg/cover_05.png"), - include_bytes!("../data/egg/cover_06.png"), + include_bytes!("../eggs/good/cover_00.png"), + include_bytes!("../eggs/good/cover_01.png"), + include_bytes!("../eggs/good/cover_02.png"), + include_bytes!("../eggs/good/cover_03.png"), + include_bytes!("../eggs/good/cover_04.png"), + include_bytes!("../eggs/good/cover_05.png"), + include_bytes!("../eggs/good/cover_06.png"), ]; pub const EGG_PATTERNS: &[&[u8]] = &[ - include_bytes!("../data/egg/pattern_00.png"), - include_bytes!("../data/egg/pattern_01.png"), - include_bytes!("../data/egg/pattern_02.png"), - include_bytes!("../data/egg/pattern_03.png"), - include_bytes!("../data/egg/pattern_04.png"), - include_bytes!("../data/egg/pattern_05.png"), - include_bytes!("../data/egg/pattern_06.png"), - include_bytes!("../data/egg/pattern_07.png"), - include_bytes!("../data/egg/pattern_08.png"), - include_bytes!("../data/egg/pattern_09.png"), - include_bytes!("../data/egg/pattern_10.png"), - include_bytes!("../data/egg/pattern_11.png"), - include_bytes!("../data/egg/pattern_12.png"), - include_bytes!("../data/egg/pattern_13.png"), - include_bytes!("../data/egg/pattern_14.png"), - include_bytes!("../data/egg/pattern_15.png"), - include_bytes!("../data/egg/pattern_16.png"), - include_bytes!("../data/egg/pattern_17.png"), - include_bytes!("../data/egg/pattern_18.png"), - include_bytes!("../data/egg/pattern_19.png"), - include_bytes!("../data/egg/pattern_20.png"), - include_bytes!("../data/egg/pattern_21.png"), - include_bytes!("../data/egg/pattern_22.png"), - include_bytes!("../data/egg/pattern_23.png"), - include_bytes!("../data/egg/pattern_24.png"), - include_bytes!("../data/egg/pattern_25.png"), - include_bytes!("../data/egg/pattern_26.png"), - include_bytes!("../data/egg/pattern_27.png"), - include_bytes!("../data/egg/pattern_28.png"), - include_bytes!("../data/egg/pattern_29.png"), - include_bytes!("../data/egg/pattern_30.png"), - include_bytes!("../data/egg/pattern_31.png"), - include_bytes!("../data/egg/pattern_32.png"), - include_bytes!("../data/egg/pattern_33.png"), - include_bytes!("../data/egg/pattern_34.png"), - include_bytes!("../data/egg/pattern_35.png"), - include_bytes!("../data/egg/pattern_36.png"), - include_bytes!("../data/egg/pattern_37.png"), - include_bytes!("../data/egg/pattern_38.png"), - include_bytes!("../data/egg/pattern_39.png"), - include_bytes!("../data/egg/pattern_40.png"), + include_bytes!("../eggs/good/pattern_00.png"), + include_bytes!("../eggs/good/pattern_01.png"), + include_bytes!("../eggs/good/pattern_02.png"), + include_bytes!("../eggs/good/pattern_03.png"), + include_bytes!("../eggs/good/pattern_04.png"), + include_bytes!("../eggs/good/pattern_05.png"), + include_bytes!("../eggs/good/pattern_06.png"), + include_bytes!("../eggs/good/pattern_07.png"), + include_bytes!("../eggs/good/pattern_08.png"), + include_bytes!("../eggs/good/pattern_09.png"), + include_bytes!("../eggs/good/pattern_10.png"), + include_bytes!("../eggs/good/pattern_11.png"), + include_bytes!("../eggs/good/pattern_12.png"), + include_bytes!("../eggs/good/pattern_13.png"), + include_bytes!("../eggs/good/pattern_14.png"), + include_bytes!("../eggs/good/pattern_15.png"), + include_bytes!("../eggs/good/pattern_16.png"), + include_bytes!("../eggs/good/pattern_17.png"), + include_bytes!("../eggs/good/pattern_18.png"), + include_bytes!("../eggs/good/pattern_19.png"), + include_bytes!("../eggs/good/pattern_20.png"), + include_bytes!("../eggs/good/pattern_21.png"), + include_bytes!("../eggs/good/pattern_22.png"), + include_bytes!("../eggs/good/pattern_23.png"), + include_bytes!("../eggs/good/pattern_24.png"), + include_bytes!("../eggs/good/pattern_25.png"), + include_bytes!("../eggs/good/pattern_26.png"), + include_bytes!("../eggs/good/pattern_27.png"), + include_bytes!("../eggs/good/pattern_28.png"), + include_bytes!("../eggs/good/pattern_29.png"), + include_bytes!("../eggs/good/pattern_30.png"), + include_bytes!("../eggs/good/pattern_31.png"), + include_bytes!("../eggs/good/pattern_32.png"), + include_bytes!("../eggs/good/pattern_33.png"), + include_bytes!("../eggs/good/pattern_34.png"), + include_bytes!("../eggs/good/pattern_35.png"), + include_bytes!("../eggs/good/pattern_36.png"), + include_bytes!("../eggs/good/pattern_37.png"), + include_bytes!("../eggs/good/pattern_38.png"), + include_bytes!("../eggs/good/pattern_39.png"), + include_bytes!("../eggs/good/pattern_40.png"), ]; diff --git a/showbits-thermal-printer-ui/public/fonts b/showbits-thermal-printer-ui/public/fonts new file mode 120000 index 0000000..f341784 --- /dev/null +++ b/showbits-thermal-printer-ui/public/fonts @@ -0,0 +1 @@ +../../showbits-assets/fonts \ No newline at end of file diff --git a/showbits-thermal-printer-ui/public/fonts/unifont-15.1.05.otf b/showbits-thermal-printer-ui/public/fonts/unifont-15.1.05.otf deleted file mode 120000 index 98528fd..0000000 --- a/showbits-thermal-printer-ui/public/fonts/unifont-15.1.05.otf +++ /dev/null @@ -1 +0,0 @@ -../../../showbits-assets/data/unifont-15.1.05.otf \ No newline at end of file diff --git a/showbits-thermal-printer-ui/public/fonts/unifont_jp-15.1.05.otf b/showbits-thermal-printer-ui/public/fonts/unifont_jp-15.1.05.otf deleted file mode 120000 index 98c31fb..0000000 --- a/showbits-thermal-printer-ui/public/fonts/unifont_jp-15.1.05.otf +++ /dev/null @@ -1 +0,0 @@ -../../../showbits-assets/data/unifont_jp-15.1.05.otf \ No newline at end of file diff --git a/showbits-thermal-printer-ui/public/fonts/unifont_upper-15.1.05.otf b/showbits-thermal-printer-ui/public/fonts/unifont_upper-15.1.05.otf deleted file mode 120000 index c5dbe67..0000000 --- a/showbits-thermal-printer-ui/public/fonts/unifont_upper-15.1.05.otf +++ /dev/null @@ -1 +0,0 @@ -../../../showbits-assets/data/unifont_upper-15.1.05.otf \ No newline at end of file