Integrate fonts into build process (#1714)

closes #1112 Co-authored-by: crapStone <crapstone01@gmail.com> Reviewed-on: https://codeberg.org/Calciumdibromid/CaBr2/pulls/1714 Reviewed-by: Epsilon_02 <epsilon_02@noreply.codeberg.org> Co-authored-by: crapStone <crapstone@noreply.codeberg.org> Co-committed-by: crapStone <crapstone@noreply.codeberg.org>
Calciumdibromid · Jan 11, 2023 · a31aea6 · a31aea6
1 parent 93ae613
commit a31aea6
Show file tree

Hide file tree

Showing 57 changed files with 26 additions and 136,541 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -26,6 +26,8 @@
     "@angular/material": "15.0.4",
     "@angular/platform-browser": "15.0.4",
     "@angular/platform-browser-dynamic": "15.0.4",
+    "@fontsource/material-icons": "4.5.4",
+    "@fontsource/roboto": "4.5.8",
     "@ngneat/transloco": "4.2.2",
     "@ngxs/form-plugin": "3.7.6",
     "@ngxs/storage-plugin": "3.7.6",
@@ -43,12 +45,6 @@
     "node": ">=14.20.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "1.2.2",
-    "@types/jasmine": "4.3.1",
-    "@types/node": "18.11.18",
-    "@typescript-eslint/eslint-plugin": "5.48.1",
-    "@typescript-eslint/parser": "5.48.1",
-    "eslint": "8.31.0",
     "@angular-devkit/build-angular": "15.0.5",
     "@angular-eslint/builder": "15.1.0",
     "@angular-eslint/eslint-plugin": "15.1.0",
@@ -57,6 +53,12 @@
     "@angular-eslint/template-parser": "15.1.0",
     "@angular/cli": "15.0.5",
     "@angular/compiler-cli": "15.0.4",
+    "@tauri-apps/cli": "1.2.2",
+    "@types/jasmine": "4.3.1",
+    "@types/node": "18.11.18",
+    "@typescript-eslint/eslint-plugin": "5.48.1",
+    "@typescript-eslint/parser": "5.48.1",
+    "eslint": "8.31.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-airbnb-typescript": "17.0.0",
     "eslint-config-prettier": "8.6.0",

diff --git a/frontend/src/assets/fonts/material-icons/MaterialIcons-Regular.ttf b/frontend/src/assets/fonts/material-icons/MaterialIcons-Regular.ttf
diff --git a/frontend/src/assets/fonts/material-icons/MaterialIcons-Regular.woff b/frontend/src/assets/fonts/material-icons/MaterialIcons-Regular.woff
diff --git a/frontend/src/assets/fonts/material-icons/MaterialIcons-Regular.woff2 b/frontend/src/assets/fonts/material-icons/MaterialIcons-Regular.woff2
diff --git a/frontend/src/assets/fonts/material-icons/font.css b/frontend/src/assets/fonts/material-icons/font.css
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Black.svg b/frontend/src/assets/fonts/roboto/Roboto-Black.svg
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Black.ttf b/frontend/src/assets/fonts/roboto/Roboto-Black.ttf
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Black.woff b/frontend/src/assets/fonts/roboto/Roboto-Black.woff
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Black.woff2 b/frontend/src/assets/fonts/roboto/Roboto-Black.woff2
diff --git a/frontend/src/assets/fonts/roboto/Roboto-BlackItalic.svg b/frontend/src/assets/fonts/roboto/Roboto-BlackItalic.svg
diff --git a/frontend/src/assets/fonts/roboto/Roboto-BlackItalic.ttf b/frontend/src/assets/fonts/roboto/Roboto-BlackItalic.ttf
diff --git a/frontend/src/assets/fonts/roboto/Roboto-BlackItalic.woff b/frontend/src/assets/fonts/roboto/Roboto-BlackItalic.woff
diff --git a/frontend/src/assets/fonts/roboto/Roboto-BlackItalic.woff2 b/frontend/src/assets/fonts/roboto/Roboto-BlackItalic.woff2
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Bold.svg b/frontend/src/assets/fonts/roboto/Roboto-Bold.svg
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Bold.ttf b/frontend/src/assets/fonts/roboto/Roboto-Bold.ttf
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Bold.woff b/frontend/src/assets/fonts/roboto/Roboto-Bold.woff
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Bold.woff2 b/frontend/src/assets/fonts/roboto/Roboto-Bold.woff2
diff --git a/frontend/src/assets/fonts/roboto/Roboto-BoldItalic.svg b/frontend/src/assets/fonts/roboto/Roboto-BoldItalic.svg
diff --git a/frontend/src/assets/fonts/roboto/Roboto-BoldItalic.ttf b/frontend/src/assets/fonts/roboto/Roboto-BoldItalic.ttf
diff --git a/frontend/src/assets/fonts/roboto/Roboto-BoldItalic.woff b/frontend/src/assets/fonts/roboto/Roboto-BoldItalic.woff
diff --git a/frontend/src/assets/fonts/roboto/Roboto-BoldItalic.woff2 b/frontend/src/assets/fonts/roboto/Roboto-BoldItalic.woff2
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Italic.svg b/frontend/src/assets/fonts/roboto/Roboto-Italic.svg
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Italic.ttf b/frontend/src/assets/fonts/roboto/Roboto-Italic.ttf
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Italic.woff b/frontend/src/assets/fonts/roboto/Roboto-Italic.woff
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Italic.woff2 b/frontend/src/assets/fonts/roboto/Roboto-Italic.woff2
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Light.svg b/frontend/src/assets/fonts/roboto/Roboto-Light.svg
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Light.ttf b/frontend/src/assets/fonts/roboto/Roboto-Light.ttf
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Light.woff b/frontend/src/assets/fonts/roboto/Roboto-Light.woff
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Light.woff2 b/frontend/src/assets/fonts/roboto/Roboto-Light.woff2
diff --git a/frontend/src/assets/fonts/roboto/Roboto-LightItalic.svg b/frontend/src/assets/fonts/roboto/Roboto-LightItalic.svg
diff --git a/frontend/src/assets/fonts/roboto/Roboto-LightItalic.ttf b/frontend/src/assets/fonts/roboto/Roboto-LightItalic.ttf
diff --git a/frontend/src/assets/fonts/roboto/Roboto-LightItalic.woff b/frontend/src/assets/fonts/roboto/Roboto-LightItalic.woff
diff --git a/frontend/src/assets/fonts/roboto/Roboto-LightItalic.woff2 b/frontend/src/assets/fonts/roboto/Roboto-LightItalic.woff2
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Medium.svg b/frontend/src/assets/fonts/roboto/Roboto-Medium.svg
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Medium.ttf b/frontend/src/assets/fonts/roboto/Roboto-Medium.ttf
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Medium.woff b/frontend/src/assets/fonts/roboto/Roboto-Medium.woff
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Medium.woff2 b/frontend/src/assets/fonts/roboto/Roboto-Medium.woff2
diff --git a/frontend/src/assets/fonts/roboto/Roboto-MediumItalic.svg b/frontend/src/assets/fonts/roboto/Roboto-MediumItalic.svg
diff --git a/frontend/src/assets/fonts/roboto/Roboto-MediumItalic.ttf b/frontend/src/assets/fonts/roboto/Roboto-MediumItalic.ttf
diff --git a/frontend/src/assets/fonts/roboto/Roboto-MediumItalic.woff b/frontend/src/assets/fonts/roboto/Roboto-MediumItalic.woff
diff --git a/frontend/src/assets/fonts/roboto/Roboto-MediumItalic.woff2 b/frontend/src/assets/fonts/roboto/Roboto-MediumItalic.woff2
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Regular.svg b/frontend/src/assets/fonts/roboto/Roboto-Regular.svg
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Regular.ttf b/frontend/src/assets/fonts/roboto/Roboto-Regular.ttf
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Regular.woff b/frontend/src/assets/fonts/roboto/Roboto-Regular.woff
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Regular.woff2 b/frontend/src/assets/fonts/roboto/Roboto-Regular.woff2
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Thin.svg b/frontend/src/assets/fonts/roboto/Roboto-Thin.svg
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Thin.ttf b/frontend/src/assets/fonts/roboto/Roboto-Thin.ttf
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Thin.woff b/frontend/src/assets/fonts/roboto/Roboto-Thin.woff
diff --git a/frontend/src/assets/fonts/roboto/Roboto-Thin.woff2 b/frontend/src/assets/fonts/roboto/Roboto-Thin.woff2
diff --git a/frontend/src/assets/fonts/roboto/Roboto-ThinItalic.svg b/frontend/src/assets/fonts/roboto/Roboto-ThinItalic.svg
diff --git a/frontend/src/assets/fonts/roboto/Roboto-ThinItalic.ttf b/frontend/src/assets/fonts/roboto/Roboto-ThinItalic.ttf
diff --git a/frontend/src/assets/fonts/roboto/Roboto-ThinItalic.woff b/frontend/src/assets/fonts/roboto/Roboto-ThinItalic.woff
diff --git a/frontend/src/assets/fonts/roboto/Roboto-ThinItalic.woff2 b/frontend/src/assets/fonts/roboto/Roboto-ThinItalic.woff2
diff --git a/frontend/src/assets/fonts/roboto/font.css b/frontend/src/assets/fonts/roboto/font.css
diff --git a/frontend/src/index.html b/frontend/src/index.html
@@ -6,8 +6,6 @@
     <base href="/" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
-    <link rel="stylesheet" href="assets/fonts/roboto/font.css" />
-    <link rel="stylesheet" href="assets/fonts/material-icons/font.css" />
   </head>
   <body class="mat-typography">
     <app-root>

diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss
@@ -1,4 +1,9 @@
 @use '@angular/material' as mat;
+
+// TODO(#1715) check if font creation saves us anything
+// @use "@fontsource/roboto/scss/mixins" as Roboto;
+// @use "@fontsource/material-icons/scss/mixins" as MatIcons;
+
 // Custom Theming for Angular Material
 // For more information: https://material.angular.io/guide/theming
 // Plus imports for other components in your app.
@@ -90,6 +95,9 @@ $ang-CaBr2-theme-dark: mat.define-dark-theme(
   }
 }
 
+@import '~@fontsource/roboto/index.css';
+@import '~@fontsource/material-icons/index.css';
+
 /* You can add global styles to this file, and also import other style files */
 
 html,

diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -1791,6 +1791,16 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@fontsource/material-icons@4.5.4":
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/@fontsource/material-icons/-/material-icons-4.5.4.tgz#bfedde9352c36dbbacb6b49d190a1ce1e5917756"
+  integrity sha512-YGmXkkEdu6EIgpFKNmB/nIXzZocwSmbI01Ninpmml8x8BT0M6RR++V1KqOfpzZ6Cw/FQ2/KYonQ3x4IY/4VRRA==
+
+"@fontsource/roboto@4.5.8":
+  version "4.5.8"
+  resolved "https://registry.yarnpkg.com/@fontsource/roboto/-/roboto-4.5.8.tgz#56347764786079838faf43f0eeda22dd7328437f"
+  integrity sha512-CnD7zLItIzt86q4Sj3kZUiLcBk1dSk81qcqgMGaZe7SQ1P8hFNxhMl5AZthK1zrDM5m74VVhaOpuMGIL4gagaA==
+
 "@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"