@openeventkit/event-site 2.0.88 → 2.0.90

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.88",
+  "version": "2.0.90",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -43,7 +43,6 @@
     "final-form": "4.20.7",
     "font-awesome": "^4.7.0",
     "formik": "^2.2.9",
-    "fs-extra": "^9.0.1",
     "full-schedule-widget": "3.0.3",
     "gatsby": "^5.8.1",
     "gatsby-alias-imports": "^1.0.6",
@@ -78,7 +77,6 @@
     "moment-timezone": "^0.5.31",
     "netlify-cms-app": "^2.15.72",
     "netlify-cms-lib-widgets": "^1.8.0",
-    "node-sass-utils": "^1.1.3",
     "openstack-uicore-foundation": "4.1.65",
     "path-browserify": "^1.0.1",
     "prop-types": "^15.6.0",
@@ -122,7 +120,7 @@
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",
-    "summit-registration-lite": "5.0.18",
+    "summit-registration-lite": "5.0.19",
     "superagent": "8.0.9",
     "sweetalert2": "^9.17.0",
     "upcoming-events-widget": "3.0.5",

package/src/actions/user-actions.js

@@ -50,6 +50,9 @@ export const UNCAST_PRESENTATION_VOTE_RESPONSE = 'UNCAST_PRESENTATION_VOTE_RESPO
 export const TOGGLE_PRESENTATION_VOTE = 'TOGGLE_PRESENTATION_VOTE';
 export const GET_EXTRA_QUESTIONS = 'GET_EXTRA_QUESTIONS';
 export const TICKET_OWNER_CHANGED = 'TICKET_OWNER_CHANGED';
