bender/59684f4f-4107-4377-a78c-0733805cdab4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_5 into main #8

Merged
bender merged 2 commits from version_5 into main 2026-05-01 00:28:29 +00:00
Conversation 0 Commits 2 Files Changed 2 +66 -5
2 changed files with 66 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/page.tsx
View File

@@ -31,8 +31,8 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "#hero" },
{ name: "Services", id: "#services" },
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Booking", id: "#booking" },
{ name: "Contact", id: "#contact" },
]}
@@ -54,7 +54,7 @@ export default function LandingPage() {
enableKpiAnimation={true}
buttons={[
{ text: "Book Appointment", href: "#booking" },
{ text: "View Services", href: "#services" },
{ text: "View Services", href: "/services" },
]}
imageSrc="https://img.b2bpic.net/premium-photo/midsection-woman-cutting-hairs-hair-salon_798657-27771.jpg?id=114542457"
mediaAnimation="opacity"
@@ -191,7 +191,7 @@ export default function LandingPage() {
logoText="Salon Greenwich"
columns={[
{ title: "Visit Us", items: [{ label: "123 Greenwich Ave, CT", href: "#" }, { label: "203-555-0123", href: "tel:2035550123" }] },
{ title: "Services", items: [{ label: "Haircuts", href: "#services" }, { label: "Treatments", href: "#services" }, { label: "Styling", href: "#services" }] },
{ title: "Services", items: [{ label: "Haircuts", href: "/services" }, { label: "Treatments", href: "/services" }, { label: "Styling", href: "/services" }] },
{ title: "Social", items: [{ label: "Instagram", href: "#" }, { label: "Facebook", href: "#" }] },
]}
copyrightText="© 2024 Salon Greenwich. All rights reserved."
@@ -200,4 +200,4 @@ export default function LandingPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

61
src/app/services/page.tsx Normal file
View File

@@ -0,0 +1,61 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import FeatureCardNineteen from '@/components/sections/feature/FeatureCardNineteen';
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
export default function ServicesPage() {
return (
<ThemeProvider
defaultButtonVariant="bounce-effect"
defaultTextAnimation="background-highlight"
borderRadius="soft"
contentWidth="mediumLarge"
sizing="large"
background="fluid"
cardStyle="solid"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
headingFontWeight="semibold"
>
<ReactLenis root>
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Booking", id: "/#booking" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Salon Greenwich"
button={{ text: "Book Now", href: "/#booking" }}
/>
<div className="pt-24">
<FeatureCardNineteen
textboxLayout="default"
useInvertedBackground={false}
features={[
{ tag: "Styling", title: "Precision Cutting", subtitle: "Modern Cuts", description: "Expertly crafted cuts that suit your facial features and lifestyle.", imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-composition-shaving-objects_23-2148122011.jpg" },
{ tag: "Treatment", title: "Deep Conditioning", subtitle: "Hydration Boost", description: "Restore shine and moisture with our premium conditioning rituals.", imageSrc: "http://img.b2bpic.net/free-photo/overhead-view-beauty-skin-care-spa-products_23-2147844990.jpg" },
{ tag: "Styling", title: "Signature Blow Dry", subtitle: "Glossy Finish", description: "The perfect blowout for any occasion, sleek or voluminous.", imageSrc: "http://img.b2bpic.net/free-photo/girl-chair-professional-hairdresser_23-2147769753.jpg" },
]}
title="Our Full Services Menu"
description="Explore all our signature treatments."
/>
</div>
<FooterBaseReveal
logoText="Salon Greenwich"
columns={[
{ title: "Visit Us", items: [{ label: "123 Greenwich Ave, CT", href: "#" }, { label: "203-555-0123", href: "tel:2035550123" }] },
{ title: "Services", items: [{ label: "Haircuts", href: "/services" }, { label: "Treatments", href: "/services" }, { label: "Styling", href: "/services" }] },
{ title: "Social", items: [{ label: "Instagram", href: "#" }, { label: "Facebook", href: "#" }] },
]}
copyrightText="© 2024 Salon Greenwich. All rights reserved."
/>
</ReactLenis>
</ThemeProvider>
);
}