Merge version_2 into main

Update src/app/page.tsx
2026-04-10 07:04:37 +00:00 · 2026-04-10 07:04:34 +00:00 · 2026-04-10 07:02:04 +00:00 · 2026-04-10 07:01:58 +00:00 · 2026-04-10 07:01:31 +00:00 · 2026-04-10 07:01:28 +00:00
4 changed files with 184 additions and 60 deletions
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -2,23 +2,27 @@

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import FooterBase from '@/components/sections/footer/FooterBase';
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import MetricSplitMediaAbout from '@/components/sections/about/MetricSplitMediaAbout';
+import MediaAbout from '@/components/sections/about/MediaAbout';
+import TeamCardEleven from '@/components/sections/team/TeamCardEleven';
+import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
+import FeatureCardEight from '@/components/sections/feature/FeatureCardEight';
+import FooterBase from '@/components/sections/footer/FooterBase';
+import { Award, Users, Target, ShieldCheck } from "lucide-react";

 export default function AboutPage() {
  return (
    <ThemeProvider
-      defaultButtonVariant="expand-hover"
-      defaultTextAnimation="reveal-blur"
-      borderRadius="pill"
-      contentWidth="medium"
-      sizing="medium"
-      background="fluid"
-      cardStyle="subtle-shadow"
-      primaryButtonStyle="double-inset"
-      secondaryButtonStyle="radial-glow"
-      headingFontWeight="light"
+        defaultButtonVariant="expand-hover"
+        defaultTextAnimation="reveal-blur"
+        borderRadius="pill"
+        contentWidth="medium"
+        sizing="medium"
+        background="fluid"
+        cardStyle="subtle-shadow"
+        primaryButtonStyle="double-inset"
+        secondaryButtonStyle="radial-glow"
+        headingFontWeight="light"
    >
      <ReactLenis root>
        <div id="nav" data-section="nav">
@@ -29,17 +33,63 @@ export default function AboutPage() {
          />
        </div>

-        <div id="about-inner" data-section="about-inner">
-          <MetricSplitMediaAbout
-            useInvertedBackground={false}
-            title="About Elite Estate"
-            description="We are committed to providing premium real estate solutions with honesty and integrity. With decades of experience, we guide you through every step of the process."
-            metrics={[{ value: "15+", title: "Years Experience" }, { value: "500+", title: "Homes Sold" }]}
-            imageSrc="http://img.b2bpic.net/free-photo/young-happy-couple-shaking-hands-with-real-estate-agent-while-buying-new-apartment_637285-6109.jpg"
-            imageAlt="Real Estate Team"
-            mediaAnimation="slide-up"
-            metricsAnimation="slide-up"
-          />
+        <div id="about-story" data-section="about-story">
+            <MediaAbout 
+                title="Our Story"
+                description="Elite Estate began with a simple mission: to redefine the luxury real estate experience. Founded on integrity and precision, we have grown into a premier agency known for curating the most desirable properties for our discerning clients. Our journey is defined by passion, dedication, and an uncompromising pursuit of excellence."
+                imageSrc="http://img.b2bpic.net/free-photo/modern-architecture-building_23-2149174158.jpg"
+                imageAlt="Modern architecture office"
+                useInvertedBackground={false}
+            />
+        </div>
+
+        <div id="achievements" data-section="achievements">
+            <MetricCardOne 
+                title="Our Milestones"
+                description="Numbers speak louder than words. Here is how we have impacted the market over the last decade."
+                textboxLayout="default"
+                gridVariant="uniform-all-items-equal"
+                animationType="slide-up"
+                useInvertedBackground={false}
+                metrics={[
+                    { id: "m1", value: "500+", title: "Properties Sold", description: "Exclusive deals closed with total satisfaction", icon: Award },
+                    { id: "m2", value: "12k+", title: "Happy Clients", description: "Families connected with their dream homes", icon: Users },
+                    { id: "m3", value: "15", title: "Years Active", description: "Experience delivering premium real estate", icon: Target },
+                    { id: "m4", value: "98%", title: "Retention Rate", description: "Trusted by repeated luxury investors", icon: ShieldCheck }
+                ]}
+            />
+        </div>
+
+        <div id="values" data-section="values">
+            <FeatureCardEight 
+                title="Our Core Values"
+                description="These fundamental principles guide our decisions and interactions every single day."
+                textboxLayout="split"
+                useInvertedBackground={false}
+                features={[
+                    { title: "Integrity", description: "Honesty and transparency are the pillars of our agency.", imageSrc: "http://img.b2bpic.net/free-photo/handshake-concept-with-handshake_23-2149735706.jpg" },
+                    { title: "Excellence", description: "We strive for perfection in every detail of your property search.", imageSrc: "http://img.b2bpic.net/free-photo/business-people-shaking-hands-meeting_23-2149174158.jpg" },
+                    { title: "Client-First", description: "Your goals and dreams are always at the forefront of our strategy.", imageSrc: "http://img.b2bpic.net/free-photo/people-working-office_23-2149174158.jpg" }
+                ]}
+            />
+        </div>
+
+        <div id="team" data-section="team">
+            <TeamCardEleven 
+                title="Meet The Experts"
+                description="The passionate professionals dedicated to making your real estate goals a reality."
+                textboxLayout="split"
+                animationType="slide-up"
+                useInvertedBackground={false}
+                groups={[
+                    {
+                        id: "g1",                        groupTitle: "Leadership",                        members: [
+                            { id: "tm1", title: "Jane Doe", subtitle: "CEO & Founder", detail: "20+ years of industry leadership in luxury markets.", imageSrc: "http://img.b2bpic.net/free-photo/business-woman-working-office_23-2149174158.jpg" },
+                            { id: "tm2", title: "John Smith", subtitle: "Director of Operations", detail: "Streamlining property acquisitions with precision.", imageSrc: "http://img.b2bpic.net/free-photo/handsome-business-man_23-2149174158.jpg" }
+                        ]
+                    }
+                ]}
+            />
        </div>

        <div id="footer" data-section="footer">
@@ -51,4 +101,4 @@ export default function AboutPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -0,0 +1,80 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import ReactLenis from "lenis/react";
+import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
+import BlogCardOne from '@/components/sections/blog/BlogCardOne';
+import ContactCenter from '@/components/sections/contact/ContactCenter';
+import FooterBase from '@/components/sections/footer/FooterBase';
+
+export default function BlogPage() {
+  return (
+    <ThemeProvider
+        defaultButtonVariant="expand-hover"
+        defaultTextAnimation="reveal-blur"
+        borderRadius="pill"
+        contentWidth="medium"
+        sizing="medium"
+        background="fluid"
+        cardStyle="subtle-shadow"
+        primaryButtonStyle="double-inset"
+        secondaryButtonStyle="radial-glow"
+        headingFontWeight="light"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarLayoutFloatingInline
+            navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Properties", id: "/properties" }, { name: "About", id: "/about" }, { name: "Contact", id: "/contact" }]}
+            brandName="Elite Estate"
+            button={{ text: "Contact Us", href: "/contact" }}
+          />
+        </div>
+
+        <div id="featured" data-section="featured">
+          <BlogCardOne
+            animationType="slide-up"
+            textboxLayout="split"
+            useInvertedBackground={false}
+            title="Featured Articles"
+            description="Expert insights into the current real estate market."
+            blogs={[
+              { id: "b1", category: "Market Trends", title: "Top 5 Neighborhoods for Investment in 2025", excerpt: "Discover where the smartest investors are putting their capital next year.", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-rainbow-nature_23-2151498219.jpg", authorName: "Jane Doe", authorAvatar: "http://img.b2bpic.net/free-photo/happy-business-man_23-2148018617.jpg", date: "Oct 12, 2024" },
+              { id: "b2", category: "Guides", title: "A First-Time Homebuyer's Checklist", excerpt: "Everything you need to navigate your first property purchase with confidence.", imageSrc: "http://img.b2bpic.net/free-photo/interior-space-decorated-boho-style_23-2150771523.jpg", authorName: "John Smith", authorAvatar: "http://img.b2bpic.net/free-photo/front-view-smiley-man-posing_23-2148563421.jpg", date: "Oct 05, 2024" }
+            ]}
+          />
+        </div>
+
+        <div id="blog" data-section="blog">
+          <BlogCardOne
+            animationType="slide-up"
+            textboxLayout="default"
+            useInvertedBackground={true}
+            title="Latest Resources"
+            description="Stay informed with our comprehensive real estate guides."
+            blogs={[
+              { id: "b3", category: "Advice", title: "How to Stage Your Home for a Quick Sale", excerpt: "Maximize your property value with these professional staging techniques.", imageSrc: "http://img.b2bpic.net/free-photo/cozy-lively-home-interior-design_23-2151118979.jpg", authorName: "Jane Doe", authorAvatar: "http://img.b2bpic.net/free-photo/happy-business-man_23-2148018617.jpg", date: "Sept 28, 2024" },
+              { id: "b4", category: "Financing", title: "Understanding Mortgage Interest Rates", excerpt: "A deep dive into how rates are determined and what they mean for you.", imageSrc: "http://img.b2bpic.net/free-photo/young-coworkers-gathering-table-office_23-2147668778.jpg", authorName: "John Smith", authorAvatar: "http://img.b2bpic.net/free-photo/front-view-smiley-man-posing_23-2148563421.jpg", date: "Sept 15, 2024" }
+            ]}
+          />
+        </div>
+
+        <div id="newsletter" data-section="newsletter">
+          <ContactCenter
+            tag="Newsletter"
+            title="Stay Informed"
+            description="Subscribe to our monthly newsletter for exclusive property market insights and news."
+            background={{ variant: "gradient-bars" }}
+            useInvertedBackground={false}
+          />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterBase
+            columns={[{ title: "Company", items: [{ label: "About", href: "/about" }, { label: "Contact", href: "/contact" }] }, { title: "Resources", items: [{ label: "Blog", href: "/blog" }, { label: "Listings", href: "/properties" }] }]}
+            logoText="ELITE ESTATE"
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -27,8 +27,8 @@ export default function LandingPage() {
      <ReactLenis root>
        <div id="nav" data-section="nav">
          <NavbarLayoutFloatingInline
-            navItems={[{ name: "Home", id: "/" }, { name: "Properties", id: "/properties" }, { name: "About", id: "/about" }, { name: "Contact", id: "/contact" }]}
-            brandName="Elite Estate"
+            navItems={[{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Properties", id: "/properties" }, { name: "About", id: "/about" }, { name: "Contact", id: "/contact" }]}
+            brandName="AoneValuer "
            button={{ text: "Contact Us", href: "/contact" }}
          />
        </div>
@@ -67,7 +67,7 @@ export default function LandingPage() {

        <div id="footer" data-section="footer">
          <FooterBase
-            columns={[{ title: "Company", items: [{ label: "About", href: "/about" }, { label: "Contact", href: "/contact" }] }, { title: "Services", items: [{ label: "Listings", href: "/properties" }] }]}
+            columns={[{ title: "Company", items: [{ label: "About", href: "/about" }, { label: "Contact", href: "/contact" }] }, { title: "Services", items: [{ label: "Listings", href: "/properties" }, { label: "Blog", href: "/blog" }] }]}
            logoText="ELITE ESTATE"
          />
        </div>
--- a/src/app/properties/page.tsx
+++ b/src/app/properties/page.tsx
@@ -2,51 +2,45 @@

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
-import FooterBase from '@/components/sections/footer/FooterBase';
-import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import ProductCardFour from '@/components/sections/product/ProductCardFour';
+import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
+import NavbarLayoutFloatingInline from "@/components/navbar/NavbarLayoutFloatingInline";
+import FooterBase from "@/components/sections/footer/FooterBase";

 export default function PropertiesPage() {
  return (
    <ThemeProvider
-      defaultButtonVariant="expand-hover"
-      defaultTextAnimation="reveal-blur"
-      borderRadius="pill"
-      contentWidth="medium"
-      sizing="medium"
-      background="fluid"
-      cardStyle="subtle-shadow"
-      primaryButtonStyle="double-inset"
-      secondaryButtonStyle="radial-glow"
-      headingFontWeight="light"
+        defaultButtonVariant="expand-hover"
+        defaultTextAnimation="reveal-blur"
+        borderRadius="pill"
+        contentWidth="medium"
+        sizing="medium"
+        background="fluid"
+        cardStyle="subtle-shadow"
+        primaryButtonStyle="double-inset"
+        secondaryButtonStyle="radial-glow"
+        headingFontWeight="light"
    >
      <ReactLenis root>
-        <div id="nav" data-section="nav">
-          <NavbarLayoutFloatingInline
+        <NavbarLayoutFloatingInline
            navItems={[{ name: "Home", id: "/" }, { name: "Properties", id: "/properties" }, { name: "About", id: "/about" }, { name: "Contact", id: "/contact" }]}
            brandName="Elite Estate"
            button={{ text: "Contact Us", href: "/contact" }}
-          />
+        />
+        <div className="pt-32 pb-20">
+            <ProductCatalog
+                layout="page"
+                products={[
+                    { id: "p1", name: "Modern Urban Loft", price: "$1.2M", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/interior-space-decorated-boho-style_23-2150771523.jpg?_wi=2" },
+                    { id: "p2", name: "Suburban Oasis", price: "$850K", rating: 4, imageSrc: "http://img.b2bpic.net/free-photo/beautiful-shot-stone-building-with-lovely-yard-blue-sky-punta-de-lobos-chile_181624-13685.jpg?_wi=2" },
+                    { id: "p3", name: "Designer Kitchen Estate", price: "$2.5M", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/young-coworkers-gathering-table-office_23-2147668778.jpg?_wi=2" }
+                ]}
+                filters={[{ label: "Price Range", options: ["Any", "Under $1M", "$1M - $2M", "Over $2M"], selected: "Any", onChange: () => {} }]}
+            />
        </div>
-
-        <div id="product" data-section="product">
-          <ProductCardFour
-            animationType="slide-up"
-            textboxLayout="default"
-            gridVariant="uniform-all-items-equal"
-            useInvertedBackground={false}
-            title="New Listings"
-            description="Our latest properties on the market."
-            products={[{ id: "p1", name: "Luxury Penthouse", price: "$4M", variant: "Premium", imageSrc: "http://img.b2bpic.net/free-photo/vertical-shot-person-standing-top-building_181624-14409.jpg?_wi=2" }, { id: "p2", name: "Modern Villa", price: "$2M", variant: "Modern", imageSrc: "http://img.b2bpic.net/free-photo/young-coworkers-gathering-table-office_23-2147668778.jpg?_wi=3" }]}
-          />
-        </div>
-
-        <div id="footer" data-section="footer">
-          <FooterBase
+        <FooterBase
            columns={[{ title: "Company", items: [{ label: "About", href: "/about" }, { label: "Contact", href: "/contact" }] }, { title: "Services", items: [{ label: "Listings", href: "/properties" }] }]}
            logoText="ELITE ESTATE"
-          />
-        </div>
+        />
      </ReactLenis>
    </ThemeProvider>
  );
Author	SHA1	Message	Date
bender	61b5e74e30	Merge version_2 into main Merge version_2 into main	2026-04-10 07:04:37 +00:00
bender	45fae36a6c	Update src/app/page.tsx	2026-04-10 07:04:34 +00:00
bender	7bc303aa4e	Merge version_2 into main Merge version_2 into main	2026-04-10 07:02:04 +00:00
bender	067ebc2fa4	Update src/app/about/page.tsx	2026-04-10 07:01:58 +00:00
bender	0e7fb9284e	Merge version_2 into main Merge version_2 into main	2026-04-10 07:01:31 +00:00
bender	02c3c4c90c	Update src/app/about/page.tsx	2026-04-10 07:01:28 +00:00
bender	d3d3a8054c	Merge version_2 into main Merge version_2 into main	2026-04-10 07:01:02 +00:00
bender	259b4805e5	Update src/app/properties/page.tsx	2026-04-10 07:00:59 +00:00
bender	eebba7e637	Update src/app/page.tsx	2026-04-10 07:00:59 +00:00
bender	f50b58c800	Add src/app/blog/page.tsx	2026-04-10 07:00:58 +00:00
bender	e38e3e6b9f	Update src/app/about/page.tsx	2026-04-10 07:00:58 +00:00
bender	af9bfc4a01	Merge version_1 into main Merge version_1 into main	2026-04-10 06:56:50 +00:00
bender	cbace3a73e	Merge version_1 into main Merge version_1 into main	2026-04-10 06:56:23 +00:00
bender	bc0eed27cb	Merge version_1 into main Merge version_1 into main	2026-04-10 06:55:49 +00:00