From c9551b774c703e596271131369378953cbe7fbce Mon Sep 17 00:00:00 2001
From: sadman <68962712+sadmann7@users.noreply.github.com>
Date: Fri, 2 Oct 2026 23:18:48 +0600
Subject: [PATCH] refactor: use next geist fonts

---
 package.json       |  1 -
 pnpm-lock.yaml     | 12 ------------
 src/app/layout.tsx | 13 ++-----------
 src/lib/fonts.ts   | 14 ++++++++++----
 4 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 43497c735..25687966d 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
     "date-fns": "^4.4.0",
     "drizzle-orm": "^0.45.2",
     "export-to-csv": "^1.5.0",
-    "geist": "^1.7.2",
     "lucide-react": "^1.47.0",
     "next": "^16.3.5",
     "next-themes": "^0.4.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 290240cc9..b1ff3eefc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -232,9 +232,6 @@ importers:
       export-to-csv:
         specifier: ^1.5.0
         version: 1.5.0
-      geist:
-        specifier: ^1.7.2
-        version: 1.7.2(next@16.3.5(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.1)(react-dom@19.3.0(react@19.3.0))(react@19.3.0))
       lucide-react:
         specifier: ^1.47.0
         version: 1.47.0(react@19.3.0)
@@ -3835,11 +3832,6 @@ packages:
   fuzzysort@3.1.0:
     resolution: {integrity: sha512-sR9BNCjBg6LNgwvxlBd0sBABvQitkLzoVY9MYYROQVX/FvfJ4Mai9LsGhDgd8qYdds0bY77VzYd5iuB+v5rwQQ==}
 
-  geist@1.7.2:
-    resolution: {integrity: sha512-Gu5lDFa3pLRyoBlBPf0QIFHVdWAnpco7fS1bJm41jyLPFoguBgiubseUN2oLXMgqZ7uxAxDoXcHMhCY/fOTTgg==}
-    peerDependencies:
-      next: '>=13.2.0'
-
   gensync@1.0.0-beta.2:
     resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
     engines: {node: '>=6.9.0'}
@@ -8221,10 +8213,6 @@ snapshots:
 
   fuzzysort@3.1.0: {}
 
-  geist@1.7.2(next@16.3.5(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.1)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)):
-    dependencies:
-      next: 16.3.5(@babel/core@7.29.7(supports-color@10.2.2))(@types/node@26.6.1)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
-
   gensync@1.0.0-beta.2: {}
 
   get-caller-file@2.0.5: {}
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index cf14ec3fd..02e4b929a 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,7 +1,6 @@
 import type { Metadata, Viewport } from "next";
 
 import { cn } from "cn";
-import { Inter } from "next/font/google";
 import Script from "next/script";
 import { Suspense } from "react";
 
@@ -14,8 +13,6 @@ import { siteConfig } from "@/lib/site";
 import { Toaster } from "@/registry/bases/radix/ui/sonner";
 import "@/styles/globals.css";
 
-const inter = Inter({ subsets: ["latin"], variable: "--font-sans" });
-
 export const metadata: Metadata = {
   metadataBase: new URL(siteConfig.url),
   title: {
@@ -77,16 +74,10 @@ export default function RootLayout({ children }: React.PropsWithChildren) {
     <html
       lang="en"
       suppressHydrationWarning
-      className={cn("font-sans", inter.variable)}
+      className={cn("font-sans", fontSans.variable, fontMono.variable)}
     >
       <head />
-      <body
-        className={cn(
-          "min-h-screen bg-background font-sans antialiased",
-          fontSans.variable,
-          fontMono.variable,
-        )}
-      >
+      <body className="min-h-screen bg-background font-sans antialiased">
         <Suspense>
           <UploadThingSSR />
         </Suspense>
diff --git a/src/lib/fonts.ts b/src/lib/fonts.ts
index 28d6eb327..afac76384 100644
--- a/src/lib/fonts.ts
+++ b/src/lib/fonts.ts
@@ -1,5 +1,11 @@
-import { GeistMono } from "geist/font/mono";
-import { GeistSans } from "geist/font/sans";
+import { Geist, Geist_Mono } from "next/font/google";
 
-export const fontSans = GeistSans;
-export const fontMono = GeistMono;
+export const fontSans = Geist({
+  subsets: ["latin"],
+  variable: "--font-sans",
+});
+
+export const fontMono = Geist_Mono({
+  subsets: ["latin"],
+  variable: "--font-mono",
+});