@openeventkit/event-site 1.0.42 → 1.0.44

package/gatsby-node.js

@@ -43,22 +43,6 @@ const getAccessToken = async (config, scope) => {
   }
 };
 
-const SSR_getMarketingSettings = async (baseUrl, summitId) => {
-
-  const params = {
-    per_page: 100,
-  };
-
-  return await axios.get(
-    `${baseUrl}/api/public/v1/config-values/all/shows/${summitId}`,
-    { params }
-  )
-    .then(response => {
-      return response.data.data
-    })
-    .catch(e => console.log("ERROR: ", e));
-};
-
 const SSR_GetRemainingPages = async (endpoint, params, lastPage) => {
   // create an array with remaining pages to perform Promise.All
   const pages = [];
@@ -78,6 +62,26 @@ const SSR_GetRemainingPages = async (endpoint, params, lastPage) => {
   return remainingPages.sort((a, b,) =>   a.current_page - b.current_page ).map(p => p.data).flat();
 }
 
+const SSR_getMarketingSettings = async (baseUrl, summitId) => {
+
+  const endpoint = `${baseUrl}/api/public/v1/config-values/all/shows/${summitId}`;
+
+  const params = {
+    per_page: 100,
+    page: 1
+  };
+
+  return await axios.get(endpoint, { params }).then(async ({data}) => {
+
+    console.log(`SSR_getMarketingSettings then data.current_page ${data.current_page} data.last_page ${data.last_page} total ${data.total}`)
+
+    let remainingPages = await SSR_GetRemainingPages(endpoint, params, data.last_page);
+
+    return [...data.data, ...remainingPages];
+
+  }).catch(e => console.log("ERROR: ", e));
+};
+
 const SSR_getEvents = async (baseUrl, summitId, accessToken) => {
 
   const endpoint = `${baseUrl}/api/v1/summits/${summitId}/events/published`;
@@ -86,7 +90,7 @@ const SSR_getEvents = async (baseUrl, summitId, accessToken) => {
     access_token: accessToken,
     per_page: 50,
     page: 1,
-    expand: "slides, links, videos, media_uploads, type, track, track.allowed_access_levels, location, location.venue, location.floor, speakers, moderator, sponsors, current_attendance, groups, rsvp_template, tags",
+    expand: "slides, links, videos, media_uploads, type, track, track.subtracks, track.allowed_access_levels, location, location.venue, location.floor, speakers, moderator, sponsors, current_attendance, groups, rsvp_template, tags",
   }
 
   return await axios.get(endpoint, { params }).then(async ({data}) => {
@@ -178,7 +182,7 @@ const SSR_getSpeakers = async (baseUrl, summitId, accessToken, filter = null) =>
 const SSR_getSummit = async (baseUrl, summitId) => {
 
   const params = {
-    expand: "event_types,tracks,track_groups,presentation_levels,locations.rooms,locations.floors,order_extra_questions.values,schedule_settings,schedule_settings.filters,schedule_settings.pre_filters",
+    expand: "event_types,tracks, tracks.subtracks,track_groups,presentation_levels,locations.rooms,locations.floors,order_extra_questions.values,schedule_settings,schedule_settings.filters,schedule_settings.pre_filters",
     t: Date.now()
   };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openeventkit/event-site",
   "description": "Event Site",
-  "version": "1.0.42",
+  "version": "1.0.44",
   "author": "Tipit LLC",
   "dependencies": {
     "@mui/base": "^5.0.0-alpha.114",
@@ -107,7 +107,7 @@
     "redux-thunk": "^2.4.1",
     "sanitize-html": "^2.7.0",
     "sass": "^1.49.9",
-    "schedule-filter-widget": "^2.0.3",
+    "schedule-filter-widget": "^2.0.6",
     "simple-chat-widget": "^1.0.31",
     "simple-oauth2": "^4.1.0",
     "slick-carousel": "^1.8.1",

package/src/actions/schedule-actions.js

@@ -103,7 +103,7 @@ export const updateFiltersFromHash =
           : "";
       } else {
         const newValues = normalizedFilters[key]
-          ? normalizedFilters[key].split(",")
+          ? decodeURIComponent(normalizedFilters[key]).split(",")
           : [];
         newFilters[key].values = newValues.map((val) => {
           if (isNaN(val)) return decodeURIComponent(val);
@@ -125,7 +125,7 @@ export const updateFiltersFromHash =
   };
 
 export const getShareLink = (filters, view) => {
-  const hashVars = [];
+  const hashVars = {};
 
   if (filters) {
     Object.entries(filters).forEach(([key, value]) => {
@@ -137,17 +137,20 @@ export const getShareLink = (filters, view) => {
         } else {
           hashValue = encodeURIComponent(value.values);
         }
-        hashVars.push(`${key}=${hashValue}`);
+        hashVars[key] = hashValue;
       }
     });
   }
 
   if (view) {
-    hashVars.push(`view=${view}`);
+    hashVars['view'] = view;
   }
 
   if (typeof window !== "undefined") {
-    return `${window.location}#${hashVars.join("&")}`;
+    const currentURL = window.location.href.split("#")[0];
+    Object.entries(hashVars).map(([key, value]) => fragmentParser.setParam(key, value));    
+    let fragment = fragmentParser.serialize();
+    return `${currentURL}#${fragment}`;
   }
 
   return "";

package/src/components/VideoComponent.js

@@ -17,6 +17,10 @@ const checkVimeoVideo = (url) => {
     return url.match(/https:\/\/(www\.)?(player\.)?vimeo.com\/(.*)/);
 };
 
+function checkYouTubeVideo(url) {
+    return url.match(/^(?:https?:\/\/)?(?:m\.|www\.)?(?:youtu\.be\/|youtube\.com\/(?:embed\/|v\/|watch\?v=|watch\?.+&v=))((\w|-){11})(?:\S+)?$/);
+}
+
 const VideoComponent = ({ url, title, namespace, firstHalf, autoPlay, start }) => {
     console.log({ url, title, namespace, firstHalf, autoPlay, start });
     if (url) {
@@ -54,6 +58,23 @@ const VideoComponent = ({ url, title, namespace, firstHalf, autoPlay, start }) =
                 <VideoJSPlayer title={title} namespace={namespace} firstHalf={firstHalf} {...videoJsOptions} />
             );
         };
+
+        const customOptions = checkYouTubeVideo(url) ? {
+            techOrder: ["youtube"],
+            sources: [{
+                type: "video/youtube",
+                src: url
+            }],
+            youtube: {
+                ytControls: 0,
+                iv_load_policy: 1
+            },
+        }: {
+            sources: [{
+                src: url
+            }],
+        };
+
         const videoJsOptions = {
             autoplay: autoPlay,
             /*
@@ -64,17 +85,10 @@ const VideoComponent = ({ url, title, namespace, firstHalf, autoPlay, start }) =
             muted: !!autoPlay,
             controls: true,
             fluid: true,
-            techOrder: ["youtube"],
-            sources: [{
-                type: "video/youtube",
-                src: url
-            }],
-            youtube: {
-                ytControls: 0,
-                iv_load_policy: 1
-            },
             playsInline: true,
+            ...customOptions
         };
+
         return (
             <VideoJSPlayer title={title} namespace={namespace} {...videoJsOptions} />
         );

package/src/templates/posters-page.js

@@ -225,7 +225,7 @@ const PostersPage = ({
 };
 
 const mapStateToProps = ({ settingState, presentationsState, userState, summitState }) => ({
-  pagesSettings: [...settingState.posterPagesSettings.posterPages],
+  pagesSettings: [...settingState.posterPagesSettings.postersPages],
   posters: presentationsState.voteablePresentations.filteredPresentations,
   allBuildTimePosters: presentationsState.voteablePresentations.ssrPresentations,
   allPosters: presentationsState.voteablePresentations.allPresentations,