Merge version_3 into main

Update src/app/wishlist/page.tsx
2026-05-24 12:56:21 +00:00 · 2026-05-24 12:56:18 +00:00 · 2026-05-24 12:56:18 +00:00 · 2026-05-24 12:56:17 +00:00 · 2026-05-24 12:56:17 +00:00 · 2026-05-24 12:56:17 +00:00
9 changed files with 23 additions and 23 deletions
--- a/src/app/cart/page.tsx
+++ b/src/app/cart/page.tsx
@@ -1,13 +1,13 @@
 "use client";

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
+import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";

 export default function CartPage() {
  return (
    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
      <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingOverlay navItems={[{ name: "Home", id: "/" }]} />
+        <NavbarStyleFullscreen brandName="Kumar Studio" navItems={[{ name: "Home", id: "/" }]} />
      </div>
      <div className="pt-32">Cart Page</div>
    </ThemeProvider>
--- a/src/app/checkout/page.tsx
+++ b/src/app/checkout/page.tsx
@@ -1,13 +1,13 @@
 "use client";

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
+import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";

 export default function CheckoutPage() {
  return (
    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
      <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingOverlay navItems={[{ name: "Home", id: "/" }]} />
+        <NavbarStyleFullscreen brandName="Kumar Studio" navItems={[{ name: "Home", id: "/" }]} />
      </div>
      <div className="pt-32">Checkout Page</div>
    </ThemeProvider>
--- a/src/app/login/page.tsx
+++ b/src/app/login/page.tsx
@@ -1,14 +1,14 @@
 "use client";

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
+import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";

 export default function LoginPage() {
  return (
    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
      <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingOverlay
-          brandName="Webild"
+        <NavbarStyleFullscreen
+          brandName="Kumar Studio"
          navItems={[{ name: "Home", id: "/" }]}
        />
      </div>
--- a/src/app/order-history/page.tsx
+++ b/src/app/order-history/page.tsx
@@ -1,13 +1,13 @@
 "use client";

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
+import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";

 export default function OrderHistoryPage() {
  return (
    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
      <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingOverlay navItems={[{ name: "Home", id: "/" }]} />
+        <NavbarStyleFullscreen brandName="Kumar Studio" navItems={[{ name: "Home", id: "/" }]} />
      </div>
      <div className="pt-32">Order History</div>
    </ThemeProvider>
--- a/src/app/order-tracking/page.tsx
+++ b/src/app/order-tracking/page.tsx
@@ -1,13 +1,13 @@
 "use client";

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
+import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";

 export default function OrderTrackingPage() {
  return (
    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
      <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingOverlay navItems={[{ name: "Home", id: "/" }]} />
+        <NavbarStyleFullscreen brandName="Kumar Studio" navItems={[{ name: "Home", id: "/" }]} />
      </div>
      <div className="pt-32">Order Tracking</div>
    </ThemeProvider>
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -2,7 +2,7 @@

 import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
+import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
 import HeroSplitDoubleCarousel from "@/components/sections/hero/HeroSplitDoubleCarousel";
 import FeatureBento from "@/components/sections/feature/FeatureBento";
 import FeatureCardTwentySix from "@/components/sections/feature/FeatureCardTwentySix";
@@ -33,8 +33,8 @@ export default function WebAgency2Page() {
      <Suspense fallback={<LoadingFallback />}>
        <ReactLenis root>
          <div id="nav" data-section="nav">
-            <NavbarLayoutFloatingOverlay
-              brandName="Webild"
+            <NavbarStyleFullscreen
+              brandName="Kumar Studio"
              navItems={[
                { name: "Work", id: "#work" },
                { name: "Services", id: "#services" },
@@ -118,7 +118,7 @@ export default function WebAgency2Page() {
            </div>

            <FooterBaseCard
-              logoText="Webild"
+              logoText="Kumar Studio"
              columns={[{ title: "Company", items: [{ label: "About", href: "#about" }, { label: "Contact", href: "#contact" }] }]}
            />
          </main>
--- a/src/app/products/[id]/page.tsx
+++ b/src/app/products/[id]/page.tsx
@@ -1,17 +1,17 @@
 "use client";

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
+import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
 import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";

 export default function ProductDetailPage() {
  return (
    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
      <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingOverlay navItems={[{ name: "Home", id: "/" }]} />
+        <NavbarStyleFullscreen brandName="Kumar Studio" navItems={[{ name: "Home", id: "/" }]} />
      </div>
      <div className="pt-32">Product Detail</div>
-      <FooterBaseCard logoText="Webild" columns={[{ title: "Nav", items: [{ label: "Home", href: "/" }] }]} />
+      <FooterBaseCard logoText="Kumar Studio" columns={[{ title: "Nav", items: [{ label: "Home", href: "/" }] }]} />
    </ThemeProvider>
  );
 }
--- a/src/app/products/page.tsx
+++ b/src/app/products/page.tsx
@@ -1,7 +1,7 @@
 "use client";

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
+import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";
 import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
 import FooterBaseCard from "@/components/sections/footer/FooterBaseCard";

@@ -9,7 +9,7 @@ export default function ProductsPage() {
  return (
    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
      <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingOverlay brandName="Webild" navItems={[{ name: "Home", id: "/" }]} />
+        <NavbarStyleFullscreen brandName="Kumar Studio" navItems={[{ name: "Home", id: "/" }]} />
      </div>
      <ProductCardTwo 
        title="Products" 
@@ -24,7 +24,7 @@ export default function ProductsPage() {
            { id: "3", brand: "C", name: "P3", price: "$30", rating: 5, reviewCount: "30", imageSrc: "/i3.jpg" }
        ]}
      />
-      <FooterBaseCard logoText="Webild" columns={[{ title: "Nav", items: [{ label: "Home", href: "/" }] }]} />
+      <FooterBaseCard logoText="Kumar Studio" columns={[{ title: "Nav", items: [{ label: "Home", href: "/" }] }]} />
    </ThemeProvider>
  );
 }
--- a/src/app/wishlist/page.tsx
+++ b/src/app/wishlist/page.tsx
@@ -1,13 +1,13 @@
 "use client";

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
+import NavbarStyleFullscreen from "@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen";

 export default function WishlistPage() {
  return (
    <ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
      <div id="nav" data-section="nav">
-        <NavbarLayoutFloatingOverlay navItems={[{ name: "Home", id: "/" }]} />
+        <NavbarStyleFullscreen brandName="Kumar Studio" navItems={[{ name: "Home", id: "/" }]} />
      </div>
      <div className="pt-32">Wishlist</div>
    </ThemeProvider>
Author	SHA1	Message	Date
bender	44b12d6564	Merge version_3 into main Merge version_3 into main	2026-05-24 12:56:21 +00:00
bender	1d2e10ee94	Update src/app/wishlist/page.tsx	2026-05-24 12:56:18 +00:00
bender	b8ee5ceb8d	Update src/app/products/page.tsx	2026-05-24 12:56:18 +00:00
bender	9d3d819856	Update src/app/products/[id]/page.tsx	2026-05-24 12:56:17 +00:00
bender	15575285eb	Update src/app/page.tsx	2026-05-24 12:56:17 +00:00
bender	cb62c4cbfa	Update src/app/order-tracking/page.tsx	2026-05-24 12:56:17 +00:00
bender	309599a61e	Update src/app/order-history/page.tsx	2026-05-24 12:56:16 +00:00
bender	b2604367ef	Update src/app/login/page.tsx	2026-05-24 12:56:16 +00:00
bender	a50009de34	Update src/app/checkout/page.tsx	2026-05-24 12:56:15 +00:00
bender	1fbfe35743	Update src/app/cart/page.tsx	2026-05-24 12:56:15 +00:00
bender	847d8c696d	Merge version_2 into main Merge version_2 into main	2026-05-24 12:53:42 +00:00
bender	4b2960aafc	Merge version_2 into main Merge version_2 into main	2026-05-24 12:53:13 +00:00
bender	791be949ce	Merge version_2 into main Merge version_2 into main	2026-05-24 12:52:44 +00:00
bender	aa4e655b25	Merge version_2 into main Merge version_2 into main	2026-05-24 12:52:08 +00:00