From 0e57643f1625b44c8e30a60808d544d09e128f1a Mon Sep 17 00:00:00 2001
From: Daniel Imms <2193314+Tyriar@users.noreply.github.com>
Date: Sat, 3 Jan 2026 15:33:13 -0800
Subject: [PATCH] Move fonts into folder

---
 .../client/components/window/addonWebFontsWindow.ts |   4 ++--
 demo/{ => fonts}/bpdots.regular.otf                 | Bin
 demo/{ => fonts}/font-licenses.txt                  |   0
 demo/{ => fonts}/kongtext.regular.ttf               | Bin
 demo/server/server.ts                               |   3 +--
 5 files changed, 3 insertions(+), 4 deletions(-)
 rename demo/{ => fonts}/bpdots.regular.otf (100%)
 rename demo/{ => fonts}/font-licenses.txt (100%)
 rename demo/{ => fonts}/kongtext.regular.ttf (100%)

diff --git a/demo/client/components/window/addonWebFontsWindow.ts b/demo/client/components/window/addonWebFontsWindow.ts
index a56f0a56..c8fb288d 100644
--- a/demo/client/components/window/addonWebFontsWindow.ts
+++ b/demo/client/components/window/addonWebFontsWindow.ts
@@ -24,7 +24,7 @@ export class AddonWebFontsWindow extends BaseWindow implements IControlWindow {
     btnKongtext.textContent = 'Load Kongtext';
     btnKongtext.title = 'Load Kongtext font and apply C64 style';
     btnKongtext.addEventListener('click', async () => {
-      const ff = new FontFace('Kongtext', 'url(/kongtext.regular.ttf) format(\'truetype\')');
+      const ff = new FontFace('Kongtext', 'url(/fonts/kongtext.regular.ttf) format(\'truetype\')');
       await loadFonts([ff]);
       this._terminal.options.fontFamily = 'Kongtext';
       this._terminal.options.lineHeight = 1.3;
@@ -45,7 +45,7 @@ export class AddonWebFontsWindow extends BaseWindow implements IControlWindow {
     btnBpdots.textContent = 'Load BPdots';
     btnBpdots.title = 'Load BPdots font';
     btnBpdots.addEventListener('click', async () => {
-      document.styleSheets[0].insertRule('@font-face { font-family: "BPdots"; src: url(/bpdots.regular.otf) format("opentype"); weight: 400 }', 0);
+      document.styleSheets[0].insertRule('@font-face { font-family: "BPdots"; src: url(/fonts/bpdots.regular.otf) format("opentype"); weight: 400 }', 0);
       await loadFonts(['BPdots']);
       this._terminal.options.fontFamily = 'BPdots';
       this._terminal.options.lineHeight = 1.3;
diff --git a/demo/bpdots.regular.otf b/demo/fonts/bpdots.regular.otf
similarity index 100%
rename from demo/bpdots.regular.otf
rename to demo/fonts/bpdots.regular.otf
diff --git a/demo/font-licenses.txt b/demo/fonts/font-licenses.txt
similarity index 100%
rename from demo/font-licenses.txt
rename to demo/fonts/font-licenses.txt
diff --git a/demo/kongtext.regular.ttf b/demo/fonts/kongtext.regular.ttf
similarity index 100%
rename from demo/kongtext.regular.ttf
rename to demo/fonts/kongtext.regular.ttf
diff --git a/demo/server/server.ts b/demo/server/server.ts
index 8733ff62..0f4a79b3 100644
--- a/demo/server/server.ts
+++ b/demo/server/server.ts
@@ -45,8 +45,7 @@ function startServer(): void {
     res.sendFile(demoRoot + '/index.css');
   });
 
-  app.get('/kongtext.regular.ttf', (req, res) => res.sendFile(demoRoot + '/kongtext.regular.ttf'));
-  app.get('/bpdots.regular.otf', (req, res) => res.sendFile(demoRoot + '/bpdots.regular.otf'));
+  app.use('/fonts', express.static(demoRoot + '/fonts'));
 
   app.use('/dist', express.static(demoRoot + '/dist'));
   app.use('/src', express.static(demoRoot + '/src'));