Merge version_2 into main

Merge version_2 into main

src/app/blog/page.tsx

@@ -29,7 +29,7 @@ export default function BlogPage() {
                     <NavbarLayoutFloatingOverlay
                         brandName="Luxe Haven"
                         navItems={[
-                            { name: "Home", id: "/" },
+                            { name: "Home", id: "hero" },
                             { name: "About", id: "about" },
                             { name: "Rooms", id: "rooms" },
                             { name: "Features", id: "features" },
@@ -100,4 +100,4 @@ export default function BlogPage() {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/layout.tsx

@@ -1257,4 +1257,4 @@ export default function RootLayout({
       </ServiceWrapper>
     </html>
   );
-}
+}

src/app/page.tsx

@@ -235,4 +235,4 @@ export default function LandingPage() {
       </div>
     </ThemeProvider>
   );
-}
+}

src/app/shop/[id]/page.tsx

@@ -85,8 +85,12 @@ export default function ProductPage({ params }: ProductPageProps) {
                         <NavbarLayoutFloatingOverlay
                             brandName="Luxe Haven"
                             navItems={[
-                                { name: "Home", id: "/" },
-                                { name: "Shop", id: "/shop" }
+                                { name: "Home", id: "hero" },
+                                { name: "About", id: "about" },
+                                { name: "Rooms", id: "rooms" },
+                                { name: "Features", id: "features" },
+                                { name: "Pricing", id: "pricing" },
+                                { name: "Contact", id: "contact" }
                             ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
@@ -153,8 +157,12 @@ export default function ProductPage({ params }: ProductPageProps) {
                         <NavbarLayoutFloatingOverlay
                             brandName="Luxe Haven"
                             navItems={[
-                                { name: "Home", id: "/" },
-                                { name: "Shop", id: "/shop" }
+                                { name: "Home", id: "hero" },
+                                { name: "About", id: "about" },
+                                { name: "Rooms", id: "rooms" },
+                                { name: "Features", id: "features" },
+                                { name: "Pricing", id: "pricing" },
+                                { name: "Contact", id: "contact" }
                             ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
@@ -228,8 +236,12 @@ export default function ProductPage({ params }: ProductPageProps) {
                     <NavbarLayoutFloatingOverlay
                         brandName="Luxe Haven"
                         navItems={[
-                            { name: "Home", id: "/" },
-                            { name: "Shop", id: "/shop" }
+                            { name: "Home", id: "hero" },
+                            { name: "About", id: "about" },
+                            { name: "Rooms", id: "rooms" },
+                            { name: "Features", id: "features" },
+                            { name: "Pricing", id: "pricing" },
+                            { name: "Contact", id: "contact" }
                         ]}
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />
@@ -308,4 +320,4 @@ export default function ProductPage({ params }: ProductPageProps) {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/shop/page.tsx

@@ -38,8 +38,12 @@ export default function ShopPage() {
                         <NavbarLayoutFloatingOverlay
                             brandName="Luxe Haven"
                             navItems={[
-                                { name: "Home", id: "/" },
-                                { name: "Shop", id: "/shop" }
+                                { name: "Home", id: "hero" },
+                                { name: "About", id: "about" },
+                                { name: "Rooms", id: "rooms" },
+                                { name: "Features", id: "features" },
+                                { name: "Pricing", id: "pricing" },
+                                { name: "Contact", id: "contact" }
                             ]}
                             button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                         />
@@ -105,8 +109,12 @@ export default function ShopPage() {
                     <NavbarLayoutFloatingOverlay
                         brandName="Luxe Haven"
                         navItems={[
-                            { name: "Home", id: "/" },
-                            { name: "Shop", id: "/shop" }
+                            { name: "Home", id: "hero" },
+                            { name: "About", id: "about" },
+                            { name: "Rooms", id: "rooms" },
+                            { name: "Features", id: "features" },
+                            { name: "Pricing", id: "pricing" },
+                            { name: "Contact", id: "contact" }
                         ]}
                         button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                     />
@@ -160,4 +168,4 @@ export default function ShopPage() {
             </ReactLenis>
         </ThemeProvider>
     );
-}
+}

src/app/styles/variables.css

@@ -2,21 +2,21 @@
   /* Base units */
   /* --vw is set by ThemeProvider */
 
-  /* --background: #f5f5f5;;
-  --card: #ffffff;;
-  --foreground: #1c1c1c;;
-  --primary-cta: #341f51;;
+  /* --background: #f5faff;;
+  --card: #f1f8ff;;
+  --foreground: #001122;;
+  --primary-cta: #15479c;;
   --secondary-cta: #ffffff;;
-  --accent: #6139e6;;
-  --background-accent: #b3a8e8;; */
+  --accent: #a8cce8;;
+  --background-accent: #7ba3cf;; */
 
-  --background: #f5f5f5;;
-  --card: #ffffff;;
-  --foreground: #1c1c1c;;
-  --primary-cta: #341f51;;
+  --background: #f5faff;;
+  --card: #f1f8ff;;
+  --foreground: #001122;;
+  --primary-cta: #15479c;;
   --secondary-cta: #ffffff;;
-  --accent: #6139e6;;
-  --background-accent: #b3a8e8;;
+  --accent: #a8cce8;;
+  --background-accent: #7ba3cf;;
 
   /* text sizing - set by ThemeProvider */
   /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);