development/d65fbd05-3e69-46ae-b056-e1b90ab1f5d4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
development merged 5 commits from version_1 into main 2026-01-15 10:15:53 +00:00
Conversation 0 Commits 5 Files Changed 5 +17 -28
1 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a4ea5824ca - Show all commits

45
src/app/products/page.tsx
View File

@@ -4,7 +4,7 @@ import Link from "next/link";
import NavbarStyleMinimal from '@/components/navbar/NavbarStyleMinimal';
import ProductCardOne from '@/components/sections/product/ProductCardOne';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import { ThemeProvider } from '@/components/ui/ThemeProvider';
import { ThemeProvider } from '@/providers/themeProvider/ThemeProvider';
export default function ProductsPage() {
return (
@@ -12,22 +12,27 @@ export default function ProductsPage() {
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="compact"
sizing="largeSizeMediumTitles"
contentWidth="medium"
sizing="medium"
background="aurora"
cardStyle="gradient-mesh"
primaryButtonStyle="double-inset"
secondaryButtonStyle="layered"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
showBlurBottom={false}
>
<div id="nav" data-section="nav">
<NavbarStyleMinimal
brandName="Bloom & Petals"
button={{
text: "Shop Now",
href: "/products"
text: "Shop Now", href: "/products"
}}
/>
<div style={{ position: 'absolute', top: '20px', right: '200px', zIndex: 1000 }}>
<Link href="/" style={{ marginRight: '15px', color: 'var(--foreground)' }}>Home</Link>
<Link href="/about" style={{ marginRight: '15px', color: 'var(--foreground)' }}>About</Link>
<Link href="/products" style={{ marginRight: '15px', color: 'var(--foreground)' }}>Products</Link>
<Link href="/contact" style={{ color: 'var(--foreground)' }}>Contact</Link>
</div>
</div>
<div id="products" data-section="products">
@@ -41,32 +46,16 @@ export default function ProductsPage() {
useInvertedBackground="noInvert"
products={[
{
id: "1",
name: "Red Rose Romance",
price: "$79.99",
imageSrc: "https://img.b2bpic.net/free-photo/elevated-view-red-rose-flower-vase_23-2148181221.jpg",
imageAlt: "Red roses bouquet"
id: "1", name: "Red Rose Romance", price: "$79.99", imageSrc: "https://img.b2bpic.net/free-photo/elevated-view-red-rose-flower-vase_23-2148181221.jpg", imageAlt: "Red roses bouquet"
},
{
id: "2",
name: "Spring Tulip Mix",
price: "$69.99",
imageSrc: "https://img.b2bpic.net/free-photo/red-roses-inside-transparent-glass-vase-room_114579-2701.jpg",
imageAlt: "Colorful tulips arrangement"
id: "2", name: "Spring Tulip Mix", price: "$69.99", imageSrc: "https://img.b2bpic.net/free-photo/red-roses-inside-transparent-glass-vase-room_114579-2701.jpg", imageAlt: "Colorful tulips arrangement"
},
{
id: "3",
name: "Sunflower Sunshine",
price: "$74.99",
imageSrc: "https://img.b2bpic.net/free-photo/close-up-man-holding-elegant-flowers_23-2148488537.jpg",
imageAlt: "Bright sunflowers"
id: "3", name: "Sunflower Sunshine", price: "$74.99", imageSrc: "https://img.b2bpic.net/free-photo/close-up-man-holding-elegant-flowers_23-2148488537.jpg", imageAlt: "Bright sunflowers"
},
{
id: "4",
name: "Orchid Elegance",
price: "$89.99",
imageSrc: "https://img.b2bpic.net/free-photo/beautiful-wedding-bouquet-roses_24837-420.jpg",
imageAlt: "Premium orchid arrangement"
id: "4", name: "Orchid Elegance", price: "$89.99", imageSrc: "https://img.b2bpic.net/free-photo/beautiful-wedding-bouquet-roses_24837-420.jpg", imageAlt: "Premium orchid arrangement"
}
]}
/>