@openeventkit/event-site 2.0.72 → 2.0.74

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.72",
+  "version": "2.0.74",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -47,15 +47,16 @@
     "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",
@@ -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",
@@ -119,7 +120,7 @@
     "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",

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

@@ -47,22 +47,12 @@ const siteSettings = {
       ]
     }),
     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

@@ -4,10 +4,8 @@ module.exports = `
     title: String
     description: String
   }
-  type Favicons {
-    favicon180: File @fileByRelativePath
-    favicon32: File @fileByRelativePath
-    favicon16: File @fileByRelativePath
+  type Favicon {
+    asset: File @fileByRelativePath
   }
   type Schedule {
     allowClick: Boolean
@@ -24,7 +22,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/RegistrationLiteComponent.js

@@ -188,8 +188,8 @@ const RegistrationLiteComponent = ({
         orderComplete2ndParagraph: orderComplete2ndParagraph,
         orderCompleteButton: orderCompleteButton,
         noAllowedTicketsMessage: noAllowedTicketsMessage,
-        showCompanyInput: showCompanyInput,
-        showCompanyInputDefaultOptions: showCompanyInputDefaultOptions
+        showCompanyInput: showCompanyInput.toString().toLowerCase() == "1",
+        showCompanyInputDefaultOptions: showCompanyInputDefaultOptions.toString().toLowerCase() == "1",
     };
 
     const { registerButton } = marketingPageSettings.hero.buttons;
@@ -246,4 +246,4 @@ export default connect(mapStateToProps, {
     checkOrderData,
     checkRequireExtraQuestionsByAttendee,
     getExtraQuestions,
-})(RegistrationLiteComponent);
+})(RegistrationLiteComponent);

package/src/components/Seo.js

@@ -1,6 +1,5 @@
 import * as React from "react";
 import useSiteMetadata from "@utils/useSiteMetadata";
-import useSiteSettings from "@utils/useSiteSettings";
 import { withPrefix } from "gatsby";
 import { getSrc } from "gatsby-plugin-image";
 
@@ -19,7 +18,6 @@ const Seo = ({
     description: description || defaultDescription,
     url: `${withPrefix(pathname || "/")}`
   }
-  const { favicons } = useSiteSettings();
   return (
     <>
       <title>{seo.title}</title>
@@ -33,27 +31,6 @@ const Seo = ({
       <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)}`}
-      />
       }
       {children}
     </>

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/utils/useSiteSettings.js

@@ -6,29 +6,6 @@ import {
 const siteSettingsQuery = graphql`
   query {
     siteSettingsJson {
-      favicons {
-        favicon16 {
-          childImageSharp {
-            gatsbyImageData (
-              quality: 100
-            )
-          }
-        }
-        favicon32 {
-          childImageSharp {
-            gatsbyImageData (
-              quality: 100
-            )
-          }
-        }
-        favicon180 {
-          childImageSharp {
-            gatsbyImageData (
-              quality: 100
-            )
-          }
-        }
-      }
       widgets {
         chat {
           enabled