bender/98ebb6d8-b140-463a-93bf-071aca338a2c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #6

Merged
bender merged 2 commits from version_2 into main 2026-03-12 12:29:15 +00:00
Conversation 0 Commits 2 Files Changed 2 +17 -19
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/about/page.tsx
View File

@@ -12,11 +12,10 @@ import { Award, ShieldCheck, Users, Home, Sparkles } from "lucide-react";
const navItems = [
{ name: "Home", id: "/" },
{ name: "About Us", id: "/about" },
{ name: "Services", id: "/" },
{ name: "Bridal Studio", id: "/" },
{ name: "Gallery", id: "/" },
{ name: "Pricing", id: "/" },
{ name: "Contact", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Gallery", id: "/gallery" },
{ name: "Pricing", id: "/pricing" },
{ name: "Contact", id: "/contact" },
];
export default function AboutPage() {
@@ -39,7 +38,7 @@ export default function AboutPage() {
brandName="Luxe Beauty Studio"
navItems={navItems}
button={{
text: "Book Appointment", href: "/"}}
text: "Book Appointment", href: "/contact"}}
className="bg-gradient-to-r from-rose-100 to-orange-50 backdrop-blur-lg border border-white/20"
buttonClassName="bg-gradient-to-r from-amber-600 to-orange-500 hover:shadow-lg hover:shadow-orange-300/50 text-white font-semibold transition-all duration-300"
/>
@@ -71,7 +70,7 @@ export default function AboutPage() {
]}
buttons={[
{
text: "Book Now", href: "/"},
text: "Book Now", href: "/contact"},
]}
buttonAnimation="slide-up"
imageSrc="http://img.b2bpic.net/free-photo/professional-women-stylish-suit-office-with-tablet-device_23-2150167800.jpg"
@@ -154,19 +153,19 @@ export default function AboutPage() {
{
label: "About Us", href: "/about"},
{
label: "Services", href: "/"},
label: "Services", href: "/services"},
{
label: "Gallery", href: "/"},
label: "Gallery", href: "/gallery"},
],
},
{
items: [
{
label: "Pricing", href: "/"},
label: "Pricing", href: "/pricing"},
{
label: "Book Appointment", href: "/"},
label: "Book Appointment", href: "/contact"},
{
label: "Contact Us", href: "/about"},
label: "Contact Us", href: "/contact"},
{
label: "Instagram", href: "https://instagram.com"},
],
@@ -180,7 +179,7 @@ export default function AboutPage() {
{
label: "Refund Policy", href: "#"},
{
label: "Contact", href: "/about"},
label: "Contact", href: "/contact"},
],
},
]}

11
src/app/services/page.tsx
View File

@@ -15,7 +15,6 @@ export default function ServicesPage() {
{ name: "Home", id: "/" },
{ name: "About Us", id: "/about" },
{ name: "Services", id: "/services" },
{ name: "Bridal Studio", id: "/bridal" },
{ name: "Gallery", id: "/gallery" },
{ name: "Pricing", id: "/pricing" },
{ name: "Contact", id: "/contact" },
@@ -61,7 +60,7 @@ export default function ServicesPage() {
secondaryButtonStyle="layered"
headingFontWeight="bold"
>
<div id="nav" data-section="nav">
<div id="nav" data-section="nav" className="fixed top-0 left-0 right-0 z-50">
<NavbarLayoutFloatingOverlay
brandName="Luxe Beauty Studio"
navItems={navItems.map((item) => ({
@@ -75,7 +74,7 @@ export default function ServicesPage() {
/>
</div>
<div id="hero" data-section="hero" className="relative min-h-screen bg-gradient-to-br from-white via-amber-50 to-orange-50">
<div id="hero" data-section="hero" className="relative min-h-screen bg-gradient-to-br from-white via-amber-50 to-orange-50 pt-24">
<HeroSplit
title="Our Premium Services"
description="Discover our comprehensive range of beauty services tailored to enhance your natural beauty and celebrate special moments. Each service is crafted with precision and care by our expert team."
@@ -99,7 +98,7 @@ export default function ServicesPage() {
/>
</div>
<div id="services" data-section="services" className="relative bg-white">
<div id="services" data-section="services" className="relative bg-white py-16 md:py-24">
<FeatureCardMedia
title="Beauty & Wellness Offerings"
description="From skincare to hair treatments and complete bridal transformations, our services are designed to make you feel confident and radiant"
@@ -124,7 +123,7 @@ export default function ServicesPage() {
/>
</div>
<div id="metrics" data-section="metrics" className="relative bg-gradient-to-br from-white via-amber-50 to-white">
<div id="metrics" data-section="metrics" className="relative bg-gradient-to-br from-white via-amber-50 to-white py-16 md:py-24">
<MetricCardEleven
title="Why Choose Luxe Beauty Studio"
description="Our commitment to excellence and customer satisfaction sets us apart in the beauty industry"
@@ -146,7 +145,7 @@ export default function ServicesPage() {
/>
</div>
<div id="contact" data-section="contact" className="relative bg-gradient-to-r from-amber-50 to-orange-50">
<div id="contact" data-section="contact" className="relative bg-gradient-to-r from-amber-50 to-orange-50 py-16 md:py-24">
<ContactSplitForm
title="Book Your Beauty Appointment"
description="Schedule your transformation today. Contact us to reserve your preferred date and time with our expert beauty professionals."