@openeventkit/event-site 2.0.99 → 2.0.101

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.99",
+  "version": "2.0.101",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -43,7 +43,7 @@
     "final-form": "4.20.7",
     "font-awesome": "^4.7.0",
     "formik": "^2.2.9",
-    "full-schedule-widget": "3.0.3",
+    "full-schedule-widget": "3.0.4",
     "gatsby": "^5.8.1",
     "gatsby-alias-imports": "^1.0.6",
     "gatsby-plugin-image": "^3.8.0",

package/src/content/site-settings/index.json

@@ -1,45 +1 @@
-{
-  "widgets": {
-    "chat": {
-      "enabled": true,
-      "showQA": false,
-      "showHelp": false,
-      "defaultScope": "page"
-    },
-    "schedule": {
-      "allowClick": true
-    }
-  },
-  "favicon": {
-    "asset": "icon.png"
-  },
-  "identityProviderButtons": [
-    {
-      "buttonColor": "#082238",
-      "providerLabel": "Continue with FNid",
-      "providerLogo": "logo_fn.svg",
-      "providerLogoSize": 27
-    },
-    {
-      "buttonColor": "#0A66C2",
-      "providerLabel": "Sign in with LinkedIn",
-      "providerParam": "linkedin",
-      "providerLogo": "logo_linkedin.svg",
-      "providerLogoSize": 18
-    },
-    {
-      "buttonColor": "#000000",
-      "providerLabel": "Sign in with Apple",
-      "providerParam": "apple",
-      "providerLogoSize": 17,
-      "providerLogo": "logo_apple.svg"
-    },
-    {
-      "buttonColor": "#1877F2",
-      "providerLabel": "Login with Facebook",
-      "providerParam": "facebook",
-      "providerLogo": "logo_facebook.svg",
-      "providerLogoSize": 20
-    }
-  ]
-}
+{"widgets":{"chat":{"enabled":true,"showQA":false,"showHelp":false,"defaultScope":"page"},"schedule":{"allowClick":true}},"favicon":{"asset":"icon.png"},"identityProviderButtons":[{"buttonColor":"#082238","providerLabel":"Continue with FNid","providerLogo":"logo_fn.svg","providerLogoSize":27},{"buttonColor":"#0A66C2","providerLabel":"Sign in with LinkedIn","providerParam":"linkedin","providerLogo":"logo_linkedin.svg","providerLogoSize":18},{"buttonColor":"#000000","providerLabel":"Sign in with Apple","providerParam":"apple","providerLogoSize":17,"providerLogo":"logo_apple.svg"},{"buttonColor":"#1877F2","providerLabel":"Login with Facebook","providerParam":"facebook","providerLogo":"logo_facebook.svg","providerLogoSize":20}],"staticJsonFilesBuildTime":[{"file":"src/data/summit.json","build_time":1709859431135},{"file":"src/data/events.json","build_time":1709859447545},{"file":"src/data/events.idx.json","build_time":1709859447564},{"file":"src/data/speakers.json","build_time":1709859452247},{"file":"src/data/speakers.idx.json","build_time":1709859452252},{"file":"src/content/sponsors.json","build_time":1709859452753},{"file":"src/data/voteable-presentations.json","build_time":1709859453093}],"lastBuild":1709859453093}

package/src/styles/colors.scss

@@ -26,6 +26,7 @@ $color_text_input_hints_light:#7B7B7B;
 $color_text_input_hints_dark:#7B7B7B;
 $color_button_background_color:#ffffff;
 $color_button_color:#000000;
+$color_alerts:#FF0000;
 
 :root {
   --color_primary: #{$color_primary};
@@ -49,6 +50,7 @@ $color_button_color:#000000;
   --color_icon_light: #{$color_icon_light};
   --color_button_background_color: #{$color_button_background_color};
   --color_button_color: #{$color_button_color};
+  --color_alerts: #{$color_alerts};
 }
 
 html[data-theme="DARK"] {

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
-}
+};