magic stuff happened

NeoPrint3D · Sep 21, 2022 · e30fa56 · e30fa56
1 parent a0961fa
commit e30fa56
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 6 deletions.
diff --git a/react-client/index.html b/react-client/index.html
@@ -7,6 +7,10 @@
     <link rel="icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="apple-touch-icon" href="/favicon.ico" />
     <meta name="theme-color" content="#023047" />
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css2?family=Crete+Round&display=swap"
+    />
 
     <script type="module">
       import { registerSW } from "virtual:pwa-register";

diff --git a/react-client/package.json b/react-client/package.json
@@ -43,6 +43,7 @@
     "vite-plugin-pwa": "^0.12.0",
     "vite-plugin-qrcode": "^0.1.1",
     "vite-plugin-remove-console": "^1.1.0",
+    "vite-plugin-webfont-dl": "^3.1.1",
     "workbox-window": "^6.5.4"
   }
 }
diff --git a/react-client/pnpm-lock.yaml b/react-client/pnpm-lock.yaml
diff --git a/react-client/src/components/GameRoom/Keyboard/Key.tsx b/react-client/src/components/GameRoom/Keyboard/Key.tsx
@@ -2,7 +2,7 @@ import { m } from "framer-motion";
 import { memo, useCallback, useContext } from "react";
 import { useWindowSize } from "react-use";
 import { useKeyboard, useGuesses } from "../../../context/GameContext";
-import { CharStatus } from "../../Grid/utils/getStatuses";
+import { CharStatus } from "../Grid/utils/getStatuses";
 
 function Key({ value, status }: { value?: string, status?: CharStatus, socket?: any }) {
     const { width } = useWindowSize()

diff --git a/react-client/src/components/GameRoom/Keyboard/Keyboard.tsx b/react-client/src/components/GameRoom/Keyboard/Keyboard.tsx
@@ -1,7 +1,7 @@
+import { m } from "framer-motion";
 import { memo, useCallback, useEffect, useState } from "react";
 import { useGuesses, useKeyboard } from "../../../context/GameContext";
-import { CharStatus } from "../../Grid/utils/getStatuses";
-import { m } from "framer-motion";
+import { CharStatus } from "../Grid/utils/getStatuses";
 import Key from "./Key";
 
 function Keyboard({ answer, handleEnter, hasGuessed }: { answer: string, handleEnter: any, hasGuessed: boolean }) {

diff --git a/react-client/src/styles/global.css b/react-client/src/styles/global.css
@@ -1,5 +1,3 @@
-@import url("https://fonts.googleapis.com/css2?family=Crete+Round&display=swap");
-
 @tailwind base;
 @tailwind components;
 @tailwind utilities;

diff --git a/react-client/vite.config.ts b/react-client/vite.config.ts
@@ -1,6 +1,7 @@
 import { defineConfig } from "vite";
 import { VitePWA } from "vite-plugin-pwa";
 import removeConsole from "vite-plugin-remove-console";
+import webfontDownload from "vite-plugin-webfont-dl";
 
 //@ts-ignore
 import manifest from "./manifest.json";
@@ -11,12 +12,15 @@ import react from "@vitejs/plugin-react";
 export default defineConfig({
   plugins: [
     react(),
+    removeConsole(),
+    webfontDownload([
+      "https://fonts.googleapis.com/css2?family=Crete+Round&display=swap",
+    ]),
     VitePWA({
       strategies: "injectManifest",
       srcDir: "",
       filename: "service-worker.js",
       manifest,
     }),
-    removeConsole(),
   ],
 });