Merge version_3 into main

Update src/app/page.tsx
2026-03-26 08:36:53 +00:00 · 2026-03-26 08:36:50 +00:00 · 2026-03-26 08:31:06 +00:00 · 2026-03-26 08:31:03 +00:00 · 2026-03-26 08:31:02 +00:00 · 2026-03-26 08:31:02 +00:00
3 changed files with 70 additions and 187 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -7,6 +7,8 @@ import { ServiceWrapper } from "@/components/ServiceWrapper";
 import Tag from "@/tag/Tag";
 import { getVisualEditScript } from "@/utils/visual-edit-script";
 import { Open_Sans } from "next/font/google";
+import { Manrope } from "next/font/google";
+import { DM_Sans } from "next/font/google";



@@ -41,9 +43,12 @@ export const metadata: Metadata = {
  },
 };

-const openSans = Open_Sans({
-  variable: "--font-open-sans",
-  subsets: ["latin"]
+
+const manrope = Manrope({
+  variable: "--font-manrope",  subsets: ["latin"],
+});
+const dmSans = DM_Sans({
+  variable: "--font-dm-sans",  subsets: ["latin"],
 });

 export default function RootLayout({
@@ -54,7 +59,7 @@ export default function RootLayout({
  return (
    <html lang="en" suppressHydrationWarning>
      <ServiceWrapper>
-        <body className={`${openSans.variable} antialiased`}>
+        <body className={`${manrope.variable} ${dmSans.variable} antialiased`}>
          <Tag />
          {children}
          <script
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -31,29 +31,17 @@ export default function LandingPage() {
      <NavbarStyleFullscreen
      navItems={[
        {
-          name: "Home",
-          id: "hero",
-        },
+          name: "Home",          id: "hero"},
        {
-          name: "About",
-          id: "about",
-        },
+          name: "About",          id: "about"},
        {
-          name: "Services",
-          id: "services",
-        },
+          name: "Services",          id: "services"},
        {
-          name: "Reviews",
-          id: "reviews",
-        },
+          name: "Reviews",          id: "reviews"},
        {
-          name: "Gallery",
-          id: "gallery",
-        },
+          name: "Gallery",          id: "gallery"},
        {
-          name: "Contact",
-          id: "contact",
-        },
+          name: "Contact",          id: "contact"},
      ]}
      brandName="The Barber Amna Vatrić"
    />
@@ -62,47 +50,30 @@ export default function LandingPage() {
  <div id="hero" data-section="hero">
      <HeroSplitDoubleCarousel
      background={{
-        variant: "plain",
-      }}
+        variant: "plain"}}
      title="Premium Barber Experience in Konjic"
      description="Discover unparalleled quality and professionalism at The Barber Amna Vatrić. Step into a modern, welcoming atmosphere designed for the discerning gentleman seeking a truly premium grooming experience."
      leftCarouselItems={[
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/high-angle-male-self-care-setting-still-life_23-2150326537.jpg",
-          imageAlt: "Luxurious barbershop interior",
-        },
+          imageSrc: "http://img.b2bpic.net/free-photo/high-angle-male-self-care-setting-still-life_23-2150326537.jpg",          imageAlt: "Luxurious barbershop interior"},
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/arrangement-new-barbecue-utensil-set-wooden-surface_23-2148206903.jpg",
-          imageAlt: "Barber performing a beard trim",
-        },
+          imageSrc: "http://img.b2bpic.net/free-photo/arrangement-new-barbecue-utensil-set-wooden-surface_23-2148206903.jpg",          imageAlt: "Barber performing a beard trim"},
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-still-life-assortment-nail-care-products_23-2148974559.jpg",
-          imageAlt: "Barber's tools on a dark surface",
-        },
+          imageSrc: "http://img.b2bpic.net/free-photo/flat-lay-still-life-assortment-nail-care-products_23-2148974559.jpg",          imageAlt: "Barber's tools on a dark surface"},
      ]}
      rightCarouselItems={[
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/young-girlfriends-relaxing-white-bathrobes-drinking-healthy-spa-cocktails-outside-resort-hotel-while-talking-furniture-with-hotel-landscaping-background_657921-1174.jpg",
-          imageAlt: "Client getting a haircut",
-        },
+          imageSrc: "http://img.b2bpic.net/free-photo/young-girlfriends-relaxing-white-bathrobes-drinking-healthy-spa-cocktails-outside-resort-hotel-while-talking-furniture-with-hotel-landscaping-background_657921-1174.jpg",          imageAlt: "Client getting a haircut"},
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/fashionable-hipster-guy-sitting-with-woman-cafe_273609-6827.jpg",
-          imageAlt: "Barber styling hair",
-        },
+          imageSrc: "http://img.b2bpic.net/free-photo/fashionable-hipster-guy-sitting-with-woman-cafe_273609-6827.jpg",          imageAlt: "Barber styling hair"},
        {
-          imageSrc: "http://img.b2bpic.net/free-photo/hairstylist-looking-client-mirror_23-2148242870.jpg",
-          imageAlt: "Finished stylish haircut",
-        },
+          imageSrc: "http://img.b2bpic.net/free-photo/hairstylist-looking-client-mirror_23-2148242870.jpg",          imageAlt: "Finished stylish haircut"},
      ]}
      buttons={[
        {
-          text: "Book Now",
-          href: "#contact",
-        },
+          text: "Book Now",          href: "#contact"},
        {
-          text: "Call Now",
-          href: "tel:062304446",
-        },
+          text: "Call Now",          href: "tel:062304446"},
      ]}
    />
  </div>
