refactor: adjust layout code structure

UNIkeEN · UNIkeEN · commit 01f5c6206755 · 2025-07-12T18:22:41.000+08:00
diff --git a/app/[lang]/layout.jsx b/app/[lang]/layout.jsx
@@ -1,10 +1,10 @@
 import { Footer, Layout, Navbar, LastUpdated } from 'nextra-theme-docs'
 import { TitleFullWithLogo } from '../components/logo-title'
-import { Search } from 'nextra/components'
+import { Head, Search } from 'nextra/components'
 import { getPageMap } from 'nextra/page-map'
 import { localeResources } from '../../locales'
 import 'nextra-theme-docs/style.css'
-
+ 
 export const metadata = {
   applicationName: 'SJMCL',
   appleWebApp: {
@@ -19,7 +19,7 @@ export const metadata = {
     template: '%s | SJMCL'
   },
 }
-
+ 
 export default async function RootLayout({ children, params }) {
   const { lang } = await params
   let pageMap = await getPageMap(`/${lang}`)
@@ -38,31 +38,47 @@ export default async function RootLayout({ children, params }) {
       placeholder={t.search.placeholder}
     />
   )
-
+  
   const footer = (
     <Footer>
       沪 ICP 备 05052060 号-7
-      <br />
+      <br/>
       {new Date().getFullYear()} © {t.footer.copyright}
     </Footer>
   )
 
   return (
-    <Layout
-      // banner={banner}
-      navbar={navbar}
-      search={search}
-      pageMap={pageMap}
-      docsRepositoryBase="https://github.com/UNIkeEN/SJMCL/tree/main"
-      footer={footer}
-      editLink={t.editLink}
-      feedback={{ content: t.feedbackLink }}
-      lastUpdated={<LastUpdated>{t.lastUpdated}</LastUpdated>}
-      i18n={Object.entries(localeResources).map(([locale, value]) => ({
-        locale, name: value.display_name,
-      }))}
+    <html
+      // Not required, but good for SEO
+      lang="en"
+      // Required to be set
+      dir="ltr"
+      // Suggested by `next-themes` package https://github.com/pacocoursey/next-themes#with-app
+      suppressHydrationWarning
     >
-      {children}
-    </Layout>
+      <Head
+      // ... Your additional head options
+      >
+        {/* Your additional tags should be passed as `children` of `<Head>` element */}
+      </Head>
+      <body>
+        <Layout
+          // banner={banner}
+          navbar={navbar}
+          search={search}
+          pageMap={pageMap}
+          docsRepositoryBase="https://github.com/UNIkeEN/SJMCL/tree/main"
+          footer={footer}
+          editLink={t.editLink}
+          feedback={{content: t.feedbackLink}}
+          lastUpdated={<LastUpdated>{t.lastUpdated}</LastUpdated>}
+          i18n={Object.entries(localeResources).map(([locale, value]) => ({
+            locale, name: value.display_name,
+          }))}
+        >
+          {children}
+        </Layout>
+      </body>
+    </html>
   )
 }
diff --git a/app/layout.jsx b/app/layout.jsx
@@ -1,27 +1,10 @@
 import { ColorModeSyncWrapper } from './components/color-mode-wrapper'
-import { Head } from 'nextra/components'
 import './styles/global.css'
 
 export default function RootLayout({ children }) {
   return (
-    <html
-      // Not required, but good for SEO
-      lang="en"
-      // Required to be set
-      dir="ltr"
-      // Suggested by `next-themes` package https://github.com/pacocoursey/next-themes#with-app
-      suppressHydrationWarning
-    >
-      <Head
-      // ... Your additional head options
-      >
-        {/* Your additional tags should be passed as `children` of `<Head>` element */}
-      </Head>
-      <body>
-        <ColorModeSyncWrapper>
-          {children}
-        </ColorModeSyncWrapper>
-      </body>
-    </html>
+    <ColorModeSyncWrapper>
+      {children}
+    </ColorModeSyncWrapper>
   )
 }
