diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx index 138dbb9..d61d4c8 100644 --- a/src/app/blog/page.tsx +++ b/src/app/blog/page.tsx @@ -1,6 +1,7 @@ -use client"; +"use client"; -import ReactLenis from "lenis/react"; +import React from 'react'; +import Link from 'next/link'; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { useBlogPosts } from "@/hooks/useBlogPosts"; @@ -16,6 +17,16 @@ import FooterMedia from '@/components/sections/footer/FooterMedia'; export default function BlogPage() { const { posts, isLoading } = useBlogPosts(); + const navItems = [ + { name: "Home", id: "/" }, + { name: "Shop", id: "/#shop" }, + { name: "About", id: "/#about" }, + { name: "Features", id: "/#features" }, + { name: "Testimonials", id: "/#testimonials" }, + { name: "FAQ", id: "/#faq" }, + { name: "Contact", id: "/#contact" }, + ]; + return ( - + - {isLoading ? ( -
-

Loading posts...

-
- ) : ( -
+ {isLoading ? ( +
+

Loading posts...

+
+ ) : ( +
+
-
- )} - + +
+ )} + + ); } diff --git a/src/app/page.tsx b/src/app/page.tsx index 459410a..d313c2c 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,6 +1,7 @@ "use client"; import React from 'react'; +import Link from 'next/link'; import { Award, CheckCircle, Heart, HelpCircle, Mail, MessageSquare, Sparkles } from 'lucide-react'; import { ThemeProvider } from '@/providers/themeProvider/ThemeProvider'; @@ -15,6 +16,15 @@ import ContactCenter from '@/components/sections/contact/ContactCenter'; import FooterMedia from '@/components/sections/footer/FooterMedia'; export default function LandingPage() { + const navItems = [ + { name: 'Shop', id: '#shop' }, + { name: 'About', id: '#about' }, + { name: 'Features', id: '#features' }, + { name: 'Testimonials', id: '#testimonials' }, + { name: 'FAQ', id: '#faq' }, + { name: 'Contact', id: '#contact' }, + ]; + return ( -
- + -
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
-
- -
+
+ +
- -
+ ); } diff --git a/src/app/shop/[id]/page.tsx b/src/app/shop/[id]/page.tsx index 60fdbef..dabd065 100644 --- a/src/app/shop/[id]/page.tsx +++ b/src/app/shop/[id]/page.tsx @@ -2,7 +2,7 @@ import { Suspense, use, useCallback } from "react"; import { useRouter } from "next/navigation"; -import ReactLenis from "lenis/react"; +import Link from 'next/link'; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay'; import FooterMedia from '@/components/sections/footer/FooterMedia'; @@ -16,6 +16,17 @@ interface ProductPageProps { params: Promise<{ id: string }>; } +const navItems = [ + { name: "Home", id: "/" }, + { name: "Shop", id: "/shop" }, + { name: "About", id: "/#about" }, + { name: "Features", id: "/#features" }, + { name: "Testimonials", id: "/#testimonials" }, + { name: "FAQ", id: "/#faq" }, + { name: "Contact", id: "/#contact" }, +]; + + export default function ProductPage({ params }: ProductPageProps) { return ( @@ -74,108 +85,52 @@ function ProductPageContent({ params }: ProductPageProps) { await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() }); }, [cartItems, checkout, getCheckoutItems]); - if (isLoading) { + const MainContent = () => { + if (isLoading) { + return ( +
+

Loading product...

+
+ ) + } + if (!product) { + return ( +
+
+

Product not found

+ +
+
+ ); + } return ( - - - -
-

Loading product...

-
- - - - ); - } - - if (!product) { - return ( - - - -
-
-

Product not found

- -
-
- - - - ); +
+ 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 }, + ]} + /> +
+ ) } return ( @@ -191,69 +146,46 @@ function ProductPageContent({ params }: ProductPageProps) { secondaryButtonStyle="layered" headingFontWeight="extrabold" > - - -
- 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 }, - ]} - /> -
-
- setCartOpen(false)} - items={cartItems} - onQuantityChange={updateQuantity} - onRemove={removeItem} - total={`$${cartTotal}`} - buttons={[ - { - text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout, - }, - ]} - /> -
- - + + +
+ setCartOpen(false)} + items={cartItems} + onQuantityChange={updateQuantity} + onRemove={removeItem} + total={`$${cartTotal}`} + buttons={[ + { + text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout, + }, + ]} + /> +
+ ); } diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx index 6e07b07..7170f3b 100644 --- a/src/app/shop/page.tsx +++ b/src/app/shop/page.tsx @@ -1,13 +1,22 @@ "use client"; import { Suspense } from "react"; -import ReactLenis from "lenis/react"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; +import Link from 'next/link'; import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay'; import FooterMedia from '@/components/sections/footer/FooterMedia'; import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog"; import { useProductCatalog } from "@/hooks/useProductCatalog"; +const navItems = [ + { name: "Home", id: "/" }, + { name: "About", id: "/#about" }, + { name: "Features", id: "/#features" }, + { name: "Testimonials", id: "/#testimonials" }, + { name: "FAQ", id: "/#faq" }, + { name: "Contact", id: "/#contact" }, +]; + function ShopPageContent() { const { products, @@ -17,54 +26,6 @@ function ShopPageContent() { filters, } = useProductCatalog({ basePath: "/shop" }); - if (isLoading) { - return ( - - - -
-

Loading products...

-
- - - - ); - } - return ( - - + + {isLoading ? ( +
+

Loading products...

+
+ ) : (
- - + )} + ); }