26 Commits

Author SHA1 Message Date
0738973c68 Update src/app/shop/page.tsx 2026-02-25 16:39:33 +00:00
65061dd3d0 Update src/app/shop/[id]/page.tsx 2026-02-25 16:39:32 +00:00
76dc61931c Update src/app/page.tsx 2026-02-25 16:39:32 +00:00
3059b6fcfc Update src/app/blog/page.tsx 2026-02-25 16:39:31 +00:00
cdeb5c59eb Switch to version 4: modified src/app/styles/variables.css 2026-02-25 16:38:37 +00:00
2fd4f33698 Switch to version 3: modified src/app/styles/variables.css 2026-02-25 16:38:13 +00:00
10718fd435 Switch to version 4: modified src/app/styles/variables.css 2026-02-25 16:36:10 +00:00
1a3354e97d Switch to version 3: modified src/app/styles/variables.css 2026-02-25 16:35:20 +00:00
d59ce72aac Merge version_4 into main
Merge version_4 into main
2026-02-25 16:33:15 +00:00
59859dd2da Update src/app/styles/variables.css 2026-02-25 16:33:10 +00:00
753ba13825 Switch to version 3: modified src/app/shop/page.tsx 2026-02-25 16:31:00 +00:00
885aa6ea19 Switch to version 3: modified src/app/shop/[id]/page.tsx 2026-02-25 16:30:59 +00:00
889c1bc7f0 Switch to version 3: modified src/app/page.tsx 2026-02-25 16:30:58 +00:00
2c394b066d Switch to version 3: modified src/app/blog/page.tsx 2026-02-25 16:30:57 +00:00
5c70aea12a Switch to version 2: modified src/app/shop/page.tsx 2026-02-25 16:30:29 +00:00
e69388108d Switch to version 2: modified src/app/shop/[id]/page.tsx 2026-02-25 16:30:28 +00:00
efd5e3aed9 Switch to version 2: modified src/app/page.tsx 2026-02-25 16:30:27 +00:00
12dc0dfc8b Switch to version 2: modified src/app/blog/page.tsx 2026-02-25 16:30:26 +00:00
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
5 changed files with 151 additions and 201 deletions

View File

