@openeventkit/event-site 2.0.128-beta.5 → 2.0.128

package/env.template

@@ -34,3 +34,4 @@ GATSBY_CMS_BACKEND_REPO=
 GATSBY_CMS_BACKEND_BRANCH=
 GATSBY_SITE_URL=
 GATSBY_GOOGLE_TAGMANAGER_ID=
+GATSBY_HASH_SANITIZE_TOKENS=

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.128-beta.5",
+  "version": "2.0.128",
   "author": "Tipit LLC",
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.5.2",

package/src/actions/clock-actions.js

@@ -1,24 +1,25 @@
-import { createAction } from 'openstack-uicore-foundation/lib/utils/actions';
+import { createAction } from "openstack-uicore-foundation/lib/utils/actions";
+import { PHASES, getSummitPhase, getEventPhase } from "@utils/phasesUtils";
+import { updateVotingPeriodsPhase } from "../actions/presentation-actions";
+import { sanitizeHash } from "../actions/security-actions";
 
-import { PHASES, getSummitPhase, getEventPhase } from '../utils/phasesUtils';
-
-import { updateVotingPeriodsPhase } from '../actions/presentation-actions';
-
-export const SUMMIT_PHASE_AFTER = 'SUMMIT_PHASE_AFTER';
-export const SUMMIT_PHASE_DURING = 'SUMMIT_PHASE_DURING';
-export const SUMMIT_PHASE_BEFORE = 'SUMMIT_PHASE_BEFORE';
-export const EVENT_PHASE_BEFORE = 'EVENT_PHASE_BEFORE';
-export const EVENT_PHASE_DURING = 'EVENT_PHASE_DURING';
-export const EVENT_PHASE_AFTER = 'EVENT_PHASE_AFTER';
-export const EVENT_PHASE_ADD = 'EVENT_PHASE_ADD';
-export const UPDATE_CLOCK = 'UPDATE_CLOCK';
+export const SUMMIT_PHASE_AFTER = "SUMMIT_PHASE_AFTER";
+export const SUMMIT_PHASE_DURING = "SUMMIT_PHASE_DURING";
+export const SUMMIT_PHASE_BEFORE = "SUMMIT_PHASE_BEFORE";
+export const EVENT_PHASE_BEFORE = "EVENT_PHASE_BEFORE";
+export const EVENT_PHASE_DURING = "EVENT_PHASE_DURING";
+export const EVENT_PHASE_AFTER = "EVENT_PHASE_AFTER";
+export const EVENT_PHASE_ADD = "EVENT_PHASE_ADD";
+export const UPDATE_CLOCK = "UPDATE_CLOCK";
 
 export const updateClock = (timestamp) => (dispatch) => {
-
   dispatch(createAction(UPDATE_CLOCK)({ timestamp }));
+
   dispatch(updateSummitPhase());
   dispatch(updateEventsPhase());
   dispatch(updateVotingPeriodsPhase());
+
+  dispatch(sanitizeHash());
 };
 
 export const updateSummitPhase = () => (dispatch, getState) => {
@@ -89,5 +90,5 @@ export const updateEventsPhase = () => (dispatch, getState) => {
           break;
       }
     }
-  })
-};
+  });
+};

package/src/actions/security-actions.js

