@openeventkit/event-site 2.0.145 → 2.0.146

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.145",
+  "version": "2.0.146",
   "author": "Tipit LLC",
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^6.5.2",
@@ -130,7 +130,7 @@
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",
-    "summit-registration-lite": "5.0.41",
+    "summit-registration-lite": "5.0.42",
     "superagent": "8.0.9",
     "sweetalert2": "^9.17.0",
     "upcoming-events-widget": "3.0.7",

package/src/components/RegistrationLiteComponent.js

@@ -119,6 +119,7 @@ const RegistrationLiteComponent = ({
     const initialOrderComplete1stParagraph = getSettingByKey(MARKETING_SETTINGS_KEYS.regLiteInitialOrderComplete1stParagraph);
     const initialOrderComplete2ndParagraph = getSettingByKey(MARKETING_SETTINGS_KEYS.regLiteInitialOrderComplete2ndParagraph);
     const initialOrderCompleteButton = getSettingByKey(MARKETING_SETTINGS_KEYS.regLiteInitialOrderCompleteButton);
+    const orderCompleteTitle = getSettingByKey(MARKETING_SETTINGS_KEYS.regLiteOrderCompleteTitle);
     const orderComplete1stParagraph = getSettingByKey(MARKETING_SETTINGS_KEYS.regLiteOrderComplete1stParagraph);
     const orderComplete2ndParagraph = getSettingByKey(MARKETING_SETTINGS_KEYS.regLiteOrderComplete2ndParagraph);
     const orderCompleteButton = getSettingByKey(MARKETING_SETTINGS_KEYS.regLiteOrderCompleteButton);
@@ -187,6 +188,7 @@ const RegistrationLiteComponent = ({
         initialOrderComplete1stParagraph: initialOrderComplete1stParagraph,
         initialOrderComplete2ndParagraph: initialOrderComplete2ndParagraph,
         initialOrderCompleteButton: initialOrderCompleteButton,
+        orderCompleteTitle: orderCompleteTitle,
         orderComplete1stParagraph: orderComplete1stParagraph,
         orderComplete2ndParagraph: orderComplete2ndParagraph,
         orderCompleteButton: orderCompleteButton,

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

@@ -26,7 +26,9 @@ export const TicketPopupReassignForm = ({ ticket, summit, order }) => {
     const [showConfirm, setShowConfirm] = useState(false);
     const [newAttendeeEmail, setNewAttendeeEmail] = useState('');
     const [showSaveMessage, setShowSaveMessage] = useState(false);
+    const [showErrorMessage, setShowErrorMessage] = useState(false);
     const [message, setMessage] = useState('')
+    const [errorMessage, setErrorMessage] = useState('')
 
     const { onTicketAssignChange } = useTicketAssignedContext();
 
@@ -38,6 +40,11 @@ export const TicketPopupReassignForm = ({ ticket, summit, order }) => {
         setTimeout(() => setShowSaveMessage(false), 5000);
     };
 
+    const toggleErrorMessage = () => {
+        setTimeout(() => setShowErrorMessage(true), 50);
+        setTimeout(() => setShowErrorMessage(false), 5000);
+    };
+
     const handleSubmit = (values, formikHelpers) => {
         setNewAttendeeEmail(values.attendee_email);
         setShowConfirm(true);
@@ -62,14 +69,17 @@ export const TicketPopupReassignForm = ({ ticket, summit, order }) => {
 
         dispatch(changeTicketAttendee({
             ticket,
-            message,            
+            message,
             order,
             data: { attendee_email: newAttendeeEmail }
         })).then((updatedTicket) => {
             onTicketAssignChange(updatedTicket);
             toggleSaveMessage();
             setMessage('');
-        });
+        }).catch((err) => {
+            setErrorMessage(err);
+            toggleErrorMessage();
+        })
     };
 
     const handleConfirmReject = () => {
@@ -83,12 +93,12 @@ export const TicketPopupReassignForm = ({ ticket, summit, order }) => {
             <form className="ticket-reassign-form" onSubmit={formik.handleSubmit}>
                 <div className="ticket-popup-form-body">
                     {
-                        isTicketPrinted ? 
+                        isTicketPrinted ?
                         <>
                             <p>
                                 {t("ticket_popup.reassign_printed_ticket")}
                             </p>
-                        </> 
+                        </>
                         :
                         <>
                             {showSaveMessage && (
@@ -104,6 +114,19 @@ export const TicketPopupReassignForm = ({ ticket, summit, order }) => {
                                 </CSSTransition>
                             )}
 
+                            {showErrorMessage && (
+                              <CSSTransition
+                                unmountOnExit
+                                in={showErrorMessage}
+                                timeout={2000}
+                                classNames="fade-in-out"
+                              >
+                                  <Alert bsStyle="warning" className="ticket-popup-form-alert text-center">
+                                      {errorMessage}
+                                  </Alert>
+                              </CSSTransition>
+                            )}
+
                             {!isUserTicketOwner && (
                                 <>
                                     <p>
@@ -167,4 +190,4 @@ export const TicketPopupReassignForm = ({ ticket, summit, order }) => {
             />
         </>
     )
-};
+};

package/src/components/summit-my-orders-tickets/store/actions/ticket-actions.js

@@ -28,6 +28,7 @@ import { objectToQueryString } from 'openstack-uicore-foundation/lib/utils/metho
 import { getIdToken } from 'openstack-uicore-foundation/lib/security/methods';
 import { getUserOrders } from "./order-actions";
 import { updateProfile } from './user-actions';
+import { processActionError } from   './../../util/helpers/index';
 
 export const GET_TICKETS = 'GET_TICKETS';
 export const ASSIGN_TICKET = 'ASSIGN_TICKET';
@@ -49,10 +50,10 @@ export const TICKET_ATTENDEE_KEYS = {
     extraQuestions: 'extra_questions'
 }
 
-const customFetchErrorHandler = (response) => {
+const customFetchErrorHandler = (response) => (dispatch) => {
     let code = response.status;
     let msg = response.statusText;
-
+    dispatch(stopLoading());
     switch (code) {
         case 403:
             Swal.fire('ERROR', i18n.t('errors.user_not_authz'), 'warning');
@@ -76,6 +77,24 @@ const customFetchErrorHandler = (response) => {
     }
 };
 
+const customWithout412ErrorHandler = (
+  err
+) => (dispatch) => {
+    dispatch(stopLoading());
+    switch (err.status) {
+        case 403:
+            Swal.fire('ERROR', i18n.t('errors.user_not_authz'), 'warning');
+            break;
+        case 401:
+            Swal.fire('ERROR', i18n.t('errors.session_expired'), 'error');
+            break;
+        case 500:
+            Swal.fire('ERROR', i18n.t('errors.server_error'), 'error');
+            break;
+    }
+};
+
+
 export const getUserTickets = ({ page = 1, perPage = 5 }) => async (dispatch, getState, { getAccessToken, apiBaseUrl, loginUrl }) => {
     const { userState: { userProfile }, summitState: { summit } } = getState();
 
@@ -229,7 +248,7 @@ export const assignAttendee = ({
         createAction(ASSIGN_TICKET),
         `${apiBaseUrl}/api/v1/summits/all/orders/${orderId}/tickets/${ticket.id}/attendee`,
         normalizedEntity,
-        authErrorHandler
+        customWithout412ErrorHandler
     )(params)(dispatch).then((newTicket) => {
         if (reassignOrderId && context === 'ticket-list') {
             dispatch(getUserTickets({ page: ticketPage }));
@@ -238,9 +257,8 @@ export const assignAttendee = ({
             dispatch(getTicketsByOrder({ orderId, page: orderTicketsCurrentPage }));
         }
         return newTicket;
-    }).catch(e => {
-        dispatch(stopLoading());
-        return (e);
+    }).catch(({err}) => {
+        processActionError(err);
     });
 }
 
@@ -301,7 +319,7 @@ export const editOwnedTicket = ({
         `${apiBaseUrl}/api/v1/summits/all/orders/all/tickets/${ticket.id}`,
         normalizedEntity,
         authErrorHandler
-    )(params)(dispatch).then(async () => {        
+    )(params)(dispatch).then(async () => {
         const hasManager = ticket.owner?.manager?.id || ticket.owner?.manager_id;
         // email should match ( only update my profile is ticket belongs to me!)
         // and if the ticket doesn't have a manager
@@ -392,7 +410,7 @@ export const changeTicketAttendee = ({
         createAction(REMOVE_TICKET_ATTENDEE),
         `${apiBaseUrl}/api/v1/summits/all/orders/${orderId}/tickets/${ticket.id}/attendee`,
         {},
-        authErrorHandler
+        customWithout412ErrorHandler
     )(params)(dispatch).then(() => {
         return dispatch(assignAttendee({
             ticket,
@@ -409,10 +427,8 @@ export const changeTicketAttendee = ({
                 reassignOrderId: orderId,
             }
         }));
-    }).catch((e) => {
-        console.log('error', e)
-        dispatch(stopLoading());
-        return (e);
+    }).catch(({err}) => {
+        processActionError(err);
     });
 };
 
@@ -573,16 +589,16 @@ export const delegateTicket = ({
     return putRequest(
         null,
         createAction(DELEGATE_TICKET),
-        `${apiBaseUrl}/api/v1/summits/${summitId}/orders/${orderId}/tickets/${ticket.id}/delegate`,        
+        `${apiBaseUrl}/api/v1/summits/${summitId}/orders/${orderId}/tickets/${ticket.id}/delegate`,
         normalizedEntity,
-        authErrorHandler    
+        authErrorHandler
     )(params)(dispatch).then(() => {
         dispatch(stopLoading());
         // Note: refresh the list view after updating the ticket.
         if (context === 'ticket-list') {
             dispatch(getUserTickets({ page: ticketPage }));
         } else {
-            dispatch(getUserOrders({ page: orderPage })).then(() => 
+            dispatch(getUserOrders({ page: orderPage })).then(() =>
                 dispatch(getTicketsByOrder({ orderId: ticket.order_id, page: orderTicketsCurrentPage }))
             );
         }

package/src/components/summit-my-orders-tickets/util/helpers/index.js

@@ -7,3 +7,16 @@ export * from './getFormattedDate';
 export * from './getFormattedTime';
 export * from './getWindowScroll';
 export * from './formatCurrency';
+
+
+export const processActionError = (err) => {
+  if(err?.status == 412) {
+    let msg = '';
+    for (const [key, value] of Object.entries(err.response.body.errors)) {
+      msg += isNaN(key) ? `${key}: ` : "";
+      msg += `${value}`;
+    }
+    throw msg;
+  }
+  throw err;
+}

package/src/styles/colors.scss

@@ -1,4 +1,4 @@
-$color_accent: #00B189;
+$color_accent: #00A2FF;
 $color_alerts: #ff0000;
 $color_background_light: #ffffff;
 $color_background_dark: #000000;
@@ -19,16 +19,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: #8DC63F;
+$color_primary: #000000;
 $color_primary_contrast: #FFFFFF;
-$color_secondary: #5e5f62;
-$color_secondary_contrast: #005870;
+$color_secondary: #00A2FF;
+$color_secondary_contrast: #181818;
 $color_text_light: #ffffff;
 $color_text_med: #828282;
-$color_text_dark: #5e5f62;
+$color_text_dark: #000000;
 $color_text_input_hints_light: #7b7b7b;
 $color_text_input_hints_dark: #7b7b7b;
-$color_text_input_hints: #c4c4c4;
+$color_text_input_hints: #131313;
 
 :root {
   --color_primary: #{$color_primary};

package/src/styles/fonts.scss

@@ -1,31 +1,26 @@
-$font-family: "Franklin Gothic";
+/**
+* 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: "Franklin Gothic" !important;
+  --font_family: #{$font-family};
 }
 
-@font-face {
-  font-family: "Franklin Gothic";
-  src: url("/fonts/franklingothic-book.ttf") format("truetype");
-  font-weight: normal;
-}
-@font-face {
-  font-family: "Franklin Gothic";
-  src: url("/fonts/franklingothic-medium.ttf") format("truetype");
-  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/sponsor-page.js

@@ -59,7 +59,7 @@ const SponsorPageTemplate = ({ sponsorId, sponsors, scanBadge, eventId, lastData
   };
 
   if (notFound) {
-    return <Interstitial title="Sponsor not found" navigateTo="/a/sponsors" ontained />
+    return <Interstitial title="Sponsor not found" navigateTo="/a/sponsors" contained />
   }
 
   const {

package/src/utils/useMarketingSettings.js

@@ -17,6 +17,7 @@ export const MARKETING_SETTINGS_KEYS = {
   regLiteInitialOrderComplete1stParagraph: "REG_LITE_INITIAL_ORDER_COMPLETE_STEP_1ST_PARAGRAPH",
   regLiteInitialOrderComplete2ndParagraph: "REG_LITE_INITIAL_ORDER_COMPLETE_STEP_2ND_PARAGRAPH",
   regLiteInitialOrderCompleteButton: "REG_LITE_INITIAL_ORDER_COMPLETE_BTN_LABEL",
+  regLiteOrderCompleteTitle: "REG_LITE_ORDER_COMPLETE_TITLE",
   regLiteOrderComplete1stParagraph: "REG_LITE_ORDER_COMPLETE_STEP_1ST_PARAGRAPH",
   regLiteOrderComplete2ndParagraph: "REG_LITE_ORDER_COMPLETE_STEP_2ND_PARAGRAPH",
   regLiteOrderCompleteButton: "REG_LITE_ORDER_COMPLETE_BTN_LABEL",