bender/5d8fc8a3-1d11-460c-b624-b65f5e3aa089
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 5 commits from version_1 into main 2026-03-16 01:43:15 +00:00
Conversation 0 Commits 5 Files Changed 5 +67 -31
5 changed files with 67 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,7 @@ export default function AboutPage() {
title="About The Rose Room"
description="OXFORD'S PREMIER DESTINATION FOR BEAUTY & WELLNESS"
background={{ variant: "plain" }}
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286624-7yt6ijqa.png"
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286624-7yt6ijqa.png?_wi=2"
imageAlt="The Rose Room Salon exterior"
tag="Professional Excellence Since 2020"
tagAnimation="blur-reveal"

54
src/app/layout.tsx
View File

@@ -1,30 +1,64 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Cormorant_Garamond } from "next/font/google";
import { DM_Sans } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { getVisualEditScript } from "@/utils/visual-edit-script";
import { Cormorant_Garamond } from "next/font/google";
import { DM_Sans } from "next/font/google";
const halant = Halant({
variable: "--font-halant",
subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
export const metadata: Metadata = {
title: "Webild components 2",
description: "Generated by create next app",
};
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const cormorantGaramond = Cormorant_Garamond({
variable: "--font-cormorant-garamond",
subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const dmSans = DM_Sans({
variable: "--font-dm-sans",
subsets: ["latin"],
});
export const metadata: Metadata = {
title: "The Rose Room Salon | Oxford, Ohio Beauty Services",
description: "Oxford's premier salon offering haircuts, styling, coloring, texture services, wax, spa treatments, and nail services by master stylists.",
keywords: "salon oxford ohio, hair salon, nail salon, beauty services, master stylist, hair coloring",
metadataBase: new URL("https://theroseroom.local"),
alternates: {
canonical: "https://theroseroom.local",
},
openGraph: {
title: "The Rose Room Salon - Oxford, Ohio",
description: "Professional beauty and salon services in Oxford, Ohio",
siteName: "The Rose Room Salon",
url: "https://theroseroom.local",
type: "website",
images: [
{
url: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286624-7yt6ijqa.png",
alt: "The Rose Room Salon exterior",
},
],
},
twitter: {
card: "summary_large_image",
title: "The Rose Room Salon",
description: "Professional beauty and salon services",
images: ["https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286624-7yt6ijqa.png"],
},
};
export default function RootLayout({
children,
}: Readonly<{
@@ -33,7 +67,9 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${cormorantGaramond.variable} ${dmSans.variable} antialiased`}>
<body
className={`${halant.variable} ${inter.variable} ${cormorantGaramond.variable} ${dmSans.variable} antialiased`}
>
<Tag />
{children}
<script
@@ -45,4 +81,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

22
src/app/page.tsx
View File

@@ -105,7 +105,7 @@ export default function HomePage() {
title="The Rose Room Salon"
description="OXFORD, OHIO'S PREMIER SALON"
background={{ variant: "plain" }}
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286624-7yt6ijqa.png"
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286624-7yt6ijqa.png?_wi=1"
imageAlt="The Rose Room Salon exterior"
buttons={[
{ text: "Book Your Visit", href: "https://fresha.com" },
@@ -134,7 +134,7 @@ export default function HomePage() {
price: "$50",
rating: 5,
reviewCount: "1 hr",
imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1694.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1694.jpg?_wi=1",
imageAlt: "builder gel manicure nail salon",
},
{
@@ -144,7 +144,7 @@ export default function HomePage() {
price: "$65",
rating: 5,
reviewCount: "1 hr 30 min",
imageSrc: "http://img.b2bpic.net/free-photo/vertical-closeup-woman-s-hand-with-white-manicure_181624-61773.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/vertical-closeup-woman-s-hand-with-white-manicure_181624-61773.jpg?_wi=1",
imageAlt: "gel-x nail extensions full set",
},
{
@@ -154,7 +154,7 @@ export default function HomePage() {
price: "$60",
rating: 5,
reviewCount: "1 hr",
imageSrc: "http://img.b2bpic.net/free-photo/male-female-friends-getting-manicure-together_23-2150285898.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/male-female-friends-getting-manicure-together_23-2150285898.jpg?_wi=1",
imageAlt: "gel-x fill in manicure maintenance",
},
{
@@ -164,7 +164,7 @@ export default function HomePage() {
price: "$35",
rating: 5,
reviewCount: "45 min",
imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1695.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1695.jpg?_wi=1",
imageAlt: "gel manicure polish nails salon",
},
{
@@ -174,7 +174,7 @@ export default function HomePage() {
price: "$55",
rating: 5,
reviewCount: "1 hr",
imageSrc: "http://img.b2bpic.net/free-photo/hand-with-colorful-manicure-book_23-2151989342.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/hand-with-colorful-manicure-book_23-2151989342.jpg?_wi=1",
imageAlt: "SNS dip powder nails salon",
},
{
@@ -184,7 +184,7 @@ export default function HomePage() {
price: "$65",
rating: 5,
reviewCount: "1 hr 30 min",
imageSrc: "http://img.b2bpic.net/free-photo/hardware-manicure-process_343596-1846.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/hardware-manicure-process_343596-1846.jpg?_wi=1",
imageAlt: "SNS dip powder with acrylic tips",
},
]}
@@ -203,25 +203,25 @@ export default function HomePage() {
{
id: "julie",
name: "Julie",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-bit7cpbg.png",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-bit7cpbg.png?_wi=1",
imageAlt: "Julie, team member",
},
{
id: "leah",
name: "Leah",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-zh7ngctm.png",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-zh7ngctm.png?_wi=1",
imageAlt: "Leah, team member",
},
{
id: "brittany",
name: "Brittany",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-q69rd2ag.png",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-q69rd2ag.png?_wi=1",
imageAlt: "Brittany, team member",
},
{
id: "mariah",
name: "Mariah",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-7duu3lf1.png",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-7duu3lf1.png?_wi=1",
imageAlt: "Mariah, team member",
},
]}

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

@@ -116,7 +116,7 @@ export default function ServicesPage() {
price: "$50",
rating: 5,
reviewCount: "1 hr",
imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1694.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1694.jpg?_wi=2",
imageAlt: "builder gel manicure nail salon",
},
{
@@ -126,7 +126,7 @@ export default function ServicesPage() {
price: "$65",
rating: 5,
reviewCount: "1 hr 30 min",
imageSrc: "http://img.b2bpic.net/free-photo/vertical-closeup-woman-s-hand-with-white-manicure_181624-61773.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/vertical-closeup-woman-s-hand-with-white-manicure_181624-61773.jpg?_wi=2",
imageAlt: "gel-x nail extensions full set",
},
{
@@ -136,7 +136,7 @@ export default function ServicesPage() {
price: "$60",
rating: 5,
reviewCount: "1 hr",
imageSrc: "http://img.b2bpic.net/free-photo/male-female-friends-getting-manicure-together_23-2150285898.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/male-female-friends-getting-manicure-together_23-2150285898.jpg?_wi=2",
imageAlt: "gel-x fill in manicure maintenance",
},
{
@@ -146,7 +146,7 @@ export default function ServicesPage() {
price: "$35",
rating: 5,
reviewCount: "45 min",
imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1695.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/woman-nails-salon-receiving-manicure-with-nail-file_1139-1695.jpg?_wi=2",
imageAlt: "gel manicure polish nails salon",
},
{
@@ -156,7 +156,7 @@ export default function ServicesPage() {
price: "$55",
rating: 5,
reviewCount: "1 hr",
imageSrc: "http://img.b2bpic.net/free-photo/hand-with-colorful-manicure-book_23-2151989342.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/hand-with-colorful-manicure-book_23-2151989342.jpg?_wi=2",
imageAlt: "SNS dip powder nails salon",
},
{
@@ -166,7 +166,7 @@ export default function ServicesPage() {
price: "$65",
rating: 5,
reviewCount: "1 hr 30 min",
imageSrc: "http://img.b2bpic.net/free-photo/hardware-manicure-process_343596-1846.jpg",
imageSrc: "http://img.b2bpic.net/free-photo/hardware-manicure-process_343596-1846.jpg?_wi=2",
imageAlt: "SNS dip powder with acrylic tips",
},
]}

8
src/app/team/page.tsx
View File

@@ -110,25 +110,25 @@ export default function TeamPage() {
{
id: "julie",
name: "Julie",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-bit7cpbg.png",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-bit7cpbg.png?_wi=2",
imageAlt: "Julie, team member",
},
{
id: "leah",
name: "Leah",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-zh7ngctm.png",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-zh7ngctm.png?_wi=2",
imageAlt: "Leah, team member",
},
{
id: "brittany",
name: "Brittany",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-q69rd2ag.png",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-q69rd2ag.png?_wi=2",
imageAlt: "Brittany, team member",
},
{
id: "mariah",
name: "Mariah",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-7duu3lf1.png",
imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3Azc1FjZzDLy0VZMsNoEXQQnd36/uploaded-1773625286625-7duu3lf1.png?_wi=2",
imageAlt: "Mariah, team member",
},
]}