+export const REQUEST_INVITATION = 'REQUEST_INVITATION';
+export const RECEIVE_INVITATION = 'RECEIVE_INVITATION';
+export const REJECT_INVITATION = 'REJECT_INVITATION';
 
 // shortName is the unique identifier assigned to a Disqus site.
 export const getDisqusSSO = (shortName) => async (dispatch, getState) => {
@@ -436,7 +439,7 @@ export const updatePassword = (password) => async (dispatch) => {
 
 export const saveAttendeeQuestions = (values, ticketId = null) => async (dispatch, getState) => {
 
-  const { userState: { userProfile: { summit_tickets } } } = getState();  
+  const { userState: { userProfile: { summit_tickets } } } = getState();
 
   const normalizedEntity = {...values};
 
@@ -453,7 +456,7 @@ export const saveAttendeeQuestions = (values, ticketId = null) => async (dispatc
   } catch (e) {
     console.log('getAccessToken error: ', e);
     return Promise.reject();
-  }  
+  }
 
   let params = {
     access_token: accessToken,
@@ -529,10 +532,11 @@ export const setUserOrder = (order) => (dispatch) => Promise.resolve().then(() =
 export const checkOrderData = (order) => (dispatch, getState) => {
   if (!order) return;
 
-  const { userState: { idpProfile: { company, given_name, family_name } } } = getState();
-  const { owner_company, owner_first_name, owner_last_name } = order || {};
+  const { userState: { idpProfile: { company, given_name, family_name, email } } } = getState();
+  const { owner_company, owner_first_name, owner_last_name, owner_email } = order || {};
 
-  if (owner_company !== company || owner_first_name !== given_name || owner_last_name !== family_name) {
+  // only change data if I am the order owner
+  if (owner_email === email  && (owner_company !== company || owner_first_name !== given_name || owner_last_name !== family_name)) {
     const newProfile = {
       first_name: owner_first_name,
       last_name: owner_last_name,
@@ -577,3 +581,44 @@ export const doVirtualCheckIn = (attendee) => async (dispatch, getState) => {
     return e;
   });
 };
+
+
+/**
+ * Get invitation by token to allow reject
+ * @param token
+ * @returns {function(*=, *): *}
+ */
+export const getInvitation = (token) => async (dispatch) => {
+  dispatch(startLoading());
+
+  return getRequest(
+    createAction(REQUEST_INVITATION),
+    createAction(RECEIVE_INVITATION),
+    `${window.API_BASE_URL}/api/public/v1/summits/${window.SUMMIT_ID}/registration-invitations/${token}`,
+    customErrorHandler
+  )({})(dispatch)
+    .finally(() => dispatch(stopLoading()));
+}
+
+/**
+ * Reject invitation by token
+ * @param token
+ * @returns {function(*=, *): *}
+ */
+export const rejectInvitation = (token) => async (dispatch) => {
+  dispatch(startLoading());
+
+  return deleteRequest(
+    null,
+    createAction(REJECT_INVITATION),
+    `${window.API_BASE_URL}/api/public/v1/summits/${window.SUMMIT_ID}/registration-invitations/${token}/reject`,
+    {},
+    customErrorHandler
+  )({})(dispatch)
+    .then(() => {
+      //redirect ?
+    })
+    .finally(() => dispatch(stopLoading()));
+}
+
+

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

@@ -5,6 +5,7 @@ import {
 import marketingPage from "./marketingPage";
 import lobbyPage from "./lobbyPage";
 import expoHallPage from "./expoHallPage";
+import invitationsRejectPage from "./invitationsRejectPage";
 
 const defaultPagesCollection = {
   ...collectionDefaults({
@@ -14,7 +15,8 @@ const defaultPagesCollection = {
   files: [
     marketingPage,
     lobbyPage,
-    expoHallPage
+    expoHallPage,
+    invitationsRejectPage
   ]
 };
 

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

@@ -0,0 +1,45 @@
+import {stringField} from "../../../fields";
+
+import {
+  INVITATIONS_REJECT_PAGE_FILE_PATH
+} from "@utils/filePath";
+
+const invitationsRejectPage = {
+  label: "Invitations Reject Page",
+  name: "invitations-reject-page",
+  file: INVITATIONS_REJECT_PAGE_FILE_PATH,
+  fields: [
+    stringField({
+      label: "Title",
+      name: "title",
+      default: "Reject Invitation"
+    }),
+    stringField({
+      label: "Not found text",
+      name: "notFoundText",
+      required: false,
+      default: "Invitation not found."
+    }),
+    stringField({
+      label: "Rejected text",
+      name: "rejectedText",
+      required: false,
+      default: "Invitation has already been rejected."
+    }),
+    stringField({
+      label: "Reject text",
+      name: "rejectText",
+      required: false,
+      default: "To reject please click on the button below."
+    }),
+    stringField({
+      label: "Reject CTA label",
+      name: "rejectCTALabel",
+      required: false,
+      default: "Reject Invitation"
+    }),
+  ]
+};
+
+export default invitationsRejectPage;
+  

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

@@ -0,0 +1,10 @@
+
+module.exports = `
+  type InvitationsRejectPageJson implements Node {
+    title: String
+    notFoundText: String
+    rejectedText: String
+    rejectText: String
+    rejectCTALabel: String
+  }
+`;

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

@@ -116,7 +116,7 @@ const marketingPage = {
       name: "countdown",
       fields: [
         booleanField({
-          label: "Should Display?",
+          label: "Display",
           name: "display",
           required: false
         }),
@@ -128,7 +128,7 @@ const marketingPage = {
     }),
     objectField({
       label: "Widgets",
-      name: "leftColumn",
+      name: "widgets",
       fields: [
         objectField({
           label: "Text",
@@ -196,41 +196,52 @@ const marketingPage = {
         })
       ]
     }),
-    numberField({
-      label: "Redirect to Event",
-      name: "eventRedirect",
-      required: false,
-      hint: "User will be redirected to this event after login"
-    }),
-    listField({
+    objectField({
       label: "Masonry",
       name: "masonry",
       fields: [
-        stringField({
-          label: "Placement",
-          name: "placement",
+        booleanField({
+          label: "Display",
+          name: "display",
           required: false
         }),
-        selectField({
-          label: "Size",
-          name: "size",
-          options: [
-            selectOption({
-              label: "Single",
-              value: 1
+        listField({
+          label: "Items",
+          name: "items",
+          fields: [
+            stringField({
+              label: "Placement",
+              name: "placement",
+              required: false
+            }),
+            selectField({
+              label: "Size",
+              name: "size",
+              options: [
+                selectOption({
+                  label: "Single",
+                  value: 1
+                }),
+                selectOption({
+                  label: "Double",
+                  value: 2
+                })
+              ]
             }),
-            selectOption({
-              label: "Double",
-              value: 2
+            linkImagesField({
+              label: "Images",
+              name: "images",
+              imageRequired: true
             })
           ]
-        }),
-        linkImagesField({
-          label: "Images",
-          name: "images",
-          imageRequired: true
         })
       ]
+    }),
+    numberField({
+      label: "Redirect to Event",
+      name: "eventRedirect",
+      required: false,
+      hint: "User will be redirected to this event after login"
     })
   ]
 };

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

@@ -9,29 +9,34 @@ module.exports = `
     alt: String
     link: String
   }
-  type MarketingPageMasonry {
+  type MarketingPageMasonryItem {
+    display: Boolean
     placement: String
     size: Int
     images: [LinkImageWithAlt]
   }
-  type MarketingPageLeftColumnTextWidget {
+  type MarketingPageMasonry {
     display: Boolean
-    content: String
+    items: [MarketingPageMasonryItem]
   }
-  type MarketingPageLeftColumnWidget {
+  type MarketingPageWidget {
     display: Boolean
     title: String
   }
-  type MarketingPageLeftColumnImageWidget {
+  type MarketingPageTextWidget {
+    display: Boolean
+    content: String
+  }
+  type MarketingPageImageWidget {
     display: Boolean
     title: String
     image: ImageWithAlt
   }
-  type MarketingPageLeftColumn {
-    text: MarketingPageLeftColumnTextWidget
-    schedule: MarketingPageLeftColumnWidget
-    disqus: MarketingPageLeftColumnWidget
-    image: MarketingPageLeftColumnImageWidget
+  type MarketingPageWidgets {
+    text: MarketingPageTextWidget
+    image: MarketingPageImageWidget
+    schedule: MarketingPageWidget
+    disqus: MarketingPageWidget
   }
   type MarketingPageCountdown {
     display: Boolean
@@ -57,9 +62,9 @@ module.exports = `
   }
   type MarketingPageJson implements Node {
     hero: MarketingPageHero
-    leftColumn: MarketingPageLeftColumn
     countdown: MarketingPageCountdown
+    widgets: MarketingPageWidgets
+    masonry: MarketingPageMasonry
     eventRedirect: Int
-    masonry: [MarketingPageMasonry]
   }
 `;

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

@@ -1,9 +1,11 @@
 const marketingPageTypeDefs = require("./marketingPage/typeDefs");
 const lobbyPageTypeDefs = require("./lobbyPage/typeDefs");
 const expoHallPageTypeDefs = require("./expoHallPage/typeDefs");
+const invitationsRejectPageTypeDefs = require("./invitationsRejectPage/typeDefs");
 
 module.exports = [
   marketingPageTypeDefs,
   lobbyPageTypeDefs,
-  expoHallPageTypeDefs
+  expoHallPageTypeDefs,
+  invitationsRejectPageTypeDefs
 ].join("");

package/src/components/AuthComponent.js

@@ -138,7 +138,7 @@ const AuthComponent = ({
         allowsNativeAuth: allowsNativeAuth,
         allowsOtpAuth: allowsOtpAuth,
         initialEmailValue: initialEmailValue,
-        title: 'Enter your email address to login with a one time code',
+        title: 'Sign in using the email associated with your account:',
         summitData: summit
     };
 

package/src/components/MarketingHeroComponent.js

@@ -12,7 +12,7 @@ import styles from "../styles/marketing-hero.module.scss";
 
 const MarketingHeroComponent = ({
   location,
-  marketingPageSettings,
+  data,
 }) => {
 
   const sliderRef = useRef(null);
@@ -32,21 +32,21 @@ const MarketingHeroComponent = ({
 
 
   const getButtons = () => {
-    const { registerButton, loginButton } = marketingPageSettings.hero.buttons;
+    const {
+      registerButton,
+      loginButton
+    } = data?.buttons || {};
 
-    return (
-      <>
-        {registerButton.display &&
-          (
-            <span className={styles.link}>
-              <RegistrationLiteComponent location={location} />
-            </span>
-          )}
-        {loginButton.display && (
-          <AuthComponent location={location} />
-        )}
-      </>
-    );
+    return <>
+      {registerButton?.display &&
+      <span className={styles.link}>
+        <RegistrationLiteComponent location={location} />
+      </span>
+      }
+      {loginButton?.display &&
+        <AuthComponent location={location} />
+      }
+    </>;
   };
 
   const sliderSettings = {
@@ -59,8 +59,8 @@ const MarketingHeroComponent = ({
   };
 
   let heroLeftColumnInlineStyles = {};
-  if (marketingPageSettings.hero?.background?.src) {
-    const imageSrc = getSrc(marketingPageSettings.hero.background.src);
+  if (data?.background?.src) {
+    const imageSrc = getSrc(data.background.src);
     heroLeftColumnInlineStyles.backgroundImage = `url(${imageSrc})`;
   }
 
@@ -73,53 +73,53 @@ const MarketingHeroComponent = ({
         >
           <div className={`${styles.heroMarketingContainer} hero-body`}>
             <div className="container">
-              <h1 className="title">{marketingPageSettings.hero.title}</h1>
-              <h2 className="subtitle">{marketingPageSettings.hero.subTitle}</h2>
+              <h1 className="title">{data?.title}</h1>
+              <h2 className="subtitle">{data?.subTitle}</h2>
               <div
                 className={styles.date}
                 style={{
-                  backgroundColor: marketingPageSettings.hero.dateLayout
+                  backgroundColor: data?.dateLayout
                     ? "var(--color_secondary)"
                     : "",
-                  display: marketingPageSettings.hero.dateLayout
+                  display: data?.dateLayout
                     ? ""
                     : "inline",
-                  transform: marketingPageSettings.hero.dateLayout
+                  transform: data?.dateLayout
                     ? "skew(-25deg)"
                     : "skew(0deg)",
                 }}
               >
-                {marketingPageSettings.hero?.dateLayout ?
-                <div style={{transform: "skew(25deg)"}}>{marketingPageSettings.hero?.date}</div>
+                {data?.dateLayout ?
+                <div style={{transform: "skew(25deg)"}}>{data?.date}</div>
                 :
                 <div style={{transform: "skew(0deg)"}}>
-                  <span>{marketingPageSettings.hero?.date}</span>
+                  <span>{data?.date}</span>
                 </div>
                 }
               </div>
-              <h4>{marketingPageSettings.hero?.time}</h4>
+              <h4>{data?.time}</h4>
               <div className={styles.heroButtons}>
                 {getButtons()}
               </div>
             </div>
           </div>
         </div>
-        {marketingPageSettings.hero?.images?.length > 0 &&
+        {data?.images?.length > 0 &&
         <div className={`${styles.rightColumn} column is-6 px-0`} id="marketing-slider" ref={sliderRef}>
-            {marketingPageSettings.hero?.images?.length > 1 ?
-            <Slider {...sliderSettings}>
-              {marketingPageSettings.hero.images.map((image, index) => {
-                const imageSrc = getSrc(image.src);
-                return (
-                  <div key={index}>
-                    <div className={styles.imageSlider} aria-label={image.alt} style={{ backgroundImage: `url(${imageSrc})`, height: sliderHeight, marginBottom: -6 }} />
-                  </div>
-                );
-              })}
-            </Slider>
-            :
-            <div className={styles.singleImage} aria-label={marketingPageSettings.hero.images[0].alt} style={{ backgroundImage: `url(${getSrc(marketingPageSettings.hero.images[0].src)})`}} >
-            </div>
+          {data?.images?.length > 1 ?
+          <Slider {...sliderSettings}>
+            {data.images.map((image, index) => {
+              const imageSrc = getSrc(image.src);
+              return (
+                <div key={index}>
+                  <div className={styles.imageSlider} aria-label={image.alt} style={{ backgroundImage: `url(${imageSrc})`, height: sliderHeight, marginBottom: -6 }} />
+                </div>
+              );
+            })}
+          </Slider>
+          :
+          <div className={styles.singleImage} aria-label={data.images[0].alt} style={{ backgroundImage: `url(${getSrc(data.images[0].src)})`}} >
+          </div>
           }
         </div>
       }

package/src/content/invitations-reject-page/index.json

@@ -0,0 +1,7 @@
+{
+  "title": "Invitation rejection",
+  "notFoundText": "Invitation not found.",
+  "rejectedText": "You have rejected your invitation. ",
+  "rejectText": "Be certain.  This is your last chance to purchase this ticket...",
+  "rejectCTALabel": "Reject"
+}

package/src/content/marketing-page/index.json

@@ -19,7 +19,7 @@
   "countdown": {
       "display": false
   },
-  "leftColumn": {
+  "widgets": {
     "schedule": {
       "display": false
     },
@@ -30,5 +30,5 @@
       "display": false
     }
   },
-  "masonry": []
+  "masonry": {}
 }

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

@@ -4,6 +4,7 @@ import { connect } from "react-redux";
 import EventPage from "../../templates/event-page";
 import PostersPage from "../../templates/posters-page";
 import SchedulePage from "../../templates/schedule-page";
+import InvitationsRejectPage from "../../templates/invitations-reject-page";
 import SponsorPage from "../../templates/sponsor-page";
 import ExpoHallPage from "../../templates/expo-hall-page";
 import FullProfilePage from "../../templates/full-profile-page";
@@ -19,8 +20,21 @@ import withFeedsWorker from "../../utils/withFeedsWorker";
 import Seo from "../../components/Seo";
 import Link from "../../components/Link";
 import { titleFromPathname } from "../../utils/urlFormating";
+import {graphql} from "gatsby";
 
-const App = ({ isLoggedUser, user, summitPhase, allowClick = true }) => {
+export const appQuery = graphql`
+  query {
+    invitationsRejectPageJson {
+      title
+      notFoundText
+      rejectedText
+      rejectText
+      rejectCTALabel
+    }
+  }
+`;
+
+const App = ({ isLoggedUser, user, summitPhase, allowClick = true, data }) => {
   return (
     <Location>
       {({ location }) => (
@@ -34,6 +48,7 @@ const App = ({ isLoggedUser, user, summitPhase, allowClick = true }) => {
             }}
             allowClick={allowClick}
           />
+          <InvitationsRejectPage path="/invitations/reject/:invitationToken" location={location} data={data} />
           <WithAuthRoute path="/" isLoggedIn={isLoggedUser} location={location}>
             <MyTicketsPage path="/my-tickets" isLoggedIn={isLoggedUser} user={user} location={location} />
             <FullProfilePage path="/profile" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location} />

package/src/pages/index.js

@@ -54,7 +54,7 @@ export const marketingPageQuery = graphql`
         display
         text
       }
-      leftColumn {
+      widgets {
         text {
           content
           display
@@ -84,24 +84,27 @@ export const marketingPageQuery = graphql`
           display
         }
       }
-      eventRedirect
       masonry {
-        placement
-        size
-        images {
-          src {
-            childImageSharp {
-              gatsbyImageData (
-                quality: 100
-                placeholder: BLURRED
-                layout: FULL_WIDTH
-              )
+        display
+        items {
+          placement
+          size
+          images {
+            src {
+              childImageSharp {
+                gatsbyImageData (
+                  quality: 100
+                  placeholder: BLURRED
+                  layout: FULL_WIDTH
+                )
+              }
             }
+            alt
+            link
           }
-          alt
-          link
         }
       }
+      eventRedirect
     }
   }
 `;

package/src/reducers/schedule-reducer.js

@@ -18,6 +18,7 @@ const INITIAL_STATE = {
     colorSource: 'track',
     is_my_schedule: false,
     only_events_with_attendee_access: false,
+    hide_past_events_with_show_always_on_schedule: false,
 };
 
 const scheduleReducer = (state = INITIAL_STATE, action) => {
@@ -41,6 +42,7 @@ const scheduleReducer = (state = INITIAL_STATE, action) => {
                 filters,
                 baseFilters,
                 only_events_with_attendee_access,
+                hide_past_events_with_show_always_on_schedule,
                 is_my_schedule,
                 userProfile,
                 isLoggedUser
@@ -48,15 +50,25 @@ const scheduleReducer = (state = INITIAL_STATE, action) => {
 
             const filterByAccessLevel = only_events_with_attendee_access && isLoggedUser;
             const filterByMySchedule = is_my_schedule && isLoggedUser;
-            const allFilteredEvents = preFilterEvents(all_events, pre_filters, summitTimeZoneId, userProfile, filterByAccessLevel, filterByMySchedule);
+            const allFilteredEvents = preFilterEvents(all_events, pre_filters, summitTimeZoneId, userProfile, filterByAccessLevel, filterByMySchedule, hide_past_events_with_show_always_on_schedule);
             const newFilters = syncFilters(filters, state.filters);
-            const events = getFilteredEvents(allFilteredEvents, newFilters, summitTimeZoneId);
+            const events = getFilteredEvents(allFilteredEvents, newFilters, summitTimeZoneId, hide_past_events_with_show_always_on_schedule);
 
-            return {...state, allEvents: allFilteredEvents, baseFilters, filters: newFilters, colorSource: color_source.toLowerCase(), events, is_my_schedule, only_events_with_attendee_access};
+            return {
+                ...state,
+                allEvents: allFilteredEvents,
+                baseFilters,
+                filters: newFilters,
+                colorSource: color_source.toLowerCase(),
+                events,
+                is_my_schedule,
+                only_events_with_attendee_access,
+                hide_past_events_with_show_always_on_schedule
+            };
         }
         case `SCHED_UPDATE_FILTER`: {
            
-            const { type : filterType, values } = payload;
+            const { type : filterType, values, hide_past_events_with_show_always_on_schedule } = payload;
             const { filters, allEvents } = state;
             // update the filters with new values
             const newFilters = {
@@ -70,24 +82,24 @@ const scheduleReducer = (state = INITIAL_STATE, action) => {
             return {...state,
                 filters : newFilters ,
                 // refilter events
-                events: getFilteredEvents(allEvents, newFilters, summitTimeZoneId)}
+                events: getFilteredEvents(allEvents, newFilters, summitTimeZoneId, hide_past_events_with_show_always_on_schedule)}
         }
         case `SCHED_UPDATE_FILTERS`: {
             const {filters, view} = payload;
-            const {allEvents} = state;
+            const {allEvents, hide_past_events_with_show_always_on_schedule} = state;
             
             // update events
-            const events = getFilteredEvents(allEvents, filters, summitTimeZoneId);
+            const events = getFilteredEvents(allEvents, filters, summitTimeZoneId, hide_past_events_with_show_always_on_schedule);
 
             return {...state, filters, events, view}
         }
         case `SCHED_CLEAR_FILTERS`: {
-            const { allEvents, baseFilters } = state;
+            const { allEvents, baseFilters, hide_past_events_with_show_always_on_schedule } = state;
             
             return {...state,
                 filters : baseFilters ,
                 // refilter events
-                events: getFilteredEvents(allEvents, baseFilters, summitTimeZoneId)}
+                events: getFilteredEvents(allEvents, baseFilters, summitTimeZoneId, hide_past_events_with_show_always_on_schedule)}
         }
         case `SCHED_CHANGE_VIEW`: {
             const {view} = payload;
@@ -99,20 +111,20 @@ const scheduleReducer = (state = INITIAL_STATE, action) => {
         }
         case `SCHED_ADD_TO_SCHEDULE`: {
             const event = payload;
-            const {allEvents, filters} = state;
+            const {allEvents, filters, hide_past_events_with_show_always_on_schedule} = state;
 
             allEvents.push(event);
-            const events = getFilteredEvents(allEvents, filters, summitTimeZoneId);
+            const events = getFilteredEvents(allEvents, filters, summitTimeZoneId, hide_past_events_with_show_always_on_schedule);
 
             return {...state, allEvents, events};
 
         }
         case `SCHED_REMOVE_FROM_SCHEDULE`: {
             const event = payload;
-            const {allEvents: allEventsCurrent, filters} = state;
+            const {allEvents: allEventsCurrent, filters, hide_past_events_with_show_always_on_schedule} = state;
 
             const allEvents = allEventsCurrent.filter(ev => ev.id !== event.id);
-            const events = getFilteredEvents(allEvents, filters, summitTimeZoneId);
+            const events = getFilteredEvents(allEvents, filters, summitTimeZoneId, hide_past_events_with_show_always_on_schedule);
 
             return {...state, allEvents, events};
 

package/src/reducers/user-reducer.js

@@ -16,7 +16,10 @@ import {
   CAST_PRESENTATION_VOTE_RESPONSE,
   UNCAST_PRESENTATION_VOTE_RESPONSE,
   TOGGLE_PRESENTATION_VOTE,
-  TICKET_OWNER_CHANGED
+  TICKET_OWNER_CHANGED,
+  RECEIVE_INVITATION,
+  REQUEST_INVITATION,
+  REJECT_INVITATION
 } from '../actions/user-actions';
 import { RESET_STATE } from '../actions/base-actions-definitions';
 import { isAuthorizedUser } from '../utils/authorizedGroups';
@@ -29,7 +32,8 @@ const DEFAULT_STATE = {
   idpProfile: null,
   isAuthorized: false,
   hasTicket: false,
-  attendee: null
+  attendee: null,
+  invitation: null,
 }
 
 const userReducer = (state = DEFAULT_STATE, action) => {
@@ -107,6 +111,15 @@ const userReducer = (state = DEFAULT_STATE, action) => {
         }
       };
     }
+    case REQUEST_INVITATION: {
+      return {...state, invitation: null};
+    }
+    case RECEIVE_INVITATION: {
+      return {...state, invitation: payload.response}
+    }
+    case REJECT_INVITATION: {
+      return {...state, invitation: {...state.invitation, status: 'Rejected'}}
+    }
     default:
       return state;
   }

package/src/styles/invitation-reject.module.scss

@@ -0,0 +1,24 @@
+@import "colors.scss";
+
+.container {
+  position: inherit;
+
+  .wrapper {
+    display: flex;
+    flex-direction: column;
+    max-width: 800px;
+    margin: 0 auto;
+
+    h1 {
+      margin-top: 40px;
+    }
+
+    div {
+      margin-top: 10px;
+    }
+
+    button {
+      margin-top: 40px;
+    }
+  }
+}

package/src/templates/expo-hall-page.js

@@ -13,6 +13,7 @@ const ExpoHallPage = ({
 }) => {
   const { expoHallPageJson: { hero } } = data;
   const style = hero?.background ? { backgroundImage: `url(${getSrc(hero.background.src)})` } : {};
+
   return (
     <Layout location={location}>
       <AttendanceTrackerComponent />

package/src/templates/invitations-reject-page.js

@@ -0,0 +1,106 @@
+import React, {useEffect, useState, useCallback, useRef} from "react";
+import PropTypes from "prop-types";
+import {connect} from "react-redux";
+import Layout from "../components/Layout";
+import AttendanceTrackerComponent from "../components/AttendanceTrackerComponent";
+import AccessTracker from "../components/AttendeeToAttendeeWidgetComponent";
+import {getInvitation, rejectInvitation} from "../actions/user-actions";
+
+import styles from "../styles/invitation-reject.module.scss";
+
+const InvitationsRejectPage = ({data, location, invitationToken, invitation, loading, ...props}) => {
+  const [loaded, setLoaded] = useState(false);
+  const [rejecting, setRejecting] = useState(false);
+  const {invitationsRejectPageJson: {title, notFoundText, rejectedText, rejectText, rejectCTALabel}} = data;
+  const titleStr = title || "Reject invitation"
+  const rejectStr = rejectText || "To reject please click on the button below."
+  const rejectCTA = rejectCTALabel || "Reject"
+  const notFoundStr = notFoundText || "Invitation not found."
+  const rejectedStr = rejectedText || "Invitation has already been rejected."
+
+  useEffect(() => {
+    setLoaded(false);
+    if (invitationToken) {
+      props.getInvitation(invitationToken)
+        .finally(() => {
+          setLoaded(true)
+        });
+    }
+  }, []);
+
+  const rejectInvitation = () => {
+    setRejecting(true);
+    props.rejectInvitation(invitationToken)
+      .finally(() => {
+        setRejecting(false);
+      });
+  }
+
+  const getMessage = () => {
+    if (!invitationToken) {
+      return (
+        <>
+          <div>Missing token.</div>
+        </>
+      );
+    }
+    else if (loaded) {
+      if (!invitation) {
+        return (
+          <>
+            <div>{notFoundStr}</div>
+          </>
+        );
+      } else {
+        if (invitation.status === 'Rejected') {
+          return (
+            <>
+              <div>{rejectedStr}</div>
+            </>
+          )
+        } else {
+          return (
+            <>
+              <div>{rejectStr}</div>
+              <button className="button is-large" onClick={rejectInvitation} disabled={rejecting}>
+                {rejectCTA}
+              </button>
+            </>
+          )
+        }
+
+      }
+    } else {
+      return null;
+    }
+  }
+
+
+  return (
+    <Layout location={location}>
+      <div className={`container ${styles.container}`}>
+        <div className={styles.wrapper}>
+          <h1>{titleStr}</h1>
+          {getMessage()}
+        </div>
+      </div>
+      <AttendanceTrackerComponent/>
+      <AccessTracker/>
+    </Layout>
+  );
+};
+
+InvitationsRejectPage.propTypes = {
+  invitationToken: PropTypes.string.isRequired
+};
+
+const mapStateToProps = ({userState, globalState}) => ({
+  invitation: userState.invitation,
+  loading: globalState?.loading
+});
+
+export default connect(
+  mapStateToProps, {
+    getInvitation,
+    rejectInvitation
+  })(InvitationsRejectPage);

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

@@ -20,6 +20,15 @@ import { PHASES } from "../utils/phasesUtils";
 
 import styles from "../styles/marketing.module.scss";
 
+const sliderSettings = {
+  autoplay: true,
+  autoplaySpeed: 5000,
+  infinite: true,
+  dots: false,
+  slidesToShow: 1,
+  slidesToScroll: 1
+};
+
 const MarketingPageTemplate = ({
   location,
   data,
@@ -30,44 +39,42 @@ const MarketingPageTemplate = ({
 }) => {
 
   const {
-    marketingPageJson
-  } = data;
+    marketingPageJson: {
+      hero,
+      countdown,
+      widgets,
+      masonry
+    } = {}
+  } = data || {};
 
   let scheduleProps = {};
-  if (marketingPageJson.leftColumn?.schedule && isLoggedUser && summitPhase !== PHASES.BEFORE) {
+  if (widgets?.schedule && isLoggedUser && summitPhase !== PHASES.BEFORE) {
     scheduleProps = {
       ...scheduleProps,
       onEventClick: (ev) => navigate(`/a/event/${ev.id}`),
     }
   }
 
-  const sliderSettings = {
-    autoplay: true,
-    autoplaySpeed: 5000,
-    infinite: true,
-    dots: false,
-    slidesToShow: 1,
-    slidesToScroll: 1
-  };
+  const shouldRenderMasonry = masonry?.display;
 
   return (
     <Layout marketing={true} location={location}>
       <AttendanceTrackerComponent />
       <MarketingHeroComponent
         location={location}
-        marketingPageSettings={marketingPageJson}
+        data={hero}
       />
-      {summit && marketingPageJson.countdown?.display && <Countdown summit={summit} text={marketingPageJson?.countdown?.text} />}
+      {summit && countdown?.display && <Countdown summit={summit} text={countdown?.text} />}
       <div className="columns">
-        <div className={`column is-half mt-3 px-6 py-6 ${styles.leftColumn}`} style={{ position: 'relative' }}>
-          {marketingPageJson.leftColumn?.text?.content && marketingPageJson.leftColumn?.text?.display &&
+        <div className={`column mt-3 px-6 py-6 ${shouldRenderMasonry ? "is-half" : ""} ${styles.leftColumn ? styles.leftColumn : ""}`} style={{ position: 'relative' }}>
+          {widgets?.text?.display && widgets?.text?.content &&
             <Markdown>
-              {marketingPageJson.leftColumn.text.content}
+              {widgets.text.content}
             </Markdown>
           }
-          {marketingPageJson.leftColumn?.schedule?.display &&
+          {widgets?.schedule?.display &&
             <>
-              <h2><b>{marketingPageJson.leftColumn.schedule.title}</b></h2>
+              <h2><b>{widgets.schedule.title}</b></h2>
               <LiteScheduleComponent
                 {...scheduleProps}
                 lastDataSync={lastDataSync}
@@ -79,28 +86,28 @@ const MarketingPageTemplate = ({
               />
             </>
           }
-          {marketingPageJson.leftColumn?.disqus?.display &&
+          {widgets?.disqus?.display &&
             <>
-              <h2><b>{marketingPageJson.leftColumn.disqus.title}</b></h2>
+              <h2><b>{widgets.disqus.title}</b></h2>
               <DisqusComponent page="marketing-site"/>
             </>
           }
-          {marketingPageJson.leftColumn?.image?.display &&
-           marketingPageJson.leftColumn?.image?.image.src &&
+          {widgets?.image?.display &&
+           widgets?.image?.image.src &&
             <>
-              <h2><b>{marketingPageJson.leftColumn.image.title}</b></h2>
+              <h2><b>{widgets.image.title}</b></h2>
               <br />
-              <GatsbyImage image={getImage(marketingPageJson.leftColumn.image.image.src)} alt={marketingPageJson.leftColumn.image.image.alt ?? ""} />
+              <GatsbyImage image={getImage(widgets.image.image.src)} alt={widgets.image.image.alt ?? ""} />
             </>
           }
         </div>
-        <div className={`column is-half px-0 pb-0 ${styles.rightColumn}`}>
+        {shouldRenderMasonry &&
+        <div className={`column is-half px-0 pb-0 ${styles.rightColumn ? styles.rightColumn : ""}`}>
           <Masonry
             breakpointCols={2}
             className="my-masonry-grid"
             columnClassName="my-masonry-grid_column">
-            { marketingPageJson.masonry &&
-              formatMasonry(marketingPageJson.masonry).map((item, index) => {
+            {masonry.items && formatMasonry(masonry.items).map((item, index) => {
               if (item.images && item.images.length === 1) {
                 const image = getImage(item.images[0].src);
                 return (
@@ -141,6 +148,7 @@ const MarketingPageTemplate = ({
             })}
           </Masonry>
         </div>
+        }
       </div>
     </Layout>
   )

package/src/utils/filePath.js

@@ -35,6 +35,7 @@ const POSTERS_PAGES_FILE_PATH = `${STATIC_CONTENT_DIR_PATH}/posters-pages.json`;
 const MARKETING_SETTINGS_FILE_PATH = `${DATA_DIR_PATH}/marketing-settings.json`;
 const MAINTENANCE_FILE_PATH = `${STATIC_CONTENT_DIR_PATH}/maintenance.json`;
 const EXPO_HALL_PAGE_FILE_PATH = `${STATIC_CONTENT_DIR_PATH}/expo-hall-page/index.json`;
+const INVITATIONS_REJECT_PAGE_FILE_PATH = `${STATIC_CONTENT_DIR_PATH}/invitations-reject-page/index.json`;
 const SPONSORS_FILE_NAME = "sponsors.json";
 const SPONSORS_FILE_PATH = `${STATIC_CONTENT_DIR_PATH}/${SPONSORS_FILE_NAME}`;
 const CMS_FONT_FILE_PATH = "/static/fonts/"
@@ -50,6 +51,7 @@ exports.REQUIRED_DIR_PATHS = [
 	SITE_SETTINGS_DIR_PATH,
 	MARKETING_PAGE_DIR_PATH,
 	LOBBY_PAGE_DIR_PATH,
+	INVITATIONS_REJECT_PAGE_FILE_PATH,
 	NAVBAR_DIR_PATH,
 	FOOTER_DIR_PATH	
 ];
@@ -83,6 +85,7 @@ exports.POSTERS_PAGES_FILE_PATH = POSTERS_PAGES_FILE_PATH;
 exports.MARKETING_SETTINGS_FILE_PATH = MARKETING_SETTINGS_FILE_PATH;
 exports.MAINTENANCE_FILE_PATH = MAINTENANCE_FILE_PATH;
 exports.EXPO_HALL_PAGE_FILE_PATH = EXPO_HALL_PAGE_FILE_PATH;
+exports.INVITATIONS_REJECT_PAGE_FILE_PATH = INVITATIONS_REJECT_PAGE_FILE_PATH;
 exports.SPONSORS_FILE_PATH = SPONSORS_FILE_PATH;
 exports.CMS_FONT_FILE_PATH = CMS_FONT_FILE_PATH;
 exports.PAYMENTS_FILE_PATH = PAYMENTS_FILE_PATH;

package/src/utils/loginUtils.js

@@ -7,13 +7,13 @@ export const getDefaultLocation = (eventRedirect, hasVirtualAccess = false) => {
 
 export const formatThirdPartyProviders = (providersArray) => {
     const providers = [
-        { button_color: '#082238', provider_label: 'Continue with FNid', provider_param: '', provider_logo: '../img/logo_fn.svg', provider_logo_size: 35 },
+        { button_color: '#082238', provider_label: 'Sign in with FNid', provider_param: '', provider_logo: '../img/logo_fn.svg', provider_logo_size: 35 },
     ];
 
     const thirdPartyProviders = [
-        { button_color: '#1877F2', provider_label: 'Continue with Facebook', provider_param: 'facebook', provider_logo: '../img/third-party-idp/logo_facebook.svg', provider_logo_size: 22 },
+        { button_color: '#1877F2', provider_label: 'Login with Facebook', provider_param: 'facebook', provider_logo: '../img/third-party-idp/logo_facebook.svg', provider_logo_size: 22 },
         { button_color: '#0A66C2', provider_label: 'Sign in with LinkedIn', provider_param: 'linkedin', provider_logo: '../img/third-party-idp/logo_linkedin.svg', provider_logo_size: 21 },
-        { button_border_color:'var(--color_input_border_color)', button_color: '#000000', provider_label: 'Continue with Apple', provider_param: 'apple', provider_logo: '../img/third-party-idp/logo_apple.svg', provider_logo_size: 19 }
+        { button_border_color:'var(--color_input_border_color)', button_color: '#000000', provider_label: 'Sign in with Apple', provider_param: 'apple', provider_logo: '../img/third-party-idp/logo_apple.svg', provider_logo_size: 19 }
     ];
 
     return [...providers, ...thirdPartyProviders.filter(p => providersArray && providersArray.includes(p.provider_param))];

package/src/utils/schedule.js

@@ -63,7 +63,7 @@ const filterMyEvents = (myEvents, events) => {
   return events.filter(ev =>  myEventsIds.includes(ev.id));
 };
 
-export const preFilterEvents = (events, filters, summitTimezone, userProfile, filterByAccessLevel, filterByMySchedule) => {
+export const preFilterEvents = (events, filters, summitTimezone, userProfile, filterByAccessLevel, filterByMySchedule, hidePast) => {
   const {schedule_summit_events = []} = userProfile || {};
   let result = [...events];
 
@@ -75,10 +75,11 @@ export const preFilterEvents = (events, filters, summitTimezone, userProfile, fi
     result = filterEventsByAccessLevel(result, userProfile);
   }
 
-  return getFilteredEvents(result, filters, summitTimezone);
+  return getFilteredEvents(result, filters, summitTimezone, hidePast);
 };
 
-export const getFilteredEvents = (events, filters, summitTimezone) => {
+export const getFilteredEvents = (events, filters, summitTimezone, hidePast) => {
+  const localNow = Date.now() / 1000;
 
   return events.filter((ev) => {
     let valid = true;
@@ -90,8 +91,11 @@ export const getFilteredEvents = (events, filters, summitTimezone) => {
       valid = filters.date.values.includes(dateString);
       if (!valid) return false;
     }
-    
-    if (ev.type.show_always_on_schedule) return true;
+
+    if (ev.type.show_always_on_schedule) {
+      // hide past events when the flag is on
+      return !(hidePast && ev.end_date < localNow);
+    }
 
     if (filters.level?.values.length > 0) {
       valid = filters.level.values.some(l => l.toString().toLowerCase() === ev.level?.toLowerCase());