@@ -114,19 +85,13 @@ export default function LandingPage() {
      metrics={[
        {
          icon: Users,
-          label: "Professional Team",
-          value: "Expert Barbers",
-        },
+          label: "Professional Team",          value: "Expert Barbers"},
        {
          icon: Star,
-          label: "Atmosphere",
-          value: "Modern Comfort",
-        },
+          label: "Atmosphere",          value: "Modern Comfort"},
        {
          icon: ShieldCheck,
-          label: "Quality & Trust",
-          value: "Uncompromising Standards",
-        },
+          label: "Quality & Trust",          value: "Uncompromising Standards"},
      ]}
      metricsAnimation="slide-up"
    />
@@ -139,59 +104,37 @@ export default function LandingPage() {
      useInvertedBackground={false}
      plans={[
        {
-          id: "haircut",
-          badge: "Classic",
-          price: "20 KM",
-          subtitle: "Precision Cut & Style",
-          buttons: [
-            {
-              text: "Book Haircut",
-              href: "#contact",
-            },
-          ],
+          id: "buzz-cut",          badge: "Quick",          price: "12.0 KM",          subtitle: "Clean & Simple",          buttons: [{
+            text: "Book Buzz Cut",            href: "#contact"
+          }],
          features: [
-            "Consultation",
-            "Wash & Cut",
-            "Styling",
-            "Hot Towel Finish",
-          ],
+            "Quick Wash",            "Precision Buzz",            "Styling"
+          ]
        },
        {
-          id: "beard-trim",
-          badge: "Refine",
-          price: "15 KM",
-          subtitle: "Expert Beard Grooming",
-          buttons: [
-            {
-              text: "Book Beard Trim",
-              href: "#contact",
-            },
-          ],
+          id: "childrens-haircut",          badge: "Kids",          price: "10.0 KM",          subtitle: "Gentle Cut (up to 6 years)",          buttons: [{
+            text: "Book Kid's Haircut",            href: "#contact"
+          }],
          features: [
-            "Beard Shaping",
-            "Trimming & Lining",
-            "Beard Product Application",
-            "Razor Finish",
-          ],
+            "Friendly Service",            "Haircut (up to 6 years)",            "Quick Style"
+          ]
        },
        {
-          id: "full-grooming",
-          badge: "Premium",
-          price: "30 KM",
-          subtitle: "Complete Transformation",
-          buttons: [
-            {
-              text: "Book Full Grooming",
-              href: "#contact",
-            },
-          ],
+          id: "haircut",          badge: "Classic",          price: "15.0 KM",          subtitle: "Standard Cut & Style",          buttons: [{
+            text: "Book Haircut",            href: "#contact"
+          }],
          features: [
-            "Precision Haircut",
-            "Full Beard Grooming",
-            "Face Hot Towel Shave",
-            "Finishing Touches",
-          ],
+            "Consultation",            "Wash & Cut",            "Styling"
+          ]
        },
+        {
+          id: "haircut-beard",          badge: "Combo",          price: "20.0–25.0 KM",          subtitle: "Complete Look",          buttons: [{
+            text: "Book Combo",            href: "#contact"
+          }],
+          features: [
+            "Precision Haircut",            "Beard Styling & Trim",            "Hot Towel Finish"
+          ]
+        }
      ]}
      title="Our Services & Pricing"
      description="Tailored grooming solutions designed for the modern man seeking exceptional quality."
