diff --git a/typing-app/bun.lockb b/typing-app/bun.lockb index f3a045a..46816c1 100755 Binary files a/typing-app/bun.lockb and b/typing-app/bun.lockb differ diff --git a/typing-app/package.json b/typing-app/package.json index bf700a1..cf71d76 100644 --- a/typing-app/package.json +++ b/typing-app/package.json @@ -11,6 +11,7 @@ "format:ci": "prettier . --check" }, "dependencies": { + "@chakra-ui/react": "^2.8.2", "@radix-ui/react-slot": "^1.0.2", "@radix-ui/react-toast": "^1.1.5", "class-variance-authority": "^0.7.0", diff --git a/typing-app/src/app/(game)/typing/page.tsx b/typing-app/src/app/(game)/typing/page.tsx deleted file mode 100644 index 8e9989d..0000000 --- a/typing-app/src/app/(game)/typing/page.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function Typing() { - return
Typing View
; -} diff --git a/typing-app/src/app/credit/page.tsx b/typing-app/src/app/credit/page.tsx deleted file mode 100644 index c7f42df..0000000 --- a/typing-app/src/app/credit/page.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function Credit() { - return
Credit View
; -} diff --git a/typing-app/src/app/game/page.tsx b/typing-app/src/app/game/page.tsx new file mode 100644 index 0000000..e654265 --- /dev/null +++ b/typing-app/src/app/game/page.tsx @@ -0,0 +1,5 @@ +import GamePage from "@/components/pages/Game"; + +export default function Typing() { + return ; +} diff --git a/typing-app/src/app/globals.css b/typing-app/src/app/globals.css index 8abdb15..248d696 100644 --- a/typing-app/src/app/globals.css +++ b/typing-app/src/app/globals.css @@ -2,75 +2,19 @@ @tailwind components; @tailwind utilities; -@layer base { - :root { - --background: 0 0% 100%; - --foreground: 222.2 84% 4.9%; - - --card: 0 0% 100%; - --card-foreground: 222.2 84% 4.9%; - - --popover: 0 0% 100%; - --popover-foreground: 222.2 84% 4.9%; - - --primary: 222.2 47.4% 11.2%; - --primary-foreground: 210 40% 98%; - - --secondary: 210 40% 96.1%; - --secondary-foreground: 222.2 47.4% 11.2%; - - --muted: 210 40% 96.1%; - --muted-foreground: 215.4 16.3% 46.9%; - - --accent: 210 40% 96.1%; - --accent-foreground: 222.2 47.4% 11.2%; - - --destructive: 0 84.2% 60.2%; - --destructive-foreground: 210 40% 98%; - - --border: 214.3 31.8% 91.4%; - --input: 214.3 31.8% 91.4%; - --ring: 222.2 84% 4.9%; - - --radius: 0.5rem; - } - - .dark { - --background: 222.2 84% 4.9%; - --foreground: 210 40% 98%; - - --card: 222.2 84% 4.9%; - --card-foreground: 210 40% 98%; - - --popover: 222.2 84% 4.9%; - --popover-foreground: 210 40% 98%; - - --primary: 210 40% 98%; - --primary-foreground: 222.2 47.4% 11.2%; - - --secondary: 217.2 32.6% 17.5%; - --secondary-foreground: 210 40% 98%; - - --muted: 217.2 32.6% 17.5%; - --muted-foreground: 215 20.2% 65.1%; - - --accent: 217.2 32.6% 17.5%; - --accent-foreground: 210 40% 98%; - - --destructive: 0 62.8% 30.6%; - --destructive-foreground: 210 40% 98%; +:root { + --foreground-rgb: 255, 255, 255; + --background-start-rgb: 0, 0, 0; + --background-end-rgb: 0, 0, 0; +} - --border: 217.2 32.6% 17.5%; - --input: 217.2 32.6% 17.5%; - --ring: 212.7 26.8% 83.9%; - } +body { + color: rgb(var(--foreground-rgb)); + background: rgb(var(--background-start-rgb)); } -@layer base { - * { - @apply border-border; - } - body { - @apply bg-background text-foreground; +@layer utilities { + .text-balance { + text-wrap: balance; } } diff --git a/typing-app/src/app/layout.tsx b/typing-app/src/app/layout.tsx index 3314e47..8b7263b 100644 --- a/typing-app/src/app/layout.tsx +++ b/typing-app/src/app/layout.tsx @@ -1,12 +1,14 @@ import type { Metadata } from "next"; import { Inter } from "next/font/google"; +import Header from "../components/organism/Header"; +import Footer from "../components/organism/Footer"; import "./globals.css"; +import { Box, ChakraProvider } from "@chakra-ui/react"; const inter = Inter({ subsets: ["latin"] }); export const metadata: Metadata = { - title: "Create Next App", - description: "Generated by create next app", + title: "TypeMaster", }; export default function RootLayout({ @@ -16,7 +18,17 @@ export default function RootLayout({ }>) { return ( - {children} + + + +
+ + {children} + +