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

Browse Source 
Merge version_1 into main
This commit was merged in pull request #2.
This commit is contained in:
development
2026-01-15 10:18:01 +00:00
parent c324ce2faa 188da41e82
commit 38a759e475
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,6 @@ export default function AboutPage() {
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
showBlurBottom={false}
>
<div id="nav" data-section="nav">
<NavbarStyleMinimal

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

@@ -18,7 +18,6 @@ export default function ContactPage() {
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
showBlurBottom={false}
>
<div id="nav" data-section="nav">
<NavbarStyleMinimal

11
src/app/page.tsx
View File

@@ -19,7 +19,6 @@ export default function HomePage() {
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
showBlurBottom={false}
>
<div id="nav" data-section="nav">
<NavbarStyleMinimal
@@ -44,8 +43,8 @@ export default function HomePage() {
imageSrc="https://img.b2bpic.net/free-photo/high-angle-beautiful-boho-flowers_23-2149526052.jpg"
imageAlt="Beautiful fresh flower arrangement"
buttons={[
{ text: "Browse Collection", href: "/products" },
{ text: "Learn More", href: "/about" }
{ text: "Browse Collection", href: "products" },
{ text: "Learn More", href: "about" }
]}
/>
</div>
@@ -64,13 +63,11 @@ export default function HomePage() {
imageSrc: "https://img.b2bpic.net/free-photo/arm-close-up-woman-with-shopping-bags_1098-2428.jpg"
},
{
id: "2", name: "Michael Chen",
handle: "@mchen_photos", testimonial: "Best floral service I've used. Fast delivery, gorgeous arrangements, and excellent customer service.", rating: 5,
id: "2", name: "Michael Chen", handle: "@mchen_photos", testimonial: "Best floral service I've used. Fast delivery, gorgeous arrangements, and excellent customer service.", rating: 5,
imageSrc: "https://img.b2bpic.net/free-photo/portrait-woman-happy-after-shopping_23-2148660676.jpg"
},
{
id: "3", name: "Emily Rodriguez", handle: "@emilyrodz",
testimonial: "Custom arrangement was exactly what I envisioned. The florist understood my vision perfectly.", rating: 5,
id: "3", name: "Emily Rodriguez", handle: "@emilyrodz", testimonial: "Custom arrangement was exactly what I envisioned. The florist understood my vision perfectly.", rating: 5,
imageSrc: "https://img.b2bpic.net/free-photo/girl-looking-away-medium-shot_23-2148225705.jpg"
}
]}

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

@@ -18,7 +18,6 @@ export default function ProductsPage() {
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
showBlurBottom={false}
>
<div id="nav" data-section="nav">
<NavbarStyleMinimal