Merge version_3 into main

Update src/app/styles/variables.css
2026-03-05 02:16:11 +00:00 · 2026-03-05 02:16:08 +00:00 · 2026-03-05 02:16:07 +00:00 · 2026-03-05 02:16:07 +00:00 · 2026-03-05 02:16:06 +00:00 · 2026-03-05 02:06:22 +00:00
4 changed files with 67 additions and 97 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,67 +1,27 @@
 import type { Metadata } from "next";
-import { Public_Sans } from "next/font/google";
-import { Inter } from "next/font/google";
 import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";
+import { DM_Sans } from "next/font/google";
+import { Inter } from "next/font/google";

-const publicSans = Public_Sans({
-  variable: "--font-public-sans",
-  subsets: ["latin"],
+const dmSans = DM_Sans({
+  variable: "--font-dm-sans",  subsets: ["latin"],
 });

 const inter = Inter({
-  variable: "--font-inter",
-  subsets: ["latin"],
+  variable: "--font-inter",  subsets: ["latin"],
 });

 export const metadata: Metadata = {
-  title: "Aesthetic Cafe | Where Every Sip Becomes a Moment",
-  description: "Experience the ultimate Instagram-worthy cafe. Handcrafted specialty drinks, artisan pastries, and beautifully designed spaces perfect for remote work or celebrations.",
-  keywords: "aesthetic cafe, specialty coffee, artisan pastries, Instagram cafe, remote work space, cafe reservations, coffee culture, instagrammable spaces",
-  metadataBase: new URL("https://aestheticcafe.com"),
-  alternates: {
-    canonical: "https://aestheticcafe.com",
-  },
-  openGraph: {
-    title: "Aesthetic Cafe | Where Every Sip Becomes a Moment",
-    description: "Discover our carefully curated aesthetic cafe with handcrafted drinks, Instagramperfect spaces, and unforgettable vibes.",
-    url: "https://aestheticcafe.com",
-    siteName: "Aesthetic Cafe",
-    type: "website",
-    images: [
-      {
-        url: "http://img.b2bpic.net/free-photo/confident-young-indian-man-black-shirt-standing-cafe_627829-5462.jpg",
-        alt: "Aesthetic Cafe interior with warm lighting",
-      },
-    ],
-  },
-  twitter: {
-    card: "summary_large_image",
-    title: "Aesthetic Cafe | Where Every Sip Becomes a Moment",
-    description: "Experience handcrafted coffee and artisan pastries in our beautifully designed aesthetic spaces.",
-    images: ["http://img.b2bpic.net/free-photo/confident-young-indian-man-black-shirt-standing-cafe_627829-5462.jpg"],
-  },
-  robots: {
-    index: true,
-    follow: true,
-  },
-};
+  title: "Aesthetic Cafe",  description: "Where Every Sip Becomes a Moment"};

 export default function RootLayout({
  children,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${publicSans.variable} ${inter.variable} antialiased`}
-        >
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body className={`${dmSans.variable} ${inter.variable}`}>{children}
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -1429,7 +1389,6 @@ export default function RootLayout({
          }}
        />
      </body>
-      </ServiceWrapper>
    </html>
  );
-}
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,7 +2,7 @@

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarStyleCentered";
-import HeroBillboardScroll from "@/components/sections/hero/HeroBillboardScroll";
+import HeroBillboardGallery from "@/components/sections/hero/HeroBillboardGallery";
 import TestimonialAboutCard from "@/components/sections/about/TestimonialAboutCard";
 import ProductCardFour from "@/components/sections/product/ProductCardFour";
 import TestimonialCardOne from "@/components/sections/testimonial/TestimonialCardOne";
@@ -14,23 +14,23 @@ import { Coffee, Leaf, Heart, Utensils, Star, Camera, Users, MapPin } from "luci
 export default function HomePage() {
  return (
    <ThemeProvider
-      defaultButtonVariant="icon-arrow"
-      defaultTextAnimation="background-highlight"
-      borderRadius="pill"
-      contentWidth="small"
-      sizing="large"
-      background="circleGradient"
-      cardStyle="subtle-shadow"
-      primaryButtonStyle="diagonal-gradient"
-      secondaryButtonStyle="radial-glow"
+      defaultButtonVariant="directional-hover"
+      defaultTextAnimation="reveal-blur"
+      borderRadius="rounded"
+      contentWidth="medium"
+      sizing="mediumLargeSizeLargeTitles"
+      background="aurora"
+      cardStyle="glass-depth"
+      primaryButtonStyle="radial-glow"
+      secondaryButtonStyle="glass"
      headingFontWeight="bold"
    >
      <div id="nav" data-section="nav">
        <NavbarStyleCentered
          navItems={[
            { name: "Home", id: "/" },
-            { name: "Menu", id: "/menu" },
-            { name: "Gallery", id: "/gallery" },
+            { name: "Menu", id: "#menu" },
+            { name: "Gallery", id: "#gallery" },
            { name: "Locations", id: "/locations" },
            { name: "Events", id: "/events" },
          ]}
@@ -40,20 +40,31 @@ export default function HomePage() {
      </div>

      <div id="hero" data-section="hero">
-        <HeroBillboardScroll
+        <HeroBillboardGallery
          title="Where Every Sip Becomes a Moment"
-          description="Immerse yourself in our carefully curated aesthetic cafe. Handcrafted drinks, Instagramperfect spaces, and unforgettable vibes await."
+          description="Immerse yourself in our carefully curated aesthetic cafe. Handcrafted drinks, Instagram-perfect spaces, and unforgettable vibes await."
          tag="Welcome to Aesthetic Cafe"
          tagIcon={Coffee}
          tagAnimation="blur-reveal"
-          background={{ variant: "plain" }}
-          imageSrc="http://img.b2bpic.net/free-photo/confident-young-indian-man-black-shirt-standing-cafe_627829-5462.jpg"
-          imageAlt="Aesthetic cafe interior with warm lighting and cozy seating"
+          background={{ variant: "sparkles-gradient" }}
+          mediaItems={[
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/confident-young-indian-man-black-shirt-standing-cafe_627829-5462.jpg",              imageAlt: "Aesthetic cafe interior with warm lighting and cozy seating"},
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/vertical-shot-male-pouring-milk-into-glass-coffee_181624-1769.jpg?_wi=1",              imageAlt: "Coffee preparation and cafe ambiance"},
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/cozy-cafe_1098-13854.jpg?_wi=1",              imageAlt: "Cozy cafe interior seating"},
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/ceramic-cups-coffee-machine_23-2147830564.jpg?_wi=1",              imageAlt: "Coffee counter and espresso machine"},
+            {
+              imageSrc: "http://img.b2bpic.net/free-photo/coffee-with-heart-pattern-wooden-background_1232-2090.jpg?_wi=1",              imageAlt: "Latte art with heart pattern"},
+          ]}
          buttons={[
-            { text: "Explore Our World", href: "/menu" },
-            { text: "Book a Table", href: "/contact" },
+            { text: "Explore Our World", href: "#menu" },
+            { text: "Book a Table", href: "#cta-section" },
          ]}
          buttonAnimation="slide-up"
+          mediaAnimation="slide-up"
        />
      </div>

@@ -66,7 +77,7 @@ export default function HomePage() {
          description="Founded by coffee enthusiasts"
          subdescription="Aesthetic Cafe - Est. 2021"
          icon={Heart}
-          imageSrc="http://img.b2bpic.net/free-photo/vertical-shot-male-pouring-milk-into-glass-coffee_181624-1769.jpg"
+          imageSrc="http://img.b2bpic.net/free-photo/vertical-shot-male-pouring-milk-into-glass-coffee_181624-1769.jpg?_wi=2"
          imageAlt="Coffee preparation and cafe ambiance"
          mediaAnimation="slide-up"
          useInvertedBackground={false}
@@ -81,8 +92,8 @@ export default function HomePage() {
          tagIcon={Utensils}
          tagAnimation="blur-reveal"
          textboxLayout="default"
-          gridVariant="uniform-all-items-equal"
-          animationType="slide-up"
+          gridVariant="bento-grid"
+          animationType="scale-rotate"
          useInvertedBackground={false}
          products={[
            {
@@ -117,7 +128,7 @@ export default function HomePage() {
          tagIcon={Star}
          tagAnimation="blur-reveal"
          textboxLayout="default"
-          animationType="slide-up"
+          animationType="blur-reveal"
          useInvertedBackground={false}
        />
      </div>
@@ -130,22 +141,22 @@ export default function HomePage() {
          tagIcon={Camera}
          tagAnimation="slide-up"
          textboxLayout="default"
-          gridVariant="uniform-all-items-equal"
-          animationType="slide-up"
+          gridVariant="bento-grid"
+          animationType="depth-3d"
          useInvertedBackground={false}
          testimonials={[
            {
              id: "1",              name: "Cozy Corner",              role: "Seating",              company: "Main Lounge",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/cozy-cafe_1098-13854.jpg",              imageAlt: "Cozy cafe interior seating"},
+              imageSrc: "http://img.b2bpic.net/free-photo/cozy-cafe_1098-13854.jpg?_wi=2",              imageAlt: "Cozy cafe interior seating"},
            {
              id: "2",              name: "Coffee Counter",              role: "Service",              company: "Main Bar",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/ceramic-cups-coffee-machine_23-2147830564.jpg",              imageAlt: "Coffee counter and espresso machine"},
+              imageSrc: "http://img.b2bpic.net/free-photo/ceramic-cups-coffee-machine_23-2147830564.jpg?_wi=2",              imageAlt: "Coffee counter and espresso machine"},
            {
              id: "3",              name: "Storefront",              role: "Entrance",              company: "Street Presence",              rating: 5,
              imageSrc: "http://img.b2bpic.net/free-photo/young-redhead-girl-drinks-coffee-sitting-near-coffee-shop-relaxing-after-riding-skateboard_613910-18845.jpg",              imageAlt: "Cafe storefront view"},
            {
              id: "4",              name: "Coffee Artistry",              role: "Detail",              company: "Craftsmanship",              rating: 5,
-              imageSrc: "http://img.b2bpic.net/free-photo/coffee-with-heart-pattern-wooden-background_1232-2090.jpg",              imageAlt: "Latte art with heart pattern"},
+              imageSrc: "http://img.b2bpic.net/free-photo/coffee-with-heart-pattern-wooden-background_1232-2090.jpg?_wi=2",              imageAlt: "Latte art with heart pattern"},
          ]}
        />
      </div>
@@ -159,7 +170,7 @@ export default function HomePage() {
          tagAnimation="slide-up"
          textboxLayout="default"
          gridVariant="uniform-all-items-equal"
-          animationType="slide-up"
+          animationType="scale-rotate"
          useInvertedBackground={false}
          testimonials={[
            {
@@ -186,11 +197,11 @@ export default function HomePage() {
          title="Reserve Your Perfect Moment"
          description="Book a table at our cafe and immerse yourself in an unforgettable aesthetic experience with world-class coffee and ambiance."
          buttons={[
-            { text: "Make a Reservation", href: "/contact" },
+            { text: "Make a Reservation", href: "#contact" },
            { text: "View Locations", href: "/locations" },
          ]}
          buttonAnimation="slide-up"
-          background={{ variant: "plain" }}
+          background={{ variant: "gradient-bars" }}
          useInvertedBackground={false}
        />
      </div>
@@ -202,16 +213,16 @@ export default function HomePage() {
            {
              title: "Explore",              items: [
                { label: "Home", href: "/" },
-                { label: "Menu", href: "/menu" },
-                { label: "Gallery", href: "/gallery" },
-                { label: "About", href: "/about" },
+                { label: "Menu", href: "#menu" },
+                { label: "Gallery", href: "#gallery" },
+                { label: "About", href: "#about" },
              ],
            },
            {
              title: "Connect",              items: [
                { label: "Locations", href: "/locations" },
                { label: "Events", href: "/events" },
-                { label: "Contact", href: "/contact" },
+                { label: "Contact", href: "#cta-section" },
                { label: "Blog", href: "/blog" },
              ],
            },
@@ -236,4 +247,4 @@ export default function HomePage() {
      </div>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-inter), sans-serif;
+  font-family: var(--font-dm-sans), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-public-sans), sans-serif;
+  font-family: var(--font-dm-sans), sans-serif;
 }
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #ffffff;
-  --card: #f9f9f9;
-  --foreground: #000f06e6;
-  --primary-cta: #0a7039;
+  --background: #010912;
+  --card: #152840;
+  --foreground: #e6f0ff;
+  --primary-cta: #cee7ff;
  --primary-cta-text: #ffffff;
-  --secondary-cta: #f9f9f9;
+  --secondary-cta: #0e1a29;
  --secondary-cta-text: #000f06e6;
-  --accent: #e2e2e2;
-  --background-accent: #c4c4c4;
+  --accent: #3f5c79;
+  --background-accent: #004a93;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	19d62c7d1e	Merge version_3 into main Merge version_3 into main	2026-03-05 02:16:11 +00:00
bender	493c1da29e	Update src/app/styles/variables.css	2026-03-05 02:16:08 +00:00
bender	4f8d53eaf8	Update src/app/styles/base.css	2026-03-05 02:16:07 +00:00
bender	9ac9bbbfc9	Update src/app/page.tsx	2026-03-05 02:16:07 +00:00
bender	cd1580462c	Update src/app/layout.tsx	2026-03-05 02:16:06 +00:00
bender	595376ad5e	Merge version_2 into main Merge version_2 into main	2026-03-05 02:06:22 +00:00
bender	b9e2653c2b	Update src/app/page.tsx	2026-03-05 02:06:12 +00:00
bender	6569dbc239	Merge version_2 into main Merge version_2 into main	2026-03-05 02:05:36 +00:00
bender	2709cb2aed	Update src/app/page.tsx	2026-03-05 02:05:32 +00:00
bender	c0d7ecb561	Update src/app/layout.tsx	2026-03-05 02:05:32 +00:00
bender	0b7d79d960	Merge version_1 into main Merge version_1 into main	2026-03-05 02:00:02 +00:00
bender	6439a1d79d	Merge version_1 into main Merge version_1 into main	2026-03-05 01:58:51 +00:00
bender	bf91960058	Merge version_1 into main Merge version_1 into main	2026-03-05 01:57:37 +00:00
bender	e4acf6a046	Merge version_1 into main Merge version_1 into main	2026-03-05 01:56:29 +00:00