bender/6295c6fc-e02a-4aac-9491-d05f3cd419c0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 4 commits from version_1 into main 2026-02-23 11:05:52 +00:00
Conversation 0 Commits 4 Files Changed 4 +53 -53
4 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/blog/page.tsx
View File

@@ -29,12 +29,12 @@ export default function BlogPage() {
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Collections", id: "collections" },
{ name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Collections", id: "/#collections" },
{ name: "About", id: "/#about" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
]}
button={{ text: "Contact Us", href: "contact" }}
button={{ text: "Contact Us", href: "/#contact" }}
brandName="Klar"
/>
</div>
@@ -62,22 +62,22 @@ export default function BlogPage() {
columns={[
{
title: "Studio", items: [
{ label: "About Us", href: "about" },
{ label: "Our Team", href: "team" },
{ label: "About Us", href: "/#about" },
{ label: "Our Team", href: "/#team" },
{ label: "Careers", href: "#" },
],
},
{
title: "Collections", items: [
{ label: "Bouquets", href: "collections" },
{ label: "Bouquets", href: "/#collections" },
{ label: "Weddings", href: "#" },
{ label: "Events", href: "#" },
],
},
{
title: "Support", items: [
{ label: "FAQ", href: "faq" },
{ label: "Contact", href: "contact" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" },
{ label: "Privacy Policy", href: "#" },
],
},

12
src/app/page.tsx
View File

@@ -28,7 +28,7 @@ export default function LandingPage() {
>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[{name: 'Home', id: 'home'}, {name: 'Collections', id: 'collections'}, {name: 'About', id: 'about'}, {name: 'Testimonials', id: 'testimonials'}, {name: 'FAQ', id: 'faq'}]}
navItems={[{name: 'Home', id: '/'}, {name: 'Collections', id: 'collections'}, {name: 'About', id: 'about'}, {name: 'Testimonials', id: 'testimonials'}, {name: 'FAQ', id: 'faq'}]}
button={{text: 'Contact Us', href: 'contact'}}
brandName="Klar"
/>
@@ -42,8 +42,8 @@ export default function LandingPage() {
imageSrc="https://img.b2bpic.net/free-photo/woman-holds-festive-flower-arrangement-with-bright-chrysanthemum-flowers_169016-51483.jpg"
imageAlt="Elegant flower arrangement for Klar Studio"
mediaAnimation="slide-up"
tagAnimation="entrance-slide"
buttonAnimation="entrance-slide"
tagAnimation="slide-up"
buttonAnimation="slide-up"
/>
</div>
<div id="about" data-section="about">
@@ -57,7 +57,7 @@ export default function LandingPage() {
imageSrc="https://img.b2bpic.net/free-photo/empty-clothing-store-filled-casual-formal-wear-items-hanging-fashion-store-racks-hangers-full-with-fashionable-clothes-accessories-discount-small-business-commercial-activity_482257-65075.jpg"
imageAlt="Florist arranging flowers in a beautiful studio"
mediaAnimation="slide-up"
tagAnimation="entrance-slide"
tagAnimation="slide-up"
useInvertedBackground={false}
/>
</div>
@@ -111,11 +111,11 @@ export default function LandingPage() {
description="Find answers to common questions about our services, orders, and studio."
faqs={[
{id: '1', title: 'What kind of flowers do you offer?', content: 'We offer a wide range of fresh, seasonal flowers, including classic roses, exotic orchids, vibrant tulips, and unique wildflowers. Our selection changes regularly based on availability and season.'},
{id: '2', title: 'Can I request a custom floral arrangement?', content: 'Absolutely! We specialize in custom designs. You can contact us directly to discuss your specific needs, preferred flowers, color palette, and occasion. We\'ll work with you to create something truly unique.'},
{id: '2', title: 'Can I request a custom floral arrangement?', content: "Absolutely! We specialize in custom designs. You can contact us directly to discuss your specific needs, preferred flowers, color palette, and occasion. We'll work with you to create something truly unique."},
{id: '3', title: 'Do you offer same-day delivery?', content: 'Yes, we offer same-day delivery for orders placed before 12 PM local time, subject to availability. Please check our delivery policy or contact us for more details and specific requirements.'},
{id: '4', title: 'What areas do you deliver to?', content: 'We deliver within the greater metropolitan area. For specific delivery zones and any special requests outside these areas, please reach out to our team.'},
{id: '5', title: 'How do I care for my flowers to make them last longer?', content: 'To extend the life of your flowers, trim the stems at an angle, change the water daily, and keep them away from direct sunlight, heat sources, and ripening fruit. We also provide care instructions with every order.'},
{id: '6', title: 'Do you cater to weddings and corporate events?', content: 'Yes, we have extensive experience with weddings, corporate events, and other special occasions. We offer full-service floral design, from consultation to setup. Please visit our \'Events\' section or contact us to schedule a consultation.'}
{id: '6', title: 'Do you cater to weddings and corporate events?', content: "Yes, we have extensive experience with weddings, corporate events, and other special occasions. We offer full-service floral design, from consultation to setup. Please visit our 'Events' section or contact us to schedule a consultation."}
]}
faqsAnimation="slide-up"
textboxLayout="default"

42
src/app/shop/[id]/page.tsx
View File

@@ -93,10 +93,10 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Collections", id: "collections" },
{ name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Collections", id: "/#collections" },
{ name: "About", id: "/#about" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Shop", id: "/shop" },
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -111,9 +111,9 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{ title: "Studio", items: [{ label: "About Us", href: "about" }, { label: "Our Team", href: "team" }, { label: "Careers", href: "#" }] },
{ title: "Collections", items: [{ label: "Bouquets", href: "collections" }, { label: "Weddings", href: "#" }, { label: "Events", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "faq" }, { label: "Contact", href: "contact" }, { label: "Privacy Policy", href: "#" }] }
{ title: "Studio", items: [{ label: "About Us", href: "/#about" }, { label: "Our Team", href: "/#team" }, { label: "Careers", href: "#" }] },
{ title: "Collections", items: [{ label: "Bouquets", href: "/#collections" }, { label: "Weddings", href: "#" }, { label: "Events", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }, { label: "Privacy Policy", href: "#" }] }
]}
copyrightText="© 2024 Klar Flowers Studio. All rights reserved."
/>
@@ -142,10 +142,10 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Collections", id: "collections" },
{ name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Collections", id: "/#collections" },
{ name: "About", id: "/#about" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Shop", id: "/shop" },
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -166,9 +166,9 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{ title: "Studio", items: [{ label: "About Us", href: "about" }, { label: "Our Team", href: "team" }, { label: "Careers", href: "#" }] },
{ title: "Collections", items: [{ label: "Bouquets", href: "collections" }, { label: "Weddings", href: "#" }, { label: "Events", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "faq" }, { label: "Contact", href: "contact" }, { label: "Privacy Policy", href: "#" }] }
{ title: "Studio", items: [{ label: "About Us", href: "/#about" }, { label: "Our Team", href: "/#team" }, { label: "Careers", href: "#" }] },
{ title: "Collections", items: [{ label: "Bouquets", href: "/#collections" }, { label: "Weddings", href: "#" }, { label: "Events", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }, { label: "Privacy Policy", href: "#" }] }
]}
copyrightText="© 2024 Klar Flowers Studio. All rights reserved."
/>
@@ -196,10 +196,10 @@ function ProductPageContent({ params }: ProductPageProps) {
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Collections", id: "collections" },
{ name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Collections", id: "/#collections" },
{ name: "About", id: "/#about" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Shop", id: "/shop" },
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -245,9 +245,9 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{ title: "Studio", items: [{ label: "About Us", href: "about" }, { label: "Our Team", href: "team" }, { label: "Careers", href: "#" }] },
{ title: "Collections", items: [{ label: "Bouquets", href: "collections" }, { label: "Weddings", href: "#" }, { label: "Events", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "faq" }, { label: "Contact", href: "contact" }, { label: "Privacy Policy", href: "#" }] }
{ title: "Studio", items: [{ label: "About Us", href: "/#about" }, { label: "Our Team", href: "/#team" }, { label: "Careers", href: "#" }] },
{ title: "Collections", items: [{ label: "Bouquets", href: "/#collections" }, { label: "Weddings", href: "#" }, { label: "Events", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }, { label: "Privacy Policy", href: "#" }] }
]}
copyrightText="© 2024 Klar Flowers Studio. All rights reserved."
/>

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

@@ -36,13 +36,13 @@ function ShopPageContent() {
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Collections", id: "collections" },
{ name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Collections", id: "/#collections" },
{ name: "About", id: "/#about" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Shop", id: "/shop" },
]}
button={{ text: "Contact Us", href: "contact" }}
button={{ text: "Contact Us", href: "/#contact" }}
brandName="Klar"
/>
</div>
@@ -54,9 +54,9 @@ function ShopPageContent() {
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{ title: "Studio", items: [{ label: "About Us", href: "about" }, { label: "Our Team", href: "team" }, { label: "Careers", href: "#" }] },
{ title: "Collections", items: [{ label: "Bouquets", href: "collections" }, { label: "Weddings", href: "#" }, { label: "Events", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "faq" }, { label: "Contact", href: "contact" }, { label: "Privacy Policy", href: "#" }] }
{ title: "Studio", items: [{ label: "About Us", href: "/#about" }, { label: "Our Team", href: "/#team" }, { label: "Careers", href: "#" }] },
{ title: "Collections", items: [{ label: "Bouquets", href: "/#collections" }, { label: "Weddings", href: "#" }, { label: "Events", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }, { label: "Privacy Policy", href: "#" }] }
]}
copyrightText="© 2024 Klar Flowers Studio. All rights reserved."
/>
@@ -84,13 +84,13 @@ function ShopPageContent() {
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Collections", id: "collections" },
{ name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Collections", id: "/#collections" },
{ name: "About", id: "/#about" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Shop", id: "/shop" },
]}
button={{ text: "Contact Us", href: "contact" }}
button={{ text: "Contact Us", href: "/#contact" }}
brandName="Klar"
/>
</div>
@@ -108,9 +108,9 @@ function ShopPageContent() {
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[
{ title: "Studio", items: [{ label: "About Us", href: "about" }, { label: "Our Team", href: "team" }, { label: "Careers", href: "#" }] },
{ title: "Collections", items: [{ label: "Bouquets", href: "collections" }, { label: "Weddings", href: "#" }, { label: "Events", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "faq" }, { label: "Contact", href: "contact" }, { label: "Privacy Policy", href: "#" }] }
{ title: "Studio", items: [{ label: "About Us", href: "/#about" }, { label: "Our Team", href: "/#team" }, { label: "Careers", href: "#" }] },
{ title: "Collections", items: [{ label: "Bouquets", href: "/#collections" }, { label: "Weddings", href: "#" }, { label: "Events", href: "#" }] },
{ title: "Support", items: [{ label: "FAQ", href: "/#faq" }, { label: "Contact", href: "/#contact" }, { label: "Privacy Policy", href: "#" }] }
]}
copyrightText="© 2024 Klar Flowers Studio. All rights reserved."
/>