Merge version_9 into main

Update src/app/page.tsx
2026-04-20 18:03:41 +00:00 · 2026-04-20 18:03:38 +00:00 · 2026-04-20 17:47:05 +00:00 · 2026-04-20 17:47:02 +00:00 · 2026-04-20 17:44:38 +00:00 · 2026-04-20 17:44:35 +00:00
4 changed files with 69 additions and 127 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,6 +7,8 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Figtree } from "next/font/google";
+import { Inter_Tight } from "next/font/google";
+import { Open_Sans } from "next/font/google";



@@ -21,8 +23,15 @@ export const metadata: Metadata = {
  },
 };

-const figtree = Figtree({
-  variable: "--font-figtree",
+
+
+
+const inter = Inter({
+  variable: "--font-inter",
+  subsets: ["latin"],
+});
+const openSans = Open_Sans({
+  variable: "--font-open-sans",
  subsets: ["latin"],
 });

@@ -34,7 +43,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${figtree.variable} antialiased`}>
+        <body className={`${inter.variable} ${openSans.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -11,7 +11,7 @@ import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaA
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
 import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCardFive';
-import { Heart, Sparkles } from "lucide-react";
+import { Wine, PartyPopper, Heart, Sparkles } from "lucide-react";

 export default function LandingPage() {
  return (
@@ -31,16 +31,13 @@ export default function LandingPage() {
  <div id="nav" data-section="nav">
      <NavbarStyleApple
      navItems={[
-        {
-          name: "Home",          id: "hero"},
-        {
-          name: "About",          id: "about"},
-        {
-          name: "Moments",          id: "gallery"},
-        {
-          name: "Contact",          id: "contact"},
+        { name: "Home", id: "hero" },
+        { name: "About", id: "about" },
+        { name: "Moments", id: "gallery" },
+        { name: "Cheers", id: "proof" },
+        { name: "Contact", id: "contact" },
      ]}
-      brandName="Birthday Joy"
+      brandName="Cheers to You"
    />
  </div>

@@ -48,37 +45,16 @@ export default function LandingPage() {
      <HeroSplit
      background={{
        variant: "sparkles-gradient"}}
-      title="Celebrating Another Beautiful Year"
-      description="Cheers to memories made, adventures taken, and the bright future ahead. Happy Birthday!"
+      title="Cheers to Another Fantastic Year"
+      description="Let's raise a glass to the memories we've made and the joy still to come!"
      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg?_wi=1"
-      imageAlt="Birthday celebration photo"
+      imageAlt="Celebration toast"
      mediaAnimation="slide-up"
-      avatars={[
-        {
-          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg",          alt: "Friend"},
-        {
-          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-nr8ale91.jpg",          alt: "Friend"},
-        {
-          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-cmb05aad.jpg",          alt: "Friend"},
-        {
-          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg",          alt: "Friend"},
-        {
-          src: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg",          alt: "Friend"},
-      ]}
-      avatarText="Joined by 50+ friends"
      marqueeItems={[
-        {
-          type: "text",          text: "Birthday Joy"},
-        {
-          type: "text-icon",          text: "Celebration",          icon: Sparkles,
-        },
-        {
-          type: "text",          text: "Another Year Wiser"},
-        {
-          type: "text-icon",          text: "Happiness",          icon: Heart,
-        },
-        {
-          type: "text",          text: "New Adventures"},
+        { type: "text-icon", text: "Cheers!", icon: Wine },
+        { type: "text-icon", text: "Party Time", icon: PartyPopper },
+        { type: "text-icon", text: "Joyful Memories", icon: Heart },
+        { type: "text-icon", text: "Celebrating You", icon: Sparkles },
      ]}
    />
  </div>
@@ -86,19 +62,15 @@ export default function LandingPage() {
  <div id="about" data-section="about">
      <MetricSplitMediaAbout
      useInvertedBackground={true}
-      title="Reflecting on the Journey"
-      description="Life is a collection of moments. From cityscape views to peaceful dinners, each photo tells a story of gratitude and love."
+      title="Celebrating Milestones"
+      description="Every year brings new reasons to toast. From big wins to quiet moments, we celebrate every step of the journey together."
      metrics={[
-        {
-          value: "365",          title: "Days of Growth"},
-        {
-          value: "∞",          title: "Memories Created"},
-        {
-          value: "1",          title: "New Beginning"},
+        { value: "365", title: "Days of Joy" },
+        { value: "100+", title: "Toasts Made" },
+        { value: "∞", title: "Happy Memories" },
      ]}
      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-nr8ale91.jpg?_wi=1"
      mediaAnimation="blur-reveal"
-      metricsAnimation="slide-up"
    />
  </div>

@@ -108,21 +80,12 @@ export default function LandingPage() {
      textboxLayout="default"
      useInvertedBackground={false}
      features={[
-        {
-          id: "m1",          title: "City Nights",          tags: [
-            "Dubai",            "Celebration"],
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg?_wi=2"},
-        {
-          id: "m2",          title: "Skyline Dreams",          tags: [
-            "Dubai",            "Views"],
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-nr8ale91.jpg?_wi=2"},
-        {
-          id: "m3",          title: "Peaceful Moments",          tags: [
-            "Dining",            "Love"],
-          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-cmb05aad.jpg?_wi=1"},
+        { id: "m1", title: "Evening Toasts", tags: ["Nightlife", "Cheers"], imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg?_wi=2" },
+        { id: "m2", title: "Festive Gatherings", tags: ["Friends", "Celebration"], imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-nr8ale91.jpg?_wi=2" },
+        { id: "m3", title: "Special Moments", tags: ["Milestones", "Love"], imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-cmb05aad.jpg?_wi=1" },
      ]}
-      title="Life Highlights"
-      description="A glimpse into the special moments that defined this year."
+      title="Gallery of Joy"
+      description="Capturing the cheers and smiles that define our favorite moments."
    />
  </div>

@@ -132,87 +95,57 @@ export default function LandingPage() {
      textboxLayout="split"
      useInvertedBackground={true}
      metrics={[
-        {
-          id: "c1",          value: "100%",          title: "Love",          description: "Surrounded by support and care.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg?_wi=3"},
-        {
-          id: "c2",          value: "365",          title: "Days",          description: "Lived fully and intentionally.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-nr8ale91.jpg?_wi=3"},
-        {
-          id: "c3",          value: "∞",          title: "Happiness",          description: "Wishing for limitless joy.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-cmb05aad.jpg?_wi=2"},
+        { id: "c1", value: "100%", title: "Laughter", description: "Guaranteed at every celebration.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776707048339-yqozlp5o.jpg" },
+        { id: "c2", value: "50+", title: "Toasts", description: "Shared with the best people.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-nr8ale91.jpg?_wi=3" },
+        { id: "c3", value: "∞", title: "Smiles", description: "Creating limitless memories.", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776707063441-22pfgn9j.jpg" },
      ]}
-      title="Counting Blessings"
-      description="Celebrating the milestones, big and small."
+      title="Counting Cheers"
+      description="Quantifying the joy and gratitude we feel today."
    />
  </div>

  <div id="proof" data-section="proof">
      <SocialProofOne
+      names={["Cheers", "Celebration", "Joy", "Toast", "Friends", "Growth", "Happy Days"]}
      textboxLayout="default"
      useInvertedBackground={false}
-      names={[
-        "Happiness",        "Love",        "Gratitude",        "New Beginnings",        "Celebration",        "Friendship",        "Family"]}
-      title="Filled With Love"
-      description="Grateful for all the support and kind wishes."
+      title="Words of Celebration"
+      description="Everything we stand for and toast to every single day."
    />
  </div>

  <div id="testimonials" data-section="testimonials">
      <TestimonialCardFive
-      textboxLayout="default"
-      useInvertedBackground={true}
      testimonials={[
-        {
-          id: "t1",          name: "Elena",          date: "Jan 2025",          title: "Best Friend",          quote: "You make every day brighter!",          tag: "Friend",          avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-nr8ale91.jpg?_wi=4",          imageAlt: "User provided image"},
-        {
-          id: "t2",          name: "Sam",          date: "Dec 2024",          title: "Partner",          quote: "Here's to the next adventure.",          tag: "Love",          avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-cmb05aad.jpg",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg?_wi=4",          imageAlt: "User provided image"},
-        {
-          id: "t3",          name: "Sarah",          date: "Nov 2024",          title: "Sister",          quote: "So proud of everything you do.",          tag: "Family",          avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-cmb05aad.jpg",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg?_wi=5",          imageAlt: "User provided image"},
-        {
-          id: "t4",          name: "Mike",          date: "Oct 2024",          title: "Friend",          quote: "Always cheering for you!",          tag: "Support",          avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg?_wi=6",          imageAlt: "User provided image"},
-        {
-          id: "t5",          name: "Chloe",          date: "Sept 2024",          title: "Colleague",          quote: "Wishing you the happiest birthday!",          tag: "Work",          avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-nr8ale91.jpg",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg?_wi=7",          imageAlt: "User provided image"},
+        { id: "t1", name: "ALISA", date: "Oct 2025", title: "Best Friend", quote: "Cheers to your incredible spirit!", tag: "Celebrate", avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-kfb160jg.jpg", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776707218095-c93sutze.jpg" },
+        { id: "t2", name: "Sam", date: "Dec 2024", title: "Husband ", quote: "Always raising a glass to you.", tag: "Love", avatarSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776696815119-cmb05aad.jpg", imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3CctceCfl7FBtuehov1NPPJzNyX/uploaded-1776708214181-r3tnmqjt.jpg" },
      ]}
-      title="Messages of Love"
-      description="Kind words from those who made this year so special."
+      textboxLayout="default"
+      useInvertedBackground={false}
+      title="Cheers from Friends"
+      description="Lovely messages from those who make the celebrations worth it."
    />
  </div>

  <div id="contact" data-section="contact">
      <ContactCTA
      useInvertedBackground={false}
-      background={{
-        variant: "radial-gradient"}}
-      tag="Keep in Touch"
-      title="Send a Birthday Wish"
-      description="I'd love to hear from you. Leave a message to brighten my birthday!"
-      buttons={[
-        {
-          text: "Share Your Birthday Wishes",          href: "#"},
-      ]}
+      background={{ variant: "radial-gradient" }}
+      tag="Get In Touch"
+      title="Send a Cheers Wish"
+      description="I'd love to read your messages! Send a toast my way today."
+      buttons={[{ text: "Send Your Wishes" }]}
    />
  </div>

  <div id="footer" data-section="footer">
      <FooterBase
      columns={[
-        {
-          title: "Links",          items: [
-            {
-              label: "Top",              href: "#hero"},
-            {
-              label: "Gallery",              href: "#gallery"},
-          ],
-        },
-        {
-          title: "Social",          items: [
-            {
-              label: "Instagram",              href: "#"},
-            {
-              label: "Twitter",              href: "#"},
-          ],
-        },
+        { title: "Links", items: [{ label: "Top", href: "#hero" }, { label: "Gallery", href: "#gallery" }] },
+        { title: "Cheers", items: [{ label: "Wishes", href: "#contact" }, { label: "Moments", href: "#gallery" }] },
      ]}
      logoText="Birthday Joy"
-      copyrightText="© 2025 | Birthday Celebration"
+      copyrightText="© 2025 | Cheers to You"
    />
  </div>
      </ReactLenis>
--- 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-figtree), sans-serif;
+  font-family: var(--font-open-sans), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-figtree), sans-serif;
+  font-family: var(--font-inter), sans-serif;
 }
--- a/src/app/styles/variables.css
+++ b/src/app/styles/variables.css
@@ -10,15 +10,15 @@
  --accent: #ffffff;
  --background-accent: #ffffff; */

-  --background: #fbf8f7;
-  --card: #ffffff;
-  --foreground: #2d2624;
-  --primary-cta: #c68a62;
-  --primary-cta-text: #ffffff;
-  --secondary-cta: #fbf8f7;
-  --secondary-cta-text: #2d2624;
-  --accent: #e3deea;
-  --background-accent: #efebe5;
+  --background: #efebe5;
+  --card: #f7f2ea;
+  --foreground: #000000;
+  --primary-cta: #000000;
+  --primary-cta-text: #efebe5;
+  --secondary-cta: #ffffff;
+  --secondary-cta-text: #000000;
+  --accent: #ffffff;
+  --background-accent: #e1b875;

  /* text sizing - set by ThemeProvider */
  /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
Author	SHA1	Message	Date
bender	d1d400213d	Merge version_9 into main Merge version_9 into main	2026-04-20 18:03:41 +00:00
bender	0bf83345be	Update src/app/page.tsx	2026-04-20 18:03:38 +00:00
bender	19aad093de	Merge version_9 into main Merge version_9 into main	2026-04-20 17:47:05 +00:00
bender	890b01eda0	Update src/app/page.tsx	2026-04-20 17:47:02 +00:00
bender	165668444e	Merge version_9 into main Merge version_9 into main	2026-04-20 17:44:38 +00:00
bender	54ae4cf662	Update src/app/page.tsx	2026-04-20 17:44:35 +00:00
bender	bfd8f89970	Merge version_9 into main Merge version_9 into main	2026-04-20 17:39:32 +00:00
bender	e472877ccc	Update theme colors	2026-04-20 17:39:29 +00:00
bender	81682c32d1	Merge version_8 into main Merge version_8 into main	2026-04-20 17:39:16 +00:00
bender	618237c50a	Update theme colors	2026-04-20 17:39:12 +00:00
bender	d1061ae35b	Merge version_7 into main Merge version_7 into main	2026-04-20 17:39:12 +00:00
bender	b159cc6408	Update theme colors	2026-04-20 17:39:05 +00:00
bender	acb006fc99	Merge version_6 into main Merge version_6 into main	2026-04-20 17:33:27 +00:00
bender	2a04b15af6	Update theme colors	2026-04-20 17:33:24 +00:00
bender	e88471d90b	Merge version_5 into main Merge version_5 into main	2026-04-20 17:33:20 +00:00
bender	c9bffd297d	Update src/app/page.tsx	2026-04-20 17:33:14 +00:00
bender	0bbdf72031	Merge version_5 into main Merge version_5 into main	2026-04-20 15:20:37 +00:00
bender	2f18f8ce88	Update theme fonts	2026-04-20 15:20:34 +00:00
bender	ea8f378b19	Update theme fonts	2026-04-20 15:20:33 +00:00
bender	146f4b018f	Update theme fonts	2026-04-20 15:20:29 +00:00
bender	341399df64	Update theme fonts	2026-04-20 15:20:29 +00:00
bender	50c3b2b1e1	Merge version_5 into main Merge version_5 into main	2026-04-20 15:20:16 +00:00
bender	20c99d072b	Update theme fonts	2026-04-20 15:20:13 +00:00
bender	b4a62073fa	Update theme fonts	2026-04-20 15:20:12 +00:00
bender	b187e46305	Merge version_5 into main Merge version_5 into main	2026-04-20 15:09:10 +00:00
bender	10485ec522	Update src/app/page.tsx	2026-04-20 15:09:07 +00:00
bender	89d30e592d	Merge version_5 into main Merge version_5 into main	2026-04-20 15:08:36 +00:00
bender	2e98a69d9c	Update src/app/page.tsx	2026-04-20 15:08:33 +00:00
bender	c6434af345	Merge version_4 into main Merge version_4 into main	2026-04-20 15:07:15 +00:00