@openeventkit/event-site 2.1.26 → 2.1.28

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.1.26",
+  "version": "2.1.28",
   "author": "Tipit LLC",
   "dependencies": {
     "@emotion/server": "^11.11.0",
@@ -87,7 +87,7 @@
     "markdown-it": "^12.0.0",
     "moment": "^2.27.0",
     "moment-timezone": "^0.5.31",
-    "my-orders-tickets-widget": "1.0.0-beta.59",
+    "my-orders-tickets-widget": "1.0.0-beta.61",
     "object.assign": "^4.1.5",
     "openstack-uicore-foundation": "4.2.8",
     "path-browserify": "^1.0.1",

package/src/components/{CertificateSection.js → Certificates/DownloadButton.js}

@@ -1,16 +1,12 @@
 import React, { useState, useEffect } from 'react';
 import { connect } from 'react-redux';
-import { generateCertificatePDF } from './CertificatePDF';
-import { useCertificateSettings } from '../utils/certificateSettings';
-import useMarketingSettings from '../utils/useMarketingSettings';
-import { MARKETING_SETTINGS_KEYS, DISPLAY_OPTIONS } from '../utils/useMarketingSettings';
-import useSiteSettings from '../utils/useSiteSettings';
-import styles from '../styles/full-profile.module.scss';
-
-const USER_ROLES = {
-  SPEAKER: 'Speaker',
-  ATTENDEE: 'Attendee'
-};
+import { generatePDF } from './generatePDF';
+import { useCertificateSettings } from './settings';
+import useMarketingSettings from '../../utils/useMarketingSettings';
+import { MARKETING_SETTINGS_KEYS, DISPLAY_OPTIONS } from '../../utils/useMarketingSettings';
+import useSiteSettings from '../../utils/useSiteSettings';
+import styles from '../../styles/full-profile.module.scss';
+import { USER_ROLES } from './constants';
 
 const CertificateSection = ({ 
   user, 
@@ -58,17 +54,15 @@ const CertificateSection = ({
     // Check if any ticket has speaker role
     const hasSpeakerTicket = allTickets.some(ticket => {
       // Check badge type name for speaker
-      const badgeType = summit?.badge_types?.find(bt => bt.id === ticket.badge?.type_id);
+      const badgeType = ticket.badge?.type;
+      
       if (badgeType?.name?.toLowerCase().includes('speaker')) {
         return true;
       }
       
-      // Check badge features for speaker
-      const featureIds = ticket.badge?.features || [];
-      const badgeFeaturesTypes = summit?.badge_features_types || [];
+      const features = ticket.badge?.features || [];
       
-      return featureIds.some(featureId => {
-        const feature = badgeFeaturesTypes.find(f => f.id === featureId);
+      return features.some(feature => {
         return feature?.name?.toLowerCase().includes('speaker');
       });
     });
@@ -95,11 +89,10 @@ const CertificateSection = ({
       const summitData = {
         name: summit.name,
         logo: summit.logo,
-        start_date: summit.start_date,
-        end_date: summit.end_date
+        dates_label: summit.dates_label
       };
 
-      await generateCertificatePDF(attendeeData, summitData, certificateSettings);
+      await generatePDF(attendeeData, summitData, certificateSettings);
     } catch (err) {
       console.error('Error downloading certificate:', err);
       setError('Failed to download certificate. Please try again.');
@@ -117,7 +110,11 @@ const CertificateSection = ({
             height: '5.5rem',
             color: 'var(--color_input_text_color)',
             backgroundColor: 'var(--color_input_background_color)',
-            borderColor: 'var(--color_input_border_color)'
+            borderColor: 'var(--color_input_border_color)',
+            whiteSpace: 'normal',
+            wordBreak: 'break-word',
+            lineHeight: '1.2',
+            padding: '1rem'
           }}
         >
           Download Certificate of Attendance

package/src/components/Certificates/constants.js

@@ -0,0 +1,4 @@
+export const USER_ROLES = {
+  SPEAKER: 'Speaker',
+  ATTENDEE: 'Attendee'
+};

package/src/components/{CertificatePDF.js → Certificates/generatePDF.js}

@@ -1,8 +1,9 @@
 import React from "react";
 import { Document, Page, Text, View, Image, StyleSheet, Font, pdf } from "@react-pdf/renderer";
 
-import fontRegular from "../../static/fonts/nunito-sans/nunito-sans-v18-latin-400.ttf";
-import fontBold from "../../static/fonts/nunito-sans/nunito-sans-v18-latin-700.ttf";
+import fontRegular from "../../../static/fonts/nunito-sans/nunito-sans-v18-latin-400.ttf";
+import fontBold from "../../../static/fonts/nunito-sans/nunito-sans-v18-latin-700.ttf";
+import { USER_ROLES } from './constants';
 
 const registerDefaultFont = () => {
   try {
@@ -147,6 +148,7 @@ const CertificatePDF = ({
   logoUrl = null
 }) => {
   const role = attendee.role || "Attendee";
+  const isSpeaker = role === USER_ROLES.SPEAKER;
   const position = attendee.jobTitle || "";
   const company = attendee.company || "";
 
@@ -213,6 +215,7 @@ const CertificatePDF = ({
       textAlign: "center",
       letterSpacing: 0.15,
       lineHeight: "160%",
+      marginBottom: 5,
     },
     summitName: {
       fontSize: 24,
@@ -223,6 +226,15 @@ const CertificatePDF = ({
       letterSpacing: 0,
       lineHeight: "133%",
     },
+    summitDate: {
+      fontSize: 16,
+      fontWeight: "normal",
+      color: "#000000",
+      textAlign: "center",
+      letterSpacing: 0.15,
+      lineHeight: "150%",
+      marginTop: 8,
+    },
     name: {
       fontSize: nameFontSize,
       fontWeight: "normal",
@@ -275,7 +287,11 @@ const CertificatePDF = ({
             
             {/* Title */}
             <Text style={styles.title}>
-              {settings.titleText || "CERTIFICATE OF ATTENDANCE"}
+              {isSpeaker && settings.speakerTitleText ? 
+                settings.speakerTitleText :
+                !isSpeaker && settings.attendeeTitleText ?
+                  settings.attendeeTitleText :
+                  settings.titleText || (isSpeaker ? "CERTIFICATE OF APPRECIATION" : "CERTIFICATE OF ATTENDANCE")}
             </Text>
             
             {/* Event Name */}
@@ -283,6 +299,13 @@ const CertificatePDF = ({
               {settings.summitName || summit.name || "EVENT NAME"}
             </Text>
             
+            {/* Summit Date */}
+            {summit.dates_label && (
+              <Text style={styles.summitDate}>
+                {summit.dates_label}
+              </Text>
+            )}
+            
             {/* Attendee Name */}
             <Text style={styles.name}>
               {fullName}
@@ -312,7 +335,7 @@ const CertificatePDF = ({
 };
 
 // helper function to generate and download the certificate
-export const generateCertificatePDF = async (attendee, summit, settings) => {
+export const generatePDF = async (attendee, summit, settings) => {
   try {
     // Validate logo URL before generating PDF
     const logoUrlToValidate = settings.logo || summit.logo;
@@ -341,4 +364,3 @@ export const generateCertificatePDF = async (attendee, summit, settings) => {
   }
 };
 
-export default CertificatePDF;

package/src/components/Certificates/index.js

@@ -0,0 +1,4 @@
+export { default as DownloadButton } from './DownloadButton';
+export { generatePDF } from './generatePDF';
+export { useCertificateSettings } from './settings';
+export { USER_ROLES } from './constants';

package/src/{utils/certificateSettings.js → components/Certificates/settings.js}

@@ -1,4 +1,4 @@
-import useMarketingSettings, { MARKETING_SETTINGS_KEYS, DISPLAY_OPTIONS } from './useMarketingSettings';
+import useMarketingSettings, { MARKETING_SETTINGS_KEYS, DISPLAY_OPTIONS } from '../../utils/useMarketingSettings';
 
 export const useCertificateSettings = (siteFont = null) => {
   const { getSettingByKey } = useMarketingSettings();
@@ -20,6 +20,8 @@ export const useCertificateSettings = (siteFont = null) => {
     logoWidth: MARKETING_SETTINGS_KEYS.certificateLogoWidth,
     logoHeight: MARKETING_SETTINGS_KEYS.certificateLogoHeight,
     titleText: MARKETING_SETTINGS_KEYS.certificateTitleText,
+    attendeeTitleText: MARKETING_SETTINGS_KEYS.certificateAttendeeTitleText,
+    speakerTitleText: MARKETING_SETTINGS_KEYS.certificateSpeakerTitleText,
     summitName: MARKETING_SETTINGS_KEYS.certificateSummitName,
     showRole: MARKETING_SETTINGS_KEYS.certificateShowRole,
   };

package/src/components/Seo.js

@@ -21,7 +21,7 @@ const Seo = ({ title, description, location, children }) => {
   const { pathname } = location;
 
   const seo = {
-    title: title ? `${siteTitle} - ${title}` : siteTitle,
+    title: title && siteTitle ? `${siteTitle} - ${title}` : (title || siteTitle || ''),
     description: description || defaultDescription,
     url: buildUrl(scheme, host, pathname),
     image: host && image ? buildUrl(scheme, host, image.publicURL) : null,

package/src/reducers/user-reducer.js

@@ -1,7 +1,6 @@
 import { reduceReducers } from '../utils/reducer-utils';
 import { LOGOUT_USER } from 'openstack-uicore-foundation/lib/security/actions';
 import {
-
     GET_DISQUS_SSO,
     GET_USER_PROFILE,
     START_LOADING_PROFILE,
@@ -65,7 +64,7 @@ const userReducer = (state = DEFAULT_STATE, action) => {
       const { response: userProfile } = payload;
       return {
         ...state,
-        userProfile: userProfile,
+        userProfile: { ...userProfile, rsvp_invitations: [] },
         isAuthorized: isAuthorizedUser(userProfile.groups),
         hasTicket: userProfile.summit_tickets?.length > 0
       }
@@ -92,16 +91,18 @@ const userReducer = (state = DEFAULT_STATE, action) => {
     case REMOVE_FROM_SCHEDULE: {
       return { ...state, userProfile: { ...state.userProfile, schedule_summit_events: [...state.userProfile.schedule_summit_events.filter(ev => ev.id !== payload.id)] } }
     }
-      case RSVP_CONFIRMED: {
-          return { ...state, userProfile: { ...state.userProfile, rsvp: [...state.userProfile.rsvp, {...payload} ] } }
-      }
-      case RSVP_CANCELLED: {
-          return { ...state, userProfile: {
-              ...state.userProfile,
-              rsvp: [...state?.userProfile?.rsvp?.filter(r => r.event_id !== payload.id)],
-              rsvp_invitations:state?.userProfile?.rsvp_invitations?.filter(i => i.event_id !== payload.id),
-          } }
+    case RSVP_CONFIRMED: {
+      return { ...state, userProfile: { ...state.userProfile, rsvp: [...state.userProfile.rsvp, { ...payload }] } }
+    }
+    case RSVP_CANCELLED: {
+      return {
+        ...state, userProfile: {
+          ...state.userProfile,
+          rsvp: [...state?.userProfile?.rsvp?.filter(r => r.event_id !== payload.id)],
+          rsvp_invitations: state?.userProfile?.rsvp_invitations?.filter(i => i.event_id !== payload.id),
+        }
       }
+    }
     case GET_DISQUS_SSO:
       const disqus = payload.response;
       return { ...state, loading: false, disqusSSO: disqus };
@@ -154,34 +155,37 @@ const userReducer = (state = DEFAULT_STATE, action) => {
     }
     case RSVP_INVITATION_ACCEPTED: {
       const invitation = payload.response;
-      const userProfile = state.userProfile? {
-          ...state?.userProfile,
-          rsvp_invitations:[ ...state?.userProfile?.rsvp_invitations,{
-            event_id: invitation.event_id,
-            status: invitation.status,
-          }],
-          rsvp: [...state?.userProfile?.rsvp, {...invitation.rsvp}],
-          schedule_summit_events: [...state?.userProfile?.schedule_summit_events, {id: invitation.event_id}]
+      const userProfile = state.userProfile ? {
+        ...state?.userProfile,
+        rsvp_invitations: [...state?.userProfile?.rsvp_invitations, {
+          event_id: invitation.event_id,
+          status: invitation.status,
+        }],
+        rsvp: [...state?.userProfile?.rsvp, { ...invitation.rsvp }],
+        schedule_summit_events: [...state?.userProfile?.schedule_summit_events, { id: invitation.event_id }]
       } : null;
 
-      return { ...state,
-          rsvpInvitation: invitation,
-          // update invitations and rsvps
-          userProfile: userProfile,
+      return {
+        ...state,
+        rsvpInvitation: invitation,
+        // update invitations and rsvps
+        userProfile: userProfile,
       }
     }
     case RSVP_INVITATION_REJECTED: {
-        // update invitations
-        const invitation = payload.response;
-        const userProfile = state.userProfile ? {...state?.userProfile,
-            rsvp_invitations:[ ...state?.userProfile?.rsvp_invitations,{
-                event_id: invitation.event_id,
-                status: invitation.status,
-            }],
-        }: null;
-        return { ...state,
-          rsvpInvitation: invitation,
-          userProfile: userProfile,
+      // update invitations
+      const invitation = payload.response;
+      const userProfile = state.userProfile ? {
+        ...state?.userProfile,
+        rsvp_invitations: [...state?.userProfile?.rsvp_invitations, {
+          event_id: invitation.event_id,
+          status: invitation.status,
+        }],
+      } : null;
+      return {
+        ...state,
+        rsvpInvitation: invitation,
+        userProfile: userProfile,
       }
     }
     default:

package/src/templates/full-profile-page.js

@@ -17,7 +17,7 @@ import LiteScheduleComponent from '../components/LiteScheduleComponent'
 import AvatarEditorModal from '../components/AvatarEditorModal'
 import ChangePasswordComponent from '../components/ChangePasswordComponent';
 import AccessTracker from "../components/AttendeeToAttendeeWidgetComponent";
-import CertificateSection from '../components/CertificateSection';
+import { DownloadButton as CertificateDownloadButton } from '../components/Certificates';
 import useMarketingSettings from '../utils/useMarketingSettings';
 import { MARKETING_SETTINGS_KEYS, DISPLAY_OPTIONS } from '../utils/useMarketingSettings';
 import { getAccessTokenSafely } from '../utils/loginUtils';
@@ -209,8 +209,8 @@ export const FullProfilePageTemplate = ({ user, getIDPProfile, updateProfile, up
 
             const params = new URLSearchParams({
                 access_token: accessToken,
-                fields: 'id,status',
-                expand: 'owner'
+                fields: 'id,status,owner.summit_hall_checked_in,owner.first_name,owner.last_name,owner.company,owner.email,badge.type.name,badge.features.name',
+                expand: 'owner,badge,badge.type,badge.features'
             });
 
             const apiBaseUrl = getEnvVariable(SUMMIT_API_BASE_URL);
@@ -239,12 +239,11 @@ export const FullProfilePageTemplate = ({ user, getIDPProfile, updateProfile, up
     const certificatesEnabled = getSettingByKey(MARKETING_SETTINGS_KEYS.certificateEnabled) !== DISPLAY_OPTIONS.hide;
     const checkedInTickets = freshTickets.filter(ticket => {
         const isCheckedIn = ticket.owner?.summit_hall_checked_in === true;
-        console.log(ticket)
         const isValidTicket = ticket.status === 'Paid';
         return isCheckedIn && isValidTicket;
     });
     
-    const showCertificate = certificatesEnabled && checkedInTickets.length > 0;
+    const showCertificateDownload = certificatesEnabled && checkedInTickets.length > 0;
 
     const discardChanges = (state) => {
         switch (state) {
@@ -317,8 +316,8 @@ export const FullProfilePageTemplate = ({ user, getIDPProfile, updateProfile, up
                         <h4>
                             @{user.idpProfile?.nickname}
                         </h4>
-                        {showCertificate && (
-                            <CertificateSection freshTickets={freshTickets} />
+                        {showCertificateDownload && (
+                            <CertificateDownloadButton freshTickets={freshTickets} />
                         )}
                         <ChangePasswordComponent updatePassword={handlePasswordUpdate} />
                     </div>

package/src/utils/build-json/EventsAPIRequest.js

@@ -8,6 +8,11 @@ class EventAPIRequest extends BaseAPIRequest {
     static instance;
 
     constructor() {
+        /*
+        *  WARNING
+        *  if any of these fields , relations or expand changes should be replicated here
+        *  https://github.com/fntechgit/pub-api/blob/main/api/utils/summit_api_requests/event_api_request.py
+        */
         const primary_fields = [
             "id",
             "created",
@@ -79,8 +84,6 @@ class EventAPIRequest extends BaseAPIRequest {
 
         const locations_relations = ["location.venue", "location.floor", "location.venue.none", "location.floor.none"];
 
-        // TODO: review relations for "current_attendance"
-
         const relations = [
             ...track_relations,
             ...type_relations,

package/src/utils/build-json/SpeakersAPIRequest.js

@@ -3,7 +3,11 @@ class SpeakersAPIRequest extends BaseAPIRequest {
     static instance;
 
     constructor() {
-
+        /*
+         *  WARNING
+         *  if any of these fields , relations or expand changes should be replicated here
+         *  https://github.com/fntechgit/pub-api/blob/main/api/utils/summit_api_requests/speaker_api_request.py
+         */
         const primary_fields =
             ['id', 'first_name', 'last_name', 'title', 'bio', 'member_id', 'pic', 'big_pic', 'company'];
 

package/src/utils/build-json/SummitAPIRequest.js

@@ -3,16 +3,21 @@ const BaseAPIRequest = require("./BaseAPIRequest");
 class SummitAPIRequest extends BaseAPIRequest {
     static instance;
 
+
     constructor() {
+        /*
+         *  WARNING
+         *  if any of these fields , relations or expand changes should be replicated here
+         *  https://github.com/fntechgit/pub-api/blob/main/api/utils/summit_api_requests/summit_api_request.py
+         */
         const primary_fields = [
             "id", "name", "start_date", "end_date", "time_zone_id", "time_zone_label", "secondary_logo", "slug",
-            "support_email", "start_showing_venues_date", "dates_with_events", "logo",
+            "support_email", "start_showing_venues_date", "dates_with_events", "logo", "dates_label",
             "registration_allowed_refund_request_till_date", "allow_update_attendee_extra_questions", "is_virtual",
             "registration_disclaimer_mandatory", "registration_disclaimer_content", "reassign_ticket_till_date",
             "is_main", "title", "description", "time_zone"
         ];
 
-        // TODO: to be reviewed later with data syncs actions to match the needs of the data update
         const event_types_fields = [
             "event_types.id"
         ];
@@ -37,9 +42,9 @@ class SummitAPIRequest extends BaseAPIRequest {
         ];
 
         const ticket_types_relations = ["ticket_types.none"];
-        const tracks_relations = ["tracks", "tracks.subtracks.none"];
+        const tracks_relations = ["tracks", "tracks.subtracks", "tracks.subtracks.none"];
         const track_groups_relations = ["track_groups.none"];
-        const location_relations = ["locations.none, locations.venue.none"];
+        const location_relations = ["locations.none", "locations.venue.none"];
         const event_types_relations = ["event_types.none"];
 
         const relations = [

package/src/utils/useMarketingSettings.js

@@ -68,6 +68,8 @@ export const MARKETING_SETTINGS_KEYS = {
   certificateLogoWidth: "CERTIFICATE_LOGO_WIDTH",
   certificateLogoHeight: "CERTIFICATE_LOGO_HEIGHT",
   certificateTitleText: "CERTIFICATE_TITLE_TEXT",
+  certificateAttendeeTitleText: "CERTIFICATE_ATTENDEE_TITLE_TEXT",
+  certificateSpeakerTitleText: "CERTIFICATE_SPEAKER_TITLE_TEXT",
   certificateSummitName: "CERTIFICATE_SUMMIT_NAME",
   certificateShowRole: "CERTIFICATE_SHOW_ROLE",
 }