Update src/app/page.tsx

Merge version_3 into main

src/app/about/page.tsx

@@ -3,11 +3,11 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
-import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 import SplitAbout from '@/components/sections/about/SplitAbout';
 import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
 
-export default function LandingPage() {
+export default function AboutPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="text-shift"
@@ -23,24 +23,13 @@ export default function LandingPage() {
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
-      <NavbarStyleApple
+      <NavbarStyleFullscreen
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",
+        { name: "Gallery", id: "/gallery" },
-          id: "/",
+        { name: "Biography", id: "/about" },
-        },
+        { name: "Contact", id: "/contact" },
-        {
+        { name: "About", id: "/about" },
-          name: "Gallery",
-          id: "/gallery",
-        },
-        {
-          name: "About",
-          id: "/about",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
       ]}
       brandName="ELARA"
     />
@@ -53,18 +42,9 @@ export default function LandingPage() {
       title="The Artist"
       description="Driven by the interplay between digital precision and human emotion."
       bulletPoints={[
-        {
+        { title: "Vision", description: "Creating experiences that challenge perception." },
-          title: "Vision",
+        { title: "Technique", description: "Blending traditional methods with modern tech." },
-          description: "Creating experiences that challenge perception.",
+        { title: "Purpose", description: "Connecting people through visual stories." },
-        },
-        {
-          title: "Technique",
-          description: "Blending traditional methods with modern tech.",
-        },
-        {
-          title: "Purpose",
-          description: "Connecting people through visual stories.",
-        },
       ]}
       imageSrc="http://img.b2bpic.net/free-photo/side-view-emo-girl-spending-time-indoors_23-2149645107.jpg"
       mediaAnimation="blur-reveal"
@@ -76,9 +56,7 @@ export default function LandingPage() {
       useInvertedBackground={false}
       title="The Philosophy"
       description={[
-        "Every piece begins with an exploration of negative space.",
+        "Every piece begins with an exploration of negative space.",        "Digital tools allow me to push the boundaries of traditional composition."]}
-        "Digital tools allow me to push the boundaries of traditional composition.",
-      ]}
     />
   </div>
 
