@openeventkit/event-site 2.0.108 → 2.0.110

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "2.0.108",
+  "version": "2.0.110",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -122,7 +122,7 @@
     "stream-browserify": "^3.0.0",
     "stream-chat": "^2.7.2",
     "stream-chat-react": "3.1.7",
-    "summit-registration-lite": "5.0.30",
+    "summit-registration-lite": "5.0.34",
     "superagent": "8.0.9",
     "sweetalert2": "^9.17.0",
     "upcoming-events-widget": "3.0.5",

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

@@ -28,6 +28,32 @@ export const fetchEventById = async (summitId, eventId, accessToken = null) => {
     });
 }
 
+/**
+ * @param summitId
+ * @param eventTypeId
+ * @param accessToken
+ * @returns {Promise<Response>}
+ */
+export const fetchEventTypeById = async (summitId, eventTypeId, accessToken = null) => {
+
+    let apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/public/v1/summits/${summitId}/event-types/${eventTypeId}`);
+    if(accessToken){
+        apiUrl = URI(`${process.env.GATSBY_SUMMIT_API_BASE_URL}/api/v1/summits/${summitId}/event-types/${eventTypeId}`);
+        apiUrl.addQuery('access_token', accessToken);
+    }
+
+    apiUrl.addQuery('evict_cache', 1);
+    return fetch(apiUrl.toString(), {
+        method: 'GET'
+    }).then(async (response) => {
+        if (response.status === 200) {
+            return await response.json();
+        }
+        return null;
+    });
+}
+
+
 /**
  *
  * @param summitId

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

@@ -58,11 +58,6 @@ const marketingPage = {
           name: "date",
           required: false
         }),
-        booleanField({
-          label: "Date Layout",
-          name: "dateLayout",
-          required: false
-        }),
         stringField({
           label: "Time",
           name: "time",

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

@@ -55,7 +55,6 @@ module.exports = `
     subTitle: String
     date: String
     time: String
-    dateLayout: Boolean
     images: [ImageWithAlt]
     background: ImageWithAlt
     buttons: MarketingPageHeroButtons

package/src/components/MarketingHeroComponent.js

@@ -78,24 +78,13 @@ const MarketingHeroComponent = ({
               <div
                 className={styles.date}
                 style={{
-                  backgroundColor: data?.dateLayout
-                    ? "var(--color_secondary)"
-                    : "",
-                  display: data?.dateLayout
-                    ? ""
-                    : "inline",
-                  transform: data?.dateLayout
-                    ? "skew(-25deg)"
-                    : "skew(0deg)",
+                  display: "inline",
+                  transform: "skew(0deg)",
                 }}
-              >
-                {data?.dateLayout ?
-                <div style={{transform: "skew(25deg)"}}>{data?.date}</div>
-                :
+              >                
                 <div style={{transform: "skew(0deg)"}}>
                   <span>{data?.date}</span>
                 </div>
-                }
               </div>
               <h4>{data?.time}</h4>
               <div className={styles.heroButtons}>

package/src/components/ProfilePopupComponent.js

@@ -343,12 +343,12 @@ const ProfilePopupComponent = ({ userProfile, idpLoading, closePopup, showProfil
                   </div>
                 </div>
                 <div className={`columns is-mobile ${styles.inputRow}`}>
-                  <div className='column is-one-quarter'>Twitter</div>
+                  <div className='column is-one-quarter'>X</div>
                   <div className='column is-two-thirds'>
                     <input
                         className={`${styles.input} ${styles.isMedium}`}
                         type="text"
-                        placeholder="Twitter"
+                        placeholder="Twitter/X"
                         onChange={e => setTwitter(e.target.value)}
                         value={twitter} />
                   </div>

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

@@ -2,7 +2,6 @@
   "hero": {
     "title": "",
     "date": "",
-    "dateLayout": false,
     "time": "",
     "buttons": {
       "registerButton": {

package/src/pages/index.js

@@ -12,7 +12,6 @@ export const marketingPageQuery = graphql`
       hero {
         title
         subTitle
-        dateLayout
         date
         time
         background {

package/src/styles/expo-hero.module.scss

@@ -7,14 +7,14 @@
 
 .title {
   font-size: 102px;
-  color: var(--color_text_dark);
+  color: var(--color_text_light);
   font-weight: bold;
   text-align: center;
 }
 
 .subtitle {
   font-size: 32px;
-  color: var(--color_text_dark);
+  color: var(--color_text_light);
   text-align: center;
   max-width: 800px;
   margin: auto;

package/src/styles/marketing-hero.module.scss

@@ -104,7 +104,6 @@
       margin-left: -3em;
 
       div {
-        transform: skew(25deg);
         font-size: 3rem;
         font-weight: bold;
         color: var(--color_text_light);
@@ -113,7 +112,6 @@
 
       span {
         margin: 0 -1.5em;
-        transform: skew(-25deg);
         display: inline;
       }
 

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

@@ -402,11 +402,11 @@ export const FullProfilePageTemplate = ({ user, getIDPProfile, updateProfile, up
                                         />
                                     </div>
                                     <div className={`column is-half ${styles.inputField}`}>
-                                        <b>Twitter</b>
+                                        <b>X</b>
                                         <input
                                             className={`${styles.input} ${styles.isLarge}`}
                                             type="text"
-                                            placeholder="Twitter"
+                                            placeholder="Twitter/X"
                                             onChange={e => setPersonalProfile({ ...personalProfile, twitter: e.target.value })}
                                             value={personalProfile.twitter}
                                         />

package/src/utils/dataUpdatesUtils.js

@@ -49,6 +49,10 @@ export const isSummitEventDataUpdate = (entity_type) => {
     return entity_type === 'Presentation' || entity_type === 'SummitEvent' || entity_type === 'SummitEventWithFile';
 }
 
+export const isSummitEventTypeDataUpdate = (entity_type) => {
+    return entity_type === 'SummitEventType' || entity_type === 'PresentationType';
+}
+
 /**
  * @param summitId
  * @param bucketKey

package/src/workers/sync_strategies/activity_type_synch_strategy.js

@@ -0,0 +1,66 @@
+import AbstractSynchStrategy from "./abstract_synch_strategy";
+import {fetchEventTypeById} from "../../actions/fetch-entities-actions";
+import {
+    BUCKET_EVENTS_DATA_KEY,
+    BUCKET_SUMMIT_DATA_KEY,
+    saveFile
+} from "../../utils/dataUpdatesUtils";
+
+/**
+ * ActivityTypeSynchStrategy
+ */
+class ActivityTypeSynchStrategy extends AbstractSynchStrategy{
+
+    async process(payload){
+
+        console.log(`ActivityTypeSynchStrategy::process`, payload);
+
+        const {entity_operator, entity_id} = payload;
+
+        const entity = await fetchEventTypeById(this.summit.id, entity_id, this.accessToken);
+
+        if (entity_operator === 'UPDATE') {
+            if (!entity) return Promise.reject('ActivityTypeSynchStrategy::process entity not found.');
+
+            // update summit
+            this.summit.event_types = [...this.summit.event_types.filter(et => et.id !== entity_id), entity]
+
+            // update events
+            this.allEvents = this.allEvents.map(ev => {
+                if (ev.type.id === entity_id) return ({...ev, type: entity});
+                return ev;
+            })
+
+
+            // update files on cache
+            console.log(`ActivityTypeSynchStrategy::process updating cache files`);
+
+            try {
+                const localNowUtc = Date.now();
+
+                await saveFile(this.summit.id, BUCKET_EVENTS_DATA_KEY, this.allEvents, localNowUtc);
+                await saveFile(this.summit.id, BUCKET_SUMMIT_DATA_KEY, this.summit, localNowUtc);
+
+            }
+            catch (e){
+                console.log(e);
+            }
+
+            let res = {
+                payload,
+                entity,
+                summit : this.summit,
+                eventsData: this.allEvents,
+                allIDXEvents : this.allIDXEvents,
+                allSpeakers : this.allSpeakers,
+                allIDXSpeakers : this.allIDXSpeakers
+            };
+
+            console.log(`ActivityTypeSynchStrategy::process done`, res);
+
+            return Promise.resolve(res);
+        }
+    }
+}
+
+export default ActivityTypeSynchStrategy;

package/src/workers/sync_strategies/synch_strategy_factory.js

@@ -1,8 +1,9 @@
-import {isSummitEventDataUpdate} from "../../utils/dataUpdatesUtils";
+import {isSummitEventDataUpdate, isSummitEventTypeDataUpdate} from "../../utils/dataUpdatesUtils";
 import ActivitySynchStrategy from "../sync_strategies/activity_synch_strategy";
 import VenueRoomSynchStrategy from "./venue_room_synch_strategy";
 import SpeakerSynchStrategy from "./speaker_synch_strategy";
 import SummitSynchStrategy from "./summit_synch_strategy";
+import ActivityTypeSynchStrategy from "./activity_type_synch_strategy";
 
 /**
  * SynchStrategyFactory
@@ -24,6 +25,9 @@ class SynchStrategyFactory {
         if (isSummitEventDataUpdate(entity_type)) {
             return new ActivitySynchStrategy(summit, allEvents, allIDXEvents, allSpeakers, allIDXSpeakers, accessToken);
         }
+        if (isSummitEventTypeDataUpdate(entity_type)) {
+            return new ActivityTypeSynchStrategy(summit, allEvents, allIDXEvents, allSpeakers, allIDXSpeakers, accessToken);
+        }
         if (entity_type === 'SummitVenueRoom') {
             return new VenueRoomSynchStrategy(summit, allEvents, allIDXEvents, allSpeakers, allIDXSpeakers, accessToken);
         }