@@ -0,0 +1,32 @@
+import { getEnvVariable, HASH_SANITIZE_TOKENS } from "@utils/envVariables";
+
+export const sanitizeHash = () => (dispatch, getState) => {
+  const { userState: { isAuthorized } } = getState();
+
+  if (!isAuthorized) {
+    const tokens = getEnvVariable(HASH_SANITIZE_TOKENS)?.split(",") ?? [];
+
+    if (tokens.length > 0) {
+      const url = new URL(window.location.href);
+      let fragment = url.hash;
+      let shouldUpdate = false;
+
+      tokens.forEach(token => {
+        if (fragment.includes(`${token}=`)) {
+          shouldUpdate = true;
+          fragment = fragment
+            .split("&")
+            .filter(fragmentToken => !fragmentToken.includes(`${token}=`))
+            .join("&")
+            .replace("#&", "#")
+            .replace("#?", "#")
+            .replace("#", "");
+        }
+      });
+
+      if (shouldUpdate) {
+        window.history.replaceState({}, "", `${url.pathname}${fragment ? `#${fragment}` : ""}`);
+      }
+    }
+  }
+};

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

@@ -2,13 +2,40 @@ import {
   booleanField,
   stringField,
   selectField,
+  selectOption,
   listField
 } from "../../../fields";
 
-import { NAVBAR_FILE_PATH } from "@utils/filePath";
-import { USER_REQUIREMENTS, PAGE_RESTRICTIONS } from "@utils/pageAccessConstants";
+import {
+  NAVBAR_FILE_PATH
+} from "@utils/filePath";
+
+const PAGE_RESTRICTIONS = {
+  any: "ANY",
+  activity: "ACTIVITY",
+  marketing: "MARKETING",
+  lobby: "LOBBY",
+  show: "SHOW",
+  customPage: "CUSTOM_PAGE"
+};
 
-import { mapObjectToSelectOptions } from "../../../utils";
+const getPageRestrictionsOptions = () =>
+  Object.entries(PAGE_RESTRICTIONS).map(([key, value]) => selectOption({ label: value, value: value }));
+
+/*
+- file: "src/content/navbar.json"
+  label: "Navbar"
+  name: "navbar"
+  fields:
+    - {label: "Navbar", name: "items", widget: list, fields: [
+        {label: "Title", name: "title", widget: string},
+        {label: "Link", name: "link", widget: string},
+        {label: "Display?", name: "display", widget: boolean, required: false},
+        {label: "Requires Auth?", name: "requiresAuth", widget: boolean, required: false, default: false},
+        {label: "Show only at Show Time?", name: "showOnlyAtShowTime", widget: boolean, required: false, default: false},
+        {label: "Show only on page", name: "pageRestriction", widget: select, multiple: true, default: ["ANY"], options: ["ANY", "MARKETING", "LOBBY", "ACTIVITY", "SHOW", "CUSTOM_PAGE"]},
+      ]}
+*/
 
 const navbar = {
   label: "Navbar",
@@ -32,29 +59,32 @@ const navbar = {
           name: "display",
           required: false
         }),
-        selectField({
-          label: "User Requirement",
-          name: "userRequirement",
-          multiple: false,
-          default: USER_REQUIREMENTS.none,
-          options: mapObjectToSelectOptions(USER_REQUIREMENTS)
-        }),
-        selectField({
-          label: "Show only on Page",
-          name: "pageRestriction",
-          multiple: true,
-          default: [PAGE_RESTRICTIONS.any],
-          options: mapObjectToSelectOptions(PAGE_RESTRICTIONS)
+        booleanField({
+          label: "Requires Auth?",
+          name: "requiresAuth",
+          required: false,
+          default: false
         }),
         booleanField({
           label: "Show only at Show Time?",
           name: "showOnlyAtShowTime",
           required: false,
           default: false
+        }),
+        selectField({
+          label: "Show only on page",
+          name: "pageRestriction",
+          multiple: true,
+          default: [PAGE_RESTRICTIONS.any],
+          options: getPageRestrictionsOptions()
         })
       ]
     })
   ]
 };
 
+export {
+  PAGE_RESTRICTIONS
+};
+
 export default navbar;

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

