bender/bc151018-32c5-4319-9755-bb084ea66a44
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 4 commits from version_1 into main 2026-02-19 11:09:09 +00:00
Conversation 0 Commits 4 Files Changed 4 +65 -32
4 changed files with 65 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@ import { useBlogPosts } from "@/hooks/useBlogPosts";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
import FooterCard from '@/components/sections/footer/FooterCard';
import { Instagram, Facebook, Pinterest } from 'lucide-react';
import { Instagram, Facebook, Pin } from 'lucide-react';
export default function BlogPage() {
// Preserved logic for fetching posts
@@ -33,13 +33,13 @@ export default function BlogPage() {
brandName="Angelina"
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Services", id: "services" },
{ name: "Shop", id: "shop" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#services" },
{ name: "Shop", id: "/#shop" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
]}
button={{ text: "Contact Us", href: "#contact" }}
button={{ text: "Contact Us", href: "/#contact" }}
/>
</div>
@@ -70,7 +70,7 @@ export default function BlogPage() {
socialLinks={[
{ icon: Instagram, href: "https://instagram.com/angelinaflowers", ariaLabel: "Instagram" },
{ icon: Facebook, href: "https://facebook.com/angelinaflowers", ariaLabel: "Facebook" },
{ icon: Pinterest, href: "https://pinterest.com/angelinaflowers", ariaLabel: "Pinterest" },
{ icon: Pin, href: "https://pinterest.com/angelinaflowers", ariaLabel: "Pinterest" },
]}
/>
</div>

20
src/app/page.tsx
View File

@@ -24,7 +24,7 @@ import {
Leaf,
Mail,
PartyPopper,
Pinterest,
Pin,
Settings,
Sparkles
} from 'lucide-react';
@@ -47,11 +47,11 @@ export default function LandingPage() {
<NavbarLayoutFloatingOverlay
brandName="Angelina"
navItems={[
{ name: "About", id: "about" },
{ name: "Services", id: "services" },
{ name: "Shop", id: "shop" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "About", id: "#about" },
{ name: "Services", id: "#services" },
{ name: "Shop", id: "#shop" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "FAQ", id: "#faq" },
]}
button={{ text: "Contact Us", href: "#contact" }}
/>
@@ -80,9 +80,9 @@ export default function LandingPage() {
{ icon: Settings, active: false },
],
stats: [
{ title: "Bouquets Designed", values: ["2500+", "3000+", "3500+"], description: "Unique creations." },
{ title: "Happy Clients", values: ["98%", "99%", "100%"], valueSuffix: "", description: "Satisfaction rate." },
{ title: "Events Beautified", values: ["150+", "200+", "250+"], description: "Weddings & more." },
{ title: "Bouquets Designed", values: [2500, 3000, 3500], description: "Unique creations." },
{ title: "Happy Clients", values: [98, 99, 100], valueSuffix: "%", description: "Satisfaction rate." },
{ title: "Events Beautified", values: [150, 200, 250], description: "Weddings & more." },
],
chartTitle: "Seasonal Popularity", chartData: [{ value: 50 }, { value: 70 }, { value: 60 }, { value: 80 }, { value: 90 }],
listTitle: "Recent Highlights", listItems: [
@@ -229,7 +229,7 @@ export default function LandingPage() {
socialLinks={[
{ icon: Instagram, href: "https://instagram.com/angelinaflowers", ariaLabel: "Instagram" },
{ icon: Facebook, href: "https://facebook.com/angelinaflowers", ariaLabel: "Facebook" },
{ icon: Pinterest, href: "https://pinterest.com/angelinaflowers", ariaLabel: "Pinterest" },
{ icon: Pin, href: "https://pinterest.com/angelinaflowers", ariaLabel: "Pinterest" },
]}
/>
</div>

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

@@ -11,7 +11,7 @@ import { useProductDetail } from "@/hooks/useProductDetail";
import { useCart } from "@/hooks/useCart";
import { useCheckout } from "@/hooks/useCheckout";
import FooterCard from '@/components/sections/footer/FooterCard';
import { Instagram, Facebook, Pinterest } from 'lucide-react';
import { Instagram, Facebook, Pin } from 'lucide-react';
interface ProductPageProps {
params: Promise<{ id: string }>;
@@ -82,10 +82,17 @@ export default function ProductPage({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Angelina"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#services" },
{ name: "Shop", id: "/#shop" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -112,10 +119,17 @@ export default function ProductPage({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Angelina"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#services" },
{ name: "Shop", id: "/#shop" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -149,10 +163,17 @@ export default function ProductPage({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Angelina"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#services" },
{ name: "Shop", id: "/#shop" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -199,7 +220,7 @@ export default function ProductPage({ params }: ProductPageProps) {
socialLinks={[
{ icon: Instagram, href: "https://instagram.com/angelinaflowers", ariaLabel: "Instagram" },
{ icon: Facebook, href: "https://facebook.com/angelinaflowers", ariaLabel: "Facebook" },
{ icon: Pinterest, href: "https://pinterest.com/angelinaflowers", ariaLabel: "Pinterest" },
{ icon: Pin, href: "https://pinterest.com/angelinaflowers", ariaLabel: "Pinterest" },
]}
/>
</div>

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

@@ -6,7 +6,7 @@ import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatin
import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
import { useProductCatalog } from "@/hooks/useProductCatalog";
import FooterCard from '@/components/sections/footer/FooterCard';
import { Instagram, Facebook, Pinterest } from 'lucide-react';
import { Instagram, Facebook, Pin } from 'lucide-react';
export default function ShopPage() {
const {
@@ -37,10 +37,16 @@ export default function ShopPage() {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Angelina"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#services" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
]}
button={{ text: "Cart", onClick: handleCartClick }}
/>
</div>
@@ -66,10 +72,16 @@ export default function ShopPage() {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
brandName="Angelina"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#services" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
]}
button={{ text: "Cart", onClick: handleCartClick }}
/>
</div>
@@ -91,7 +103,7 @@ export default function ShopPage() {
socialLinks={[
{ icon: Instagram, href: "https://instagram.com/angelinaflowers", ariaLabel: "Instagram" },
{ icon: Facebook, href: "https://facebook.com/angelinaflowers", ariaLabel: "Facebook" },
{ icon: Pinterest, href: "https://pinterest.com/angelinaflowers", ariaLabel: "Pinterest" },
{ icon: Pin, href: "https://pinterest.com/angelinaflowers", ariaLabel: "Pinterest" },
]}
/>
</div>