@mjhls/mjh-framework 1.0.687 → 1.0.689-segment

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.687
+# mjh-framework v. 1.0.689-segment
 
 > Foundation Framework 
 

package/dist/cjs/Auth.js

@@ -23,6 +23,7 @@ var asyncToGenerator = require('./asyncToGenerator-533d476a.js');
 require('./_set-species-f92c67c5.js');
 var reactBootstrap = require('react-bootstrap');
 var util = require('./util-f2c1b65b.js');
+var index$4 = require('./index-bd6c9f56.js');
 var useSWR = _interopDefault(require('swr'));
 var Local = _interopDefault(require('passport-local'));
 var mysql = _interopDefault(require('mysql'));
@@ -1210,213 +1211,12 @@ var SignupForm$1 = function SignupForm(props) {
   );
 };
 
-/*!
- * cookie
- * Copyright(c) 2012-2014 Roman Shtylman
- * Copyright(c) 2015 Douglas Christopher Wilson
- * MIT Licensed
- */
-
-/**
- * Module exports.
- * @public
- */
-
-var parse_1 = parse;
-var serialize_1 = serialize;
-
-/**
- * Module variables.
- * @private
- */
-
-var decode = decodeURIComponent;
-var encode = encodeURIComponent;
-var pairSplitRegExp = /; */;
-
-/**
- * RegExp to match field-content in RFC 7230 sec 3.2
- *
- * field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
- * field-vchar   = VCHAR / obs-text
- * obs-text      = %x80-FF
- */
-
-var fieldContentRegExp = /^[\u0009\u0020-\u007e\u0080-\u00ff]+$/;
-
-/**
- * Parse a cookie header.
- *
- * Parse the given cookie header string into an object
- * The object has the various cookies as keys(names) => values
- *
- * @param {string} str
- * @param {object} [options]
- * @return {object}
- * @public
- */
-
-function parse(str, options) {
-  if (typeof str !== 'string') {
-    throw new TypeError('argument str must be a string');
-  }
-
-  var obj = {};
-  var opt = options || {};
-  var pairs = str.split(pairSplitRegExp);
-  var dec = opt.decode || decode;
-
-  for (var i = 0; i < pairs.length; i++) {
-    var pair = pairs[i];
-    var eq_idx = pair.indexOf('=');
-
-    // skip things that don't look like key=value
-    if (eq_idx < 0) {
-      continue;
-    }
-
-    var key = pair.substr(0, eq_idx).trim();
-    var val = pair.substr(++eq_idx, pair.length).trim();
-
-    // quoted values
-    if ('"' == val[0]) {
-      val = val.slice(1, -1);
-    }
-
-    // only assign once
-    if (undefined == obj[key]) {
-      obj[key] = tryDecode(val, dec);
-    }
-  }
-
-  return obj;
-}
-
-/**
- * Serialize data into a cookie header.
- *
- * Serialize the a name value pair into a cookie string suitable for
- * http headers. An optional options object specified cookie parameters.
- *
- * serialize('foo', 'bar', { httpOnly: true })
- *   => "foo=bar; httpOnly"
- *
- * @param {string} name
- * @param {string} val
- * @param {object} [options]
- * @return {string}
- * @public
- */
-
-function serialize(name, val, options) {
-  var opt = options || {};
-  var enc = opt.encode || encode;
-
-  if (typeof enc !== 'function') {
-    throw new TypeError('option encode is invalid');
-  }
-
-  if (!fieldContentRegExp.test(name)) {
-    throw new TypeError('argument name is invalid');
-  }
-
-  var value = enc(val);
-
-  if (value && !fieldContentRegExp.test(value)) {
-    throw new TypeError('argument val is invalid');
-  }
-
-  var str = name + '=' + value;
-
-  if (null != opt.maxAge) {
-    var maxAge = opt.maxAge - 0;
-
-    if (isNaN(maxAge) || !isFinite(maxAge)) {
-      throw new TypeError('option maxAge is invalid')
-    }
-
-    str += '; Max-Age=' + Math.floor(maxAge);
-  }
-
-  if (opt.domain) {
-    if (!fieldContentRegExp.test(opt.domain)) {
-      throw new TypeError('option domain is invalid');
-    }
-
-    str += '; Domain=' + opt.domain;
-  }
-
-  if (opt.path) {
-    if (!fieldContentRegExp.test(opt.path)) {
-      throw new TypeError('option path is invalid');
-    }
-
-    str += '; Path=' + opt.path;
-  }
-
-  if (opt.expires) {
-    if (typeof opt.expires.toUTCString !== 'function') {
-      throw new TypeError('option expires is invalid');
-    }
-
-    str += '; Expires=' + opt.expires.toUTCString();
-  }
-
-  if (opt.httpOnly) {
-    str += '; HttpOnly';
-  }
-
-  if (opt.secure) {
-    str += '; Secure';
-  }
-
-  if (opt.sameSite) {
-    var sameSite = typeof opt.sameSite === 'string'
-      ? opt.sameSite.toLowerCase() : opt.sameSite;
-
-    switch (sameSite) {
-      case true:
-        str += '; SameSite=Strict';
-        break;
-      case 'lax':
-        str += '; SameSite=Lax';
-        break;
-      case 'strict':
-        str += '; SameSite=Strict';
-        break;
-      case 'none':
-        str += '; SameSite=None';
-        break;
-      default:
-        throw new TypeError('option sameSite is invalid');
-    }
-  }
-
-  return str;
-}
-
-/**
- * Try decoding a string using a decoding function.
- *
- * @param {string} str
- * @param {function} decode
- * @private
- */
-
-function tryDecode(str, decode) {
-  try {
-    return decode(str);
-  } catch (e) {
-    return str;
-  }
-}
-
 var TOKEN_NAME = 'token';
 var MAX_AGE = 60 * 60 * 8; // 8 hours
 
 function setTokenCookie(res, token, eKey) {
   var cookies_serailized = [];
-  cookies_serailized.push(serialize_1(TOKEN_NAME, token, {
+  cookies_serailized.push(index$4.serialize_1(TOKEN_NAME, token, {
     //maxAge: MAX_AGE,  // we want login cookie to expire when browser
     //expires: new Date(Date.now() + MAX_AGE * 1000),
     //httpOnly: true,
@@ -1425,7 +1225,7 @@ function setTokenCookie(res, token, eKey) {
     //sameSite: 'lax',
   }));
 
-  cookies_serailized.push(serialize_1('eKey', eKey, {
+  cookies_serailized.push(index$4.serialize_1('eKey', eKey, {
     //maxAge: MAX_AGE,  // we want login cookie to expire when browser
     //expires: new Date(Date.now() + MAX_AGE * 1000),
     //httpOnly: true,
@@ -1439,12 +1239,12 @@ function setTokenCookie(res, token, eKey) {
 
 function removeTokenCookie(res) {
   var cookies_serailized = [];
-  cookies_serailized.push(serialize_1(TOKEN_NAME, '', {
+  cookies_serailized.push(index$4.serialize_1(TOKEN_NAME, '', {
     maxAge: -1,
     expires: new Date(Date.now() - MAX_AGE * 1000),
     path: '/'
   }));
-  cookies_serailized.push(serialize_1('eKey', '', {
+  cookies_serailized.push(index$4.serialize_1('eKey', '', {
     maxAge: -1,
     expires: new Date(Date.now() - MAX_AGE * 1000),
     path: '/'
@@ -1459,7 +1259,7 @@ function parseCookies(req) {
 
   // For pages we do need to parse the cookies.
   var cookie = req.headers ? req.headers.cookie : null;
-  return parse_1(cookie || '');
+  return index$4.parse_1(cookie || '');
 }
 
 function getTokenCookie(req) {

package/dist/cjs/DeckContent.js

@@ -44,7 +44,7 @@ require('./_set-species-f92c67c5.js');
 require('./Segment.js');
 require('./Beam.js');
 require('./AdSlot.js');
-var ADInfeed = require('./ADInfeed-cf81b7aa.js');
+var ADInfeed = require('./ADInfeed-3410ab3c.js');
 
 var DeckContent = function (_React$Component) {
   inherits._inherits(DeckContent, _React$Component);

package/dist/cjs/ExternalResources.js

@@ -46,7 +46,7 @@ require('./GroupDeck.js');
 require('react-bootstrap');
 var Button = _interopDefault(require('react-bootstrap/Button'));
 var index$3 = require('./index-5be2866f.js');
-var getSerializers = require('./index-a1090dcd.js');
+var getSerializers = require('./index-44c25825.js');
 require('./util-f2c1b65b.js');
 require('./brightcove-react-player-loader.es-156bd4d6.js');
 require('react-bootstrap/Pagination');

package/dist/cjs/GridContent.js

@@ -44,9 +44,9 @@ require('./_set-species-f92c67c5.js');
 require('./Segment.js');
 require('./Beam.js');
 require('./AdSlot.js');
-var ADInfeed = require('./ADInfeed-cf81b7aa.js');
+var ADInfeed = require('./ADInfeed-3410ab3c.js');
 var lodash = require('./lodash-fc2922d0.js');
-var ADlgInfeed = require('./ADlgInfeed-ebc1bf56.js');
+var ADlgInfeed = require('./ADlgInfeed-845aac15.js');
 var getContentCategory = require('./getContentCategory-f38a4c00.js');
 var get = require('./get-68c52cb1.js');
 require('./AD.js');

package/dist/cjs/HamMagazine.js

@@ -113,6 +113,16 @@ var HamMagazine = function HamMagazine(props) {
 
     // Initial screenwidth setup on refresh or on load
     setScreenWidth(parseInt(window.innerWidth));
+
+    setTimeout(function () {
+      var segmentLinks = navRef.current.querySelectorAll('a[needsegmentsupport="true"]');
+      for (var i = 0; i < segmentLinks.length; i++) {
+        var link = segmentLinks[i];
+        var href = link.getAttribute('href');
+        var newRef = Segment.getURL(href, { needSegmentSupport: true });
+        link.setAttribute('href', newRef);
+      }
+    }, 1000);
   }, []);
 
   // Check for browser resize
@@ -402,7 +412,8 @@ var HamMagazine = function HamMagazine(props) {
                               'a',
                               {
                                 key: subIndex,
-                                href: Segment.getURL(ddRow.url, ddRow),
+                                needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
+                                href: ddRow.url,
                                 target: ddRow.blank ? '_blank' : '_self',
                                 rel: 'noopener noreferrer',
                                 className: 'dropdown-item' },
@@ -424,7 +435,8 @@ var HamMagazine = function HamMagazine(props) {
                               'a',
                               {
                                 key: subIndex,
-                                href: Segment.getURL(ddRow.url, ddRow),
+                                needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
+                                href: ddRow.url,
                                 target: ddRow.blank ? '_blank' : '_self',
                                 rel: 'noopener noreferrer',
                                 className: 'dropdown-item' },
@@ -438,7 +450,13 @@ var HamMagazine = function HamMagazine(props) {
                 } else {
                   return row.url && row.name ? React__default.createElement(
                     'a',
-                    { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', rel: 'noopener noreferrer', className: 'nav-link' },
+                    { key: index,
+                      needsegmentsupport: row.needSegmentSupport ? 'true' : '',
+                      href: row.url,
+                      target: row.blank ? '_blank' : '_self',
+                      rel: 'noopener noreferrer',
+                      className: 'nav-link'
+                    },
                     row.name
                   ) : null;
                 }
@@ -476,7 +494,8 @@ var HamMagazine = function HamMagazine(props) {
                             'a',
                             {
                               key: subIndex,
-                              href: Segment.getURL(ddRow.url, ddRow),
+                              needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
+                              href: ddRow.url,
                               target: ddRow.blank ? '_blank' : '_self',
                               rel: 'noopener noreferrer',
                               className: 'dropdown-item nav-link' },
@@ -497,7 +516,8 @@ var HamMagazine = function HamMagazine(props) {
                               'a',
                               {
                                 key: subIndex,
-                                href: Segment.getURL(ddRow.url, ddRow),
+                                needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '',
+                                href: ddRow.url,
                                 target: ddRow.blank ? '_blank' : '_self',
                                 rel: 'noopener noreferrer',
                                 className: 'dropdown-item' },
@@ -511,7 +531,13 @@ var HamMagazine = function HamMagazine(props) {
                 } else {
                   return row.url && row.name ? React__default.createElement(
                     'a',
-                    { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', rel: 'noopener noreferrer', className: 'nav-link' },
+                    { key: index,
+                      needsegmentsupport: row.needSegmentSupport ? 'true' : '',
+                      href: row.url,
+                      target: row.blank ? '_blank' : '_self',
+                      rel: 'noopener noreferrer',
+                      className: 'nav-link'
+                    },
                     row.name
                   ) : null;
                 }

package/dist/cjs/IssueLanding.js

@@ -35,9 +35,9 @@ require('./_set-species-f92c67c5.js');
 require('./Segment.js');
 require('./Beam.js');
 require('./AdSlot.js');
-require('./ADInfeed-cf81b7aa.js');
+require('./ADInfeed-3410ab3c.js');
 require('./lodash-fc2922d0.js');
-require('./ADlgInfeed-ebc1bf56.js');
+require('./ADlgInfeed-845aac15.js');
 require('./getContentCategory-f38a4c00.js');
 require('./AuthorComponent-bb831b74.js');
 require('react-bootstrap');

package/dist/cjs/LeftNav.js

@@ -57,13 +57,15 @@ var LeftNav = function LeftNav(props) {
 
   var leftNavRef = React.useRef(null);
   React.useEffect(function () {
-    var segmentLinks = leftNavRef.current.querySelectorAll('a[needsegmentsupport="true"]');
-    for (var i = 0; i < segmentLinks.length; i++) {
-      var link = segmentLinks[i];
-      var href = link.getAttribute('href');
-      var newHref = Segment.getURL(href, { needSegmentSupport: true });
-      link.setAttribute('href', newHref);
-    }
+    setTimeout(function () {
+      var segmentLinks = leftNavRef.current.querySelectorAll('a[needsegmentsupport="true"]');
+      for (var i = 0; i < segmentLinks.length; i++) {
+        var link = segmentLinks[i];
+        var href = link.getAttribute('href');
+        var newHref = Segment.getURL(href, { needSegmentSupport: true });
+        link.setAttribute('href', newHref);
+      }
+    }, 1000);
   }, []);
 
   var renderListGroupItem = function renderListGroupItem(subRow) {

package/dist/cjs/MasterDeck.js

@@ -42,9 +42,9 @@ require('./_set-species-f92c67c5.js');
 require('./Segment.js');
 require('./Beam.js');
 require('./AdSlot.js');
-var ADInfeed = require('./ADInfeed-cf81b7aa.js');
+var ADInfeed = require('./ADInfeed-3410ab3c.js');
 var lodash = require('./lodash-fc2922d0.js');
-var ADlgInfeed = require('./ADlgInfeed-ebc1bf56.js');
+var ADlgInfeed = require('./ADlgInfeed-845aac15.js');
 
 var MasterDeck = function (_React$Component) {
   inherits._inherits(MasterDeck, _React$Component);

package/dist/cjs/NavDvm.js

@@ -36,28 +36,43 @@ var NavDvm = function NavDvm(props) {
       website = _props$website === undefined ? {} : _props$website;
 
 
+  var sfRef = React.useRef(null);
+
+  React.useEffect(function () {
+    // this adds ?eKey=xxx or ?anonymousid=xxx for forms that's outside - eg) formstack forms
+    // for tracking same user
+    setTimeout(function () {
+      var segmentLinks = sfRef.current.querySelectorAll('a[needsegmentsupport="true"]');
+      for (var i = 0; i < segmentLinks.length; i++) {
+        var link = segmentLinks[i];
+        var href = link.getAttribute('href');
+        var newRef = Segment.getURL(href, { needSegmentSupport: true });
+        link.setAttribute('href', newRef);
+      }
+    }, 1000);
+  }, []);
+
   var getLink = function getLink(url, className, name, key, blank) {
     var needSegmentSupport = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
 
-    url = Segment.getURL(url, { needSegmentSupport: needSegmentSupport });
     if (url && (url.includes('https://') || url.includes('http://'))) {
       return React__default.createElement(
         'a',
-        { target: blank ? '_blank' : '_self', key: key, href: url || '#', className: className },
+        { target: blank ? '_blank' : '_self', needsegmentsupport: needSegmentSupport ? 'true' : '', key: key, href: url || '#', className: className },
         name
       );
     }
 
     return React__default.createElement(
       'a',
-      { key: key, href: url || '#', target: blank ? '_blank' : '_self', className: className },
+      { key: key, href: url || '#', needsegmentsupport: needSegmentSupport ? 'true' : '', target: blank ? '_blank' : '_self', className: className },
       name
     );
   };
 
   return React__default.createElement(
     React__default.Fragment,
-    null,
+    { ref: sfRef },
     React__default.createElement(
       Navbar,
       { className: 'top-nav', expand: 'xl' },
@@ -157,7 +172,7 @@ var NavDvm = function NavDvm(props) {
                         if (ddRow.url && ddRow.name) {
                           return ddRow.url && ddRow.name ? React__default.createElement(
                             'a',
-                            { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
+                            { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
                             ddRow.name
                           ) : null;
                         } else return null;
@@ -177,7 +192,7 @@ var NavDvm = function NavDvm(props) {
                           if (ddRow.url && ddRow.name) {
                             return ddRow.url && ddRow.name ? React__default.createElement(
                               'a',
-                              { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
+                              { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
                               ddRow.name
                             ) : null;
                           } else return null;
@@ -189,7 +204,7 @@ var NavDvm = function NavDvm(props) {
               } else {
                 return row.url && row.name ? React__default.createElement(
                   'a',
-                  { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', className: 'nav-link' },
+                  { key: index, needsegmentsupport: row.needSegmentSupport ? 'true' : '', href: row.url, target: row.blank ? '_blank' : '_self', className: 'nav-link' },
                   row.name
                 ) : null;
               }

package/dist/cjs/NavMagazine.js

@@ -115,6 +115,16 @@ var NavMagazine = function NavMagazine(props) {
 
     // Initial screenwidth setup on refresh or on load
     setScreenWidth(parseInt(window.innerWidth));
+
+    setTimeout(function () {
+      var segmentLinks = navRef.current.querySelectorAll('a[needsegmentsupport="true"]');
+      for (var i = 0; i < segmentLinks.length; i++) {
+        var link = segmentLinks[i];
+        var href = link.getAttribute('href');
+        var newRef = Segment.getURL(href, { needSegmentSupport: true });
+        link.setAttribute('href', newRef);
+      }
+    }, 1000);
   }, []);
 
   // Check for browser resize
@@ -423,7 +433,7 @@ var NavMagazine = function NavMagazine(props) {
                           if (ddRow.url && ddRow.name) {
                             return ddRow.url && ddRow.name ? React__default.createElement(
                               'a',
-                              { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
+                              { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
                               ddRow.name
                             ) : null;
                           } else return null;
@@ -443,7 +453,7 @@ var NavMagazine = function NavMagazine(props) {
                             if (ddRow.url && ddRow.name) {
                               return ddRow.url && ddRow.name ? React__default.createElement(
                                 'a',
-                                { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
+                                { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
                                 ddRow.name
                               ) : null;
                             } else return null;
@@ -455,7 +465,7 @@ var NavMagazine = function NavMagazine(props) {
                 } else {
                   return row.url && row.name ? React__default.createElement(
                     'a',
-                    { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', className: 'nav-link' },
+                    { key: index, needsegmentsupport: row.needSegmentSupport ? 'true' : '', href: row.url, target: row.blank ? '_blank' : '_self', className: 'nav-link' },
                     row.name
                   ) : null;
                 }
@@ -491,7 +501,7 @@ var NavMagazine = function NavMagazine(props) {
                         } else {
                           return ddRow.url && ddRow.name ? React__default.createElement(
                             'a',
-                            { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
+                            { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
                             ddRow.name
                           ) : null;
                         }
@@ -509,7 +519,7 @@ var NavMagazine = function NavMagazine(props) {
                           } else {
                             return ddRow.url && ddRow.name ? React__default.createElement(
                               'a',
-                              { key: subIndex, href: Segment.getURL(ddRow.url, ddRow), target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
+                              { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
                               ddRow.name
                             ) : null;
                           }
@@ -520,7 +530,7 @@ var NavMagazine = function NavMagazine(props) {
                 } else {
                   return row.url && row.name ? React__default.createElement(
                     'a',
-                    { key: index, href: Segment.getURL(row.url, row), target: row.blank ? '_blank' : '_self', className: 'nav-link' },
+                    { key: index, needsegmentsupport: row.needSegmentSupport ? 'true' : '', href: row.url, target: row.blank ? '_blank' : '_self', className: 'nav-link' },
                     row.name
                   ) : null;
                 }