@@ -4,9 +4,8 @@ module.exports = `
     title: String
     link: String
     display: Boolean
-    userRequirement: String
+    requiresAuth: Boolean
     pageRestriction: [String]
-    showOnlyAtShowTime: Boolean
   }
 
   type NavbarJson implements Node {

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

@@ -21,8 +21,6 @@ import {
   IDP_BASE_URL
 } from "@utils/envVariables";
 
-import { mapObjectToSelectOptions } from "../../../utils";
-
 const FONT_FORMATS = {
   truetype: "ttf",
   opentype: "otf",
@@ -31,6 +29,9 @@ const FONT_FORMATS = {
   eot: "eot"
 };
 
+const getFontFormatOptions = () =>
+  Object.entries(FONT_FORMATS).map(([key, value]) => selectOption({ label: value, value: value }));
+
 const siteSettings = {
   label: "Site Settings",
   name: "site-settings",
@@ -150,7 +151,7 @@ const siteSettings = {
               name: "fontFormat",
               multiple: false,
               required: false,
-              options: mapObjectToSelectOptions(FONT_FORMATS)
+              options: getFontFormatOptions()
             })
           ],
         }),
@@ -169,7 +170,7 @@ const siteSettings = {
               name: "fontFormat",
               multiple: false,
               required: false,
-              options: mapObjectToSelectOptions(FONT_FORMATS)
+              options: getFontFormatOptions()
             })
           ]
         })

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

@@ -1,16 +1,27 @@
-import { collectionDefaults } from "../../patterns";
+import {
+  collectionDefaults
+} from "../../patterns";
 
 import {
   hiddenField,
   stringField,
   selectField,
+  selectOption,
   markdownField
 } from "../../fields";
 
-import { CONTENT_PAGES_DIR_PATH } from "@utils/filePath";
-import { USER_REQUIREMENTS } from "@utils/pageAccessConstants";
+import {
+  CONTENT_PAGES_DIR_PATH
+} from "@utils/filePath";
+
+const USER_REQUIREMENTS = {
+  none: "NONE",
+  loggedIn: "LOGGED_IN",
+  hasTicket: "HAS_TICKET"
+};
 
-import { mapObjectToSelectOptions } from "../../utils";
+const getUserRequirementsOptions = () =>
+  Object.entries(USER_REQUIREMENTS).map(([key, value]) => selectOption({ label: value, value: value }));
 
 const contentPagesCollection = {
   ...collectionDefaults({
@@ -38,7 +49,7 @@ const contentPagesCollection = {
       name: "userRequirement",
       multiple: false,
       default: USER_REQUIREMENTS.none,
-      options: mapObjectToSelectOptions(USER_REQUIREMENTS)
+      options: getUserRequirementsOptions()
     }),
     markdownField({
       label: "Body",
@@ -47,4 +58,8 @@ const contentPagesCollection = {
   ]
 };
 
+export {
+  USER_REQUIREMENTS
+};
+
 export default contentPagesCollection;

package/src/components/AuthComponent.js

@@ -17,7 +17,7 @@ import IconButton from "./IconButton";
 import Link from "./Link";
 
 import { getDefaultLocation, validateIdentityProviderButtons } from "@utils/loginUtils";
-import { userHasAccessLevel, VIRTUAL_ACCESS_LEVEL } from "@utils/authorizedGroups";
+import { userHasAccessLevel, VirtualAccessLevel } from "@utils/authorizedGroups";
 import useSiteSettings from "@utils/useSiteSettings";
 import { PHASES } from "@utils/phasesUtils";
 
@@ -49,7 +49,7 @@ const AuthComponent = ({
     const [otpError, setOtpError] = useState(false);
 
     const hasVirtualBadge = useMemo(() =>
-        userProfile ? userHasAccessLevel(userProfile.summit_tickets, VIRTUAL_ACCESS_LEVEL) : false
+        userProfile ? userHasAccessLevel(userProfile.summit_tickets, VirtualAccessLevel) : false
         , [userProfile]);
     const defaultPath = getDefaultLocation(eventRedirect, hasVirtualBadge);
 

package/src/components/Navbar/index.js

@@ -4,11 +4,11 @@ import { connect } from "react-redux";
 import { navigate } from "gatsby";
 import NavbarTemplate from "./template";
 
-import { userHasAccessLevel, VIRTUAL_ACCESS_LEVEL } from "@utils/authorizedGroups";
+import { userHasAccessLevel, VirtualAccessLevel } from "@utils/authorizedGroups";
 import { getDefaultLocation } from "@utils/loginUtils";
 
 import { PHASES } from "@utils/phasesUtils";
-import { USER_REQUIREMENTS, PAGE_RESTRICTIONS } from "@utils/pageAccessConstants";
+import { PAGE_RESTRICTIONS } from "../../cms/config/collections/configurationsCollection/navbar";
 
 import navbarContent from "content/navbar/index.json";
 
@@ -17,8 +17,6 @@ const Navbar = ({
   summitPhase,
   summit,
   isLoggedUser,
-  isAuthorized,
-  hasTicket,
   idpProfile,
   userProfile,
   eventRedirect
@@ -26,57 +24,64 @@ const Navbar = ({
 
   // we store this calculation to use it later
   const hasVirtualBadge = useMemo(() =>
-    userProfile ? userHasAccessLevel(userProfile.summit_tickets, VIRTUAL_ACCESS_LEVEL) : false
+    userProfile ? userHasAccessLevel(userProfile.summit_tickets, VirtualAccessLevel) : false
   , [userProfile]);
 
   const defaultPath = getDefaultLocation(eventRedirect, hasVirtualBadge);
 
-  const meetsUserRequirement = (userRequirement) => {
-    switch (userRequirement) {
-      case USER_REQUIREMENTS.none:
-        return true;
-      case USER_REQUIREMENTS.loggedIn:
-        return isLoggedUser || isAuthorized;
-      case USER_REQUIREMENTS.hasTicket:
-        return hasTicket || isAuthorized;
-      default:
-        return false;
-    }
-  };
-
   const isCustomPage = (path) => {
     return !isMarketingPage(path) &&
            !isShowPage(path) &&
            !isProfilePage(path) &&
            !isMySchedulePage(path) &&
            !isExtraQuestionsPage(path);
-  };
+  }
 
-  const isMySchedulePage = (path) => path.startsWith("/a/my-schedule");
+  const isMySchedulePage = (path) => {
+    return path.startsWith("/a/my-schedule");
+  }
 
-  const isProfilePage = (path) => path.startsWith("/a/profile");
+  const isProfilePage = (path) => {
+    return path.startsWith("/a/profile");
+  }
 
-  const isExtraQuestionsPage = (path) => path.startsWith("/a/extra-questions");
+  const isExtraQuestionsPage = (path) => {
+    return path.startsWith("/a/extra-questions");
+  }
 
-  const isMarketingPage = (path) => path === "/";
+  const isMarketingPage = (path) => {
+      return path === '/';
+  }
 
-  const isLobbyPage = (path) => path === "/a" || path === "/a/";
+  const isLobbyPage = (path) => {
+    return path === '/a' || path === '/a/';
+  }
 
-  const isActivityPage = (path) => path.startsWith("/a/event");
+  const isActivityPage = (path) => {
+    return path.startsWith("/a/event");
+  }
 
-  const isSponsorPage = (path) => path.startsWith("/a/sponsor");
+  const isSponsorPage = (path) => {
+    return path.startsWith("/a/sponsor");
+  }
 
-  const isSchedulePage = (path) => path.startsWith("/a/schedule");
+  const isSchedulePage = (path) => {
+    return path.startsWith("/a/schedule");
+  }
 
-  const isShowPage = (path) => isLobbyPage(path) || isActivityPage(path) || isSponsorPage(path) || isSchedulePage(path);
+  const isShowPage = (path) => {
+    return isLobbyPage(path) || // lobby
+        isActivityPage(path) || // activity
+        isSponsorPage(path) || // expo hall or sponsor page
+        isSchedulePage(path);// schedule
+  }
 
   // we assume that all pages under /a/* requires auth except /a/schedule
-  // item.userRequirement allows to mark specific pages that are not under /a/* pattern.
+  // item.requiresAuth allows to mark specific pages that are not under /a/* pattern.
   const showItem = (item) => {
     // check if we have location defined, if so use the path name , else if window is defined use the window.location
     // as a fallback
-    const currentPath = location ? location.pathname : (typeof window !== "undefined" ? window.location.pathname : "");
-
+    const currentPath = location ? location.pathname: (typeof window !== "undefined" ? window.location.pathname: "");
     const passPageRestriction = !item.pageRestriction ||
         item.link === currentPath || // if we are on the same page then show it
         item.pageRestriction.includes(PAGE_RESTRICTIONS.any) ||
@@ -84,10 +89,11 @@ const Navbar = ({
         (item.pageRestriction.includes(PAGE_RESTRICTIONS.marketing) && isMarketingPage(currentPath)) ||
         (item.pageRestriction.includes(PAGE_RESTRICTIONS.lobby) && isLobbyPage(currentPath)) ||
         (item.pageRestriction.includes(PAGE_RESTRICTIONS.show) && isShowPage(currentPath)) ||
-        (item.pageRestriction.includes(PAGE_RESTRICTIONS.customPage) && isCustomPage(currentPath));
+        (item.pageRestriction.includes(PAGE_RESTRICTIONS.customPage) && isCustomPage(currentPath))
+    ;
 
     return item.display &&
-           meetsUserRequirement(item.userRequirement) &&
+           (!item.requiresAuth || isLoggedUser) &&
            (!item.showOnlyAtShowTime || summitPhase >= PHASES.DURING) &&
            passPageRestriction;
   };
@@ -109,6 +115,7 @@ const Navbar = ({
   );
 };
 
+
 const mapStateToProps = ({
   clockState,
   settingState,
@@ -119,8 +126,6 @@ const mapStateToProps = ({
   summit: summitState.summit,
   summitPhase: clockState.summit_phase,
   isLoggedUser: loggedUserState.isLoggedUser,
-  isAuthorized: userState.isAuthorized,
-  hasTicket: userState.hasTicket,
   idpProfile: userState.idpProfile,
   userProfile: userState.userProfile,
   // TODO: move to site settings i/o marketing page settings

package/src/components/RegistrationLiteComponent.js

@@ -24,7 +24,7 @@ import "summit-registration-lite/dist/index.css";
 import useSiteSettings from "@utils/useSiteSettings";
 import useMarketingSettings, { MARKETING_SETTINGS_KEYS }  from "@utils/useMarketingSettings";
 import { getEnvVariable, SUMMIT_API_BASE_URL, OAUTH2_CLIENT_ID, REGISTRATION_BASE_URL, SUPPORT_EMAIL } from "@utils/envVariables";
-import { userHasAccessLevel, VIRTUAL_ACCESS_LEVEL } from "@utils/authorizedGroups";
+import { userHasAccessLevel, VirtualAccessLevel } from "@utils/authorizedGroups";
 import { validateIdentityProviderButtons } from "@utils/loginUtils";
 import { triggerTagManagerTrackEvent } from "@utils/eventTriggers";
 
@@ -136,7 +136,7 @@ const RegistrationLiteComponent = ({
         loading: loadingProfile || loadingIDP,
         // only show info if its not a recent purchase
         ticketOwned: userProfile?.summit_tickets?.length > 0,
-        hasVIRTUAL_ACCESS_LEVEL: userHasAccessLevel(userProfile?.summit_tickets, VIRTUAL_ACCESS_LEVEL),
+        hasVirtualAccessLevel: userHasAccessLevel(userProfile?.summit_tickets, VirtualAccessLevel),
         ownedTickets: attendee?.ticket_types || [],
         authUser: (provider) => onClickLogin(provider),
         getPasswordlessCode: getPasswordlessCode,

package/src/components/UserNavbar.js

@@ -1,16 +1,15 @@
-import React from "react";
-import { Link } from "gatsby";
-import { connect } from "react-redux";
+import React from 'react'
+import { Link } from 'gatsby'
+import { connect } from 'react-redux'
 
-import LogoutButton from "./LogoutButton";
-import ProfilePopupComponent from "./ProfilePopupComponent";
+import styles from '../styles/navbar.module.scss';
+import LogoutButton from './LogoutButton';
+import ProfilePopupComponent from './ProfilePopupComponent';
 
-import { updateProfilePicture, updateProfile } from "../actions/user-actions"
+import { updateProfilePicture, updateProfile } from '../actions/user-actions'
 
-import { getDefaultLocation } from ".@utils/loginUtils";
-import { userHasAccessLevel, VIRTUAL_ACCESS_LEVEL } from "../utils/authorizedGroups";
-
-import styles from "../styles/navbar.module.scss";
+import { getDefaultLocation } from '../utils/loginUtils';
+import {userHasAccessLevel, VirtualAccessLevel} from "../utils/authorizedGroups";
 
 const UserNavbar = class extends React.Component {
 
@@ -19,7 +18,7 @@ const UserNavbar = class extends React.Component {
     this.state = {
       active: false,
       showProfile: false,
-      navBarActiveClass: "",
+      navBarActiveClass: '',
     }
   }
 
@@ -33,9 +32,9 @@ const UserNavbar = class extends React.Component {
 
   handleTogglePopup = (profile) => {
     if (profile) {
-      document.body.classList.add("is-clipped");
+      document.body.classList.add('is-clipped');
     } else {
-      document.body.classList.remove("is-clipped");
+      document.body.classList.remove('is-clipped');
     }
     this.setState({showProfile: profile})
   }
@@ -54,7 +53,7 @@ const UserNavbar = class extends React.Component {
             navBarActiveClass: `${styles.isActive}`,
           })
           : this.setState({
-            navBarActiveClass: "",
+            navBarActiveClass: '',
           })
       }
     )
@@ -67,7 +66,7 @@ const UserNavbar = class extends React.Component {
 
     // we store this calculation to use it later
     const hasVirtualBadge =
-        userProfile ? userHasAccessLevel(userProfile.summit_tickets, VIRTUAL_ACCESS_LEVEL) : false;
+        userProfile ? userHasAccessLevel(userProfile.summit_tickets, VirtualAccessLevel) : false;
 
     let defaultPath = getDefaultLocation(eventRedirect, hasVirtualBadge);
 
@@ -144,4 +143,4 @@ const mapStateToProps = ({ settingState, userState }) => ({
   userProfile: userState.userProfile
 });
 
-export default connect(mapStateToProps, { updateProfilePicture, updateProfile })(UserNavbar);
+export default connect(mapStateToProps, { updateProfilePicture, updateProfile })(UserNavbar)

package/src/content/navbar/index.json

@@ -4,7 +4,7 @@
       "title": "Lobby",
       "link": "/a/",
       "display": true,
-      "userRequirement": "LOGGED_IN",
+      "requiresAuth": true,
       "pageRestriction": [
         "ANY"
       ]
@@ -13,7 +13,7 @@
       "title": "My Tickets",
       "link": "/a/my-tickets",
       "display": true,
-      "userRequirement": "LOGGED_IN",
+      "requiresAuth": true,
       "pageRestriction": [
         "ANY"
       ]
@@ -22,7 +22,7 @@
       "title": "Schedule",
       "link": "/a/schedule",
       "display": true,
-      "userRequirement": "NONE",
+      "requiresAuth": false,
       "pageRestriction": [
         "ANY"
       ]
@@ -31,13 +31,13 @@
       "title": "My Schedule",
       "link": "/a/my-schedule",
       "display": true,
-      "userRequirement": "NONE"
+      "requiresAuth": false
     },
     {
       "title": "My Profile",
       "link": "/a/profile",
       "display": true,
-      "userRequirement": "LOGGED_IN",
+      "requiresAuth": true,
       "pageRestriction": [
         "ANY"
       ]

package/src/routes/WithAuthzRoute.js

@@ -1,10 +1,10 @@
-import React, { useEffect, useState, useMemo } from "react";
-import { connect } from "react-redux";
-import { navigate } from "gatsby";
+import React, {useEffect, useState, useMemo} from "react";
+import {connect} from "react-redux";
+import {navigate} from "gatsby";
 import { pick } from "@gatsbyjs/reach-router";
 import { getUserProfile, requireExtraQuestions } from "../actions/user-actions";
 import HeroComponent from "../components/HeroComponent";
-import { userHasAccessLevel, VIRTUAL_ACCESS_LEVEL } from "@utils/authorizedGroups";
+import { userHasAccessLevel, VirtualAccessLevel } from "../utils/authorizedGroups";
 
 const pathsRequiringVirtualBadge = [
     { path: "/a/" },
@@ -12,7 +12,7 @@ const pathsRequiringVirtualBadge = [
     { path: "/a/posters" },
     { path: "/a/sponsors" },
     { path: "/a/posters/:trackGroupId" },
-    { path: "/a/poster/:presentationId/" }
+    { path: "/a/poster/:presentationId/" },
 ];
 
 /**
@@ -44,7 +44,7 @@ const WithAuthzRoute = ({
 
     // we store this calculation to use it later
     const hasVirtualBadge = useMemo(() =>
-        userProfile ? userHasAccessLevel(userProfile.summit_tickets, VIRTUAL_ACCESS_LEVEL) : false,
+        userProfile ? userHasAccessLevel(userProfile.summit_tickets, VirtualAccessLevel) : false,
         [userProfile.summit_tickets]);
 
     const userIsReady = () => {
@@ -98,7 +98,7 @@ const WithAuthzRoute = ({
     return children;
 };
 
-const mapStateToProps = ({ userState }) => ({
+const mapStateToProps = ({userState}) => ({
     userProfile: userState.userProfile,
     isAuthorized: userState.isAuthorized,
     hasTicket: userState.hasTicket,

package/src/routes/authorization-callback-route.js

@@ -11,20 +11,19 @@
  * limitations under the License.
  **/
 
-import React from "react";
-import URI from "urijs";
-import { navigate } from "gatsby";
+import React from 'react'
+import URI from "urijs"
+import { navigate } from "gatsby"
 import { Redirect } from "@gatsbyjs/reach-router";
-import { connect } from "react-redux";
+import { connect } from 'react-redux';
 import AbstractAuthorizationCallbackRoute from "openstack-uicore-foundation/lib/security/abstract-auth-callback-route";
-import { getUserProfile, addToSchedule, removeFromSchedule } from "../actions/user-actions";
+import { getUserProfile, addToSchedule, removeFromSchedule } from '../actions/user-actions'
 import HeroComponent from "../components/HeroComponent";
-import { getEnvVariable, IDP_BASE_URL, OAUTH2_CLIENT_ID } from "@utils/envVariables";
-import { getPendingAction } from "@utils/schedule";
+import { getEnvVariable, IDP_BASE_URL, OAUTH2_CLIENT_ID } from '../utils/envVariables'
+import { getPendingAction } from '../utils/schedule';
 
-import { userHasAccessLevel, VIRTUAL_ACCESS_LEVEL } from "@utils/authorizedGroups";
-
-import "../styles/bulma.scss";
+import '../styles/bulma.scss';
+import {userHasAccessLevel, VirtualAccessLevel} from "../utils/authorizedGroups";
 
 class AuthorizationCallbackRoute extends AbstractAuthorizationCallbackRoute {
 
@@ -37,16 +36,16 @@ class AuthorizationCallbackRoute extends AbstractAuthorizationCallbackRoute {
             const pendingAction = getPendingAction();
             if (pendingAction) {
                 const { action, event } = pendingAction;
-                action === "ADD_EVENT" ? this.props.addToSchedule(event) : this.props.removeFromSchedule(event);
+                action === 'ADD_EVENT' ? this.props.addToSchedule(event) : this.props.removeFromSchedule(event);
             }
             backUrl = URI.decode(backUrl);
             // fallback
-            if(!backUrl || backUrl == "")
-                backUrl = "/";
+            if(!backUrl || backUrl == '')
+                backUrl = '/';
             let { userProfile } = this.props;
             // if redirect to lobby first time if we have virtual access
-            if(backUrl == "/" && userProfile && userHasAccessLevel(userProfile.summit_tickets, VIRTUAL_ACCESS_LEVEL)){
-                backUrl = "/a/";
+            if(backUrl == '/' && userProfile && userHasAccessLevel(userProfile.summit_tickets, VirtualAccessLevel)){
+                backUrl = '/a/';
             }
             navigate(backUrl);
         });
@@ -55,9 +54,9 @@ class AuthorizationCallbackRoute extends AbstractAuthorizationCallbackRoute {
     _redirect2Error(error) {
         console.log(`AuthorizationCallbackRoute error ${error}`);
         if (
-            error.includes("access_denied") ||
-            error.includes("consent_required")
-        ) return <Redirect to={"/"} noThrow />;
+            error.includes('access_denied') ||
+            error.includes('consent_required')
+        ) return <Redirect to={'/'} noThrow />;
         return <Redirect to={`/error?error=${error}`} noThrow/>;
     }
 
@@ -88,4 +87,4 @@ export default connect(mapStateToProps, {
     getUserProfile,
     addToSchedule,
     removeFromSchedule,
-})(AuthorizationCallbackRoute);
+})(AuthorizationCallbackRoute)

package/src/styles/colors.scss

@@ -1,4 +1,10 @@
-$color_accent: #00A2FF;
+/**
+* Warning:
+* Dont edit this file by hand, has been generated by colors scss util
+* Uses default colors as base and then overriden by colors set via marketing
+**/
+
+$color_accent: #ff5e32;
 $color_alerts: #ff0000;
 $color_background_light: #ffffff;
 $color_background_dark: #000000;
@@ -19,16 +25,16 @@ $color_input_text_color_light: #363636;
 $color_input_text_color_dark: #ffffff;
 $color_input_text_color_disabled_light: #ffffff;
 $color_input_text_color_disabled_dark: #ffffff;
-$color_primary: #000000;
-$color_primary_contrast: #FFFFFF;
-$color_secondary: #00A2FF;
-$color_secondary_contrast: #181818;
+$color_primary: #6d6e71;
+$color_primary_contrast: #f1f2f2;
+$color_secondary: #00CEC4;
+$color_secondary_contrast: #ff5e32;
 $color_text_light: #ffffff;
 $color_text_med: #828282;
-$color_text_dark: #000000;
+$color_text_dark: #333333;
 $color_text_input_hints_light: #7b7b7b;
 $color_text_input_hints_dark: #7b7b7b;
-$color_text_input_hints: #131313;
+$color_text_input_hints: #c4c4c4;
 
 :root {
   --color_primary: #{$color_primary};

package/src/styles/fonts.scss

@@ -1,31 +1,26 @@
-$font-family: "BuilderExtended";
+/**
+* Warning:
+* Dont edit this file by hand, has been generated by fonts scss util
+* Generated with font values set via CMS
+**/
+
+$font-family: 'Nunito Sans', sans-serif;
 
 :root {
-  --font_family: "BuilderExtended" !important;
+  --font_family: #{$font-family};
 }
 
-@font-face {
-  font-family: "BuilderExtended";
-  src: url("/fonts/buildersans-regular.woff") format("woff");
-  font-weight: normal;
-}
-@font-face {
-  font-family: "BuilderExtended";
-  src: url("/fonts/builderextended-semibold.woff") format("woff");
-  font-weight: bold;
-}
-  
 %font-regular {
-  font-family: var(--font_family);
+  font-family: 'Nunito Sans', sans-serif;
   font-weight: 400;
 }
 
 %font-semi {
-  font-family: var(--font_family);
+  font-family: 'Nunito Sans', sans-serif;
   font-weight: 600;
 }
 
 %font-bold {
-  font-family: var(--font_family);
+  font-family: 'Nunito Sans', sans-serif;
   font-weight: 700;
 }

package/src/templates/content-page/index.js

@@ -7,9 +7,9 @@ import { MDXProvider } from "@mdx-js/react";
 import ContentPageTemplate from "./template";
 import Layout from "../../components/Layout";
 import Seo from "../../components/Seo";
-import { titleFromPathname } from "@utils/urlFormating";
+import { titleFromPathname } from "../../utils/urlFormating";
 
-import { USER_REQUIREMENTS } from "@utils/pageAccessConstants";
+import { USER_REQUIREMENTS } from "../../cms/config/collections/contentPagesCollection";
 
 const ContentPage = ({
   data,

package/src/templates/login-page.js

@@ -1,19 +1,19 @@
-import React, {useMemo} from "react";
-import { connect } from "react-redux";
-import { navigate } from "gatsby";
+import React, {useMemo} from 'react'
+import { connect } from 'react-redux'
+import { navigate } from "gatsby"
 
-import Layout from "../components/Layout";
-import AuthComponent from "../components/AuthComponent";
+import Layout from '../components/Layout'
+import AuthComponent from '../components/AuthComponent'
 
-import { getDefaultLocation } from "@utils/loginUtils";
-import {userHasAccessLevel, VIRTUAL_ACCESS_LEVEL} from "@utils/authorizedGroups";
+import { getDefaultLocation } from '../utils/loginUtils'
+import {userHasAccessLevel, VirtualAccessLevel} from "../utils/authorizedGroups";
 
 
 export const LoginPageTemplate = ({ loggedUserState, eventRedirect, location, userProfile }) => {
 
   // we store this calculation to use it later
   const hasVirtualBadge = useMemo(() =>
-          userProfile ? userHasAccessLevel(userProfile.summit_tickets, VIRTUAL_ACCESS_LEVEL) : false,
+          userProfile ? userHasAccessLevel(userProfile.summit_tickets, VirtualAccessLevel) : false,
       [userProfile]);
 
   if (loggedUserState.isLoggedUser) {

package/src/templates/token-expire-page.js

@@ -1,15 +1,15 @@
-import React from "react";
-import PropTypes from "prop-types";
-import { connect } from "react-redux";
+import React from 'react'
+import PropTypes from 'prop-types'
+import { connect } from 'react-redux'
 
 import URI from "urijs";
-import { handleResetReducers } from "../actions/event-actions";
-import { doLogin } from "openstack-uicore-foundation/lib/security/methods";
+import { handleResetReducers } from '../actions/event-actions'
+import { doLogin } from 'openstack-uicore-foundation/lib/security/methods'
 
-import { getDefaultLocation } from "@utils/loginUtils";
+import { getDefaultLocation } from '../utils/loginUtils';
 
-import HeroComponent from "../components/HeroComponent";
-import { userHasAccessLevel, VIRTUAL_ACCESS_LEVEL } from "../utils/authorizedGroups";
+import HeroComponent from '../components/HeroComponent'
+import { userHasAccessLevel, VirtualAccessLevel } from "../utils/authorizedGroups";
 
 export const TokenExpirePageTemplate = class extends React.Component {
 
@@ -22,10 +22,10 @@ export const TokenExpirePageTemplate = class extends React.Component {
 
       // we store this calculation to use it later
       const hasVirtualBadge =
-              userProfile ? userHasAccessLevel(userProfile.summit_tickets, VIRTUAL_ACCESS_LEVEL) : false;
+              userProfile ? userHasAccessLevel(userProfile.summit_tickets, VirtualAccessLevel) : false;
 
       let defaultPath = getDefaultLocation(eventRedirect, hasVirtualBadge);
-      let previousLocation = location.state?.backUrl && location.state.backUrl !== "/auth/expired" ? location.state.backUrl : defaultPath;
+      let previousLocation = location.state?.backUrl && location.state.backUrl !== '/auth/expired' ? location.state.backUrl : defaultPath;
       let backUrl = URI.encode(previousLocation);
 
       setTimeout(() => {

package/src/utils/authorizedGroups.js

@@ -3,7 +3,7 @@ import {
   AUTHZ_USER_GROUPS,
 } from "./envVariables";
 
-export const VIRTUAL_ACCESS_LEVEL = "VIRTUAL";
+export const VirtualAccessLevel = 'VIRTUAL';
 
 export const isAuthorizedUser = (groups) => {
   let authorizedGroups = getEnvVariable(AUTHZ_USER_GROUPS);

package/src/utils/envVariables.js

@@ -26,6 +26,7 @@ export const REAL_TIME_UPDATES_STRATEGY = "REAL_TIME_UPDATES_STRATEGY";
 export const TIMEINTERVALSINCE1970_API_URL = "TIMEINTERVALSINCE1970_API_URL";
 export const ABLY_API_KEY = "ABLY_API_KEY";
 export const GOOGLE_TAGMANAGER_ID = "GOOGLE_TAGMANAGER_ID";
+export const HASH_SANITIZE_TOKENS = "HASH_SANITIZE_TOKENS";
 
 const processEnv = {
   /**
@@ -63,6 +64,7 @@ const processEnv = {
   TIMEINTERVALSINCE1970_API_URL: process.env.GATSBY_TIMEINTERVALSINCE1970_API_URL,
   ABLY_API_KEY: process.env.GATSBY_ABLY_API_KEY,
   GOOGLE_TAGMANAGER_ID: process.env.GATSBY_GOOGLE_TAGMANAGER_ID,
+  HASH_SANITIZE_TOKENS: process.env.GATSBY_HASH_SANITIZE_TOKENS
 }
 
 export const getEnvVariable = (name) => {

package/src/cms/config/utils.js

@@ -1,4 +0,0 @@
-import { selectOption } from "./fields";
-
-export const mapObjectToSelectOptions = (object) => 
-  Object.entries(object).map(([key, value]) => selectOption({ label: value, value: value }));

package/src/utils/pageAccessConstants.js

@@ -1,16 +0,0 @@
-const USER_REQUIREMENTS = {
-  none: "NONE",
-  loggedIn: "LOGGED_IN",
-  hasTicket: "HAS_TICKET"
-};
-
-const PAGE_RESTRICTIONS = {
-  any: "ANY",
-  activity: "ACTIVITY",
-  marketing: "MARKETING",
-  lobby: "LOBBY",
-  show: "SHOW",
-  customPage: "CUSTOM_PAGE"
-};
-
-export { USER_REQUIREMENTS, PAGE_RESTRICTIONS };