@mjhls/mjh-framework 1.0.870 → 1.0.872

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.
Files changed (6) hide show
  1. package/README.md +1 -1
  2. package/dist/cjs/PartnerDetailListing.js +17 -10
  3. package/dist/cjs/QueueDeckExpanded.js +2 -2
  4. package/dist/esm/PartnerDetailListing.js +17 -10
  5. package/dist/esm/QueueDeckExpanded.js +2 -2
  6. package/package.json +2 -2
package/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # mjh-framework v. 1.0.870
1
+ # mjh-framework v. 1.0.872
2
2
 
3
3
  [![NPM](https://img.shields.io/npm/v/mjh-framework.svg)](https://www.npmjs.com/package/mjh-framework) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
4
4
 
package/dist/cjs/PartnerDetailListing.js CHANGED
@@ -250,6 +250,11 @@ var ImageSlider = function ImageSlider(props) {
250
250
 
251
251
  var _this = undefined;
252
252
 
253
+ var checkIsFacebookGroup = function checkIsFacebookGroup(url) {
254
+ return (/www\.facebook\.com\/groups/.test(url)
255
+ );
256
+ };
257
+
253
258
  var PartnerDetails = function PartnerDetails(_ref) {
254
259
  var posts = _ref.posts,
255
260
  query = _ref.query,
@@ -281,7 +286,8 @@ var PartnerDetails = function PartnerDetails(_ref) {
281
286
  React__default['default'].createElement('img', {
282
287
  alt: partnerDetails.thumbnail && partnerDetails.thumbnail.alt ? partnerDetails.thumbnail.alt : partnerDetails.name,
283
288
  style: { maxWidth: '100%' },
284
- src: partnerDetails.thumbnail ? urlFor({ client: client, source: partnerDetails.thumbnail.asset }) : '' }),
289
+ src: partnerDetails.thumbnail ? urlFor({ client: client, source: partnerDetails.thumbnail.asset }) : ''
290
+ }),
285
291
  partnerDetails.thumbnail && partnerDetails.thumbnail.caption && React__default['default'].createElement(
286
292
  'figcaption',
287
293
  null,
@@ -294,7 +300,8 @@ var PartnerDetails = function PartnerDetails(_ref) {
294
300
  React__default['default'].createElement('img', {
295
301
  alt: partnerDetails.thumbnail && partnerDetails.thumbnail.alt ? partnerDetails.thumbnail.alt : partnerDetails.name,
296
302
  style: { maxWidth: '100%' },
297
- src: partnerDetails.thumbnail ? urlFor({ client: client, source: partnerDetails.thumbnail.asset }) : '' }),
303
+ src: partnerDetails.thumbnail ? urlFor({ client: client, source: partnerDetails.thumbnail.asset }) : ''
304
+ }),
298
305
  partnerDetails.thumbnail && partnerDetails.thumbnail.caption && React__default['default'].createElement(
299
306
  'figcaption',
300
307
  null,
@@ -306,16 +313,16 @@ var PartnerDetails = function PartnerDetails(_ref) {
306
313
  { jsx: 'true' },
307
314
  '\n @media screen and (max-width: 768px) {\n .partners-logo {\n width: 100%;\n min-width: 100%;\n }\n .partner-logo-wrap {\n flex-wrap: wrap;\n }\n .block-content-partners {\n padding-left: 0 !important;\n }\n }\n '
308
315
  ),
309
- (partnerDetails.description || partnerDetails.linkedin || partnerDetails.twitter && partnerDetails.facebook) && React__default['default'].createElement(
316
+ (partnerDetails.description || partnerDetails.linkedin || partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React__default['default'].createElement(
310
317
  'div',
311
318
  { className: 'block-content-partners my-4', style: { maxWidth: '100%', paddingLeft: '2rem', flex: '1 1 auto' } },
312
319
  partnerDetails.description && React__default['default'].createElement(BlockContent.BlockContent, _extends._extends({ serializers: getSerializers.getSerializers(client), blocks: partnerDetails.description, imageOptions: { w: 320, h: 240, fit: 'max' } }, client.config())),
313
- (partnerDetails.linkedin || partnerDetails.twitter && partnerDetails.facebook) && React__default['default'].createElement(
320
+ (partnerDetails.linkedin || partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React__default['default'].createElement(
314
321
  'div',
315
322
  null,
316
323
  React__default['default'].createElement(
317
324
  'p',
318
- { 'class': 'd-inline-block font-weight-bold' },
325
+ { className: 'd-inline-block font-weight-bold' },
319
326
  'Connect with us:'
320
327
  ),
321
328
  ' ',
@@ -325,7 +332,7 @@ var PartnerDetails = function PartnerDetails(_ref) {
325
332
  rel: 'noopener noreferrer',
326
333
  style: { height: 30, width: 30 }
327
334
  }),
328
- partnerDetails.twitter && partnerDetails.facebook && React__default['default'].createElement(reactSocialIcons.reactSocialIcons_1, { url: partnerDetails.facebook, target: '_blank', rel: 'noopener noreferrer', style: { height: 30, width: 30, marginLeft: '0.25rem' } })
335
+ (partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React__default['default'].createElement(reactSocialIcons.reactSocialIcons_1, { url: partnerDetails.facebook, target: '_blank', rel: 'noopener noreferrer', style: { height: 30, width: 30, marginLeft: '0.25rem' } })
329
336
  )
330
337
  )
331
338
  ),
@@ -344,7 +351,7 @@ var PartnerDetails = function PartnerDetails(_ref) {
344
351
  { className: ' mb-5' },
345
352
  React__default['default'].createElement(Feature, { dataset: features, client: client })
346
353
  ),
347
- (partnerDetails.twitter || partnerDetails.facebook) && React__default['default'].createElement(
354
+ (partnerDetails.twitter || partnerDetails.facebook && !checkIsFacebookGroup(partnerDetails.facebook)) && React__default['default'].createElement(
348
355
  'div',
349
356
  { className: 'mb-5', style: { width: '100%', maxWidth: '100%', textAlign: 'center', padding: '15px', border: '2px solid #aaa', borderRadius: '15px' } },
350
357
  partnerDetails.twitter ? React__default['default'].createElement(reactTwitterEmbed.TwitterTimelineEmbed, { sourceType: 'url', url: partnerDetails.twitter, options: { height: 400 } }) : partnerDetails.facebook && React__default['default'].createElement(
@@ -405,8 +412,8 @@ PartnerDetails.returnGetInitialProps = function () {
405
412
 
406
413
 
407
414
  if (category) {
408
- //if partners page has a sub category such as onclive
409
- //e.g. /sap-partner/[category]/[partner]
415
+ // if partners page has a sub category such as onclive
416
+ // e.g. /sap-partner/[category]/[partner]
410
417
 
411
418
  partnerQuery = '*[_type == \'documentGroup\' && !(_id in path("drafts.**")) && identifier.current == \'' + category + '\' && references(\'' + partnerDocumentGroupID + '\')] [0] {\n ...,\n \'partner\': *[_type == \'documentGroup\' && identifier.current == \'' + identifier + '\' && references(^._id)] [0] {\n description,\n name,\n identifier,\n thumbnail,\n twitter,\n facebook,\n linkedin,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n \n }\n }';
412
419
  }
@@ -433,7 +440,7 @@ PartnerDetails.returnGetInitialProps = function () {
433
440
  articles = _context.sent;
434
441
 
435
442
 
436
- //need to exclude slideshows from body due to the affiliate slider
443
+ // need to exclude slideshows from body due to the affiliate slider
437
444
  if (partnerDetails && partnerDetails.description) {
438
445
  partnerDetails.description = partnerDetails.description.filter(function (block) {
439
446
  return block._type !== 'slideshows';
package/dist/cjs/QueueDeckExpanded.js CHANGED
@@ -158,7 +158,7 @@ var checkExternalUrl = function checkExternalUrl(url) {
158
158
  };
159
159
 
160
160
  var cardLoader = function cardLoader(data, client, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage, showAuthor, showCategory, imageHeight, imageWidth, imageMaxHeight, imageFit, rightItems, brandInsightAd, showBI, itemsPerPage, heroContent, lgInfeedAd, showPubInfo, contentCategoryMapping, showTimeDiff, showTaxonomies, showIntro) {
161
- var numberOfItemsBeforeAd = 6;
161
+ var numberOfItemsBeforeAd = data.length < 6 ? data.length : 6;
162
162
  var insertBrandInsightAd = function insertBrandInsightAd(arr, index, newElement) {
163
163
  return [].concat(toConsumableArray._toConsumableArray(arr.slice(0, index)), [newElement], toConsumableArray._toConsumableArray(arr.slice(index)));
164
164
  };
@@ -1316,7 +1316,7 @@ var ImagePlaceholder = function ImagePlaceholder() {
1316
1316
  };
1317
1317
 
1318
1318
  var renderMobileAd = function renderMobileAd(index, numberOfItemsBeforeAd, rightItems) {
1319
- var i = ((index + 1) / numberOfItemsBeforeAd - 1) % rightItems.length;
1319
+ var i = numberOfItemsBeforeAd < 6 ? 0 : ((index + 1) / numberOfItemsBeforeAd - 1) % rightItems.length;
1320
1320
  return React__default['default'].createElement(
1321
1321
  'div',
1322
1322
  { style: { display: 'flex', flex: '1 0 auto' } },
package/dist/esm/PartnerDetailListing.js CHANGED
@@ -244,6 +244,11 @@ var ImageSlider = function ImageSlider(props) {
244
244
 
245
245
  var _this = undefined;
246
246
 
247
+ var checkIsFacebookGroup = function checkIsFacebookGroup(url) {
248
+ return (/www\.facebook\.com\/groups/.test(url)
249
+ );
250
+ };
251
+
247
252
  var PartnerDetails = function PartnerDetails(_ref) {
248
253
  var posts = _ref.posts,
249
254
  query = _ref.query,
@@ -275,7 +280,8 @@ var PartnerDetails = function PartnerDetails(_ref) {
275
280
  React.createElement('img', {
276
281
  alt: partnerDetails.thumbnail && partnerDetails.thumbnail.alt ? partnerDetails.thumbnail.alt : partnerDetails.name,
277
282
  style: { maxWidth: '100%' },
278
- src: partnerDetails.thumbnail ? urlFor({ client: client, source: partnerDetails.thumbnail.asset }) : '' }),
283
+ src: partnerDetails.thumbnail ? urlFor({ client: client, source: partnerDetails.thumbnail.asset }) : ''
284
+ }),
279
285
  partnerDetails.thumbnail && partnerDetails.thumbnail.caption && React.createElement(
280
286
  'figcaption',
281
287
  null,
@@ -288,7 +294,8 @@ var PartnerDetails = function PartnerDetails(_ref) {
288
294
  React.createElement('img', {
289
295
  alt: partnerDetails.thumbnail && partnerDetails.thumbnail.alt ? partnerDetails.thumbnail.alt : partnerDetails.name,
290
296
  style: { maxWidth: '100%' },
291
- src: partnerDetails.thumbnail ? urlFor({ client: client, source: partnerDetails.thumbnail.asset }) : '' }),
297
+ src: partnerDetails.thumbnail ? urlFor({ client: client, source: partnerDetails.thumbnail.asset }) : ''
298
+ }),
292
299
  partnerDetails.thumbnail && partnerDetails.thumbnail.caption && React.createElement(
293
300
  'figcaption',
294
301
  null,
@@ -300,16 +307,16 @@ var PartnerDetails = function PartnerDetails(_ref) {
300
307
  { jsx: 'true' },
301
308
  '\n @media screen and (max-width: 768px) {\n .partners-logo {\n width: 100%;\n min-width: 100%;\n }\n .partner-logo-wrap {\n flex-wrap: wrap;\n }\n .block-content-partners {\n padding-left: 0 !important;\n }\n }\n '
302
309
  ),
303
- (partnerDetails.description || partnerDetails.linkedin || partnerDetails.twitter && partnerDetails.facebook) && React.createElement(
310
+ (partnerDetails.description || partnerDetails.linkedin || partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React.createElement(
304
311
  'div',
305
312
  { className: 'block-content-partners my-4', style: { maxWidth: '100%', paddingLeft: '2rem', flex: '1 1 auto' } },
306
313
  partnerDetails.description && React.createElement(BlockContent, _extends({ serializers: getSerializers(client), blocks: partnerDetails.description, imageOptions: { w: 320, h: 240, fit: 'max' } }, client.config())),
307
- (partnerDetails.linkedin || partnerDetails.twitter && partnerDetails.facebook) && React.createElement(
314
+ (partnerDetails.linkedin || partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React.createElement(
308
315
  'div',
309
316
  null,
310
317
  React.createElement(
311
318
  'p',
312
- { 'class': 'd-inline-block font-weight-bold' },
319
+ { className: 'd-inline-block font-weight-bold' },
313
320
  'Connect with us:'
314
321
  ),
315
322
  ' ',
@@ -319,7 +326,7 @@ var PartnerDetails = function PartnerDetails(_ref) {
319
326
  rel: 'noopener noreferrer',
320
327
  style: { height: 30, width: 30 }
321
328
  }),
322
- partnerDetails.twitter && partnerDetails.facebook && React.createElement(reactSocialIcons_1, { url: partnerDetails.facebook, target: '_blank', rel: 'noopener noreferrer', style: { height: 30, width: 30, marginLeft: '0.25rem' } })
329
+ (partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React.createElement(reactSocialIcons_1, { url: partnerDetails.facebook, target: '_blank', rel: 'noopener noreferrer', style: { height: 30, width: 30, marginLeft: '0.25rem' } })
323
330
  )
324
331
  )
325
332
  ),
@@ -338,7 +345,7 @@ var PartnerDetails = function PartnerDetails(_ref) {
338
345
  { className: ' mb-5' },
339
346
  React.createElement(Feature, { dataset: features, client: client })
340
347
  ),
341
- (partnerDetails.twitter || partnerDetails.facebook) && React.createElement(
348
+ (partnerDetails.twitter || partnerDetails.facebook && !checkIsFacebookGroup(partnerDetails.facebook)) && React.createElement(
342
349
  'div',
343
350
  { className: 'mb-5', style: { width: '100%', maxWidth: '100%', textAlign: 'center', padding: '15px', border: '2px solid #aaa', borderRadius: '15px' } },
344
351
  partnerDetails.twitter ? React.createElement(TwitterTimelineEmbed, { sourceType: 'url', url: partnerDetails.twitter, options: { height: 400 } }) : partnerDetails.facebook && React.createElement(
@@ -399,8 +406,8 @@ PartnerDetails.returnGetInitialProps = function () {
399
406
 
400
407
 
401
408
  if (category) {
402
- //if partners page has a sub category such as onclive
403
- //e.g. /sap-partner/[category]/[partner]
409
+ // if partners page has a sub category such as onclive
410
+ // e.g. /sap-partner/[category]/[partner]
404
411
 
405
412
  partnerQuery = '*[_type == \'documentGroup\' && !(_id in path("drafts.**")) && identifier.current == \'' + category + '\' && references(\'' + partnerDocumentGroupID + '\')] [0] {\n ...,\n \'partner\': *[_type == \'documentGroup\' && identifier.current == \'' + identifier + '\' && references(^._id)] [0] {\n description,\n name,\n identifier,\n thumbnail,\n twitter,\n facebook,\n linkedin,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n \n }\n }';
406
413
  }
@@ -427,7 +434,7 @@ PartnerDetails.returnGetInitialProps = function () {
427
434
  articles = _context.sent;
428
435
 
429
436
 
430
- //need to exclude slideshows from body due to the affiliate slider
437
+ // need to exclude slideshows from body due to the affiliate slider
431
438
  if (partnerDetails && partnerDetails.description) {
432
439
  partnerDetails.description = partnerDetails.description.filter(function (block) {
433
440
  return block._type !== 'slideshows';
package/dist/esm/QueueDeckExpanded.js CHANGED
@@ -152,7 +152,7 @@ var checkExternalUrl = function checkExternalUrl(url) {
152
152
  };
153
153
 
154
154
  var cardLoader = function cardLoader(data, client, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage, showAuthor, showCategory, imageHeight, imageWidth, imageMaxHeight, imageFit, rightItems, brandInsightAd, showBI, itemsPerPage, heroContent, lgInfeedAd, showPubInfo, contentCategoryMapping, showTimeDiff, showTaxonomies, showIntro) {
155
- var numberOfItemsBeforeAd = 6;
155
+ var numberOfItemsBeforeAd = data.length < 6 ? data.length : 6;
156
156
  var insertBrandInsightAd = function insertBrandInsightAd(arr, index, newElement) {
157
157
  return [].concat(_toConsumableArray(arr.slice(0, index)), [newElement], _toConsumableArray(arr.slice(index)));
158
158
  };
@@ -1310,7 +1310,7 @@ var ImagePlaceholder = function ImagePlaceholder() {
1310
1310
  };
1311
1311
 
1312
1312
  var renderMobileAd = function renderMobileAd(index, numberOfItemsBeforeAd, rightItems) {
1313
- var i = ((index + 1) / numberOfItemsBeforeAd - 1) % rightItems.length;
1313
+ var i = numberOfItemsBeforeAd < 6 ? 0 : ((index + 1) / numberOfItemsBeforeAd - 1) % rightItems.length;
1314
1314
  return React.createElement(
1315
1315
  'div',
1316
1316
  { style: { display: 'flex', flex: '1 0 auto' } },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mjhls/mjh-framework",
3
- "version": "1.0.870",
3
+ "version": "1.0.872",
4
4
  "description": "Foundation Framework",
5
5
  "author": "mjh-framework",
6
6
  "license": "MIT",
@@ -68,7 +68,6 @@
68
68
  "react-device-detect": "^1.11.14",
69
69
  "react-dfp": "^0.19.0",
70
70
  "react-dom": "^16.12.0",
71
- "react-facebook": "^8.1.4",
72
71
  "react-icons": "^3.8.0",
73
72
  "react-infinite-scroll-component": "^5.0.4",
74
73
  "react-lazyload": "^2.6.5",
@@ -100,6 +99,7 @@
100
99
  "next-cookies": "^2.0.3",
101
100
  "nookies": "^2.4.0",
102
101
  "react-cookies": "^0.1.1",
102
+ "react-facebook": "^8.1.4",
103
103
  "react-instantsearch-dom": "^6.10.3",
104
104
  "react-script-tag": "^1.1.2",
105
105
  "rollup-plugin-peer-deps-external": "^2.2.4",