Fonts fix

11 months ago · a1b6d0fead
parent 341aae53a9
commit a1b6d0fead
6 changed files with 36 additions and 12 deletions
--- a/package.json
+++ b/package.json
@ -22,6 +22,7 @@
    "class-variance-authority": "^0.7.0",
    "clsx": "^2.1.0",
    "cmdk": "^1.0.0",
+    "geist": "^1.3.0",
    "lucide-react": "^0.363.0",
    "next": "14.1.4",
    "next-themes": "^0.3.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -38,6 +38,9 @@ dependencies:
  cmdk:
    specifier: ^1.0.0
    version: 1.0.0(@types/react-dom@18.2.23)(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0)
+  geist:
+    specifier: ^1.3.0
+    version: 1.3.0(next@14.1.4)
  lucide-react:
    specifier: ^0.363.0
    version: 0.363.0(react@18.2.0)
@ -2129,6 +2132,14 @@ packages:
    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
    dev: true

+  /geist@1.3.0(next@14.1.4):
+    resolution: {integrity: sha512-IoGBfcqVEYB4bEwsfHd35jF4+X9LHRPYZymHL4YOltHSs9LJa24DYs1Z7rEMQ/lsEvaAIc61Y9aUxgcJaQ8lrg==}
+    peerDependencies:
+      next: '>=13.2.0 <15.0.0-0'
+    dependencies:
+      next: 14.1.4(react-dom@18.2.0)(react@18.2.0)
+    dev: false
+
  /get-intrinsic@1.2.4:
    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
    engines: {node: '>= 0.4'}
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@ -1,5 +1,5 @@
 import type { Metadata } from "next";
-import { Lato as FontSans } from "next/font/google";
+
 import "./globals.css";

 export const metadata: Metadata = {
@ -11,10 +11,7 @@ import { cn } from "@/lib/utils";
 import { ThemeProvider } from "@/components/theme-provider";
 import Layout from "@/components/layout";

-const fontSans = FontSans({
-  weight: ["400", "700"],
-  subsets: ["latin", "latin-ext"],
-});
+import fonts from "@/components/fonts";

 export default function RootLayout({
  children,
@ -26,7 +23,7 @@ export default function RootLayout({
      <body
        className={cn(
          "min-h-screen bg-background text-foreground antialiased",
-          fontSans.className,
+          fonts.sans.className
        )}
      >
        <ThemeProvider
--- a/src/components/fonts.tsx
+++ b/src/components/fonts.tsx
@ -0,0 +1,9 @@
+import { GeistMono } from "geist/font/mono";
+import { GeistSans } from "geist/font/sans";
+
+const fonts = {
+  sans: GeistSans,
+  mono: GeistMono,
+};
+
+export default fonts;
--- a/src/components/layout/header.tsx
+++ b/src/components/layout/header.tsx
@ -2,13 +2,23 @@ import Logo from "@/components/logo";
 import { Separator } from "@/components/ui/separator";
 import Nav from "./nav";
 import Link from "next/link";
+import { cn } from "@/lib/utils";
+
+import fonts from "@/components/fonts";

 const Header = () => (
  <header className="w-full flex flex-col justify-center items-center">
    <div className="py-2 px-4 md:px-8 flex flex-row justify-between w-full max-w-screen-2xl">
-      <Link href="/" className="flex flex-row items-center gap-x-2 hover:opacity-80 transition-opacity">
+      <Link
+        href="/"
+        className="flex flex-row items-center gap-x-2 hover:opacity-80 transition-opacity"
+      >
        <Logo className="h-6 w-6" />
-        <span className="font-mono text-2xl hidden md:inline-block">wych.dev</span>
+        <span
+          className={cn("text-2xl hidden md:inline-block", fonts.mono.className)}
+        >
+          wych.dev
+        </span>
      </Link>
      <Nav />
    </div>
--- a/src/components/layout/nav.tsx
+++ b/src/components/layout/nav.tsx
@ -17,10 +17,6 @@ import {
 import {
  GalleryHorizontalEnd,
  Home,
-  PanelRightClose,
-  Scroll,
-  Search,
-  Settings,
  SunMoon,
 } from "lucide-react";
 import { useRouter } from "next/navigation";