bender/e0b69165-001c-4ae2-b210-941f34316a80
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_2
Branches Tags
bender:main bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_3
Branches Tags
bender:main bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

8 Commits
version_2 ... version_3

Author SHA1 Message Date
bender
6cd834b0b0 Update src/app/shop/page.tsx 2026-02-25 16:02:01 +00:00
bender
fdafdea006 Update src/app/shop/[id]/page.tsx 2026-02-25 16:02:00 +00:00
bender
4c05a9a205 Update src/app/blog/page.tsx 2026-02-25 16:01:59 +00:00
bender
4df2aeb8d3 Update src/app/shop/page.tsx 2026-02-25 15:59:06 +00:00
bender
71778dd3c1 Update src/app/shop/[id]/page.tsx 2026-02-25 15:59:05 +00:00
bender
166d0522b0 Update src/app/page.tsx 2026-02-25 15:59:05 +00:00
bender
d66418565e Update src/app/blog/page.tsx 2026-02-25 15:59:04 +00:00
bender
1b13b9b6af Merge version_2 into main 
Merge version_2 into main
 2026-02-25 15:52:24 +00:00
4 changed files with 130 additions and 147 deletions
Expand all files Collapse all files

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

@@ -30,18 +30,20 @@ export default function BlogPage() {
headingFontWeight="light" headingFontWeight="light"
> >
<ReactLenis root> <ReactLenis root>
<NavbarStyleFullscreen <div id="nav" data-section="nav">
navItems={[ <NavbarStyleFullscreen
{ name: "Home", id: "/" }, navItems={[
{ name: "About", id: "/#about" }, { name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }, { name: "About", id: "/#about" },
{ name: "Testimonials", id: "/#testimonials" }, { name: "Shop", id: "/shop" },
{ name: "Contact", id: "/#contact" }, { name: "Testimonials", id: "/#testimonials" },
]} { name: "Contact", id: "/#contact" },
brandName="Angola" ]}
bottomLeftText="Experience the Beauty" brandName="Angola"
bottomRightText="hello@angola.com" bottomLeftText="Experience the Beauty"
/> bottomRightText="hello@angola.com"
/>
</div>
<main> <main>
{isLoading ? ( {isLoading ? (
@@ -61,34 +63,35 @@ export default function BlogPage() {
)} )}
</main> </main>
<FooterMedia <div id="footer" data-section="footer">
imageSrc="http://img.b2bpic.net/free-photo/beautiful-decoration-cute-little-dried-colorful-flowers-wallpaper_343596-3238.jpg?_wi=2" <FooterMedia
imageAlt="Soft, blurred pastel flowers in a tranquil setting" imageSrc="http://img.b2bpic.net/free-photo/beautiful-decoration-cute-little-dried-colorful-flowers-wallpaper_343596-3238.jpg?_wi=2"
columns={[ imageAlt="Soft, blurred pastel flowers in a tranquil setting"
{ columns={[
title: "Shop", items: [ {
{ label: "Bouquets", href: "/shop" }, title: "Shop", items: [
{ label: "Arrangements", href: "/shop" }, { label: "Bouquets", href: "/shop" },
{ label: "Custom Orders", href: "/#contact" }, { label: "Arrangements", href: "/shop" },
], { label: "Custom Orders", href: "/#contact" },
}, ],
{ },
title: "Company", items: [ {
{ label: "About Us", href: "/#about" }, title: "Company", items: [
{ label: "FAQ", href: "/#faq" }, { label: "About Us", href: "/#about" },
{ label: "Contact", href: "/#contact" }, { label: "Contact", href: "/#contact" },
], ],
}, },
{ {
title: "Connect", items: [ title: "Connect", items: [
{ label: "Instagram", href: "https://instagram.com/angola_flowers" }, { label: "Instagram", href: "https://instagram.com/angola_flowers" },
{ label: "Facebook", href: "https://facebook.com/angola_flowers" }, { label: "Facebook", href: "https://facebook.com/angola_flowers" },
], ],
}, },
]} ]}
logoText="Angola" logoText="Angola"
copyrightText="© 2024 Angola Flowers Studio. All rights reserved." copyrightText="© 2024 Angola Flowers Studio. All rights reserved."
/> />
</div>
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );

22
src/app/page.tsx
View File

@@ -6,7 +6,6 @@ import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCa
import TextSplitAbout from '@/components/sections/about/TextSplitAbout'; import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
import ProductCardFour from '@/components/sections/product/ProductCardFour'; import ProductCardFour from '@/components/sections/product/ProductCardFour';
import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen'; import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
import FaqBase from '@/components/sections/faq/FaqBase';
import ContactSplitForm from '@/components/sections/contact/ContactSplitForm'; import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
import FooterMedia from '@/components/sections/footer/FooterMedia'; import FooterMedia from '@/components/sections/footer/FooterMedia';
@@ -111,26 +110,6 @@ export default function LandingPage() {
/> />
</div> </div>
<div id="faq" data-section="faq">
<FaqBase
title="Frequently Asked Questions"
description="Find answers to common questions about our services, flower care, and ordering process."
faqs={[
{
id: "1", title: "What is your delivery policy?", content: "We offer local delivery within a 20-mile radius of our studio. Same-day delivery is available for orders placed before 12 PM local time, Monday-Saturday."},
{
id: "2", title: "How do I care for my fresh flowers?", content: "For optimal freshness, trim stems at an angle, change water daily, and keep flowers away from direct sunlight and heat sources. A packet of flower food is included with every order."},
{
id: "3", title: "Can I request a custom bouquet?", content: "Absolutely! We specialize in custom designs. Please contact us directly to discuss your vision, preferred flowers, colors, and budget. We'd love to bring your unique floral ideas to life."},
{
id: "4", title: "What payment methods do you accept?", content: "We accept all major credit cards (Visa, Mastercard, Amex), PayPal, and Apple Pay for online orders. In-studio purchases can also be made with cash."},
]}
textboxLayout="default"
useInvertedBackground={false}
faqsAnimation="slide-up"
/>
</div>
<div id="contact" data-section="contact"> <div id="contact" data-section="contact">
<ContactSplitForm <ContactSplitForm
title="Get in Touch with Our Floral Experts" title="Get in Touch with Our Floral Experts"
@@ -167,7 +146,6 @@ export default function LandingPage() {
{ {
title: "Company", items: [ title: "Company", items: [
{ label: "About Us", href: "/#about" }, { label: "About Us", href: "/#about" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" }, { label: "Contact", href: "/#contact" },
], ],
}, },

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

@@ -89,7 +89,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light" headingFontWeight="light"
> >
<ReactLenis root> <ReactLenis root>
<div id="navbar" data-section="navbar"> <div id="nav" data-section="nav">
<NavbarStyleFullscreen <NavbarStyleFullscreen
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
@@ -129,7 +129,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light" headingFontWeight="light"
> >
<ReactLenis root> <ReactLenis root>
<div id="navbar" data-section="navbar"> <div id="nav" data-section="nav">
<NavbarStyleFullscreen <NavbarStyleFullscreen
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
@@ -176,7 +176,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light" headingFontWeight="light"
> >
<ReactLenis root> <ReactLenis root>
<div id="navbar" data-section="navbar"> <div id="nav" data-section="nav">
<NavbarStyleFullscreen <NavbarStyleFullscreen
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
@@ -191,59 +191,60 @@ function ProductPageContent({ params }: ProductPageProps) {
button={{ text: "Cart", onClick: () => setCartOpen(true) }} button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/> />
</div> </div>
<div id="product-detail-card" data-section="product-detail-card"> <main>
<ProductDetailCard <div id="product-detail-card" data-section="product-detail-card">
layout="page" <ProductDetailCard
name={product.name} layout="page"
price={product.price} name={product.name}
salePrice={meta.salePrice} price={product.price}
rating={product.rating || 0} salePrice={meta.salePrice}
description={product.description} rating={product.rating || 0}
images={images} description={product.description}
variants={variants.length > 0 ? variants : undefined} images={images}
quantity={quantityVariant} variants={variants.length > 0 ? variants : undefined}
ribbon={meta.ribbon} quantity={quantityVariant}
inventoryStatus={meta.inventoryStatus} ribbon={meta.ribbon}
inventoryQuantity={meta.inventoryQuantity} inventoryStatus={meta.inventoryStatus}
sku={meta.sku} inventoryQuantity={meta.inventoryQuantity}
buttons={[ sku={meta.sku}
{ text: "Add To Cart", onClick: handleAddToCart }, buttons={[
{ text: "Buy Now", onClick: handleBuyNow }, { text: "Add To Cart", onClick: handleAddToCart },
]} { text: "Buy Now", onClick: handleBuyNow },
/> ]}
</div> />
<div id="product-cart" data-section="product-cart"> </div>
<ProductCart <div id="product-cart" data-section="product-cart">
isOpen={cartOpen} <ProductCart
onClose={() => setCartOpen(false)} isOpen={cartOpen}
items={cartItems} onClose={() => setCartOpen(false)}
onQuantityChange={updateQuantity} items={cartItems}
onRemove={removeItem} onQuantityChange={updateQuantity}
total={`$${cartTotal}`} onRemove={removeItem}
buttons={[ total={`$${cartTotal}`}
{ buttons={[
text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout, {
}, text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
]} },
/> ]}
</div> />
<div id="footer" data-section="footer"> </div>
<FooterMedia <div id="footer" data-section="footer">
imageSrc="http://img.b2bpic.net/free-photo/beautiful-decoration-cute-little-dried-colorful-flowers-wallpaper_343596-3238.jpg?_wi=4" <FooterMedia
imageAlt="Soft, blurred pastel flowers in a tranquil setting" imageSrc="http://img.b2bpic.net/free-photo/beautiful-decoration-cute-little-dried-colorful-flowers-wallpaper_343596-3238.jpg?_wi=4"
columns={[ imageAlt="Soft, blurred pastel flowers in a tranquil setting"
{ title: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Arrangements", href: "/shop" }, { label: "Custom Orders", href: "/#contact" }] }, columns={[
{ title: "Company", items: [ { title: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Arrangements", href: "/shop" }, { label: "Custom Orders", href: "/#contact" }] },
{ label: "About Us", href: "/#about" }, { title: "Company", items: [
{ label: "FAQ", href: "/#faq" }, { label: "About Us", href: "/#about" },
{ label: "Contact", href: "/#contact" } { label: "Contact", href: "/#contact" }
] }, ] },
{ title: "Connect", items: [{ label: "Instagram", href: "https://instagram.com/angola_flowers" }, { label: "Facebook", href: "https://facebook.com/angola_flowers" }] } { title: "Connect", items: [{ label: "Instagram", href: "https://instagram.com/angola_flowers" }, { label: "Facebook", href: "https://facebook.com/angola_flowers" }] }
]} ]}
logoText="Angola" logoText="Angola"
copyrightText="© 2024 Angola Flowers Studio. All rights reserved." copyrightText="© 2024 Angola Flowers Studio. All rights reserved."
/> />
</div> </div>
</main>
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );

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

@@ -32,7 +32,7 @@ function ShopPageContent() {
headingFontWeight="light" headingFontWeight="light"
> >
<ReactLenis root> <ReactLenis root>
<div id="navbar" data-section="navbar"> <div id="nav" data-section="nav">
<NavbarStyleFullscreen <NavbarStyleFullscreen
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
@@ -71,7 +71,7 @@ function ShopPageContent() {
headingFontWeight="light" headingFontWeight="light"
> >
<ReactLenis root> <ReactLenis root>
<div id="navbar" data-section="navbar"> <div id="nav" data-section="nav">
<NavbarStyleFullscreen <NavbarStyleFullscreen
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
@@ -86,34 +86,35 @@ function ShopPageContent() {
button={{ text: "Cart", onClick: () => {} }} button={{ text: "Cart", onClick: () => {} }}
/> />
</div> </div>
<div id="product-catalog" data-section="product-catalog"> <main>
<ProductCatalog <div id="product-catalog" data-section="product-catalog">
layout="page" <ProductCatalog
products={products} layout="page"
searchValue={search} products={products}
onSearchChange={setSearch} searchValue={search}
searchPlaceholder="Search products..." onSearchChange={setSearch}
filters={filters} searchPlaceholder="Search products..."
emptyMessage="No products found" filters={filters}
/> emptyMessage="No products found"
</div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/beautiful-decoration-cute-little-dried-colorful-flowers-wallpaper_343596-3238.jpg?_wi=3"
imageAlt="Soft, blurred pastel flowers in a tranquil setting"
columns={[
{ title: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Arrangements", href: "/shop" }, { label: "Custom Orders", href: "/#contact" }] },
{ title: "Company", items: [
{ label: "About Us", href: "/#about" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" }
] },
{ title: "Connect", items: [{ label: "Instagram", href: "https://instagram.com/angola_flowers" }, { label: "Facebook", href: "https://facebook.com/angola_flowers" }] }
]}
logoText="Angola"
copyrightText="© 2024 Angola Flowers Studio. All rights reserved."
/> />
</div> </div>
<div id="footer" data-section="footer">
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/beautiful-decoration-cute-little-dried-colorful-flowers-wallpaper_343596-3238.jpg?_wi=3"
imageAlt="Soft, blurred pastel flowers in a tranquil setting"
columns={[
{ title: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Arrangements", href: "/shop" }, { label: "Custom Orders", href: "/#contact" }] },
{ title: "Company", items: [
{ label: "About Us", href: "/#about" },
{ label: "Contact", href: "/#contact" }
] },
{ title: "Connect", items: [{ label: "Instagram", href: "https://instagram.com/angola_flowers" }, { label: "Facebook", href: "https://facebook.com/angola_flowers" }] }
]}
logoText="Angola"
copyrightText="© 2024 Angola Flowers Studio. All rights reserved."
/>
</div>
</main>
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );