@mjhls/mjh-framework 1.0.966-testV4 → 1.0.966-testV6

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/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # mjh-framework v. 1.0.969
1
+ # mjh-framework v. 1.0.970
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
 
@@ -151,11 +151,11 @@ var PartnerDetails = function PartnerDetails(_ref) {
151
151
  { jsx: 'true' },
152
152
  '\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 '
153
153
  ),
154
- (partnerDetails.description || partnerDetails.linkedin || partnerDetails.instagram || partnerDetails.youtube || partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React__default['default'].createElement(
154
+ (partnerDetails.description || partnerDetails.linkedin || partnerDetails.instagram || partnerDetails.youtube && partnerDetails.youtubeIcon || partnerDetails.twitter && partnerDetails.twitterIcon || partnerDetails.facebook && !partnerDetails.twitterIcon) && React__default['default'].createElement(
155
155
  'div',
156
156
  { className: 'block-content-partners my-4', style: { maxWidth: '100%', paddingLeft: '2rem', flex: '1 1 auto' } },
157
157
  partnerDetails.description && React__default['default'].createElement(BlockContent.BlockContent, _extends._extends({ serializers: getSerializers.getSerializers(client), blocks: description, imageOptions: { w: 320, h: 240, fit: 'max' } }, client.config())),
158
- (partnerDetails.linkedin || partnerDetails.instagram || partnerDetails.youtube || partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React__default['default'].createElement(
158
+ (partnerDetails.linkedin || partnerDetails.instagram || partnerDetails.youtube && partnerDetails.youtubeIcon || partnerDetails.twitter && partnerDetails.twitterIcon || partnerDetails.facebook && !partnerDetails.twitterIcon) && React__default['default'].createElement(
159
159
  'div',
160
160
  null,
161
161
  React__default['default'].createElement(
@@ -176,8 +176,24 @@ var PartnerDetails = function PartnerDetails(_ref) {
176
176
  rel: 'noopener noreferrer',
177
177
  style: { height: 30, width: 30 }
178
178
  }),
179
- partnerDetails.youtube && partnerDetails.youtubeIcon && React__default['default'].createElement(reactSocialIcons.reactSocialIcons_1, { url: partnerDetails.youtube, target: '_blank', rel: 'noopener noreferrer', style: { height: 30, width: 30, marginLeft: '0.25rem' } }),
180
- (partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && (partnerDetails.twitterIcon ? React__default['default'].createElement(reactSocialIcons.reactSocialIcons_1, { url: partnerDetails.twitter, target: '_blank', rel: 'noopener noreferrer', style: { height: 30, width: 30, marginLeft: '0.25rem' } }) : React__default['default'].createElement(reactSocialIcons.reactSocialIcons_1, { url: partnerDetails.facebook, target: '_blank', rel: 'noopener noreferrer', style: { height: 30, width: 30, marginLeft: '0.25rem' } }))
179
+ partnerDetails.youtube && partnerDetails.youtubeIcon && React__default['default'].createElement(reactSocialIcons.reactSocialIcons_1, {
180
+ url: partnerDetails.youtube,
181
+ target: '_blank',
182
+ rel: 'noopener noreferrer',
183
+ style: { height: 30, width: 30, marginLeft: '0.25rem' }
184
+ }),
185
+ partnerDetails.twitter && partnerDetails.twitterIcon && React__default['default'].createElement(reactSocialIcons.reactSocialIcons_1, {
186
+ url: partnerDetails.twitter,
187
+ target: '_blank',
188
+ rel: 'noopener noreferrer',
189
+ style: { height: 30, width: 30, marginLeft: '0.25rem' }
190
+ }),
191
+ partnerDetails.facebook && !partnerDetails.twitterIcon && React__default['default'].createElement(reactSocialIcons.reactSocialIcons_1, {
192
+ url: partnerDetails.facebook,
193
+ target: '_blank',
194
+ rel: 'noopener noreferrer',
195
+ style: { height: 30, width: 30, marginLeft: '0.25rem' }
196
+ })
181
197
  )
182
198
  )
183
199
  ),
@@ -260,7 +276,7 @@ PartnerDetails.returnGetInitialProps = function () {
260
276
  // if partners page has a sub category such as onclive
261
277
  // e.g. /sap-partner/[category]/[partner]
262
278
 
263
- 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 pixelTrackingCode->,\n description,\n name,\n identifier,\n thumbnail{ ..., asset-> },\n twitter,\n facebook,\n linkedin,\n twitterIcon,\n youtube,\n youtubeIcon,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n \n }\n }';
279
+ 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 pixelTrackingCode->,\n description,\n name,\n identifier,\n thumbnail{ ..., asset-> },\n twitter,\n facebook,\n linkedin,\n instagram,\n twitterIcon,\n youtube,\n youtubeIcon,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n \n }\n }';
264
280
  }
