bender/51b386c5-5479-4f53-95b4-5ad2fe8cfafa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 4 commits from version_1 into main 2026-02-23 07:27:54 +00:00
Conversation 0 Commits 4 Files Changed 4 +29 -31
4 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
use client";
"use client";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
@@ -31,16 +31,15 @@ export default function BlogPage() {
headingFontWeight="light"
>
<ReactLenis root>
<NavbarStyleApple
brandName="Grandeur Hotels"
navItems={[
{ name: "Home", id: "/" },
{ name: "Rooms", id: "rooms" },
{ name: "Amenities", id: "amenities" },
{ name: "Gallery", id: "gallery" },
{ name: "Contact", id: "contact" },
]}
/>
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Grandeur Hotels"
navItems={[
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
]}
/>
</div>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
@@ -60,17 +59,18 @@ export default function BlogPage() {
</div>
)}
<FooterCard
logoText="Grandeur Hotels"
copyrightText="© 2025 Grandeur Hotels. All rights reserved."
socialLinks={[
{ icon: Facebook, href: "https://facebook.com/grandeurhotels", ariaLabel: "Facebook" },
{ icon: Twitter, href: "https://twitter.com/grandeurhotels", ariaLabel: "Twitter" },
{ icon: Instagram, href: "https://instagram.com/grandeurhotels", ariaLabel: "Instagram" },
]}
useInvertedBackground={false}
ariaLabel="Site footer with brand and social links"
/>
<div id="footer" data-section="footer">
<FooterCard
logoText="Grandeur Hotels"
copyrightText="© 2025 Grandeur Hotels. All rights reserved."
socialLinks={[
{ icon: Facebook, href: "https://facebook.com/grandeurhotels", ariaLabel: "Facebook" },
{ icon: Twitter, href: "https://twitter.com/grandeurhotels", ariaLabel: "Twitter" },
{ icon: Instagram, href: "https://instagram.com/grandeurhotels", ariaLabel: "Instagram" },
]}
ariaLabel="Site footer with brand and social links"
/>
</div>
</ReactLenis>
</ThemeProvider>
);

4
src/app/page.tsx
View File

@@ -46,7 +46,7 @@ export default function LandingPage() {
description="Discover unparalleled comfort and luxury at Grandeur Hotels. Your perfect getaway awaits."
background={{ variant: 'plain' }}
mediaItems={[
{ imageSrc: "https://img.b2bpic.net/free-photo/luxury-bedroom-interior-with-rich-furniture-scenic-view-from-walkout-deck_1258-111483.jpg?_wi=1", imageAlt: "Luxury hotel room with city view" },
{ 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 city view" },
{ imageSrc: "https://img.b2bpic.net/free-photo/hotel-lobby_23-2149397559.jpg", imageAlt: "Elegant hotel lobby with grand chandelier" },
{ imageSrc: "https://img.b2bpic.net/free-photo/there-are-glasses-wine-water-table-with-white-cloth-are-ready-dining_613910-3426.jpg", imageAlt: "Fine dining restaurant in a hotel" },
{ imageSrc: "https://img.b2bpic.net/free-photo/luxury-poolside-experience-where-guests-bask-opulence-cabanas_1268-31113.jpg", imageAlt: "Infinity pool overlooking a scenic landscape" },
@@ -93,7 +93,7 @@ export default function LandingPage() {
description="Choose from our exquisite selection of rooms, each designed for ultimate comfort and elegance."
products={[
{
id: "suite", name: "Luxury Executive Suite", price: "$499/night", imageSrc: "https://img.b2bpic.net/free-photo/luxury-bedroom-interior-with-rich-furniture-scenic-view-from-walkout-deck_1258-111483.jpg?_wi=2", imageAlt: "Luxury hotel suite with a spacious living area", onProductClick: () => console.log('view suite details'),
id: "suite", name: "Luxury Executive Suite", price: "$499/night", imageSrc: "https://img.b2bpic.net/free-photo/luxury-bedroom-interior-with-rich-furniture-scenic-view-from-walkout-deck_1258-111483.jpg", imageAlt: "Luxury hotel suite with a spacious living area", onProductClick: () => console.log('view suite details'),
},
{
id: "deluxe", name: "Deluxe Double Room", price: "$299/night", imageSrc: "https://img.b2bpic.net/free-photo/pillow-bed_1203-2819.jpg", imageAlt: "Deluxe double room with a comfortable king-size bed", onProductClick: () => console.log('view deluxe room details'),

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

@@ -89,7 +89,6 @@ function ProductPageContent({ params }: ProductPageProps) {
{ icon: Twitter, href: "https://twitter.com/grandeurhotels", ariaLabel: "Twitter" },
{ icon: Instagram, href: "https://instagram.com/grandeurhotels", ariaLabel: "Instagram" }
],
useInvertedBackground: false,
ariaLabel: "Site footer with brand and social links"
};
@@ -108,7 +107,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple {...navbarProps} />
</div>
<div id="loading-section" data-section="loading-section">
@@ -139,7 +138,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple {...navbarProps} />
</div>
<div id="not-found-section" data-section="not-found-section">
@@ -177,7 +176,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple {...navbarProps} />
</div>
<div id="product-detail-card" data-section="product-detail-card">

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

@@ -31,7 +31,6 @@ function ShopPageContent() {
{ icon: Twitter, href: "https://twitter.com/grandeurhotels", ariaLabel: "Twitter" },
{ icon: Instagram, href: "https://instagram.com/grandeurhotels", ariaLabel: "Instagram" }
],
useInvertedBackground: false,
ariaLabel: "Site footer with brand and social links"
};
@@ -50,7 +49,7 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple {...navbarProps} />
</div>
<div id="loading-section" data-section="loading-section">
@@ -80,7 +79,7 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple {...navbarProps} />
</div>
<div id="product-catalog" data-section="product-catalog">