Compare commits
No commits in common. "0df362a891b9ac3686343e556d3b730dc0ca99b0" and "4a7c6b9a66b8090bef080b6811a38cf926fe4c68" have entirely different histories.
0df362a891
...
4a7c6b9a66
|
@ -71,6 +71,6 @@
|
||||||
@apply border-border;
|
@apply border-border;
|
||||||
}
|
}
|
||||||
body {
|
body {
|
||||||
@apply bg-background text-foreground font-main;
|
@apply bg-background text-foreground;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
import type { Metadata } from "next"
|
import type { Metadata } from "next"
|
||||||
import { Jaldi, Be_Vietnam_Pro } from "next/font/google"
|
import Image from "next/image"
|
||||||
|
import { Inter, Jaldi } from "next/font/google"
|
||||||
|
import "./globals.css"
|
||||||
import Header from "@/components/LayoutHeader"
|
import Header from "@/components/LayoutHeader"
|
||||||
import Footer from "@/components/LayoutFooter"
|
import Footer from "@/components/LayoutFooter"
|
||||||
import "./globals.css"
|
|
||||||
|
|
||||||
const beVietnamPro = Be_Vietnam_Pro({ weight: ["400"], subsets: ["latin"], variable: "--font-be-vietnam-pro" })
|
const inter = Inter({ subsets: ["latin"], variable: "--font-inter" })
|
||||||
const jaldi = Jaldi({
|
const jaldi = Jaldi({
|
||||||
subsets: ["latin"],
|
subsets: ["latin"],
|
||||||
weight: ["400"],
|
weight: ["400"],
|
||||||
|
@ -23,7 +24,7 @@ export default function RootLayout({
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<body className={`font-main bg-gray-900 flex ${beVietnamPro.variable} ${jaldi.variable}`}>
|
<body className={`font-main bg-gray-900 flex`}>
|
||||||
<main className="flex w-full min-h-screen flex-col md:px-40 items-center py-16 mx-auto">
|
<main className="flex w-full min-h-screen flex-col md:px-40 items-center py-16 mx-auto">
|
||||||
<Header />
|
<Header />
|
||||||
{children}
|
{children}
|
||||||
|
|
|
@ -39,12 +39,7 @@ export async function fetchFeedData({
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// const articles = await prisma.article.findMany({
|
// Mocking the data instead of fetching from the database
|
||||||
// ...query,
|
|
||||||
// skip: current,
|
|
||||||
// take: next,
|
|
||||||
// });
|
|
||||||
|
|
||||||
const articles: Article[] = [
|
const articles: Article[] = [
|
||||||
{
|
{
|
||||||
id: 1,
|
id: 1,
|
||||||
|
|
|
@ -17,7 +17,7 @@ const config: Config = {
|
||||||
},
|
},
|
||||||
extend: {
|
extend: {
|
||||||
fontFamily: {
|
fontFamily: {
|
||||||
main: "var(--font-be-vietnam-pro)",
|
main: "var(--font-inter)",
|
||||||
secondary: "var(--font-jaldi)",
|
secondary: "var(--font-jaldi)",
|
||||||
},
|
},
|
||||||
colors: {
|
colors: {
|
||||||
|
|
Loading…
Reference in New Issue