Compare commits

...

2 Commits

Author SHA1 Message Date
Juan Di Toro 0df362a891 Merge branch 'develop' of git.lumeweb.com:LumeWeb/web3.news into develop 2023-12-05 17:21:20 +01:00
Juan Di Toro cc090a1f33 fix: install proper fonts 2023-12-05 17:19:31 +01:00
4 changed files with 12 additions and 8 deletions

View File

@ -71,6 +71,6 @@
@apply border-border; @apply border-border;
} }
body { body {
@apply bg-background text-foreground; @apply bg-background text-foreground font-main;
} }
} }

View File

@ -1,11 +1,10 @@
import type { Metadata } from "next" import type { Metadata } from "next"
import Image from "next/image" import { Jaldi, Be_Vietnam_Pro } from "next/font/google"
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 inter = Inter({ subsets: ["latin"], variable: "--font-inter" }) const beVietnamPro = Be_Vietnam_Pro({ weight: ["400"], subsets: ["latin"], variable: "--font-be-vietnam-pro" })
const jaldi = Jaldi({ const jaldi = Jaldi({
subsets: ["latin"], subsets: ["latin"],
weight: ["400"], weight: ["400"],
@ -24,7 +23,7 @@ export default function RootLayout({
}) { }) {
return ( return (
<html lang="en"> <html lang="en">
<body className={`font-main bg-gray-900 flex`}> <body className={`font-main bg-gray-900 flex ${beVietnamPro.variable} ${jaldi.variable}`}>
<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}

View File

@ -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[] = [ const articles: Article[] = [
{ {
id: 1, id: 1,

View File

@ -17,7 +17,7 @@ const config: Config = {
}, },
extend: { extend: {
fontFamily: { fontFamily: {
main: "var(--font-inter)", main: "var(--font-be-vietnam-pro)",
secondary: "var(--font-jaldi)", secondary: "var(--font-jaldi)",
}, },
colors: { colors: {