From 181d33517e31af3172aa15d630667eb9354b2975 Mon Sep 17 00:00:00 2001
From: lucdev <me@lucdev.net>
Date: Mon, 24 Apr 2023 12:05:28 -0300
Subject: [PATCH 1/2] use npm package to self-host fonts

---
 frontend/package.json              |  1 +
 frontend/src/routes/+layout.svelte |  4 ++++
 frontend/src/routes/main.css       | 34 ------------------------------
 3 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 54aa8ac..80b8720 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -37,6 +37,7 @@
 	},
 	"type": "module",
 	"dependencies": {
+		"@fontsource/firago": "^4.5.3",
 		"@popperjs/core": "^2.11.7",
 		"@sentry/node": "^7.46.0",
 		"base64-arraybuffer": "^1.0.2",
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 11861e5..0e13ce1 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -1,5 +1,9 @@
 <script lang="ts">
   import "bootstrap/dist/css/bootstrap.min.css";
+  import "@fontsource/firago/400.css";
+  import "@fontsource/firago/400-italic.css";
+  import "@fontsource/firago/700.css";
+  import "@fontsource/firago/700-italic.css";
   import "bootstrap-icons/font/bootstrap-icons.css";
   import "./main.css";
 
diff --git a/frontend/src/routes/main.css b/frontend/src/routes/main.css
index c1a4c91..6610c12 100644
--- a/frontend/src/routes/main.css
+++ b/frontend/src/routes/main.css
@@ -1,37 +1,3 @@
-@font-face {
-  font-family: "FiraGO";
-  font-display: swap;
-  font-style: normal;
-  font-weight: 400;
-  src: url("/fonts/FiraGO-400.woff") format("woff");
-}
-
-@font-face {
-  font-family: "FiraGO";
-  font-display: swap;
-  font-style: normal;
-  font-weight: 400;
-  src: url("/fonts/FiraGO-400i.woff") format("woff");
-  font-style: italic;
-}
-
-@font-face {
-  font-family: "FiraGO";
-  font-display: swap;
-  font-style: normal;
-  font-weight: 700;
-  src: url("/fonts/FiraGO-700.woff") format("woff");
-}
-
-@font-face {
-  font-family: "FiraGO";
-  font-display: swap;
-  font-style: normal;
-  font-weight: 700;
-  src: url("/fonts/FiraGO-700i.woff") format("woff");
-  font-style: italic;
-}
-
 body {
   font-family: "FiraGO", sans-serif;
 }

From 15d2f4acba77e3ba5de6ebff54280716fb733c88 Mon Sep 17 00:00:00 2001
From: lucdev <me@lucdev.net>
Date: Mon, 24 Apr 2023 14:03:57 -0300
Subject: [PATCH 2/2] delete download-fonts.sh

---
 docs/production.md | 2 --
 download-fonts.sh  | 3 ---
 2 files changed, 5 deletions(-)
 delete mode 100755 download-fonts.sh

diff --git a/docs/production.md b/docs/production.md
index 9a2daa0..8588b71 100644
--- a/docs/production.md
+++ b/docs/production.md
@@ -10,8 +10,6 @@ git clone https://codeberg.org/u1f320/pronouns.cc.git pronouns
 cd pronouns
 make all
 
-# if required fonts have not been downloaded yet
-./download-fonts.sh
 # if running for the first time
 ./pronouns database migrate
 ```
diff --git a/download-fonts.sh b/download-fonts.sh
deleted file mode 100755
index 58d81e0..0000000
--- a/download-fonts.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-curl "https://free.bboxtype.com/embedfonts/fonts.php?family=FiraGO&weight=400" -o frontend/static/fonts/FiraGO-400.woff "https://free.bboxtype.com/embedfonts/fonts.php?family=FiraGO&weight=400i" -o frontend/static/fonts/FiraGO-400i.woff "https://free.bboxtype.com/embedfonts/fonts.php?family=FiraGO&weight=700" -o frontend/static/fonts/FiraGO-700.woff "https://free.bboxtype.com/embedfonts/fonts.php?family=FiraGO&weight=700i" -o frontend/static/fonts/FiraGO-700i.woff