development/f267d758-2c31-4ebd-a2fe-028f8c859a18
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
development merged 4 commits from version_1 into main 2026-02-06 12:47:58 +00:00
Conversation 0 Commits 4 Files Changed 4 +9 -9
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7e88caea9b - Show all commits

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

@@ -86,12 +86,12 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Alisa"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "products" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" }
]}
button={{ text: "Order Now", href: "products" }}
button={{ text: "Order Now", href: "/shop" }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -102,7 +102,7 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
items: [
{ label: "Shop Flowers", href: "products" },
{ label: "Shop Flowers", href: "/shop" },
{ label: "About Us", href: "about" },
{ label: "Testimonials", href: "testimonials" }
]
@@ -148,12 +148,12 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Alisa"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "products" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" }
]}
button={{ text: "Order Now", href: "products" }}
button={{ text: "Order Now", href: "/shop" }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -172,7 +172,7 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
items: [
{ label: "Shop Flowers", href: "products" },
{ label: "Shop Flowers", href: "/shop" },
{ label: "About Us", href: "about" },
{ label: "Testimonials", href: "testimonials" }
]
@@ -217,12 +217,12 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Alisa"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "products" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" }
]}
button={{ text: "Order Now", href: "products" }}
button={{ text: "Order Now", href: "/shop" }}
/>
</div>
<div id="productDetailCard" data-section="productDetailCard">
@@ -266,7 +266,7 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
items: [
{ label: "Shop Flowers", href: "products" },
{ label: "Shop Flowers", href: "/shop" },
{ label: "About Us", href: "about" },
{ label: "Testimonials", href: "testimonials" }
]