265
281
 
266
282
  taxonomyQuery = '*[_type == \'documentGroup\' \n && !(_id in path("drafts.**"))\n && references(\'' + partnerDocumentGroupID + '\')\n && isShow != false\n && identifier.current == \'' + identifier + '\'] [0] {\n \'id\': _id,\n \'title\': name\n }';
package/dist/cjs/View.js CHANGED
@@ -2130,7 +2130,7 @@ var ArticleQueue = function ArticleQueue(props) {
2130
2130
  changeMeta(meta);
2131
2131
  }
2132
2132
  if (props.setCustomDimensions) {
2133
- props.setCustomDimensions(true, activeArticle, '200', prevUrl);
2133
+ props.setCustomDimensions(activeArticle, '200', prevUrl, '', true);
2134
2134
  }
2135
2135
  // if (props.pageview) props.pageview(newPath, pageviewProperties)
2136
2136
  refreshAD(path);
@@ -2205,7 +2205,7 @@ var View = function View(props) {
2205
2205
  });
2206
2206
  var waitAndExicute = function waitAndExicute() {
2207
2207
  if (typeof window.GA_INITIALIZED !== 'undefined') {
2208
- setCustomDimensions(false, article, statusCode, prevUrl);
2208
+ setCustomDimensions(article, statusCode, prevUrl, '', false);
2209
2209
  } else timer = setTimeout(waitAndExicute, 1000);
2210
2210
  };
2211
2211
  waitAndExicute();
@@ -145,11 +145,11 @@ var PartnerDetails = function PartnerDetails(_ref) {
145
145
  { jsx: 'true' },
146
146
  '\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 '
147
147
  ),
