diff --git a/src/app/alphabet/page.tsx b/src/app/alphabet/page.tsx index 817bfa8..293b089 100644 --- a/src/app/alphabet/page.tsx +++ b/src/app/alphabet/page.tsx @@ -4,6 +4,7 @@ import Button from "@/components/Button"; import { Letter, SupportedAlphabets } from "@/interfaces"; import { useEffect, useState } from "react"; import MemoryCard from "./MemoryCard"; +import { Navbar } from "@/components/Navbar"; export default function Home() { const [chosenAlphabet, setChosenAlphabet] = useState(null); @@ -43,7 +44,8 @@ export default function Home() { } }, [loadingState]); - if (!chosenAlphabet) return ( + if (!chosenAlphabet) return (<> +
请选择您想学习的字符
@@ -52,7 +54,9 @@ export default function Home() {
-
); + + + ); if (loadingState === 'loading') { return '加载中...'; } @@ -60,11 +64,14 @@ export default function Home() { return '加载失败，请重试'; } if (loadingState === 'success' && alphabetData[chosenAlphabet]) { - return ( - ); + return (<> + + + + ); } return null; } \ No newline at end of file diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 8d6a370..c78d04e 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -2,8 +2,6 @@ import type { Metadata } from "next"; import { Geist, Geist_Mono } from "next/font/google"; import "./globals.css"; import type { Viewport } from 'next' -import Link from "next/link"; -import Image from "next/image"; export const viewport: Viewport = { width: 'device-width', @@ -25,33 +23,7 @@ export const metadata: Metadata = { description: "A Website to Learn Languages", }; -function MyLink( - { href, label }: { href: string, label: string } -) { - return ( - {label} - ) -} -function Navbar() { - return ( -
- - logo - - 学语言 - -
- - -
-
- ); -} + export default function RootLayout({ children, @@ -63,7 +35,6 @@ export default function RootLayout({ - {children} diff --git a/src/app/page.tsx b/src/app/page.tsx index 6f819bc..95dac9c 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,3 +1,4 @@ +import { Navbar } from "@/components/Navbar"; import Link from "next/link"; function TopArea() { @@ -91,6 +92,7 @@ function Explore() { export default function Home() { return ( <> + diff --git a/src/app/srt-player/page.tsx b/src/app/srt-player/page.tsx index ca1258d..8a376af 100644 --- a/src/app/srt-player/page.tsx +++ b/src/app/srt-player/page.tsx @@ -3,23 +3,25 @@ import { KeyboardEvent, useRef, useState } from "react"; import UploadArea from "./UploadArea"; import VideoPanel from "./VideoPlayer/VideoPanel"; +import { Navbar } from "@/components/Navbar"; export default function Home() { const videoRef = useRef(null); const [videoUrl, setVideoUrl] = useState(null); const [srtUrl, setSrtUrl] = useState(null); - return ( -
) => e.preventDefault()}> -
- - + return (<> + +
) => e.preventDefault()}> +
+ + +
-
- ); + ); } diff --git a/src/app/text-speaker/page.tsx b/src/app/text-speaker/page.tsx index a10f92c..d2240e5 100644 --- a/src/app/text-speaker/page.tsx +++ b/src/app/text-speaker/page.tsx @@ -9,6 +9,7 @@ import { ChangeEvent, useEffect, useRef, useState } from "react"; import SaveList from "./SaveList"; import { TextSpeakerItemSchema } from "@/interfaces"; import z from "zod"; +import { Navbar } from "@/components/Navbar"; export default function Home() { const textareaRef = useRef(null); @@ -228,6 +229,7 @@ export default function Home() { } return (<> +