@@ -205,37 +148,13 @@ export default function LandingPage() {
      useInvertedBackground={true}
      testimonials={[
        {
-          id: "1",
-          name: "Haris Delić",
-          role: "Client",
-          testimonial: "Odlična usluga i prijatno osoblje, sve pohvale.",
-          imageSrc: "http://img.b2bpic.net/free-photo/handsome-afroamerican-man-smiling_23-2148508920.jpg",
-          imageAlt: "Haris Delić",
-        },
+          id: "1",          name: "Haris Delić",          role: "Client",          testimonial: "Odlična usluga i prijatno osoblje, sve pohvale.",          imageSrc: "http://img.b2bpic.net/free-photo/handsome-afroamerican-man-smiling_23-2148508920.jpg",          imageAlt: "Haris Delić"},
        {
-          id: "2",
-          name: "Adnan Hodžić",
-          role: "Client",
-          testimonial: "Profesionalnost na nivou, napokon nešto svjetski u gradu! Hvala Amna.",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-handsome-smiling-young-man-wearing-casual-shirt-trousers_158538-19375.jpg",
-          imageAlt: "Adnan Hodžić",
-        },
+          id: "2",          name: "Adnan Hodžić",          role: "Client",          testimonial: "Profesionalnost na nivou, napokon nešto svjetski u gradu! Hvala Amna.",          imageSrc: "http://img.b2bpic.net/free-photo/portrait-handsome-smiling-young-man-wearing-casual-shirt-trousers_158538-19375.jpg",          imageAlt: "Adnan Hodžić"},
        {
-          id: "3",
-          name: "Dino Karić",
-          role: "Client",
-          testimonial: "Predivan ambijent, osoblje je profesionalno i veoma ljubazno, sve pohvale.",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-sexy-smiling-handsome-fashion-businessman-model-dressed-elegant-blue-suit-posing-street-background-metrosexual_158538-10424.jpg",
-          imageAlt: "Dino Karić",
-        },
+          id: "3",          name: "Dino Karić",          role: "Client",          testimonial: "Predivan ambijent, osoblje je profesionalno i veoma ljubazno, sve pohvale.",          imageSrc: "http://img.b2bpic.net/free-photo/portrait-sexy-smiling-handsome-fashion-businessman-model-dressed-elegant-blue-suit-posing-street-background-metrosexual_158538-10424.jpg",          imageAlt: "Dino Karić"},
        {
-          id: "4",
-          name: "Emir Suljić",
-          role: "Client",
-          testimonial: "Vrhunska usluga. Najtoplija preporuka svima!",
-          imageSrc: "http://img.b2bpic.net/free-photo/handsome-young-bearded-guy-denim-shirt-hold-hands-pockets_176420-17847.jpg",
-          imageAlt: "Emir Suljić",
-        },
+          id: "4",          name: "Emir Suljić",          role: "Client",          testimonial: "Vrhunska usluga. Najtoplija preporuka svima!",          imageSrc: "http://img.b2bpic.net/free-photo/handsome-young-bearded-guy-denim-shirt-hold-hands-pockets_176420-17847.jpg",          imageAlt: "Emir Suljić"},
      ]}
      title="What Our Clients Say"
      description="Hear directly from our valued customers about their premium grooming experience at The Barber Amna Vatrić."
