Merge version_8 into main

Update src/app/styles/variables.css
2026-02-24 12:32:15 +00:00 · 2026-02-24 12:32:10 +00:00 · 2026-02-24 12:32:10 +00:00 · 2026-02-24 12:32:09 +00:00 · 2026-02-24 12:32:08 +00:00 · 2026-02-24 12:32:07 +00:00
6 changed files with 43 additions and 65 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -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 "./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 = {
-  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({
  children,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
-    <html lang="en" suppressHydrationWarning>
+    <html lang="en">
-      <ServiceWrapper>
+      <body className={inter.variable}>{children}
        <body
          className={roboto.variable}
        >
          <Tag />
          {children}
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -1407,7 +1386,6 @@ export default function RootLayout({
          }}
        />
      </body>
      </ServiceWrapper>
    </html>
  );
 }
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,4 +1,4 @@
-"use client"
+"use client";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
@@ -45,7 +45,7 @@ export default function LandingPage() {
      <div id="hero" data-section="hero">
        <HeroBillboardGallery
-          title="Crafted Coffee, Community Connection"
+          title="dskfjsdlkjf"
          description="Experience premium specialty coffee in an inviting space designed for authentic connections and exceptional taste."
          tag="Welcome to Brew & Co"
          tagIcon={Coffee}
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -88,7 +88,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                headingFontWeight="normal"
            >
                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
+                    <div id="nav" data-section="nav">
                    <NavbarLayoutFloatingOverlay
                        brandName="Brew & Co"
                        navItems={[
@@ -98,7 +98,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                            {"name":"Testimonials","id":"testimonials"},
                            {"name":"Contact","id":"contact"}
                        ]}
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                        button={{ text: "Reserve Now", href: "#contact" }}
                    />
                    </div>
                    <main className="min-h-screen flex items-center justify-center pt-20">
@@ -135,7 +135,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                headingFontWeight="normal"
            >
                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
+                    <div id="nav" data-section="nav">
                        <NavbarLayoutFloatingOverlay
                            brandName="Brew & Co"
                            navItems={[
@@ -145,7 +145,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                                {"name":"Testimonials","id":"testimonials"},
                                {"name":"Contact","id":"contact"}
                            ]}
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                            button={{ text: "Reserve Now", href: "#contact" }}
                        />
                    </div>
                    <main className="min-h-screen flex items-center justify-center pt-20">
@@ -189,7 +189,7 @@ function ProductPageContent({ params }: ProductPageProps) {
            headingFontWeight="normal"
        >
            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                <NavbarLayoutFloatingOverlay
                    brandName="Brew & Co"
                    navItems={[
@@ -199,7 +199,7 @@ function ProductPageContent({ params }: ProductPageProps) {
                        {"name":"Testimonials","id":"testimonials"},
                        {"name":"Contact","id":"contact"}
                    ]}
-                    button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                    button={{ text: "Reserve Now", href: "#contact" }}
                />
                </div>
                <div id="productDetailCard" data-section="productDetailCard">
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -33,7 +33,7 @@ function ShopPageContent() {
                headingFontWeight="normal"
            >
                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
+                    <div id="nav" data-section="nav">
                    <NavbarLayoutFloatingOverlay
                        brandName="Brew & Co"
                        navItems={[
@@ -43,7 +43,7 @@ function ShopPageContent() {
                            {"name":"Testimonials","id":"testimonials"},
                            {"name":"Contact","id":"contact"}
                        ]}
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                        button={{ text: "Reserve Now", href: "#contact" }}
                    />
                    </div>
                    <main className="min-h-screen flex items-center justify-center pt-20">
@@ -79,7 +79,7 @@ function ShopPageContent() {
            headingFontWeight="normal"
        >
            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                <NavbarLayoutFloatingOverlay
                    brandName="Brew & Co"
                    navItems={[
@@ -89,7 +89,7 @@ function ShopPageContent() {
                        {"name":"Testimonials","id":"testimonials"},
                        {"name":"Contact","id":"contact"}
                    ]}
-                    button={{ text: "Cart", onClick: () => setCartOpen(true) }}
+                    button={{ text: "Reserve Now", href: "#contact" }}
                />
                </div>
                <div id="productCatalog" data-section="productCatalog">
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -2,23 +2,23 @@
  /* Base units */
  /* --vw is set by ThemeProvider */
-  /* --background: #000802;;
+  /* --background: #f5faff;;
-  --card: #0b1a0b;;
+  --card: #f1f8ff;;
-  --foreground: #e6ffe6;;
+  --foreground: #001122;;
-  --primary-cta: #80da9b;;
+  --primary-cta: #159c49;;
-  --secondary-cta: #07170b;;
+  --secondary-cta: #ffffff;;
-  --accent: #38714a;;
+  --accent: #a8e8ba;;
-  --background-accent: #2c6541;; */
+  --background-accent: #6bbf8e;; */
-  --background: #000802;;
+  --background: #f5faff;;
-  --card: #0b1a0b;;
+  --card: #f1f8ff;;
-  --foreground: #e6ffe6;;
+  --foreground: #001122;;
-  --primary-cta: #80da9b;;
+  --primary-cta: #159c49;;
-  --primary-cta-text: #f7f6f7;;
+  --primary-cta-text: #ffffff;;
-  --secondary-cta: #07170b;;
+  --secondary-cta: #ffffff;;
-  --secondary-cta-text: #0c1325;;
+  --secondary-cta-text: #3d2817;;
-  --accent: #38714a;;
+  --accent: #a8e8ba;;
-  --background-accent: #2c6541;;
+  --background-accent: #6bbf8e;;
  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
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
bender	0443aa41c6	Update src/app/shop/page.tsx	2026-02-24 11:57:03 +00:00
bender	3768276359	Update src/app/shop/[id]/page.tsx	2026-02-24 11:57:02 +00:00
bender	52f8ae3813	Update src/app/page.tsx	2026-02-24 11:57:01 +00:00
bender	3d6785f573	Update src/app/blog/page.tsx	2026-02-24 11:56:59 +00:00
bender	51aebaa699	Merge version_6 into main Merge version_6 into main	2026-02-24 11:53:14 +00:00
bender	b25680bbf8	Update src/app/styles/variables.css	2026-02-24 11:53:10 +00:00
bender	443f5828bf	Update src/app/shop/page.tsx	2026-02-24 11:53:09 +00:00
bender	bfda844f35	Update src/app/shop/[id]/page.tsx	2026-02-24 11:53:08 +00:00
bender	bdbc6203ac	Update src/app/page.tsx	2026-02-24 11:53:08 +00:00
bender	0a1a9f700e	Update src/app/layout.tsx	2026-02-24 11:53:07 +00:00
bender	9433e9f20e	Update src/app/blog/page.tsx	2026-02-24 11:53:05 +00:00
bender	bb42a8abda	Merge version_5 into main Merge version_5 into main	2026-02-24 11:50:39 +00:00
bender	0683f11482	Update src/app/styles/variables.css	2026-02-24 11:50:34 +00:00
bender	7876cdadac	Update src/app/shop/page.tsx	2026-02-24 11:50:34 +00:00
bender	389c4060f6	Update src/app/shop/[id]/page.tsx	2026-02-24 11:50:33 +00:00
bender	a2efa131ef	Update src/app/page.tsx	2026-02-24 11:50:32 +00:00
bender	fc0c22fed5	Update src/app/layout.tsx	2026-02-24 11:50:31 +00:00
bender	ef34e041e7	Update src/app/blog/page.tsx	2026-02-24 11:50:30 +00:00
bender	d0b389a608	Merge version_4 into main Merge version_4 into main	2026-02-24 11:47:19 +00:00
bender	39fae5c28d	Update src/app/styles/variables.css	2026-02-24 11:47:15 +00:00
bender	7f6b4e2295	Update src/app/shop/page.tsx	2026-02-24 11:47:14 +00:00
bender	47f260b4c2	Update src/app/shop/[id]/page.tsx	2026-02-24 11:47:13 +00:00
bender	e7de8f5228	Update src/app/page.tsx	2026-02-24 11:47:12 +00:00
bender	f1f467346d	Update src/app/layout.tsx	2026-02-24 11:47:12 +00:00
bender	d85d2e39d5	Update src/app/blog/page.tsx	2026-02-24 11:47:11 +00:00
bender	56000785d9	Merge version_3 into main Merge version_3 into main	2026-02-24 11:30:59 +00:00
bender	d87ca2b631	Update src/app/page.tsx	2026-02-24 11:30:54 +00:00
bender	f88a5bf093	Merge version_2 into main Merge version_2 into main	2026-02-24 11:18:12 +00:00