development/4dddaf34-92d4-4076-9044-ad4add35e20c
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 #3.
This commit is contained in:
development
2026-01-15 10:47:55 +00:00
parent c6916a0069 05f079b0ef
commit c074cff8ab
4 changed files with 148 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ export default function AboutPage() {
primaryButtonStyle="gradient" primaryButtonStyle="gradient"
secondaryButtonStyle="glass" secondaryButtonStyle="glass"
showBlurBottom={false} showBlurBottom={false}
headingFontWeight="semibold"
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
<NavbarStyleApple <NavbarStyleApple
@@ -74,40 +73,42 @@ export default function AboutPage() {
/> />
</div> </div>
<FooterBaseCard <div id="footer" data-section="footer">
logoText="Kvitka Moya" <FooterBaseCard
columns={[ logoText="Kvitka Moya"
{ columns={[
title: "Shop", items: [ {
{ label: "Arrangements", href: "/products" }, title: "Shop", items: [
{ label: "Seasonal Flowers", href: "/products" }, { label: "Arrangements", href: "/products" },
{ label: "Custom Orders", href: "/contact" } { label: "Seasonal Flowers", href: "/products" },
] { label: "Custom Orders", href: "/contact" }
}, ]
{ },
title: "Company", items: [ {
{ label: "About Us", href: "/about" }, title: "Company", items: [
{ label: "Delivery Info", href: "/about" }, { label: "About Us", href: "/about" },
{ label: "Blog", href: "#" } { label: "Delivery Info", href: "/about" },
] { label: "Blog", href: "#" }
}, ]
{ },
title: "Support", items: [ {
{ label: "FAQ", href: "/faq" }, title: "Support", items: [
{ label: "Contact", href: "/contact" }, { label: "FAQ", href: "/faq" },
{ label: "Track Order", href: "#" } { label: "Contact", href: "/contact" },
] { label: "Track Order", href: "#" }
}, ]
{ },
title: "Connect", items: [ {
{ label: "Instagram", href: "https://instagram.com" }, title: "Connect", items: [
{ label: "Facebook", href: "https://facebook.com" }, { label: "Instagram", href: "https://instagram.com" },
{ label: "Newsletter", href: "/contact" } { label: "Facebook", href: "https://facebook.com" },
] { label: "Newsletter", href: "/contact" }
} ]
]} }
copyrightText="© 2025 Kvitka Moya. All rights reserved." ]}
/> copyrightText="© 2025 Kvitka Moya. All rights reserved."
/>
</div>
</ThemeProvider> </ThemeProvider>
); );
} }

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

@@ -19,7 +19,6 @@ export default function ContactPage() {
primaryButtonStyle="gradient" primaryButtonStyle="gradient"
secondaryButtonStyle="glass" secondaryButtonStyle="glass"
showBlurBottom={false} showBlurBottom={false}
headingFontWeight="semibold"
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
<NavbarStyleApple <NavbarStyleApple
@@ -38,47 +37,49 @@ export default function ContactPage() {
text="Ready to brighten someone's day? Get in touch with us today to order your perfect arrangement or discuss custom options." text="Ready to brighten someone's day? Get in touch with us today to order your perfect arrangement or discuss custom options."
animationType="entrance-slide" animationType="entrance-slide"
buttons={[ buttons={[
{ text: "Contact Us", href: "/contact" }, { text: "Contact Us", href: "contact" },
{ text: "Shop Now", href: "/products" } { text: "Shop Now", href: "products" }
]} ]}
useInvertedBackground="noInvert" useInvertedBackground="noInvert"
/> />
</div> </div>
<FooterBaseCard <div id="footer" data-section="footer">
logoText="Kvitka Moya" <FooterBaseCard
columns={[ logoText="Kvitka Moya"
{ columns={[
title: "Shop", items: [ {
{ label: "Arrangements", href: "/products" }, title: "Shop", items: [
{ label: "Seasonal Flowers", href: "/products" }, { label: "Arrangements", href: "/products" },
{ label: "Custom Orders", href: "/contact" } { label: "Seasonal Flowers", href: "/products" },
] { label: "Custom Orders", href: "/contact" }
}, ]
{ },
title: "Company", items: [ {
{ label: "About Us", href: "/about" }, title: "Company", items: [
{ label: "Delivery Info", href: "/about" }, { label: "About Us", href: "/about" },
{ label: "Blog", href: "#" } { label: "Delivery Info", href: "/about" },
] { label: "Blog", href: "#" }
}, ]
{ },
title: "Support", items: [ {
{ label: "FAQ", href: "/faq" }, title: "Support", items: [
{ label: "Contact", href: "/contact" }, { label: "FAQ", href: "/faq" },
{ label: "Track Order", href: "#" } { label: "Contact", href: "/contact" },
] { label: "Track Order", href: "#" }
}, ]
{ },
title: "Connect", items: [ {
{ label: "Instagram", href: "https://instagram.com" }, title: "Connect", items: [
{ label: "Facebook", href: "https://facebook.com" }, { label: "Instagram", href: "https://instagram.com" },
{ label: "Newsletter", href: "/contact" } { label: "Facebook", href: "https://facebook.com" },
] { label: "Newsletter", href: "/contact" }
} ]
]} }
copyrightText="© 2025 Kvitka Moya. All rights reserved." ]}
/> copyrightText="© 2025 Kvitka Moya. All rights reserved."
/>
</div>
</ThemeProvider> </ThemeProvider>
); );
} }

