bender/8172b1ae-4080-4f02-8c1e-0d3bb04c01b4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #4

Merged
bender merged 4 commits from version_1 into main 2026-03-03 11:00:22 +00:00
Conversation 0 Commits 4 Files Changed 4 +54 -52
4 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,10 +9,10 @@ import { Heart } from 'lucide-react';
export default function AboutPage() {
const navItems = [
{ name: "Shop", id: "shop" },
{ name: "Collections", id: "collections" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" },
{ name: "Collections", id: "/collections" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
{ name: "Cart", id: "https://example.com/cart" },
];
@@ -43,8 +43,8 @@ export default function AboutPage() {
]}
useInvertedBackground={false}
buttons={[
{ text: "Shop Now", href: "shop" },
{ text: "Design Consultation", href: "contact" }
{ text: "Shop Now", href: "/shop" },
{ text: "Design Consultation", href: "/contact" }
]}
buttonAnimation="slide-up"
/>
@@ -92,17 +92,17 @@ export default function AboutPage() {
columns={[
{
title: "Shop", items: [
{ label: "All Furniture", href: "shop" },
{ label: "Seating", href: "shop" },
{ label: "Tables", href: "shop" },
{ label: "Storage", href: "shop" },
{ label: "New Arrivals", href: "shop" }
{ label: "All Furniture", href: "/shop" },
{ label: "Seating", href: "/shop" },
{ label: "Tables", href: "/shop" },
{ label: "Storage", href: "/shop" },
{ label: "New Arrivals", href: "/shop" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "about" },
{ label: "Design Philosophy", href: "about" },
{ label: "About Us", href: "/about" },
{ label: "Design Philosophy", href: "/about" },
{ label: "Sustainability", href: "#" },
{ label: "Careers", href: "#" },
{ label: "Press", href: "#" }
@@ -110,7 +110,7 @@ export default function AboutPage() {
},
{
title: "Support", items: [
{ label: "Contact Us", href: "contact" },
{ label: "Contact Us", href: "/contact" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns", href: "#" },
{ label: "Care Guide", href: "#" },

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

@@ -9,10 +9,10 @@ import { Phone, HelpCircle } from 'lucide-react';
export default function ContactPage() {
const navItems = [
{ name: "Shop", id: "shop" },
{ name: "Collections", id: "collections" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" },
{ name: "Collections", id: "/collections" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
{ name: "Cart", id: "https://example.com/cart" },
];
@@ -90,17 +90,17 @@ export default function ContactPage() {
columns={[
{
title: "Shop", items: [
{ label: "All Furniture", href: "shop" },
{ label: "Seating", href: "shop" },
{ label: "Tables", href: "shop" },
{ label: "Storage", href: "shop" },
{ label: "New Arrivals", href: "shop" }
{ label: "All Furniture", href: "/shop" },
{ label: "Seating", href: "/shop" },
{ label: "Tables", href: "/shop" },
{ label: "Storage", href: "/shop" },
{ label: "New Arrivals", href: "/shop" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "about" },
{ label: "Design Philosophy", href: "about" },
{ label: "About Us", href: "/about" },
{ label: "Design Philosophy", href: "/about" },
{ label: "Sustainability", href: "#" },
{ label: "Careers", href: "#" },
{ label: "Press", href: "#" }
@@ -108,7 +108,7 @@ export default function ContactPage() {
},
{
title: "Support", items: [
{ label: "Contact Us", href: "contact" },
{ label: "Contact Us", href: "/contact" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns", href: "#" },
{ label: "Care Guide", href: "#" },

30
src/app/page.tsx
View File

@@ -11,13 +11,14 @@ import FaqSplitMedia from '@/components/sections/faq/FaqSplitMedia';
import ContactFaq from '@/components/sections/contact/ContactFaq';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import { Sparkles, ArrowRight, Star, Heart, HelpCircle, Mail } from 'lucide-react';
import Link from 'next/link';
export default function HomePage() {
const navItems = [
{ name: "Shop", id: "shop" },
{ name: "Collections", id: "collections" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" },
{ name: "Collections", id: "/collections" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
{ name: "Cart", id: "https://example.com/cart" },
];
@@ -80,6 +81,7 @@ export default function HomePage() {
]}
textboxLayout="default"
useInvertedBackground={false}
animationType="slide-up"
/>
</div>
@@ -130,8 +132,8 @@ export default function HomePage() {
]}
useInvertedBackground={true}
buttons={[
{ text: "Learn Our Story", href: "about" },
{ text: "Contact Us", href: "contact" }
{ text: "Learn Our Story", href: "/about" },
{ text: "Contact Us", href: "/contact" }
]}
buttonAnimation="slide-up"
/>
@@ -232,17 +234,17 @@ export default function HomePage() {
columns={[
{
title: "Shop", items: [
{ label: "All Furniture", href: "shop" },
{ label: "Seating", href: "shop" },
{ label: "Tables", href: "shop" },
{ label: "Storage", href: "shop" },
{ label: "New Arrivals", href: "shop" }
{ label: "All Furniture", href: "/shop" },
{ label: "Seating", href: "/shop" },
{ label: "Tables", href: "/shop" },
{ label: "Storage", href: "/shop" },
{ label: "New Arrivals", href: "/shop" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "about" },
{ label: "Design Philosophy", href: "about" },
{ label: "About Us", href: "/about" },
{ label: "Design Philosophy", href: "/about" },
{ label: "Sustainability", href: "#" },
{ label: "Careers", href: "#" },
{ label: "Press", href: "#" }
@@ -250,7 +252,7 @@ export default function HomePage() {
},
{
title: "Support", items: [
{ label: "Contact Us", href: "contact" },
{ label: "Contact Us", href: "/contact" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns", href: "#" },
{ label: "Care Guide", href: "#" },

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

@@ -8,10 +8,10 @@ import { Star } from 'lucide-react';
export default function ShopPage() {
const navItems = [
{ name: "Shop", id: "shop" },
{ name: "Collections", id: "collections" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" },
{ name: "Collections", id: "/collections" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
{ name: "Cart", id: "https://example.com/cart" },
];
@@ -105,17 +105,17 @@ export default function ShopPage() {
columns={[
{
title: "Shop", items: [
{ label: "All Furniture", href: "shop" },
{ label: "Seating", href: "shop" },
{ label: "Tables", href: "shop" },
{ label: "Storage", href: "shop" },
{ label: "New Arrivals", href: "shop" }
{ label: "All Furniture", href: "/shop" },
{ label: "Seating", href: "/shop" },
{ label: "Tables", href: "/shop" },
{ label: "Storage", href: "/shop" },
{ label: "New Arrivals", href: "/shop" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "about" },
{ label: "Design Philosophy", href: "about" },
{ label: "About Us", href: "/about" },
{ label: "Design Philosophy", href: "/about" },
{ label: "Sustainability", href: "#" },
{ label: "Careers", href: "#" },
{ label: "Press", href: "#" }
@@ -123,7 +123,7 @@ export default function ShopPage() {
},
{
title: "Support", items: [
{ label: "Contact Us", href: "contact" },
{ label: "Contact Us", href: "/contact" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns", href: "#" },
{ label: "Care Guide", href: "#" },