Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d16b4b791f | |||
| 41618c9bc5 | |||
| bb177b7d10 | |||
| d647d292ff | |||
| c75ba484e1 | |||
| 449413b96d | |||
| 1093a8308b | |||
| 12770b0ccc | |||
| 00fbb6983d | |||
| 23c51ab060 | |||
| fa0c2d1096 | |||
| 764a398356 | |||
| 71bf474d69 | |||
| 0f302cbf5f | |||
| b466c9e65f | |||
| 476eac78dd | |||
| aa3d5a3d76 | |||
| a103c39ef9 | |||
| e837a437f2 | |||
| 2508ebfb12 |
@@ -14,7 +14,7 @@ export default function BlogPage() {
|
||||
<ThemeProvider
|
||||
defaultButtonVariant="shift-hover"
|
||||
defaultTextAnimation="entrance-slide"
|
||||
borderRadius="sharp"
|
||||
borderRadius="rounded"
|
||||
contentWidth="smallMedium"
|
||||
sizing="medium"
|
||||
background="noise"
|
||||
@@ -69,4 +69,4 @@ export default function BlogPage() {
|
||||
</ReactLenis>
|
||||
</ThemeProvider>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,12 +3,6 @@ import { Archivo } from "next/font/google";
|
||||
import "./globals.css";
|
||||
import { ServiceWrapper } from "@/components/ServiceWrapper";
|
||||
import Tag from "@/tag/Tag";
|
||||
import { DM_Sans } from "next/font/google";
|
||||
import { Inter } from "next/font/google";
|
||||
import { Inter } from "next/font/google";
|
||||
import { Open_Sans } from "next/font/google";
|
||||
import { Public_Sans } from "next/font/google";
|
||||
import { Inter } from "next/font/google";
|
||||
|
||||
const archivo = Archivo({
|
||||
variable: "--font-archivo", subsets: ["latin"],
|
||||
@@ -36,33 +30,6 @@ export const metadata: Metadata = {
|
||||
}
|
||||
};
|
||||
|
||||
const dmSans = DM_Sans({
|
||||
variable: "--font-dm-sans",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
const inter = Inter({
|
||||
variable: "--font-inter",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
|
||||
const inter = Inter({
|
||||
variable: "--font-inter",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
const openSans = Open_Sans({
|
||||
variable: "--font-open-sans",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
|
||||
const publicSans = Public_Sans({
|
||||
variable: "--font-public-sans",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
const inter = Inter({
|
||||
variable: "--font-inter",
|
||||
subsets: ["latin"],
|
||||
});
|
||||
|
||||
export default function RootLayout({
|
||||
children,
|
||||
}: Readonly<{
|
||||
@@ -71,7 +38,9 @@ export default function RootLayout({
|
||||
return (
|
||||
<html lang="en" suppressHydrationWarning>
|
||||
<ServiceWrapper>
|
||||
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
|
||||
<body
|
||||
className={archivo.variable}
|
||||
>
|
||||
<Tag />
|
||||
{children}
|
||||
|
||||
@@ -121,7 +90,9 @@ export default function RootLayout({
|
||||
' background-color: #4d96ff05 !important;' +
|
||||
'}' +
|
||||
'img.webild-hover,' +
|
||||
'img.webild-selected {' +
|
||||
'img.webild-selected,' +
|
||||
'video.webild-hover,' +
|
||||
'video.webild-selected {' +
|
||||
' outline-offset: 2px !important;' +
|
||||
'}' +
|
||||
'.webild-element-type-label {' +
|
||||
@@ -193,6 +164,10 @@ export default function RootLayout({
|
||||
return 'Image';
|
||||
}
|
||||
|
||||
if (tagName === 'video') {
|
||||
return 'Video';
|
||||
}
|
||||
|
||||
const backgroundImage = computedStyle.backgroundImage;
|
||||
if (backgroundImage && backgroundImage !== 'none') {
|
||||
const urlMatch = backgroundImage.match(/url(['"]?([^'")]+)['"]?)/);
|
||||
@@ -275,6 +250,38 @@ export default function RootLayout({
|
||||
return url;
|
||||
};
|
||||
|
||||
const getMediaTypeFromUrl = (url) => {
|
||||
const videoExts = ['.mp4', '.webm', '.ogg', '.mov', '.avi', '.mkv', '.m4v', '.wmv'];
|
||||
const imageExts = ['.jpg', '.jpeg', '.png', '.gif', '.webp', '.svg', '.bmp', '.ico', '.tiff', '.avif'];
|
||||
try {
|
||||
const pathname = new URL(url).pathname.toLowerCase();
|
||||
if (videoExts.some(function(ext) { return pathname.endsWith(ext); })) return 'video';
|
||||
if (imageExts.some(function(ext) { return pathname.endsWith(ext); })) return 'image';
|
||||
} catch(e) {}
|
||||
return 'unknown';
|
||||
};
|
||||
|
||||
const swapMediaElement = (oldEl, newTag, newSrc) => {
|
||||
const newEl = document.createElement(newTag);
|
||||
Array.from(oldEl.attributes).forEach(function(attr) {
|
||||
if (attr.name !== 'src' && attr.name !== 'alt' && attr.name !== 'srcset' && attr.name !== 'autoplay' && attr.name !== 'loop' && attr.name !== 'muted' && attr.name !== 'playsinline') {
|
||||
try { newEl.setAttribute(attr.name, attr.value); } catch(e) {}
|
||||
}
|
||||
});
|
||||
newEl.style.cssText = oldEl.style.cssText;
|
||||
if (newTag === 'video') {
|
||||
newEl.setAttribute('autoplay', '');
|
||||
newEl.setAttribute('loop', '');
|
||||
newEl.setAttribute('muted', '');
|
||||
newEl.setAttribute('playsinline', '');
|
||||
}
|
||||
newEl.src = newSrc;
|
||||
if (oldEl.parentNode) {
|
||||
oldEl.parentNode.replaceChild(newEl, oldEl);
|
||||
}
|
||||
return newEl;
|
||||
};
|
||||
|
||||
const getElementInfo = (element, assignId = false) => {
|
||||
const rect = element.getBoundingClientRect();
|
||||
const tagName = element.tagName.toLowerCase();
|
||||
@@ -317,7 +324,18 @@ export default function RootLayout({
|
||||
isBackground: false
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
if (tagName === 'video') {
|
||||
const rawSrc = element.src || element.currentSrc || (element.querySelector('source') && element.querySelector('source').src) || '';
|
||||
const resolvedSrc = extractOriginalUrl(rawSrc);
|
||||
info.imageData = {
|
||||
src: resolvedSrc,
|
||||
alt: element.getAttribute('aria-label') || undefined,
|
||||
isBackground: false,
|
||||
isVideo: true
|
||||
};
|
||||
}
|
||||
|
||||
const computedStyle = window.getComputedStyle(element);
|
||||
const backgroundImage = computedStyle.backgroundImage;
|
||||
if (backgroundImage && backgroundImage !== 'none') {
|
||||
@@ -365,7 +383,8 @@ export default function RootLayout({
|
||||
const tagName = element.tagName?.toLowerCase();
|
||||
if (invalidElements.includes(tagName)) return false;
|
||||
const isImage = tagName === 'img';
|
||||
if (isImage) return true;
|
||||
const isVideo = tagName === 'video';
|
||||
if (isImage || isVideo) return true;
|
||||
const hasInnerHTML = element.innerHTML && element.innerHTML.trim().length > 0;
|
||||
const hasTextContent = element.textContent && element.textContent.trim().length > 0;
|
||||
const hasChildren = element.children && element.children.length > 0;
|
||||
@@ -405,7 +424,7 @@ export default function RootLayout({
|
||||
node.nodeType === Node.TEXT_NODE && node.textContent && node.textContent.trim().length > 0
|
||||
);
|
||||
|
||||
const hasImages = element.tagName === 'IMG' || computedStyle.backgroundImage !== 'none' || element.querySelector('img');
|
||||
const hasImages = element.tagName === 'IMG' || element.tagName === 'VIDEO' || computedStyle.backgroundImage !== 'none' || element.querySelector('img') || element.querySelector('video');
|
||||
const isInteractive = ['BUTTON', 'A', 'INPUT', 'SELECT', 'TEXTAREA'].includes(element.tagName);
|
||||
const hasFewChildren = element.children.length <= 3;
|
||||
const area = rect.width * rect.height;
|
||||
@@ -1086,11 +1105,22 @@ export default function RootLayout({
|
||||
updateButtonText(element, change.oldValue);
|
||||
}
|
||||
} else if (change.type === 'replaceImage') {
|
||||
const isBackground = element.tagName.toLowerCase() !== 'img';
|
||||
const revertTag = element.tagName.toLowerCase();
|
||||
const isBackground = revertTag !== 'img' && revertTag !== 'video';
|
||||
if (isBackground) {
|
||||
element.style.backgroundImage = change.oldValue ? 'url(' + change.oldValue + ')' : '';
|
||||
} else {
|
||||
element.src = change.oldValue;
|
||||
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);
|
||||
} else if (revertTag === 'video') {
|
||||
element.src = change.oldValue;
|
||||
element.load();
|
||||
} else {
|
||||
element.src = change.oldValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
@@ -1190,7 +1220,7 @@ export default function RootLayout({
|
||||
if (!isActive) return;
|
||||
|
||||
if (e.data.type === 'webild-replace-image') {
|
||||
const { selector, newSrc, isBackground } = e.data.data;
|
||||
const { selector, newSrc, isBackground, allowMediaTypeSwap } = e.data.data;
|
||||
let element = null;
|
||||
|
||||
try {
|
||||
@@ -1221,7 +1251,32 @@ export default function RootLayout({
|
||||
replaced = true;
|
||||
} else if (element.tagName.toLowerCase() === 'img') {
|
||||
oldValue = element.src;
|
||||
element.src = newSrc;
|
||||
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;
|
||||
}
|
||||
replaced = true;
|
||||
} else if (element.tagName.toLowerCase() === 'video') {
|
||||
oldValue = element.src || element.currentSrc || '';
|
||||
const newMediaType = getMediaTypeFromUrl(newSrc);
|
||||
const sources = element.querySelectorAll('source');
|
||||
if (newMediaType === 'image' && allowMediaTypeSwap) {
|
||||
const swapped = swapMediaElement(element, 'img', newSrc);
|
||||
if (selectedElement === element) selectedElement = swapped;
|
||||
element = swapped;
|
||||
} else {
|
||||
if (sources.length > 0) {
|
||||
sources.forEach(function(source) { source.src = newSrc; });
|
||||
element.load();
|
||||
} else {
|
||||
element.src = newSrc;
|
||||
element.load();
|
||||
}
|
||||
}
|
||||
replaced = true;
|
||||
} else {
|
||||
const hasBackgroundImage = window.getComputedStyle(element).backgroundImage !== 'none';
|
||||
@@ -1359,4 +1414,4 @@ export default function RootLayout({
|
||||
</ServiceWrapper>
|
||||
</html>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ export default function LandingPage() {
|
||||
<ThemeProvider
|
||||
defaultButtonVariant="shift-hover"
|
||||
defaultTextAnimation="entrance-slide"
|
||||
borderRadius="sharp"
|
||||
borderRadius="rounded"
|
||||
contentWidth="smallMedium"
|
||||
sizing="medium"
|
||||
background="noise"
|
||||
@@ -83,22 +83,22 @@ export default function LandingPage() {
|
||||
tagIcon={Scissors}
|
||||
features={[
|
||||
{
|
||||
title: "Classic Haircuts", description: "Timeless styles executed with precision and attention to detail. From fades to tapers, we craft the perfect cut for you.", imageSrc: "https://img.b2bpic.net/free-photo/handsome-businessman-barber-shop_1157-21514.jpg", imageAlt: "Classic Haircuts"
|
||||
title: "Classic Haircuts", description: "Timeless styles executed with precision and attention to detail. From fades to tapers, we craft the perfect cut for you.", imageSrc: "https://img.b2bpic.net/free-photo/handsome-businessman-barber-shop_1157-21514.jpg?_wi=1", imageAlt: "Classic Haircuts"
|
||||
},
|
||||
{
|
||||
title: "Beard Grooming", description: "Professional beard trimming, shaping, and conditioning. Maintain that distinguished look with expert care.", imageSrc: "https://img.b2bpic.net/free-photo/serious-elegant-bearded-male-wearing-classic-waistcoat-slim-bow-tie_613910-1520.jpg", imageAlt: "Beard Grooming"
|
||||
title: "Beard Grooming", description: "Professional beard trimming, shaping, and conditioning. Maintain that distinguished look with expert care.", imageSrc: "https://img.b2bpic.net/free-photo/serious-elegant-bearded-male-wearing-classic-waistcoat-slim-bow-tie_613910-1520.jpg?_wi=1", imageAlt: "Beard Grooming"
|
||||
},
|
||||
{
|
||||
title: "Hot Shave", description: "Traditional hot towel shaves using premium products and classic techniques for the ultimate relaxation.", imageSrc: "https://img.b2bpic.net/free-photo/portrait-pensive-man-with-receive-moustache-beard-trimming-procedure-barbershop_613910-15033.jpg", imageAlt: "Hot Shave"
|
||||
title: "Hot Shave", description: "Traditional hot towel shaves using premium products and classic techniques for the ultimate relaxation.", imageSrc: "https://img.b2bpic.net/free-photo/portrait-pensive-man-with-receive-moustache-beard-trimming-procedure-barbershop_613910-15033.jpg?_wi=1", imageAlt: "Hot Shave"
|
||||
},
|
||||
{
|
||||
title: "Hair Styling", description: "Modern styling with premium products. Whether it's pomade or gel, we'll give you the look you want.", imageSrc: "https://img.b2bpic.net/free-photo/studio-portrait-bearded-photographer-wearing-classic-suit-holding-retro-camera-standing-with-his-arms-crossed_613910-19282.jpg", imageAlt: "Hair Styling"
|
||||
title: "Hair Styling", description: "Modern styling with premium products. Whether it's pomade or gel, we'll give you the look you want.", imageSrc: "https://img.b2bpic.net/free-photo/studio-portrait-bearded-photographer-wearing-classic-suit-holding-retro-camera-standing-with-his-arms-crossed_613910-19282.jpg?_wi=1", imageAlt: "Hair Styling"
|
||||
},
|
||||
{
|
||||
title: "Signature Treatments", description: "Exclusive grooming treatments including scalp massage and conditioning therapy for complete wellness.", imageSrc: "https://img.b2bpic.net/free-photo/handsome-businessman-barber-shop_1157-21514.jpg", imageAlt: "Signature Treatments"
|
||||
title: "Signature Treatments", description: "Exclusive grooming treatments including scalp massage and conditioning therapy for complete wellness.", imageSrc: "https://img.b2bpic.net/free-photo/handsome-businessman-barber-shop_1157-21514.jpg?_wi=2", imageAlt: "Signature Treatments"
|
||||
},
|
||||
{
|
||||
title: "VIP Experience", description: "Premium service package with extended time, complimentary beverages, and personalized consultation.", imageSrc: "https://img.b2bpic.net/free-photo/serious-elegant-bearded-male-wearing-classic-waistcoat-slim-bow-tie_613910-1520.jpg", imageAlt: "VIP Experience"
|
||||
title: "VIP Experience", description: "Premium service package with extended time, complimentary beverages, and personalized consultation.", imageSrc: "https://img.b2bpic.net/free-photo/serious-elegant-bearded-male-wearing-classic-waistcoat-slim-bow-tie_613910-1520.jpg?_wi=2", imageAlt: "VIP Experience"
|
||||
}
|
||||
]}
|
||||
gridVariant="uniform-all-items-equal"
|
||||
@@ -193,16 +193,16 @@ export default function LandingPage() {
|
||||
tagIcon={Users}
|
||||
members={[
|
||||
{
|
||||
id: "1", name: "Marcus DeVille", role: "Master Barber & Owner", imageSrc: "https://img.b2bpic.net/free-photo/handsome-businessman-barber-shop_1157-21514.jpg", imageAlt: "Marcus DeVille"
|
||||
id: "1", name: "Marcus DeVille", role: "Master Barber & Owner", imageSrc: "https://img.b2bpic.net/free-photo/handsome-businessman-barber-shop_1157-21514.jpg?_wi=3", imageAlt: "Marcus DeVille"
|
||||
},
|
||||
{
|
||||
id: "2", name: "Antonio Rossi", role: "Senior Stylist", imageSrc: "https://img.b2bpic.net/free-photo/serious-elegant-bearded-male-wearing-classic-waistcoat-slim-bow-tie_613910-1520.jpg", imageAlt: "Antonio Rossi"
|
||||
id: "2", name: "Antonio Rossi", role: "Senior Stylist", imageSrc: "https://img.b2bpic.net/free-photo/serious-elegant-bearded-male-wearing-classic-waistcoat-slim-bow-tie_613910-1520.jpg?_wi=3", imageAlt: "Antonio Rossi"
|
||||
},
|
||||
{
|
||||
id: "3", name: "James Turner", role: "Grooming Specialist", imageSrc: "https://img.b2bpic.net/free-photo/portrait-pensive-man-with-receive-moustache-beard-trimming-procedure-barbershop_613910-15033.jpg", imageAlt: "James Turner"
|
||||
id: "3", name: "James Turner", role: "Grooming Specialist", imageSrc: "https://img.b2bpic.net/free-photo/portrait-pensive-man-with-receive-moustache-beard-trimming-procedure-barbershop_613910-15033.jpg?_wi=2", imageAlt: "James Turner"
|
||||
},
|
||||
{
|
||||
id: "4", name: "David Hassan", role: "Master Barber", imageSrc: "https://img.b2bpic.net/free-photo/studio-portrait-bearded-photographer-wearing-classic-suit-holding-retro-camera-standing-with-his-arms-crossed_613910-19282.jpg", imageAlt: "David Hassan"
|
||||
id: "4", name: "David Hassan", role: "Master Barber", imageSrc: "https://img.b2bpic.net/free-photo/studio-portrait-bearded-photographer-wearing-classic-suit-holding-retro-camera-standing-with-his-arms-crossed_613910-19282.jpg?_wi=2", imageAlt: "David Hassan"
|
||||
}
|
||||
]}
|
||||
gridVariant="uniform-all-items-equal"
|
||||
@@ -244,4 +244,4 @@ export default function LandingPage() {
|
||||
</div>
|
||||
</ThemeProvider>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ export default function ProductPage({ params }: ProductPageProps) {
|
||||
<ThemeProvider
|
||||
defaultButtonVariant="shift-hover"
|
||||
defaultTextAnimation="entrance-slide"
|
||||
borderRadius="sharp"
|
||||
borderRadius="rounded"
|
||||
contentWidth="smallMedium"
|
||||
sizing="medium"
|
||||
background="noise"
|
||||
@@ -114,7 +114,7 @@ export default function ProductPage({ params }: ProductPageProps) {
|
||||
<ThemeProvider
|
||||
defaultButtonVariant="shift-hover"
|
||||
defaultTextAnimation="entrance-slide"
|
||||
borderRadius="sharp"
|
||||
borderRadius="rounded"
|
||||
contentWidth="smallMedium"
|
||||
sizing="medium"
|
||||
background="noise"
|
||||
@@ -164,7 +164,7 @@ export default function ProductPage({ params }: ProductPageProps) {
|
||||
<ThemeProvider
|
||||
defaultButtonVariant="shift-hover"
|
||||
defaultTextAnimation="entrance-slide"
|
||||
borderRadius="sharp"
|
||||
borderRadius="rounded"
|
||||
contentWidth="smallMedium"
|
||||
sizing="medium"
|
||||
background="noise"
|
||||
@@ -233,4 +233,4 @@ export default function ProductPage({ params }: ProductPageProps) {
|
||||
</ReactLenis>
|
||||
</ThemeProvider>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ export default function ShopPage() {
|
||||
<ThemeProvider
|
||||
defaultButtonVariant="shift-hover"
|
||||
defaultTextAnimation="entrance-slide"
|
||||
borderRadius="sharp"
|
||||
borderRadius="rounded"
|
||||
contentWidth="smallMedium"
|
||||
sizing="medium"
|
||||
background="noise"
|
||||
@@ -63,7 +63,7 @@ export default function ShopPage() {
|
||||
<ThemeProvider
|
||||
defaultButtonVariant="shift-hover"
|
||||
defaultTextAnimation="entrance-slide"
|
||||
borderRadius="sharp"
|
||||
borderRadius="rounded"
|
||||
contentWidth="smallMedium"
|
||||
sizing="medium"
|
||||
background="noise"
|
||||
@@ -107,4 +107,4 @@ export default function ShopPage() {
|
||||
</ReactLenis>
|
||||
</ThemeProvider>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,21 +2,21 @@
|
||||
/* Base units */
|
||||
/* --vw is set by ThemeProvider */
|
||||
|
||||
/* --background: #f5f4ef;;
|
||||
--card: #dad6cd;;
|
||||
--foreground: #2a2928;;
|
||||
--primary-cta: #2a2928;;
|
||||
--secondary-cta: #efe7dd;;
|
||||
--accent: #ffffff;;
|
||||
--background-accent: #c6b180;; */
|
||||
/* --background: #010912;;
|
||||
--card: #152840;;
|
||||
--foreground: #e6f0ff;;
|
||||
--primary-cta: #cee7ff;;
|
||||
--secondary-cta: #0e1a29;;
|
||||
--accent: #3f5c79;;
|
||||
--background-accent: #004a93;; */
|
||||
|
||||
--background: #f5f4ef;;
|
||||
--card: #dad6cd;;
|
||||
--foreground: #2a2928;;
|
||||
--primary-cta: #2a2928;;
|
||||
--secondary-cta: #efe7dd;;
|
||||
--accent: #ffffff;;
|
||||
--background-accent: #c6b180;;
|
||||
--background: #010912;;
|
||||
--card: #152840;;
|
||||
--foreground: #e6f0ff;;
|
||||
--primary-cta: #cee7ff;;
|
||||
--secondary-cta: #0e1a29;;
|
||||
--accent: #3f5c79;;
|
||||
--background-accent: #004a93;;
|
||||
|
||||
/* text sizing - set by ThemeProvider */
|
||||
/* --text-2xs: clamp(0.465rem, 0.62vw, 0.62rem);
|
||||
|
||||
Reference in New Issue
Block a user