@mjhls/mjh-framework 1.0.458 → 1.0.460

package/README.md

@@ -1,5 +1,4 @@
-
-# mjh-framework v. 1.0.458
+# mjh-framework v. 1.0.460
 
 > Foundation Framework 
 

package/dist/cjs/ArticleQueue.js

@@ -55,6 +55,7 @@ var getSerializers = require('./getSerializers.js');
 require('./util-f2c1b65b.js');
 require('react-bootstrap/Pagination');
 require('next/dynamic');
+var getKeywords = require('./getKeywords.js');
 
 var renderAuthor = function renderAuthor(authorName, authorURL, index, length) {
   var defaultUrl = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'authors';
@@ -140,6 +141,10 @@ var Article = function Article(props) {
   var url = _props$article$url.current,
       issue = _props$article.issue,
       source = _props$article.source,
+      internalTag = _props$article.internalTag,
+      seoTag = _props$article.seoTag,
+      sponsoredTag = _props$article.sponsoredTag,
+      userDefinedTag = _props$article.userDefinedTag,
       regionalPages = props.regionalPages,
       nationalPage = props.nationalPage,
       ISIContent = props.ISIContent,
@@ -436,6 +441,7 @@ var Article = function Article(props) {
   var shareSummary = summary;
   var shareImage = thumbnail && thumbnail.asset ? urlFor(thumbnail.asset).url() : shareImageDefault;
   var siteName = props.website.title;
+  var shareKeywords = getKeywords(props.article).join(',');
 
   var meta = {
     shareTitle: shareTitle,
@@ -443,7 +449,8 @@ var Article = function Article(props) {
     shareSummary: shareSummary,
     shareUrl: shareUrl,
     shareImage: shareImage,
-    shareVia: props.Settings.title
+    shareVia: props.Settings.title,
+    shareKeywords: shareKeywords
   };
   return React__default.createElement(
     React__default.Fragment,
@@ -471,6 +478,7 @@ var Article = function Article(props) {
             '' + shareTitle
           ),
           React__default.createElement('meta', { name: 'description', key: 'description', content: shareSummary }),
+          React__default.createElement('meta', { name: 'keywords', key: 'keywords', content: shareKeywords }),
           passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' }),
           React__default.createElement('meta', { property: 'og:url', content: shareUrl, key: 'og:url' }),
           React__default.createElement('meta', { property: 'og:title', content: shareTitle, key: 'og:title' }),
@@ -481,7 +489,8 @@ var Article = function Article(props) {
           React__default.createElement('meta', { name: 'twitter:title', content: shareTitle, key: 'twitter:title' }),
           React__default.createElement('meta', { name: 'twitter:image', content: shareImage, key: 'twitter:image' }),
           React__default.createElement('meta', { name: 'twitter:site', content: '@' + props.Settings.title, key: 'twitter:site' }),
-          React__default.createElement('meta', { name: 'twitter:description', content: shareSummary, key: 'twitter:description' })
+          React__default.createElement('meta', { name: 'twitter:description', content: shareSummary, key: 'twitter:description' }),
+          React__default.createElement('link', { rel: 'canonical', href: shareUrl, key: 'canonical' })
         ),
         React__default.createElement(
           'h1',
@@ -802,6 +811,7 @@ var ArticleQueue = function ArticleQueue(props) {
   var changeMeta = function changeMeta(meta) {
     document.title = meta.shareTitle;
     document.querySelector('meta[name="description"]').setAttribute('content', meta.shareSummary);
+    document.querySelector('meta[name="keywords"]').setAttribute('content', meta.shareKeywords);
     document.querySelector('meta[property="og:url"]').setAttribute('content', meta.shareUrl);
     document.querySelector('meta[property="og:title"]').setAttribute('content', meta.shareTitle);
     document.querySelector('meta[property="og:site_name"]').setAttribute('content', meta.shareVia);
@@ -810,6 +820,7 @@ var ArticleQueue = function ArticleQueue(props) {
     document.querySelector('meta[name="twitter:image"]').setAttribute('content', meta.shareImage);
     document.querySelector('meta[name="twitter:site"]').setAttribute('content', meta.shareVia);
     document.querySelector('meta[name="twitter:description"]').setAttribute('content', meta.shareSummary);
+    document.querySelector('link[rel="canonical"]').setAttribute('href', meta.shareUrl);
   };
 
   var onChangeArticle = function onChangeArticle(path, visibility, meta) {

package/dist/cjs/View.js

@@ -57,6 +57,7 @@ var getSerializers = require('./getSerializers.js');
 require('./util-f2c1b65b.js');
 require('react-bootstrap/Pagination');
 require('next/dynamic');
+var getKeywords = require('./getKeywords.js');
 var getTargeting = require('./getTargeting-3ced038f.js');
 var urlFor = require('./urlFor.js');
 
@@ -593,6 +594,7 @@ var Article = function Article(props) {
     var shareSummary = article.summary;
     var shareImage = thumbnail && thumbnail.asset ? urlFor(props.client, thumbnail.asset).url() : shareImageDefault;
     var siteName = props.website && props.website.title ? props.website.title : '';
+    var shareKeywords = getKeywords(props.article).join(',');
 
     var meta = {
       shareTitle: shareTitle,
@@ -600,7 +602,8 @@ var Article = function Article(props) {
       shareSummary: shareSummary,
       shareUrl: shareUrl,
       shareImage: shareImage,
-      shareVia: props.Settings.title
+      shareVia: props.Settings.title,
+      shareKeywords: shareKeywords
     };
     if (!props.infiniteScroll) {
       onChangeArticle = function onChangeArticle() {
@@ -969,6 +972,7 @@ var ArticleQueue = function ArticleQueue(props) {
   var changeMeta = function changeMeta(meta) {
     document.title = meta.shareTitle;
     document.querySelector('meta[name="description"]').setAttribute('content', meta.shareSummary);
+    document.querySelector('meta[name="keywords"]').setAttribute('content', meta.shareKeywords);
     document.querySelector('meta[property="og:url"]').setAttribute('content', meta.shareUrl);
     document.querySelector('meta[property="og:title"]').setAttribute('content', meta.shareTitle);
     document.querySelector('meta[property="og:site_name"]').setAttribute('content', meta.shareVia);
@@ -977,6 +981,7 @@ var ArticleQueue = function ArticleQueue(props) {
     document.querySelector('meta[name="twitter:image"]').setAttribute('content', meta.shareImage);
     document.querySelector('meta[name="twitter:site"]').setAttribute('content', meta.shareVia);
     document.querySelector('meta[name="twitter:description"]').setAttribute('content', meta.shareSummary);
+    document.querySelector('link[rel="canonical"]').setAttribute('href', meta.shareUrl);
   };
 
   var onChangeArticle = function onChangeArticle(path, visibility, meta) {
@@ -1139,6 +1144,7 @@ var View = function View(props) {
         article.title + ' | ' + props.cache.siteSettingCache.name
       ),
       React__default.createElement('meta', { name: 'description', key: 'description', content: shareOptions.shareSummary }),
+      React__default.createElement('meta', { name: 'keywords', content: getKeywords(article).join(','), key: 'keywords' }),
       passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' }),
       React__default.createElement('meta', { property: 'og:url', content: shareOptions.shareUrl, key: 'og:url' }),
       React__default.createElement('meta', { property: 'og:title', content: shareOptions.shareTitle, key: 'og:title' }),
@@ -1150,6 +1156,7 @@ var View = function View(props) {
       React__default.createElement('meta', { name: 'twitter:image', content: shareOptions.shareImage, key: 'twitter:image' }),
       React__default.createElement('meta', { name: 'twitter:site', content: '@' + props.Settings.title, key: 'twitter:site' }),
       React__default.createElement('meta', { name: 'twitter:description', content: shareOptions.shareSummary, key: 'twitter:description' }),
+      React__default.createElement('link', { rel: 'canonical', href: shareOptions.shareUrl, key: 'canonical' }),
       React__default.createElement(
         'noscript',
         null,

package/dist/cjs/getKeywords.js

@@ -4,24 +4,39 @@ var getKeywords = function getKeywords(article) {
   var keywords = [];
   var internalTag = article.internalTag,
       userDefinedTag = article.userDefinedTag,
-      SponsorshipTag = article.SponsorshipTag;
+      SponsorshipTag = article.SponsorshipTag,
+      seoTag = article.seoTag;
 
 
   if (internalTag) {
     internalTag.map(function (item) {
-      keywords.push(item);
+      if (!keywords.includes(item)) {
+        keywords.push(item);
+      }
     });
   }
 
   if (userDefinedTag) {
     userDefinedTag.map(function (item) {
-      keywords.push(item);
+      if (!keywords.includes(item)) {
+        keywords.push(item);
+      }
     });
   }
 
   if (SponsorshipTag) {
     SponsorshipTag.map(function (item) {
-      keywords.push(item);
+      if (!keywords.includes(item)) {
+        keywords.push(item);
+      }
+    });
+  }
+
+  if (seoTag) {
+    seoTag.map(function (item) {
+      if (!keywords.includes(item)) {
+        keywords.push(item);
+      }
     });
   }
 

package/dist/cjs/getSerializers.js

@@ -7072,6 +7072,7 @@ var YouTubeGallery = function YouTubeGallery(_ref) {
   var get1 = router && router.asPath ? router.asPath.split('/')[0] : '';
   var get2 = router && router.asPath ? router.asPath.split('/')[1] : '';
   var get3 = router && router.asPath ? router.asPath.split('/')[2].split('?')[0] : '';
+
   // Once component mounts, set the variables
   React.useEffect(function () {
     var params = new URL(document.location).searchParams;
@@ -7116,7 +7117,13 @@ var YouTubeGallery = function YouTubeGallery(_ref) {
 
   React.useEffect(function () {
     if (vidLoaded == true) {
-      document.title = nodes.videos[series - 1].title;
+      var params = new URL(document.location).searchParams;
+      var seriesVid = params.get('seriesVid');
+      var vidTitle = nodes.videos[series - 1].title;
+      var originalTitle = document.title;
+      if (seriesVid) {
+        document.title = vidTitle + ' | ' + originalTitle;
+      }
     }
   }, [vidLoaded]);
 

package/dist/cjs/index.js

@@ -140,6 +140,7 @@ var getSerializers = require('./getSerializers.js');
 require('./util-f2c1b65b.js');
 require('react-bootstrap/Pagination');
 require('next/dynamic');
+var getKeywords = require('./getKeywords.js');
 var ArticleQueue = require('./ArticleQueue.js');
 var RelatedContent = require('./RelatedContent.js');
 var ForbesHero = require('./ForbesHero.js');
@@ -160,7 +161,6 @@ require('mysql');
 var View = require('./View.js');
 var getTargeting = require('./getTargeting-3ced038f.js');
 var urlFor = require('./urlFor.js');
-var getKeywords = require('./getKeywords.js');
 var getQuery = require('./getQuery.js');
 
 
@@ -223,6 +223,7 @@ exports.PublicationLanding = PublicationLanding;
 exports.IssueLanding = IssueLanding;
 exports.PopUpModal = PopUpModal;
 exports.getSerializers = getSerializers;
+exports.getKeywords = getKeywords;
 exports.ArticleQueue = ArticleQueue;
 exports.RelatedContent = RelatedContent;
 exports.ForbesHero = ForbesHero;
@@ -240,5 +241,4 @@ exports.Auth = Auth.default;
 exports.View = View;
 exports.getTargeting = getTargeting.getTargeting;
 exports.urlFor = urlFor;
-exports.getKeywords = getKeywords;
 exports.getQuery = getQuery;

package/dist/esm/ArticleQueue.js

@@ -50,6 +50,7 @@ import getSerializers from './getSerializers.js';
 import './util-7700fc59.js';
 import 'react-bootstrap/Pagination';
 import 'next/dynamic';
+import getKeywords from './getKeywords.js';
 
 var renderAuthor = function renderAuthor(authorName, authorURL, index, length) {
   var defaultUrl = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'authors';
@@ -135,6 +136,10 @@ var Article = function Article(props) {
   var url = _props$article$url.current,
       issue = _props$article.issue,
       source = _props$article.source,
+      internalTag = _props$article.internalTag,
+      seoTag = _props$article.seoTag,
+      sponsoredTag = _props$article.sponsoredTag,
+      userDefinedTag = _props$article.userDefinedTag,
       regionalPages = props.regionalPages,
       nationalPage = props.nationalPage,
       ISIContent = props.ISIContent,
@@ -431,6 +436,7 @@ var Article = function Article(props) {
   var shareSummary = summary;
   var shareImage = thumbnail && thumbnail.asset ? urlFor(thumbnail.asset).url() : shareImageDefault;
   var siteName = props.website.title;
+  var shareKeywords = getKeywords(props.article).join(',');
 
   var meta = {
     shareTitle: shareTitle,
@@ -438,7 +444,8 @@ var Article = function Article(props) {
     shareSummary: shareSummary,
     shareUrl: shareUrl,
     shareImage: shareImage,
-    shareVia: props.Settings.title
+    shareVia: props.Settings.title,
+    shareKeywords: shareKeywords
   };
   return React__default.createElement(
     React__default.Fragment,
@@ -466,6 +473,7 @@ var Article = function Article(props) {
             '' + shareTitle
           ),
           React__default.createElement('meta', { name: 'description', key: 'description', content: shareSummary }),
+          React__default.createElement('meta', { name: 'keywords', key: 'keywords', content: shareKeywords }),
           passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' }),
           React__default.createElement('meta', { property: 'og:url', content: shareUrl, key: 'og:url' }),
           React__default.createElement('meta', { property: 'og:title', content: shareTitle, key: 'og:title' }),
@@ -476,7 +484,8 @@ var Article = function Article(props) {
           React__default.createElement('meta', { name: 'twitter:title', content: shareTitle, key: 'twitter:title' }),
           React__default.createElement('meta', { name: 'twitter:image', content: shareImage, key: 'twitter:image' }),
           React__default.createElement('meta', { name: 'twitter:site', content: '@' + props.Settings.title, key: 'twitter:site' }),
-          React__default.createElement('meta', { name: 'twitter:description', content: shareSummary, key: 'twitter:description' })
+          React__default.createElement('meta', { name: 'twitter:description', content: shareSummary, key: 'twitter:description' }),
+          React__default.createElement('link', { rel: 'canonical', href: shareUrl, key: 'canonical' })
         ),
         React__default.createElement(
           'h1',
@@ -797,6 +806,7 @@ var ArticleQueue = function ArticleQueue(props) {
   var changeMeta = function changeMeta(meta) {
     document.title = meta.shareTitle;
     document.querySelector('meta[name="description"]').setAttribute('content', meta.shareSummary);
+    document.querySelector('meta[name="keywords"]').setAttribute('content', meta.shareKeywords);
     document.querySelector('meta[property="og:url"]').setAttribute('content', meta.shareUrl);
     document.querySelector('meta[property="og:title"]').setAttribute('content', meta.shareTitle);
     document.querySelector('meta[property="og:site_name"]').setAttribute('content', meta.shareVia);
@@ -805,6 +815,7 @@ var ArticleQueue = function ArticleQueue(props) {
     document.querySelector('meta[name="twitter:image"]').setAttribute('content', meta.shareImage);
     document.querySelector('meta[name="twitter:site"]').setAttribute('content', meta.shareVia);
     document.querySelector('meta[name="twitter:description"]').setAttribute('content', meta.shareSummary);
+    document.querySelector('link[rel="canonical"]').setAttribute('href', meta.shareUrl);
   };
 
   var onChangeArticle = function onChangeArticle(path, visibility, meta) {

package/dist/esm/View.js

@@ -52,6 +52,7 @@ import getSerializers from './getSerializers.js';
 import './util-7700fc59.js';
 import 'react-bootstrap/Pagination';
 import 'next/dynamic';
+import getKeywords from './getKeywords.js';
 import { a as getContentPlacementUrl, g as getTargeting } from './getTargeting-8f4bd5db.js';
 import urlFor from './urlFor.js';
 
@@ -588,6 +589,7 @@ var Article = function Article(props) {
     var shareSummary = article.summary;
     var shareImage = thumbnail && thumbnail.asset ? urlFor(props.client, thumbnail.asset).url() : shareImageDefault;
     var siteName = props.website && props.website.title ? props.website.title : '';
+    var shareKeywords = getKeywords(props.article).join(',');
 
     var meta = {
       shareTitle: shareTitle,
@@ -595,7 +597,8 @@ var Article = function Article(props) {
       shareSummary: shareSummary,
       shareUrl: shareUrl,
       shareImage: shareImage,
-      shareVia: props.Settings.title
+      shareVia: props.Settings.title,
+      shareKeywords: shareKeywords
     };
     if (!props.infiniteScroll) {
       onChangeArticle = function onChangeArticle() {
@@ -964,6 +967,7 @@ var ArticleQueue = function ArticleQueue(props) {
   var changeMeta = function changeMeta(meta) {
     document.title = meta.shareTitle;
     document.querySelector('meta[name="description"]').setAttribute('content', meta.shareSummary);
+    document.querySelector('meta[name="keywords"]').setAttribute('content', meta.shareKeywords);
     document.querySelector('meta[property="og:url"]').setAttribute('content', meta.shareUrl);
     document.querySelector('meta[property="og:title"]').setAttribute('content', meta.shareTitle);
     document.querySelector('meta[property="og:site_name"]').setAttribute('content', meta.shareVia);
@@ -972,6 +976,7 @@ var ArticleQueue = function ArticleQueue(props) {
     document.querySelector('meta[name="twitter:image"]').setAttribute('content', meta.shareImage);
     document.querySelector('meta[name="twitter:site"]').setAttribute('content', meta.shareVia);
     document.querySelector('meta[name="twitter:description"]').setAttribute('content', meta.shareSummary);
+    document.querySelector('link[rel="canonical"]').setAttribute('href', meta.shareUrl);
   };
 
   var onChangeArticle = function onChangeArticle(path, visibility, meta) {
@@ -1134,6 +1139,7 @@ var View = function View(props) {
         article.title + ' | ' + props.cache.siteSettingCache.name
       ),
       React__default.createElement('meta', { name: 'description', key: 'description', content: shareOptions.shareSummary }),
+      React__default.createElement('meta', { name: 'keywords', content: getKeywords(article).join(','), key: 'keywords' }),
       passwordLock && React__default.createElement('meta', { name: 'robots', content: 'noindex, nofollow' }),
       React__default.createElement('meta', { property: 'og:url', content: shareOptions.shareUrl, key: 'og:url' }),
       React__default.createElement('meta', { property: 'og:title', content: shareOptions.shareTitle, key: 'og:title' }),
@@ -1145,6 +1151,7 @@ var View = function View(props) {
       React__default.createElement('meta', { name: 'twitter:image', content: shareOptions.shareImage, key: 'twitter:image' }),
       React__default.createElement('meta', { name: 'twitter:site', content: '@' + props.Settings.title, key: 'twitter:site' }),
       React__default.createElement('meta', { name: 'twitter:description', content: shareOptions.shareSummary, key: 'twitter:description' }),
+      React__default.createElement('link', { rel: 'canonical', href: shareOptions.shareUrl, key: 'canonical' }),
       React__default.createElement(
         'noscript',
         null,

package/dist/esm/getKeywords.js

@@ -2,24 +2,39 @@ var getKeywords = function getKeywords(article) {
   var keywords = [];
   var internalTag = article.internalTag,
       userDefinedTag = article.userDefinedTag,
-      SponsorshipTag = article.SponsorshipTag;
+      SponsorshipTag = article.SponsorshipTag,
+      seoTag = article.seoTag;
 
 
   if (internalTag) {
     internalTag.map(function (item) {
-      keywords.push(item);
+      if (!keywords.includes(item)) {
+        keywords.push(item);
+      }
     });
   }
 
   if (userDefinedTag) {
     userDefinedTag.map(function (item) {
-      keywords.push(item);
+      if (!keywords.includes(item)) {
+        keywords.push(item);
+      }
     });
   }
 
   if (SponsorshipTag) {
     SponsorshipTag.map(function (item) {
-      keywords.push(item);
+      if (!keywords.includes(item)) {
+        keywords.push(item);
+      }
+    });
+  }
+
+  if (seoTag) {
+    seoTag.map(function (item) {
+      if (!keywords.includes(item)) {
+        keywords.push(item);
+      }
     });
   }
 

package/dist/esm/getSerializers.js

@@ -7066,6 +7066,7 @@ var YouTubeGallery = function YouTubeGallery(_ref) {
   var get1 = router && router.asPath ? router.asPath.split('/')[0] : '';
   var get2 = router && router.asPath ? router.asPath.split('/')[1] : '';
   var get3 = router && router.asPath ? router.asPath.split('/')[2].split('?')[0] : '';
+
   // Once component mounts, set the variables
   useEffect(function () {
     var params = new URL(document.location).searchParams;
@@ -7110,7 +7111,13 @@ var YouTubeGallery = function YouTubeGallery(_ref) {
 
   useEffect(function () {
     if (vidLoaded == true) {
-      document.title = nodes.videos[series - 1].title;
+      var params = new URL(document.location).searchParams;
+      var seriesVid = params.get('seriesVid');
+      var vidTitle = nodes.videos[series - 1].title;
+      var originalTitle = document.title;
+      if (seriesVid) {
+        document.title = vidTitle + ' | ' + originalTitle;
+      }
     }
   }, [vidLoaded]);
 

package/dist/esm/index.js

@@ -136,6 +136,7 @@ export { default as getSerializers } from './getSerializers.js';
 import './util-7700fc59.js';
 import 'react-bootstrap/Pagination';
 import 'next/dynamic';
+export { default as getKeywords } from './getKeywords.js';
 export { default as ArticleQueue } from './ArticleQueue.js';
 export { default as RelatedContent } from './RelatedContent.js';
 export { default as ForbesHero } from './ForbesHero.js';
@@ -156,5 +157,4 @@ import 'mysql';
 export { default as View } from './View.js';
 export { g as getTargeting } from './getTargeting-8f4bd5db.js';
 export { default as urlFor } from './urlFor.js';
-export { default as getKeywords } from './getKeywords.js';
 export { default as getQuery } from './getQuery.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.458",
+  "version": "1.0.460",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",