bender/a8cd9a48-0656-46cc-b343-cad3e5a42dd0
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-20 22:19:30 +00:00
Conversation 0 Commits 4 Files Changed 4 +33 -38
4 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,17 +30,16 @@ export default function BlogPage() {
headingFontWeight="semibold"
>
<ReactLenis root>
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Rooms", id: "rooms" },
{ name: "Amenities", id: "amenities" },
{ name: "Gallery", id: "gallery" },
{ name: "Contact", id: "contact" },
]}
brandName="Grandeur Hotel"
/>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Blog", id: "/blog" },
{ name: "Shop", id: "/shop" },
]}
brandName="Grandeur Hotel"
/>
</div>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
@@ -56,13 +55,13 @@ export default function BlogPage() {
useInvertedBackground={false}
/>
)}
<FooterLogoReveal
logoText="Grandeur Hotel"
leftLink={{ text: "Privacy Policy", href: "/privacy" }}
rightLink={{ text: "Terms of Service", href: "/terms" }}
useInvertedBackground={false}
/>
<div id="footer" data-section="footer">
<FooterLogoReveal
logoText="Grandeur Hotel"
leftLink={{ text: "Privacy Policy", href: "/privacy" }}
rightLink={{ text: "Terms of Service", href: "/terms" }}
/>
</div>
</ReactLenis>
</ThemeProvider>
);

10
src/app/page.tsx
View File

