diff --git a/web/src/app/layout.tsx b/web/src/app/layout.tsx index 5ae1fc273..a0a809b07 100644 --- a/web/src/app/layout.tsx +++ b/web/src/app/layout.tsx @@ -2,8 +2,8 @@ import type { Metadata } from "next"; import { Geist, Geist_Mono } from "next/font/google"; import "./globals.css"; import { ThemeProvider } from "@/components/theme-provider"; -import { SiteHeader } from "@/components/site-header"; -import { SiteFooter } from "@/components/site-footer"; +import { Header } from "@/components/header"; +import { Footer } from "@/components/footer"; const geistSans = Geist({ variable: "--font-geist-sans", @@ -37,10 +37,10 @@ export default function RootLayout({ enableSystem disableTransitionOnChange > - +
{children} - +
diff --git a/web/src/components/footer/api-link.tsx b/web/src/components/footer/api-link.tsx new file mode 100644 index 000000000..2e218d859 --- /dev/null +++ b/web/src/components/footer/api-link.tsx @@ -0,0 +1,15 @@ +import { FileJson2 } from "lucide-react"; + +export function ApiLink() { + return ( + + + API + + ); +} diff --git a/web/src/assets/collinmbarrett-icon-dark.png b/web/src/components/footer/collinmbarrett-link/collinmbarrett-icon-dark.png similarity index 100% rename from web/src/assets/collinmbarrett-icon-dark.png rename to web/src/components/footer/collinmbarrett-link/collinmbarrett-icon-dark.png diff --git a/web/src/assets/collinmbarrett-icon-light.png b/web/src/components/footer/collinmbarrett-link/collinmbarrett-icon-light.png similarity index 100% rename from web/src/assets/collinmbarrett-icon-light.png rename to web/src/components/footer/collinmbarrett-link/collinmbarrett-icon-light.png diff --git a/web/src/components/footer/collinmbarrett-link/index.tsx b/web/src/components/footer/collinmbarrett-link/index.tsx new file mode 100644 index 000000000..be6ccd716 --- /dev/null +++ b/web/src/components/footer/collinmbarrett-link/index.tsx @@ -0,0 +1,24 @@ +import CollinMBarrettIconLight from "./collinmbarrett-icon-light.png"; +import CollinMBarrettIconDark from "./collinmbarrett-icon-dark.png"; +import { ImageThemed } from "@/components/image-themed"; + +export function CollinMBarrettLink() { + return ( + + + by Collin M. Barrett + + ); +} diff --git a/web/src/assets/github-mark-dark.svg b/web/src/components/footer/github-link/github-mark-dark.svg similarity index 100% rename from web/src/assets/github-mark-dark.svg rename to web/src/components/footer/github-link/github-mark-dark.svg diff --git a/web/src/assets/github-mark-light.svg b/web/src/components/footer/github-link/github-mark-light.svg similarity index 100% rename from web/src/assets/github-mark-light.svg rename to web/src/components/footer/github-link/github-mark-light.svg diff --git a/web/src/components/footer/github-link/index.tsx b/web/src/components/footer/github-link/index.tsx new file mode 100644 index 000000000..a0a58f172 --- /dev/null +++ b/web/src/components/footer/github-link/index.tsx @@ -0,0 +1,24 @@ +import GitHubMarkLight from "./github-mark-light.svg"; +import GitHubMarkDark from "./github-mark-dark.svg"; +import { ImageThemed } from "@/components/image-themed"; + +export function GitHubLink() { + return ( + + + GitHub + + ); +} diff --git a/web/src/components/footer/index.tsx b/web/src/components/footer/index.tsx new file mode 100644 index 000000000..510b3dd5f --- /dev/null +++ b/web/src/components/footer/index.tsx @@ -0,0 +1,13 @@ +import { CollinMBarrettLink } from "./collinmbarrett-link"; +import { GitHubLink } from "./github-link"; +import { ApiLink } from "./api-link"; + +export function Footer() { + return ( +
+ + + +
+ ); +} diff --git a/web/src/components/site-header.tsx b/web/src/components/header.tsx similarity index 77% rename from web/src/components/site-header.tsx rename to web/src/components/header.tsx index 113d6a888..6f205d089 100644 --- a/web/src/components/site-header.tsx +++ b/web/src/components/header.tsx @@ -1,12 +1,12 @@ -import { ThemeModeToggle } from "./theme-mode-toggle"; +import { ThemeToggle } from "./theme-toggle"; -export function SiteHeader() { +export function Header() { return (
diff --git a/web/src/components/theme-image.tsx b/web/src/components/image-themed.tsx similarity index 96% rename from web/src/components/theme-image.tsx rename to web/src/components/image-themed.tsx index 5acf6444a..a463ec86a 100644 --- a/web/src/components/theme-image.tsx +++ b/web/src/components/image-themed.tsx @@ -10,7 +10,7 @@ type ThemedImageProps = Omit & { alt: string; }; -export function ThemeImage({ +export function ImageThemed({ srcLight, srcDark, alt, diff --git a/web/src/components/site-footer.tsx b/web/src/components/site-footer.tsx deleted file mode 100644 index 48b15be43..000000000 --- a/web/src/components/site-footer.tsx +++ /dev/null @@ -1,54 +0,0 @@ -import { FileJson2 } from "lucide-react"; -import CollinMBarrettIconLight from "../assets/collinmbarrett-icon-light.png"; -import CollinMBarrettIconDark from "../assets/collinmbarrett-icon-dark.png"; -import GitHubMarkLight from "../assets/github-mark-light.svg"; -import GitHubMarkDark from "../assets/github-mark-dark.svg"; -import { ThemeImage } from "@/components/theme-image"; - -export function SiteFooter() { - return ( - - ); -} diff --git a/web/src/components/theme-mode-toggle.tsx b/web/src/components/theme-toggle.tsx similarity index 97% rename from web/src/components/theme-mode-toggle.tsx rename to web/src/components/theme-toggle.tsx index c2aa7a14c..498143795 100644 --- a/web/src/components/theme-mode-toggle.tsx +++ b/web/src/components/theme-toggle.tsx @@ -12,7 +12,7 @@ import { DropdownMenuTrigger, } from "@/components/ui/dropdown-menu"; -export function ThemeModeToggle() { +export function ThemeToggle() { const { setTheme } = useTheme(); return (