@openeventkit/event-site 1.0.7 → 1.0.9

package/gatsby-config.js

@@ -113,13 +113,14 @@ module.exports = {
         customizeWebpackConfig: (config) => {
           /**
            * Forces transpiliation of solution js files; required for theming.
-           * @see https://github.com/gatsbyjs/gatsby/issues/14053#issuecomment-493401486
+           * @see https://www.gatsbyjs.com/docs/how-to/custom-configuration/add-custom-webpack-config/#modifying-the-babel-loader
            */
-          const solutionJsTest = new RegExp(`${__dirname}(?:[^]*)*\.(js|mjs|jsx|ts|tsx)`);
-          const jsTest = /\.(js|mjs|jsx|ts|tsx)$/;
+          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;

package/gatsby-node.js

@@ -37,7 +37,7 @@ const getAccessToken = async (config, scope) => {
   try {
     return await client.getToken({ scope });
   } catch (error) {
-    console.log('Access Token error', error);
+    console.log("Access Token error", error);
   }
 };
 
@@ -54,7 +54,7 @@ const SSR_getMarketingSettings = async (baseUrl, summitId) => {
     .then(response => {
       return response.data.data
     })
-    .catch(e => console.log('ERROR: ', e));
+    .catch(e => console.log("ERROR: ", e));
 };
 
 const SSR_GetRemainingPages = async (endpoint, params, lastPage) => {
@@ -84,7 +84,7 @@ const SSR_getEvents = async (baseUrl, summitId, accessToken) => {
     access_token: accessToken,
     per_page: 50,
     page: 1,
-    expand: 'slides, links, videos, media_uploads, type, track, track.allowed_access_levels, location, location.venue, location.floor, speakers, moderator, sponsors, current_attendance, groups, rsvp_template, tags',
+    expand: "slides, links, videos, media_uploads, type, track, track.allowed_access_levels, location, location.venue, location.floor, speakers, moderator, sponsors, current_attendance, groups, rsvp_template, tags",
   }
 
   return await axios.get(endpoint, { params }).then(async ({data}) => {
@@ -95,7 +95,7 @@ const SSR_getEvents = async (baseUrl, summitId, accessToken) => {
 
     return [...data.data, ...remainingPages];
 
-  }).catch(e => console.log('ERROR: ', e));
+  }).catch(e => console.log("ERROR: ", e));
 };
 
 const SSR_getSpeakers = async (baseUrl, summitId, accessToken, filter = null) => {
@@ -109,7 +109,7 @@ const SSR_getSpeakers = async (baseUrl, summitId, accessToken, filter = null) =>
   const endpoint = `${baseUrl}/api/v1/summits/${summitId}/speakers/on-schedule`;
 
   if (filter) {
-    params['filter[]'] = filter;
+    params["filter[]"] = filter;
   }
 
   return await axios.get(
@@ -123,13 +123,13 @@ const SSR_getSpeakers = async (baseUrl, summitId, accessToken, filter = null) =>
 
       return [ ...data.data, ...remainingPages];
     })
-    .catch(e => console.log('ERROR: ', e));
+    .catch(e => console.log("ERROR: ", e));
 };
 
 const SSR_getSummit = async (baseUrl, summitId) => {
 
   const params = {
-    expand: 'event_types,tracks,track_groups,presentation_levels,locations.rooms,locations.floors,order_extra_questions.values,schedule_settings,schedule_settings.filters,schedule_settings.pre_filters',
+    expand: "event_types,tracks,track_groups,presentation_levels,locations.rooms,locations.floors,order_extra_questions.values,schedule_settings,schedule_settings.filters,schedule_settings.pre_filters",
     t: Date.now()
   };
 
@@ -138,7 +138,7 @@ const SSR_getSummit = async (baseUrl, summitId) => {
     { params }
   )
     .then(({ data }) => data)
-    .catch(e => console.log('ERROR: ', e));
+    .catch(e => console.log("ERROR: ", e));
 };
 
 const SSR_getVoteablePresentations = async (baseUrl, summitId, accessToken) => {
@@ -149,8 +149,8 @@ const SSR_getVoteablePresentations = async (baseUrl, summitId, accessToken) => {
     access_token: accessToken,
     per_page: 50,
     page: 1,
-    filter: 'published==1',
-    expand: 'slides, links, videos, media_uploads, type, track, track.allowed_access_levels, location, location.venue, location.floor, speakers, moderator, sponsors, current_attendance, groups, rsvp_template, tags',
+    filter: "published==1",
+    expand: "slides, links, videos, media_uploads, type, track, track.allowed_access_levels, location, location.venue, location.floor, speakers, moderator, sponsors, current_attendance, groups, rsvp_template, tags",
   };
 
   return await axios.get(endpoint,
@@ -162,12 +162,12 @@ const SSR_getVoteablePresentations = async (baseUrl, summitId, accessToken) => {
 
     return [...data.data, ...remainingPages];
   })
-    .catch(e => console.log('ERROR: ', e));
+    .catch(e => console.log("ERROR: ", e));
 };
 
 exports.onPreBootstrap = async () => {
 
-  console.log('onPreBootstrap');
+  console.log("onPreBootstrap");
 
   const summitId = process.env.GATSBY_SUMMIT_ID;
   const summitApiBaseUrl = process.env.GATSBY_SUMMIT_API_BASE_URL;
@@ -186,7 +186,7 @@ exports.onPreBootstrap = async () => {
       tokenPath: process.env.GATSBY_OAUTH_TOKEN_PATH
     },
     options: {
-      authorizationMethod: 'header'
+      authorizationMethod: "header"
     }
   };
 
@@ -194,7 +194,7 @@ exports.onPreBootstrap = async () => {
 
   // extract colors from marketing settings
   marketingSettings.map(({ key, value }) => {
-    if (key.startsWith('color_')) colorSettings[key] = value;
+    if (key.startsWith("color_")) colorSettings[key] = value;
   });
 
   // create required directories
@@ -215,16 +215,16 @@ exports.onPreBootstrap = async () => {
   // summit
   const summit = await SSR_getSummit(summitApiBaseUrl, summitId);
   fileBuildTimes.push({
-    'file': SUMMIT_FILE_PATH,
-    'build_time': Date.now()
+    "file": SUMMIT_FILE_PATH,
+    "build_time": Date.now()
   });
   fs.writeFileSync(SUMMIT_FILE_PATH, JSON.stringify(summit), "utf8");
 
   // Show Events
   const allEvents = await SSR_getEvents(summitApiBaseUrl, summitId, accessToken);
   fileBuildTimes.push({
-    'file': EVENTS_FILE_PATH,
-    'build_time': Date.now()
+    "file": EVENTS_FILE_PATH,
+    "build_time": Date.now()
   });
   console.log(`allEvents ${allEvents.length}`);
 
@@ -234,8 +234,8 @@ exports.onPreBootstrap = async () => {
   allEvents.forEach((e, index) => allEventsIDX[e.id] = index);
 
   fileBuildTimes.push({
-    'file': EVENTS_IDX_FILE_PATH,
-    'build_time': Date.now()
+    "file": EVENTS_IDX_FILE_PATH,
+    "build_time": Date.now()
   });
   fs.writeFileSync(EVENTS_IDX_FILE_PATH, JSON.stringify(allEventsIDX), "utf8");
 
@@ -244,8 +244,8 @@ exports.onPreBootstrap = async () => {
   const allSpeakers = await SSR_getSpeakers(summitApiBaseUrl, summitId, accessToken);
   console.log(`allSpeakers ${allSpeakers.length}`);
   fileBuildTimes.push({
-    'file': SPEAKERS_FILE_PATH,
-    'build_time': Date.now()
+    "file": SPEAKERS_FILE_PATH,
+    "build_time": Date.now()
   });
 
   fs.writeFileSync(SPEAKERS_FILE_PATH, JSON.stringify(allSpeakers), "utf8");
@@ -253,8 +253,8 @@ exports.onPreBootstrap = async () => {
   const allSpeakersIDX = {};
   allSpeakers.forEach((e, index) => allSpeakersIDX[e.id] = index);
   fileBuildTimes.push({
-    'file': SPEAKERS_IDX_FILE_PATH,
-    'build_time': Date.now()
+    "file": SPEAKERS_IDX_FILE_PATH,
+    "build_time": Date.now()
   });
   fs.writeFileSync(SPEAKERS_IDX_FILE_PATH, JSON.stringify(allSpeakersIDX), "utf8");
 
@@ -262,8 +262,8 @@ exports.onPreBootstrap = async () => {
   const allVoteablePresentations = await SSR_getVoteablePresentations(summitApiBaseUrl, summitId, accessToken);
   console.log(`allVoteablePresentations ${allVoteablePresentations.length}`);
   fileBuildTimes.push({
-    'file':VOTEABLE_PRESENTATIONS_FILE_PATH,
-    'build_time': Date.now()
+    "file":VOTEABLE_PRESENTATIONS_FILE_PATH,
+    "build_time": Date.now()
   });
   fs.writeFileSync(VOTEABLE_PRESENTATIONS_FILE_PATH, JSON.stringify(allVoteablePresentations), "utf8");
 
@@ -302,8 +302,8 @@ exports.createPages = ({ actions, graphql }) => {
   // create a catch all redirect
   if (maintenanceMode.enabled) {
     createRedirect({
-      fromPath: '/*',
-      toPath: '/maintenance/'
+      fromPath: "/*",
+      toPath: "/maintenance/"
     });
   }
 
@@ -343,7 +343,7 @@ exports.createPages = ({ actions, graphql }) => {
 
       var slug = fields.slug;
       if (slug.match(/custom-pages/)) {
-        slug = slug.replace('/custom-pages/', '/');
+        slug = slug.replace("/custom-pages/", "/");
       }
 
       const page = {
@@ -365,8 +365,34 @@ exports.createPages = ({ actions, graphql }) => {
   });
 };
 
-exports.onCreateWebpackConfig = ({ actions, plugins, loaders }) => {
+exports.onCreateWebpackConfig = ({
+  actions,
+  plugins,
+  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);
+  }
   actions.setWebpackConfig({
+    module: {
+      rules: [
+        jsRule
+      ]
+    },
     resolve: {
       /**
        * Webpack removed automatic polyfills for these node APIs in v5,
@@ -375,79 +401,82 @@ exports.onCreateWebpackConfig = ({ actions, plugins, loaders }) => {
        * @see https://viglucci.io/how-to-polyfill-buffer-with-webpack-5
        */
       fallback: {
-        path: require.resolve('path-browserify'),
-        stream: require.resolve('stream-browserify'),
-        buffer: require.resolve('buffer/')
+        path: require.resolve("path-browserify"),
+        stream: require.resolve("stream-browserify"),
+        buffer: require.resolve("buffer/")
       },
       // allows content and data imports to correctly resolve when theming
       modules: [path.resolve(__dirname, "src")]
     },
-    // canvas is a jsdom external dependency
-    externals: ['canvas'],
-    // devtool: 'source-map',
+    // devtool: "source-map",
     plugins: [
       plugins.define({
-        'global.GENTLY': false,
-        'global.BLOB': false
+        "global.GENTLY": false,
+        "global.BLOB": false
       }),
       new webpack.ProvidePlugin({
-        Buffer: ['buffer', 'Buffer'],
+        Buffer: ["buffer", "Buffer"],
+      }),
+      // ignore unused jsdom dependency
+      new webpack.IgnorePlugin({
+        resourceRegExp: /canvas/,
+        contextRegExp: /jsdom$/
       }),
-        // upload source maps only if we have an sentry auth token and we are at production
-        ...('GATSBY_SENTRY_AUTH_TOKEN' in process.env && process.env.NODE_ENV === 'production') ?[
-            new SentryWebpackPlugin({
-          org: process.env.GATSBY_SENTRY_ORG,
-          project: process.env.GATSBY_SENTRY_PROJECT,
-          ignore: ["app-*", "polyfill-*", "framework-*", "webpack-runtime-*","~partytown"],
-          // Specify the directory containing build artifacts
-          include: [
-              {
-                paths: ['src','public','.cache'],
-                urlPrefix: '~/',
-              },
-              {
-                paths: ['node_modules/upcoming-events-widget/dist'],
-                urlPrefix: '~/node_modules/upcoming-events-widget/dist',
-              },
-              {
-                paths: ['node_modules/summit-registration-lite/dist'],
-                urlPrefix: '~/node_modules/summit-registration-lite/dist',
-              },
-              {
-                paths: ['node_modules/full-schedule-widget/dist'],
-                urlPrefix: '~/node_modules/full-schedule-widget//dist',
-              },
-              {
-                paths: ['node_modules/schedule-filter-widget/dist'],
-                urlPrefix: '~/node_modules/schedule-filter-widget/dist',
-              },
-              {
-                paths: ['node_modules/lite-schedule-widget/dist'],
-                urlPrefix: '~/node_modules/lite-schedule-widget/dist',
-              },
-              {
-                paths: ['node_modules/live-event-widget/dist'],
-                urlPrefix: '~/node_modules/live-event-widget/dist',
-              },
-              {
-                paths: ['node_modules/attendee-to-attendee-widget/dist'],
-                urlPrefix: '~/node_modules/attendee-to-attendee-widget/dist',
-              },
-              {
-                paths: ['node_modules/openstack-uicore-foundation/lib'],
-                urlPrefix: '~/node_modules/openstack-uicore-foundation/lib',
-              },
-              {
-                paths: ['node_modules/speakers-widget/dist'],
-                urlPrefix: '~/node_modules/speakers-widget/dist',
-              },
-          ],
-          // Auth tokens can be obtained from https://sentry.io/settings/account/api/auth-tokens/
-          // and needs the `project:releases` and `org:read` scopes
-          authToken: process.env.GATSBY_SENTRY_AUTH_TOKEN,
-          // Optionally uncomment the line below to override automatic release name detection
-          release: process.env.GATSBY_SENTRY_RELEASE,
-        })]:[],
+      // upload source maps only if we have an sentry auth token and we are at production
+      ...("GATSBY_SENTRY_AUTH_TOKEN" in process.env && process.env.NODE_ENV === "production") ?[
+          new SentryWebpackPlugin({
+        org: process.env.GATSBY_SENTRY_ORG,
+        project: process.env.GATSBY_SENTRY_PROJECT,
+        ignore: ["app-*", "polyfill-*", "framework-*", "webpack-runtime-*", "~partytown"],
+        // Specify the directory containing build artifacts
+        include: [
+            {
+              paths: ["src","public",".cache"],
+              urlPrefix: "~/",
+            },
+            {
+              paths: ["node_modules/upcoming-events-widget/dist"],
+              urlPrefix: "~/node_modules/upcoming-events-widget/dist",
+            },
+            {
+              paths: ["node_modules/summit-registration-lite/dist"],
+              urlPrefix: "~/node_modules/summit-registration-lite/dist",
+            },
+            {
+              paths: ["node_modules/full-schedule-widget/dist"],
+              urlPrefix: "~/node_modules/full-schedule-widget//dist",
+            },
+            {
+              paths: ["node_modules/schedule-filter-widget/dist"],
+              urlPrefix: "~/node_modules/schedule-filter-widget/dist",
+            },
+            {
+              paths: ["node_modules/lite-schedule-widget/dist"],
+              urlPrefix: "~/node_modules/lite-schedule-widget/dist",
+            },
+            {
+              paths: ["node_modules/live-event-widget/dist"],
+              urlPrefix: "~/node_modules/live-event-widget/dist",
+            },
+            {
+              paths: ["node_modules/attendee-to-attendee-widget/dist"],
+              urlPrefix: "~/node_modules/attendee-to-attendee-widget/dist",
+            },
+            {
+              paths: ["node_modules/openstack-uicore-foundation/lib"],
+              urlPrefix: "~/node_modules/openstack-uicore-foundation/lib",
+            },
+            {
+              paths: ["node_modules/speakers-widget/dist"],
+              urlPrefix: "~/node_modules/speakers-widget/dist",
+            },
+        ],
+        // Auth tokens can be obtained from https://sentry.io/settings/account/api/auth-tokens/
+        // and needs the `project:releases` and `org:read` scopes
+        authToken: process.env.GATSBY_SENTRY_AUTH_TOKEN,
+        // Optionally uncomment the line below to override automatic release name detection
+        release: process.env.GATSBY_SENTRY_RELEASE,
+      })]:[],
     ]
   });
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -27,7 +27,6 @@
     "browser-tabs-lock": "^1.2.15",
     "buffer": "^6.0.3",
     "bulma": "^0.9.0",
-    "canvas": "^2.6.1",
     "classnames": "^2.3.1",
     "clean-html": "^1.5.0",
     "codemirror": "^5.55.0",
@@ -42,7 +41,7 @@
     "font-awesome": "^4.7.0",
     "formik": "^2.2.9",
     "fs-extra": "^9.0.1",
-    "full-schedule-widget": "2.0.22",
+    "full-schedule-widget": "2.0.26",
     "gatsby": "^5.8.1",
     "gatsby-alias-imports": "^1.0.6",
     "gatsby-plugin-image": "^3.8.0",

package/src/cms/config/index.js

@@ -19,6 +19,10 @@ const config = {
       deleteMedia: "[skip ci] Delete “{{path}}”",
     }
   },
+  // TODO: remove; only for dev purpose
+  local_backend: {
+    url: "http://localhost:8081/api/v1"
+  },
   // It is not required to set `load_config_file` if the `config.yml` file is
   // missing, but will improve performance and avoid a load error.
   load_config_file: false,

package/src/components/LoginButton.js

@@ -23,6 +23,7 @@ const LoginButton = ({
     allowsNativeAuth,
     allowsOtpAuth,
     location,
+    children,
 }) => {
     const [isActive, setIsActive] = useState(false);
     const [initialEmailValue, setInitialEmailValue] = useState('');
@@ -58,13 +59,13 @@ const LoginButton = ({
         doLogin(getBackURL(), provider, null, initialEmailValue || null);
     };
 
-    const closeLoginPopup = () => {
+    const handleClosePopup = () => {
         setIsActive(false);
         setOtpLogin(false);
         setOtpError(false);
     }
 
-    const openLoginPopup = () => {
+    const handleOpenPopup = () => {
         setIsActive(true);
         setOtpLogin(false);
         setOtpError(false);
@@ -130,10 +131,14 @@ const LoginButton = ({
 
     return (
         <div className={styles.loginButtonWrapper}>
-            <button className={`${styles.button} button is-large`} onClick={() => openLoginPopup()}>
-                <i className={`fa fa-2x fa-edit icon is-large`} />
-                <b>{loginButton.text}</b>
-            </button>
+            {children ? 
+                React.cloneElement(children, { onClick: handleOpenPopup })
+                :
+                <button className={`${styles.button} button is-large`} onClick={handleOpenPopup}>
+                    <i className={`fa fa-2x fa-edit icon is-large`} />
+                    <b>{loginButton.text}</b>
+                </button>
+            }
             {isActive &&
                 <div id={`${styles.modal}`} className="modal is-active">
                     <div className="modal-background"></div>
@@ -142,7 +147,7 @@ const LoginButton = ({
                             <div className={styles.innerWrapper}>
                                 <div className={styles.title}>
                                     <span>{summit.name}</span>
-                                    <i className="fa fa-close" aria-label="close" onClick={() => closeLoginPopup()}></i>
+                                    <i className="fa fa-close" aria-label="close" onClick={handleClosePopup}></i>
                                 </div>
                                 {!otpLogin && <LoginComponent {...loginComponentProps} />}
                                 {otpLogin && <PasswordlessLoginComponent {...passwordlessLoginProps} />}

package/src/components/RegistrationLiteComponent.js

@@ -42,7 +42,8 @@ const RegistrationLiteComponent = ({
    allowsNativeAuth,
    allowsOtpAuth,
    checkRequireExtraQuestionsByAttendee,
-   getExtraQuestions
+   getExtraQuestions,
+   children,
 }) => {
     const [isActive, setIsActive] = useState(false);
     const [initialEmailValue, setInitialEmailValue] = useState('');
@@ -64,6 +65,10 @@ const RegistrationLiteComponent = ({
         return URI.encode(backUrl);
     };
 
+    const handleOpenPopup = () => {
+        setIsActive(true);
+    }
+
     const onClickLogin = (provider) => {
         doLogin(getBackURL(), provider);
     };
@@ -174,12 +179,15 @@ const RegistrationLiteComponent = ({
 
     return (
         <>
-            {registerButton.display &&
-                <button className={`${styles.button} button is-large`} disabled={isActive}
-                        onClick={() => setIsActive(true)}>
-                    <i className={`fa fa-2x fa-edit icon is-large`}/>
-                    <b>{registerButton.text}</b>
-                </button>
+            {children ? 
+                React.cloneElement(children, { onClick: handleOpenPopup })
+                :
+                registerButton.display &&
+                    <button className={`${styles.button} button is-large`} disabled={isActive}
+                            onClick={handleOpenPopup}>
+                        <i className={`fa fa-2x fa-edit icon is-large`}/>
+                        <b>{registerButton.text}</b>
+                    </button>
             }
             <div>
                 <Sentry.ErrorBoundary fallback={SentryFallbackFunction({componentName: 'Registration Lite'})}>

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

@@ -1,17 +1 @@
-{
-  "widgets": {
-    "chat": {
-      "showQA": false,
-      "showHelp": false,
-      "defaultScope": "page"
-    },
-    "schedule": {
-      "allowClick": true
-    }
-  },
-  "favicons": {
-    "favicon180": "/img/favicon.png",
-    "favicon32": "/img/favicon.png",
-    "favicon16": "/img/favicon.png"
-  }
-}
+{"widgets":{"chat":{"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":1683663346252},{"file":"src/data/events.json","build_time":1683663351130},{"file":"src/data/events.idx.json","build_time":1683663351136},{"file":"src/data/speakers.json","build_time":1683663352187},{"file":"src/data/speakers.idx.json","build_time":1683663352188},{"file":"src/data/voteable-presentations.json","build_time":1683663352546}],"lastBuild":1683663352546}