@@ -250,37 +169,13 @@ export default function LandingPage() {
      useInvertedBackground={false}
      products={[
        {
-          id: "haircut-1",
-          name: "Precision Fade",
-          price: "",
-          variant: "Haircut",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-hairdresser-shaving-male-customer-s-beard-with-comb-hair-clipper-barbershop_181624-40011.jpg?_wi=1",
-          imageAlt: "Modern men's haircut with precision fade",
-        },
+          id: "haircut-1",          name: "Precision Fade",          price: "",          variant: "Haircut",          imageSrc: "http://img.b2bpic.net/free-photo/young-hairdresser-shaving-male-customer-s-beard-with-comb-hair-clipper-barbershop_181624-40011.jpg?_wi=1",          imageAlt: "Modern men's haircut with precision fade"},
        {
-          id: "tools-1",
-          name: "Golden Tools",
-          price: "",
-          variant: "Tools",
-          imageSrc: "http://img.b2bpic.net/free-photo/comb-scissor-top-view_23-2148352833.jpg",
-          imageAlt: "Elegant barber tools with golden accents",
-        },
+          id: "tools-1",          name: "Golden Tools",          price: "",          variant: "Tools",          imageSrc: "http://img.b2bpic.net/free-photo/comb-scissor-top-view_23-2148352833.jpg",          imageAlt: "Elegant barber tools with golden accents"},
        {
-          id: "interior-1",
-          name: "Luxury Interior",
-          price: "",
-          variant: "Interior",
-          imageSrc: "http://img.b2bpic.net/free-photo/modern-luxury-furniture-adorns-comfortable-home-interior-generated-by-ai_188544-29070.jpg",
-          imageAlt: "Luxurious barbershop interior with warm lighting",
-        },
+          id: "interior-1",          name: "Luxury Interior",          price: "",          variant: "Interior",          imageSrc: "http://img.b2bpic.net/free-photo/modern-luxury-furniture-adorns-comfortable-home-interior-generated-by-ai_188544-29070.jpg",          imageAlt: "Luxurious barbershop interior with warm lighting"},
        {
-          id: "beard-1",
-          name: "Sculpted Beard",
-          price: "",
-          variant: "Beard Trim",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-hairdresser-shaving-male-customer-s-beard-with-comb-hair-clipper-barbershop_181624-40011.jpg?_wi=2",
-          imageAlt: "Well-groomed beard with sculpted lines",
-        },
+          id: "beard-1",          name: "Sculpted Beard",          price: "",          variant: "Beard Trim",          imageSrc: "http://img.b2bpic.net/free-photo/young-hairdresser-shaving-male-customer-s-beard-with-comb-hair-clipper-barbershop_181624-40011.jpg?_wi=2",          imageAlt: "Well-groomed beard with sculpted lines"},
      ]}
      title="Our Craft & Space"
      description="A visual journey through our precision artistry, the tools of our trade, and the luxurious ambiance of our barbershop."
@@ -291,8 +186,7 @@ export default function LandingPage() {
      <ContactCenter
      useInvertedBackground={true}
      background={{
-        variant: "plain",
-      }}
+        variant: "plain"}}
      tag="Get in Touch"
      title="Visit Us in Konjic"
      description="Located in the heart of Konjic, Bosnia and Herzegovina, we are ready to welcome you for your next premium grooming experience. For appointments, please call us directly at:\n\nPhone: 062 304 446"
@@ -305,45 +199,29 @@ export default function LandingPage() {
        {
          items: [
            {
-              label: "Home",
-              href: "#hero",
-            },
+              label: "Home",              href: "#hero"},
            {
-              label: "About",
-              href: "#about",
-            },
+              label: "About",              href: "#about"},
            {
-              label: "Services",
-              href: "#services",
-            },
+              label: "Services",              href: "#services"},
          ],
        },
        {
          items: [
            {
-              label: "Reviews",
-              href: "#reviews",
-            },
+              label: "Reviews",              href: "#reviews"},
            {
-              label: "Gallery",
-              href: "#gallery",
-            },
+              label: "Gallery",              href: "#gallery"},
            {
-              label: "Contact",
-              href: "#contact",
-            },
+              label: "Contact",              href: "#contact"},
          ],
        },
        {
          items: [
            {
-              label: "Privacy Policy",
-              href: "#",
-            },
+              label: "Privacy Policy",              href: "#"},
            {
-              label: "Terms of Service",
-              href: "#",
-            },
+              label: "Terms of Service",              href: "#"},
          ],
        },
      ]}
@@ -353,4 +231,4 @@ export default function LandingPage() {
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- 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-open-sans), sans-serif;
+  font-family: var(--font-dm-sans), sans-serif;
  position: relative;
  min-height: 100vh;
  overscroll-behavior: none;
@@ -24,5 +24,5 @@ h3,
 h4,
 h5,
 h6 {
-  font-family: var(--font-open-sans), sans-serif;
+  font-family: var(--font-manrope), sans-serif;
 }
Author	SHA1	Message	Date
bender	4583f8ea09	Merge version_3 into main Merge version_3 into main	2026-03-26 08:36:53 +00:00
bender	33eccaea69	Update src/app/page.tsx	2026-03-26 08:36:50 +00:00
bender	28948f6df4	Merge version_2 into main Merge version_2 into main	2026-03-26 08:31:06 +00:00
bender	0062acf107	Update src/app/styles/base.css	2026-03-26 08:31:03 +00:00
bender	59a943b3c4	Update src/app/page.tsx	2026-03-26 08:31:02 +00:00
bender	8ed752b3be	Update src/app/layout.tsx	2026-03-26 08:31:02 +00:00
bender	f27e4c2551	Merge version_1 into main Merge version_1 into main	2026-03-26 08:29:12 +00:00