@treely/strapi-slices 7.5.4 → 7.6.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/constants/strapi.d.ts +1 -0
- package/dist/models/strapi/StrapiEvent.d.ts +4 -2
- package/dist/strapi-slices.cjs.development.js +29 -20
- 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 +29 -20
- package/dist/strapi-slices.esm.js.map +1 -1
- package/dist/utils/convertStrapiTime.d.ts +3 -0
- package/package.json +3 -2
- package/src/components/EventCard/EventCard.test.tsx +7 -3
- package/src/components/EventCard/EventCard.tsx +13 -17
- package/src/constants/strapi.ts +1 -0
- package/src/integrations/strapi/getPortfolioProjects.ts +5 -2
- package/src/integrations/strapi/getStrapiCollectionType.ts +2 -1
- package/src/integrations/strapi/getStrapiSingleType.ts +2 -1
- package/src/models/strapi/StrapiEvent.ts +4 -2
- package/src/slices/Events/Events.test.tsx +11 -9
- package/src/slices/Events/Events.tsx +12 -8
- package/src/test/strapiMocks/strapiEventMock.ts +4 -2
- package/src/utils/convertStrapiTime.test.ts +21 -0
- package/src/utils/convertStrapiTime.ts +19 -0
|
@@ -39,8 +39,10 @@ interface StrapiEvent {
|
|
|
39
39
|
location?: string;
|
|
40
40
|
locale: Locale;
|
|
41
41
|
online?: boolean;
|
|
42
|
-
|
|
43
|
-
|
|
42
|
+
startDate: Date;
|
|
43
|
+
startTime?: string;
|
|
44
|
+
endDate?: Date;
|
|
45
|
+
endTime?: string;
|
|
44
46
|
slices: any[];
|
|
45
47
|
localizations: StrapiLocalization[];
|
|
46
48
|
topBanner?: StrapiTopBanner;
|
|
@@ -390,6 +390,7 @@ function _taggedTemplateLiteralLoose(e, t) {
|
|
|
390
390
|
|
|
391
391
|
var STRAPI_URI = process.env.NEXT_PUBLIC_STRAPI_URI || 'http://127.0.0.1:1337';
|
|
392
392
|
var STRAPI_DEFAULT_PAGE_SIZE = '100';
|
|
393
|
+
var STRAPI_DEFAULT_POPULATE_DEPTH = '4';
|
|
393
394
|
var STRAPI_FALLBACK_LOCALE = 'en';
|
|
394
395
|
|
|
395
396
|
var strapiClient = /*#__PURE__*/axiosCacheInterceptor.setupCache(/*#__PURE__*/axios__default.default.create({
|
|
@@ -501,7 +502,7 @@ var getPortfolioProjects = /*#__PURE__*/function () {
|
|
|
501
502
|
}
|
|
502
503
|
cache = preview ? false : undefined;
|
|
503
504
|
params = {
|
|
504
|
-
pLevel:
|
|
505
|
+
pLevel: STRAPI_DEFAULT_POPULATE_DEPTH,
|
|
505
506
|
locale: locale,
|
|
506
507
|
'pagination[pageSize]': STRAPI_DEFAULT_PAGE_SIZE,
|
|
507
508
|
status: preview ? 'draft' : 'published'
|
|
@@ -565,7 +566,7 @@ var getStrapiCollectionType = /*#__PURE__*/function () {
|
|
|
565
566
|
_ref$locale = _ref.locale, locale = _ref$locale === void 0 ? 'en' : _ref$locale, _ref$preview = _ref.preview, preview = _ref$preview === void 0 ? false : _ref$preview, _ref$filters = _ref.filters, filters = _ref$filters === void 0 ? {} : _ref$filters;
|
|
566
567
|
cache = preview ? false : undefined;
|
|
567
568
|
sharedParams = {
|
|
568
|
-
pLevel:
|
|
569
|
+
pLevel: STRAPI_DEFAULT_POPULATE_DEPTH,
|
|
569
570
|
'pagination[pageSize]': STRAPI_DEFAULT_PAGE_SIZE,
|
|
570
571
|
filters: filters,
|
|
571
572
|
status: preview ? 'draft' : 'published'
|
|
@@ -635,7 +636,7 @@ var getStrapiSingleType = /*#__PURE__*/function () {
|
|
|
635
636
|
_ref$locale = _ref.locale, locale = _ref$locale === void 0 ? 'en' : _ref$locale, _ref$preview = _ref.preview, preview = _ref$preview === void 0 ? false : _ref$preview, _ref$filters = _ref.filters, filters = _ref$filters === void 0 ? {} : _ref$filters;
|
|
636
637
|
cache = preview ? false : undefined;
|
|
637
638
|
params = {
|
|
638
|
-
pLevel:
|
|
639
|
+
pLevel: STRAPI_DEFAULT_POPULATE_DEPTH,
|
|
639
640
|
locale: locale,
|
|
640
641
|
'pagination[pageSize]': STRAPI_DEFAULT_PAGE_SIZE,
|
|
641
642
|
filters: filters,
|
|
@@ -5868,6 +5869,18 @@ var EventType;
|
|
|
5868
5869
|
EventType["FAIR"] = "Fair";
|
|
5869
5870
|
})(EventType || (EventType = {}));
|
|
5870
5871
|
|
|
5872
|
+
var convertStrapiTime = function convertStrapiTime(date, formatNumber) {
|
|
5873
|
+
var tempTime = date.split(':');
|
|
5874
|
+
var dt = new Date();
|
|
5875
|
+
dt.setHours(parseInt(tempTime[0], 10), parseInt(tempTime[1], 10), 0, 0);
|
|
5876
|
+
var time = new Date(dt.getTime() - dt.getTimezoneOffset() * 60000);
|
|
5877
|
+
return formatNumber(time.getUTCHours(), {
|
|
5878
|
+
minimumIntegerDigits: 2
|
|
5879
|
+
}) + ":" + formatNumber(time.getUTCMinutes(), {
|
|
5880
|
+
minimumIntegerDigits: 2
|
|
5881
|
+
});
|
|
5882
|
+
};
|
|
5883
|
+
|
|
5871
5884
|
var _templateObject;
|
|
5872
5885
|
var MAX_LENGTH = 120;
|
|
5873
5886
|
var LOCATION_MAX_LENGTH = 28;
|
|
@@ -6041,19 +6054,15 @@ var EventCard = function EventCard(_ref) {
|
|
|
6041
6054
|
color: 'var(--boemly-colors-primary-700)'
|
|
6042
6055
|
}), React__default.default.createElement(boemly.Text, {
|
|
6043
6056
|
size: ['xsLowBold', null, null, 'smLowBold']
|
|
6044
|
-
}, formatDate(event.
|
|
6057
|
+
}, formatDate(event.startDate, {
|
|
6045
6058
|
year: 'numeric',
|
|
6046
6059
|
month: '2-digit',
|
|
6047
6060
|
day: '2-digit'
|
|
6048
|
-
}),
|
|
6049
|
-
|
|
6050
|
-
|
|
6051
|
-
|
|
6052
|
-
}),
|
|
6053
|
-
minimumIntegerDigits: 2
|
|
6054
|
-
}), ":", formatNumber(new Date(event.end).getUTCMinutes(), {
|
|
6055
|
-
minimumIntegerDigits: 2
|
|
6056
|
-
})))), React__default.default.createElement(boemly.Text, {
|
|
6061
|
+
}), event.startTime && " | " + convertStrapiTime(event.startTime, formatNumber) + " ", (event.endDate || event.endTime) && ' - ', event.endDate && formatDate(event.endDate, {
|
|
6062
|
+
year: 'numeric',
|
|
6063
|
+
month: '2-digit',
|
|
6064
|
+
day: '2-digit'
|
|
6065
|
+
}), event.endTime && event.endDate && ' | ', event.endTime && convertStrapiTime(event.endTime, formatNumber)))), React__default.default.createElement(boemly.Text, {
|
|
6057
6066
|
mb: mobile ? '0' : '7',
|
|
6058
6067
|
size: ['xsRegularNormal', null, null, 'smRegularNormal']
|
|
6059
6068
|
}, isExpanded || !mobile ? event.description : event.description.substring(0, MAX_LENGTH) + "..."), event.description.length > MAX_LENGTH && mobile && React__default.default.createElement(boemly.Flex, {
|
|
@@ -6179,15 +6188,15 @@ var Events = function Events(_ref) {
|
|
|
6179
6188
|
var now = new Date().toISOString();
|
|
6180
6189
|
var buildEventsUrl = function buildEventsUrl(index, batchSize, startFilter) {
|
|
6181
6190
|
var url = new URL("/treely-events", STRAPI_URI);
|
|
6182
|
-
url.searchParams.append('pagination[
|
|
6191
|
+
url.searchParams.append('pagination[startDate]', (index * batchSize).toString());
|
|
6183
6192
|
url.searchParams.append('pagination[limit]', batchSize.toString());
|
|
6184
6193
|
url.searchParams.append(startFilter, now);
|
|
6185
6194
|
url.searchParams.append('locale', locale);
|
|
6186
|
-
url.searchParams.append('pLevel',
|
|
6195
|
+
url.searchParams.append('pLevel', STRAPI_DEFAULT_POPULATE_DEPTH);
|
|
6187
6196
|
if (sort[0] === Sort.OLDEST_FIRST) {
|
|
6188
|
-
url.searchParams.append('sort', '
|
|
6197
|
+
url.searchParams.append('sort', 'startDate:asc');
|
|
6189
6198
|
} else {
|
|
6190
|
-
url.searchParams.append('sort', '
|
|
6199
|
+
url.searchParams.append('sort', 'startDate:desc');
|
|
6191
6200
|
}
|
|
6192
6201
|
if (eventTypeFilter.length) {
|
|
6193
6202
|
eventTypeFilter.forEach(function (filter, i) {
|
|
@@ -6202,10 +6211,10 @@ var Events = function Events(_ref) {
|
|
|
6202
6211
|
return "/treely-events" + url.search;
|
|
6203
6212
|
};
|
|
6204
6213
|
var getUpcomingKey = React.useCallback(function (index) {
|
|
6205
|
-
return buildEventsUrl(index, UPCOMING_BATCH_SIZE, 'filters[
|
|
6214
|
+
return buildEventsUrl(index, UPCOMING_BATCH_SIZE, 'filters[startDate][$gte]');
|
|
6206
6215
|
}, [eventTypeFilter, languageFilter, sort]);
|
|
6207
6216
|
var getPastKey = React.useCallback(function (index) {
|
|
6208
|
-
return buildEventsUrl(index, PAST_BATCH_SIZE, 'filters[
|
|
6217
|
+
return buildEventsUrl(index, PAST_BATCH_SIZE, 'filters[startDate][$lt]');
|
|
6209
6218
|
}, [eventTypeFilter, languageFilter, sort]);
|
|
6210
6219
|
var _useEvents = useEvents({
|
|
6211
6220
|
getKey: getUpcomingKey,
|
|
@@ -6250,7 +6259,7 @@ var Events = function Events(_ref) {
|
|
|
6250
6259
|
case 0:
|
|
6251
6260
|
url = new URL("/treely-events", STRAPI_URI);
|
|
6252
6261
|
url.searchParams.append('locale', locale);
|
|
6253
|
-
url.searchParams.append('pLevel',
|
|
6262
|
+
url.searchParams.append('pLevel', STRAPI_DEFAULT_POPULATE_DEPTH);
|
|
6254
6263
|
_context.next = 5;
|
|
6255
6264
|
return fetch(STRAPI_URI + "/api/treely-events" + url.search, {
|
|
6256
6265
|
headers: {
|