bender/4354fd42-b3c5-4a77-a8f3-958bab3c68a6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #3

Merged
bender merged 2 commits from version_2 into main 2026-03-06 17:57:13 +00:00
Conversation 0 Commits 2 Files Changed 2 +7 -45
2 changed files with 7 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/app/layout.tsx
View File

@@ -1,57 +1,20 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Nunito } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
const nunito = Nunito({
variable: "--font-nunito", subsets: ["latin"],
});
const inter = Inter({ subsets: ["latin"] });
export const metadata: Metadata = {
title: "Nomadic Oasis Barber Lounge | Elite Grooming Minneapolis", description: "Premium barbershop in Minneapolis offering precision fades, beard sculpting, and elite grooming. Experience precision, professionalism, and presence.", keywords: "barbershop Minneapolis, premium haircut, elite grooming, barber fade, beard sculpting, south Minneapolis barber, east Minneapolis barber", metadataBase: new URL("https://nomadicroasisbarber.com"),
alternates: {
canonical: "https://nomadicroasisbarber.com"},
openGraph: {
title: "Nomadic Oasis Barber Lounge", description: "Where Precision Meets Presence. Elite grooming destination on Minneapolis' south and east side.", url: "https://nomadicroasisbarber.com", siteName: "Nomadic Oasis Barber Lounge", type: "website", images: [
{
url: "https://nomadicroasisbarber.com/og-image.jpg", alt: "Nomadic Oasis Barber Lounge"},
],
},
twitter: {
card: "summary_large_image", title: "Nomadic Oasis Barber Lounge", description: "Premium barbershop for elite grooming in Minneapolis", images: ["https://nomadicroasisbarber.com/twitter-image.jpg"],
},
robots: {
index: true,
follow: true,
},
};
title: "Nomadic Oasis - Elite Grooming Minneapolis", description: "Premium fades, sculpted beards, and elite grooming at Minneapolis' premier barbershop."};
export default function RootLayout({
children,
}: Readonly<{
}: {
children: React.ReactNode;
}>) {
}) {
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${nunito.variable} antialiased`}
>
<Tag />
{children}
<html lang="en">
<body className={inter.className}>{children}
<script
dangerouslySetInnerHTML={{
__html: `
@@ -1419,7 +1382,6 @@ export default function RootLayout({
}}
/>
</body>
</ServiceWrapper>
</html>
);
}

2
src/app/page.tsx
View File

@@ -91,7 +91,7 @@ export default function LandingPage() {
<div id="services" data-section="services">
<PricingCardThree
title="Our Services"
title="Invest in Your Confidence"
description="Precision-crafted grooming experiences designed to transform your look and confidence."
textboxLayout="default"
animationType="blur-reveal"