wip: font

yigehuaihaizi · Jun 27, 2024 · 17b1e40 · 17b1e40
1 parent e3a4bcf
commit 17b1e40
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 15 deletions.
diff --git a/public/fonts/Pacifico.ttf b/public/fonts/Pacifico.ttf
diff --git a/public/fonts/XiaolaiMonoSC-Regular.ttf b/public/fonts/XiaolaiMonoSC-Regular.ttf
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -2,7 +2,7 @@
  * @Author: kasuie
  * @Date: 2024-05-20 16:08:41
  * @LastEditors: kasuie
- * @LastEditTime: 2024-06-26 23:43:26
+ * @LastEditTime: 2024-06-27 18:09:42
  * @Description:
  */
 import type { Metadata } from "next";
@@ -13,8 +13,7 @@ import { getConfig } from "@/lib/config";
 import { GoogleAnalytics, GoogleTagManager } from "@next/third-parties/google";
 import Script from "next/script";
 import "@/styles/index.css";
-
-// const manrope = Manrope({ subsets: ["latin"] });
+import StyleRegistry from "@/components/layout/StyleRegistry";
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -39,12 +38,15 @@ export default async function RootLayout({
 }: Readonly<{
   children: React.ReactNode;
 }>) {
-  // const appConfig = await getConfig("config.json");
+  const appConfig = await getConfig("config.json");
   return (
     <html lang="zh-CN" suppressHydrationWarning>
-      <body className={`${inter.className} mio-scroll overflow-y-auto`}>
-        <AppProviders>
+      <body
+        className={`${inter.className} mio-scroll mio-fonts overflow-y-auto`}
+      >
+        <AppProviders appConfig={appConfig}>
           <Layout>{children}</Layout>
+          <StyleRegistry />
         </AppProviders>
         {process.env.GTAGID && <GoogleAnalytics gaId={process.env.GTAGID} />}
         {process.env.GTMID && <GoogleTagManager gtmId={process.env.GTMID} />}

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -2,7 +2,7 @@
  * @Author: kasuie
  * @Date: 2024-05-20 16:08:41
  * @LastEditors: kasuie
- * @LastEditTime: 2024-06-27 10:35:12
+ * @LastEditTime: 2024-06-27 17:46:12
  * @Description:
  */
 import { Loader } from "@/components/ui/loader/Loader";
@@ -35,6 +35,7 @@ export default async function Home() {
     bgConfig,
     theme,
     footer,
+    globalStyle,
     ...others
   } = transformConfig(await getConfig("config.json"));
 

diff --git a/src/components/effect/TextEffect.tsx b/src/components/effect/TextEffect.tsx
@@ -2,7 +2,7 @@
  * @Author: kasuie
  * @Date: 2024-05-22 14:29:52
  * @LastEditors: kasuie
- * @LastEditTime: 2024-06-12 22:01:30
+ * @LastEditTime: 2024-06-27 18:00:29
  * @Description:
  */
 "use client";
@@ -142,7 +142,7 @@ export function TextEffect({
   return (
     <motion.div
       className={clsx(
-        `k-words-hearts z-[1] relative mx-4 min-h-[30px] text-center font-[cursive] text-[20px] text-white sm:mx-0`,
+        `k-words-hearts z-[1] relative mx-4 min-h-[30px] text-center text-[20px] text-white sm:mx-0`,
         {
           "mb-3": showFrom && typing,
         }

diff --git a/src/components/layout/Layout.tsx b/src/components/layout/Layout.tsx
@@ -2,15 +2,11 @@
  * @Author: kasuie
  * @Date: 2024-05-20 17:15:33
  * @LastEditors: kasuie
- * @LastEditTime: 2024-06-26 23:02:57
+ * @LastEditTime: 2024-06-27 18:04:37
  * @Description:
  */
-import StyleRegistry from "./StyleRegistry";
 export function Layout({ children }: { children: React.ReactNode }) {
   return (
-    <>
-      <main className={"mio-fonts relative min-h-screen"}>{children}</main>;
-      <StyleRegistry></StyleRegistry>
-    </>
+    <main className={"relative min-h-screen"}>{children}</main>
   );
 }
diff --git a/src/config/config.json b/src/config/config.json
@@ -28,6 +28,15 @@
     "style": "",
     "istTransition": true
   },
+  "globalStyle": {
+    "fonts": [
+      {
+        "src": "/fonts/XiaolaiMonoSC-Regular.ttf",
+        "name": "XiaolaiMonoSC"
+      }
+    ],
+    "callback": "cursive,emoji"
+  },
   "subTitle": "https://v1.hitokoto.cn?c=a&c=b&c=c",
   "subTitleConfig": {
     "typing": true,