@@ -30,18 +30,19 @@ export default function BlogPage() {
headingFontWeight="light"
>
<ReactLenis root>
<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" },
{ name: "Testimonials", id: "/#testimonials" }
]}
brandName="Angola"
bottomLeftText="Experience the Beauty"
bottomRightText="hello@angola.com"
/>
</div>
<main>
{isLoading ? (
@@ -61,6 +62,7 @@ export default function BlogPage() {
)}
</main>
<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"
@@ -69,14 +71,12 @@ export default function BlogPage() {
title: "Shop", items: [
{ label: "Bouquets", href: "/shop" },
{ label: "Arrangements", href: "/shop" },
{ label: "Custom Orders", href: "/#contact" },
{ label: "Custom Orders", href: "/shop" },
],
},
{
title: "Company", items: [
{ label: "About Us", href: "/#about" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" },
{ label: "About Us", href: "/#about" }
],
},
{
@@ -89,6 +89,7 @@ export default function BlogPage() {
logoText="Angola"
copyrightText="© 2024 Angola Flowers Studio. All rights reserved."
/>
</div>
</ReactLenis>
</ThemeProvider>
);

View File

@@ -6,8 +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';
export default function LandingPage() {
@@ -30,8 +28,7 @@ export default function LandingPage() {
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Shop", id: "/shop" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
{ name: "Testimonials", id: "/#testimonials" }
]}
brandName="Angola"
bottomLeftText="Experience the Beauty"
@@ -67,7 +64,7 @@ export default function LandingPage() {
"At Angola, we believe in the power of flowers to express emotions, celebrate milestones, and create unforgettable memories. Our studio is dedicated to sourcing the freshest, most beautiful blooms and transforming them into stunning works of art.", "Every arrangement is crafted with meticulous care and a keen eye for design, ensuring that each bouquet tells its own unique story. We pour our heart into every petal, bringing beauty and elegance to your world."]}
buttons={[
{ text: "Meet Our Team", href: "#team" },
{ text: "Contact Us", href: "/#contact" },
{ text: "Shop Now", href: "/shop" },
]}
useInvertedBackground={false}
showBorder={false}
@@ -111,47 +108,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"
description="Have a question, special request, or need help with an order? Fill out the form below and we'll get back to you shortly."
inputs={[
{ name: "name", type: "text", placeholder: "Your Name", required: true },
{ name: "email", type: "email", placeholder: "Your Email", required: true },
]}
textarea={{
name: "message", placeholder: "Tell us about your floral needs or inquiry...", rows: 5,
required: true,
}}
useInvertedBackground={false}
imageSrc="http://img.b2bpic.net/free-photo/top-view-hands-with-gladiolus-flower-pink-alstroemeria-with-lilac-daisy-flowers-sketchbook-with-red-stapler-paper-clips-wooden-background_141793-7805.jpg"
imageAlt="A florist's hands arranging flowers in a studio"
mediaPosition="right"
mediaAnimation="slide-up"
buttonText="Send Message"
/>
</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=1"
@@ -161,14 +117,12 @@ export default function LandingPage() {
title: "Shop", items: [
{ label: "Bouquets", href: "/shop" },
{ label: "Arrangements", href: "/shop" },
{ label: "Custom Orders", href: "/#contact" },
{ label: "Custom Orders", href: "/shop" },
],
},
{
title: "Company", items: [
{ label: "About Us", href: "/#about" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" },
{ label: "About Us", href: "/#about" }
],
},
{

View File

@@ -89,14 +89,13 @@ 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: "/" },
{ name: "About", id: "/#about" },
{ name: "Shop", id: "/shop" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
{ name: "Testimonials", id: "/#testimonials" }
]}
brandName="Angola"
bottomLeftText="Experience the Beauty"
@@ -129,14 +128,13 @@ 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: "/" },
{ name: "About", id: "/#about" },
{ name: "Shop", id: "/shop" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
{ name: "Testimonials", id: "/#testimonials" }
]}
brandName="Angola"
bottomLeftText="Experience the Beauty"
@@ -176,14 +174,13 @@ 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: "/" },
{ name: "About", id: "/#about" },
{ name: "Shop", id: "/shop" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
{ name: "Testimonials", id: "/#testimonials" }
]}
brandName="Angola"
bottomLeftText="Experience the Beauty"
@@ -191,6 +188,7 @@ function ProductPageContent({ params }: ProductPageProps) {
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main>
<div id="product-detail-card" data-section="product-detail-card">
<ProductDetailCard
layout="page"
@@ -232,11 +230,9 @@ function ProductPageContent({ params }: ProductPageProps) {
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: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Arrangements", href: "/shop" }, { label: "Custom Orders", href: "/shop" }] },
{ title: "Company", items: [
{ label: "About Us", href: "/#about" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" }
{ label: "About Us", href: "/#about" }
] },
{ title: "Connect", items: [{ label: "Instagram", href: "https://instagram.com/angola_flowers" }, { label: "Facebook", href: "https://facebook.com/angola_flowers" }] }
]}
@@ -244,6 +240,7 @@ function ProductPageContent({ params }: ProductPageProps) {
copyrightText="© 2024 Angola Flowers Studio. All rights reserved."
/>
</div>
</main>
</ReactLenis>
</ThemeProvider>
);

View File

@@ -32,14 +32,13 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<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" },
{ name: "Testimonials", id: "/#testimonials" }
]}
brandName="Angola"
bottomLeftText="Experience the Beauty"
@@ -71,14 +70,13 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<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" },
{ name: "Testimonials", id: "/#testimonials" }
]}
brandName="Angola"
bottomLeftText="Experience the Beauty"
@@ -86,6 +84,7 @@ function ShopPageContent() {
button={{ text: "Cart", onClick: () => {} }}
/>
</div>
<main>
<div id="product-catalog" data-section="product-catalog">
<ProductCatalog
layout="page"
@@ -102,11 +101,9 @@ function ShopPageContent() {
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: "Shop", items: [{ label: "Bouquets", href: "/shop" }, { label: "Arrangements", href: "/shop" }, { label: "Custom Orders", href: "/shop" }] },
{ title: "Company", items: [
{ label: "About Us", href: "/#about" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact", href: "/#contact" }
{ label: "About Us", href: "/#about" }
] },
{ title: "Connect", items: [{ label: "Instagram", href: "https://instagram.com/angola_flowers" }, { label: "Facebook", href: "https://facebook.com/angola_flowers" }] }
]}
@@ -114,6 +111,7 @@ function ShopPageContent() {
copyrightText="© 2024 Angola Flowers Studio. All rights reserved."
/>
</div>
</main>
</ReactLenis>
</ThemeProvider>
);

View File

@@ -2,23 +2,23 @@
/* Base units */
/* --vw is set by ThemeProvider */
/* --background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--secondary-cta: #1f0a0a;;
--accent: #7b2d2d;;
--background-accent: #b8111f;; */
/* --background: #fbfcfb;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #28a745;;
--secondary-cta: #007bff;;
--accent: #8bc7ff;;
--background-accent: #e6fae6;; */
--background: #060000;;
--card: #1d0d0d;;
--foreground: #ffe6e6;;
--primary-cta: #ff3d4a;;
--primary-cta-text: #060000;;
--secondary-cta: #1f0a0a;;
--secondary-cta-text: #ffe6e6;;
--accent: #7b2d2d;;
--background-accent: #b8111f;;
--background: #fbfcfb;;
--card: #ffffff;;
--foreground: #1c1c1c;;
--primary-cta: #28a745;;
--primary-cta-text: #ffffff;;
--secondary-cta: #007bff;;
--secondary-cta-text: #ffffff;;
--accent: #8bc7ff;;
--background-accent: #e6fae6;;
/* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);