bender/dbc21477-8597-4ecb-8286-18f574047b03
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #4

Merged
bender merged 2 commits from version_1 into main 2026-02-25 08:31:10 +00:00
Conversation 0 Commits 2 Files Changed 2 +5 -5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ title: "Shop", items: [{ label: "All Products", href: "products" }, { label: "Serums", href: "#" }, { label: "Moisturizers", href: "#" }, { label: "Masks & Treatments", href: "#" }] },
{ title: "Company", items: [{ label: "About Us", href: "about" }, { label: "Our Story", href: "#" }, { label: "Sustainability", href: "#" }, { label: "Careers", href: "#" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "#" }, { label: "FAQ", href: "faq" }, { label: "Shipping & Returns", href: "#" }, { label: "Privacy Policy", href: "#" }] }
]
]}
copyrightText="© 2025 Luxe Botanics. All rights reserved. Crafted with purpose, delivered with luxury."
/>
</div>
@@ -169,7 +169,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ title: "Shop", items: [{ label: "All Products", href: "products" }, { label: "Serums", href: "#" }, { label: "Moisturizers", href: "#" }, { label: "Masks & Treatments", href: "#" }] },
{ title: "Company", items: [{ label: "About Us", href: "about" }, { label: "Our Story", href: "#" }, { label: "Sustainability", href: "#" }, { label: "Careers", href: "#" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "#" }, { label: "FAQ", href: "faq" }, { label: "Shipping & Returns", href: "#" }, { label: "Privacy Policy", href: "#" }] }
]
]}
copyrightText="© 2025 Luxe Botanics. All rights reserved. Crafted with purpose, delivered with luxury."
/>
</div>
@@ -249,7 +249,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ title: "Shop", items: [{ label: "All Products", href: "products" }, { label: "Serums", href: "#" }, { label: "Moisturizers", href: "#" }, { label: "Masks & Treatments", href: "#" }] },
{ title: "Company", items: [{ label: "About Us", href: "about" }, { label: "Our Story", href: "#" }, { label: "Sustainability", href: "#" }, { label: "Careers", href: "#" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "#" }, { label: "FAQ", href: "faq" }, { label: "Shipping & Returns", href: "#" }, { label: "Privacy Policy", href: "#" }] }
]
]}
copyrightText="© 2025 Luxe Botanics. All rights reserved. Crafted with purpose, delivered with luxury."
/>
</div>

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

@@ -56,7 +56,7 @@ function ShopPageContent() {
{ title: "Shop", items: [{ label: "All Products", href: "products" }, { label: "Serums", href: "#" }, { label: "Moisturizers", href: "#" }, { label: "Masks & Treatments", href: "#" }] },
{ title: "Company", items: [{ label: "About Us", href: "about" }, { label: "Our Story", href: "#" }, { label: "Sustainability", href: "#" }, { label: "Careers", href: "#" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "#" }, { label: "FAQ", href: "faq" }, { label: "Shipping & Returns", href: "#" }, { label: "Privacy Policy", href: "#" }] }
]
]}
copyrightText="© 2025 Luxe Botanics. All rights reserved. Crafted with purpose, delivered with luxury."
/>
</div>
@@ -111,7 +111,7 @@ function ShopPageContent() {
{ title: "Shop", items: [{ label: "All Products", href: "products" }, { label: "Serums", href: "#" }, { label: "Moisturizers", href: "#" }, { label: "Masks & Treatments", href: "#" }] },
{ title: "Company", items: [{ label: "About Us", href: "about" }, { label: "Our Story", href: "#" }, { label: "Sustainability", href: "#" }, { label: "Careers", href: "#" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "#" }, { label: "FAQ", href: "faq" }, { label: "Shipping & Returns", href: "#" }, { label: "Privacy Policy", href: "#" }] }
]
]}
copyrightText="© 2025 Luxe Botanics. All rights reserved. Crafted with purpose, delivered with luxury."
/>
</div>