Merge version_6 into main

Update src/app/shop/page.tsx
2026-02-20 21:59:21 +00:00 · 2026-02-20 21:59:16 +00:00 · 2026-02-20 21:59:16 +00:00 · 2026-02-20 21:56:29 +00:00 · 2026-02-20 21:56:25 +00:00 · 2026-02-20 21:56:24 +00:00
4 changed files with 88 additions and 78 deletions
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -28,51 +28,56 @@ export default function BlogPage() {
            headingFontWeight="medium"
        >
            <ReactLenis root>
-                <NavbarLayoutFloatingInline
-                    navItems={[
-                        { name: "Home", id: "/" },
-                        { name: "About", id: "#about" },
-                        { name: "Services", id: "#features-detailed" },
-                        { name: "Clients", id: "/" },
-                        { name: "Contact", id: "#contact" },
-                    ]}
-                    brandName="Pro Studio"
-                    button={{ text: "Get a Quote", href: "/#contact" }}
-                    className="bg-card/90 backdrop-blur-sm shadow-lg"
-                    navItemClassName="text-foreground hover:text-primary-cta transition-colors duration-300"
-                    buttonClassName="bg-primary-cta text-secondary-cta px-6 py-2 rounded-pill hover:bg-accent hover:text-primary-cta transition-all duration-300"
-                    buttonTextClassName="font-medium text-base"
-                />
-
-                {isLoading ? (
-                    <div className="w-content-width mx-auto py-20 text-center">
-                        <p className="text-foreground">Loading posts...</p>
-                    </div>
-                ) : (
-                    <BlogCardThree
-                        blogs={posts}
-                        title="Featured Articles"
-                        description="Explore our latest insights"
-                        animationType="slide-up"
-                        textboxLayout="default"
-                        useInvertedBackground={false}
+                <div id="nav" data-section="nav">
+                    <NavbarLayoutFloatingInline
+                        navItems={[
+                            { name: "Home", id: "/" },
+                            { name: "About", id: "/#about" },
+                            { name: "Services", id: "/#features-detailed" },
+                            { name: "Contact", id: "/#contact" },
+                        ]}
+                        brandName="Pro Studio"
+                        button={{ text: "Get a Quote", href: "/#contact" }}
+                        className="bg-card/90 backdrop-blur-sm shadow-lg"
+                        navItemClassName="text-foreground hover:text-primary-cta transition-colors duration-300"
+                        buttonClassName="bg-primary-cta text-secondary-cta px-6 py-2 rounded-pill hover:bg-accent hover:text-primary-cta transition-all duration-300"
+                        buttonTextClassName="font-medium text-base"
                    />
-                )}
+                </div>

-                <FooterCard
-                    logoText="Pro Studio"
-                    copyrightText="© 2023 Pro Studio. All rights reserved."
-                    socialLinks={[
-                        { icon: Twitter, href: "https://twitter.com/prostudio", ariaLabel: "Twitter" },
-                        { icon: Linkedin, href: "https://linkedin.com/company/prostudio", ariaLabel: "LinkedIn" },
-                        { icon: Instagram, href: "https://instagram.com/prostudio", ariaLabel: "Instagram" },
-                    ]}
-                    className="py-16 md:py-24 bg-background-accent"
-                    cardClassName="bg-card/70 backdrop-blur-md"
-                    logoClassName="text-2xl font-bold text-foreground"
-                    copyrightTextClassName="text-sm text-foreground/70"
-                    socialIconClassName="text-foreground/80 hover:text-primary-cta transition-colors duration-300"
-                />
+                <div id="blog" data-section="blog">
+                    {isLoading ? (
+                        <div className="w-content-width mx-auto py-20 text-center">
+                            <p className="text-foreground">Loading posts...</p>
+                        </div>
+                    ) : (
+                        <BlogCardThree
+                            blogs={posts}
+                            title="Featured Articles"
+                            description="Explore our latest insights"
+                            animationType="slide-up"
+                            textboxLayout="default"
+                            useInvertedBackground={false}
+                        />
+                    )}
+                </div>
+
+                <div id="footer" data-section="footer">
+                    <FooterCard
+                        logoText="Pro Studio"
+                        copyrightText="© 2023 Pro Studio. All rights reserved."
+                        socialLinks={[
+                            { icon: Twitter, href: "https://twitter.com/prostudio", ariaLabel: "Twitter" },
+                            { icon: Linkedin, href: "https://linkedin.com/company/prostudio", ariaLabel: "LinkedIn" },
+                            { icon: Instagram, href: "https://instagram.com/prostudio", ariaLabel: "Instagram" },
+                        ]}
+                        className="py-16 md:py-24 bg-background-accent"
+                        cardClassName="bg-card/70 backdrop-blur-md"
+                        logoClassName="text-2xl font-bold text-foreground"
+                        copyrightTextClassName="text-sm text-foreground/70"
+                        socialIconClassName="text-foreground/80 hover:text-primary-cta transition-colors duration-300"
+                    />
+                </div>
            </ReactLenis>
        </ThemeProvider>
    );
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -50,7 +50,7 @@ export default function LandingPage() {
    >
      <div id="nav" data-section="nav">
        <NavbarLayoutFloatingInline
-          navItems={[{ name: "Home", id: "/" }, { name: "About", id: "#about" }, { name: "Services", id: "#features-detailed" }, { name: "Clients", id: "/" }, { name: "Contact", id: "#contact" }]}
+          navItems={[{ name: "Home", id: "/" }, { name: "About", id: "#about" }, { name: "Services", id: "#features-detailed" }, { name: "Contact", id: "#contact" }]}
          brandName="Pro Studio"
          button={{ text: "Get a Quote", href: "#contact" }}
          className="bg-card/90 backdrop-blur-sm shadow-lg"
@@ -66,7 +66,13 @@ export default function LandingPage() {
          background={{ variant: "glowing-orb" }}
          kpis={[{ value: "15+", label: "Years Experience" }, { value: "500+", label: "Projects Delivered" }, { value: "98%", label: "Client Satisfaction" }]}
          enableKpiAnimation={true}
-          tag="Your Story, Our Expertise"
+          avatars={[
+            { src: "https://picsum.photos/id/1005/40/40", alt: "Client Avatar 1" },
+            { src: "https://picsum.photos/id/1006/40/40", alt: "Client Avatar 2" },
+            { src: "https://picsum.photos/id/1008/40/40", alt: "Client Avatar 3" },
+            { src: "https://picsum.photos/id/1011/40/40", alt: "Client Avatar 4" }
+          ]}
+          avatarText="Trusted by over 200+ clients"
          buttons={[{ text: "View Our Work", href: "#services" }, { text: "Get a Free Consultation", href: "#contact" }]}
          imageSrc="https://img.b2bpic.net/free-photo/medium-shot-people-radio-station_23-2148802324.jpg?_wi=1"
          imageAlt="Professional production studio set up"
@@ -79,21 +85,20 @@ export default function LandingPage() {
          buttonClassName="px-8 py-3 rounded-pill text-lg"
          buttonTextClassName="font-semibold"
          marqueeItems={[
-            { type: "text", text: "Creative Minds Agency" },
-            { type: "text", text: "GlobalTech Solutions" },
-            { type: "text", text: "Apex Innovations" },
-            { type: "text", text: "Nexus Games" },
-            { type: "text", text: "Bloom Skincare" },
-            { type: "text", text: "FutureForward Consulting" },
-            { type: "text", text: "Digital Horizon Studios" },
-            { type: "text", text: "Urban Living Magazine" },
-            { type: "text", text: "Veridian Dynamics" },
-            { type: "text", text: "Starlight Entertainment" }
+            { type: "image", src: "https://picsum.photos/id/1018/100/50", alt: "Client Logo 1" },
+            { type: "image", src: "https://picsum.photos/id/1025/100/50", alt: "Client Logo 2" },
+            { type: "image", src: "https://picsum.photos/id/1032/100/50", alt: "Client Logo 3" },
+            { type: "image", src: "https://picsum.photos/id/1035/100/50", alt: "Client Logo 4" },
+            { type: "image", src: "https://picsum.photos/id/1043/100/50", alt: "Client Logo 5" },
+            { type: "image", src: "https://picsum.photos/id/1047/100/50", alt: "Client Logo 6" },
+            { type: "image", src: "https://picsum.photos/id/1049/100/50", alt: "Client Logo 7" },
+            { type: "image", src: "https://picsum.photos/id/106/100/50", alt: "Client Logo 8" },
+            { type: "image", src: "https://picsum.photos/id/107/100/50", alt: "Client Logo 9" },
+            { type: "image", src: "https://picsum.photos/id/108/100/50", alt: "Client Logo 10" }
          ]}
          marqueeSpeed={40}
-          showMarqueeCard={true}
-          marqueeTextClassName="text-2xl font-semibold text-foreground/80"
-          marqueeCardClassName="bg-card/70 backdrop-blur-md"
+          showMarqueeCard={false}
+          marqueeImageClassName="max-h-12 w-auto object-contain py-2"
        />
      </div>
      <div id="about" data-section="about">
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -90,12 +90,13 @@ function ProductPageContent({ params }: ProductPageProps) {
                headingFontWeight="medium"
            >
                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
+                    <div id="nav" data-section="nav">
                        <NavbarLayoutFloatingInline
                            navItems={[
                                { name: "Home", id: "/" },
-                                { name: "Shop", id: "/shop" },
-                                { name: "Clients", id: "/" }
+                                { name: "About", id: "/#about" },
+                                { name: "Services", id: "/#features-detailed" },
+                                { name: "Contact", id: "/#contact" }
                            ]}
                            brandName="Pro Studio"
                            className="bg-card/90 backdrop-blur-sm shadow-lg"
@@ -144,12 +145,13 @@ function ProductPageContent({ params }: ProductPageProps) {
                headingFontWeight="medium"
            >
                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
+                    <div id="nav" data-section="nav">
                        <NavbarLayoutFloatingInline
                            navItems={[
                                { name: "Home", id: "/" },
-                                { name: "Shop", id: "/shop" },
-                                { name: "Clients", id: "/" }
+                                { name: "About", id: "/#about" },
+                                { name: "Services", id: "/#features-detailed" },
+                                { name: "Contact", id: "/#contact" }
                            ]}
                            brandName="Pro Studio"
                            className="bg-card/90 backdrop-blur-sm shadow-lg"
@@ -205,12 +207,13 @@ function ProductPageContent({ params }: ProductPageProps) {
            headingFontWeight="medium"
        >
            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                    <NavbarLayoutFloatingInline
                        navItems={[
                            { name: "Home", id: "/" },
-                            { name: "Shop", id: "/shop" },
-                            { name: "Clients", id: "/" }
+                            { name: "About", id: "/#about" },
+                            { name: "Services", id: "/#features-detailed" },
+                            { name: "Contact", id: "/#contact" }
                        ]}
                        brandName="Pro Studio"
                        className="bg-card/90 backdrop-blur-sm shadow-lg"
@@ -225,16 +228,11 @@ function ProductPageContent({ params }: ProductPageProps) {
                        layout="page"
                        name={product.name}
                        price={product.price}
-                        salePrice={meta.salePrice}
                        rating={product.rating || 0}
                        description={product.description}
                        images={images}
                        variants={variants.length > 0 ? variants : undefined}
                        quantity={quantityVariant}
-                        ribbon={meta.ribbon}
-                        inventoryStatus={meta.inventoryStatus}
-                        inventoryQuantity={meta.inventoryQuantity}
-                        sku={meta.sku}
                        buttons={[
                            { text: "Add To Cart", onClick: handleAddToCart },
                            { text: "Buy Now", onClick: handleBuyNow },
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -57,12 +57,13 @@ export default function ShopPage() {
                headingFontWeight="medium"
            >
                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
+                    <div id="nav" data-section="nav">
                        <NavbarLayoutFloatingInline
                            navItems={[
                                { name: "Home", id: "/" },
-                                { name: "Shop", id: "/shop" },
-                                { name: "Clients", id: "/" }
+                                { name: "About", id: "/#about" },
+                                { name: "Services", id: "/#features-detailed" },
+                                { name: "Contact", id: "/#contact" }
                            ]}
                            brandName="Pro Studio"
                            className="bg-card/90 backdrop-blur-sm shadow-lg"
@@ -110,12 +111,13 @@ export default function ShopPage() {
            headingFontWeight="medium"
        >
            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
+                <div id="nav" data-section="nav">
                    <NavbarLayoutFloatingInline
                        navItems={[
                            { name: "Home", id: "/" },
-                            { name: "Shop", id: "/shop" },
-                            { name: "Clients", id: "/" }
+                            { name: "About", id: "/#about" },
+                            { name: "Services", id: "/#features-detailed" },
+                            { name: "Contact", id: "/#contact" }
                        ]}
                        brandName="Pro Studio"
                        className="bg-card/90 backdrop-blur-sm shadow-lg"
Author	SHA1	Message	Date
bender	636030f5ac	Merge version_6 into main Merge version_6 into main	2026-02-20 21:59:21 +00:00
bender	25c3090f50	Update src/app/shop/page.tsx	2026-02-20 21:59:16 +00:00
bender	cbf42372d9	Update src/app/shop/[id]/page.tsx	2026-02-20 21:59:16 +00:00
bender	9d6ed7b987	Merge version_6 into main Merge version_6 into main	2026-02-20 21:56:29 +00:00
bender	3606fab604	Update src/app/shop/page.tsx	2026-02-20 21:56:25 +00:00
bender	b83697c236	Update src/app/shop/[id]/page.tsx	2026-02-20 21:56:24 +00:00
bender	d517233ecf	Update src/app/page.tsx	2026-02-20 21:56:23 +00:00
bender	c4349f6d82	Update src/app/layout.tsx	2026-02-20 21:56:22 +00:00
bender	1ae2fd45a5	Update src/app/blog/page.tsx	2026-02-20 21:56:21 +00:00
bender	44938edcab	Merge version_5 into main Merge version_5 into main	2026-02-20 21:54:06 +00:00
bender	965e177eba	Update src/app/shop/page.tsx	2026-02-20 21:54:02 +00:00
bender	a328c8ab5b	Update src/app/shop/[id]/page.tsx	2026-02-20 21:54:01 +00:00
bender	2adf8812ff	Update src/app/page.tsx	2026-02-20 21:54:00 +00:00
bender	03789c0713	Update src/app/blog/page.tsx	2026-02-20 21:53:59 +00:00
bender	56de79167d	Merge version_5 into main Merge version_5 into main	2026-02-20 21:50:59 +00:00
bender	589cbdc856	Update src/app/shop/page.tsx	2026-02-20 21:50:55 +00:00
bender	efe9db1683	Update src/app/shop/[id]/page.tsx	2026-02-20 21:50:54 +00:00
bender	23b102ac73	Update src/app/page.tsx	2026-02-20 21:50:54 +00:00
bender	0791e387ba	Update src/app/layout.tsx	2026-02-20 21:50:53 +00:00
bender	27b87ddcc9	Update src/app/blog/page.tsx	2026-02-20 21:50:51 +00:00
bender	6df21d20f2	Merge version_4 into main Merge version_4 into main	2026-02-20 21:48:39 +00:00
bender	4f6ea92720	Update src/app/shop/page.tsx	2026-02-20 21:48:35 +00:00
bender	ef81853402	Update src/app/shop/[id]/page.tsx	2026-02-20 21:48:34 +00:00
bender	b00bdd2aa0	Update src/app/page.tsx	2026-02-20 21:48:33 +00:00
bender	0ba1c6c0d9	Update src/app/blog/page.tsx	2026-02-20 21:48:32 +00:00
bender	fe0d992f26	Merge version_3 into main Merge version_3 into main	2026-02-20 21:44:43 +00:00