bender/4f0231be-06f4-47d9-802a-42511fded151
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #3

Merged
bender merged 7 commits from version_2 into main 2026-04-06 15:55:56 +00:00
Conversation 0 Commits 7 Files Changed 7 +7 -6
7 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function CartPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleCentered navItems={[{ name: "Home", id: "/" }, { name: "Cart", id: "/cart" }]} brandName="E-Shop" />
<div className="container mx-auto py-20 px-6">
<h1 className="text-4xl font-bold mb-8">Your Shopping Cart</h1>

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

@@ -5,7 +5,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function CheckoutPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleCentered navItems={[{ name: "Home", id: "/" }, { name: "Cart", id: "/cart" }]} brandName="E-Shop" />
<div className="container mx-auto py-20 px-6">
<h1 className="text-4xl font-bold mb-8">Checkout</h1>

2
src/app/confirmation/page.tsx
View File

@@ -5,7 +5,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function ConfirmationPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleCentered navItems={[{ name: "Home", id: "/" }, { name: "Cart", id: "/cart" }]} brandName="E-Shop" />
<div className="container mx-auto py-20 px-6">
<h1 className="text-4xl font-bold mb-8">Thank You!</h1>

2
src/app/haircare/page.tsx
View File

@@ -5,7 +5,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function HaircarePage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Skincare", id: "/skincare" }, { name: "Makeup", id: "/makeup" }, { name: "Haircare", id: "/haircare" }, { name: "Contact", id: "/" }]}
brandName="E-Shop"

2
src/app/makeup/page.tsx
View File

@@ -5,7 +5,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function MakeupPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Skincare", id: "/skincare" }, { name: "Makeup", id: "/makeup" }, { name: "Haircare", id: "/haircare" }, { name: "Contact", id: "/" }]}
brandName="E-Shop"

1
src/app/shop/page.tsx
View File

@@ -67,6 +67,7 @@ export default function ShopPage() {
animationType="slide-up"
textboxLayout="default"
gridVariant="uniform-all-items-equal"
useInvertedBackground={false}
title="Shop Products"
description="Explore our full range of curated items."
products={products.filter(p => p.name.toLowerCase().includes(search.toLowerCase()))}

2
src/app/skincare/page.tsx
View File

@@ -5,7 +5,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function SkincarePage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Skincare", id: "/skincare" }, { name: "Makeup", id: "/makeup" }, { name: "Haircare", id: "/haircare" }, { name: "Contact", id: "/" }]}
brandName="E-Shop"