@mjhls/mjh-framework 1.0.689-segment → 1.0.689

package/README.md

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

package/dist/cjs/Auth.js

@@ -23,7 +23,6 @@ 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'));
@@ -1211,12 +1210,213 @@ 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(index$4.serialize_1(TOKEN_NAME, token, {
+  cookies_serailized.push(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,
@@ -1225,7 +1425,7 @@ function setTokenCookie(res, token, eKey) {
     //sameSite: 'lax',
   }));
 
-  cookies_serailized.push(index$4.serialize_1('eKey', eKey, {
+  cookies_serailized.push(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,
@@ -1239,12 +1439,12 @@ function setTokenCookie(res, token, eKey) {
 
 function removeTokenCookie(res) {
   var cookies_serailized = [];
-  cookies_serailized.push(index$4.serialize_1(TOKEN_NAME, '', {
+  cookies_serailized.push(serialize_1(TOKEN_NAME, '', {
     maxAge: -1,
     expires: new Date(Date.now() - MAX_AGE * 1000),
     path: '/'
   }));
-  cookies_serailized.push(index$4.serialize_1('eKey', '', {
+  cookies_serailized.push(serialize_1('eKey', '', {
     maxAge: -1,
     expires: new Date(Date.now() - MAX_AGE * 1000),
     path: '/'
@@ -1259,7 +1459,7 @@ function parseCookies(req) {
 
   // For pages we do need to parse the cookies.
   var cookie = req.headers ? req.headers.cookie : null;
-  return index$4.parse_1(cookie || '');
+  return parse_1(cookie || '');
 }
 
 function getTokenCookie(req) {

package/dist/cjs/NavNative.js

@@ -92,23 +92,13 @@ var NavNative = function NavNative(props) {
     var topNavHeight = document.querySelector('.nav-brands') && document.querySelector('.nav-brands').offsetHeight;
     // Setting the top of the search component based on the offset of navigation component.
     searchRef.current.style.top = (topNavHeight ? topNavHeight + navRef.current.offsetHeight : navRef.current.offsetHeight) + 1 + 'px';
-  }, []);
-
-  React.useEffect(function () {
-
-    var navdropdowns = navRef.current.querySelectorAll('#basic-nav-dropdown');
-    console.log('navdropdowns:', navdropdowns);
 
     setTimeout(function () {
-
       var segmentLinks = navRef.current.querySelectorAll('a[needsegmentsupport="true"]');
-      console.log('segmentLinks:', segmentLinks);
       for (var i = 0; i < segmentLinks.length; i++) {
         var link = segmentLinks[i];
         var href = link.getAttribute('href');
         var newRef = Segment.getURL(href, { needSegmentSupport: true });
-        console.log('href:', href);
-        console.log('newRef:', newRef);
         link.setAttribute('href', newRef);
       }
     }, 1000);
@@ -433,19 +423,15 @@ var NavNative = function NavNative(props) {
                   { key: 'subnav-' + index },
                   React__default.createElement(
                     NavDropdown,
-                    { key: index, title: row.name, id: 'basic-nav-dropdown', renderMenuOnMount: true },
+                    { key: index, title: row.name, id: 'basic-nav-dropdown' },
                     row.subQuery && row.subQuery.map(function (ddRow, subIndex) {
                       if (ddRow.type === 'divider') {
                         return React__default.createElement(NavDropdown.Divider, { key: subIndex });
                       } else {
                         return ddRow.url && ddRow.name ? React__default.createElement(
-                          NavDropdown.Item,
-                          null,
-                          React__default.createElement(
-                            NavDropdown.Link,
-                            { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
-                            ddRow.name
-                          )
+                          'a',
+                          { key: subIndex, needsegmentsupport: ddRow.needSegmentSupport ? 'true' : '', href: ddRow.url, target: ddRow.blank ? '_blank' : '_self', className: 'dropdown-item' },
+                          ddRow.name
                         ) : null;
                       }
                     })