@openeventkit/event-site 2.0.98 → 2.0.100

package/gatsby-node.js

@@ -337,7 +337,7 @@ exports.onPreBootstrap = async () => {
   if(siteFonts && Object.keys(siteFonts).length > 0) {
     // Generate the SCSS file
     const scssFontsFile = generateFontFile(siteFonts);
-    if(scssFontsFile) {
+    if (scssFontsFile) {
       const standalone = __dirname === path.resolve();
       let fontFilePath = FONTS_SCSS_FILE_PATH;
       if (!standalone) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.98",
+  "version": "2.0.100",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -121,7 +121,7 @@
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",
-    "summit-registration-lite": "5.0.23",
+    "summit-registration-lite": "5.0.24",
     "superagent": "8.0.9",
     "sweetalert2": "^9.17.0",
     "upcoming-events-widget": "3.0.5",

package/src/utils/cssUtils.js

@@ -1,85 +1,62 @@
 const getFontFormat = (format) => {
-  let formatString = '';
-  switch (format) {
-    case 'ttf':
-      formatString = "format('truetype')";
-      break;
-    case 'otf':
-      formatString = "format('opentype')";
-      break;
-    case 'woff':
-      formatString = "format('woff')";
-      break;
-    case 'woff2':
-      formatString = "format('woff2')";
-      break;
-    default:
-      formatString = null;
-      break;
-  }
-  return formatString;
-}
+  const formatMap = {
+    "ttf": "format(\"truetype\")",
+    "otf": "format(\"opentype\")",
+    "woff": "format(\"woff\")",
+    "woff2": "format(\"woff2\")",
+  };
+  return formatMap[format] || "";
+};
 
-const getFontSrc = (fontPath) => {
-  // get the filename from the file path
-  const fileName = fontPath.substring(fontPath.lastIndexOf("/")+1) 
-  return `/fonts/${fileName}`;
-}
+const getFontSrc = (fontPath) => fontPath.replace(/^\/static/, "");
+
+const generateFontFace = (fontFamily, fontData, fontWeight) => {
+  if (!fontFamily || !fontData || !fontData.fontFile || !fontData.fontFormat) return "";
+
+  const { fontFile, fontFormat } = fontData;
+  return `@font-face {
+  font-family: "${fontFamily}";
+  src: url("${getFontSrc(fontFile)}") ${getFontFormat(fontFormat)};
+  font-weight: ${fontWeight};
+}`;
+};
 
-const generateFontFile = (fontData) => {
-  // check fields
-  if(!fontData?.fontFamily) return null;
-  if(!fontData?.regularFont?.fontFile) return null;
-  if(!fontData?.regularFont?.fontFormat) return null;
-  if(!fontData?.boldFont?.fontFile) return null;
-  if(!fontData?.boldFont?.fontFormat) return null;
+const generateFontFile = (fontsData) => {
+  if (!fontsData || !fontsData.fontFamily || !fontsData.regularFont || !fontsData.boldFont) return null;
 
-  const scssFonts = `
-  $font-family: "${fontData.fontFamily}";
+  const { fontFamily, regularFont, boldFont } = fontsData;
 
-  :root {
-    --font_family: "${fontData.fontFamily}" !important;
-  }
+  if (!regularFont.fontFile || !regularFont.fontFormat) return null;
+  if (!boldFont.fontFile || !boldFont.fontFormat) return null;
 
-  // Adding these new fonts for this theme
-  ${fontData.regularFont && fontData.regularFont.fontFile ?
-    `@font-face {
-        font-family: "${fontData.fontFamily}";
-        src: url("${getFontSrc(fontData.regularFont?.fontFile)}") ${getFontFormat(fontData.regularFont?.fontFormat)};
-        font-weight: normal;
-    }`
-    :
-    ''
-  }
+  const regularFontFace = generateFontFace(fontFamily, regularFont, "normal");
+  const boldFontFace = generateFontFace(fontFamily, boldFont, "bold");
 
-  ${fontData.boldFont && fontData.boldFont.fontFile ?
-    `@font-face {
-        font-family: "${fontData.fontFamily}";
-        src: url("${getFontSrc(fontData.boldFont?.fontFile)}") ${getFontFormat(fontData.boldFont?.fontFormat)};
-        font-weight: bold;
-    }`
-    :
-    ''
-  }
+  return `$font-family: "${fontFamily}";
+
+:root {
+  --font_family: "${fontFamily}" !important;
+}
+
+${regularFontFace}
+${boldFontFace}
   
-  %font-regular {
-    font-family: "${fontData.fontFamily}";
-    font-weight: 400;
-  }
+%font-regular {
+  font-family: var(--font_family);
+  font-weight: 400;
+}
 
-  %font-semi {
-    font-family: "${fontData.fontFamily}";
-    font-weight: 600;
-  }
+%font-semi {
+  font-family: var(--font_family);
+  font-weight: 600;
+}
 
-  %font-bold {
-    font-family: "${fontData.fontFamily}";
-    font-weight: 700;
-  }
- `;
-  return scssFonts;
+%font-bold {
+  font-family: var(--font_family);
+  font-weight: 700;
+}`;
 };
 
 module.exports = {
   generateFontFile
-}
+};