bender/847689e4-b3bf-4e99-848a-a2ae969ac907
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 2 commits from version_1 into main 2026-02-14 12:15:54 +00:00
Conversation 0 Commits 2 Files Changed 2 +122 -27
2 changed files with 122 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,8 +85,8 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleCentered
brandName="Lumina Hotel"
navItems={[
{"name":"Home","id":"/"},
{"name":"Shop","id":"/shop"}
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -98,9 +98,28 @@ export default function ProductPage({ params }: ProductPageProps) {
<FooterBase
logoText="Lumina Hotel"
columns={[
{"title":"About","items":[{"label":"Our Story","href":"about"},{"label":"Awards","href":"#"},{"label":"Careers","href":"#"}]},
{"title":"Services","items":[{"label":"Rooms","href":"rooms"},{"label":"Dining","href":"#"},{"label":"Spa","href":"amenities"},{"label":"Events","href":"#"}]},
{"title":"Contact","items":[{"label":"Call Us: +1 (555) 123-4567","href":"#"},{"label":"Email: info@luminahotel.com","href":"#"},{"label":"Visit Us","href":"#"}]}
{
title: "About", items: [
{ label: "Our Story", href: "about" },
{ label: "Awards", href: "#" },
{ label: "Careers", href: "#" }
]
},
{
title: "Services", items: [
{ label: "Rooms", href: "rooms" },
{ label: "Dining", href: "#" },
{ label: "Spa", href: "amenities" },
{ label: "Events", href: "#" }
]
},
{
title: "Contact", items: [
{ label: "Call Us: +1 (555) 123-4567", href: "#" },
{ label: "Email: info@luminahotel.com", href: "#" },
{ label: "Visit Us", href: "#" }
]
}
]
copyrightText="© 2025 Lumina Hotel. All rights reserved."
onPrivacyClick={null}
@@ -130,8 +149,8 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleCentered
brandName="Lumina Hotel"
navItems={[
{"name":"Home","id":"/"},
{"name":"Shop","id":"/shop"}
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -151,9 +170,28 @@ export default function ProductPage({ params }: ProductPageProps) {
<FooterBase
logoText="Lumina Hotel"
columns={[
{"title":"About","items":[{"label":"Our Story","href":"about"},{"label":"Awards","href":"#"},{"label":"Careers","href":"#"}]},
{"title":"Services","items":[{"label":"Rooms","href":"rooms"},{"label":"Dining","href":"#"},{"label":"Spa","href":"amenities"},{"label":"Events","href":"#"}]},
{"title":"Contact","items":[{"label":"Call Us: +1 (555) 123-4567","href":"#"},{"label":"Email: info@luminahotel.com","href":"#"},{"label":"Visit Us","href":"#"}]}
{
title: "About", items: [
{ label: "Our Story", href: "about" },
{ label: "Awards", href: "#" },
{ label: "Careers", href: "#" }
]
},
{
title: "Services", items: [
{ label: "Rooms", href: "rooms" },
{ label: "Dining", href: "#" },
{ label: "Spa", href: "amenities" },
{ label: "Events", href: "#" }
]
},
{
title: "Contact", items: [
{ label: "Call Us: +1 (555) 123-4567", href: "#" },
{ label: "Email: info@luminahotel.com", href: "#" },
{ label: "Visit Us", href: "#" }
]
}
]
copyrightText="© 2025 Lumina Hotel. All rights reserved."
onPrivacyClick={null}
@@ -182,8 +220,8 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleCentered
brandName="Lumina Hotel"
navItems={[
{"name":"Home","id":"/"},
{"name":"Shop","id":"/shop"}
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -228,10 +266,29 @@ export default function ProductPage({ params }: ProductPageProps) {
<FooterBase
logoText="Lumina Hotel"
columns={[
{"title":"About","items":[{"label":"Our Story","href":"about"},{"label":"Awards","href":"#"},{"label":"Careers","href":"#"}]},
{"title":"Services","items":[{"label":"Rooms","href":"rooms"},{"label":"Dining","href":"#"},{"label":"Spa","href":"amenities"},{"label":"Events","href":"#"}]},
{"title":"Contact","items":[{"label":"Call Us: +1 (555) 123-4567","href":"#"},{"label":"Email: info@luminahotel.com","href":"#"},{"label":"Visit Us","href":"#"}]}
]
{
title: "About", items: [
{ label: "Our Story", href: "about" },
{ label: "Awards", href: "#" },
{ label: "Careers", href: "#" }
]
},
{
title: "Services", items: [
{ label: "Rooms", href: "rooms" },
{ label: "Dining", href: "#" },
{ label: "Spa", href: "amenities" },
{ label: "Events", href: "#" }
]
},
{
title: "Contact", items: [
{ label: "Call Us: +1 (555) 123-4567", href: "#" },
{ label: "Email: info@luminahotel.com", href: "#" },
{ label: "Visit Us", href: "#" }
]
}
]}
copyrightText="© 2025 Lumina Hotel. All rights reserved."
onPrivacyClick={null}
/>

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

@@ -38,8 +38,8 @@ export default function ShopPage() {
<NavbarStyleCentered
brandName="Lumina Hotel"
navItems={[
{"name":"Home","id":"/"},
{"name":"Shop","id":"/shop"}
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -51,9 +51,28 @@ export default function ShopPage() {
<FooterBase
logoText="Lumina Hotel"
columns={[
{"title":"About","items":[{"label":"Our Story","href":"about"},{"label":"Awards","href":"#"},{"label":"Careers","href":"#"}]},
{"title":"Services","items":[{"label":"Rooms","href":"rooms"},{"label":"Dining","href":"#"},{"label":"Spa","href":"amenities"},{"label":"Events","href":"#"}]},
{"title":"Contact","items":[{"label":"Call Us: +1 (555) 123-4567","href":"#"},{"label":"Email: info@luminahotel.com","href":"#"},{"label":"Visit Us","href":"#"}]}
{
title: "About", items: [
{ label: "Our Story", href: "about" },
{ label: "Awards", href: "#" },
{ label: "Careers", href: "#" }
]
},
{
title: "Services", items: [
{ label: "Rooms", href: "rooms" },
{ label: "Dining", href: "#" },
{ label: "Spa", href: "amenities" },
{ label: "Events", href: "#" }
]
},
{
title: "Contact", items: [
{ label: "Call Us: +1 (555) 123-4567", href: "#" },
{ label: "Email: info@luminahotel.com", href: "#" },
{ label: "Visit Us", href: "#" }
]
}
]
copyrightText="© 2025 Lumina Hotel. All rights reserved."
onPrivacyClick={null}
@@ -82,8 +101,8 @@ export default function ShopPage() {
<NavbarStyleCentered
brandName="Lumina Hotel"
navItems={[
{"name":"Home","id":"/"},
{"name":"Shop","id":"/shop"}
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -103,10 +122,29 @@ export default function ShopPage() {
<FooterBase
logoText="Lumina Hotel"
columns={[
{"title":"About","items":[{"label":"Our Story","href":"about"},{"label":"Awards","href":"#"},{"label":"Careers","href":"#"}]},
{"title":"Services","items":[{"label":"Rooms","href":"rooms"},{"label":"Dining","href":"#"},{"label":"Spa","href":"amenities"},{"label":"Events","href":"#"}]},
{"title":"Contact","items":[{"label":"Call Us: +1 (555) 123-4567","href":"#"},{"label":"Email: info@luminahotel.com","href":"#"},{"label":"Visit Us","href":"#"}]}
]
{
title: "About", items: [
{ label: "Our Story", href: "about" },
{ label: "Awards", href: "#" },
{ label: "Careers", href: "#" }
]
},
{
title: "Services", items: [
{ label: "Rooms", href: "rooms" },
{ label: "Dining", href: "#" },
{ label: "Spa", href: "amenities" },
{ label: "Events", href: "#" }
]
},
{
title: "Contact", items: [
{ label: "Call Us: +1 (555) 123-4567", href: "#" },
{ label: "Email: info@luminahotel.com", href: "#" },
{ label: "Visit Us", href: "#" }
]
}
]}
copyrightText="© 2025 Lumina Hotel. All rights reserved."
onPrivacyClick={null}
/>