bender/92bd4539-bb1d-4e97-9c2f-2a2adcced562
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_1
Branches Tags
bender:main bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_6
Branches Tags
bender:main bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

24 Commits
version_1 ... version_6

Author SHA1 Message Date
bender
5bbfc32b0c Update src/app/styles/variables.css 2026-02-15 10:57:08 +00:00
bender
c7a55de827 Update src/app/shop/page.tsx 2026-02-15 10:57:07 +00:00
bender
c493a2f2b2 Update src/app/shop/[id]/page.tsx 2026-02-15 10:57:07 +00:00
bender
dfe1678b80 Update src/app/page.tsx 2026-02-15 10:57:06 +00:00
bender
266e367168 Update src/app/blog/page.tsx 2026-02-15 10:57:05 +00:00
bender
ccf6806ebd Merge version_5 into main 
Merge version_5 into main
 2026-02-15 10:45:43 +00:00
bender
18c9cd8d49 Update src/app/styles/variables.css 2026-02-15 10:45:39 +00:00
bender
08ed3d6b94 Merge version_5 into main 
Merge version_5 into main
 2026-02-15 10:44:46 +00:00
bender
0349deba15 Update theme colors 2026-02-15 10:44:40 +00:00
bender
cafb28f979 Merge version_4 into main 
Merge version_4 into main
 2026-02-15 10:41:50 +00:00
bender
0ed29dbdb4 Update src/app/styles/variables.css 2026-02-15 10:41:45 +00:00
bender
231605ad56 Merge version_3 into main 
Merge version_3 into main
 2026-02-15 10:39:44 +00:00
bender
d4c1f07d3e Update theme colors 2026-02-15 10:39:38 +00:00
bender
e122110225 Merge version_3 into main 
Merge version_3 into main
 2026-02-15 10:06:10 +00:00
bender
505ccc707e Update theme colors 2026-02-15 10:06:04 +00:00
bender
0d3a700e01 Merge version_3 into main 
Merge version_3 into main
 2026-02-15 09:56:24 +00:00
bender
fa3ec30c00 Update src/app/styles/variables.css 2026-02-15 09:56:20 +00:00
bender
0d887953f8 Merge version_2 into main 
Merge version_2 into main
 2026-02-15 09:53:03 +00:00
