@openeventkit/event-site 2.0.69 → 2.0.71

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.69",
+  "version": "2.0.71",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -71,6 +71,7 @@
     "lodash": "^4.17.19",
     "lz-string": "^1.4.4",
     "markdown-it": "^12.0.0",
+    "markdown-to-jsx": "^7.3.2",
     "moment": "^2.27.0",
     "moment-timezone": "^0.5.31",
     "netlify-cms-app": "^2.15.72",

package/src/cms/config/collections/defaultPagesCollection/marketingPage/index.js

@@ -9,9 +9,23 @@ import {
   listField,
   imageWithAltField,
   imagesField,
-  linkImagesField
+  linkImagesField,
+  markdownField
 } from "../../../fields";
 
+const markdownFieldButtons = [
+  "bold",
+  "italic",
+  "link",
+  "heading-one",
+  "heading-two",
+  "heading-three",
+  "heading-four",
+  "heading-five",
+  "bulleted-list",
+  "numbered-list"
+];
+
 import {
   MARKETING_PAGE_FILE_PATH
 } from "@utils/filePath";
@@ -116,6 +130,23 @@ const marketingPage = {
       label: "Widgets",
       name: "leftColumn",
       fields: [
+        objectField({
+          label: "Text",
+          name: "text",
+          fields: [
+            booleanField({
+              label: "Display",
+              name: "display",
+              required: false
+            }),
+            markdownField({
+              label: "Content",
+              name: "content",
+              buttons: markdownFieldButtons,
+              editor_components: []
+            })
+          ]
+        }),
         objectField({
           label: "Schedule",
           name: "schedule",

package/src/cms/config/collections/defaultPagesCollection/marketingPage/typeDefs.js

@@ -14,6 +14,10 @@ module.exports = `
     size: Int
     images: [LinkImageWithAlt]
   }
+  type MarketingPageLeftColumnTextWidget {
+    display: Boolean
+    content: String
+  }
   type MarketingPageLeftColumnWidget {
     display: Boolean
     title: String
@@ -24,6 +28,7 @@ module.exports = `
     image: ImageWithAlt
   }
   type MarketingPageLeftColumn {
+    text: MarketingPageLeftColumnTextWidget
     schedule: MarketingPageLeftColumnWidget
     disqus: MarketingPageLeftColumnWidget
     image: MarketingPageLeftColumnImageWidget

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

@@ -1 +1,53 @@
-{"widgets":{"chat":{"enabled": true, "showQA":false,"showHelp":false,"defaultScope":"page"},"schedule":{"allowClick":true}},"favicons":{"favicon180":"/img/favicon.png","favicon32":"/img/favicon.png","favicon16":"/img/favicon.png"},"staticJsonFilesBuildTime":[{"file":"src/data/summit.json","build_time":1692386447666},{"file":"src/data/events.json","build_time":1692386451064},{"file":"src/data/events.idx.json","build_time":1692386451066},{"file":"src/data/speakers.json","build_time":1692386451884},{"file":"src/data/speakers.idx.json","build_time":1692386451884},{"file":"src/content/sponsors.json","build_time":1692386455106},{"file":"src/data/voteable-presentations.json","build_time":1692386457214}],"lastBuild":1692386457215}
+{
+  "widgets": {
+    "chat": {
+      "enabled": true,
+      "showQA": false,
+      "showHelp": false,
+      "defaultScope": "page"
+    },
+    "schedule": {
+      "allowClick": true
+    }
+  },
+  "favicons": {
+    "favicon180": "/img/favicon.png",
+    "favicon32": "/img/favicon.png",
+    "favicon16": "/img/favicon.png"
+  },
+  "staticJsonFilesBuildTime": [
+    {
+      "file": "src/data/summit.json",
+      "build_time": 1692386447666
+    },
+    {
+      "file": "src/data/events.json",
+      "build_time": 1692386451064
+    },
+    {
+      "file": "src/data/events.idx.json",
+      "build_time": 1692386451066
+    },
+    {
+      "file": "src/data/speakers.json",
+      "build_time": 1692386451884
+    },
+    {
+      "file": "src/data/speakers.idx.json",
+      "build_time": 1692386451884
+    },
+    {
+      "file": "src/content/sponsors.json",
+      "build_time": 1692386455106
+    },
+    {
+      "file": "src/data/voteable-presentations.json",
+      "build_time": 1692386457214
+    }
+  ],
+  "lastBuild": 1692386457215,
+  "siteMetadata": {
+    "title": "test!!",
+    "description": "TEST!!$DESC"
+  }
+}

package/src/pages/index.js

@@ -55,6 +55,10 @@ export const marketingPageQuery = graphql`
         text
       }
       leftColumn {
+        text {
+          content
+          display
+        }
         disqus {
           title
           display

package/src/styles/marketing.module.scss

@@ -1,6 +1,7 @@
-@import 'colors.scss';
 
-.masonry {
+.left-column {
+}
+.right-column {
   .image-slider {
     height: auto;
     background-position: center;

package/src/templates/marketing-page-template.js

@@ -2,6 +2,7 @@ import * as React from "react";
 import PropTypes from "prop-types";
 import { navigate } from "gatsby";
 import { GatsbyImage, getImage } from "gatsby-plugin-image";
+import Markdown from "markdown-to-jsx";
 
 import Layout from "../components/Layout";
 import AttendanceTrackerComponent from "../components/AttendanceTrackerComponent";
@@ -57,8 +58,13 @@ const MarketingPageTemplate = ({
         marketingPageSettings={marketingPageJson}
       />
       {summit && marketingPageJson.countdown?.display && <Countdown summit={summit} text={marketingPageJson?.countdown?.text} />}
-      <div className="columns" id="marketing-columns">
-        <div className="column is-half px-6 pt-6 pb-0" style={{ position: 'relative' }}>
+      <div className="columns">
+        <div className={`column is-half mt-3 px-6 py-6 ${styles.leftColumn}`} style={{ position: 'relative' }}>
+          {marketingPageJson.leftColumn?.text?.content && marketingPageJson.leftColumn?.text?.display &&
+            <Markdown>
+              {marketingPageJson.leftColumn.text.content}
+            </Markdown>
+          }
           {marketingPageJson.leftColumn?.schedule?.display &&
             <>
               <h2><b>{marketingPageJson.leftColumn.schedule.title}</b></h2>
@@ -88,7 +94,7 @@ const MarketingPageTemplate = ({
             </>
           }
         </div>
-        <div className="column is-half px-0 pb-0">
+        <div className={`column is-half px-0 pb-0 ${styles.rightColumn}`}>
           <Masonry
             breakpointCols={2}
             className="my-masonry-grid"

package/src/utils/customErrorHandler.js

@@ -12,12 +12,17 @@ export const customErrorHandler = (err, res) => (dispatch, state) => {
       expiredToken(err);
       break;
     case 412:
-      for (let [key, value] of Object.entries(err.response.body.errors)) {
-        if (isNaN(key)) {
-          msg += key + ': ';
+      const errors = err?.response?.body?.errors;
+      if(errors) {
+        for (let [key, value] of Object.entries(errors)) {
+          if (isNaN(key)) {
+            msg += key + ': ';
+          }
+          msg += value + '<br>';
         }
-        msg += value + '<br>';
-      }      
+      } else {
+        msg = 'There was a problem with our server, please contact admin.';
+      }
       Swal.fire("Validation error", msg, "warning");
       break;
     default: