@openeventkit/event-site 2.0.73 → 2.0.75

package/gatsby-config.js

@@ -8,6 +8,7 @@ const {
   STATIC_CONTENT_DIR_PATH,
   CONTENT_PAGES_DIR_PATH,
   SITE_SETTINGS_FILE_PATH,
+  SITE_SETTINGS_DIR_PATH,
   MARKETING_SETTINGS_FILE_PATH
 } = require("./src/utils/filePath");
 
@@ -19,12 +20,32 @@ catch (e) {
   console.log("Falling back to default site settings.")
 }
 
+const title = siteSettings?.siteMetadata?.title || process.env.GATSBY_METADATA_TITLE || "Event Site";
+const description = siteSettings?.siteMetadata?.description || process.env.GATSBY_METADATA_DESCRIPTION || "Event Site";
+const manifestFaviconSettings = siteSettings?.favicon?.asset ? {
+  icon: `${SITE_SETTINGS_DIR_PATH}/${siteSettings.favicon.asset}`,
+  include_favicon: true
+} : {};
+
 module.exports = {
   siteMetadata: {
-    title: `${siteSettings?.siteMetadata?.title || process.env.GATSBY_METADATA_TITLE || 'Event Site'}`,
-    description: `${siteSettings?.siteMetadata?.description || process.env.GATSBY_METADATA_DESCRIPTION || 'Event Site'}`
+    title: title,
+    description: description
   },
   plugins: [
+    {
+      resolve: "gatsby-plugin-manifest",
+      options: {
+        name: title,
+        short_name: title,
+        description: description,
+        start_url: "/",
+        // Enables "Add to Homescreen" prompt and disables browser UI (including back button)
+        // see https://developers.google.com/web/fundamentals/web-app-manifest/#display
+        display: "minimal-ui",
+        ...manifestFaviconSettings
+      }
+    },
     {
       resolve: "gatsby-alias-imports",
       options: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.73",
+  "version": "2.0.75",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -43,19 +43,20 @@
     "font-awesome": "^4.7.0",
     "formik": "^2.2.9",
     "fs-extra": "^9.0.1",
-    "full-schedule-widget": "3.0.2",
+    "full-schedule-widget": "3.0.3",
     "gatsby": "^5.8.1",
     "gatsby-alias-imports": "^1.0.6",
     "gatsby-plugin-image": "^3.8.0",
+    "gatsby-plugin-manifest": "^5.12.3",
     "gatsby-plugin-netlify": "^5.1.0",
     "gatsby-plugin-netlify-cms": "^7.8.0",
     "gatsby-plugin-sass": "^6.8.0",
-    "gatsby-plugin-sharp": "^5.8.1",
+    "gatsby-plugin-sharp": "^5.12.3",
     "gatsby-remark-images": "^7.8.0",
     "gatsby-source-filesystem": "^5.8.0",
     "gatsby-transformer-json": "^5.8.0",
     "gatsby-transformer-remark": "^6.8.0",
-    "gatsby-transformer-sharp": "^5.8.0",
+    "gatsby-transformer-sharp": "^5.12.3",
     "history": "^4.10.1",
     "i18n-react": "^0.6.4",
     "i18next": "^21.8.3",
@@ -66,8 +67,8 @@
     "immutability-helper": "2.9.1",
     "immutable": "^3.7.6",
     "jsdom": "^16.2.2",
-    "lite-schedule-widget": "3.0.2",
-    "live-event-widget": "4.0.1",
+    "lite-schedule-widget": "3.0.3",
+    "live-event-widget": "4.0.2",
     "lodash": "^4.17.19",
     "lz-string": "^1.4.4",
     "markdown-it": "^12.0.0",
@@ -77,7 +78,7 @@
     "netlify-cms-app": "^2.15.72",
     "netlify-cms-lib-widgets": "^1.8.0",
     "node-sass-utils": "^1.1.3",
-    "openstack-uicore-foundation": "4.1.54",
+    "openstack-uicore-foundation": "4.1.55",
     "path-browserify": "^1.0.1",
     "prop-types": "^15.6.0",
     "react": "^18.2.0",
@@ -115,14 +116,14 @@
     "slick-carousel": "^1.8.1",
     "smoothscroll-polyfill": "^0.4.4",
     "socket.io-client": "^4.5.2",
-    "speakers-widget": "4.0.0",
+    "speakers-widget": "4.0.1",
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",
-    "summit-registration-lite": "5.0.12",
+    "summit-registration-lite": "5.0.13",
     "superagent": "8.0.9",
     "sweetalert2": "^9.17.0",
-    "upcoming-events-widget": "3.0.4",
+    "upcoming-events-widget": "3.0.5",
     "urijs": "^1.19.2",
     "use-fit-text": "^2.4.0",
     "uuid": "^7.0.0",

package/src/actions/fetch-entities-actions.js

@@ -15,7 +15,7 @@ export const fetchEventById = async (summitId, eventId, accessToken = null) => {
     }
 
     apiUrl.addQuery('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');
-
+    apiUrl.addQuery('evict_cache', 1);
     return fetch(apiUrl.toString(), {
         method: 'GET'
     }).then(async (response) => {
@@ -45,6 +45,8 @@ export const fetchLocationById = async(summitId, locationId, expand, accessToken
     if(expand)
         apiUrl.addQuery('expand', expand);
 
+    apiUrl.addQuery('evict_cache', 1);
+
     return fetch(apiUrl.toString(), {
         method: 'GET'
     }).then(async (response) => {
@@ -67,10 +69,12 @@ export const fetchSpeakerById = async(summitId, speakerId, accessToken = null) =
     let apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/public/v1/summits/${summitId}/speakers/${speakerId}`);
 
     if(accessToken){
-        apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/v1/summits/${summitId}/speaker/${speakerId}`);
+        apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/v1/summits/${summitId}/speakers/${speakerId}`);
         apiUrl.addQuery('access_token', accessToken);
     }
 
+    apiUrl.addQuery('evict_cache', 1);
+
     return fetch(apiUrl.toString(), {
         method: 'GET'
     }).then(async (response) => {
@@ -92,6 +96,7 @@ export const fetchSummitById =  async(summitId, accessToken = null) => {
 
     apiUrl.addQuery('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');
     apiUrl.addQuery('t', Date.now());
+    apiUrl.addQuery('evict_cache', 1);
 
     return fetch(apiUrl.toString(), {
         method: 'GET'
@@ -101,4 +106,4 @@ export const fetchSummitById =  async(summitId, accessToken = null) => {
         }
         return null;
     });
-}
+}

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

@@ -35,34 +35,29 @@ const siteSettings = {
       name: "siteMetadata",
       fields: [
         stringField({
-          label: "title",
+          label: "Title",
           name: "title",
           required: false
         }),
         textField({
-          label: "description",
+          label: "Description",
           name: "description",
           required: false
+        }),
+        imageField({
+          label: "Image",
+          name: "image",
+          required: false
         })
       ]
     }),
     objectField({
-      label: "Favicons",
-      name: "favicons",
+      label: "Favicon",
+      name: "favicon",
       fields: [
         imageField({
-          label: "Favicon 180x180",
-          name: "favicon180",
-          required: false
-        }),
-        imageField({
-          label: "Favicon 32x32",
-          name: "favicon32",
-          required: false
-        }),
-        imageField({
-          label: "Favicon 16x16",
-          name: "favicon16",
+          label: "Image for favicon generation (squared, at least 512x512)",
+          name: "asset",
           required: false
         })
       ]

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

@@ -3,11 +3,10 @@ module.exports = `
   type SiteMetadata {
     title: String
     description: String
+    image: File @fileByRelativePath
   }
-  type Favicons {
-    favicon180: File @fileByRelativePath
-    favicon32: File @fileByRelativePath
-    favicon16: File @fileByRelativePath
+  type Favicon {
+    asset: File @fileByRelativePath
   }
   type Schedule {
     allowClick: Boolean
@@ -24,7 +23,7 @@ module.exports = `
   }
   type SiteSettingsJson implements Node {
     siteMetadata: SiteMetadata
-    favicons: Favicons
+    favicon: Favicon
     widgets: Widgets
   }
 `;

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

@@ -13,6 +13,10 @@ import {
   markdownField
 } from "../../../fields";
 
+import {
+  MARKETING_PAGE_FILE_PATH
+} from "@utils/filePath";
+
 const markdownFieldButtons = [
   "bold",
   "italic",
@@ -26,10 +30,6 @@ const markdownFieldButtons = [
   "numbered-list"
 ];
 
-import {
-  MARKETING_PAGE_FILE_PATH
-} from "@utils/filePath";
-
 const marketingPage = {
   label: "Marketing Page",
   name: "marketing-page",

package/src/components/Seo.js

@@ -1,63 +1,54 @@
 import * as React from "react";
-import useSiteMetadata from "@utils/useSiteMetadata";
+import PropTypes from "prop-types";
 import useSiteSettings from "@utils/useSiteSettings";
-import { withPrefix } from "gatsby";
+import { Helmet } from "react-helmet";
 import { getSrc } from "gatsby-plugin-image";
+import { getUrl } from "@utils/urlFormating";
 
-const Seo = ({
-  title,
-  description,
-  pathname,
-  children
-}) => {
+const Seo = ({ title, description, location, children }) => {
   const {
-    title: defaultTitle,
-    description: defaultDescription,
-  } = useSiteMetadata();
+    siteMetadata: {
+      title: siteTitle,
+      description: defaultDescription,
+      image
+    }
+  } = useSiteSettings();
+  const host = typeof window !== "undefined" ? window.location.host : null;
+  const scheme = typeof window !== "undefined" ? window.location.protocol.replace(":", "") : "https";
+  const { pathname } = location;
   const seo = {
-    title: title ? `${defaultTitle} - ${title}` : defaultTitle,
+    title: title ? `${siteTitle} - ${title}` : siteTitle,
     description: description || defaultDescription,
-    url: `${withPrefix(pathname || "/")}`
-  }
-  const { favicons } = useSiteSettings();
+    url: getUrl(scheme, host, pathname),
+    image: host && image ? getUrl(scheme, host, getSrc(image)) : null,
+  };
   return (
-    <>
-      <title>{seo.title}</title>
-      <meta name="description" content={seo.description} />
-      <meta name="twitter:card" content="summary" />
-      <meta name="twitter:title" content={seo.title} />
-      <meta name="twitter:url" content={seo.url} />
-      <meta name="twitter:description" content={seo.description} />
-      <meta name="description" content={seo.description} />
-      <meta name="theme-color" content="#fff" />
-      <meta property="og:type" content="business.business" />
-      <meta property="og:title" content={seo.title} />
-      <meta property="og:url" content={seo.url} />
-      {favicons?.favicon180 &&
-      <link
-        rel="apple-touch-icon"
-        sizes="180x180"
-        href={`${getSrc(favicons.favicon180)}`}
-      />
-      }
-      {favicons?.favicon32 &&
-      <link
-        rel="icon"
-        sizes="32x32"
-        href={`${getSrc(favicons.favicon32)}`}
-      />
-      }
-      {favicons?.favicon16 &&
-      <link
-        rel="icon"
-        type="image/png"
-        sizes="16x16"
-        href={`${getSrc(favicons.favicon16)}`}
-      />
-      }
+    <Helmet>
+      {seo.title && <title>{seo.title}</title>}
+      {seo.description && <meta name="description" content={seo.description} />}
+      {seo.url && <meta property="og:url" content={seo.url} />}
+      <meta property="og:type" content="website" />
+      {seo.title && <meta property="og:title" content={seo.title} />}
+      {seo.description && <meta property="og:description" content={seo.description} />}
+      {seo.image && <meta property="og:image" content={seo.image} />}
+      {seo.image && <meta name="twitter:card" content="summary_large_image" />}
+      {host && <meta property="twitter:domain" content={host} />}
+      {seo.url && <meta property="twitter:url" content={seo.url} />}
+      {seo.title && <meta name="twitter:title" content={seo.title} />}
+      {seo.description && <meta name="twitter:description" content={seo.description} />}
+      {seo.image && <meta name="twitter:image" content={seo.image} />}
       {children}
-    </>
-  )
+    </Helmet>
+  );
+};
+
+Seo.propTypes = {
+  title: PropTypes.string,
+  description: PropTypes.string,
+  location: PropTypes.shape({
+    pathname: PropTypes.string.isRequired
+  }).isRequired,
+  children: PropTypes.node
 };
 
 export default Seo;

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

@@ -10,44 +10,7 @@
       "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"
+  "favicon": {
+    "asset": "icon.png"
   }
 }

package/src/pages/a/[...].js

@@ -91,6 +91,6 @@ export const Head = ({
 }) => (
   <Seo
     title={titleFromPathname(location.pathname)}
-    pathname={location.pathname}
+    location={location}
   />
 );

package/src/pages/a/index.js

@@ -74,6 +74,6 @@ export const Head = ({
 }) => (
   <Seo
     title={"Lobby"}
-    pathname={location.pathname}
+    location={location}
   />
 );

package/src/pages/a/sponsors.js

@@ -71,6 +71,6 @@ export const Head = ({
 }) => (
   <Seo
     title={"Expo Hall"}
-    pathname={location.pathname}
+    location={location}
   />
 );

package/src/pages/index.js

@@ -139,4 +139,7 @@ const mapStateToProps = ({
 export default connect(mapStateToProps, {
 })(withFeedsWorker(withRealTimeUpdates(MarketingPage)));
 
-export const Head = () => <Seo />;
+export const Head = ({
+  location
+}) => <Seo location={location} />;
+

package/src/templates/content-page.js

@@ -87,6 +87,6 @@ export const Head = ({
 }) => (
   <Seo
     title={titleFromPathname(location.pathname)}
-    pathname={location.pathname}
+    location={location}
   />
 );

package/src/templates/event-page.js

@@ -191,8 +191,8 @@ export const EventPageTemplate = class extends React.Component {
                 </div>
               )}
               <UpcomingEventsComponent
-                key={`event_page_upcomming_event_${lastDataSync}`}
                 id={`event_page_upcomming_event_${lastDataSync}`}
+                lastDataSync={lastDataSync}
                 trackId={event.track ? event.track.id : null}
                 eventCount={3}
                 title={

package/src/templates/lobby-page.js

@@ -76,7 +76,7 @@ export const LobbyPageTemplate = class extends React.Component {
               <h2><b>Today</b></h2>
               <LiveEventWidgetComponent
                 id={`lobby_page_live_event_${lastDataSync}`}
-                key={`lobby_page_live_event_${lastDataSync}`}
+                lastDataSync={lastDataSync}
                 onlyPresentations={true}
                 featuredEventId={liveNowFeaturedEventId}
                 onEventClick={(ev) => this.onEventChange(ev)}
@@ -91,7 +91,7 @@ export const LobbyPageTemplate = class extends React.Component {
               />
               <UpcomingEventsComponent
                 id={`lobby_page_upcomming_events_${lastDataSync}`}
-                key={`lobby_page_upcomming_events_${lastDataSync}`}
+                lastDataSync={lastDataSync}
                 title="Up Next"
                 eventCount={4}
                 renderEventLink={(event) => <Link to={`/a/event/${event.id}`}>{event.title}</Link>}
@@ -102,7 +102,7 @@ export const LobbyPageTemplate = class extends React.Component {
                 <SpeakersWidgetComponent
                   title="Today's Speakers"
                   id={`home_page_today_speakers_${lastDataSync}`}
-                  key={`home_page_today_speakers_${lastDataSync}`}
+                  lastDataSync={lastDataSync}
                   bigPics={true}
                 />
               }
@@ -110,7 +110,7 @@ export const LobbyPageTemplate = class extends React.Component {
                 <SpeakersWidgetComponent
                   title="Featured Speakers"
                   id={`lobby_page_featured_speakers_${lastDataSync}`}
-                  key={`lobby_page_featured_speakers_${lastDataSync}`}
+                  lastDataSync={lastDataSync}
                   bigPics={false}
                   featured={true}
                   date={null}
@@ -124,7 +124,7 @@ export const LobbyPageTemplate = class extends React.Component {
               <AttendeesWidget user={user}/>
               <LiteScheduleComponent
                 id={`lobby_page_lite_schedule_${lastDataSync}`}
-                key={`lobby_page_lite_schedule_${lastDataSync}`}
+                lastDataSync={lastDataSync}
                 onEventClick={(ev) => this.onEventChange(ev)}
                 onViewAllEventsClick={() => this.onViewAllMyEventsClick()}
                 title="My Schedule"

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

@@ -70,7 +70,7 @@ const MarketingPageTemplate = ({
               <h2><b>{marketingPageJson.leftColumn.schedule.title}</b></h2>
               <LiteScheduleComponent
                 {...scheduleProps}
-                key={`marketing_lite_schedule_${lastDataSync}`}
+                lastDataSync={lastDataSync}
                 id={`marketing_lite_schedule_${lastDataSync}`}
                 page="marketing-site"
                 showAllEvents={true}

package/src/templates/schedule-page.js

@@ -91,9 +91,7 @@ const SchedulePage = ({ summit, scheduleState, summitPhase, isLoggedUser, locati
       <div className={`container ${styles.container}`}>
         <div className={`${styles.wrapper} ${showFilters ? styles.showFilters : ""}`}>
           <div className={styles.scheduleWrapper}>
-            <FullSchedule {...schedProps}
-              key={`fullschedule_${lastDataSync}`}
-            />
+            <FullSchedule {...schedProps} lastDataSync={lastDataSync} />
           </div>
           <div ref={filtersWrapperRef} className={styles.filterWrapper}>
             <ScheduleFilters {...filterProps} />

package/src/templates/sponsor-page.js

@@ -21,7 +21,7 @@ import { getEnvVariable, LIVE_EVENT_THUMBNAIL_GIF_CAPTURE_STARTS } from "../util
 import styles from '../styles/sponsor-page.module.scss'
 import SponsorNavigation from '../components/SponsorNavigation'
 
-const SponsorPageTemplate = ({ sponsorId, sponsors, scanBadge, eventId }) => {
+const SponsorPageTemplate = ({ sponsorId, sponsors, scanBadge, eventId, lastDataSync }) => {
 
   const [sponsorLoading, setSponsorLoading] = useState(true);
   const [sponsor, setSponsor] = useState(null)
@@ -104,6 +104,7 @@ const SponsorPageTemplate = ({ sponsorId, sponsors, scanBadge, eventId }) => {
             }
             {liveEventWidget &&
               <LiveEventWidgetComponent
+                lastDataSync={lastDataSync}
                 onEventClick={(ev) => onEventChange(ev)}
                 onlyPresentations={true}
                 sponsorId={sponsor?.company.id}
@@ -115,6 +116,7 @@ const SponsorPageTemplate = ({ sponsorId, sponsors, scanBadge, eventId }) => {
             {scheduleWidget &&
               <UpcomingEventsComponent
                 eventCount={3}
+                lastDataSync={lastDataSync}
                 sponsorId={sponsor?.company.id}
                 renderEventLink={(event) => <Link to={`/a/event/${event.id}`}>{event.title}</Link>}
                 allEventsLink={<Link to={`/a/schedule#company=${encodeURIComponent(sponsor?.name)}`}>View all <span className="sr-only">events</span></Link>}
@@ -184,10 +186,11 @@ SponsorPageTemplate.propTypes = {
   sponsorId: PropTypes.string,
 };
 
-const mapStateToProps = ({ userState, sponsorState, summitState }) => ({
+const mapStateToProps = ({ userState, sponsorState, summitState, settingState }) => ({
   user: userState,
   sponsors: sponsorState.sponsors,
-  summit: summitState.summit
+  summit: summitState.summit,
+  lastDataSync: settingState.lastDataSync
 });
 
 export default connect(mapStateToProps, { scanBadge })(SponsorPage);

package/src/utils/urlFormating.js

@@ -1,3 +1,10 @@
+
+export const getUrl = (scheme, host, pathname) => {
+  if (!host) return null;
+  const domain = `${scheme}://${host}`;
+  return `${domain}${pathname ?? "/"}`;
+};
+
 export const getSponsorURL = (id, name) => {  
   let formattedName = name.toLowerCase().replace(/\s/g, '-');
   return `${id}-${formattedName}`;

package/src/utils/useSiteSettings.js

@@ -6,22 +6,10 @@ import {
 const siteSettingsQuery = graphql`
   query {
     siteSettingsJson {
-      favicons {
-        favicon16 {
-          childImageSharp {
-            gatsbyImageData (
-              quality: 100
-            )
-          }
-        }
-        favicon32 {
-          childImageSharp {
-            gatsbyImageData (
-              quality: 100
-            )
-          }
-        }
-        favicon180 {
+      siteMetadata {
+        title,
+        description,
+        image {
           childImageSharp {
             gatsbyImageData (
               quality: 100