Merge version_1 into main

Merge version_1 into main
This commit was merged in pull request #1.
This commit is contained in:
2026-02-23 11:06:00 +00:00
4 changed files with 7 additions and 30 deletions

View File

@@ -28,16 +28,15 @@ export default function BlogPage() {
brandName="Nano Mango" brandName="Nano Mango"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "Products", id: "products" }, { name: "Products", id: "/#products" },
{ name: "About", id: "about" }, { name: "About", id: "/#about" },
{ name: "Testimonials", id: "testimonials" }, { name: "Testimonials", id: "/#testimonials" },
{ name: "FAQs", id: "faqs" }, { name: "FAQs", id: "/#faqs" },
]} ]}
button={{ text: "Shop Now", href: "#products" }} button={{ text: "Shop Now", href: "/#products" }}
buttonClassName="shadow-lg" buttonClassName="shadow-lg"
navItemClassName="text-foreground/80 hover:text-foreground" navItemClassName="text-foreground/80 hover:text-foreground"
className="backdrop-blur-sm bg-card/70" className="backdrop-blur-sm bg-card/70"
navItemsAnimation="background-highlight"
/> />
</div> </div>

View File

@@ -43,7 +43,7 @@ export default function SitePage() {
<HeroSplitKpi <HeroSplitKpi
title="Sip in Style with Nano Mango" title="Sip in Style with Nano Mango"
description="Discover our unique collection of cups designed for every moment, blending aesthetics with sustainability." description="Discover our unique collection of cups designed for every moment, blending aesthetics with sustainability."
background={{ variant: "circleGradient" }} background={{ variant: "radial-gradient" }}
kpis={[ kpis={[
{ value: "100+", label: "Unique Designs" }, { value: "100+", label: "Unique Designs" },
{ value: "5,000+", label: "Happy Sippers" }, { value: "5,000+", label: "Happy Sippers" },
@@ -60,7 +60,7 @@ export default function SitePage() {
mediaAnimation="blur-reveal" mediaAnimation="blur-reveal"
tag="Tasteful & Sustainable" tag="Tasteful & Sustainable"
tagIcon={Sparkles} tagIcon={Sparkles}
tagAnimation="background-highlight" tagAnimation="slide-up"
className="py-16 md:py-24 lg:py-32" className="py-16 md:py-24 lg:py-32"
titleClassName="font-light text-foreground" titleClassName="font-light text-foreground"
descriptionClassName="text-foreground/70" descriptionClassName="text-foreground/70"

View File

@@ -10,7 +10,6 @@ import ProductCart from "@/components/ecommerce/cart/ProductCart";
import { useProductDetail } from "@/hooks/useProductDetail"; import { useProductDetail } from "@/hooks/useProductDetail";
import { useCart } from "@/hooks/useCart"; import { useCart } from "@/hooks/useCart";
import { useCheckout } from "@/hooks/useCheckout"; import { useCheckout } from "@/hooks/useCheckout";
import Footer from "@/components/footer/Footer"; // Assuming a generic footer component
interface ProductPageProps { interface ProductPageProps {
params: Promise<{ id: string }>; params: Promise<{ id: string }>;
@@ -97,7 +96,6 @@ function ProductPageContent({ params }: ProductPageProps) {
buttonClassName="shadow-lg" buttonClassName="shadow-lg"
navItemClassName="text-foreground/80 hover:text-foreground" navItemClassName="text-foreground/80 hover:text-foreground"
className="backdrop-blur-sm bg-card/70" className="backdrop-blur-sm bg-card/70"
navItemsAnimation="background-highlight"
/> />
</div> </div>
<div id="loading-section" data-section="loading-section"> <div id="loading-section" data-section="loading-section">
@@ -105,9 +103,6 @@ function ProductPageContent({ params }: ProductPageProps) {
<p className="text-foreground">Loading product...</p> <p className="text-foreground">Loading product...</p>
</main> </main>
</div> </div>
<div id="footer" data-section="footer">
<Footer />
</div>
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
@@ -136,7 +131,6 @@ function ProductPageContent({ params }: ProductPageProps) {
buttonClassName="shadow-lg" buttonClassName="shadow-lg"
navItemClassName="text-foreground/80 hover:text-foreground" navItemClassName="text-foreground/80 hover:text-foreground"
className="backdrop-blur-sm bg-card/70" className="backdrop-blur-sm bg-card/70"
navItemsAnimation="background-highlight"
/> />
</div> </div>
<div id="not-found-section" data-section="not-found-section"> <div id="not-found-section" data-section="not-found-section">
@@ -152,9 +146,6 @@ function ProductPageContent({ params }: ProductPageProps) {
</div> </div>
</main> </main>
</div> </div>
<div id="footer" data-section="footer">
<Footer />
</div>
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
@@ -182,7 +173,6 @@ function ProductPageContent({ params }: ProductPageProps) {
buttonClassName="shadow-lg" buttonClassName="shadow-lg"
navItemClassName="text-foreground/80 hover:text-foreground" navItemClassName="text-foreground/80 hover:text-foreground"
className="backdrop-blur-sm bg-card/70" className="backdrop-blur-sm bg-card/70"
navItemsAnimation="background-highlight"
/> />
</div> </div>
<div id="product-detail-card" data-section="product-detail-card"> <div id="product-detail-card" data-section="product-detail-card">
@@ -221,9 +211,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]} ]}
/> />
</div> </div>
<div id="footer" data-section="footer">
<Footer />
</div>
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );

View File

@@ -6,7 +6,6 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline'; import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog"; import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
import { useProductCatalog } from "@/hooks/useProductCatalog"; import { useProductCatalog } from "@/hooks/useProductCatalog";
import Footer from "@/components/footer/Footer"; // Assuming a generic footer component
function ShopPageContent() { function ShopPageContent() {
const { const {
@@ -40,7 +39,6 @@ function ShopPageContent() {
buttonClassName="shadow-lg" buttonClassName="shadow-lg"
navItemClassName="text-foreground/80 hover:text-foreground" navItemClassName="text-foreground/80 hover:text-foreground"
className="backdrop-blur-sm bg-card/70" className="backdrop-blur-sm bg-card/70"
navItemsAnimation="background-highlight"
/> />
</div> </div>
<div id="loading-section" data-section="loading-section"> <div id="loading-section" data-section="loading-section">
@@ -48,9 +46,6 @@ function ShopPageContent() {
<p className="text-foreground">Loading products...</p> <p className="text-foreground">Loading products...</p>
</main> </main>
</div> </div>
<div id="footer" data-section="footer">
<Footer />
</div>
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
@@ -78,7 +73,6 @@ function ShopPageContent() {
buttonClassName="shadow-lg" buttonClassName="shadow-lg"
navItemClassName="text-foreground/80 hover:text-foreground" navItemClassName="text-foreground/80 hover:text-foreground"
className="backdrop-blur-sm bg-card/70" className="backdrop-blur-sm bg-card/70"
navItemsAnimation="background-highlight"
/> />
</div> </div>
<div id="product-catalog" data-section="product-catalog"> <div id="product-catalog" data-section="product-catalog">
@@ -92,9 +86,6 @@ function ShopPageContent() {
emptyMessage="No products found" emptyMessage="No products found"
/> />
</div> </div>
<div id="footer" data-section="footer">
<Footer />
</div>
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );