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

Merge version_7 into main

Browse Source 
Merge version_7 into main
This commit was merged in pull request #8.
This commit is contained in:
bender
2026-02-25 17:20:37 +00:00
parent dbffcf6359 ee5fca0b8e
commit 64e70885da
5 changed files with 88 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,9 +35,11 @@ export default function BlogPage() {
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "About", id: "/#about" }, { name: "About", id: "/#about" },
{ name: "Pricing", id: "/#pricing" },
{ name: "Shop", id: "/shop" }, { name: "Shop", id: "/shop" },
{ name: "Team", id: "/#team" },
{ name: "Testimonials", id: "/#testimonials" }, { name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" }, { name: "Contact", id: "/#contact" }
]} ]}
brandName="Angola" brandName="Angola"
bottomLeftText="Experience the Beauty" bottomLeftText="Experience the Beauty"

55
src/app/page.tsx
View File

@@ -4,10 +4,13 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen'; import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo'; import HeroCarouselLogo from '@/components/sections/hero/heroCarouselLogo/HeroCarouselLogo';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout'; import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
import PricingCardOne from '@/components/sections/pricing/PricingCardOne';
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 ContactSplitForm from '@/components/sections/contact/ContactSplitForm'; import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
import TeamCardOne from '@/components/sections/team/TeamCardOne';
import FooterMedia from '@/components/sections/footer/FooterMedia'; import FooterMedia from '@/components/sections/footer/FooterMedia';
import { Shield, Users } from 'lucide-react';
export default function LandingPage() { export default function LandingPage() {
return ( return (
@@ -28,9 +31,11 @@ export default function LandingPage() {
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "About", id: "/#about" }, { name: "About", id: "/#about" },
{ name: "Pricing", id: "/#pricing" },
{ name: "Shop", id: "/shop" }, { name: "Shop", id: "/shop" },
{ name: "Team", id: "/#team" },
{ name: "Testimonials", id: "/#testimonials" }, { name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" }, { name: "Contact", id: "/#contact" }
]} ]}
brandName="Angola" brandName="Angola"
bottomLeftText="Experience the Beauty" bottomLeftText="Experience the Beauty"
@@ -73,6 +78,30 @@ export default function LandingPage() {
/> />
</div> </div>
<div id="pricing" data-section="pricing">
<PricingCardOne
title="Choose Your Perfect Plan"
description="Unlock the full potential with our flexible pricing options."
plans={[
{
id: "1", badge: "Basic", badgeIcon: Shield,
price: "$19/mo", subtitle: "Perfect for individuals", features: ["5 Users", "50GB Storage", "Email Support"],
},
{
id: "2", badge: "Pro", badgeIcon: Shield,
price: "$49/mo", subtitle: "Ideal for small teams", features: ["20 Users", "200GB Storage", "Priority Support"],
},
{
id: "3", badge: "Enterprise", badgeIcon: Shield,
price: "$99/mo", subtitle: "For growing businesses", features: ["Unlimited Users", "1TB Storage", "24/7 Support"],
},
]}
textboxLayout="default"
animationType="slide-up"
useInvertedBackground={false}
/>
</div>
<div id="products" data-section="products"> <div id="products" data-section="products">
<ProductCardFour <ProductCardFour
title="Featured Floral Collections" title="Featured Floral Collections"
@@ -131,6 +160,30 @@ export default function LandingPage() {
/> />
</div> </div>
<div id="team" data-section="team">
<TeamCardOne
title="Meet Our Talented Team"
description="Dedicated to bringing your floral visions to life."
members={[
{
id: "1", name: "Sarah Johnson", role: "Founder", imageSrc: "http://img.b2bpic.net/free-photo/portrait-woman-smiling-outside_23-2148135804.jpg", imageAlt: "Portrait of Sarah Johnson"
},
{
id: "2", name: "Michael Chen", role: "Lead Designer", imageSrc: "http://img.b2bpic.net/free-photo/handsome-bearded-guy-posing-white-t-shirt_273609-17367.jpg", imageAlt: "Portrait of Michael Chen"
},
{
id: "3", name: "Emily White", role: "Event Specialist", imageSrc: "http://img.b2bpic.net/free-photo/portrait-african-american-young-woman_23-2148737271.jpg", imageAlt: "Portrait of Emily White"
},
]}
gridVariant="uniform-all-items-equal"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={true}
tag="Our Experts"
tagIcon={Users}
/>
</div>
<div id="footer" data-section="footer"> <div id="footer" data-section="footer">
<FooterMedia <FooterMedia
imageSrc="http://img.b2bpic.net/free-photo/beautiful-decoration-cute-little-dried-colorful-flowers-wallpaper_343596-3238.jpg?_wi=1" imageSrc="http://img.b2bpic.net/free-photo/beautiful-decoration-cute-little-dried-colorful-flowers-wallpaper_343596-3238.jpg?_wi=1"

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

@@ -94,9 +94,11 @@ function ProductPageContent({ params }: ProductPageProps) {
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "About", id: "/#about" }, { name: "About", id: "/#about" },
{ name: "Pricing", id: "/#pricing" },
{ name: "Shop", id: "/shop" }, { name: "Shop", id: "/shop" },
{ name: "Team", id: "/#team" },
{ name: "Testimonials", id: "/#testimonials" }, { name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" }, { name: "Contact", id: "/#contact" }
]} ]}
brandName="Angola" brandName="Angola"
bottomLeftText="Experience the Beauty" bottomLeftText="Experience the Beauty"
@@ -134,9 +136,11 @@ function ProductPageContent({ params }: ProductPageProps) {
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "About", id: "/#about" }, { name: "About", id: "/#about" },
{ name: "Pricing", id: "/#pricing" },
{ name: "Shop", id: "/shop" }, { name: "Shop", id: "/shop" },
{ name: "Team", id: "/#team" },
{ name: "Testimonials", id: "/#testimonials" }, { name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" }, { name: "Contact", id: "/#contact" }
]} ]}
brandName="Angola" brandName="Angola"
bottomLeftText="Experience the Beauty" bottomLeftText="Experience the Beauty"
@@ -181,9 +185,11 @@ function ProductPageContent({ params }: ProductPageProps) {
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "About", id: "/#about" }, { name: "About", id: "/#about" },
{ name: "Pricing", id: "/#pricing" },
{ name: "Shop", id: "/shop" }, { name: "Shop", id: "/shop" },
{ name: "Team", id: "/#team" },
{ name: "Testimonials", id: "/#testimonials" }, { name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" }, { name: "Contact", id: "/#contact" }
]} ]}
brandName="Angola" brandName="Angola"
bottomLeftText="Experience the Beauty" bottomLeftText="Experience the Beauty"

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

