From e30fa5675ecab073ef55e5edafd3444cd336a3a7 Mon Sep 17 00:00:00 2001
From: NeoPrint3D <drew@ronsman.com>
Date: Wed, 21 Sep 2022 11:13:06 -0500
Subject: [PATCH] magic stuff happened

---
 react-client/index.html                       |  4 ++++
 react-client/package.json                     |  1 +
 react-client/pnpm-lock.yaml                   | 21 +++++++++++++++++++
 .../src/components/GameRoom/Keyboard/Key.tsx  |  2 +-
 .../components/GameRoom/Keyboard/Keyboard.tsx |  4 ++--
 react-client/src/styles/global.css            |  2 --
 react-client/vite.config.ts                   |  6 +++++-
 7 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/react-client/index.html b/react-client/index.html
index 47424c5..e8c95f3 100644
--- 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
index a7798ee..358cafd 100644
--- 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
index 4621087..26706f9 100644
--- a/react-client/pnpm-lock.yaml
+++ b/react-client/pnpm-lock.yaml
@@ -29,6 +29,7 @@ specifiers:
   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
 
 dependencies:
@@ -62,6 +63,7 @@ devDependencies:
   vite-plugin-pwa: 0.12.3_ytzi5swfraj2n2tmn6nztjm3nm
   vite-plugin-qrcode: 0.1.1_vite@2.9.14
   vite-plugin-remove-console: 1.1.0
+  vite-plugin-webfont-dl: 3.1.1_vite@2.9.14
   workbox-window: 6.5.4
 
 packages:
@@ -2779,6 +2781,14 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
+  /axios/0.25.0:
+    resolution: {integrity: sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==}
+    dependencies:
+      follow-redirects: 1.15.2
+    transitivePeerDependencies:
+      - debug
+    dev: true
+
   /axios/0.27.2:
     resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
     dependencies:
@@ -7179,6 +7189,17 @@ packages:
     resolution: {integrity: sha512-FZ0gLEsRqgHPCl+blHpT3h004+InKrGddmBXTfs7Cj/xWY7FdHpL9Zc9kgjxh8zIzjZ/MblsPDDEqg5BVHIXDA==}
     dev: true
 
+  /vite-plugin-webfont-dl/3.1.1_vite@2.9.14:
+    resolution: {integrity: sha512-TR7EQ0IRL0yauWs328qUG+w4PPhdmAGQFyH/8ODDI0xseHEcHAt1Bd5H8Y9MAqjhOiPz8odjxt24lUizIVCNAw==}
+    peerDependencies:
+      vite: ^2 || ^3
+    dependencies:
+      axios: 0.25.0
+      vite: 2.9.14
+    transitivePeerDependencies:
+      - debug
+    dev: true
+
   /vite/2.9.14:
     resolution: {integrity: sha512-P/UCjSpSMcE54r4mPak55hWAZPlyfS369svib/gpmz8/01L822lMPOJ/RYW6tLCe1RPvMvOsJ17erf55bKp4Hw==}
     engines: {node: '>=12.2.0'}
diff --git a/react-client/src/components/GameRoom/Keyboard/Key.tsx b/react-client/src/components/GameRoom/Keyboard/Key.tsx
index 9945e8d..6f5fca4 100644
--- 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
index e54b565..e0d93bf 100644
--- 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
index d2732fc..6af50c4 100644
--- 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
index 2e42f56..6607905 100644
--- 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(),
   ],
 });