@treely/strapi-slices 7.6.3 → 7.7.0

package/dist/models/strapi/StrapiEvent.d.ts

@@ -39,10 +39,9 @@ interface StrapiEvent {
     location?: string;
     locale: Locale;
     online?: boolean;
-    startDate: Date;
-    startTime?: string;
-    endDate?: Date;
-    endTime?: string;
+    start: Date;
+    end?: Date;
+    allDay?: boolean;
     slices: any[];
     localizations: StrapiLocalization[];
     topBanner?: StrapiTopBanner;

package/dist/strapi-slices.cjs.development.js

@@ -5869,16 +5869,8 @@ var EventType;
   EventType["FAIR"] = "Fair";
 })(EventType || (EventType = {}));
 
-var convertStrapiTime = function convertStrapiTime(date, formatNumber) {
-  var tempTime = date.split(':');
-  var dt = new Date();
-  dt.setHours(parseInt(tempTime[0], 10), parseInt(tempTime[1], 10), 0, 0);
-  var time = new Date(dt.getTime() - dt.getTimezoneOffset() * 60000);
-  return formatNumber(time.getUTCHours(), {
-    minimumIntegerDigits: 2
-  }) + ":" + formatNumber(time.getUTCMinutes(), {
-    minimumIntegerDigits: 2
-  });
+var isSameDate = function isSameDate(date1, date2) {
+  return date1.getFullYear() === date2.getFullYear() && date1.getMonth() === date2.getMonth() && date1.getDate() === date2.getDate();
 };
 
 var _templateObject;
@@ -6054,15 +6046,27 @@ var EventCard = function EventCard(_ref) {
     color: 'var(--boemly-colors-primary-700)'
   }), React__default.default.createElement(boemly.Text, {
     size: ['xsLowBold', null, null, 'smLowBold']
-  }, formatDate(event.startDate, {
+  }, formatDate(event.start, {
     year: 'numeric',
     month: '2-digit',
     day: '2-digit'
-  }), event.startTime && " | " + convertStrapiTime(event.startTime, formatNumber) + " ", (event.endDate || event.endTime) && ' - ', event.endDate && formatDate(event.endDate, {
+  }), !event.allDay && " | " + formatNumber(new Date(event.start).getUTCHours(), {
+    minimumIntegerDigits: 2
+  }) + ":" + formatNumber(new Date(event.start).getUTCMinutes(), {
+    minimumIntegerDigits: 2
+  }), event.end && !isSameDate(new Date(event.start), new Date(event.end)) && React__default.default.createElement(React__default.default.Fragment, null, ' - ', formatDate(event.end, {
     year: 'numeric',
     month: '2-digit',
     day: '2-digit'
-  }), event.endTime && event.endDate && ' | ', event.endTime && convertStrapiTime(event.endTime, formatNumber)))), React__default.default.createElement(boemly.Text, {
+  }), !event.allDay && " | " + formatNumber(new Date(event.end).getUTCHours(), {
+    minimumIntegerDigits: 2
+  }) + ":" + formatNumber(new Date(event.end).getUTCMinutes(), {
+    minimumIntegerDigits: 2
+  })), event.end && !event.allDay && isSameDate(new Date(event.start), new Date(event.end)) && " - " + formatNumber(new Date(event.end).getUTCHours(), {
+    minimumIntegerDigits: 2
+  }) + ":" + formatNumber(new Date(event.end).getUTCMinutes(), {
+    minimumIntegerDigits: 2
+  })))), React__default.default.createElement(boemly.Text, {
     mb: mobile ? '0' : '7',
     size: ['xsRegularNormal', null, null, 'smRegularNormal']
   }, isExpanded || !mobile ? event.description : event.description.substring(0, MAX_LENGTH) + "..."), event.description.length > MAX_LENGTH && mobile && React__default.default.createElement(boemly.Flex, {
@@ -6194,9 +6198,9 @@ var Events = function Events(_ref) {
     url.searchParams.append('locale', locale);
     url.searchParams.append('pLevel', STRAPI_DEFAULT_POPULATE_DEPTH);
     if (sort[0] === Sort.OLDEST_FIRST) {
-      url.searchParams.append('sort', 'startDate:asc');
+      url.searchParams.append('sort', 'start:asc');
     } else {
-      url.searchParams.append('sort', 'startDate:desc');
+      url.searchParams.append('sort', 'start:desc');
     }
     if (eventTypeFilter.length) {
       eventTypeFilter.forEach(function (filter, i) {
@@ -6211,10 +6215,10 @@ var Events = function Events(_ref) {
     return "/treely-events" + url.search;
   };
   var getUpcomingKey = React.useCallback(function (index) {
-    return buildEventsUrl(index, UPCOMING_BATCH_SIZE, 'filters[startDate][$gte]');
+    return buildEventsUrl(index, UPCOMING_BATCH_SIZE, 'filters[start][$gte]');
   }, [eventTypeFilter, languageFilter, sort]);
   var getPastKey = React.useCallback(function (index) {
-    return buildEventsUrl(index, PAST_BATCH_SIZE, 'filters[startDate][$lt]');
+    return buildEventsUrl(index, PAST_BATCH_SIZE, 'filters[start][$lt]');
   }, [eventTypeFilter, languageFilter, sort]);
   var _useEvents = useEvents({
       getKey: getUpcomingKey,