diff --git a/app/favicon.ico b/app/favicon.ico index 718d6fe..5cb9707 100644 Binary files a/app/favicon.ico and b/app/favicon.ico differ diff --git a/app/layout.tsx b/app/layout.tsx index a631403..cb7f459 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -2,18 +2,25 @@ import { Geist, Geist_Mono, Inter } from "next/font/google" import "./globals.css" import { ThemeProvider } from "@/components/theme-provider" -import { cn } from "@/lib/utils"; +import { cn } from "@/lib/utils" import { SidebarInset, SidebarProvider } from "@/components/ui/sidebar" import { AppSidebar } from "@/components/app-sidebar" import { PlayerBar } from "@/components/player-bar" +import type { Metadata } from "next" -const inter = Inter({subsets:['latin'],variable:'--font-sans'}) +const inter = Inter({ subsets: ["latin"], variable: "--font-sans" }) const fontMono = Geist_Mono({ subsets: ["latin"], variable: "--font-mono", }) +export const metadata: Metadata = { + title: "oTunes", + description: "Our Music", + // keywords: ["Next.js", "React", "SEO"], +} + export default function RootLayout({ children, }: Readonly<{ @@ -23,7 +30,12 @@ export default function RootLayout({ diff --git a/components/app-sidebar.tsx b/components/app-sidebar.tsx index b0ec876..4202d24 100644 --- a/components/app-sidebar.tsx +++ b/components/app-sidebar.tsx @@ -24,8 +24,11 @@ import { SidebarMenuButton, SidebarMenuItem, } from "@/components/ui/sidebar" +import { ThemeToggle } from "@/components/theme-toggle" import Image from "next/image" import Link from "next/link" +import { useTheme } from "next-themes" +import * as React from "react" const browse = [ { title: "Home", path: "/", icon: House }, @@ -51,11 +54,20 @@ export function AppSidebar() { const router = useRouter() const pathname = usePathname() + const { resolvedTheme } = useTheme() + const [mounted, setMounted] = React.useState(false) + + React.useEffect(() => { + setMounted(true) + }, []) + + const isDark = mounted && resolvedTheme === "dark" + return (
- {"oTunes"} + {"oTunes"} oTunes
@@ -120,13 +132,14 @@ export function AppSidebar() { - - + + JH - Joshua Higgins + Joshua Higgins + diff --git a/components/theme-provider.tsx b/components/theme-provider.tsx index 3d44f48..6fd064e 100644 --- a/components/theme-provider.tsx +++ b/components/theme-provider.tsx @@ -15,55 +15,35 @@ function ThemeProvider({ disableTransitionOnChange {...props} > - + {children} ) } -function isTypingTarget(target: EventTarget | null) { - if (!(target instanceof HTMLElement)) { - return false - } - - return ( - target.isContentEditable || - target.tagName === "INPUT" || - target.tagName === "TEXTAREA" || - target.tagName === "SELECT" - ) -} - -function ThemeHotkey() { - const { resolvedTheme, setTheme } = useTheme() +function ThemeFavicon() { + const { resolvedTheme } = useTheme() React.useEffect(() => { - function onKeyDown(event: KeyboardEvent) { - if (event.defaultPrevented || event.repeat) { - return - } - - if (event.metaKey || event.ctrlKey || event.altKey) { - return - } - - if (event.key.toLowerCase() !== "d") { - return - } - - if (isTypingTarget(event.target)) { - return - } - - setTheme(resolvedTheme === "dark" ? "light" : "dark") + if (!resolvedTheme) { + return } - window.addEventListener("keydown", onKeyDown) + const href = + resolvedTheme === "dark" ? "/favicon-dark.ico" : "/favicon.ico" - return () => { - window.removeEventListener("keydown", onKeyDown) + for (const rel of ["icon", "shortcut icon"] as const) { + let link = document.querySelector(`link[rel="${rel}"]`) + + if (!link) { + link = document.createElement("link") + link.rel = rel + document.head.appendChild(link) + } + + link.href = href } - }, [resolvedTheme, setTheme]) + }, [resolvedTheme]) return null } diff --git a/components/theme-toggle.tsx b/components/theme-toggle.tsx new file mode 100644 index 0000000..a0f6431 --- /dev/null +++ b/components/theme-toggle.tsx @@ -0,0 +1,31 @@ +"use client" + +import * as React from "react" +import { Moon, Sun } from "lucide-react" +import { useTheme } from "next-themes" + +import { Button } from "@/components/ui/button" + +export function ThemeToggle() { + const { resolvedTheme, setTheme } = useTheme() + const [mounted, setMounted] = React.useState(false) + + React.useEffect(() => { + setMounted(true) + }, []) + + const isDark = mounted && resolvedTheme === "dark" + + return ( + + ) +} diff --git a/public/favicon-dark.ico b/public/favicon-dark.ico new file mode 100644 index 0000000..e3a693d Binary files /dev/null and b/public/favicon-dark.ico differ diff --git a/public/logo-dark.png b/public/logo-dark.png new file mode 100644 index 0000000..6e2d12c Binary files /dev/null and b/public/logo-dark.png differ diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000..485c244 Binary files /dev/null and b/public/logo.png differ