@@ -37,9 +37,11 @@ function ShopPageContent() {
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "About", id: "/#about" }, { name: "About", id: "/#about" },
{ name: "Pricing", id: "/#pricing" },
{ name: "Shop", id: "/shop" }, { name: "Shop", id: "/shop" },
{ name: "Team", id: "/#team" },
{ name: "Testimonials", id: "/#testimonials" }, { name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" }, { name: "Contact", id: "/#contact" }
]} ]}
brandName="Angola" brandName="Angola"
bottomLeftText="Experience the Beauty" bottomLeftText="Experience the Beauty"
@@ -76,9 +78,11 @@ function ShopPageContent() {
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "About", id: "/#about" }, { name: "About", id: "/#about" },
{ name: "Pricing", id: "/#pricing" },
{ name: "Shop", id: "/shop" }, { name: "Shop", id: "/shop" },
{ name: "Team", id: "/#team" },
{ name: "Testimonials", id: "/#testimonials" }, { name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" }, { name: "Contact", id: "/#contact" }
]} ]}
brandName="Angola" brandName="Angola"
bottomLeftText="Experience the Beauty" bottomLeftText="Experience the Beauty"

32
src/app/styles/variables.css
View File

@@ -2,23 +2,23 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #060000;; /* --background: #f5faff;;
--card: #1d0d0d;; --card: #f1f8ff;;
--foreground: #ffe6e6;; --foreground: #001122;;
--primary-cta: #ff3d4a;; --primary-cta: #0a7039;;
--secondary-cta: #1f0a0a;; --secondary-cta: #ffffff;;
--accent: #7b2d2d;; --accent: #15479c;;
--background-accent: #b8111f;; */ --background-accent: #a8cce8;; */
--background: #060000;; --background: #f5faff;;
--card: #1d0d0d;; --card: #f1f8ff;;
--foreground: #ffe6e6;; --foreground: #001122;;
--primary-cta: #ff3d4a;; --primary-cta: #0a7039;;
--primary-cta-text: #060000;; --primary-cta-text: #f5faff;;
--secondary-cta: #1f0a0a;; --secondary-cta: #ffffff;;
--secondary-cta-text: #ffe6e6;; --secondary-cta-text: #001122;;
--accent: #7b2d2d;; --accent: #15479c;;
--background-accent: #b8111f;; --background-accent: #a8cce8;;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);