148
- (partnerDetails.description || partnerDetails.linkedin || partnerDetails.instagram || partnerDetails.youtube || partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React__default.createElement(
148
+ (partnerDetails.description || partnerDetails.linkedin || partnerDetails.instagram || partnerDetails.youtube && partnerDetails.youtubeIcon || partnerDetails.twitter && partnerDetails.twitterIcon || partnerDetails.facebook && !partnerDetails.twitterIcon) && React__default.createElement(
149
149
  'div',
150
150
  { className: 'block-content-partners my-4', style: { maxWidth: '100%', paddingLeft: '2rem', flex: '1 1 auto' } },
151
151
  partnerDetails.description && React__default.createElement(BlockContent, _extends({ serializers: getSerializers(client), blocks: description, imageOptions: { w: 320, h: 240, fit: 'max' } }, client.config())),
152
- (partnerDetails.linkedin || partnerDetails.instagram || partnerDetails.youtube || partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && React__default.createElement(
152
+ (partnerDetails.linkedin || partnerDetails.instagram || partnerDetails.youtube && partnerDetails.youtubeIcon || partnerDetails.twitter && partnerDetails.twitterIcon || partnerDetails.facebook && !partnerDetails.twitterIcon) && React__default.createElement(
153
153
  'div',
154
154
  null,
155
155
  React__default.createElement(
@@ -170,8 +170,24 @@ var PartnerDetails = function PartnerDetails(_ref) {
170
170
  rel: 'noopener noreferrer',
171
171
  style: { height: 30, width: 30 }
172
172
  }),
173
- partnerDetails.youtube && partnerDetails.youtubeIcon && React__default.createElement(reactSocialIcons_1, { url: partnerDetails.youtube, target: '_blank', rel: 'noopener noreferrer', style: { height: 30, width: 30, marginLeft: '0.25rem' } }),
174
- (partnerDetails.twitter && partnerDetails.facebook || !partnerDetails.twitter && partnerDetails.facebook && checkIsFacebookGroup(partnerDetails.facebook)) && (partnerDetails.twitterIcon ? React__default.createElement(reactSocialIcons_1, { url: partnerDetails.twitter, target: '_blank', rel: 'noopener noreferrer', style: { height: 30, width: 30, marginLeft: '0.25rem' } }) : React__default.createElement(reactSocialIcons_1, { url: partnerDetails.facebook, target: '_blank', rel: 'noopener noreferrer', style: { height: 30, width: 30, marginLeft: '0.25rem' } }))
173
+ partnerDetails.youtube && partnerDetails.youtubeIcon && React__default.createElement(reactSocialIcons_1, {
174
+ url: partnerDetails.youtube,
175
+ target: '_blank',
176
+ rel: 'noopener noreferrer',
177
+ style: { height: 30, width: 30, marginLeft: '0.25rem' }
178
+ }),
179
+ partnerDetails.twitter && partnerDetails.twitterIcon && React__default.createElement(reactSocialIcons_1, {
180
+ url: partnerDetails.twitter,
181
+ target: '_blank',
182
+ rel: 'noopener noreferrer',
183
+ style: { height: 30, width: 30, marginLeft: '0.25rem' }
184
+ }),
185
+ partnerDetails.facebook && !partnerDetails.twitterIcon && React__default.createElement(reactSocialIcons_1, {
186
+ url: partnerDetails.facebook,
187
+ target: '_blank',
188
+ rel: 'noopener noreferrer',
189
+ style: { height: 30, width: 30, marginLeft: '0.25rem' }
190
+ })
175
191
  )
176
192
  )
177
193
  ),
@@ -254,7 +270,7 @@ PartnerDetails.returnGetInitialProps = function () {
254
270
  // if partners page has a sub category such as onclive
255
271
  // e.g. /sap-partner/[category]/[partner]
256
272
 
257
- 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 pixelTrackingCode->,\n description,\n name,\n identifier,\n thumbnail{ ..., asset-> },\n twitter,\n facebook,\n linkedin,\n twitterIcon,\n youtube,\n youtubeIcon,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n \n }\n }';
273
+ 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 pixelTrackingCode->,\n description,\n name,\n identifier,\n thumbnail{ ..., asset-> },\n twitter,\n facebook,\n linkedin,\n instagram,\n twitterIcon,\n youtube,\n youtubeIcon,\n "affiliates": description[_type==\'slideshows\']{\n ...,\n slides->{...}\n }\n \n }\n }';
258
274
  }
259
275
 
260
276
  taxonomyQuery = '*[_type == \'documentGroup\' \n && !(_id in path("drafts.**"))\n && references(\'' + partnerDocumentGroupID + '\')\n && isShow != false\n && identifier.current == \'' + identifier + '\'] [0] {\n \'id\': _id,\n \'title\': name\n }';
package/dist/esm/View.js CHANGED
@@ -2120,7 +2120,7 @@ var ArticleQueue = function ArticleQueue(props) {
2120
2120
  changeMeta(meta);
2121
2121
  }
2122
2122
  if (props.setCustomDimensions) {
2123
- props.setCustomDimensions(true, activeArticle, '200', prevUrl);
2123
+ props.setCustomDimensions(activeArticle, '200', prevUrl, '', true);
2124
2124
  }
2125
2125
  // if (props.pageview) props.pageview(newPath, pageviewProperties)
2126
2126
  refreshAD(path);
@@ -2195,7 +2195,7 @@ var View = function View(props) {
2195
2195
  });
2196
2196
  var waitAndExicute = function waitAndExicute() {
2197
2197
  if (typeof window.GA_INITIALIZED !== 'undefined') {
2198
- setCustomDimensions(false, article, statusCode, prevUrl);
2198
+ setCustomDimensions(article, statusCode, prevUrl, '', false);
2199
2199
  } else timer = setTimeout(waitAndExicute, 1000);
2200
2200
  };
2201
2201
  waitAndExicute();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mjhls/mjh-framework",
3
- "version": "1.0.966-testV4",
3
+ "version": "1.0.966-testV6",
4
4
  "description": "Foundation Framework",
5
5
  "author": "mjh-framework",
6
6
  "license": "MIT",