diff --git a/src/app/globals.css b/src/app/globals.css index 960f26d..046a484 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -71,6 +71,6 @@ @apply border-border; } body { - @apply bg-background text-foreground; + @apply bg-background text-foreground font-main; } } diff --git a/src/app/layout.tsx b/src/app/layout.tsx index b8916be..1eac0be 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,11 +1,10 @@ import type { Metadata } from "next" -import Image from "next/image" -import { Inter, Jaldi } from "next/font/google" -import "./globals.css" +import { Jaldi, Be_Vietnam_Pro } from "next/font/google" import Header from "@/components/LayoutHeader" import Footer from "@/components/LayoutFooter" +import "./globals.css" -const inter = Inter({ subsets: ["latin"], variable: "--font-inter" }) +const beVietnamPro = Be_Vietnam_Pro({ weight: ["400"], subsets: ["latin"], variable: "--font-be-vietnam-pro" }) const jaldi = Jaldi({ subsets: ["latin"], weight: ["400"], @@ -24,7 +23,7 @@ export default function RootLayout({ }) { return ( - +
{children} diff --git a/src/lib/feed.ts b/src/lib/feed.ts index 1e5a353..99b3e8e 100644 --- a/src/lib/feed.ts +++ b/src/lib/feed.ts @@ -39,7 +39,12 @@ export async function fetchFeedData({ } } - // Mocking the data instead of fetching from the database + // const articles = await prisma.article.findMany({ + // ...query, + // skip: current, + // take: next, + // }); + const articles: Article[] = [ { id: 1, diff --git a/tailwind.config.ts b/tailwind.config.ts index 36cc00a..b87097e 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -17,7 +17,7 @@ const config: Config = { }, extend: { fontFamily: { - main: "var(--font-inter)", + main: "var(--font-be-vietnam-pro)", secondary: "var(--font-jaldi)", }, colors: {