Merge version_2 into main #2

Merged
bender merged 2 commits from version_2 into main 2026-03-05 02:27:25 +00:00
2 changed files with 13 additions and 55 deletions

View File

@@ -1,57 +1,20 @@
import type { Metadata } from "next";
import { Mulish } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const mulish = Mulish({
variable: "--font-mulish",
subsets: ["latin"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
title: "One Day Cafe - Korean Specialty Coffee in Lakewood",
description: "Come as you are. One Day Cafe serves specialty Korean coffee, intentional service, and community vibes in Lakewood. Open MonThu 9am9pm, FriSat 9am10pm.",
keywords: "Korean coffee, specialty coffee, Lakewood WA, coffee shop, matcha, croffle, tiramisu, cafe, LGBTQ+ friendly",
openGraph: {
title: "One Day Cafe - Your Neighborhood Coffee Spot",
description: "Specialty Korean coffee, crafted with intention. Come as you are.",
siteName: "One Day Cafe",
images: [
{
url: "http://img.b2bpic.net/free-photo/white-ceramic-mug-with-coffee_209848-35.jpg",
alt: "One Day Cafe specialty coffee",
},
],
},
twitter: {
card: "summary_large_image",
title: "One Day Cafe - Korean Specialty Coffee",
description: "Crafted with intention. Served with warmth. Your neighborhood coffee shop.",
images: ["http://img.b2bpic.net/free-photo/white-ceramic-mug-with-coffee_209848-35.jpg"],
},
};
title: "One Day Cafe", description: "Specialty Korean coffee, intentional service, and community."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${mulish.variable} ${inter.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.className}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1419,7 +1382,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}
}

View File

@@ -53,8 +53,8 @@ export default function HomePage() {
imageSrc="http://img.b2bpic.net/free-photo/white-ceramic-mug-with-coffee_209848-35.jpg"
imageAlt="Beautifully crafted latte at One Day Cafe"
buttons={[
{ text: "View Menu", href: "/menu" },
{ text: "Order Online", href: "https://www.doordash.com" },
{ text: "View Menu", href: "/menu" },
]}
mediaAnimation="slide-up"
buttonAnimation="slide-up"
@@ -80,14 +80,10 @@ export default function HomePage() {
tag="Fan Favorites"
tagIcon={Star}
features={[
{
title: "Sunrise Americano", description: "Our signature blend: bold, smooth, and crafted with precision. The perfect start to any day.", bentoComponent: "globe"},
{
title: "Korean Naju Pear Ice Blended Slush", description: "A refreshing twist on Korean café tradition. Sweet, fruity, and utterly craveable.", bentoComponent: "animated-bar-chart"},
{
title: "Earl Grey Matcha Tiramisu", description: "Elevated dessert meets café culture. Layers of matcha richness, tiramisu elegance, and earl grey sophistication.", bentoComponent: "line-chart"},
{
title: "Mango Matcha & Strawberry Croffle", description: "Crispy-on-the-outside, fluffy-inside croffle with vibrant mango matcha and strawberry toppings.", bentoComponent: "map"},
{ title: "Sunrise Americano", description: "Our signature blend: bold, smooth, and crafted with precision. The perfect start to any day.", bentoComponent: "globe"},
{ title: "Korean Naju Pear Ice Blended Slush", description: "A refreshing twist on Korean café tradition. Sweet, fruity, and utterly craveable.", bentoComponent: "animated-bar-chart"},
{ title: "Earl Grey Matcha Tiramisu", description: "Elevated dessert meets café culture. Layers of matcha richness, tiramisu elegance, and earl grey sophistication.", bentoComponent: "line-chart"},
{ title: "Mango Matcha & Strawberry Croffle", description: "Crispy-on-the-outside, fluffy-inside croffle with vibrant mango matcha and strawberry toppings.", bentoComponent: "map"},
]}
textboxLayout="default"
animationType="slide-up"
@@ -137,4 +133,4 @@ export default function HomePage() {
</div>
</ThemeProvider>
);
}
}