diff --git a/src/app/layout.tsx b/src/app/layout.tsx index aaab976..d92ab4e 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -4,9 +4,14 @@ import { Inter } from "next/font/google"; import "./globals.css"; import { ServiceWrapper } from "@/components/ServiceWrapper"; import Tag from "@/tag/Tag"; -import { Public_Sans } from "next/font/google"; +const mulish = Mulish({ + variable: "--font-mulish", subsets: ["latin"], +}); +const inter = Inter({ + variable: "--font-inter", subsets: ["latin"], +}); export const metadata: Metadata = { title: "Go Green Detailing - Professional Eco-Friendly Car Detailing", description: "Expert professional car detailing services using eco-friendly products. Exterior wash, interior detailing, ceramic coating, and more. Book your appointment today.", keywords: "car detailing, auto detailing, ceramic coating, car wash, eco-friendly, professional detailing, paint protection", openGraph: { @@ -20,15 +25,6 @@ export const metadata: Metadata = { }, }; -const publicSans = Public_Sans({ - variable: "--font-public-sans", - subsets: ["latin"], -}); -const inter = Inter({ - variable: "--font-inter", - subsets: ["latin"], -}); - export default function RootLayout({ children, }: Readonly<{ @@ -37,7 +33,9 @@ export default function RootLayout({ return ( - + {children} @@ -282,7 +280,9 @@ export default function RootLayout({ const getElementInfo = (element, assignId = false) => { const rect = element.getBoundingClientRect(); const tagName = element.tagName.toLowerCase(); - + const selector = getUniqueSelector(element, assignId); + const sectionId = getSectionId(element); + let className = undefined; try { if (element.className) { @@ -310,7 +310,8 @@ export default function RootLayout({ }; if (tagName === 'img') { - info.imageData = { + const originalSrc = extractOriginalUrl(element.src); + info.imageData = { src: originalSrc, alt: element.alt || undefined, naturalWidth: element.naturalWidth, @@ -321,7 +322,8 @@ export default function RootLayout({ if (tagName === 'video') { const rawSrc = element.src || element.currentSrc || (element.querySelector('source') && element.querySelector('source').src) || ''; - info.imageData = { + const resolvedSrc = extractOriginalUrl(rawSrc); + info.imageData = { src: resolvedSrc, alt: element.getAttribute('aria-label') || undefined, isBackground: false, @@ -334,7 +336,8 @@ export default function RootLayout({ if (backgroundImage && backgroundImage !== 'none') { const urlMatch = backgroundImage.match(/url(['"]?([^'")]+)['"]?)/); if (urlMatch) { - if (tagName !== 'img') { + const originalBgSrc = extractOriginalUrl(urlMatch[1]); + if (tagName !== 'img') { info.imageData = { src: originalBgSrc, isBackground: true @@ -346,7 +349,8 @@ export default function RootLayout({ } } - info.elementType = elementType; + const elementType = getElementType(element); + info.elementType = elementType; if (elementType === 'Button') { const buttonText = element.textContent?.trim() || element.value || element.getAttribute('aria-label') || ''; @@ -439,11 +443,13 @@ export default function RootLayout({ }; const isTextElement = (element) => { - return elementType === 'Text'; + const elementType = getElementType(element); + return elementType === 'Text'; }; const isButtonElement = (element) => { - return elementType === 'Button'; + const elementType = getElementType(element); + return elementType === 'Button'; }; const updateButtonText = (element, newText) => { @@ -518,7 +524,8 @@ export default function RootLayout({ }; const handleInput = () => { - let currentText = element.textContent; + const elementInfo = getElementInfo(element); + let currentText = element.textContent; // Ensure there's always at least a space to keep the element editable if (currentText === '' || currentText === null || currentText.length === 0) { @@ -631,7 +638,8 @@ export default function RootLayout({ }, '*'); if (save && originalContent !== element.textContent) { - let finalText = element.textContent; + const elementInfo = getElementInfo(element); + let finalText = element.textContent; // Trim the final text and convert space-only to empty string for saving if (finalText === ' ' || finalText.trim() === '') { @@ -760,7 +768,7 @@ export default function RootLayout({ lastMouseX = e.clientX; lastMouseY = e.clientY; - || e.target; + const target = getMostSpecificElement(e.clientX, e.clientY) || e.target; if (!isValidElement(target) || target === hoveredElement || target === selectedElement) { return; @@ -792,7 +800,8 @@ export default function RootLayout({ hoverOverlay = createHoverOverlay(target); } - showElementTypeLabel(target, elementType); + const elementType = getElementType(target); + showElementTypeLabel(target, elementType); window.parent.postMessage({ type: 'webild-element-hover', @@ -834,7 +843,7 @@ export default function RootLayout({ e.preventDefault(); e.stopPropagation(); - || e.target; + const target = getMostSpecificElement(e.clientX, e.clientY) || e.target; if (!isValidElement(target)) return; if (selectedElement && selectedElement !== target) { @@ -879,7 +888,8 @@ export default function RootLayout({ hoveredElement = null; } - selectedElement.dataset.webildSelector = elementInfo.selector; + const elementInfo = getElementInfo(target, true); + selectedElement.dataset.webildSelector = elementInfo.selector; showElementTypeLabel(target, elementInfo.elementType); window.parent.postMessage({ @@ -962,7 +972,8 @@ export default function RootLayout({ isScrolling = false; if (lastMouseX > 0 && lastMouseY > 0) { - if (target && isValidElement(target) && target !== selectedElement) { + const target = getMostSpecificElement(lastMouseX, lastMouseY); + if (target && isValidElement(target) && target !== selectedElement) { hoveredElement = target; const computedStyle = window.getComputedStyle(target); @@ -976,7 +987,8 @@ export default function RootLayout({ hoveredElement.classList.add(hoverClass); hoverOverlay = createHoverOverlay(target); - showElementTypeLabel(target, elementType); + const elementType = getElementType(target); + showElementTypeLabel(target, elementType); window.parent.postMessage({ type: 'webild-element-hover', @@ -999,7 +1011,8 @@ export default function RootLayout({ const saveChangeToStorage = (change) => { try { - const existingChanges = JSON.parse(localStorage.getItem(storageKey) || '[]'); + const storageKey = getStorageKey(); + const existingChanges = JSON.parse(localStorage.getItem(storageKey) || '[]'); const filteredChanges = existingChanges.filter(c => { return !(c.oldValue === change.oldValue && c.sectionId === change.sectionId); @@ -1019,7 +1032,8 @@ export default function RootLayout({ const clearLocalChanges = () => { try { - localStorage.removeItem(storageKey); + const storageKey = getStorageKey(); + localStorage.removeItem(storageKey); window.parent.postMessage({ type: 'webild-local-changes-cleared', data: {} @@ -1068,7 +1082,8 @@ export default function RootLayout({ if (e.data.type === 'webild-cancel-changes') { try { - const savedChanges = localStorage.getItem(storageKey); + const storageKey = getStorageKey(); + const savedChanges = localStorage.getItem(storageKey); if (savedChanges) { const changes = JSON.parse(savedChanges); changes.forEach(change => { @@ -1090,7 +1105,8 @@ export default function RootLayout({ if (isBackground) { element.style.backgroundImage = change.oldValue ? 'url(' + change.oldValue + ')' : ''; } else { - if (revertTag === 'video' && oldMediaType === 'image') { + const oldMediaType = getMediaTypeFromUrl(change.oldValue); + if (revertTag === 'video' && oldMediaType === 'image') { swapMediaElement(element, 'img', change.oldValue); } else if (revertTag === 'img' && oldMediaType === 'video') { swapMediaElement(element, 'video', change.oldValue); @@ -1138,7 +1154,8 @@ export default function RootLayout({ const el = textElements[i]; if (isTextElement(el) && el.textContent.trim() === (oldValue || '').trim()) { element = el; - if (newSelector) { + const newSelector = getUniqueSelector(element, true); + if (newSelector) { element.dataset.webildSelector = newSelector; } break; @@ -1229,8 +1246,10 @@ export default function RootLayout({ replaced = true; } else if (element.tagName.toLowerCase() === 'img') { oldValue = element.src; - if (newMediaType === 'video' && allowMediaTypeSwap) { - if (selectedElement === element) selectedElement = swapped; + const newMediaType = getMediaTypeFromUrl(newSrc); + if (newMediaType === 'video' && allowMediaTypeSwap) { + const swapped = swapMediaElement(element, 'video', newSrc); + if (selectedElement === element) selectedElement = swapped; element = swapped; } else { element.src = newSrc; @@ -1238,9 +1257,11 @@ export default function RootLayout({ replaced = true; } else if (element.tagName.toLowerCase() === 'video') { oldValue = element.src || element.currentSrc || ''; - const sources = element.querySelectorAll('source'); + const newMediaType = getMediaTypeFromUrl(newSrc); + const sources = element.querySelectorAll('source'); if (newMediaType === 'image' && allowMediaTypeSwap) { - if (selectedElement === element) selectedElement = swapped; + const swapped = swapMediaElement(element, 'img', newSrc); + if (selectedElement === element) selectedElement = swapped; element = swapped; } else { if (sources.length > 0) { @@ -1262,7 +1283,8 @@ export default function RootLayout({ } if (replaced) { - + const elementInfo = getElementInfo(element); + let cleanOldValue = oldValue; if (oldValue.includes('url(')) { const urlMatch = oldValue.match(/url(['"]?([^'")]+)['"]?)/); @@ -1333,7 +1355,13 @@ export default function RootLayout({ } }, true); - + const urlCheckInterval = setInterval(() => { + if (lastPathname !== window.location.pathname) { + lastPathname = window.location.pathname; + notifyPageChange(); + } + }, 500); + notifyPageChange(); window.webildCleanup = () => { diff --git a/src/app/page.tsx b/src/app/page.tsx index 1591928..29ef27e 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -41,7 +41,7 @@ export default function LandingPage() {