@@ -86,36 +64,12 @@ export default function LandingPage() {
       <FooterBaseCard
       logoText="ELARA"
       columns={[
-        {
+        { title: "Studio", items: [{ label: "Gallery", href: "/gallery" }, { label: "Biography", href: "/about" }] },
-          title: "Studio",
+        { title: "Connect", items: [{ label: "Contact", href: "/contact" }, { label: "Instagram", href: "#" }] },
-          items: [
-            {
-              label: "Gallery",
-              href: "/gallery",
-            },
-            {
-              label: "Biography",
-              href: "/about",
-            },
-          ],
-        },
-        {
-          title: "Connect",
-          items: [
-            {
-              label: "Contact",
-              href: "/contact",
-            },
-            {
-              label: "Instagram",
-              href: "#",
-            },
-          ],
-        },
       ]}
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/contact/page.tsx

@@ -5,9 +5,9 @@ import ReactLenis from "lenis/react";
 import ContactCTA from '@/components/sections/contact/ContactCTA';
 import ContactCenter from '@/components/sections/contact/ContactCenter';
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
-import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 
-export default function LandingPage() {
+export default function ContactPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="text-shift"
@@ -23,24 +23,13 @@ export default function LandingPage() {
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
-      <NavbarStyleApple
+      <NavbarStyleFullscreen
       navItems={[
-        {
+        { name: "Home", id: "/" },
-          name: "Home",
+        { name: "Gallery", id: "/gallery" },
-          id: "/",
+        { name: "Biography", id: "/about" },
-        },
+        { name: "Contact", id: "/contact" },
-        {
+        { name: "About", id: "/about" },
-          name: "Gallery",
-          id: "/gallery",
-        },
-        {
-          name: "About",
-          id: "/about",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
       ]}
       brandName="ELARA"
     />
@@ -49,27 +38,18 @@ export default function LandingPage() {
   <div id="contact-box" data-section="contact-box">
       <ContactCTA
       useInvertedBackground={false}
-      background={{
+      background={{ variant: "plain" }}
-        variant: "plain",
-      }}
       tag="Inquiry"
       title="Work with us"
       description="Let's discuss your next project or exhibition."
-      buttons={[
+      buttons={[{ text: "Email Studio", href: "mailto:hello@elara.art" }]}
-        {
-          text: "Email Studio",
-          href: "mailto:hello@elara.art",
-        },
-      ]}
     />
   </div>
 
   <div id="contact" data-section="contact">
       <ContactCenter
       useInvertedBackground={false}
-      background={{
+      background={{ variant: "plain" }}
-        variant: "plain",
-      }}
       tag="Newsletter"
       title="Stay Updated"
       description="Receive news on latest exhibitions and studio releases."
@@ -80,36 +60,12 @@ export default function LandingPage() {
       <FooterBaseCard
       logoText="ELARA"
       columns={[
-        {
+        { title: "Studio", items: [{ label: "Gallery", href: "/gallery" }, { label: "Biography", href: "/about" }] },
-          title: "Studio",
+        { title: "Connect", items: [{ label: "Contact", href: "/contact" }, { label: "Instagram", href: "#" }] },
-          items: [
-            {
-              label: "Gallery",
-              href: "/gallery",
-            },
-            {
-              label: "Biography",
-              href: "/about",
-            },
-          ],
-        },
-        {
-          title: "Connect",
-          items: [
-            {
-              label: "Contact",
-              href: "/contact",
-            },
-            {
-              label: "Instagram",
-              href: "#",
-            },
-          ],
-        },
       ]}
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/gallery/page.tsx

@@ -3,11 +3,11 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
-import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
 import ProductCatalog from '@/components/ecommerce/productCatalog/ProductCatalog';
 
-export default function LandingPage() {
+export default function GalleryPage() {
   return (
     <ThemeProvider
         defaultButtonVariant="text-shift"
@@ -23,12 +23,13 @@ export default function LandingPage() {
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
-      <NavbarStyleApple
+      <NavbarStyleFullscreen
       navItems={[
         { name: "Home", id: "/" },
         { name: "Gallery", id: "/gallery" },
-        { name: "About", id: "/about" },
+        { name: "Biography", id: "/about" },
         { name: "Contact", id: "/contact" },
+        { name: "About", id: "/about" },
       ]}
       brandName="ELARA"
     />
@@ -67,16 +68,12 @@ export default function LandingPage() {
       <FooterBaseCard
       logoText="ELARA"
       columns={[
-        {
+        { title: "Studio", items: [{ label: "Gallery", href: "/gallery" }, { label: "Biography", href: "/about" }] },
-          title: "Studio",          items: [{ label: "Gallery", href: "/gallery" }, { label: "Biography", href: "/about" }],
+        { title: "Connect", items: [{ label: "Contact", href: "/contact" }, { label: "Instagram", href: "#" }] },
-        },
-        {
-          title: "Connect",          items: [{ label: "Contact", href: "/contact" }, { label: "Instagram", href: "#" }],
-        },
       ]}
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}

src/app/page.tsx

@@ -7,7 +7,7 @@ import FeatureCardTwentySeven from '@/components/sections/feature/FeatureCardTwe
 import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import HeroSplitKpi from '@/components/sections/hero/HeroSplitKpi';
 import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
-import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
 import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
 import { Award, Eye, Users } from "lucide-react";
 
@@ -27,12 +27,13 @@ export default function LandingPage() {
     >
       <ReactLenis root>
   <div id="nav" data-section="nav">
-      <NavbarStyleApple
+      <NavbarStyleFullscreen
       navItems={[
         { name: "Home", id: "/" },
         { name: "Gallery", id: "/gallery" },
-        { name: "About", id: "/about" },
+        { name: "Biography", id: "/about" },
         { name: "Contact", id: "/contact" },
+        { name: "About", id: "/about" },
       ]}
       brandName="ELARA"
     />
@@ -129,16 +130,12 @@ export default function LandingPage() {
       <FooterBaseCard
       logoText="ELARA"
       columns={[
-        {
+        { title: "Studio", items: [{ label: "Gallery", href: "/gallery" }, { label: "Biography", href: "/about" }] },
-          title: "Studio",          items: [{ label: "Gallery", href: "/gallery" }, { label: "Biography", href: "/about" }],
+        { title: "Connect", items: [{ label: "Contact", href: "/contact" }, { label: "Instagram", href: "#" }] },
-        },
-        {
-          title: "Connect",          items: [{ label: "Contact", href: "/contact" }, { label: "Instagram", href: "#" }],
-        },
       ]}
     />
   </div>
       </ReactLenis>
     </ThemeProvider>
   );
-}
+}