bender/b1f8a916-ac42-4a36-bc7d-492b63578d7e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_8 into main #10

Merged
bender merged 6 commits from version_8 into main 2026-02-24 12:32:15 +00:00
Conversation 0 Commits 6 Files Changed 6 +29 -51
6 changed files with 29 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/blog/page.tsx
View File

@@ -91,4 +91,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

42
src/app/layout.tsx
View File

@@ -1,45 +1,24 @@
import type { Metadata } from "next";
import { Roboto } from "next/font/google";
import { Inter } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import "./styles/variables.css";
import "./styles/base.css";
const roboto = Roboto({
variable: "--font-roboto", subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
export const metadata: Metadata = {
title: "Brew & Co - Premium Specialty Coffee & Community", description: "Discover exceptional single-origin coffee, expert baristas, and a welcoming community space. Visit Brew & Co for the perfect cup.", keywords: "specialty coffee, espresso, cafe, barista, premium coffee, coffee shop, single origin", openGraph: {
title: "Brew & Co - Premium Specialty Coffee", description: "Experience exceptional coffee and community connection", siteName: "Brew & Co", type: "website", images: [
{
url: "https://img.b2bpic.net/free-photo/caffeine-romantic-milk-wood-aroma_1232-4541.jpg", alt: "Brew & Co Premium Coffee"
}
]
},
twitter: {
card: "summary_large_image", title: "Brew & Co - Premium Specialty Coffee", description: "Exceptional coffee crafted by passionate baristas", images: ["https://img.b2bpic.net/free-photo/cooking-coffee-with-automatic-coffeemachine_1220-5264.jpg"]
},
robots: {
index: true,
follow: true
}
};
title: "Brew & Co - Premium Specialty Coffee", description: "Experience premium specialty coffee in an inviting space designed for authentic connections and exceptional taste."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={roboto.variable}
>
<Tag />
{children}
<html lang="en">
<body className={inter.variable}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1407,7 +1386,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

4
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -274,4 +274,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

2
src/app/shop/[id]/page.tsx
View File

@@ -252,4 +252,4 @@ function ProductPageContent({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

2
src/app/shop/page.tsx
View File

@@ -125,4 +125,4 @@ export default function ShopPage() {
<ShopPageContent />
</Suspense>
);
}
}

28
src/app/styles/variables.css
View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #e8d4c4;;
--card: #f5e6d9;;
--foreground: #3d2817;;
--primary-cta: #8b4513;;
--secondary-cta: #f5e6d9;;
--accent: #d4a373;;
--background-accent: #b8925f;; */
/* --background: #f5faff;;
--card: #f1f8ff;;
--foreground: #001122;;
--primary-cta: #159c49;;
--secondary-cta: #ffffff;;
--accent: #a8e8ba;;
--background-accent: #6bbf8e;; */
--background: #e8d4c4;;
--card: #f5e6d9;;
--foreground: #3d2817;;
--primary-cta: #8b4513;;
--background: #f5faff;;
--card: #f1f8ff;;
--foreground: #001122;;
--primary-cta: #159c49;;
--primary-cta-text: #ffffff;;
--secondary-cta: #f5e6d9;;
--secondary-cta: #ffffff;;
--secondary-cta-text: #3d2817;;
--accent: #d4a373;;
--background-accent: #b8925f;;
--accent: #a8e8ba;;
--background-accent: #6bbf8e;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);