Update theme fonts
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
import type { Metadata } from "next";
|
import type { Metadata } from "next";
|
||||||
import { DM_Sans } from "next/font/google";
|
import { DM_Sans } from "next/font/google";
|
||||||
import { Inter } from "next/font/google";
|
import { Inter } from "next/font/google";
|
||||||
|
import { Public_Sans } from "next/font/google";
|
||||||
import "./globals.css";
|
import "./globals.css";
|
||||||
|
|
||||||
|
|
||||||
@@ -10,8 +11,9 @@ export const metadata: Metadata = {
|
|||||||
keywords: ["computer club", "tech enthusiasts", "coding club", "student technology", "tech community"],
|
keywords: ["computer club", "tech enthusiasts", "coding club", "student technology", "tech community"],
|
||||||
};
|
};
|
||||||
|
|
||||||
const dmSans = DM_Sans({
|
|
||||||
variable: "--font-dm-sans",
|
const publicSans = Public_Sans({
|
||||||
|
variable: "--font-public-sans",
|
||||||
subsets: ["latin"],
|
subsets: ["latin"],
|
||||||
});
|
});
|
||||||
const inter = Inter({
|
const inter = Inter({
|
||||||
@@ -26,7 +28,7 @@ export default function RootLayout({
|
|||||||
}>) {
|
}>) {
|
||||||
return (
|
return (
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<body className={`${dmSans.variable} ${inter.variable} antialiased`}>
|
<body className={`${publicSans.variable} ${inter.variable} antialiased`}>
|
||||||
{children}
|
{children}
|
||||||
|
|
||||||
<script
|
<script
|
||||||
@@ -270,8 +272,6 @@ export default function RootLayout({
|
|||||||
const getElementInfo = (element, assignId = false) => {
|
const getElementInfo = (element, assignId = false) => {
|
||||||
const rect = element.getBoundingClientRect();
|
const rect = element.getBoundingClientRect();
|
||||||
const tagName = element.tagName.toLowerCase();
|
const tagName = element.tagName.toLowerCase();
|
||||||
const selector = getUniqueSelector(element, assignId);
|
|
||||||
const sectionId = getSectionId(element);
|
|
||||||
|
|
||||||
let className = undefined;
|
let className = undefined;
|
||||||
try {
|
try {
|
||||||
@@ -300,8 +300,7 @@ export default function RootLayout({
|
|||||||
};
|
};
|
||||||
|
|
||||||
if (tagName === 'img') {
|
if (tagName === 'img') {
|
||||||
const originalSrc = extractOriginalUrl(element.src);
|
info.imageData = {
|
||||||
info.imageData = {
|
|
||||||
src: originalSrc,
|
src: originalSrc,
|
||||||
alt: element.alt || undefined,
|
alt: element.alt || undefined,
|
||||||
naturalWidth: element.naturalWidth,
|
naturalWidth: element.naturalWidth,
|
||||||
@@ -312,8 +311,7 @@ export default function RootLayout({
|
|||||||
|
|
||||||
if (tagName === 'video') {
|
if (tagName === 'video') {
|
||||||
const rawSrc = element.src || element.currentSrc || (element.querySelector('source') && element.querySelector('source').src) || '';
|
const rawSrc = element.src || element.currentSrc || (element.querySelector('source') && element.querySelector('source').src) || '';
|
||||||
const resolvedSrc = extractOriginalUrl(rawSrc);
|
info.imageData = {
|
||||||
info.imageData = {
|
|
||||||
src: resolvedSrc,
|
src: resolvedSrc,
|
||||||
alt: element.getAttribute('aria-label') || undefined,
|
alt: element.getAttribute('aria-label') || undefined,
|
||||||
isBackground: false,
|
isBackground: false,
|
||||||
@@ -326,8 +324,7 @@ export default function RootLayout({
|
|||||||
if (backgroundImage && backgroundImage !== 'none') {
|
if (backgroundImage && backgroundImage !== 'none') {
|
||||||
const urlMatch = backgroundImage.match(/url(['"]?([^'")]+)['"]?)/);
|
const urlMatch = backgroundImage.match(/url(['"]?([^'")]+)['"]?)/);
|
||||||
if (urlMatch) {
|
if (urlMatch) {
|
||||||
const originalBgSrc = extractOriginalUrl(urlMatch[1]);
|
if (tagName !== 'img') {
|
||||||
if (tagName !== 'img') {
|
|
||||||
info.imageData = {
|
info.imageData = {
|
||||||
src: originalBgSrc,
|
src: originalBgSrc,
|
||||||
isBackground: true
|
isBackground: true
|
||||||
@@ -339,8 +336,7 @@ export default function RootLayout({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const elementType = getElementType(element);
|
info.elementType = elementType;
|
||||||
info.elementType = elementType;
|
|
||||||
|
|
||||||
if (elementType === 'Button') {
|
if (elementType === 'Button') {
|
||||||
const buttonText = element.textContent?.trim() || element.value || element.getAttribute('aria-label') || '';
|
const buttonText = element.textContent?.trim() || element.value || element.getAttribute('aria-label') || '';
|
||||||
@@ -433,13 +429,11 @@ export default function RootLayout({
|
|||||||
};
|
};
|
||||||
|
|
||||||
const isTextElement = (element) => {
|
const isTextElement = (element) => {
|
||||||
const elementType = getElementType(element);
|
return elementType === 'Text';
|
||||||
return elementType === 'Text';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const isButtonElement = (element) => {
|
const isButtonElement = (element) => {
|
||||||
const elementType = getElementType(element);
|
return elementType === 'Button';
|
||||||
return elementType === 'Button';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateButtonText = (element, newText) => {
|
const updateButtonText = (element, newText) => {
|
||||||
@@ -514,8 +508,7 @@ export default function RootLayout({
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handleInput = () => {
|
const handleInput = () => {
|
||||||
const elementInfo = getElementInfo(element);
|
let currentText = element.textContent;
|
||||||
let currentText = element.textContent;
|
|
||||||
|
|
||||||
// Ensure there's always at least a space to keep the element editable
|
// Ensure there's always at least a space to keep the element editable
|
||||||
if (currentText === '' || currentText === null || currentText.length === 0) {
|
if (currentText === '' || currentText === null || currentText.length === 0) {
|
||||||
@@ -628,8 +621,7 @@ export default function RootLayout({
|
|||||||
}, '*');
|
}, '*');
|
||||||
|
|
||||||
if (save && originalContent !== element.textContent) {
|
if (save && originalContent !== element.textContent) {
|
||||||
const elementInfo = getElementInfo(element);
|
let finalText = element.textContent;
|
||||||
let finalText = element.textContent;
|
|
||||||
|
|
||||||
// Trim the final text and convert space-only to empty string for saving
|
// Trim the final text and convert space-only to empty string for saving
|
||||||
if (finalText === ' ' || finalText.trim() === '') {
|
if (finalText === ' ' || finalText.trim() === '') {
|
||||||
@@ -758,7 +750,7 @@ export default function RootLayout({
|
|||||||
lastMouseX = e.clientX;
|
lastMouseX = e.clientX;
|
||||||
lastMouseY = e.clientY;
|
lastMouseY = e.clientY;
|
||||||
|
|
||||||
const target = getMostSpecificElement(e.clientX, e.clientY) || e.target;
|
|| e.target;
|
||||||
|
|
||||||
if (!isValidElement(target) || target === hoveredElement || target === selectedElement) {
|
if (!isValidElement(target) || target === hoveredElement || target === selectedElement) {
|
||||||
return;
|
return;
|
||||||
@@ -790,8 +782,7 @@ export default function RootLayout({
|
|||||||
hoverOverlay = createHoverOverlay(target);
|
hoverOverlay = createHoverOverlay(target);
|
||||||
}
|
}
|
||||||
|
|
||||||
const elementType = getElementType(target);
|
showElementTypeLabel(target, elementType);
|
||||||
showElementTypeLabel(target, elementType);
|
|
||||||
|
|
||||||
window.parent.postMessage({
|
window.parent.postMessage({
|
||||||
type: 'webild-element-hover',
|
type: 'webild-element-hover',
|
||||||
@@ -833,7 +824,7 @@ export default function RootLayout({
|
|||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|
||||||
const target = getMostSpecificElement(e.clientX, e.clientY) || e.target;
|
|| e.target;
|
||||||
if (!isValidElement(target)) return;
|
if (!isValidElement(target)) return;
|
||||||
|
|
||||||
if (selectedElement && selectedElement !== target) {
|
if (selectedElement && selectedElement !== target) {
|
||||||
@@ -878,8 +869,7 @@ export default function RootLayout({
|
|||||||
hoveredElement = null;
|
hoveredElement = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
const elementInfo = getElementInfo(target, true);
|
selectedElement.dataset.webildSelector = elementInfo.selector;
|
||||||
selectedElement.dataset.webildSelector = elementInfo.selector;
|
|
||||||
showElementTypeLabel(target, elementInfo.elementType);
|
showElementTypeLabel(target, elementInfo.elementType);
|
||||||
|
|
||||||
window.parent.postMessage({
|
window.parent.postMessage({
|
||||||
@@ -962,8 +952,7 @@ export default function RootLayout({
|
|||||||
isScrolling = false;
|
isScrolling = false;
|
||||||
|
|
||||||
if (lastMouseX > 0 && lastMouseY > 0) {
|
if (lastMouseX > 0 && lastMouseY > 0) {
|
||||||
const target = getMostSpecificElement(lastMouseX, lastMouseY);
|
if (target && isValidElement(target) && target !== selectedElement) {
|
||||||
if (target && isValidElement(target) && target !== selectedElement) {
|
|
||||||
hoveredElement = target;
|
hoveredElement = target;
|
||||||
|
|
||||||
const computedStyle = window.getComputedStyle(target);
|
const computedStyle = window.getComputedStyle(target);
|
||||||
@@ -977,8 +966,7 @@ export default function RootLayout({
|
|||||||
hoveredElement.classList.add(hoverClass);
|
hoveredElement.classList.add(hoverClass);
|
||||||
hoverOverlay = createHoverOverlay(target);
|
hoverOverlay = createHoverOverlay(target);
|
||||||
|
|
||||||
const elementType = getElementType(target);
|
showElementTypeLabel(target, elementType);
|
||||||
showElementTypeLabel(target, elementType);
|
|
||||||
|
|
||||||
window.parent.postMessage({
|
window.parent.postMessage({
|
||||||
type: 'webild-element-hover',
|
type: 'webild-element-hover',
|
||||||
@@ -1001,8 +989,7 @@ export default function RootLayout({
|
|||||||
|
|
||||||
const saveChangeToStorage = (change) => {
|
const saveChangeToStorage = (change) => {
|
||||||
try {
|
try {
|
||||||
const storageKey = getStorageKey();
|
const existingChanges = JSON.parse(localStorage.getItem(storageKey) || '[]');
|
||||||
const existingChanges = JSON.parse(localStorage.getItem(storageKey) || '[]');
|
|
||||||
|
|
||||||
const filteredChanges = existingChanges.filter(c => {
|
const filteredChanges = existingChanges.filter(c => {
|
||||||
return !(c.oldValue === change.oldValue && c.sectionId === change.sectionId);
|
return !(c.oldValue === change.oldValue && c.sectionId === change.sectionId);
|
||||||
@@ -1022,8 +1009,7 @@ export default function RootLayout({
|
|||||||
|
|
||||||
const clearLocalChanges = () => {
|
const clearLocalChanges = () => {
|
||||||
try {
|
try {
|
||||||
const storageKey = getStorageKey();
|
localStorage.removeItem(storageKey);
|
||||||
localStorage.removeItem(storageKey);
|
|
||||||
window.parent.postMessage({
|
window.parent.postMessage({
|
||||||
type: 'webild-local-changes-cleared',
|
type: 'webild-local-changes-cleared',
|
||||||
data: {}
|
data: {}
|
||||||
@@ -1072,8 +1058,7 @@ export default function RootLayout({
|
|||||||
|
|
||||||
if (e.data.type === 'webild-cancel-changes') {
|
if (e.data.type === 'webild-cancel-changes') {
|
||||||
try {
|
try {
|
||||||
const storageKey = getStorageKey();
|
const savedChanges = localStorage.getItem(storageKey);
|
||||||
const savedChanges = localStorage.getItem(storageKey);
|
|
||||||
if (savedChanges) {
|
if (savedChanges) {
|
||||||
const changes = JSON.parse(savedChanges);
|
const changes = JSON.parse(savedChanges);
|
||||||
changes.forEach(change => {
|
changes.forEach(change => {
|
||||||
@@ -1095,8 +1080,7 @@ export default function RootLayout({
|
|||||||
if (isBackground) {
|
if (isBackground) {
|
||||||
element.style.backgroundImage = change.oldValue ? 'url(' + change.oldValue + ')' : '';
|
element.style.backgroundImage = change.oldValue ? 'url(' + change.oldValue + ')' : '';
|
||||||
} else {
|
} else {
|
||||||
const oldMediaType = getMediaTypeFromUrl(change.oldValue);
|
if (revertTag === 'video' && oldMediaType === 'image') {
|
||||||
if (revertTag === 'video' && oldMediaType === 'image') {
|
|
||||||
swapMediaElement(element, 'img', change.oldValue);
|
swapMediaElement(element, 'img', change.oldValue);
|
||||||
} else if (revertTag === 'img' && oldMediaType === 'video') {
|
} else if (revertTag === 'img' && oldMediaType === 'video') {
|
||||||
swapMediaElement(element, 'video', change.oldValue);
|
swapMediaElement(element, 'video', change.oldValue);
|
||||||
@@ -1144,8 +1128,7 @@ export default function RootLayout({
|
|||||||
const el = textElements[i];
|
const el = textElements[i];
|
||||||
if (isTextElement(el) && el.textContent.trim() === (oldValue || '').trim()) {
|
if (isTextElement(el) && el.textContent.trim() === (oldValue || '').trim()) {
|
||||||
element = el;
|
element = el;
|
||||||
const newSelector = getUniqueSelector(element, true);
|
if (newSelector) {
|
||||||
if (newSelector) {
|
|
||||||
element.dataset.webildSelector = newSelector;
|
element.dataset.webildSelector = newSelector;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -1236,10 +1219,8 @@ export default function RootLayout({
|
|||||||
replaced = true;
|
replaced = true;
|
||||||
} else if (element.tagName.toLowerCase() === 'img') {
|
} else if (element.tagName.toLowerCase() === 'img') {
|
||||||
oldValue = element.src;
|
oldValue = element.src;
|
||||||
const newMediaType = getMediaTypeFromUrl(newSrc);
|
if (newMediaType === 'video' && allowMediaTypeSwap) {
|
||||||
if (newMediaType === 'video' && allowMediaTypeSwap) {
|
if (selectedElement === element) selectedElement = swapped;
|
||||||
const swapped = swapMediaElement(element, 'video', newSrc);
|
|
||||||
if (selectedElement === element) selectedElement = swapped;
|
|
||||||
element = swapped;
|
element = swapped;
|
||||||
} else {
|
} else {
|
||||||
element.src = newSrc;
|
element.src = newSrc;
|
||||||
@@ -1247,11 +1228,9 @@ export default function RootLayout({
|
|||||||
replaced = true;
|
replaced = true;
|
||||||
} else if (element.tagName.toLowerCase() === 'video') {
|
} else if (element.tagName.toLowerCase() === 'video') {
|
||||||
oldValue = element.src || element.currentSrc || '';
|
oldValue = element.src || element.currentSrc || '';
|
||||||
const newMediaType = getMediaTypeFromUrl(newSrc);
|
const sources = element.querySelectorAll('source');
|
||||||
const sources = element.querySelectorAll('source');
|
|
||||||
if (newMediaType === 'image' && allowMediaTypeSwap) {
|
if (newMediaType === 'image' && allowMediaTypeSwap) {
|
||||||
const swapped = swapMediaElement(element, 'img', newSrc);
|
if (selectedElement === element) selectedElement = swapped;
|
||||||
if (selectedElement === element) selectedElement = swapped;
|
|
||||||
element = swapped;
|
element = swapped;
|
||||||
} else {
|
} else {
|
||||||
if (sources.length > 0) {
|
if (sources.length > 0) {
|
||||||
@@ -1273,7 +1252,6 @@ export default function RootLayout({
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (replaced) {
|
if (replaced) {
|
||||||
const elementInfo = getElementInfo(element);
|
|
||||||
|
|
||||||
let cleanOldValue = oldValue;
|
let cleanOldValue = oldValue;
|
||||||
if (oldValue.includes('url(')) {
|
if (oldValue.includes('url(')) {
|
||||||
@@ -1345,12 +1323,6 @@ export default function RootLayout({
|
|||||||
}
|
}
|
||||||
}, true);
|
}, true);
|
||||||
|
|
||||||
const urlCheckInterval = setInterval(() => {
|
|
||||||
if (lastPathname !== window.location.pathname) {
|
|
||||||
lastPathname = window.location.pathname;
|
|
||||||
notifyPageChange();
|
|
||||||
}
|
|
||||||
}, 500);
|
|
||||||
|
|
||||||
notifyPageChange();
|
notifyPageChange();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user