@openeventkit/event-site 1.0.13 → 1.0.19

package/gatsby-browser.js

@@ -2,8 +2,6 @@ import * as Sentry from "@sentry/gatsby";
 import { RewriteFrames as RewriteFramesIntegration } from "@sentry/integrations";
 import ReduxWrapper from "./src/state/ReduxWrapper";
 
-import colors from "./src/content/colors.json";
-
 import smoothscroll from "smoothscroll-polyfill";
 import "what-input";
 
@@ -12,6 +10,8 @@ import "./src/styles/bulma.scss";
 // import base styles
 import "./src/styles/style.scss";
 
+import colors from "data/colors.json";
+
 // smooth scroll polyfill needed for Safari
 smoothscroll.polyfill();
 

package/gatsby-config.js

@@ -1,36 +1,24 @@
 const path = require("path");
 
 require("dotenv").config({
-  path: `.env.${process.env.NODE_ENV}`,
+  path: `.env.${process.env.NODE_ENV}`
 });
 
 const {
   STATIC_CONTENT_DIR_PATH,
-  SITE_SETTINGS_FILE_PATH
+  CONTENT_PAGES_DIR_PATH,
+  SITE_SETTINGS_FILE_PATH,
+  MARKETING_SETTINGS_FILE_PATH
 } = require("./src/utils/filePath");
 
 let siteSettings = require(`./${SITE_SETTINGS_FILE_PATH}`);
 try {
-  const resolvedSiteSettingsFilePath = path.resolve(SITE_SETTINGS_FILE_PATH);
-  siteSettings = require(resolvedSiteSettingsFilePath);
+  siteSettings = require(path.resolve(SITE_SETTINGS_FILE_PATH));
 }
 catch (e) {
   console.log("Falling back to default site settings.")
 }
 
