@openeventkit/event-site 2.1.1 → 2.1.3

package/gatsby-node.js

@@ -250,7 +250,8 @@ const SSR_getSummit = async (baseUrl, summitId) => {
       "schedule_settings," +
       "schedule_settings.filters," +
       "schedule_settings.pre_filters,"+
-      "ticket_types",
+      "ticket_types," +
+      "badge_features_types" ,
     t: Date.now()
   };
 

package/netlify.toml

@@ -8,8 +8,6 @@
   YARN_VERSION = "1.22.19"
   YARN_FLAGS = "--no-ignore-optional"
   NODE_OPTIONS = "--max-old-space-size=10240"
-[[plugins]]
-  package = "netlify-plugin-gatsby-cache"
 [[headers]]
   # Define which paths this specific [[headers]] block will cover.
   for = "/*"

package/package.json

@@ -1,18 +1,19 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "author": "Tipit LLC",
   "dependencies": {
     "@emotion/server": "^11.11.0",
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
     "@fortawesome/free-brands-svg-icons": "^6.5.2",
     "@fortawesome/react-fontawesome": "^0.2.2",
+    "@loadable/component": "^5.16.4",
     "@mdx-js/react": "^3.0.1",
     "@mdx-js/runtime": "^1.6.22",
     "@mui/base": "^5.0.0-beta.40",
-    "@mui/icons-material": "^5.15.5",
-    "@mui/material": "^5.15.5",
+    "@mui/icons-material": "^5.15.20",
+    "@mui/material": "^5.15.20",
     "@mux/mux-player-react": "^1.14.1",
     "@ncwidgets/file-relation": "^0.8.0",
     "@ncwidgets/id": "^0.8.1",
@@ -52,7 +53,7 @@
     "event-feedback-widget": "^2.0.1",
     "final-form": "4.20.7",
     "font-awesome": "^4.7.0",
-    "formik": "^2.2.9",
+    "formik": "^2.4.6",
     "full-schedule-widget": "3.0.9",
     "gatsby": "^5.13.5",
     "gatsby-alias-imports": "^1.0.6",
@@ -75,6 +76,7 @@
     "idtoken-verifier": "^2.2.2",
     "immutability-helper": "2.9.1",
     "immutable": "^5.0.0-beta.5",
+    "js-cookie": "^3.0.5",
     "jsdom": "^24.1.0",
     "klaro": "^0.7.21",
     "lite-schedule-widget": "3.0.3",
@@ -84,8 +86,9 @@
     "markdown-it": "^12.0.0",
     "moment": "^2.27.0",
     "moment-timezone": "^0.5.31",
+    "my-orders-tickets-widget": "1.0.0-beta.47",
     "object.assign": "^4.1.5",
-    "openstack-uicore-foundation": "4.1.90",
+    "openstack-uicore-foundation": "4.2.8",
     "path-browserify": "^1.0.1",
     "prop-types": "^15.6.0",
     "react": "^18.2.0",
@@ -97,7 +100,7 @@
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "^18.2.0",
     "react-final-form": "6.5.9",
-    "react-i18next": "^11.16.9",
+    "react-i18next": "^14.1.2",
     "react-iframe-comm": "^1.2.2",
     "react-immutable-proptypes": "^2.2.0",
     "react-laag": "^2.0.5",
@@ -131,9 +134,9 @@
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",
-    "summit-registration-lite": "5.0.44",
+    "summit-registration-lite": "6.0.0",
     "superagent": "8.0.9",
-    "sweetalert2": "^9.17.0",
+    "sweetalert2": "^11.11.1",
     "upcoming-events-widget": "3.0.7",
     "urijs": "^1.19.2",
     "use-fit-text": "^2.4.0",
@@ -145,7 +148,7 @@
     "web-vitals": "^1.1.2",
     "what-input": "^5.2.10",
     "xmlhttprequest": "^1.8.0",
-    "yup": "^0.32.11"
+    "yup": "^1.4.0"
   },
   "keywords": [
     "Open Event Kit"

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

@@ -181,7 +181,6 @@ export const fetchSpeakerById = async(summitId, speakerId, accessToken = null) =
  */
 export const fetchSummitById =  async(summitId, accessToken = null) => {
     let apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/public/v1/summits/${summitId}`);
-
     const expand = [
         'event_types',
         'tracks',
@@ -196,6 +195,7 @@ export const fetchSummitById =  async(summitId, accessToken = null) => {
         'schedule_settings.filters',
         'schedule_settings.pre_filters',
         "ticket_types",
+        "badge_features_types",
     ]
 
     apiUrl.addQuery('expand', expand.join(','));

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

@@ -1,14 +1,15 @@
 import {
-  fileField,  
+  booleanField,
+  fileField,
 } from "../../../fields";
 
-import {  
+import {
   PAYMENTS_FILE_PATH,
   APPLE_PAY_DOMAIN_FILE_PATH,
   APPLE_PAY_DOMAIN_FILE_NAME
 } from "@utils/filePath";
 
-const payments = {  
+const payments = {
   label: "Payments",
   name: "payments",
   file: PAYMENTS_FILE_PATH,
@@ -19,8 +20,13 @@ const payments = {
       file: APPLE_PAY_DOMAIN_FILE_NAME,
       media_folder: APPLE_PAY_DOMAIN_FILE_PATH,
       public_folder: APPLE_PAY_DOMAIN_FILE_PATH,
-    }),            
-  ],        
+    }),
+    booleanField({
+      label: "Hide Postal Code",
+      name: "hidePostalCode",
+      required: false,
+    }),
+  ],
 };
 
 export default payments;

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

@@ -0,0 +1,6 @@
+
+module.exports = `
+  type PaymentsJson implements Node {
+    hidePostalCode: Boolean
+  }
+`;

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

@@ -2,10 +2,12 @@ const siteSettingsTypeDefs = require("./siteSettings/typeDefs");
 const adsTypeDefs = require("./ads/typeDefs");
 const navbarTypeDefs = require("./navbar/typeDefs");
 const footerTypeDefs = require("./footer/typeDefs");
+const paymentsTypeDefs = require("./payments/typeDefs");
 
 module.exports = [
   siteSettingsTypeDefs,
   adsTypeDefs,
   navbarTypeDefs,
-  footerTypeDefs
+  footerTypeDefs,
+  paymentsTypeDefs
 ].join("");

package/src/components/AttendeeToAttendeeWidgetComponent.js

@@ -1,8 +1,8 @@
-import React, { useEffect, useRef, useState, useCallback } from "react";
+import React, {useEffect, useRef, useState, useCallback} from "react";
 import * as Sentry from "@sentry/react";
-import { connect } from "react-redux";
+import {connect} from "react-redux";
 import FragmentParser from "openstack-uicore-foundation/lib/utils/fragment-parser";
-import { getAccessToken } from "openstack-uicore-foundation/lib/security/methods";
+import {getAccessToken} from "openstack-uicore-foundation/lib/security/methods";
 import {
   AttendeeToAttendeeContainer,
   permissions,
@@ -18,14 +18,14 @@ import {
   SUPABASE_URL,
   SUPABASE_KEY,
 } from "@utils/envVariables";
-import { PHASES } from "@utils/phasesUtils";
+import {PHASES} from "@utils/phasesUtils";
 
 import "attendee-to-attendee-widget/dist/index.css";
 
-import { SentryFallbackFunction } from "./SentryErrorComponent";
+import {SentryFallbackFunction} from "./SentryErrorComponent";
 
-import { useEventListener } from "@utils/hooks";
-import { INIT_LOGOUT_EVENT } from "@utils/eventTriggers";
+import {useEventListener} from "@utils/hooks";
+import {INIT_LOGOUT_EVENT} from "@utils/eventTriggers";
 import {getAccessTokenSafely} from "../utils/loginUtils";
 
 const sbAuthProps = {
@@ -33,9 +33,11 @@ const sbAuthProps = {
   supabaseKey: getEnvVariable(SUPABASE_KEY),
 };
 
+const envVarsPresent = getEnvVariable(SUPABASE_URL) && getEnvVariable(SUPABASE_KEY) && getEnvVariable(STREAM_IO_API_KEY) && getEnvVariable(CHAT_API_BASE_URL);
+
 const adminGroups = ["administrators", "super-admins"];
 
-const AttendeesWidgetComponent = ({ user, event, summit, chatSettings }) => {
+const AttendeesWidgetComponent = ({user, event, summit, chatSettings}) => {
   const [loading, setLoading] = useState(true);
 
   //Deep linking support
@@ -44,18 +46,18 @@ const AttendeesWidgetComponent = ({ user, event, summit, chatSettings }) => {
   const sqacRef = useRef();
   const ocrRef = useRef();
 
-  const { userProfile, idpProfile } = user || {};
-  const { summit_tickets } = userProfile || {};
-  const { 
-    email, 
-    groups, 
+  const {userProfile, idpProfile} = user || {};
+  const {summit_tickets} = userProfile || {};
+  const {
+    email,
+    groups,
     bio,
     given_name,
     family_name,
     picture,
     company,
     job_title,
-    sub, 
+    sub,
     github_user,
     linked_in_profile,
     twitter_name,
@@ -69,7 +71,7 @@ const AttendeesWidgetComponent = ({ user, event, summit, chatSettings }) => {
   } = idpProfile || {};
 
   useEffect(() => {
-    if (!user || !userProfile || !idpProfile) return;
+    if (!user || !userProfile || !idpProfile || !envVarsPresent) return;
     const fragmentParser = new FragmentParser();
     const starHelpChatParam = fragmentParser.getParam("starthelpchat");
     const starQAChatParam = fragmentParser.getParam("startqachat");
@@ -88,7 +90,7 @@ const AttendeesWidgetComponent = ({ user, event, summit, chatSettings }) => {
     setLoading(false);
   }, [user, idpProfile, userProfile]);
 
-  if (loading) return <div style={{ margin: "20px auto", position: "relative" }}>Loading...</div>;
+  if (loading) return <div style={{margin: "20px auto", position: "relative"}}>Loading...</div>;
 
   const chatProps = {
     streamApiKey: getEnvVariable(STREAM_IO_API_KEY),
@@ -133,7 +135,7 @@ const AttendeesWidgetComponent = ({ user, event, summit, chatSettings }) => {
           .filter((st) => st.badge)
           .flatMap((st) => st.badge.features)
           .map((feature) => feature.id))]
-    
+
         return summit.badge_features_types.filter((bft) => attendeeBadgeFeatureIds.includes(bft.id));
       },
       bio: bio,
@@ -144,14 +146,14 @@ const AttendeesWidgetComponent = ({ user, event, summit, chatSettings }) => {
       showSocialInfo: public_profile_show_social_media_info === true,
       showBio: public_profile_show_bio === true,
       hasPermission: (permission) => {
-        const isAdmin =  groups &&
-            groups.map((g) => g.slug).filter((g) => adminGroups.includes(g))
-                .length > 0;
+        const isAdmin = groups &&
+          groups.map((g) => g.slug).filter((g) => adminGroups.includes(g))
+            .length > 0;
         switch (permission) {
           case permissions.MANAGE_ROOMS:
             return isAdmin;
           case permissions.CHAT:
-            if(isAdmin) return true;
+            if (isAdmin) return true;
             const accessLevels = summit_tickets
               .flatMap((x) => x.badge?.type.access_levels)
               .filter(
@@ -181,27 +183,27 @@ const AttendeesWidgetComponent = ({ user, event, summit, chatSettings }) => {
     ...sbAuthProps,
   };
 
-  if (!chatSettings?.enabled) return null;
+  if (!chatSettings?.enabled || !envVarsPresent) return null;
 
   return (
-    <div style={{ margin: "20px auto", position: "relative" }}>
-        <Sentry.ErrorBoundary fallback={SentryFallbackFunction({componentName: 'Attendee To Attendee'})}>
-          <AttendeeToAttendeeContainer
-            {...widgetProps}
-            ref={{ sdcRef, shcRef, sqacRef, ocrRef }}
-          />
-        </Sentry.ErrorBoundary>
-      </div>
+    <div style={{margin: "20px auto", position: "relative"}}>
+      <Sentry.ErrorBoundary fallback={SentryFallbackFunction({componentName: 'Attendee To Attendee'})}>
+        <AttendeeToAttendeeContainer
+          {...widgetProps}
+          ref={{sdcRef, shcRef, sqacRef, ocrRef}}
+        />
+      </Sentry.ErrorBoundary>
+    </div>
   );
 };
 
-const mapState = ({ settingState }) => ({
+const mapState = ({settingState}) => ({
   chatSettings: settingState.widgets.chat,
 });
 
 export const AttendeesWidget = connect(mapState)(AttendeesWidgetComponent);
 
-const AccessTracker = ({ user, isLoggedUser, summitPhase, chatSettings, updateChatProfileEnabled=false }) => {
+const AccessTracker = ({user, isLoggedUser, summitPhase, chatSettings, updateChatProfileEnabled = false}) => {
   const chatProps = {
     streamApiKey: getEnvVariable(STREAM_IO_API_KEY),
     apiBaseUrl: getEnvVariable(IDP_BASE_URL),
@@ -215,7 +217,7 @@ const AccessTracker = ({ user, isLoggedUser, summitPhase, chatSettings, updateCh
       return accessToken;
     },
   };
-  
+
   const trackerRef = useRef();
 
   const handleLogout = useCallback(() => {
@@ -228,7 +230,7 @@ const AccessTracker = ({ user, isLoggedUser, summitPhase, chatSettings, updateCh
   useEffect(() => {
     if (!isLoggedUser) {
       if (trackerRef.current)
-          trackerRef.current.signOut();
+        trackerRef.current.signOut();
     }
   }, [isLoggedUser]);
 
@@ -251,7 +253,7 @@ const AccessTracker = ({ user, isLoggedUser, summitPhase, chatSettings, updateCh
     return null;
   }
 
-  const { summit_tickets } = user.userProfile;
+  const {summit_tickets} = user.userProfile;
   const {
     bio,
     given_name,
@@ -310,12 +312,12 @@ const AccessTracker = ({ user, isLoggedUser, summitPhase, chatSettings, updateCh
     ...sbAuthProps
   };
 
-  if (!chatSettings.enabled) return null;
+  if (!chatSettings.enabled || !envVarsPresent) return null;
 
-  return <Tracker {...widgetProps} ref={trackerRef} />;
+  return <Tracker {...widgetProps} ref={trackerRef}/>;
 };
 
-const mapStateToProps = ({ loggedUserState, userState, clockState, settingState }) => ({
+const mapStateToProps = ({loggedUserState, userState, clockState, settingState}) => ({
   isLoggedUser: loggedUserState.isLoggedUser,
   user: userState,
   summitPhase: clockState.summit_phase,

package/src/components/AuthComponent.js

@@ -46,6 +46,7 @@ const AuthComponent = ({
     const [otpLogin, setOtpLogin] = useState(false);
     const [userEmail, setUserEmail] = useState('');
     const [otpLength, setOtpLength] = useState(null);
+    const [otpLifeTime, setOtpLifeTime] = useState(null);
     const [otpError, setOtpError] = useState(false);
 
     const hasVirtualBadge = useMemo(() =>
@@ -129,8 +130,10 @@ const AuthComponent = ({
 
     const sendCode = (email) => {
         setUserEmail(email);
+        setOtpLifeTime(0);
         return getPasswordlessCode(email).then(({ response }) => {
             setOtpLength(response.otp_length);
+            setOtpLifeTime(response.otp_lifetime)
             setOtpLogin(true);
         }).catch((err) => {
             const errorMessage = err.response?.body?.error || err.message;
@@ -154,6 +157,7 @@ const AuthComponent = ({
     const passwordlessLoginProps = {
         email: userEmail,
         codeLength: otpLength,
+        codeLifeTime: otpLifeTime,
         passwordlessLogin: (code) => loginPasswordless(code, userEmail).then(() => {
             // close popup and then navigate bc its its the same origin page
             // it would not reload and closed the popup automatically

package/src/components/AvatarEditorModal/index.js

@@ -1,6 +1,6 @@
 import React, { useState, useRef, useEffect } from "react";
 import AvatarEditor from "react-avatar-editor";
-import { AjaxLoader } from "openstack-uicore-foundation/lib/components";
+import AjaxLoader from "openstack-uicore-foundation/lib/components/ajaxloader";
 import { Box, Typography, Slider, Modal } from "@mui/material";
 import { Button, IconButton } from "../ui";
 import { styled } from "@mui/system";

package/src/components/ChangePasswordComponent.js

@@ -35,6 +35,7 @@ const ChangePasswordComponent = ({ updatePassword }) => {
           <div className={`columns is-mobile ${styles.passwordFields}`}>
             <div className={`columns column is-full ${styles.inputField}`}>
               <b>Current Password</b>
+              <i className={styles.subLabel}>(leave blank if you don't have one)</i>
               <div>
                 <input
                   className={`column is-11 ${styles.input} ${styles.isLarge}`}
@@ -81,7 +82,7 @@ const ChangePasswordComponent = ({ updatePassword }) => {
           </div>
           <div className={`columns is-mobile ${styles.buttons}`}>
             <div className={`column is-full`}>
-              <button disabled={!currentPassword || !newPassword || !newPasswordConfirm}
+              <button disabled={!newPassword || !newPasswordConfirm}
                 className="button is-large"
                 onClick={() => updatePassword(currentPassword, newPassword, newPasswordConfirm)}
               >

package/src/components/DisqusComponent.js

@@ -126,7 +126,10 @@ const DisqusComponent = ({summit, sponsor, event, disqusSSO, hideMobile, title,
     if (!remoteAuthS3) error = ` ${error} ${!remoteAuthS3 ? 'SSO remoteAuthS3 missing' : ''}`;
     if (!apiKey) error = ` ${error} ${!apiKey ? 'SSO apiKey missing' : ''}`;
     if (!shortname) error = ` ${error} ${!shortname ? 'DISQUS_SHORTNAME env var missing' : ''}`;
-    return error;
+
+    // no error, fail silently
+    console.log(error);
+    return null;
   }
 
   const disqusConfig = {

package/src/components/MyOrdersTicketsComponent.js

@@ -1,12 +1,17 @@
 import React from 'react';
 import * as Sentry from "@sentry/react";
 import { useDispatch, useSelector } from 'react-redux';
-import { getEnvVariable, IDP_BASE_URL, SUMMIT_API_BASE_URL, OAUTH2_CLIENT_ID, SUPPORT_EMAIL } from '../utils/envVariables';
-import { MyOrdersTicketsWidget } from './summit-my-orders-tickets';
-import { getUserProfile, ticketOwnerChange } from '../actions/user-actions';
-
+import { getAccessToken } from 'openstack-uicore-foundation/lib/security/methods';
+import { getEnvVariable, SUMMIT_API_BASE_URL, OAUTH2_CLIENT_ID, SUPPORT_EMAIL } from '../utils/envVariables';
+import { getUserProfile, ticketOwnerChange,updateProfile } from '../actions/user-actions';
+import loadable from "@loadable/component";
+import 'my-orders-tickets-widget/dist/index.css';
+import 'my-orders-tickets-widget/dist/i18n';
 import { SentryFallbackFunction } from "./SentryErrorComponent";
-import {getAccessTokenSafely} from "../utils/loginUtils";
+const MyOrdersMyTicketsWidget = loadable(() => import("my-orders-tickets-widget/dist/index"), {
+    ssr: false,
+    fallback: null,
+});
 
 export const MyOrdersTicketsComponent = () => {
     const dispatch = useDispatch();
@@ -18,19 +23,19 @@ export const MyOrdersTicketsComponent = () => {
     const widgetProps = {
         apiBaseUrl: getEnvVariable(SUMMIT_API_BASE_URL),
         clientId: getEnvVariable(OAUTH2_CLIENT_ID),
-        idpBaseUrl: getEnvVariable(IDP_BASE_URL),
         supportEmail: summit.support_email || getEnvVariable(SUPPORT_EMAIL),
         loginUrl: '/',
-        getAccessToken: getAccessTokenSafely,
+        getAccessToken,
         getUserProfile: async () => await dispatch(getUserProfile()),
+        updateProfile: (profile) =>  dispatch(updateProfile(profile)),
         summit,
         user,
         onTicketAssigned: (ticket) => dispatch(ticketOwnerChange(ticket))
     };
 
     return (
-        <Sentry.ErrorBoundary fallback={SentryFallbackFunction({componentName: 'My Orders & Tickets'})}>
-            <MyOrdersTicketsWidget {...widgetProps} />
-        </Sentry.ErrorBoundary>
+      <Sentry.ErrorBoundary fallback={SentryFallbackFunction({componentName: 'My Orders & Tickets'})}>
+          <MyOrdersMyTicketsWidget {...widgetProps} />
+      </Sentry.ErrorBoundary>
     );
 };

package/src/components/RegistrationLiteComponent.js

@@ -5,7 +5,7 @@ import { navigate, withPrefix } from "gatsby";
 import { connect } from "react-redux";
 import URI from "urijs";
 import Swal from "sweetalert2";
-
+import {ERROR_TYPE_ERROR, ERROR_TYPE_VALIDATION, ERROR_TYPE_PAYMENT} from "summit-registration-lite/dist/utils/constants";
 import FragmentParser from "openstack-uicore-foundation/lib/utils/fragment-parser";
 import { doLogin, passwordlessStart, getAccessToken } from "openstack-uicore-foundation/lib/security/methods"
 import { doLogout } from "openstack-uicore-foundation/lib/security/actions"
@@ -22,6 +22,7 @@ import { SentryFallbackFunction } from "./SentryErrorComponent";
 import RegistrationLiteWidget from "summit-registration-lite/dist";
 import "summit-registration-lite/dist/index.css";
 import useSiteSettings from "@utils/useSiteSettings";
+import usePaymentSettings from "@utils/usePaymentSettings";
 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";
@@ -114,6 +115,9 @@ const RegistrationLiteComponent = ({
         return setPasswordlessLogin(params);
     };
 
+    const handleOnError = (e) => {
+    }
+
     const { getSettingByKey } = useMarketingSettings();
 
     const inPersonDisclaimer = getSettingByKey(MARKETING_SETTINGS_KEYS.registrationInPersonDisclaimer);
@@ -132,6 +136,8 @@ const RegistrationLiteComponent = ({
 
     const siteSettings = useSiteSettings();
 
+    const paymentSettings = usePaymentSettings();
+
     const widgetProps = {
         apiBaseUrl: getEnvVariable(SUMMIT_API_BASE_URL),
         clientId: getEnvVariable(OAUTH2_CLIENT_ID),
@@ -173,7 +179,7 @@ const RegistrationLiteComponent = ({
         handleCompanyError: () => handleCompanyError,
         allowsNativeAuth: allowsNativeAuth,
         allowsOtpAuth: allowsOtpAuth,
-        stripeOptions: {
+        providerOptions: {
             fonts: [{ cssSrc: withPrefix("/fonts/fonts.css") }],
             style: { base: { fontFamily: `"Nunito Sans", sans-serif`, fontWeight: 300 } }
         },
@@ -202,7 +208,10 @@ const RegistrationLiteComponent = ({
         showCompanyInputDefaultOptions: showCompanyInputDefaultOptions,
         idpLogoLight: siteSettings?.idpLogo?.idpLogoLight?.publicURL,
         idpLogoDark: siteSettings?.idpLogo?.idpLogoDark?.publicURL,
-        idpLogoAlt: siteSettings?.idpLogo?.idpLogoAlt
+        idpLogoAlt: siteSettings?.idpLogo?.idpLogoAlt,
+        hidePostalCode: paymentSettings?.hidePostalCode,
+        successfulPaymentReturnUrl: `${window.location.origin}/a/my-tickets/`,
+        onError: handleOnError,
     };
 
     const { registerButton } = marketingPageSettings.hero.buttons;

package/src/components/summit-my-orders-tickets/components/DelegatePopup/DelegatePopup.js

@@ -12,7 +12,6 @@
  **/
 import React, { useState } from 'react'
 import { useTranslation } from "react-i18next";
-import { Input } from 'openstack-uicore-foundation/lib/components';
 import usePortal from 'react-useportal';
 
 import './delegate-popup.scss';
@@ -37,7 +36,7 @@ export const DelegatePopup = ({ isOpen, onAccept, onReject }) => {
                         <div className="confirm-popup">
                             <h4>Delegate Ticket</h4>
                             <p>Delegation will create a new attendee and require to you to fill the first Name, last Name and to answer the extra questions again</p>
-                            
+
                             <div className="buttons">
                                 <span onClick={handleRejectClick}>{t("confirm_popup.cancel")}</span>
                                 <span onClick={handleAcceptClick}>{t("confirm_popup.accept")}</span>
@@ -48,4 +47,4 @@ export const DelegatePopup = ({ isOpen, onAccept, onReject }) => {
             )}
         </>
     );
-};
+};

package/src/components/summit-my-orders-tickets/components/MyOrdersTickets.js

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { useTranslation } from "react-i18next";
 import classNames from 'classnames';
-import { AjaxLoader } from "openstack-uicore-foundation/lib/components";
+import AjaxLoader from "openstack-uicore-foundation/lib/components/ajaxloader";
 import { getUserOrders } from '../store/actions/order-actions';
 import { getUserTickets } from '../store/actions/ticket-actions';
 import { OrderList } from './OrderList/OrderList';
@@ -62,7 +62,7 @@ export const MyOrdersTickets = ({ className }) => {
             )}
 
             <div className={classNames('my-orders-tickets', className)}>
-                {hasOrders && (                    
+                {hasOrders && (
                     <OrderList />
                 )}
 
@@ -76,4 +76,4 @@ export const MyOrdersTickets = ({ className }) => {
             </div>
         </>
     );
-};
+};

package/src/components/summit-my-orders-tickets/components/TicketPopup/TicketPopupAssignForm.js

@@ -5,9 +5,8 @@ import { CSSTransition } from "react-transition-group";
 import Alert from 'react-bootstrap/lib/Alert';
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
-import { Input } from 'openstack-uicore-foundation/lib/components'
+import Input from 'openstack-uicore-foundation/lib/components/inputs/text-input'
 import { assignAttendee } from "../../store/actions/ticket-actions";
-import { getSummitFormattedReassignDate } from "../../util";
 import { useTicketAssignedContext } from "../../context/TicketAssignedContext";
 
 const initialValues = {
@@ -134,4 +133,4 @@ export const TicketPopupAssignForm = ({ ticket, summit, order }) => {
             </div>
         </form>
     )
-};
+};

package/src/components/summit-my-orders-tickets/components/TicketPopup/TicketPopupEditDetailsForm/TicketPopupEditDetailsForm.js

@@ -5,7 +5,9 @@ import { CSSTransition } from "react-transition-group";
 import Alert from 'react-bootstrap/lib/Alert';
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
-import { Input, RegistrationCompanyInput, RawHTML } from 'openstack-uicore-foundation/lib/components';
+import Input from 'openstack-uicore-foundation/lib/components/inputs/text-input'
+import RegistrationCompanyInput from 'openstack-uicore-foundation/lib/components/inputs/registration-company-input';
+import RawHTML from 'openstack-uicore-foundation/lib/components/raw-html';
 import ExtraQuestionsForm from 'openstack-uicore-foundation/lib/components/extra-questions';
 import QuestionsSet from 'openstack-uicore-foundation/lib/utils/questions-set';
 import { getMainOrderExtraQuestions } from '../../../store/actions/summit-actions';

package/src/components/summit-my-orders-tickets/components/TicketPopup/TicketPopupReassignForm.js

@@ -5,7 +5,7 @@ import { CSSTransition } from "react-transition-group";
 import Alert from 'react-bootstrap/lib/Alert';
 import { useFormik } from 'formik';
 import * as Yup from 'yup';
-import { Input } from 'openstack-uicore-foundation/lib/components'
+import Input from 'openstack-uicore-foundation/lib/components/inputs/text-input'
 import { changeTicketAttendee } from "../../store/actions/ticket-actions";
 import { ConfirmPopup, CONFIRM_POPUP_CASE } from "../ConfirmPopup/ConfirmPopup";
 import { getSummitFormattedReassignDate } from "../../util";

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

@@ -11,13 +11,13 @@
       },
       "loginButton": {
         "text": "Log In",
-        "display": false
+        "display": true
       }
     },
     "images": []
   },
   "countdown": {
-      "display": false
+    "display": false
   },
   "widgets": {
     "schedule": {

package/src/content/{payments.json → payments/index.json}

@@ -1,3 +1,4 @@
 {
-  "applePayDomainFile": "/static/.well-known/apple-developer-merchantid-domain-association"
-}
+  "applePayDomainFile": "/static/.well-known/apple-developer-merchantid-domain-association",
+  "hidePostalCode": false
+}

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

@@ -1 +1 @@
-{"favicon":{"asset":"icon.png"},"widgets":{"chat":{"enabled":true,"showQA":false,"showHelp":false,"defaultScope":"page"},"schedule":{"allowClick":true}},"identityProviderButtons":[{"buttonColor":"#082238","providerLabel":"Continue with FNid","providerLogo":"logo_fn.svg","providerLogoSize":27},{"buttonColor":"#0A66C2","providerLabel":"Sign in with LinkedIn","providerParam":"linkedin","providerLogo":"logo_linkedin.svg","providerLogoSize":18},{"buttonColor":"#000000","providerLabel":"Sign in with Apple","providerParam":"apple","providerLogoSize":17,"providerLogo":"logo_apple.svg"},{"buttonColor":"#1877F2","providerLabel":"Login with Facebook","providerParam":"facebook","providerLogo":"logo_facebook.svg","providerLogoSize":20}],"maintenanceMode":{"enabled":false,"title":"Site under maintenance","subtitle":"Please reload page shortly"},"staticJsonFilesBuildTime":[{"file":"src/data/summit.json","build_time":1729267425393},{"file":"src/data/events.json","build_time":1729267444704},{"file":"src/data/events.idx.json","build_time":1729267444760},{"file":"src/data/speakers.json","build_time":1729267451072},{"file":"src/data/speakers.idx.json","build_time":1729267451085},{"file":"src/content/sponsors.json","build_time":1729267451432},{"file":"src/data/voteable-presentations.json","build_time":1729267451798}],"lastBuild":1729267451799}
+{"favicon":{"asset":"icon.png"},"widgets":{"chat":{"enabled":true,"showQA":false,"showHelp":false,"defaultScope":"page"},"schedule":{"allowClick":true}},"identityProviderButtons":[{"buttonColor":"#082238","providerLabel":"Continue with FNid","providerLogo":"logo_fn.svg","providerLogoSize":27},{"buttonColor":"#0A66C2","providerLabel":"Sign in with LinkedIn","providerParam":"linkedin","providerLogo":"logo_linkedin.svg","providerLogoSize":18},{"buttonColor":"#000000","providerLabel":"Sign in with Apple","providerParam":"apple","providerLogoSize":17,"providerLogo":"logo_apple.svg"},{"buttonColor":"#1877F2","providerLabel":"Login with Facebook","providerParam":"facebook","providerLogo":"logo_facebook.svg","providerLogoSize":20}],"maintenanceMode":{"enabled":false,"title":"Site under maintenance","subtitle":"Please reload page shortly"},"staticJsonFilesBuildTime":[{"file":"src/data/summit.json","build_time":1748026605601},{"file":"src/data/events.json","build_time":1748026626928},{"file":"src/data/events.idx.json","build_time":1748026626985},{"file":"src/data/speakers.json","build_time":1748026634015},{"file":"src/data/speakers.idx.json","build_time":1748026634022},{"file":"src/content/sponsors.json","build_time":1748026637386},{"file":"src/data/voteable-presentations.json","build_time":1748026638342}],"lastBuild":1748026638342}

package/src/content/sponsors.json

@@ -1 +1 @@
-[]
+[{"id":360,"created":1741369599,"last_edited":1741369599,"order":2,"summit_id":63,"is_published":true,"side_image":null,"header_image":null,"header_image_mobile":null,"carousel_advertise_image":null,"marquee":"","intro":"","external_link":"","video_link":"","chat_link":"","featured_event_id":0,"header_image_alt_text":"","side_image_alt_text":"","header_image_mobile_alt_text":"","carousel_advertise_image_alt_text":"","show_logo_in_event_page":true,"lead_report_setting_id":null,"extra_questions":[541],"members":[96743,29308],"company":{"id":3496,"created":1654774567,"last_edited":1654774567,"name":"Tipit","url":null,"url_segment":null,"city":null,"state":null,"country":null,"description":null,"industry":null,"contributions":null,"member_level":null,"overview":null,"products":null,"commitment":null,"commitment_author":null,"logo":null,"big_logo":null,"color":"#f0f0ee","display_on_site":false,"featured":false,"contact_email":null,"admin_email":null,"sponsorships":[],"project_sponsorships":[]},"sponsorship":{"id":2065,"widget_title":"Test Widget Title","lobby_template":"big-images","expo_hall_template":"big-images","sponsor_page_template":"small-header","event_page_template":"small-images","sponsor_page_use_disqus_widget":false,"sponsor_page_use_live_event_widget":false,"sponsor_page_use_schedule_widget":false,"sponsor_page_use_banner_widget":false,"badge_image":"https://summit-api-dev-assets.nyc3.digitaloceanspaces.com/summits/63/summit_sponsorship_types/2065/shopping.png","badge_image_alt_text":"","summit_id":63,"order":2,"should_display_on_expo_hall_page":false,"should_display_on_lobby_page":false,"type":{"id":8,"created":1603223268,"last_edited":1603223268,"name":"Featured","label":"Featured","order":8,"size":"Large"}},"ads":[],"materials":[],"social_networks":[]}]

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

@@ -82,12 +82,12 @@ const App = ({ isLoggedUser, user, summitPhase, allowClick = true, data }) => {
             <MyTicketsPage path="/my-tickets" isLoggedIn={isLoggedUser} user={user} location={location} />
             <FullProfilePage path="/profile" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location} />
             <ExtraQuestionsPage path="/extra-questions" isLoggedIn={isLoggedUser} user={user} location={location} />
-            { !mySchedulePageJson.needsTicketAuthz && mySchedulePage({location, summitPhase,isLoggedUser, user, allowClick, title:mySchedulePageJson.title, key: mySchedulePageJson.key }) }
+            { mySchedulePageJson && !mySchedulePageJson.needsTicketAuthz && mySchedulePage({location, summitPhase,isLoggedUser, user, allowClick, title:mySchedulePageJson.title, key: mySchedulePageJson.key }) }
             <WithAuthzRoute path="/" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location}>
                 <PostersPage path="/posters" trackGroupId={0} location={location} />
                 <PostersPage path="/posters/:trackGroupId" location={location} />
                 <PosterDetailPage path="/poster/:presentationId/" isLoggedIn={isLoggedUser} user={user} location={location} />
-                { mySchedulePageJson.needsTicketAuthz && mySchedulePage({location, summitPhase,isLoggedUser, user, allowClick, title: mySchedulePageJson.title, key: mySchedulePageJson.key }) }
+                { mySchedulePageJson && mySchedulePageJson.needsTicketAuthz && mySchedulePage({location, summitPhase,isLoggedUser, user, allowClick, title: mySchedulePageJson.title, key: mySchedulePageJson.key }) }
                 <ShowOpenRoute path="/" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location}>
                   <WithBadgeRoute path="/event/:eventId" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location}>
                     <EventPage path="/" summitPhase={summitPhase} isLoggedIn={isLoggedUser} user={user} location={location} />

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

@@ -40,8 +40,12 @@ export class LogOutCallbackRoute extends React.Component {
             let query = URI.parseQuery(location.search);
             // compare the state and perform the final logout
             if (query.hasOwnProperty("state") && query["state"] === postLogoutState) {
-                this.props.doLogout();
                 let backUrl = getFromLocalStorage('post_logout_redirect_path', true);
+                this.props.doLogout();
+                // clear current state , bc unmounted widgets will not receive the LOG_OUT event
+                if(typeof window !== 'undefined') {
+                    window.localStorage.clear();
+                }
                 navigate(backUrl ? backUrl : '/');
                 return;
             }
@@ -69,4 +73,4 @@ export default connect(
     {
         doLogout
     }
-)(LogOutCallbackRoute)
+)(LogOutCallbackRoute)

package/src/styles/change-password.module.scss

@@ -30,7 +30,12 @@
         margin-bottom: 5px;
       }
 
-      i {
+      .subLabel {
+        margin-top: -6px;
+        margin-bottom: 10px;
+      }
+
+      :global(.fa) {
         margin-left: 10px;
         color: #d3d3d3;
         cursor: pointer;

package/src/templates/extra-questions-page.js

@@ -10,7 +10,9 @@ import { isEmpty } from "lodash";
 import { getExtraQuestions } from '../actions/summit-actions';
 import { saveAttendeeQuestions } from '../actions/user-actions';
 import { TICKET_ATTENDEE_KEYS as TicketKeys } from '../components/summit-my-orders-tickets/store/actions/ticket-actions';
-import { Input, RegistrationCompanyInput, RawHTML } from 'openstack-uicore-foundation/lib/components';
+import Input from 'openstack-uicore-foundation/lib/components/inputs/text-input'
+import RegistrationCompanyInput  from 'openstack-uicore-foundation/lib/components/inputs/registration-company-input';
+import RawHTML from 'openstack-uicore-foundation/lib/components/raw-html';
 import FragmentParser from "openstack-uicore-foundation/lib/utils/fragment-parser";
 import QuestionsSet from 'openstack-uicore-foundation/lib/utils/questions-set';
 import ExtraQuestionsForm from 'openstack-uicore-foundation/lib/components/extra-questions';
@@ -259,12 +261,12 @@ export const ExtraQuestionsPageTemplate = ({ user, summit, extraQuestions, atten
                                 onChange={(e) =>
                                     formik.setFieldTouched(TicketKeys.disclaimerAccepted, true) && formik.handleChange(e)
                                 }
-                                checked={formik.values[TicketKeys.disclaimerAccepted]}                                
+                                checked={formik.values[TicketKeys.disclaimerAccepted]}
                             />
                             <label htmlFor={TicketKeys.disclaimerAccepted}>
                                 {summit.registration_disclaimer_mandatory && <b> *</b>}
-                            </label>                            
-                        </div>                        
+                            </label>
+                        </div>
                         <div className="mt-3">
                             <RawHTML>
                                 {summit.registration_disclaimer_content}

package/src/utils/filePath.js

@@ -41,7 +41,8 @@ const INVITATIONS_REJECT_PAGE_FILE_PATH = `${STATIC_CONTENT_DIR_PATH}/invitation
 const SPONSORS_FILE_NAME = "sponsors.json";
 const SPONSORS_FILE_PATH = `${STATIC_CONTENT_DIR_PATH}/${SPONSORS_FILE_NAME}`;
 const CMS_FONT_FILE_PATH = "/static/fonts/"
-const PAYMENTS_FILE_PATH = `${STATIC_CONTENT_DIR_PATH}/payments.json`;
+const PAYMENTS_DIR_PATH = `${STATIC_CONTENT_DIR_PATH}/payments`;
+const PAYMENTS_FILE_PATH = `${PAYMENTS_DIR_PATH}/index.json`;
 const APPLE_PAY_DOMAIN_FILE_PATH = `/static/.well-known/`
 const APPLE_PAY_DOMAIN_FILE_NAME = `apple-developer-merchantid-domain-association`;
 const MY_SCHEDULE_PAGE_DIR_PATH = `${STATIC_CONTENT_DIR_PATH}/my-schedule-page`;
@@ -58,7 +59,8 @@ exports.REQUIRED_DIR_PATHS = [
   INVITATIONS_REJECT_PAGE_FILE_PATH,
   NAVBAR_DIR_PATH,
   FOOTER_DIR_PATH,
-  MY_SCHEDULE_PAGE_FILE_PATH
+  MY_SCHEDULE_PAGE_FILE_PATH,
+  PAYMENTS_DIR_PATH
 ];
 
 exports.STATIC_CONTENT_DIR_PATH = STATIC_CONTENT_DIR_PATH;

package/src/utils/usePaymentSettings.js

@@ -0,0 +1,20 @@
+import {
+    graphql,
+    useStaticQuery
+  } from "gatsby";
+  
+  const paymentSettingsQuery = graphql`
+    query {
+      paymentsJson {
+        hidePostalCode
+      }
+    }
+  `;
+  
+  const usePaymentSettings = () => {
+    const { paymentsJson } = useStaticQuery(paymentSettingsQuery);
+    return paymentsJson;
+  };
+  
+  export default usePaymentSettings;
+