From e5ddfe6e896b3a7aedbf4c9fd34b5395d7e74449 Mon Sep 17 00:00:00 2001 From: Ali Piry Date: Fri, 18 Aug 2023 18:12:27 +0330 Subject: [PATCH] cleanup --- package.json | 1 + src/app/layout.tsx | 13 +++---------- src/ui/header/header-content-container.tsx | 4 ++-- src/utils/cn.ts | 6 ++++++ src/utils/fonts.ts | 7 +++++++ src/utils/index.ts | 2 ++ yarn.lock | 5 +++++ 7 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 src/utils/cn.ts create mode 100644 src/utils/fonts.ts create mode 100644 src/utils/index.ts diff --git a/package.json b/package.json index 4d33021..29650f4 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "@typescript-eslint/eslint-plugin": "6.4.0", "@typescript-eslint/parser": "6.4.0", "autoprefixer": "10.4.15", + "clsx": "2.0.0", "eslint": "8.47.0", "eslint-config-next": "13.4.18", "eslint-config-prettier": "9.0.0", diff --git a/src/app/layout.tsx b/src/app/layout.tsx index c460a52..97e1b0c 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,8 +1,7 @@ import { ReactNode } from "react"; -import { Montserrat } from "next/font/google"; -import { twMerge } from "tailwind-merge"; import Header from "@/ui/header/header"; import Footer from "@/ui/footer/footer"; +import { cn, montserratFont } from "@/utils"; import { APP_ENV, SITE_URL } from "@/config"; import "@/app/globals.css"; @@ -61,12 +60,6 @@ export const metadata = { }, }; -const montserrat = Montserrat({ - weight: ["100", "200", "300", "400", "500", "600", "700", "800", "900"], - subsets: ["latin"], - variable: "--font-montserrat", -}); - interface RootLayoutProps { children: ReactNode; } @@ -75,8 +68,8 @@ export default function RootLayout({ children }: RootLayoutProps) { return (