bender/f583dd20-557b-435d-b85d-522f21f3168a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

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

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

@@ -28,11 +28,11 @@ export default function BlogPage() {
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "Rooms", id: "rooms" },
{ name: "Amenities", id: "amenities" },
{ name: "Offers", id: "offers" },
{ name: "Gallery", id: "gallery" },
{ name: "Contact", id: "contact" },
{ name: "Rooms", id: "/#rooms" },
{ name: "Amenities", id: "/#amenities" },
{ name: "Offers", id: "/#offers" },
{ name: "Gallery", id: "/#gallery" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Grandeur Hotel"
/>
@@ -61,21 +61,21 @@ export default function BlogPage() {
columns={[
{
title: "About Us", items: [
{ label: "Our Story", href: "#about" },
{ label: "Our Story", href: "/#about" },
{ label: "Careers", href: "#" },
],
},
{
title: "Services", items: [
{ label: "Rooms", href: "#rooms" },
{ label: "Amenities", href: "#amenities" },
{ label: "Offers", href: "#pricing" },
{ label: "Rooms", href: "/#rooms" },
{ label: "Amenities", href: "/#amenities" },
{ label: "Offers", href: "/#pricing" },
],
},
{
title: "Guest Services", items: [
{ label: "FAQs", href: "#faq" },
{ label: "Contact", href: "#contact" },
{ label: "FAQs", href: "/#faq" },
{ label: "Contact", href: "/#contact" },
],
},
]}

8
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";
@@ -89,7 +89,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Grandeur Hotel"
@@ -131,7 +131,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Grandeur Hotel"
@@ -180,7 +180,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Grandeur Hotel"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { useCallback } from "react";
import ReactLenis from "lenis/react";
@@ -57,7 +57,7 @@ export default function ShopPage() {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Grandeur Hotel"
@@ -98,7 +98,7 @@ export default function ShopPage() {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Grandeur Hotel"