8 Commits

Author SHA1 Message Date
6cd834b0b0 Update src/app/shop/page.tsx 2026-02-25 16:02:01 +00:00
fdafdea006 Update src/app/shop/[id]/page.tsx 2026-02-25 16:02:00 +00:00
4c05a9a205 Update src/app/blog/page.tsx 2026-02-25 16:01:59 +00:00
4df2aeb8d3 Update src/app/shop/page.tsx 2026-02-25 15:59:06 +00:00
71778dd3c1 Update src/app/shop/[id]/page.tsx 2026-02-25 15:59:05 +00:00
166d0522b0 Update src/app/page.tsx 2026-02-25 15:59:05 +00:00
d66418565e Update src/app/blog/page.tsx 2026-02-25 15:59:04 +00:00
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

View File

@@ -30,18 +30,20 @@ export default function BlogPage() {
headingFontWeight="light"
>
<ReactLenis root>
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Shop", id: "/shop" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Angola"
bottomLeftText="Experience the Beauty"
bottomRightText="hello@angola.com"
/>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Shop", id: "/shop" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Angola"
bottomLeftText="Experience the Beauty"
bottomRightText="hello@angola.com"
/>
</div>
<main>
{isLoading ? (
@@ -61,34 +63,35 @@ export default function BlogPage() {
)}
</main>
<FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/beautiful-decoration-cute-little-dried-colorful-flowers-wallpaper_343596-3238.jpg?_wi=2"
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 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=2"
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>
</ReactLenis>
</ThemeProvider>
);

View File

@@ -6,7 +6,6 @@ import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCa
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
import ProductCardFour from '@/components/sections/product/ProductCardFour';
import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
import FaqBase from '@/components/sections/faq/FaqBase';
import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
import FooterMedia from '@/components/sections/footer/FooterMedia';
@@ -111,26 +110,6 @@ export default function LandingPage() {
/>
</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">
<ContactSplitForm
title="Get in Touch with Our Floral Experts"
@@ -167,7 +146,6 @@ export default function LandingPage() {
{
title: "Company", items: [
{ label: "About Us", href: "/#about" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" },
],
},

View File

@@ -89,7 +89,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
@@ -129,7 +129,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
@@ -176,7 +176,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
@@ -191,59 +191,60 @@ function ProductPageContent({ params }: ProductPageProps) {
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">
<ProductDetailCard
layout="page"
name={product.name}
price={product.price}
salePrice={meta.salePrice}
rating={product.rating || 0}
description={product.description}
images={images}
variants={variants.length > 0 ? variants : undefined}
quantity={quantityVariant}
ribbon={meta.ribbon}
inventoryStatus={meta.inventoryStatus}
inventoryQuantity={meta.inventoryQuantity}
sku={meta.sku}
buttons={[
{ text: "Add To Cart", onClick: handleAddToCart },
{ text: "Buy Now", onClick: handleBuyNow },
]}
/>
</div>
<div id="product-cart" data-section="product-cart">
<ProductCart
isOpen={cartOpen}
onClose={() => setCartOpen(false)}
items={cartItems}
onQuantityChange={updateQuantity}
onRemove={removeItem}
total={`$${cartTotal}`}
buttons={[
{
text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
},
]}
/>
</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=4"
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>
<main>
<div id="product-detail-card" data-section="product-detail-card">
<ProductDetailCard
layout="page"
name={product.name}
price={product.price}
salePrice={meta.salePrice}
rating={product.rating || 0}
description={product.description}
images={images}
variants={variants.length > 0 ? variants : undefined}
quantity={quantityVariant}
ribbon={meta.ribbon}
inventoryStatus={meta.inventoryStatus}
inventoryQuantity={meta.inventoryQuantity}
sku={meta.sku}
buttons={[
{ text: "Add To Cart", onClick: handleAddToCart },
{ text: "Buy Now", onClick: handleBuyNow },
]}
/>
</div>
<div id="product-cart" data-section="product-cart">
<ProductCart
isOpen={cartOpen}
onClose={() => setCartOpen(false)}
items={cartItems}
onQuantityChange={updateQuantity}
onRemove={removeItem}
total={`$${cartTotal}`}
buttons={[
{
text: isCheckoutLoading ? "Processing..." : "Check Out", onClick: handleCheckout,
},
]}
/>
</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=4"
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>
</ThemeProvider>
);

View File

@@ -32,7 +32,7 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
@@ -71,7 +71,7 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
@@ -86,34 +86,35 @@ function ShopPageContent() {
button={{ text: "Cart", onClick: () => {} }}
/>
</div>
<div id="product-catalog" data-section="product-catalog">
<ProductCatalog
layout="page"
products={products}
searchValue={search}
onSearchChange={setSearch}
searchPlaceholder="Search products..."
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."
<main>
<div id="product-catalog" data-section="product-catalog">
<ProductCatalog
layout="page"
products={products}
searchValue={search}
onSearchChange={setSearch}
searchPlaceholder="Search products..."
filters={filters}
emptyMessage="No products found"
/>
</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>
</ThemeProvider>
);