Merge version_6 into main

Update src/app/page.tsx
2026-05-06 19:10:24 +00:00 · 2026-05-06 19:10:21 +00:00 · 2026-05-06 19:08:41 +00:00 · 2026-05-06 19:08:38 +00:00 · 2026-05-06 19:08:37 +00:00 · 2026-05-06 19:08:04 +00:00
3 changed files with 14 additions and 13 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -6,6 +6,7 @@ import "@/lib/gsap-setup";
 import { ServiceWrapper } from "@/components/ServiceWrapper";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Public_Sans } from "next/font/google";
 import { Roboto } from "next/font/google";
@@ -19,13 +20,13 @@ export const metadata: Metadata = {
  },
 };
-const publicSans = Public_Sans({
+
-  variable: "--font-public-sans",
+
-  subsets: ["latin"],
+
-});
+const roboto = Roboto({
-const inter = Inter({
+  variable: "--font-roboto",
  variable: "--font-inter",
  subsets: ["latin"],
  weight: ["100", "300", "400", "500", "700", "900"],
 });
 export default function RootLayout({
@@ -36,7 +37,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${publicSans.variable} ${inter.variable} antialiased`}>
+        <body className={`${roboto.variable} antialiased`}>
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -78,7 +78,7 @@ export default function LandingPage() {
        {
          text: "VIEW PRICES",          href: "#pricing"},
      ]}
-      imageSrc="http://img.b2bpic.net/free-photo/close-up-details-hairdresser-salon_23-2149205856.jpg"
+      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DMGxfgFdRWLXzYqe2HfYt6JE4x/uploaded-1778093237434-05qgab2c.jpg"
      imageAlt="Doc Barnet Luxury Salon"
      avatars={[
        {
@@ -135,7 +135,7 @@ export default function LandingPage() {
        {
          title: "Ladies Styling",          description: "Wash, cut, and blow dry services for sophisticated style.",          imageSrc: "http://img.b2bpic.net/free-photo/woman-with-hairdryer-hairbrush_1385-2900.jpg",          imageAlt: "Ladies Styling"},
        {
-          title: "Beard & Facial",          description: "Expert beard shaping, hot towel shaves, and facial treatments.",          imageSrc: "http://img.b2bpic.net/free-photo/woman-helping-man-applying-facial-mask_23-2148784320.jpg",          imageAlt: "Facial treatment"},
+          title: "Beard & Facial",          description: "Expert beard shaping, hot towel shaves, and facial treatments.",          imageSrc: "https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DMGxfgFdRWLXzYqe2HfYt6JE4x/tmp/beard-facial-expert-beard-shaping-hot-to-1778093777491-f883e38f.png",          imageAlt: "Facial treatment"},
      ]}
      title="PREMIUM SERVICES"
      description="Comprehensive grooming and hair solutions for gentlemen and ladies."
@@ -277,7 +277,7 @@ export default function LandingPage() {
  <div id="footer" data-section="footer">
      <FooterMedia
-      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DMGxfgFdRWLXzYqe2HfYt6JE4x/uploaded-1778093237434-05qgab2c.jpg"
+      imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3DMGxfgFdRWLXzYqe2HfYt6JE4x/uploaded-1778094604107-kwe3q62f.jpg"
      logoText="DOC BARNET"
      columns={[
        {
@@ -303,7 +303,7 @@ export default function LandingPage() {
        {
          title: "Social",          items: [
            {
-              label: "Instagram",              href: "#"},
+              label: "Instagram",              href: "https://www.instagram.com/docbarnet?igsh=MWMwdHBnamFibXc3Yw%3D%3D&utm_source=qr"},
            {
              label: "Facebook",              href: "#"},
            {
--- a/src/app/styles/base.css
+++ b/src/app/styles/base.css
@@ -11,7 +11,7 @@ html {
 body {
  background-color: var(--background);
  color: var(--foreground);
-  font-family: var(--font-inter), sans-serif;
+  font-family: var(--font-roboto), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-public-sans), sans-serif;
+  font-family: var(--font-roboto), sans-serif;
 }
Author	SHA1	Message	Date
bender	7aa5cd0464	Merge version_6 into main Merge version_6 into main	2026-05-06 19:10:24 +00:00
bender	68be6c90ca	Update src/app/page.tsx	2026-05-06 19:10:21 +00:00
bender	424fc1bda0	Merge version_6 into main Merge version_6 into main	2026-05-06 19:08:41 +00:00
bender	e7bdac001f	Update theme fonts	2026-05-06 19:08:38 +00:00
bender	0275050a84	Update theme fonts	2026-05-06 19:08:37 +00:00
bender	d7b094f699	Merge version_6 into main Merge version_6 into main	2026-05-06 19:08:04 +00:00
bender	5c0e39ddb5	Update theme fonts	2026-05-06 19:08:01 +00:00
bender	7be8de2298	Update theme fonts	2026-05-06 19:08:00 +00:00
bender	b0e8fa1bcf	Merge version_6 into main Merge version_6 into main	2026-05-06 19:07:54 +00:00
bender	4640a6ff8a	Update theme fonts	2026-05-06 19:07:48 +00:00
bender	7f44a844b7	Update theme fonts	2026-05-06 19:07:47 +00:00
bender	a8c68f6bdc	Merge version_6 into main Merge version_6 into main	2026-05-06 19:05:03 +00:00
bender	93dbd56af2	Update src/app/page.tsx	2026-05-06 19:05:00 +00:00
bender	c2f5202634	Merge version_6 into main Merge version_6 into main	2026-05-06 19:00:14 +00:00
bender	f2d3be292c	Update src/app/page.tsx	2026-05-06 19:00:11 +00:00
bender	9a568791ce	Merge version_6 into main Merge version_6 into main	2026-05-06 18:50:53 +00:00
bender	793e5a416f	Update src/app/page.tsx	2026-05-06 18:50:50 +00:00
bender	b527dc297e	Merge version_5 into main Merge version_5 into main	2026-05-06 18:47:31 +00:00
bender	9223dd8d40	Merge version_5 into main Merge version_5 into main	2026-05-06 18:45:47 +00:00
bender	c60f83ccc0	Merge version_5 into main Merge version_5 into main	2026-05-06 17:39:38 +00:00