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

Compare commits

merge into: bender:version_7
Branches Tags
bender:main bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:main
Branches Tags
bender:main bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

8 Commits
version_7 ... main

Author SHA1 Message Date
bender
381220b1e7 Merge version_8 into main 
Merge version_8 into main
 2026-02-24 12:32:15 +00:00
bender
dc40d06eaf Update src/app/styles/variables.css 2026-02-24 12:32:10 +00:00
bender
17720354d0 Update src/app/shop/page.tsx 2026-02-24 12:32:10 +00:00
bender
b0e010f1b6 Update src/app/shop/[id]/page.tsx 2026-02-24 12:32:09 +00:00
bender
e20c964ec9 Update src/app/page.tsx 2026-02-24 12:32:08 +00:00
bender
c125065886 Update src/app/layout.tsx 2026-02-24 12:32:07 +00:00
bender
01c55509d7 Update src/app/blog/page.tsx 2026-02-24 12:32:06 +00:00
bender
6b02aa6bc1 Merge version_7 into main 
Merge version_7 into main
 2026-02-24 11:57:07 +00:00
6 changed files with 29 additions and 51 deletions
Expand all files Collapse all files

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

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

42
src/app/layout.tsx
View File

@@ -1,45 +1,24 @@
import type { Metadata } from "next"; import type { Metadata } from "next";
import { Roboto } from "next/font/google"; import { Inter } from "next/font/google";
import "./globals.css"; import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import "./styles/variables.css";
import Tag from "@/tag/Tag"; import "./styles/base.css";
const roboto = Roboto({ const inter = Inter({
variable: "--font-roboto", subsets: ["latin"], variable: "--font-inter", subsets: ["latin"],
weight: ["100", "300", "400", "500", "700", "900"],
}); });
export const metadata: Metadata = { 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 premium specialty coffee in an inviting space designed for authentic connections and exceptional taste."};
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
}
};
export default function RootLayout({ export default function RootLayout({
children, children,
}: Readonly<{ }: {
children: React.ReactNode; children: React.ReactNode;
}>) { }) {
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en">
<ServiceWrapper> <body className={inter.variable}>{children}
<body
className={roboto.variable}
>
<Tag />
{children}
<script <script
dangerouslySetInnerHTML={{ dangerouslySetInnerHTML={{
__html: ` __html: `
@@ -1407,7 +1386,6 @@ export default function RootLayout({
}} }}
/> />
</body> </body>
</ServiceWrapper>
</html> </html>
); );
} }

4
src/app/page.tsx
View File

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

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

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

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

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

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

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