bender/fbbfd214-b0f8-4cf7-aba3-1025bfe61dfc
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 23:27:27 +00:00
Conversation 0 Commits 4 Files Changed 4 +6 -10
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,6 @@ export default function BlogPage() {
logoText="The Grand Hotel"
leftLink={{ text: "Privacy Policy", href: "/privacy" }}
rightLink={{ text: "Terms of Service", href: "/terms" }}
useInvertedBackground={true}
/>
</div>
</ReactLenis>

8
src/app/page.tsx
View File

@@ -50,9 +50,9 @@ export default function LandingPage() {
]}
mediaItems={[
{
imageSrc: "https://img.b2bpic.net/free-photo/aerial-shot-aria-hotel-las-vegas_181624-42881.jpg?_wi=1", imageAlt: "Grand Hotel exterior in daylight"},
imageSrc: "https://img.b2bpic.net/free-photo/aerial-shot-aria-hotel-las-vegas_181624-42881.jpg", imageAlt: "Grand Hotel exterior in daylight"},
{
imageSrc: "https://img.b2bpic.net/free-photo/aerial-shot-aria-hotel-las-vegas_181624-42881.jpg?_wi=2", imageAlt: "Grand Hotel exterior at dusk"},
imageSrc: "https://img.b2bpic.net/free-photo/aerial-shot-aria-hotel-las-vegas_181624-42881.jpg", imageAlt: "Grand Hotel exterior at dusk"},
]}
mediaAnimation="slide-up"
rating={5}
@@ -107,10 +107,10 @@ export default function LandingPage() {
reviewCount: "1.2k", imageSrc: "https://img.b2bpic.net/free-photo/hotel-room-luxury-resort_53876-138105.jpg", imageAlt: "Deluxe hotel room with city view"},
{
id: "2", brand: "The Grand Hotel", name: "Executive Suite", price: "From $600/night", rating: 5,
reviewCount: "850", imageSrc: "https://img.b2bpic.net/free-photo/luxury-bedroom-interior-with-rich-furniture-scenic-view-from-walkout-deck_1258-111483.jpg?_wi=1", imageAlt: "Spacious executive suite living area"},
reviewCount: "850", imageSrc: "https://img.b2bpic.net/free-photo/luxury-bedroom-interior-with-rich-furniture-scenic-view-from-walkout-deck_1258-111483.jpg", imageAlt: "Spacious executive suite living area"},
{
id: "3", brand: "The Grand Hotel", name: "Presidential Suite", price: "From $1500/night", rating: 5,
reviewCount: "300", imageSrc: "https://img.b2bpic.net/free-photo/luxury-bedroom-interior-with-rich-furniture-scenic-view-from-walkout-deck_1258-111483.jpg?_wi=2", imageAlt: "Lavish presidential suite bedroom"},
reviewCount: "300", imageSrc: "https://img.b2bpic.net/free-photo/luxury-bedroom-interior-with-rich-furniture-scenic-view-from-walkout-deck_1258-111483.jpg", imageAlt: "Lavish presidential suite bedroom"},
]}
gridVariant="three-columns-all-equal-width"
animationType="slide-up"

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

@@ -106,7 +106,6 @@ function ProductPageContent({ params }: ProductPageProps) {
logoText="The Grand Hotel"
leftLink={{ text: "Privacy Policy", href: "/privacy" }}
rightLink={{ text: "Terms of Service", href: "/terms" }}
useInvertedBackground={true}
/>
</div>
</ReactLenis>
@@ -154,7 +153,6 @@ function ProductPageContent({ params }: ProductPageProps) {
logoText="The Grand Hotel"
leftLink={{ text: "Privacy Policy", href: "/privacy" }}
rightLink={{ text: "Terms of Service", href: "/terms" }}
useInvertedBackground={true}
/>
</div>
</ReactLenis>
@@ -224,7 +222,6 @@ function ProductPageContent({ params }: ProductPageProps) {
logoText="The Grand Hotel"
leftLink={{ text: "Privacy Policy", href: "/privacy" }}
rightLink={{ text: "Terms of Service", href: "/terms" }}
useInvertedBackground={true}
/>
</div>
</ReactLenis>

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

@@ -35,6 +35,7 @@ export default function ShopPage() {
<NavbarLayoutFloatingOverlay
brandName="The Grand Hotel"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
button={{ text: "Book Now", href: "/#contact" }}
/>
</div>
<div id="loading-section" data-section="loading-section">
@@ -47,7 +48,6 @@ export default function ShopPage() {
logoText="The Grand Hotel"
leftLink={{ text: "Privacy Policy", href: "/privacy" }}
rightLink={{ text: "Terms of Service", href: "/terms" }}
useInvertedBackground={true}
/>
</div>
</ReactLenis>
@@ -73,6 +73,7 @@ export default function ShopPage() {
<NavbarLayoutFloatingOverlay
brandName="The Grand Hotel"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
button={{ text: "Book Now", href: "/#contact" }}
/>
</div>
<div id="product-catalog" data-section="product-catalog">
@@ -91,7 +92,6 @@ export default function ShopPage() {
logoText="The Grand Hotel"
leftLink={{ text: "Privacy Policy", href: "/privacy" }}
rightLink={{ text: "Terms of Service", href: "/terms" }}
useInvertedBackground={true}
/>
</div>
</ReactLenis>