bender/481b504a-1e2c-4a12-a153-027626af481a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #3

Merged
bender merged 4 commits from version_1 into main 2026-02-20 21:23:03 +00:00
Conversation 0 Commits 4 Files Changed 4 +26 -26
4 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/blog/page.tsx
View File

@@ -28,13 +28,12 @@ export default function BlogPage() {
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Rooms", id: "rooms" },
{ name: "Amenities", id: "amenities" },
{ name: "Gallery", id: "gallery" },
{ name: "Contact", id: "contact" },
{ name: "Rooms", id: "/#products" },
{ name: "Amenities", id: "/#features" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Grand Stay"
button={{ text: "Book Now", href: "#contact" }}
button={{ text: "Book Now", href: "/#contact" }}
/>
</div>
@@ -61,15 +60,15 @@ export default function BlogPage() {
columns={[
{
title: "Hotel", items: [
{ label: "About Us", href: "#about" },
{ label: "Rooms", href: "#rooms" },
{ label: "Amenities", href: "#amenities" },
{ label: "About Us", href: "/#about" },
{ label: "Rooms", href: "/#products" },
{ label: "Amenities", href: "/#features" },
],
},
{
title: "Guest Services", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact Us", href: "/#contact" },
{ label: "Privacy Policy", href: "/privacy" },
],
},

7
src/app/page.tsx
View File

@@ -28,7 +28,7 @@ export default function SitePage() {
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[{name:"Rooms",id:"rooms"},{name:"Amenities",id:"amenities"},{name:"Gallery",id:"gallery"},{name:"Contact",id:"contact"}]}
navItems={[{name:"Rooms",id:"products"},{name:"Amenities",id:"features"},{name:"Contact",id:"contact"}]}
brandName="Grand Stay"
button={{text:"Book Now",href:"#contact"}}
/>
@@ -38,7 +38,7 @@ export default function SitePage() {
title="Experience Unforgettable Stays at Grand Stay"
description="Indulge in unparalleled comfort and luxury. Your perfect escape awaits with world-class service and breathtaking views."
background={{ variant: 'plain' }}
buttons={[{text:"Book Your Room",href:"#contact"},{text:"Explore Rooms",href:"#rooms"}]}
buttons={[{text:"Book Your Room",href:"#contact"},{text:"Explore Rooms",href:"#products"}]}
imageSrc="https://img.b2bpic.net/free-photo/luxury-bedroom-interior-with-rich-furniture-scenic-view-from-walkout-deck_1258-111483.jpg"
imageAlt="Luxury hotel room with a large bed and city view"
mediaAnimation="opacity"
@@ -54,6 +54,7 @@ export default function SitePage() {
imageSrc="https://img.b2bpic.net/free-photo/side-view-woman-looking-out-window_23-2149622868.jpg"
imageAlt="Elegant hotel lobby with a grand chandelier and comfortable seating"
mediaAnimation="slide-up"
metricsAnimation="slide-up"
/>
</div>
<div id="features" data-section="features">
@@ -126,7 +127,7 @@ export default function SitePage() {
</div>
<div id="footer" data-section="footer">
<FooterBaseReveal
columns={[{title:"Hotel",items:[{label:"About Us",href:"#about"},{label:"Rooms",href:"#rooms"},{label:"Amenities",href:"#amenities"}]},{title:"Guest Services",items:[{label:"FAQ",href:"#faq"},{label:"Contact Us",href:"#contact"},{label:"Privacy Policy",href:"/privacy"}]},{title:"Follow Us",items:[{label:"Facebook",href:"https://facebook.com/grandstay"},{label:"Instagram",href:"https://instagram.com/grandstay"},{label:"Twitter",href:"https://twitter.com/grandstay"}]}]}
columns={[{title:"Hotel",items:[{label:"About Us",href:"#about"},{label:"Rooms",href:"#products"},{label:"Amenities",href:"#features"}]},{title:"Guest Services",items:[{label:"FAQ",href:"#faq"},{label:"Contact Us",href:"#contact"},{label:"Privacy Policy",href:"/privacy"}]},{title:"Follow Us",items:[{label:"Facebook",href:"https://facebook.com/grandstay"},{label:"Instagram",href:"https://instagram.com/grandstay"},{label:"Twitter",href:"https://twitter.com/grandstay"}]}]}
copyrightText="© 2024 Grand Stay. All rights reserved."
/>
</div>

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

@@ -75,7 +75,7 @@ function ProductPageContent({ params }: ProductPageProps) {
}, [cartItems, checkout, getCheckoutItems]);
const navbar = (
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
@@ -93,15 +93,15 @@ function ProductPageContent({ params }: ProductPageProps) {
columns={[
{
title: "Hotel", items: [
{ label: "About Us", href: "#about" },
{ label: "Rooms", href: "#rooms" },
{ label: "Amenities", href: "#amenities" },
{ label: "About Us", href: "/#about" },
{ label: "Rooms", href: "/#products" },
{ label: "Amenities", href: "/#features" },
],
},
{
title: "Guest Services", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact Us", href: "/#contact" },
{ label: "Privacy Policy", href: "/privacy" },
],
},

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

@@ -31,7 +31,7 @@ export default function ShopPage() {
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
@@ -63,7 +63,7 @@ export default function ShopPage() {
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
@@ -89,15 +89,15 @@ export default function ShopPage() {
columns={[
{
title: "Hotel", items: [
{ label: "About Us", href: "#about" },
{ label: "Rooms", href: "#rooms" },
{ label: "Amenities", href: "#amenities" },
{ label: "About Us", href: "/#about" },
{ label: "Rooms", href: "/#products" },
{ label: "Amenities", href: "/#features" },
],
},
{
title: "Guest Services", items: [
{ label: "FAQ", href: "#faq" },
{ label: "Contact Us", href: "#contact" },
{ label: "FAQ", href: "/#faq" },
{ label: "Contact Us", href: "/#contact" },
{ label: "Privacy Policy", href: "/privacy" },
],
},