bender/81bd7e57-bab6-41ef-b54d-bf45bd67bea5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #4

Merged
bender merged 2 commits from version_2 into main 2026-04-03 21:32:13 +00:00
Conversation 0 Commits 2 Files Changed 2 +36 -39
2 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/app/cart/page.tsx
View File

@@ -2,36 +2,31 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import ProductCart from '@/components/ecommerce/cart/ProductCart';
import FooterBase from '@/components/sections/footer/FooterBase';
import { useState } from "react";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import FooterMedia from '@/components/sections/footer/FooterMedia';
export default function CartPage() {
const [items, setItems] = useState([
{ id: "p1", name: "Premium Gadget", price: "$129", quantity: 1, imageSrc: "http://img.b2bpic.net/free-photo/green-leaves-stacked-book-against-white-backdrop_23-2147924495.jpg" }
]);
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "hero" }, { name: "Cart", id: "/cart" }, { name: "Checkout", id: "/checkout" }]}
brandName="ShopifyPro"
/>
<main className="py-20 px-6 container mx-auto">
<ProductCart
isOpen={true}
onClose={() => {}}
items={items}
total="$129"
buttons={[{ text: "Checkout Now", href: "/checkout" }]}
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Cart", id: "/cart" }, { name: "Checkout", id: "/checkout" }]}
brandName="ShopifyPro"
button={{ text: "Contact", href: "#contact" }}
/>
</div>
<main className="py-20 px-6 container mx-auto">
<h1 className="text-4xl font-bold mb-8">Your Cart</h1>
<p>Cart items will appear here.</p>
</main>
<FooterBase
columns={[{ title: "Company", items: [{ label: "About Us", href: "#" }] }]}
logoText="ShopifyPro"
/>
<div id="footer" data-section="footer">
<FooterMedia
logoText="ShopifyPro"
imageSrc="https://img.b2bpic.net/free-photo/green-leaves-stacked-book-against-white-backdrop_23-2147924495.jpg"
columns={[{ title: "Company", items: [{ label: "About Us", href: "#" }] }]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);

32
src/app/checkout/page.tsx
View File

@@ -2,25 +2,24 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import FooterBase from '@/components/sections/footer/FooterBase';
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import FooterMedia from '@/components/sections/footer/FooterMedia';
export default function CheckoutPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "hero" }, { name: "Cart", id: "/cart" }, { name: "Checkout", id: "/checkout" }]}
brandName="ShopifyPro"
/>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Cart", id: "/cart" }, { name: "Checkout", id: "/checkout" }]}
brandName="ShopifyPro"
button={{ text: "Contact", href: "#contact" }}
/>
</div>
<main className="py-20 px-6 container mx-auto flex flex-col items-center">
<h1 className="text-4xl font-bold mb-8">Checkout</h1>
<div className="w-full max-w-2xl bg-card p-8 rounded-lg shadow-sm border border-border">
<h2 className="text-xl font-semibold mb-4">Order Summary</h2>
<div className="flex justify-between border-b pb-4 mb-4">
<span>Premium Gadget (x1)</span>
<span>$129</span>
</div>
<div className="flex justify-between font-bold text-xl mb-8">
<span>Total</span>
<span>$129</span>
@@ -30,10 +29,13 @@ export default function CheckoutPage() {
</button>
</div>
</main>
<FooterBase
columns={[{ title: "Company", items: [{ label: "About Us", href: "#" }] }]}
logoText="ShopifyPro"
/>
<div id="footer" data-section="footer">
<FooterMedia
logoText="ShopifyPro"
imageSrc="https://img.b2bpic.net/free-photo/green-leaves-stacked-book-against-white-backdrop_23-2147924495.jpg"
columns={[{ title: "Company", items: [{ label: "About Us", href: "#" }] }]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);