-const relativeContentDir = `${__dirname}/${STATIC_CONTENT_DIR_PATH}`;
-const resolvedContentDir = path.resolve(STATIC_CONTENT_DIR_PATH);
-const contentDirs = [relativeContentDir];
-if (relativeContentDir !== resolvedContentDir) {
-  contentDirs.unshift(resolvedContentDir);
-};
-const gatsbySourceFilesystemContentConfigs = contentDirs.map(contentDir => ({
-  resolve: "gatsby-source-filesystem",
-  options: {
-    path: contentDir
-  }
-}));
-
 module.exports = {
   siteMetadata: {
     title: `${siteSettings?.siteMetadata?.title || process.env.GATSBY_METADATA_TITLE || 'Event Site'}`,
@@ -90,7 +78,27 @@ module.exports = {
         name: "pages"
       }
     },
-    ...gatsbySourceFilesystemContentConfigs,
+    {
+      resolve: "gatsby-source-filesystem",
+      options: {
+        path: path.resolve(CONTENT_PAGES_DIR_PATH),
+        name: "contentPages"
+      }
+    },
+    {
+      resolve: "gatsby-source-filesystem",
+      options: {
+        path: path.resolve(STATIC_CONTENT_DIR_PATH),
+        name: "content"
+      }
+    },
+    {
+      resolve: "gatsby-source-filesystem",
+      options: {
+        path: path.resolve(MARKETING_SETTINGS_FILE_PATH),
+        name: "marketingSettings"
+      }
+    },
     "gatsby-plugin-image",
     "gatsby-plugin-sharp",
     "gatsby-transformer-sharp",
@@ -118,20 +126,24 @@ module.exports = {
         manualInit: true,
         enableIdentityWidget: false,
         customizeWebpackConfig: (config) => {
-          /**
-           * Forces transpiliation of solution js files; required for theming.
-           * @see https://www.gatsbyjs.com/docs/how-to/custom-configuration/add-custom-webpack-config/#modifying-the-babel-loader
-           */
           const jsTestString = "\\.(js|mjs|jsx|ts|tsx)$";
           const jsTest = new RegExp(jsTestString);
           const jsRule = config.module.rules.find(
             (rule) => String(rule.test) === String(jsTest)
           );
-          const solutionJsTest = new RegExp(`${__dirname}(.*)${jsTestString}`);
-          const jsRuleInclude = jsRule.include;
-          jsRule.include = (modulePath) => {
-            if (solutionJsTest.test(modulePath)) return true;
-            return jsRuleInclude(modulePath);
+          // is it running standalone? or is it running as a module/package?
+          const standalone = __dirname === path.resolve();
+          if (!standalone) {
+            /**
+             * Force transpiliation of solution js files; required for theming.
+             * @see https://www.gatsbyjs.com/docs/how-to/custom-configuration/add-custom-webpack-config/#modifying-the-babel-loader
+             */
+            const solutionJsTest = new RegExp(`${__dirname}(.*)${jsTestString}`);
+            const jsRuleInclude = jsRule.include;
+            jsRule.include = (modulePath) => {
+              if (solutionJsTest.test(modulePath)) return true;
+              return jsRuleInclude(modulePath);
+            }
           }
           config.module.rules = [
             ...config.module.rules.filter(

package/gatsby-node.js

@@ -15,10 +15,11 @@ const myEnv = require("dotenv").config({
 
 const {
   REQUIRED_DIR_PATHS,
-  COLORS_SASS_FILE_PATH,
+  DEFAULT_COLORS_FILE_PATH,
   COLORS_FILE_PATH,
+  COLORS_SASS_FILE_PATH,
   SITE_SETTINGS_FILE_PATH,
-  HOME_SETTINGS_FILE_PATH,
+  LOBBY_PAGE_FILE_PATH,
   SUMMIT_FILE_PATH,
   EVENTS_FILE_PATH,
   EVENTS_IDX_FILE_PATH,
@@ -172,9 +173,9 @@ 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);
-  const colorSettings = fs.existsSync(COLORS_FILE_PATH) ? JSON.parse(fs.readFileSync(COLORS_FILE_PATH)) : {};
-  const homeSettings = fs.existsSync(HOME_SETTINGS_FILE_PATH) ? JSON.parse(fs.readFileSync(HOME_SETTINGS_FILE_PATH)) : {};
+  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)) : {};
 
   const config = {
     client: {
@@ -204,9 +205,9 @@ exports.onPreBootstrap = async () => {
     }
   });
 
-  fs.writeFileSync(COLORS_FILE_PATH, JSON.stringify(colorSettings), "utf8");
   fs.writeFileSync(MARKETING_SETTINGS_FILE_PATH, JSON.stringify(marketingSettings), "utf8");
-  fs.writeFileSync(HOME_SETTINGS_FILE_PATH, JSON.stringify(homeSettings), "utf8");
+  fs.writeFileSync(COLORS_FILE_PATH, JSON.stringify(colorSettings), "utf8");
+  fs.writeFileSync(LOBBY_PAGE_FILE_PATH, JSON.stringify(lobbyPageSettings), "utf8");
 
   let sassColors = "";
   Object.entries(colorSettings).forEach(([key, value]) => sassColors += `$${key} : ${value};\n`);
@@ -342,8 +343,8 @@ exports.createPages = ({ actions, graphql }) => {
       const { id, fields, frontmatter: { templateKey } } = edge.node;
 
       var slug = fields.slug;
-      if (slug.match(/custom-pages/)) {
-        slug = slug.replace("/custom-pages/", "/");
+      if (slug.match(/content-pages/)) {
+        slug = slug.replace("/content-pages/", "/");
       }
 
       const page = {
@@ -371,21 +372,25 @@ exports.onCreateWebpackConfig = ({
   loaders,
   getConfig
 }) => {
-  /**
-   * Forces transpiliation of solution js files; required for theming.
-   * @see https://www.gatsbyjs.com/docs/how-to/custom-configuration/add-custom-webpack-config/#modifying-the-babel-loader
-   */
   const config = getConfig();
   const jsTestString = "\\.(js|mjs|jsx|ts|tsx)$";
   const jsTest = new RegExp(jsTestString);
   const jsRule = config.module.rules.find(
     (rule) => String(rule.test) === String(jsTest)
   );
-  const solutionJsTest = new RegExp(`${__dirname}(.*)${jsTestString}`);
-  const jsRuleInclude = jsRule.include;
-  jsRule.include = (modulePath) => {
-    if (solutionJsTest.test(modulePath)) return true;
-    return jsRuleInclude(modulePath);
+  // is it running standalone? or is it running as a module/package?
+  const standalone = __dirname === path.resolve();
+  if (!standalone) {
+    /**
+     * Force transpiliation of solution js files; required for theming.
+     * @see https://www.gatsbyjs.com/docs/how-to/custom-configuration/add-custom-webpack-config/#modifying-the-babel-loader
+     */
+    const solutionJsTest = new RegExp(`${__dirname}(.*)${jsTestString}`);
+    const jsRuleInclude = jsRule.include;
+    jsRule.include = (modulePath) => {
+      if (solutionJsTest.test(modulePath)) return true;
+      return jsRuleInclude(modulePath);
+    }
   }
   actions.setWebpackConfig({
     module: {
@@ -406,7 +411,7 @@ exports.onCreateWebpackConfig = ({
         buffer: require.resolve("buffer/")
       },
       // allows content and data imports to correctly resolve when theming
-      modules: [path.resolve(__dirname, "src")]
+      modules: [path.resolve("src")]
     },
     // devtool: "source-map",
     plugins: [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "1.0.13",
+  "version": "1.0.19",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -116,7 +116,7 @@
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",
-    "summit-registration-lite": "4.0.9",
+    "summit-registration-lite": "^4.0.11",
     "superagent": "8.0.9",
     "sweetalert2": "^9.17.0",
     "upcoming-events-widget": "2.0.8",

package/src/cms/cms.js

@@ -6,11 +6,11 @@ import "./cms-utils";
 import { Widget as FileRelationWidget } from "@ncwidgets/file-relation";
 import { Widget as IdWidget } from "@ncwidgets/id";
 
-import CustomPagePreview from "./preview-templates/CustomPagePreview";
+import ContentPagePreview from "./preview-templates/ContentPagePreview";
 
 CMS.init({ config });
 
 CMS.registerWidget(IdWidget);
 CMS.registerWidget(FileRelationWidget);
 
-CMS.registerPreviewTemplate("pages", CustomPagePreview);
+CMS.registerPreviewTemplate("contentPages", ContentPagePreview);

package/src/cms/config/collections/configurationsCollection/index.js

@@ -22,4 +22,4 @@ const configurationsCollection = {
   ]
 };
 
-export default configurationsCollection;
+export default configurationsCollection;

package/src/cms/config/collections/configurationsCollection/navbar/index.js

@@ -75,7 +75,6 @@ const navbar = {
           label: "Show only on page",
           name: "pageRestriction",
           multiple: true,
-          required: false,
           default: [PAGE_RESTRICTIONS.any],
           options: getPageRestrictionsOptions()
         })

package/src/cms/config/collections/configurationsCollection/siteSettings/index.js

@@ -84,7 +84,6 @@ const siteSettings = {
             selectField({
               label: "Default Filter Criteria",
               name: "defaultScope",
-              required: false,
               default: 'page',
               options: [
                 selectOption({

package/src/cms/config/collections/contentPagesCollection/index.js

@@ -0,0 +1,65 @@
+import {
+  collectionDefaults
+} from "../../patterns";
+
+import {
+  hiddenField,
+  stringField,
+  selectField,
+  selectOption,
+  markdownField
+} from "../../fields";
+
+import {
+  CONTENT_PAGES_DIR_PATH
+} from "@utils/filePath";
+
+const USER_REQUIREMENTS = {
+  none: "NONE",
+  loggedIn: "LOGGED_IN",
+  hasTicket: "HAS_TICKET"
+};
+
+const getUserRequirementsOptions = () =>
+  Object.entries(USER_REQUIREMENTS).map(([key, value]) => selectOption({ label: value, value: value }));
+
+const contentPagesCollection = {
+  ...collectionDefaults({
+    label: "Content Pages",
+    name: "contentPages",
+    editor: {
+      preview: true
+    }
+  }),
+  folder: CONTENT_PAGES_DIR_PATH,
+  create: true,
+  slug: "{{slug}}",
+  fields: [
+    hiddenField({
+      label: "Template Key",
+      name: "templateKey",
+      default: "content-page"
+    }),
+    stringField({
+      label: "Title",
+      name: "title"
+    }),
+    selectField({
+      label: "User Requirement",
+      name: "userRequirement",
+      multiple: false,
+      default: USER_REQUIREMENTS.none,
+      options: getUserRequirementsOptions()
+    }),
+    markdownField({
+      label: "Body",
+      name: "body"
+    })
+  ]
+};
+
+export {
+  USER_REQUIREMENTS
+};
+
+export default contentPagesCollection;

package/src/cms/config/collections/contentPagesCollection/typeDefs.js

@@ -0,0 +1,8 @@
+
+module.exports = `
+  type MarkdownRemarkFrontmatter {
+    templateKey: String
+    title: String
+    userRequirement: String
+  }
+`;

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

@@ -12,8 +12,8 @@ const defaultPagesCollection = {
   }),
   files: [
     marketingPage,
-    //lobbyPage
+    lobbyPage
   ]
 };
 
-export default defaultPagesCollection;
+export default defaultPagesCollection;

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

@@ -0,0 +1,67 @@
+import {
+  booleanField,
+  numberField,
+  stringField,
+  objectField,
+  imageWithAltField
+} from "../../../fields";
+
+import {
+  LOBBY_PAGE_FILE_PATH
+} from "@utils/filePath";
+
+const lobbyPage = {
+  label: "Lobby Page",
+  name: "lobby-page",
+  file: LOBBY_PAGE_FILE_PATH,
+  fields: [
+    objectField({
+      label: "Hero",
+      name: "hero",
+      fields: [
+        stringField({
+          label: "Title",
+          name: "title"
+        }),
+        stringField({
+          label: "Subtitle",
+          name: "subTitle",
+          required: false
+        }),
+        imageWithAltField({
+          label: "Background Image",
+          name: "background"
+        })
+      ]
+    }),
+    objectField({
+      label: "Center Column",
+      name: "centerColumn",
+      fields: [
+        objectField({
+          label: "Speakers",
+          name: "speakers",
+          fields: [
+            booleanField({
+              label: "Show Today Speakers",
+              name: "showTodaySpeakers",
+              default: false
+            }),
+            booleanField({
+              label: "Show Feature Speakers",
+              name: "showFeatureSpeakers",
+              default: false
+            })
+          ]
+        })
+      ]
+    }),
+    numberField({
+      label: "Live Event Widget - Featured Event",
+      name: "liveNowFeaturedEventId",
+      required: false
+    })
+  ]
+};
+
+export default lobbyPage;

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

@@ -1,3 +1,24 @@
 
 module.exports = `
+  type ImageWithAlt {
+    src: File @fileByRelativePath
+    alt: String
+  }
+  type LobbyPageCenterColumnSpeakersWidget {
+    showTodaySpeakers: Boolean
+    showFeatureSpeakers: Boolean
+  }
+  type LobbyPageCenterColumn {
+    speakers: LobbyPageCenterColumnSpeakersWidget
+  }
+  type LobbyPageHero {
+    title: String
+    subTitle: String
+    background: ImageWithAlt
+  }
+  type LobbyPageJson implements Node {
+    hero: LobbyPageHero
+    centerColumn: LobbyPageCenterColumn
+    liveNowFeaturedEventId: Int
+  }
 `;

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

@@ -36,7 +36,7 @@ const marketingPage = {
         }),
         stringField({
           label: "Subtitle",
-          name: "subtitle",
+          name: "subTitle",
           required: false
         }),
         stringField({

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

@@ -42,7 +42,7 @@ module.exports = `
   }
   type MarketingPageHero {
     title: String
-    subtitle: String
+    subTitle: String
     date: String
     time: String
     dateLayout: Boolean

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

@@ -1,7 +1,9 @@
 const configurationsCollectionTypeDefs = require("./configurationsCollection/typeDefs");
 const defaultPagesCollectionTypeDefs = require("./defaultPagesCollection/typeDefs");
+const contentPagesCollectionTypeDefs = require("./contentPagesCollection/typeDefs");
 
 module.exports = [
   configurationsCollectionTypeDefs,
-  defaultPagesCollectionTypeDefs
+  defaultPagesCollectionTypeDefs,
+  contentPagesCollectionTypeDefs
 ].join("");

package/src/cms/config/fields.js

@@ -111,13 +111,11 @@ export const fileField = ({
 export const selectField = ({
   label = "Select",
   name = "select",
-  required = false,
   options = [],
   ...rest
 } = {}) => ({
   label,
   name,
-  required,
   widget: "select",
   options,
   ...rest
@@ -126,12 +124,10 @@ export const selectField = ({
 export const selectOption = ({
   label = "SelectOption",
   value,
-  required = false,
   ...rest
 } = {}) => ({
   label,
   value,
-  required,
   ...rest
 });
 

package/src/cms/config/index.js

@@ -1,9 +1,11 @@
 import configurationsCollection from "./collections/configurationsCollection";
 import defaultPagesCollection from "./collections/defaultPagesCollection";
+import contentPagesCollection from "./collections/contentPagesCollection";
 
 export const collections = [
   configurationsCollection,
-  defaultPagesCollection
+  defaultPagesCollection,
+  contentPagesCollection
 ];
 
 const config = {
@@ -27,4 +29,4 @@ const config = {
   collections: collections
 };
 
-export default config;
+export default config;

package/src/cms/config/patterns.js

@@ -6,7 +6,8 @@ import {
 
 export const collectionDefaults = ({
   label,
-  name
+  name,
+  editor = { preview: false }
 }) => ({
   label,
   name,
@@ -15,9 +16,7 @@ export const collectionDefaults = ({
    */
   media_folder: "",
   public_folder: "",
-  editor: {
-    preview: false
-  }
+  editor: editor
 });
 
 export const imageWithAltFieldset = ({

package/src/cms/preview-templates/{CustomPagePreview.js → ContentPagePreview.js}

@@ -1,21 +1,21 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { CustomPageTemplate } from '../../templates/custom-page'
+import { ContentPageTemplate } from '../../templates/content-page'
 
-const CustomPagePreview = ({ entry, getAsset, widgetFor }) => {
+const ContentPagePreview = ({ entry, getAsset, widgetFor }) => {
   return (
-    <CustomPageTemplate
+    <ContentPageTemplate
       title={entry.getIn(['data', 'title'])}
       content={widgetFor('body')}
     />
   )
 }
 
-CustomPagePreview.propTypes = {
+ContentPagePreview.propTypes = {
   entry: PropTypes.shape({
     getIn: PropTypes.func,
   }),
   getAsset: PropTypes.func,
 }
 
-export default CustomPagePreview
+export default ContentPagePreview

package/src/components/DisqusComponent.js

@@ -1,7 +1,7 @@
 import React from "react";
 import { connect } from "react-redux";
 import { DiscussionEmbed } from "disqus-react";
-import { withMarketingSettings } from "@utils/useMarketingSettings";
+import { withMarketingSettings, MARKETING_SETTINGS_KEYS } from "@utils/useMarketingSettings";
 import { getEnvVariable, DISQUS_SHORTNAME } from "@utils/envVariables";
 import { getDisqusSSO } from "../actions/user-actions";
 import PropTypes from "prop-types";
@@ -51,8 +51,7 @@ const DisqusComponent = class extends React.Component {
       page,
       sponsor,
       event,
-      getMarketingSettingByKey,
-      MARKETING_SETTINGS_KEYS
+      getMarketingSettingByKey
     } = this.props;
 
     let threadsBy = getMarketingSettingByKey(MARKETING_SETTINGS_KEYS.disqusThreadsBy) ?? "event";
@@ -102,8 +101,7 @@ const DisqusComponent = class extends React.Component {
       page,
       sponsor,
       event,
-      getMarketingSettingByKey,
-      MARKETING_SETTINGS_KEYS
+      getMarketingSettingByKey
     } = this.props;
 
     let suffix = '';

package/src/components/FullSchedule.js

@@ -9,6 +9,7 @@ import { callAction, getShareLink } from "../actions/schedule-actions";
 import Schedule from "full-schedule-widget/dist";
 import "full-schedule-widget/dist/index.css";
 
+import useMarketingSettings, { MARKETING_SETTINGS_KEYS } from "@utils/useMarketingSettings";
 import { SentryFallbackFunction } from "./SentryErrorComponent";
 
 const FullSchedule = ({
@@ -16,7 +17,6 @@ const FullSchedule = ({
   className,
   userProfile,
   colorSettings,
-  homeSettings,
   addToSchedule,
   removeFromSchedule,
   callAction,
@@ -26,13 +26,15 @@ const FullSchedule = ({
   schedKey,
   ...rest
 }) => {
+  const { getSettingByKey } = useMarketingSettings();
+  const defaultImage = getSettingByKey(MARKETING_SETTINGS_KEYS.schedultDefaultImage);
   const componentProps = {
     title: "Schedule",
     summit,
     marketingSettings: colorSettings,
     userProfile,
     withThumbs: false,
-    defaultImage: homeSettings.schedule_default_image,
+    defaultImage: defaultImage,
     showSendEmail: false,
     onStartChat: null,
     shareLink: getShareLink(filters, view),
@@ -57,7 +59,7 @@ const FullSchedule = ({
 
   return (
     <div className={className || "schedule-container"}>
-      <Sentry.ErrorBoundary fallback={SentryFallbackFunction({componentName: 'Full Schedule'})}>
+      <Sentry.ErrorBoundary fallback={SentryFallbackFunction({componentName: "Full Schedule"})}>
         <Schedule {...componentProps} />
       </Sentry.ErrorBoundary>
     </div>
@@ -67,7 +69,6 @@ const FullSchedule = ({
 const mapStateToProps = ({ userState, settingState }) => ({
   userProfile: userState.userProfile,
   colorSettings: settingState.colorSettings,
-  homeSettings: settingState.homeSettings,
   allowClick: settingState?.widgets?.schedule?.allowClick
 });