From cd1586292b4513c2743911cce66dcce4d2d9dc34 Mon Sep 17 00:00:00 2001 From: Pihkaal Date: Tue, 11 Nov 2025 14:52:41 +0100 Subject: [PATCH] refactor: restructure components and assets --- app/app.vue | 4 ++-- app/assets/app.css | 11 ++--------- app/assets/{ => fonts}/nds-7px.ttf | Bin app/assets/{ => fonts}/nds-9px.ttf | Bin .../home/bottom-screen/background.png} | Bin .../{ => images/home/top-screen}/background.png | Bin .../home/top-screen/calendar/day-selector.png} | Bin .../home/top-screen/calendar/last-row.png} | Bin .../home/top-screen/status-bar/battery.png} | Bin .../home/top-screen/status-bar/gba-display.png} | Bin .../top-screen/status-bar/startup-mode.png} | Bin app/components/Home/BottomScreen/Background.vue | 2 +- .../{ => Home}/TopScreen/Background.vue | 6 +++++- .../{ => Home}/TopScreen/Calendar.vue | 12 ++++++++++-- app/components/{ => Home}/TopScreen/Clock.vue | 0 .../{ => Home}/TopScreen/StatusBar.vue | 16 ++++++++++++---- app/components/Home/TopScreen/TopScreen.vue | 10 ++++++++++ app/components/TopScreen/TopScreen.vue | 10 ---------- 18 files changed, 42 insertions(+), 29 deletions(-) rename app/assets/{ => fonts}/nds-7px.ttf (100%) rename app/assets/{ => fonts}/nds-9px.ttf (100%) rename app/assets/{home-screen_bottom_background.png => images/home/bottom-screen/background.png} (100%) rename app/assets/{ => images/home/top-screen}/background.png (100%) rename app/assets/{calendar_day-selector.png => images/home/top-screen/calendar/day-selector.png} (100%) rename app/assets/{calendar_last-row.png => images/home/top-screen/calendar/last-row.png} (100%) rename app/assets/{status-bar_battery.png => images/home/top-screen/status-bar/battery.png} (100%) rename app/assets/{status-bar_gba-display.png => images/home/top-screen/status-bar/gba-display.png} (100%) rename app/assets/{status-bar_startup-mode.png => images/home/top-screen/status-bar/startup-mode.png} (100%) rename app/components/{ => Home}/TopScreen/Background.vue (68%) rename app/components/{ => Home}/TopScreen/Calendar.vue (89%) rename app/components/{ => Home}/TopScreen/Clock.vue (100%) rename app/components/{ => Home}/TopScreen/StatusBar.vue (81%) create mode 100644 app/components/Home/TopScreen/TopScreen.vue delete mode 100644 app/components/TopScreen/TopScreen.vue diff --git a/app/app.vue b/app/app.vue index 04538ee..064b605 100644 --- a/app/app.vue +++ b/app/app.vue @@ -16,9 +16,9 @@ const showStats = ref(false);
- + - +
diff --git a/app/assets/app.css b/app/assets/app.css index 73abc8b..b1529c0 100644 --- a/app/assets/app.css +++ b/app/assets/app.css @@ -1,20 +1,13 @@ -@font-face { - font-family: "Nintendo DS BIOS"; - src: url("/assets/Nintendo-DS-BIOS.ttf") format("truetype"); - font-weight: normal; - font-style: normal; -} - @font-face { font-family: "NDS7"; - src: url("/assets/nds-7px.ttf") format("truetype"); + src: url("/assets/fonts/nds-7px.ttf") format("truetype"); font-weight: normal; font-style: normal; } @font-face { font-family: "NDS9"; - src: url("/assets/nds-9px.ttf") format("truetype"); + src: url("/assets/fonts/nds-9px.ttf") format("truetype"); font-weight: normal; font-style: normal; } diff --git a/app/assets/nds-7px.ttf b/app/assets/fonts/nds-7px.ttf similarity index 100% rename from app/assets/nds-7px.ttf rename to app/assets/fonts/nds-7px.ttf diff --git a/app/assets/nds-9px.ttf b/app/assets/fonts/nds-9px.ttf similarity index 100% rename from app/assets/nds-9px.ttf rename to app/assets/fonts/nds-9px.ttf diff --git a/app/assets/home-screen_bottom_background.png b/app/assets/images/home/bottom-screen/background.png similarity index 100% rename from app/assets/home-screen_bottom_background.png rename to app/assets/images/home/bottom-screen/background.png diff --git a/app/assets/background.png b/app/assets/images/home/top-screen/background.png similarity index 100% rename from app/assets/background.png rename to app/assets/images/home/top-screen/background.png diff --git a/app/assets/calendar_day-selector.png b/app/assets/images/home/top-screen/calendar/day-selector.png similarity index 100% rename from app/assets/calendar_day-selector.png rename to app/assets/images/home/top-screen/calendar/day-selector.png diff --git a/app/assets/calendar_last-row.png b/app/assets/images/home/top-screen/calendar/last-row.png similarity index 100% rename from app/assets/calendar_last-row.png rename to app/assets/images/home/top-screen/calendar/last-row.png diff --git a/app/assets/status-bar_battery.png b/app/assets/images/home/top-screen/status-bar/battery.png similarity index 100% rename from app/assets/status-bar_battery.png rename to app/assets/images/home/top-screen/status-bar/battery.png diff --git a/app/assets/status-bar_gba-display.png b/app/assets/images/home/top-screen/status-bar/gba-display.png similarity index 100% rename from app/assets/status-bar_gba-display.png rename to app/assets/images/home/top-screen/status-bar/gba-display.png diff --git a/app/assets/status-bar_startup-mode.png b/app/assets/images/home/top-screen/status-bar/startup-mode.png similarity index 100% rename from app/assets/status-bar_startup-mode.png rename to app/assets/images/home/top-screen/status-bar/startup-mode.png diff --git a/app/components/Home/BottomScreen/Background.vue b/app/components/Home/BottomScreen/Background.vue index e9143be..1f588b6 100644 --- a/app/components/Home/BottomScreen/Background.vue +++ b/app/components/Home/BottomScreen/Background.vue @@ -11,7 +11,7 @@ useRender((ctx) => { diff --git a/app/components/TopScreen/Background.vue b/app/components/Home/TopScreen/Background.vue similarity index 68% rename from app/components/TopScreen/Background.vue rename to app/components/Home/TopScreen/Background.vue index 4be4828..c1c81d2 100644 --- a/app/components/TopScreen/Background.vue +++ b/app/components/Home/TopScreen/Background.vue @@ -9,5 +9,9 @@ useRender((ctx) => { diff --git a/app/components/TopScreen/Calendar.vue b/app/components/Home/TopScreen/Calendar.vue similarity index 89% rename from app/components/TopScreen/Calendar.vue rename to app/components/Home/TopScreen/Calendar.vue index fb7219f..7502468 100644 --- a/app/components/TopScreen/Calendar.vue +++ b/app/components/Home/TopScreen/Calendar.vue @@ -70,6 +70,14 @@ useRender((ctx) => { diff --git a/app/components/TopScreen/Clock.vue b/app/components/Home/TopScreen/Clock.vue similarity index 100% rename from app/components/TopScreen/Clock.vue rename to app/components/Home/TopScreen/Clock.vue diff --git a/app/components/TopScreen/StatusBar.vue b/app/components/Home/TopScreen/StatusBar.vue similarity index 81% rename from app/components/TopScreen/StatusBar.vue rename to app/components/Home/TopScreen/StatusBar.vue index b3b08a7..6a32df4 100644 --- a/app/components/TopScreen/StatusBar.vue +++ b/app/components/Home/TopScreen/StatusBar.vue @@ -44,11 +44,19 @@ useRender((ctx) => { diff --git a/app/components/Home/TopScreen/TopScreen.vue b/app/components/Home/TopScreen/TopScreen.vue new file mode 100644 index 0000000..9f04724 --- /dev/null +++ b/app/components/Home/TopScreen/TopScreen.vue @@ -0,0 +1,10 @@ + diff --git a/app/components/TopScreen/TopScreen.vue b/app/components/TopScreen/TopScreen.vue deleted file mode 100644 index 7b2be6d..0000000 --- a/app/components/TopScreen/TopScreen.vue +++ /dev/null @@ -1,10 +0,0 @@ -