Merge version_5 into main

Update src/app/page.tsx
2026-02-17 16:45:54 +00:00 · 2026-02-17 16:45:49 +00:00 · 2026-02-17 16:45:49 +00:00 · 2026-02-17 16:44:20 +00:00 · 2026-02-17 16:44:16 +00:00 · 2026-02-17 16:44:15 +00:00
4 changed files with 58 additions and 51 deletions
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,43 +1,22 @@
 import type { Metadata } from "next";
-import { Josefin_Sans } from "next/font/google";
 import { Inter } from "next/font/google";
 import "./globals.css";
-import { ServiceWrapper } from "@/components/ServiceWrapper";
-import Tag from "@/tag/Tag";
+import "./styles/variables.css";
+import "./styles/base.css";

-const josefinSans = Josefin_Sans({
-  variable: "--font-josefin-sans",  subsets: ["latin"],
-  weight: ["100", "200", "300", "400", "500", "600", "700"],
-});
-
-const inter = Inter({
-  variable: "--font-inter",  subsets: ["latin"],
-});
+const inter = Inter({ subsets: ["latin"] });

 export const metadata: Metadata = {
-  title: "Old Boy Domino Club - Join Our Community",  description: "Join Old Boy Domino Club, a thriving 38+ year community of domino enthusiasts. Experience classic gaming, tournaments, and lifelong friendships.",  keywords: "domino club, domino games, community gaming, tournaments, fellowship, classic games",  openGraph: {
-    title: "Old Boy Domino Club",    description: "Join our thriving community of domino enthusiasts since 1985",    siteName: "Old Boy Domino Club",    type: "website"
-  },
-  robots: {
-    index: true,
-    follow: true
-  }
-};
+  title: "Old Boy Domino Club",  description: "Join a thriving community of domino enthusiasts"};

 export default function RootLayout({
  children,
-}: Readonly<{
+}: {
  children: React.ReactNode;
-}>) {
+}) {
  return (
-    <html lang="en" suppressHydrationWarning>
-      <ServiceWrapper>
-        <body
-          className={`${josefinSans.variable} ${inter.variable} antialiased`}
-        >
-          <Tag />
-          {children}
-        
+    <html lang="en">
+      <body className={inter.className}>{children}
        <script
          dangerouslySetInnerHTML={{
            __html: `
@@ -431,6 +410,20 @@ export default function RootLayout({
    
    originalContent = element.textContent;
    element.contentEditable = 'true';
+    
+    if (!element.dataset.webildOriginalWhiteSpace) {
+      const computedStyle = window.getComputedStyle(element);
+      element.dataset.webildOriginalWhiteSpace = computedStyle.whiteSpace;
+      element.dataset.webildOriginalWordWrap = computedStyle.wordWrap;
+      element.dataset.webildOriginalOverflowWrap = computedStyle.overflowWrap;
+      element.dataset.webildOriginalOverflow = computedStyle.overflow;
+    }
+    
+    element.style.whiteSpace = 'pre-wrap';
+    element.style.wordWrap = 'break-word';
+    element.style.overflowWrap = 'break-word';
+    element.style.overflow = 'visible';
+    
    element.focus();
    isEditing = true;
    
@@ -540,6 +533,23 @@ export default function RootLayout({
    element.contentEditable = 'false';
    isEditing = false;
    
+    if (element.dataset.webildOriginalWhiteSpace) {
+      element.style.whiteSpace = element.dataset.webildOriginalWhiteSpace === 'normal' ? '' : element.dataset.webildOriginalWhiteSpace;
+      delete element.dataset.webildOriginalWhiteSpace;
+    }
+    if (element.dataset.webildOriginalWordWrap) {
+      element.style.wordWrap = element.dataset.webildOriginalWordWrap === 'normal' ? '' : element.dataset.webildOriginalWordWrap;
+      delete element.dataset.webildOriginalWordWrap;
+    }
+    if (element.dataset.webildOriginalOverflowWrap) {
+      element.style.overflowWrap = element.dataset.webildOriginalOverflowWrap === 'normal' ? '' : element.dataset.webildOriginalOverflowWrap;
+      delete element.dataset.webildOriginalOverflowWrap;
+    }
+    if (element.dataset.webildOriginalOverflow) {
+      element.style.overflow = element.dataset.webildOriginalOverflow === 'visible' ? '' : element.dataset.webildOriginalOverflow;
+      delete element.dataset.webildOriginalOverflow;
+    }
+    
    if (element.dataset.beforeInputHandler === 'true') {
      element.removeEventListener('beforeinput', () => {});
      delete element.dataset.beforeInputHandler;
@@ -845,6 +855,9 @@ export default function RootLayout({

  const handleScroll = () => {
    if (!isActive) return;
+    
+    if (isEditing) return;
+    
    if (selectedElement) {
      makeUneditable(selectedElement, false);
      selectedElement.classList.remove(selectedClass);
@@ -1256,7 +1269,6 @@ export default function RootLayout({
          }}
        />
      </body>
-      </ServiceWrapper>
    </html>
  );
-}
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,8 +1,8 @@
-"use client"
+"use client";

 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
-import HeroBillboard from '@/components/sections/hero/HeroBillboard';
+import HeroSplit from '@/components/sections/hero/HeroSplit';
 import TextAbout from '@/components/sections/about/TextAbout';
 import FeatureCardMedia from '@/components/sections/feature/FeatureCardMedia';
 import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
@@ -42,18 +42,18 @@ export default function LandingPage() {
      </div>

      <div id="hero" data-section="hero">
-        <HeroBillboard
-          title="Welcome to Old Boy Domino Club"
+        <HeroSplit
+          title="Old Boy Domino Club"
          description="Join a thriving community of domino enthusiasts where tradition meets fellowship. Experience the timeless joy of classic domino gaming with friends who share your passion."
-          background={{ variant: "plain" }}
-          tag="Est. 1985"
-          tagIcon={Dice6}
-          imageSrc="https://img.b2bpic.net/free-photo/side-view-glass-tea-with-backgammon-jam-carpet-table_176474-3102.jpg"
-          imageAlt="Classic domino table game in session"
          buttons={[
            { text: "Join Our Club", href: "contact" },
            { text: "Learn More", href: "about" }
          ]}
+          background={{ variant: "sparkles-gradient" }}
+          imageSrc="https://img.b2bpic.net/free-photo/side-view-glass-tea-with-backgammon-jam-carpet-table_176474-3102.jpg"
+          imageAlt="Classic domino table game in session"
+          mediaAnimation="slide-up"
+          imagePosition="right"
        />
      </div>

@@ -225,4 +225,4 @@ export default function LandingPage() {
      </div>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -90,8 +90,7 @@ export default function ProductPage({ params }: ProductPageProps) {
                                {"name":"About","id":"about"},
                                {"name":"Features","id":"features"},
                                {"name":"Team","id":"team"},
-                                {"name":"Contact","id":"contact"},
-                                {"name":"Shop","id":"/shop"}
+                                {"name":"Contact","id":"contact"}
                            ]}
                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                        />
@@ -138,8 +137,7 @@ export default function ProductPage({ params }: ProductPageProps) {
                                {"name":"About","id":"about"},
                                {"name":"Features","id":"features"},
                                {"name":"Team","id":"team"},
-                                {"name":"Contact","id":"contact"},
-                                {"name":"Shop","id":"/shop"}
+                                {"name":"Contact","id":"contact"}
                            ]}
                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                        />
@@ -193,8 +191,7 @@ export default function ProductPage({ params }: ProductPageProps) {
                            {"name":"About","id":"about"},
                            {"name":"Features","id":"features"},
                            {"name":"Team","id":"team"},
-                            {"name":"Contact","id":"contact"},
-                            {"name":"Shop","id":"/shop"}
+                            {"name":"Contact","id":"contact"}
                        ]}
                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
                    />
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -40,8 +40,7 @@ export default function ShopPage() {
                                {"name":"About","id":"about"},
                                {"name":"Features","id":"features"},
                                {"name":"Team","id":"team"},
-                                {"name":"Contact","id":"contact"},
-                                {"name":"Shop","id":"/shop"}
+                                {"name":"Contact","id":"contact"}
                            ]}
                            button={{ text: "Cart", onClick: () => console.log("cart") }}
                        />
@@ -87,8 +86,7 @@ export default function ShopPage() {
                            {"name":"About","id":"about"},
                            {"name":"Features","id":"features"},
                            {"name":"Team","id":"team"},
-                            {"name":"Contact","id":"contact"},
-                            {"name":"Shop","id":"/shop"}
+                            {"name":"Contact","id":"contact"}
                        ]}
                        button={{ text: "Cart", onClick: () => console.log("cart") }}
                    />
Author	SHA1	Message	Date
bender	0d950eb8f8	Merge version_5 into main Merge version_5 into main	2026-02-17 16:45:54 +00:00
bender	5b690416a9	Update src/app/page.tsx	2026-02-17 16:45:49 +00:00
bender	9cf716171d	Update src/app/layout.tsx	2026-02-17 16:45:49 +00:00
bender	9010cc01f5	Merge version_5 into main Merge version_5 into main	2026-02-17 16:44:20 +00:00
bender	c78a0f3831	Update src/app/page.tsx	2026-02-17 16:44:16 +00:00
bender	d965b0a2d8	Update src/app/layout.tsx	2026-02-17 16:44:15 +00:00
bender	7acd81e237	Merge version_4 into main Merge version_4 into main	2026-02-17 16:35:30 +00:00
bender	7c7d540c09	Update src/app/page.tsx	2026-02-17 16:35:26 +00:00
bender	c842154ba3	Merge version_4 into main Merge version_4 into main	2026-02-17 16:33:00 +00:00
bender	63a50c726f	Update src/app/page.tsx	2026-02-17 16:32:56 +00:00
bender	1dfd077177	Merge version_4 into main Merge version_4 into main	2026-02-17 16:30:41 +00:00
bender	9923a8549e	Update src/app/page.tsx	2026-02-17 16:30:37 +00:00
bender	f34ff74614	Merge version_4 into main Merge version_4 into main	2026-02-17 16:28:21 +00:00
bender	366bd012ad	Update src/app/shop/page.tsx	2026-02-17 16:28:17 +00:00
bender	c4cbe5e66d	Update src/app/shop/[id]/page.tsx	2026-02-17 16:28:16 +00:00
bender	0cdb25fc36	Update src/app/page.tsx	2026-02-17 16:28:15 +00:00
bender	9420c06195	Merge version_3 into main Merge version_3 into main	2026-02-17 15:22:00 +00:00
bender	c48b16bab8	Update src/app/page.tsx	2026-02-17 15:21:55 +00:00
bender	2edb5cc7cb	Merge version_3 into main Merge version_3 into main	2026-02-17 15:19:31 +00:00
bender	23f4b72e47	Update src/app/shop/page.tsx	2026-02-17 15:19:27 +00:00
bender	118e4e284e	Update src/app/shop/[id]/page.tsx	2026-02-17 15:19:26 +00:00
bender	fd45714d78	Update src/app/page.tsx	2026-02-17 15:19:25 +00:00
bender	9bbab0e3f0	Update src/app/blog/page.tsx	2026-02-17 15:19:24 +00:00
bender	cbf4c29e49	Merge version_2 into main Merge version_2 into main	2026-02-17 15:11:30 +00:00
bender	26106da4ac	Update src/app/shop/page.tsx	2026-02-17 15:11:26 +00:00
bender	bea97a008b	Update src/app/shop/[id]/page.tsx	2026-02-17 15:11:25 +00:00
bender	d3bef756fb	Update src/app/page.tsx	2026-02-17 15:11:24 +00:00
bender	61abdfb14e	Update src/app/layout.tsx	2026-02-17 15:11:23 +00:00
bender	3a7a9f4bee	Update src/app/blog/page.tsx	2026-02-17 15:11:22 +00:00
bender	7c55a7e268	Merge version_1 into main Merge version_1 into main	2026-02-16 15:10:40 +00:00