71
src/app/faq/page.tsx
View File

@@ -19,7 +19,6 @@ export default function FaqPage() {
primaryButtonStyle="gradient" primaryButtonStyle="gradient"
secondaryButtonStyle="glass" secondaryButtonStyle="glass"
showBlurBottom={false} showBlurBottom={false}
headingFontWeight="semibold"
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
<NavbarStyleApple <NavbarStyleApple
@@ -66,40 +65,42 @@ export default function FaqPage() {
/> />
</div> </div>
<FooterBaseCard <div id="footer" data-section="footer">
logoText="Kvitka Moya" <FooterBaseCard
columns={[ logoText="Kvitka Moya"
{ columns={[
title: "Shop", items: [ {
{ label: "Arrangements", href: "/products" }, title: "Shop", items: [
{ label: "Seasonal Flowers", href: "/products" }, { label: "Arrangements", href: "/products" },
{ label: "Custom Orders", href: "/contact" } { label: "Seasonal Flowers", href: "/products" },
] { label: "Custom Orders", href: "/contact" }
}, ]
{ },
title: "Company", items: [ {
{ label: "About Us", href: "/about" }, title: "Company", items: [
{ label: "Delivery Info", href: "/about" }, { label: "About Us", href: "/about" },
{ label: "Blog", href: "#" } { label: "Delivery Info", href: "/about" },
] { label: "Blog", href: "#" }
}, ]
{ },
title: "Support", items: [ {
{ label: "FAQ", href: "/faq" }, title: "Support", items: [
{ label: "Contact", href: "/contact" }, { label: "FAQ", href: "/faq" },
{ label: "Track Order", href: "#" } { label: "Contact", href: "/contact" },
] { label: "Track Order", href: "#" }
}, ]
{ },
title: "Connect", items: [ {
{ label: "Instagram", href: "https://instagram.com" }, title: "Connect", items: [
{ label: "Facebook", href: "https://facebook.com" }, { label: "Instagram", href: "https://instagram.com" },
{ label: "Newsletter", href: "/contact" } { label: "Facebook", href: "https://facebook.com" },
] { label: "Newsletter", href: "/contact" }
} ]
]} }
copyrightText="© 2025 Kvitka Moya. All rights reserved." ]}
/> copyrightText="© 2025 Kvitka Moya. All rights reserved."
/>
</div>
</ThemeProvider> </ThemeProvider>
); );
} }

75
src/app/page.tsx
View File

@@ -21,7 +21,6 @@ export default function HomePage() {
primaryButtonStyle="gradient" primaryButtonStyle="gradient"
secondaryButtonStyle="glass" secondaryButtonStyle="glass"
showBlurBottom={false} showBlurBottom={false}
headingFontWeight="semibold"
> >
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
<NavbarStyleApple <NavbarStyleApple
@@ -43,8 +42,8 @@ export default function HomePage() {
imageSrc="https://img.b2bpic.net/free-photo/still-life-with-bouquet-blue-pink-wildflowers-vase_169016-58261.jpg" imageSrc="https://img.b2bpic.net/free-photo/still-life-with-bouquet-blue-pink-wildflowers-vase_169016-58261.jpg"
imageAlt="Beautiful fresh flower arrangement" imageAlt="Beautiful fresh flower arrangement"
buttons={[ buttons={[
{ text: "Shop Now", href: "/products" }, { text: "Shop Now", href: "products" },
{ text: "Learn More", href: "/about" } { text: "Learn More", href: "about" }
]} ]}
/> />
</div> </div>
@@ -97,40 +96,42 @@ export default function HomePage() {
/> />
</div> </div>
<FooterBaseCard <div id="footer" data-section="footer">
logoText="Kvitka Moya" <FooterBaseCard
columns={[ logoText="Kvitka Moya"
{ columns={[
title: "Shop", items: [ {
{ label: "Arrangements", href: "/products" }, title: "Shop", items: [
{ label: "Seasonal Flowers", href: "/products" }, { label: "Arrangements", href: "/products" },
{ label: "Custom Orders", href: "/contact" } { label: "Seasonal Flowers", href: "/products" },
] { label: "Custom Orders", href: "/contact" }
}, ]
{ },
title: "Company", items: [ {
{ label: "About Us", href: "/about" }, title: "Company", items: [
{ label: "Delivery Info", href: "/about" }, { label: "About Us", href: "/about" },
{ label: "Blog", href: "#" } { label: "Delivery Info", href: "/about" },
] { label: "Blog", href: "#" }
}, ]
{ },
title: "Support", items: [ {
{ label: "FAQ", href: "/faq" }, title: "Support", items: [
{ label: "Contact", href: "/contact" }, { label: "FAQ", href: "/faq" },
{ label: "Track Order", href: "#" } { label: "Contact", href: "/contact" },
] { label: "Track Order", href: "#" }
}, ]
{ },
title: "Connect", items: [ {
{ label: "Instagram", href: "https://instagram.com" }, title: "Connect", items: [
{ label: "Facebook", href: "https://facebook.com" }, { label: "Instagram", href: "https://instagram.com" },
{ label: "Newsletter", href: "/contact" } { label: "Facebook", href: "https://facebook.com" },
] { label: "Newsletter", href: "/contact" }
} ]
]} }
copyrightText="© 2025 Kvitka Moya. All rights reserved." ]}
/> copyrightText="© 2025 Kvitka Moya. All rights reserved."
/>
</div>
</ThemeProvider> </ThemeProvider>
); );
} }