@openeventkit/event-site 2.0.49 → 2.0.51

package/gatsby-node.js

@@ -225,7 +225,7 @@ exports.onPreBootstrap = async () => {
 
   const summitId = process.env.GATSBY_SUMMIT_ID;
   const summitApiBaseUrl = process.env.GATSBY_SUMMIT_API_BASE_URL;
-  const marketingSettings = await SSR_getMarketingSettings(process.env.GATSBY_MARKETING_API_BASE_URL, summitId);
+  let   marketingSettings = await SSR_getMarketingSettings(process.env.GATSBY_MARKETING_API_BASE_URL, summitId);
   const colorSettings = fs.existsSync(COLORS_FILE_PATH) ? JSON.parse(fs.readFileSync(COLORS_FILE_PATH)) : require(`./${DEFAULT_COLORS_FILE_PATH}`);
   const globalSettings = fs.existsSync(SITE_SETTINGS_FILE_PATH) ? JSON.parse(fs.readFileSync(SITE_SETTINGS_FILE_PATH)) : {};
   const lobbyPageSettings = fs.existsSync(LOBBY_PAGE_FILE_PATH) ? JSON.parse(fs.readFileSync(LOBBY_PAGE_FILE_PATH)) : {};
@@ -247,9 +247,12 @@ exports.onPreBootstrap = async () => {
 
   const accessToken = await getAccessToken(config, process.env.GATSBY_BUILD_SCOPES).then(({ token }) => token.access_token);
 
+  const FileType = 'FILE';
   // extract colors from marketing settings
-  marketingSettings.map(({ key, value }) => {
-    if (key.startsWith("color_")) colorSettings[key] = value;
+  marketingSettings = marketingSettings.map( entry => {
+    if (entry.key.startsWith("color_")) colorSettings[entry.key] = entry.value;
+    if(entry.type === FileType) return {...entry, value: entry.file};
+    return {...entry};
   });
 
   // create required directories

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.49",
+  "version": "2.0.51",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",

package/src/components/summit-my-orders-tickets/components/TicketPopup/ticket-popup.scss

@@ -85,7 +85,7 @@
     display: flex;
     gap: 15px;
     width: 90px;
-    color: $color-primary-contrast;
+    color: var(--color_text_dark);
     flex-direction: column;    
 
     .ticket-popup-row-icon {

package/src/utils/useMarketingSettings.js

@@ -21,15 +21,13 @@ export const MARKETING_SETTINGS_KEYS = {
   regLiteNoAllowedTicketsMessage: "REG_LITE_NO_ALLOWED_TICKETS_MESSAGE",
 }
 
-const FileType = 'FILE';
+
 const marketingSettingsQuery = graphql`
   query {
     allMarketingSettingsJson {
       nodes {
         key
-        type
         value
-        file
       }
     }
   }
@@ -37,11 +35,8 @@ const marketingSettingsQuery = graphql`
 
 const useMarketingSettings = () => {
   const { allMarketingSettingsJson } = useStaticQuery(marketingSettingsQuery);
-  const getSettingByKey = (key) => {
-    const node = allMarketingSettingsJson.nodes.find(setting => setting.key === key);
-    if(!node) return null;
-    return node.type === FileType ? node?.file : node?.value;
-  }
+  const getSettingByKey = (key) =>
+      allMarketingSettingsJson.nodes.find(setting => setting.key === key)?.value;
   return { getSettingByKey };
 };