Merge version_2 into main #4

Merged
bender merged 2 commits from version_2 into main 2026-03-05 04:50:54 +00:00
2 changed files with 14 additions and 40 deletions

View File

@@ -1,56 +1,25 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Source_Sans_3 } from "next/font/google";
import "./styles/variables.css";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const sourceSans3 = Source_Sans_3({
variable: "--font-source-sans-3", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Craft Coffee SF | Specialty Coffee in San Francisco", description: "Locally roasted, ethically sourced specialty coffee in San Francisco. Order ahead or visit our cafe for the best third space in the Mission.", keywords: "specialty coffee San Francisco, locally roasted coffee, artisanal espresso, fair trade coffee, coffee shop Mission District", metadataBase: new URL("https://craftcoffeesf.local"),
openGraph: {
title: "Craft Coffee SF - San Francisco's Community Coffee Shop", description: "Locally roasted, expertly brewed coffee made for real conversations. Stop by or order ahead.", type: "website", siteName: "Craft Coffee SF", images: [
{
url: "http://img.b2bpic.net/free-photo/close-up-barista-hands-preparing-coffee-customer-coffee-shop_93675-135317.jpg", alt: "Craft Coffee SF counter with specialty espresso drinks"
}
]
},
twitter: {
card: "summary_large_image", title: "Craft Coffee SF - Local Coffee Community", description: "Locally roasted, expertly brewed, made for real conversations.", images: ["http://img.b2bpic.net/free-photo/selective-closeup-shot-coffee-with-latte-art-black-ceramic-cup-wooden-surface_181624-3880.jpg"]
},
robots: {
index: true,
follow: true
}
};
title: "Craft Coffee", description: "Locally roasted, expertly brewed craft coffee in San Francisco"};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${sourceSans3.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.variable}>
{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1418,7 +1387,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

View File

@@ -63,6 +63,7 @@ export default function LandingPage() {
mediaAnimation="slide-up"
rating={5}
ratingText="Rated by Real Coffee Lovers"
buttonClassName="px-8 py-4 text-lg"
/>
</div>
@@ -77,6 +78,7 @@ export default function LandingPage() {
buttons={[{ text: "Learn More", href: "#features" }]}
buttonAnimation="slide-up"
useInvertedBackground={false}
buttonClassName="px-8 py-4 text-lg"
/>
</div>
@@ -104,6 +106,7 @@ export default function LandingPage() {
useInvertedBackground={false}
buttons={[{ text: "Explore Menu", href: "#products" }]}
buttonAnimation="slide-up"
buttonClassName="px-8 py-4 text-lg"
/>
</div>
@@ -131,6 +134,7 @@ export default function LandingPage() {
useInvertedBackground={false}
buttons={[{ text: "Order Online", href: "#contact" }]}
buttonAnimation="slide-up"
buttonClassName="px-8 py-4 text-lg"
/>
</div>
@@ -173,6 +177,7 @@ export default function LandingPage() {
useInvertedBackground={false}
buttons={[{ text: "Join Our Community", href: "#contact" }]}
buttonAnimation="slide-up"
buttonClassName="px-8 py-4 text-lg"
/>
</div>
@@ -186,6 +191,7 @@ export default function LandingPage() {
]}
background={{ variant: "plain" }}
useInvertedBackground={false}
buttonClassName="px-8 py-4 text-lg"
/>
</div>