bender
d98bf2215c Update src/app/styles/variables.css 2026-02-15 09:52:59 +00:00
bender
3724897280 Update src/app/shop/page.tsx 2026-02-15 09:52:58 +00:00
bender
4a5df482e5 Update src/app/shop/[id]/page.tsx 2026-02-15 09:52:57 +00:00
bender
663e6fe0c3 Update src/app/page.tsx 2026-02-15 09:52:57 +00:00
bender
5953ba62c0 Update src/app/layout.tsx 2026-02-15 09:52:56 +00:00
bender
85d9781995 Update src/app/blog/page.tsx 2026-02-15 09:52:55 +00:00
6 changed files with 48 additions and 28 deletions
Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ export default function BlogPage() {
{ name: "Rooms", id: "rooms" }, { name: "Rooms", id: "rooms" },
{ name: "Amenities", id: "amenities" }, { name: "Amenities", id: "amenities" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Reviews", id: "reviews" }, { name: "Blog", id: "/blog" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }
]} ]}
bottomLeftText="5-Star Hospitality" bottomLeftText="5-Star Hospitality"
@@ -86,4 +86,4 @@ export default function BlogPage() {
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

2
src/app/layout.tsx
View File

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

8
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client" "use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider"; import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen'; import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
@@ -34,7 +34,7 @@ export default function LuxuryHotelPage() {
{ name: "Rooms", id: "rooms" }, { name: "Rooms", id: "rooms" },
{ name: "Amenities", id: "amenities" }, { name: "Amenities", id: "amenities" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Reviews", id: "reviews" }, { name: "Blog", id: "/blog" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }
]} ]}
bottomLeftText="5-Star Hospitality" bottomLeftText="5-Star Hospitality"
@@ -49,7 +49,7 @@ export default function LuxuryHotelPage() {
socialLinks={[ socialLinks={[
{ icon: Heart, label: "Favorites", href: "#rooms" }, { icon: Heart, label: "Favorites", href: "#rooms" },
{ icon: MapPin, label: "Location", href: "#contact" }, { icon: MapPin, label: "Location", href: "#contact" },
{ icon: Star, label: "Reviews", href: "#reviews" } { icon: Star, label: "Reviews", href: "#testimonials" }
]} ]}
linkCards={[ linkCards={[
{ {
@@ -241,4 +241,4 @@ export default function LuxuryHotelPage() {
</div> </div>
</ThemeProvider> </ThemeProvider>
); );
} }

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

@@ -87,7 +87,11 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Luxury Suites" brandName="Luxury Suites"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "Shop", id: "/shop" } { name: "Rooms", id: "rooms" },
{ name: "Amenities", id: "amenities" },
{ name: "About", id: "about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "contact" }
]} ]}
bottomLeftText="5-Star Hospitality" bottomLeftText="5-Star Hospitality"
bottomRightText="reservations@luxurysuites.com" bottomRightText="reservations@luxurysuites.com"
@@ -134,7 +138,11 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Luxury Suites" brandName="Luxury Suites"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "Shop", id: "/shop" } { name: "Rooms", id: "rooms" },
{ name: "Amenities", id: "amenities" },
{ name: "About", id: "about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "contact" }
]} ]}
bottomLeftText="5-Star Hospitality" bottomLeftText="5-Star Hospitality"
bottomRightText="reservations@luxurysuites.com" bottomRightText="reservations@luxurysuites.com"
@@ -188,7 +196,11 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Luxury Suites" brandName="Luxury Suites"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "Shop", id: "/shop" } { name: "Rooms", id: "rooms" },
{ name: "Amenities", id: "amenities" },
{ name: "About", id: "about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "contact" }
]} ]}
bottomLeftText="5-Star Hospitality" bottomLeftText="5-Star Hospitality"
bottomRightText="reservations@luxurysuites.com" bottomRightText="reservations@luxurysuites.com"
@@ -246,4 +258,4 @@ export default function ProductPage({ params }: ProductPageProps) {
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

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

@@ -37,7 +37,11 @@ export default function ShopPage() {
brandName="Luxury Suites" brandName="Luxury Suites"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "Shop", id: "/shop" } { name: "Rooms", id: "rooms" },
{ name: "Amenities", id: "amenities" },
{ name: "About", id: "about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "contact" }
]} ]}
bottomLeftText="5-Star Hospitality" bottomLeftText="5-Star Hospitality"
bottomRightText="reservations@luxurysuites.com" bottomRightText="reservations@luxurysuites.com"
@@ -83,7 +87,11 @@ export default function ShopPage() {
brandName="Luxury Suites" brandName="Luxury Suites"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "Shop", id: "/shop" } { name: "Rooms", id: "rooms" },
{ name: "Amenities", id: "amenities" },
{ name: "About", id: "about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "contact" }
]} ]}
bottomLeftText="5-Star Hospitality" bottomLeftText="5-Star Hospitality"
bottomRightText="reservations@luxurysuites.com" bottomRightText="reservations@luxurysuites.com"
@@ -116,4 +124,4 @@ export default function ShopPage() {
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

28
src/app/styles/variables.css
View File

@@ -2,21 +2,21 @@
/* Base units */ /* Base units */
/* --vw is set by ThemeProvider */ /* --vw is set by ThemeProvider */
/* --background: #f5faff;; /* --background: #060000;;;;
--card: #f1f8ff;; --card: #1d0d0d;;;;
--foreground: #001122;; --foreground: #ffe6e6;;;;
--primary-cta: #15479c;; --primary-cta: #ff3d4a;;;;
--secondary-cta: #ffffff;; --secondary-cta: #1f0a0a;;;;
--accent: #a8cce8;; --accent: #7b2d2d;;;;
--background-accent: #7ba3cf;; */ --background-accent: #b8111f;;;; */
--background: #f5faff;; --background: #060000;;;;
--card: #f1f8ff;; --card: #1d0d0d;;;;
--foreground: #001122;; --foreground: #ffe6e6;;;;
--primary-cta: #15479c;; --primary-cta: #ff3d4a;;;;
--secondary-cta: #ffffff;; --secondary-cta: #1f0a0a;;;;
--accent: #a8cce8;; --accent: #7b2d2d;;;;
--background-accent: #7ba3cf;; --background-accent: #b8111f;;;;
/* text sizing - set by ThemeProvider */ /* text sizing - set by ThemeProvider */
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem); /* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);