@treely/strapi-slices 7.6.2 → 7.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/models/strapi/StrapiEvent.d.ts +3 -4
- package/dist/strapi-slices.cjs.development.js +22 -18
- package/dist/strapi-slices.cjs.development.js.map +1 -1
- package/dist/strapi-slices.cjs.production.min.js +1 -1
- package/dist/strapi-slices.cjs.production.min.js.map +1 -1
- package/dist/strapi-slices.esm.js +22 -18
- package/dist/strapi-slices.esm.js.map +1 -1
- package/dist/utils/isSameDate.d.ts +2 -0
- package/package.json +1 -1
- package/src/components/EventCard/EventCard.test.tsx +17 -0
- package/src/components/EventCard/EventCard.tsx +37 -13
- package/src/models/strapi/StrapiEvent.ts +3 -4
- package/src/slices/Events/Events.test.tsx +9 -11
- package/src/slices/Events/Events.tsx +5 -6
- package/src/test/strapiMocks/strapiEventMock.ts +3 -4
- package/src/utils/isSameDate.test.ts +18 -0
- package/src/utils/isSameDate.ts +9 -0
- package/dist/utils/convertStrapiTime.d.ts +0 -3
- package/src/utils/convertStrapiTime.test.ts +0 -21
- package/src/utils/convertStrapiTime.ts +0 -19
|
@@ -5851,16 +5851,8 @@ var EventType;
|
|
|
5851
5851
|
EventType["FAIR"] = "Fair";
|
|
5852
5852
|
})(EventType || (EventType = {}));
|
|
5853
5853
|
|
|
5854
|
-
var
|
|
5855
|
-
|
|
5856
|
-
var dt = new Date();
|
|
5857
|
-
dt.setHours(parseInt(tempTime[0], 10), parseInt(tempTime[1], 10), 0, 0);
|
|
5858
|
-
var time = new Date(dt.getTime() - dt.getTimezoneOffset() * 60000);
|
|
5859
|
-
return formatNumber(time.getUTCHours(), {
|
|
5860
|
-
minimumIntegerDigits: 2
|
|
5861
|
-
}) + ":" + formatNumber(time.getUTCMinutes(), {
|
|
5862
|
-
minimumIntegerDigits: 2
|
|
5863
|
-
});
|
|
5854
|
+
var isSameDate = function isSameDate(date1, date2) {
|
|
5855
|
+
return date1.getFullYear() === date2.getFullYear() && date1.getMonth() === date2.getMonth() && date1.getDate() === date2.getDate();
|
|
5864
5856
|
};
|
|
5865
5857
|
|
|
5866
5858
|
var _templateObject;
|
|
@@ -6036,15 +6028,27 @@ var EventCard = function EventCard(_ref) {
|
|
|
6036
6028
|
color: 'var(--boemly-colors-primary-700)'
|
|
6037
6029
|
}), React.createElement(Text, {
|
|
6038
6030
|
size: ['xsLowBold', null, null, 'smLowBold']
|
|
6039
|
-
}, formatDate(event.
|
|
6031
|
+
}, formatDate(event.start, {
|
|
6040
6032
|
year: 'numeric',
|
|
6041
6033
|
month: '2-digit',
|
|
6042
6034
|
day: '2-digit'
|
|
6043
|
-
}), event.
|
|
6035
|
+
}), !event.allDay && " | " + formatNumber(new Date(event.start).getUTCHours(), {
|
|
6036
|
+
minimumIntegerDigits: 2
|
|
6037
|
+
}) + ":" + formatNumber(new Date(event.start).getUTCMinutes(), {
|
|
6038
|
+
minimumIntegerDigits: 2
|
|
6039
|
+
}), event.end && !isSameDate(new Date(event.start), new Date(event.end)) && React.createElement(React.Fragment, null, ' - ', formatDate(event.end, {
|
|
6044
6040
|
year: 'numeric',
|
|
6045
6041
|
month: '2-digit',
|
|
6046
6042
|
day: '2-digit'
|
|
6047
|
-
}), event.
|
|
6043
|
+
}), !event.allDay && " | " + formatNumber(new Date(event.end).getUTCHours(), {
|
|
6044
|
+
minimumIntegerDigits: 2
|
|
6045
|
+
}) + ":" + formatNumber(new Date(event.end).getUTCMinutes(), {
|
|
6046
|
+
minimumIntegerDigits: 2
|
|
6047
|
+
})), event.end && !event.allDay && isSameDate(new Date(event.start), new Date(event.end)) && " - " + formatNumber(new Date(event.end).getUTCHours(), {
|
|
6048
|
+
minimumIntegerDigits: 2
|
|
6049
|
+
}) + ":" + formatNumber(new Date(event.end).getUTCMinutes(), {
|
|
6050
|
+
minimumIntegerDigits: 2
|
|
6051
|
+
})))), React.createElement(Text, {
|
|
6048
6052
|
mb: mobile ? '0' : '7',
|
|
6049
6053
|
size: ['xsRegularNormal', null, null, 'smRegularNormal']
|
|
6050
6054
|
}, isExpanded || !mobile ? event.description : event.description.substring(0, MAX_LENGTH) + "..."), event.description.length > MAX_LENGTH && mobile && React.createElement(Flex, {
|
|
@@ -6170,15 +6174,15 @@ var Events = function Events(_ref) {
|
|
|
6170
6174
|
var now = new Date().toISOString();
|
|
6171
6175
|
var buildEventsUrl = function buildEventsUrl(index, batchSize, startFilter) {
|
|
6172
6176
|
var url = new URL("/treely-events", STRAPI_URI);
|
|
6173
|
-
url.searchParams.append('pagination[
|
|
6177
|
+
url.searchParams.append('pagination[start]', (index * batchSize).toString());
|
|
6174
6178
|
url.searchParams.append('pagination[limit]', batchSize.toString());
|
|
6175
6179
|
url.searchParams.append(startFilter, now);
|
|
6176
6180
|
url.searchParams.append('locale', locale);
|
|
6177
6181
|
url.searchParams.append('pLevel', STRAPI_DEFAULT_POPULATE_DEPTH);
|
|
6178
6182
|
if (sort[0] === Sort.OLDEST_FIRST) {
|
|
6179
|
-
url.searchParams.append('sort', '
|
|
6183
|
+
url.searchParams.append('sort', 'start:asc');
|
|
6180
6184
|
} else {
|
|
6181
|
-
url.searchParams.append('sort', '
|
|
6185
|
+
url.searchParams.append('sort', 'start:desc');
|
|
6182
6186
|
}
|
|
6183
6187
|
if (eventTypeFilter.length) {
|
|
6184
6188
|
eventTypeFilter.forEach(function (filter, i) {
|
|
@@ -6193,10 +6197,10 @@ var Events = function Events(_ref) {
|
|
|
6193
6197
|
return "/treely-events" + url.search;
|
|
6194
6198
|
};
|
|
6195
6199
|
var getUpcomingKey = useCallback(function (index) {
|
|
6196
|
-
return buildEventsUrl(index, UPCOMING_BATCH_SIZE, 'filters[
|
|
6200
|
+
return buildEventsUrl(index, UPCOMING_BATCH_SIZE, 'filters[start][$gte]');
|
|
6197
6201
|
}, [eventTypeFilter, languageFilter, sort]);
|
|
6198
6202
|
var getPastKey = useCallback(function (index) {
|
|
6199
|
-
return buildEventsUrl(index, PAST_BATCH_SIZE, 'filters[
|
|
6203
|
+
return buildEventsUrl(index, PAST_BATCH_SIZE, 'filters[start][$lt]');
|
|
6200
6204
|
}, [eventTypeFilter, languageFilter, sort]);
|
|
6201
6205
|
var _useEvents = useEvents({
|
|
6202
6206
|
getKey: getUpcomingKey,
|