@@ -75,9 +75,9 @@ export default function LandingPage() {
title="Discover Our World-Class Amenities"
description="From serene spa treatments to exquisite dining, every detail is crafted for your comfort and enjoyment."
features={[
{ title: "Infinity Pool with City Views", description: "Relax in our stunning rooftop infinity pool, offering breathtaking panoramic views of the city skyline.", icon: Sun, mediaItems: [{ imageSrc: "https://img.b2bpic.net/free-photo/portrait-beautiful-young-asian-woman-relax-happy-smile-leisure-around-outdoor-swimming-pool_74190-11179.jpg?_wi=1", imageAlt: "Rooftop infinity pool" }, { imageSrc: "https://img.b2bpic.net/free-photo/portrait-beautiful-young-asian-woman-relax-happy-smile-leisure-around-outdoor-swimming-pool_74190-11179.jpg?_wi=2", imageAlt: "Rooftop infinity pool" }] },
{ title: "Gourmet Dining Experiences", description: "Indulge in culinary masterpieces at our Michelin-starred restaurant, where every dish is a journey.", icon: Utensils, mediaItems: [{ imageSrc: "https://img.b2bpic.net/free-photo/elegantly-dressed-couple-handsome-stylish-male-charming-brunette-woman-sitting-together-luxury-restaurant_613910-18589.jpg?_wi=1", imageAlt: "Fine dining restaurant interior" }, { imageSrc: "https://img.b2bpic.net/free-photo/elegantly-dressed-couple-handsome-stylish-male-charming-brunette-woman-sitting-together-luxury-restaurant_613910-18589.jpg?_wi=2", imageAlt: "Fine dining restaurant interior" }] },
{ title: "Rejuvenating Spa & Wellness", description: "Escape to our luxurious spa for a range of treatments designed to restore balance and tranquility.", icon: Spa, mediaItems: [{ imageSrc: "https://img.b2bpic.net/free-photo/happy-woman-reading-book-while-spending-relaxing-day-wit-her-husband-wellness-center_637285-7458.jpg?_wi=1", imageAlt: "Spa treatment room" }, { imageSrc: "https://img.b2bpic.net/free-photo/happy-woman-reading-book-while-spending-relaxing-day-wit-her-husband-wellness-center_637285-7458.jpg?_wi=2", imageAlt: "Spa treatment room" }] },
{ title: "Infinity Pool with City Views", description: "Relax in our stunning rooftop infinity pool, offering breathtaking panoramic views of the city skyline.", icon: Sun, mediaItems: [{ imageSrc: "https://img.b2bpic.net/free-photo/portrait-beautiful-young-asian-woman-relax-happy-smile-leisure-around-outdoor-swimming-pool_74190-11179.jpg", imageAlt: "Rooftop infinity pool" }, { imageSrc: "https://img.b2bpic.net/free-photo/portrait-beautiful-young-asian-woman-relax-happy-smile-leisure-around-outdoor-swimming-pool_74190-11179.jpg", imageAlt: "Rooftop infinity pool" }] },
{ title: "Gourmet Dining Experiences", description: "Indulge in culinary masterpieces at our Michelin-starred restaurant, where every dish is a journey.", icon: Utensils, mediaItems: [{ imageSrc: "https://img.b2bpic.net/free-photo/elegantly-dressed-couple-handsome-stylish-male-charming-brunette-woman-sitting-together-luxury-restaurant_613910-18589.jpg", imageAlt: "Fine dining restaurant interior" }, { imageSrc: "https://img.b2bpic.net/free-photo/elegantly-dressed-couple-handsome-stylish-male-charming-brunette-woman-sitting-together-luxury-restaurant_613910-18589.jpg", imageAlt: "Fine dining restaurant interior" }] },
{ title: "Rejuvenating Spa & Wellness", description: "Escape to our luxurious spa for a range of treatments designed to restore balance and tranquility.", icon: Spa, mediaItems: [{ imageSrc: "https://img.b2bpic.net/free-photo/happy-woman-reading-book-while-spending-relaxing-day-wit-her-husband-wellness-center_637285-7458.jpg", imageAlt: "Spa treatment room" }, { imageSrc: "https://img.b2bpic.net/free-photo/happy-woman-reading-book-while-spending-relaxing-day-wit-her-husband-wellness-center_637285-7458.jpg", imageAlt: "Spa treatment room" }] },
]}
textboxLayout="default"
animationType="depth-3d"
@@ -89,8 +89,8 @@ export default function LandingPage() {
title="Our Exquisite Rooms & Suites"
description="Choose from our selection of elegantly appointed rooms, each offering a unique blend of comfort and style."
products={[
{ id: "1", name: "Luxury Suite", price: "$750/night", 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 suite bedroom" },
{ id: "2", name: "Deluxe Room", price: "$450/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: "Deluxe hotel room living area" },
{ id: "1", name: "Luxury Suite", price: "$750/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 bedroom" },
{ id: "2", name: "Deluxe Room", price: "$450/night", imageSrc: "https://img.b2bpic.net/free-photo/luxury-bedroom-interior-with-rich-furniture-scenic-view-from-walkout-deck_1258-111483.jpg", imageAlt: "Deluxe hotel room living area" },
{ id: "3", name: "Standard Room", price: "$250/night", imageSrc: "https://img.b2bpic.net/free-photo/smiling-businessman-communicating-mobile-phone-while-standing-with-travel-bag-hotel-room_637285-7626.jpg", imageAlt: "Standard hotel room with city view" },
]}
gridVariant="three-columns-all-equal-width"

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation";
@@ -75,14 +75,12 @@ function ProductPageContent({ params }: ProductPageProps) {
}, [cartItems, checkout, getCheckoutItems]);
const navbarProps = {
navItems: [{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }],
brandName: "Grandeur Hotel", button: { text: "Cart", onClick: () => setCartOpen(true) },
};
navItems: [{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }],
brandName: "Grandeur Hotel"};
const footerProps = {
logoText: "Grandeur Hotel", leftLink: { text: "Privacy Policy", href: "/privacy" },
rightLink: { text: "Terms of Service", href: "/terms" },
useInvertedBackground: false,
};
if (isLoading) {
@@ -100,7 +98,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple {...navbarProps} />
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -129,7 +127,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple {...navbarProps} />
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -165,7 +163,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="semibold"
>
<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">

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

@@ -1,4 +1,4 @@
use client";
"use client";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
@@ -41,14 +41,12 @@ export default function ShopPage() {
};
const navbarProps = {
navItems: [{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }],
brandName: "Grandeur Hotel", button: { text: "Cart", onClick: () => setCartOpen(true) },
};
navItems: [{ name: "Home", id: "/" }, { name: "Blog", id: "/blog" }, { name: "Shop", id: "/shop" }],
brandName: "Grandeur Hotel"};
const footerProps = {
logoText: "Grandeur Hotel", leftLink: { text: "Privacy Policy", href: "/privacy" },
rightLink: { text: "Terms of Service", href: "/terms" },
useInvertedBackground: false
};
if (isLoading) {
@@ -66,7 +64,7 @@ export default function ShopPage() {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple {...navbarProps} />
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -94,7 +92,7 @@ export default function ShopPage() {
headingFontWeight="semibold"
>
<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">