bender/a9a251d8-d175-47d8-b7dd-7b9bf62fa2b3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 5 commits from version_2 into main 2026-04-08 20:47:49 +00:00
Conversation 0 Commits 5 Files Changed 5 +62 -17
5 changed files with 62 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/about/page.tsx
View File

@@ -8,15 +8,26 @@ import FooterBase from "@/components/sections/footer/FooterBase";
export default function AboutPage() {
return (
<ThemeProvider>
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="medium"
sizing="medium"
background="none"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="medium"
>
<ReactLenis root>
<NavbarLayoutFloatingOverlay
brandName="Firenze"
navItems={[
{ name: "Collections", id: "collections" },
{ name: "Home", id: "/" },
{ name: "Catalog", id: "/catalog" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "contact" },
{ name: "Contact", id: "/contact" },
]}
/>
<MetricSplitMediaAbout
@@ -28,13 +39,14 @@ export default function AboutPage() {
{ value: "100%", title: "Sustainably Sourced" }
]}
imageSrc="http://img.b2bpic.net/free-photo/artisan-doing-woodcutting_23-2150600761.jpg"
useInvertedBackground={false}
/>
<FooterBase
logoText="Firenze Furniture"
copyrightText="© 2026 | Firenze Furniture Co."
columns={[
{ title: "Company", items: [{ label: "History", href: "/about" }, { label: "Artisans", href: "/about" }, { label: "Stores", href: "#" }] },
{ title: "Shop", items: [{ label: "Collections", href: "/catalog" }, { label: "Dining", href: "/catalog" }, { label: "Bedroom", href: "/catalog" }] },
{ title: "Shop", items: [{ label: "Collections", href: "/gallery" }, { label: "Dining", href: "/catalog" }, { label: "Bedroom", href: "/catalog" }] },
{ title: "Connect", items: [{ label: "Instagram", href: "#" }, { label: "Pinterest", href: "#" }, { label: "Newsletter", href: "#" }] },
]}
/>

21
src/app/catalog/page.tsx
View File

@@ -8,20 +8,29 @@ import FooterBase from "@/components/sections/footer/FooterBase";
export default function CatalogPage() {
return (
<ThemeProvider>
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="medium"
sizing="medium"
background="none"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="medium"
>
<ReactLenis root>
<NavbarLayoutFloatingOverlay
brandName="Firenze"
navItems={[
{ name: "Collections", id: "collections" },
{ name: "Collections", id: "/gallery" },
{ name: "Catalog", id: "/catalog" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "contact" },
{ name: "Contact", id: "/contact" },
]}
/>
<ProductCatalog
layout="page"
title="Our Full Catalog"
products={[
{ id: "1", name: "Classic Walnut Dining Table", price: "$3,200", rating: 5, imageSrc: "http://img.b2bpic.net/free-photo/minimalist-spacious-interior-design_23-2150378910.jpg" },
{ id: "2", name: "Velvet Modular Sofa", price: "$4,500", rating: 4, imageSrc: "http://img.b2bpic.net/free-photo/room-with-green-leather-sofa_140725-6419.jpg" },
@@ -33,7 +42,7 @@ export default function CatalogPage() {
copyrightText="© 2026 | Firenze Furniture Co."
columns={[
{ title: "Company", items: [{ label: "History", href: "/about" }, { label: "Artisans", href: "/about" }, { label: "Stores", href: "#" }] },
{ title: "Shop", items: [{ label: "Collections", href: "/catalog" }, { label: "Dining", href: "/catalog" }, { label: "Bedroom", href: "/catalog" }] },
{ title: "Shop", items: [{ label: "Collections", href: "/gallery" }, { label: "Dining", href: "/catalog" }, { label: "Bedroom", href: "/catalog" }] },
{ title: "Connect", items: [{ label: "Instagram", href: "#" }, { label: "Pinterest", href: "#" }, { label: "Newsletter", href: "#" }] },
]}
/>

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

@@ -8,21 +8,33 @@ import FooterBase from "@/components/sections/footer/FooterBase";
export default function ContactPage() {
return (
<ThemeProvider>
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="medium"
sizing="medium"
background="none"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="medium"
>
<ReactLenis root>
<NavbarLayoutFloatingOverlay
brandName="Firenze"
navItems={[
{ name: "Home", id: "/" },
{ name: "Collections", id: "/gallery" },
{ name: "Catalog", id: "/catalog" },
{ name: "Contact", id: "/contact" },
]}
button={{ text: "View Catalog", href: "/gallery" }}
/>
<ContactText
text="Get in Touch with Our Artisans"
background={{ variant: "canvas-reveal" }}
buttons={[{ text: "Submit Inquiry", href: "#" }]}
useInvertedBackground={false}
className="pt-32 pb-24"
/>
<FooterBase

18
src/app/gallery/page.tsx
View File

@@ -8,16 +8,27 @@ import FooterBase from "@/components/sections/footer/FooterBase";
export default function GalleryPage() {
return (
<ThemeProvider>
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="medium"
sizing="medium"
background="none"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="medium"
>
<ReactLenis root>
<NavbarLayoutFloatingOverlay
brandName="Firenze"
navItems={[
{ name: "Home", id: "/" },
{ name: "Collections", id: "/gallery" },
{ name: "Catalog", id: "/catalog" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
]}
button={{ text: "View Catalog", href: "/gallery" }}
/>
<ProductCardThree
title="Our Furniture Showcase"
@@ -25,6 +36,7 @@ export default function GalleryPage() {
gridVariant="bento-grid"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
products={[
{ id: "1", name: "Walnut Dining Table", price: "$4,500", imageSrc: "http://img.b2bpic.net/free-photo/minimalist-spacious-interior-design_23-2150378910.jpg" },
{ id: "2", name: "Velvet Modular Sofa", price: "$8,200", imageSrc: "http://img.b2bpic.net/free-photo/pillow-sofa_1203-2656.jpg" },

4
src/app/page.tsx
View File

@@ -11,7 +11,7 @@ import TestimonialCardFifteen from "@/components/sections/testimonial/Testimonia
import FaqBase from "@/components/sections/faq/FaqBase";
import ContactCTA from "@/components/sections/contact/ContactCTA";
import FooterBase from "@/components/sections/footer/FooterBase";
import { Sparkles, ArrowUpRight, Shield, TrendingUp, Award, Users } from "lucide-react";
import { Sparkles, ArrowUpRight, Users, Award, TrendingUp } from "lucide-react";
export default function FirenzeFurniturePage() {
return (
@@ -23,7 +23,7 @@ export default function FirenzeFurniturePage() {
sizing="medium"
background="none"
cardStyle="glass-elevated"
primaryButtonStyle="metallic"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="medium"
>