bender/904244c7-2dee-47cc-b2d2-8d52fdbbcb22
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_4
Branches Tags
bender:main bender:version_19 bender:version_18 bender:version_17 bender:version_16 bender:version_15 bender:version_14 bender:version_13 bender:version_12 bender:version_11 bender:version_10 bender:version_9 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1
...
pull from: bender:version_9
Branches Tags
bender:main bender:version_19 bender:version_18 bender:version_17 bender:version_16 bender:version_15 bender:version_14 bender:version_13 bender:version_12 bender:version_11 bender:version_10 bender:version_9 bender:version_8 bender:version_7 bender:version_6 bender:version_5 bender:version_4 bender:version_3 bender:version_2 bender:version_1

12 Commits
version_4 ... version_9

Author SHA1 Message Date
bender
f9cd211092 Update src/app/styles/base.css 2026-03-27 19:23:13 +00:00
bender
85356bbd96 Update src/app/page.tsx 2026-03-27 19:23:12 +00:00
bender
6b49851c4f Update src/app/layout.tsx 2026-03-27 19:23:12 +00:00
bender
c44d3c669c Merge version_8 into main 
Merge version_8 into main
 2026-03-27 19:22:34 +00:00
bender
cb9b618c69 Update src/app/page.tsx 2026-03-27 19:22:31 +00:00
bender
110cd5c894 Merge version_7 into main 
Merge version_7 into main
 2026-03-27 19:21:08 +00:00
bender
73c1b0b712 Update src/app/page.tsx 2026-03-27 19:21:02 +00:00
bender
6187c79a37 Merge version_6 into main 
Merge version_6 into main
 2026-03-27 19:20:27 +00:00
bender
03e4134601 Update src/app/page.tsx 2026-03-27 19:20:24 +00:00
bender
764572ccba Merge version_5 into main 
Merge version_5 into main
 2026-03-27 19:19:40 +00:00
bender
efa866adcb Update src/app/page.tsx 2026-03-27 19:19:37 +00:00
bender
ad3ca2d96c Merge version_4 into main 
Merge version_4 into main
 2026-03-27 19:18:57 +00:00
3 changed files with 18 additions and 17 deletions
Expand all files Collapse all files

9
src/app/layout.tsx
View File

@@ -6,6 +6,7 @@ import "@/lib/gsap-setup";
import { ServiceWrapper } from "@/components/ServiceWrapper"; import { ServiceWrapper } from "@/components/ServiceWrapper";
import { getVisualEditScript } from "@/utils/visual-edit-script"; import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Nunito_Sans } from "next/font/google"; import { Nunito_Sans } from "next/font/google";
import { Montserrat } from "next/font/google";
@@ -19,9 +20,9 @@ export const metadata: Metadata = {
}, },
}; };
const nunitoSans = Nunito_Sans({
variable: "--font-nunito-sans", const montserrat = Montserrat({
subsets: ["latin"], variable: "--font-montserrat", subsets: ["latin"],
}); });
export default function RootLayout({ export default function RootLayout({
@@ -32,7 +33,7 @@ export default function RootLayout({
return ( return (
<html lang="en" suppressHydrationWarning> <html lang="en" suppressHydrationWarning>
<ServiceWrapper> <ServiceWrapper>
<body className={`${nunitoSans.variable} antialiased`}> <body className={`${montserrat.variable} antialiased`}>
{children} {children}
<script <script

22
src/app/page.tsx
View File

@@ -17,12 +17,12 @@ export default function LandingPage() {
defaultTextAnimation="background-highlight" defaultTextAnimation="background-highlight"
borderRadius="rounded" borderRadius="rounded"
contentWidth="smallMedium" contentWidth="smallMedium"
sizing="mediumLargeSizeMediumTitles" sizing="largeSizeMediumTitles"
background="floatingGradient" background="floatingGradient"
cardStyle="solid" cardStyle="solid"
primaryButtonStyle="diagonal-gradient" primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="radial-glow" secondaryButtonStyle="radial-glow"
headingFontWeight="bold" headingFontWeight="extrabold"
> >
<ReactLenis root> <ReactLenis root>
<div id="nav" data-section="nav"> <div id="nav" data-section="nav">
@@ -69,17 +69,17 @@ export default function LandingPage() {
useInvertedBackground={false} useInvertedBackground={false}
plans={[ plans={[
{ {
id: "p1", badge: "Most Popular", price: "$45", subtitle: "The Signature Cut", buttons: [{ text: "Book", href: "#contact" }], id: "p1", badge: "Signature", price: "$45", subtitle: "Full service hair cut with design, black mask, and eyebrows", buttons: [{ text: "Book", href: "#contact" }],
features: ["Precision Haircut", "Line-up", "Hot Towel Service"], features: ["Precision Haircut", "Custom Design", "Black Mask Treatment", "Eyebrow Grooming"],
}, },
{ {
id: "p2", badge: "Complete", price: "$65", subtitle: "Full Grooming", buttons: [{ text: "Book", href: "#contact" }], id: "p2", badge: "Classic", price: "$35", subtitle: "Haircut with Eyebrows", buttons: [{ text: "Book", href: "#contact" }],
features: ["Precision Haircut", "Eyebrow Grooming", "Line-up"],
},
{
id: "p3", badge: "Complete", price: "$65", subtitle: "Full Grooming", buttons: [{ text: "Book", href: "#contact" }],
features: ["Signature Cut", "Beard Trim", "Facial Treatment"], features: ["Signature Cut", "Beard Trim", "Facial Treatment"],
}, },
{
id: "p3", badge: "Executive", price: "$85", subtitle: "The Migo Elite", buttons: [{ text: "Book", href: "#contact" }],
features: ["Full Grooming", "Hot Towel", "Express Facial"],
},
]} ]}
title="Services & Pricing" title="Services & Pricing"
description="Select the service that fits your style." description="Select the service that fits your style."
@@ -107,7 +107,7 @@ export default function LandingPage() {
<div id="contact" data-section="contact"> <div id="contact" data-section="contact">
<ContactSplitForm <ContactSplitForm
useInvertedBackground={false} useInvertedBackground={false}
title="Schedule Your Visit" title="Schedule Your Visit (512-504-6134)"
description="Ready to get fresh? Reach out and let's get you on the schedule." description="Ready to get fresh? Reach out and let's get you on the schedule."
inputs={[ inputs={[
{ name: "name", type: "text", placeholder: "Your Name", required: true }, { name: "name", type: "text", placeholder: "Your Name", required: true },
@@ -132,4 +132,4 @@ export default function LandingPage() {
</ReactLenis> </ReactLenis>
</ThemeProvider> </ThemeProvider>
); );
} }

4
src/app/styles/base.css
View File

@@ -11,7 +11,7 @@ html {
body { body {
background-color: var(--background); background-color: var(--background);
color: var(--foreground); color: var(--foreground);
font-family: var(--font-nunito-sans), sans-serif; font-family: var(--font-montserrat), sans-serif;
position: relative; position: relative;
min-height: 100vh; min-height: 100vh;
overscroll-behavior: none; overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
h4, h4,
h5, h5,
h6 { h6 {
font-family: var(--font-nunito-sans), sans-serif; font-family: var(--font-montserrat), sans-serif;
} }