Browse Source

fix: #1251 use google fonts mirror

Yidadaa 1 year ago
parent
commit
4b9d753254
4 changed files with 8 additions and 6 deletions
  1. 2 3
      app/layout.tsx
  2. 2 0
      app/store/access.ts
  3. 3 2
      app/styles/globals.scss
  4. 1 1
      next.config.mjs

+ 2 - 3
app/layout.tsx

@@ -35,10 +35,9 @@ export default function RootLayout({
         />
         <meta name="version" content={buildConfig.commitId} />
         <link rel="manifest" href="/site.webmanifest"></link>
-        <link rel="preconnect" href="https://fonts.googleapis.com"></link>
-        <link rel="preconnect" href="https://fonts.gstatic.com"></link>
+        <link rel="preconnect" href="https://fonts.proxy.ustclug.org"></link>
         <link
-          href="https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@300;400;700;900&display=swap"
+          href="https://fonts.proxy.ustclug.org/css2?family=Noto+Sans+SC:wght@300;400;700;900&display=swap"
           rel="stylesheet"
         ></link>
         <script src="/serviceWorkerRegister.js" defer></script>

+ 2 - 0
app/store/access.ts

@@ -41,6 +41,8 @@ export const useAccessStore = create<AccessControlStore>()(
         set(() => ({ token }));
       },
       isAuthorized() {
+        get().fetch();
+
         // has token or has code or disabled access control
         return (
           !!get().token || !!get().accessCode || !get().enabledAccessControl()

+ 3 - 2
app/styles/globals.scss

@@ -88,6 +88,9 @@
 }
 html {
   height: var(--full-height);
+
+  font-family: "Noto Sans SC", "SF Pro SC", "SF Pro Text", "SF Pro Icons",
+    "PingFang SC", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
 }
 
 body {
@@ -102,8 +105,6 @@ body {
   align-items: center;
   user-select: none;
   touch-action: pan-x pan-y;
-  font-family: "Noto Sans SC", "SF Pro SC", "SF Pro Text", "SF Pro Icons",
-    "PingFang SC", "Helvetica Neue", "Helvetica", "Arial", sans-serif;
 
   @media only screen and (max-width: 600px) {
     background-color: var(--second);

+ 1 - 1
next.config.mjs

@@ -17,7 +17,7 @@ const nextConfig = {
     }
 
     return {
-      afterFiles: ret,
+      beforeFiles: ret,
     };
   },
   webpack(config) {