diff --git a/src/app/shop/page.tsx b/src/app/shop/page.tsx
index 599fa4b..9f29ac3 100644
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -1,154 +1,88 @@
-use client";
+"use client";
 
-import { Suspense, useCallback } from "react";
-import ReactLenis from "lenis/react";
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import ProductCardOne from '@/components/sections/product/ProductCardOne';
 import FooterBase from '@/components/sections/footer/FooterBase';
-import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
-import ProductCart from "@/components/ecommerce/cart/ProductCart";
-import { useProductCatalog } from "@/hooks/useProductCatalog";
-import { useCart } from "@/hooks/useCart";
-import { useCheckout } from "@/hooks/useCheckout";
-
-function ShopPageContent() {
-    const {
-        products,
-        isLoading,
-        search,
-        setSearch,
-        filters,
-    } = useProductCatalog({ basePath: "/shop" });
-
-    const {
-        items: cartItems,
-        isOpen: cartOpen,
-        setIsOpen: setCartOpen,
-        updateQuantity,
-        removeItem,
-        total: cartTotal,
-        getCheckoutItems,
-    } = useCart();
-
-    const { checkout, isLoading: isCheckoutLoading } = useCheckout();
-
-    const handleCheckout = useCallback(async () => {
-        if (cartItems.length === 0) return;
-
-        const currentUrl = new URL(window.location.href);
-        currentUrl.searchParams.set("success", "true");
-
-        await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
-    }, [cartItems, checkout, getCheckoutItems]);
-
-    if (isLoading) {
-        return (
-            <ThemeProvider
-                defaultButtonVariant="hover-magnetic"
-                defaultTextAnimation="reveal-blur"
-                borderRadius="rounded"
-                contentWidth="mediumLarge"
-                sizing="largeSmallSizeLargeTitles"
-                background="floatingGradient"
-                cardStyle="glass-depth"
-                primaryButtonStyle="diagonal-gradient"
-                secondaryButtonStyle="layered"
-                headingFontWeight="bold"
-            >
-                <ReactLenis root>
-                    <div id="navbar" data-section="navbar">
-                        <NavbarStyleApple
-                            brandName="Hookah Haven"
-                            navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                        />
-                    </div>
-                    <main className="min-h-screen flex items-center justify-center pt-20">
-                        <p className="text-foreground">Loading products...</p>
-                    </main>
-                    <div id="footer" data-section="footer">
-                        <FooterBase
-                            logoText="Hookah Haven"
-                            copyrightText="© 2024 Hookah Haven. All rights reserved."
-                            columns={[
-                                { title: "Shop", items: [{ label: "Hookahs", href: "/products#hookahs" }, { label: "Tobacco", href: "/products#tobacco" }, { label: "Charcoal", href: "/products#charcoal" }, { label: "Accessories", href: "/products#accessories" }] },
-                                { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Blog", href: "/blog" }, { label: "Contact", href: "/contact" }] },
-                                { title: "Legal", items: [{ label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
-                            ]}
-                        />
-                    </div>
-                </ReactLenis>
-            </ThemeProvider>
-        );
-    }
-
-    return (
-        <ThemeProvider
-            defaultButtonVariant="hover-magnetic"
-            defaultTextAnimation="reveal-blur"
-            borderRadius="rounded"
-            contentWidth="mediumLarge"
-            sizing="largeSmallSizeLargeTitles"
-            background="floatingGradient"
-            cardStyle="glass-depth"
-            primaryButtonStyle="diagonal-gradient"
-            secondaryButtonStyle="layered"
-            headingFontWeight="bold"
-        >
-            <ReactLenis root>
-                <div id="navbar" data-section="navbar">
-                    <NavbarStyleApple
-                        brandName="Hookah Haven"
-                        navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
-                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
-                    />
-                </div>
-                <div id="product-catalog" data-section="product-catalog">
-                    <ProductCatalog
-                        layout="page"
-                        products={products}
-                        searchValue={search}
-                        onSearchChange={setSearch}
-                        searchPlaceholder="Search products..."
-                        filters={filters}
-                        emptyMessage="No products found"
-                    />
-                </div>
-                <div id="product-cart" data-section="product-cart">
-                    <ProductCart
-                        isOpen={cartOpen}
-                        onClose={() => setCartOpen(false)}
-                        items={cartItems}
-                        onQuantityChange={updateQuantity}
-                        onRemove={removeItem}
-                        total={`$${cartTotal}`}
-                        buttons={[
-                            {
-                                text: isCheckoutLoading ? "Processing..." : "Check Out",                                onClick: handleCheckout,
-                            },
-                        ]}
-                    />
-                </div>
-                <div id="footer" data-section="footer">
-                    <FooterBase
-                        logoText="Hookah Haven"
-                        copyrightText="© 2024 Hookah Haven. All rights reserved."
-                        columns={[
-                            { title: "Shop", items: [{ label: "Hookahs", href: "/products#hookahs" }, { label: "Tobacco", href: "/products#tobacco" }, { label: "Charcoal", href: "/products#charcoal" }, { label: "Accessories", href: "/products#accessories" }] },
-                            { title: "Company", items: [{ label: "About Us", href: "/about" }, { label: "Blog", href: "/blog" }, { label: "Contact", href: "/contact" }] },
-                            { title: "Legal", items: [{ label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
-                        ]}
-                    />
-                </div>
-            </ReactLenis>
-        </ThemeProvider>
-    );
-}
 
 export default function ShopPage() {
-    return (
-        <Suspense>
-            <ShopPageContent />
-        </Suspense>
-    );
+  const navItems = [
+    { name: "Home", id: "/" },
+    { name: "Products", id: "/products" },
+    { name: "About", id: "/about" },
+    { name: "Contact", id: "/contact" }
+  ];
+
+  const footerColumns = [
+    {
+      title: "Shop",      items: [
+        { label: "Hookahs", href: "/products" },
+        { label: "Tobacco", href: "/products" },
+        { label: "Charcoal", href: "/products" },
+        { label: "Accessories", href: "/products" },
+      ],
+    },
+    {
+      title: "Company",      items: [
+        { label: "About Us", href: "/about" },
+        { label: "Blog", href: "/blog" },
+        { label: "Contact", href: "/contact" },
+      ],
+    },
+    {
+      title: "Legal",      items: [
+        { label: "Privacy Policy", href: "/privacy" },
+        { label: "Terms of Service", href: "/terms" },
+      ],
+    },
+  ];
+
+  return (
+    <ThemeProvider
+      defaultButtonVariant="hover-magnetic"
+      defaultTextAnimation="reveal-blur"
+      borderRadius="rounded"
+      contentWidth="mediumLarge"
+      sizing="largeSmallSizeLargeTitles"
+      background="floatingGradient"
+      cardStyle="glass-depth"
+      primaryButtonStyle="diagonal-gradient"
+      secondaryButtonStyle="layered"
+      headingFontWeight="bold"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarStyleApple
+          brandName="Hookah Haven"
+          navItems={navItems}
+        />
+      </div>
+
+      <div id="products" data-section="products">
+        <ProductCardOne
+          title="Our Signature Collection"
+          description="Hand-picked for connoisseurs: discover our best-selling hookahs, premium tobacco, and essential accessories."
+          products={[
+            { id: "1", name: "Classic Elegance Hookah", price: "$129.99", imageSrc: "https://img.b2bpic.net/free-photo/meduza-hookah-with-cockatails-side-view_140725-9140.jpg", imageAlt: "Classic glass hookah" },
+            { id: "2", name: "Rich Vanilla Tobacco", price: "$19.99", imageSrc: "https://img.b2bpic.net/free-photo/fresh-shisha-woman-hands_140725-1338.jpg", imageAlt: "Pack of vanilla hookah tobacco" },
+            { id: "3", name: "Natural Coconut Charcoal", price: "$14.99", imageSrc: "https://img.b2bpic.net/free-photo/hookah-still-life-composition_23-2149213336.jpg", imageAlt: "Box of natural coconut charcoal" },
+            { id: "4", name: "Premium Ceramic Bowl", price: "$24.99", imageSrc: "https://img.b2bpic.net/free-photo/hookah-isolated-white_93675-132617.jpg", imageAlt: "Detailed ceramic hookah bowl" },
+            { id: "5", name: "Beginner's Hookah Kit", price: "$89.99", imageSrc: "https://img.b2bpic.net/free-photo/people-enjoying-night-out-together_23-2149173653.jpg", imageAlt: "Complete hookah starter kit" },
+            { id: "6", name: "Exotic Flavor Assortment", price: "$49.99", imageSrc: "https://img.b2bpic.net/free-photo/side-view-woman-imposes-pineapple-jam-saucer-with-nuts-glass-tea-table_141793-13056.jpg", imageAlt: "Collection of various hookah tobacco flavors" }
+          ]}
+          gridVariant="three-columns-all-equal-width"
+          animationType="slide-up"
+          textboxLayout="default"
+          useInvertedBackground={false}
+        />
+      </div>
+
+      <div id="footer" data-section="footer">
+        <FooterBase
+          logoText="Hookah Haven"
+          copyrightText="© 2024 Hookah Haven. All rights reserved."
+          columns={footerColumns}
+        />
+      </div>
+    </ThemeProvider>
+  );
 }