@mjhls/mjh-framework 1.0.296 → 1.0.298

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.296
+# mjh-framework v. 1.0.298
 
 > Foundation Framework
 

package/dist/cjs/{ADInfeed-824fcfb6.js → ADInfeed-6b94763a.js}

@@ -5,7 +5,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var React = require('react');
 var React__default = _interopDefault(React);
 var Card = _interopDefault(require('react-bootstrap/Card'));
-var AdSlot = require('./AdSlot-405b39eb.js');
+var AdSlot = require('./AdSlot-29aee917.js');
 
 var ADInfeed = function ADInfeed(_ref) {
   var index = _ref.index,

package/dist/cjs/{AdSlot-405b39eb.js → AdSlot-29aee917.js}

@@ -9,9 +9,20 @@ var main = require('./main-0ea1b808.js');
 var React = require('react');
 var React__default = _interopDefault(React);
 var PropTypes = _interopDefault(require('prop-types'));
-var slicedToArray = require('./slicedToArray-e38fb29d.js');
+var slicedToArray = require('./slicedToArray-bed4d943.js');
 var promise = require('./promise-2c453658.js');
 
+var $JSON = _toObject._core.JSON || (_toObject._core.JSON = { stringify: JSON.stringify });
+var stringify = function stringify(it) { // eslint-disable-line no-unused-vars
+  return $JSON.stringify.apply($JSON, arguments);
+};
+
+var stringify$1 = _commonjsHelpers.createCommonjsModule(function (module) {
+module.exports = { "default": stringify, __esModule: true };
+});
+
+var _JSON$stringify = _commonjsHelpers.unwrapExports(stringify$1);
+
 var runtime = _commonjsHelpers.createCommonjsModule(function (module) {
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
@@ -777,17 +788,6 @@ if (hadRuntime) {
 
 var regenerator = runtimeModule;
 
-var $JSON = _toObject._core.JSON || (_toObject._core.JSON = { stringify: JSON.stringify });
-var stringify = function stringify(it) { // eslint-disable-line no-unused-vars
-  return $JSON.stringify.apply($JSON, arguments);
-};
-
-var stringify$1 = _commonjsHelpers.createCommonjsModule(function (module) {
-module.exports = { "default": stringify, __esModule: true };
-});
-
-var _JSON$stringify = _commonjsHelpers.unwrapExports(stringify$1);
-
 var asyncToGenerator = _commonjsHelpers.createCommonjsModule(function (module, exports) {
 
 exports.__esModule = true;
@@ -836,6 +836,22 @@ require("babel-polyfill");
 
 var beam_domain = 'https://beam.mjhlifesciences.com';
 
+function getCookie(cname) {
+  var name = cname + "=";
+  var decodedCookie = decodeURIComponent(document.cookie);
+  var ca = decodedCookie.split(';');
+  for (var i = 0; i < ca.length; i++) {
+    var c = ca[i];
+    while (c.charAt(0) == ' ') {
+      c = c.substring(1);
+    }
+    if (c.indexOf(name) == 0) {
+      return c.substring(name.length, c.length);
+    }
+  }
+  return "";
+}
+
 var Beam = {
   proc_url: function proc_url() {
     var $_GET = {};
@@ -849,15 +865,36 @@ var Beam = {
     return $_GET;
   },
   proc_eKey: function proc_eKey($_GET) {
-    var eKey = "N/A";
+    var _this = this;
 
-    if ($_GET["eKey"]) {
-      eKey = $_GET["eKey"];
-    } else if (typeof window.eKey !== 'undefined') {
-      eKey = window.eKey;
-    }
+    return _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
+      var eKey;
+      return regenerator.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              eKey = "N/A";
+
+
+              if ($_GET["eKey"]) {
+                eKey = $_GET["eKey"];
+              } else if (typeof window.eKey !== 'undefined') {
+                eKey = window.eKey;
+              }
 
-    return eKey;
+              if (!eKey || eKey === 'N/A') {
+                eKey = getCookie('eKey');
+              }
+
+              return _context.abrupt('return', eKey);
+
+            case 4:
+            case 'end':
+              return _context.stop();
+          }
+        }
+      }, _callee, _this);
+    }))();
   },
   proc_source: function proc_source() {
     var referrer = "N/A";
@@ -902,32 +939,57 @@ var Beam = {
     return data;
   },
   get_beam: function get_beam(deviceType) {
-    var beam = {};
-    beam.eKey = this.proc_eKey(this.proc_url());
-    beam.source = this.proc_source();
-    beam.meta = this.proc_meta();
-    beam.host = this.proc_host();
-    beam.device = deviceType;
-    return beam;
+    var _this2 = this;
+
+    return _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2() {
+      var beam;
+      return regenerator.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              beam = {};
+              _context2.next = 3;
+              return _this2.proc_eKey(_this2.proc_url());
+
+            case 3:
+              beam.eKey = _context2.sent;
+
+              beam.source = _this2.proc_source();
+              beam.meta = _this2.proc_meta();
+              beam.host = _this2.proc_host();
+              beam.device = deviceType;
+              return _context2.abrupt('return', beam);
+
+            case 9:
+            case 'end':
+              return _context2.stop();
+          }
+        }
+      }, _callee2, _this2);
+    }))();
   },
 
 
   /* for client use */
   report_beam_event: function report_beam_event(action, deviceType) {
-    var _this = this;
+    var _this3 = this;
 
-    return _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee() {
+    return _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee3() {
       var beam, response, res;
-      return regenerator.wrap(function _callee$(_context) {
+      return regenerator.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
-              beam = _this.get_beam(deviceType);
+              _context3.next = 2;
+              return _this3.get_beam(deviceType);
+
+            case 2:
+              beam = _context3.sent;
 
 
               console.log('Call Beam', action, beam);
 
-              _context.next = 4;
+              _context3.next = 6;
               return fetch(beam_domain + '/api/beam/event', {
                 headers: {
                   'Content-Type': 'application/json',
@@ -942,36 +1004,36 @@ var Beam = {
                 })
               });
 
-            case 4:
-              response = _context.sent;
-              _context.next = 7;
+            case 6:
+              response = _context3.sent;
+              _context3.next = 9;
               return response.json();
 
-            case 7:
-              res = _context.sent;
+            case 9:
+              res = _context3.sent;
 
               if (res.error) {
                 console.error('Beam reporting error:', res.error);
               }
 
-            case 9:
+            case 11:
             case 'end':
-              return _context.stop();
+              return _context3.stop();
           }
         }
-      }, _callee, _this);
+      }, _callee3, _this3);
     }))();
   },
   report_beam_ad: function report_beam_ad(action, deviceType, cID, lID, campID, adSize, slotId) {
-    var _this2 = this;
+    var _this4 = this;
 
-    return _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee2() {
+    return _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee4() {
       var beam, data, response, res;
-      return regenerator.wrap(function _callee2$(_context2) {
+      return regenerator.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
-              beam = _this2.get_beam(deviceType);
+              beam = _this4.get_beam(deviceType);
               data = {};
 
               data.campaignId = campID;
@@ -982,7 +1044,7 @@ var Beam = {
 
               console.log('Call DFP', action, data);
 
-              _context2.next = 10;
+              _context4.next = 10;
               return fetch(beam_domain + '/api/beam/ad', {
                 headers: {
                   'Content-Type': 'application/json',
@@ -999,12 +1061,12 @@ var Beam = {
               });
 
             case 10:
-              response = _context2.sent;
-              _context2.next = 13;
+              response = _context4.sent;
+              _context4.next = 13;
               return response.json();
 
             case 13:
-              res = _context2.sent;
+              res = _context4.sent;
 
               if (res.error) {
                 console.error('DFP reporting error:', res.error);
@@ -1012,22 +1074,22 @@ var Beam = {
 
             case 15:
             case 'end':
-              return _context2.stop();
+              return _context4.stop();
           }
         }
-      }, _callee2, _this2);
+      }, _callee4, _this4);
     }))();
   },
   report_beam_video: function report_beam_video(action, deviceType, duration, current, segment) {
-    var _this3 = this;
+    var _this5 = this;
 
-    return _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee3() {
+    return _asyncToGenerator( /*#__PURE__*/regenerator.mark(function _callee5() {
       var beam, data, response, res;
-      return regenerator.wrap(function _callee3$(_context3) {
+      return regenerator.wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
-              beam = _this3.get_beam(deviceType);
+              beam = _this5.get_beam(deviceType);
               data = {};
 
               data.duration = duration;
@@ -1037,7 +1099,7 @@ var Beam = {
 
               console.log('Call YouTube', action, data);
 
-              _context3.next = 9;
+              _context5.next = 9;
               return fetch(beam_domain + '/api/beam/video', {
                 headers: {
                   'Content-Type': 'application/json',
@@ -1054,12 +1116,12 @@ var Beam = {
               });
 
             case 9:
-              response = _context3.sent;
-              _context3.next = 12;
+              response = _context5.sent;
+              _context5.next = 12;
               return response.json();
 
             case 12:
-              res = _context3.sent;
+              res = _context5.sent;
 
               if (res.error) {
                 console.error('Video reporting error:', res.error);
@@ -1067,10 +1129,10 @@ var Beam = {
 
             case 14:
             case 'end':
-              return _context3.stop();
+              return _context5.stop();
           }
         }
-      }, _callee3, _this3);
+      }, _callee5, _this5);
     }))();
   }
 };

package/dist/cjs/DeckContent.js

@@ -26,10 +26,10 @@ require('react-dom');
 var index = require('./index-39beccb3.js');
 var index$1 = require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
-require('./slicedToArray-e38fb29d.js');
-require('./AdSlot-405b39eb.js');
+require('./slicedToArray-bed4d943.js');
+require('./AdSlot-29aee917.js');
 require('./promise-2c453658.js');
-var ADInfeed = require('./ADInfeed-824fcfb6.js');
+var ADInfeed = require('./ADInfeed-6b94763a.js');
 
 var DeckContent = function (_React$Component) {
   inherits$2._inherits(DeckContent, _React$Component);

package/dist/cjs/{Dfp-f75c65fd.js → Dfp-f871551d.js}

@@ -12,7 +12,7 @@ var React__default = _interopDefault(React);
 var PropTypes = _interopDefault(require('prop-types'));
 var visibilitySensor = require('./visibility-sensor-b72d9527.js');
 require('react-dom');
-var slicedToArray = require('./slicedToArray-e38fb29d.js');
+var slicedToArray = require('./slicedToArray-bed4d943.js');
 
 var AD = function AD(_ref) {
   var networkID = _ref.networkID,

package/dist/cjs/{Figure-0681dd7d.js → Figure-434da9bb.js}

@@ -9,7 +9,7 @@ require('./core.get-iterator-method-e049ca4a.js');
 var React = require('react');
 var React__default = _interopDefault(React);
 var index = require('./index-39beccb3.js');
-var slicedToArray = require('./slicedToArray-e38fb29d.js');
+var slicedToArray = require('./slicedToArray-bed4d943.js');
 var reactBootstrap = require('react-bootstrap');
 
 var urlFor = function urlFor(source, client) {

package/dist/cjs/{GridContent-929798bf.js → GridContent-380b5f9c.js}

@@ -20,11 +20,11 @@ var Router__default = _interopDefault(Router);
 var index = require('./index-39beccb3.js');
 var index$1 = require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
-var ADInfeed = require('./ADInfeed-824fcfb6.js');
+var ADInfeed = require('./ADInfeed-6b94763a.js');
 var get$1 = require('./get-de2660c3.js');
 
 var Dfp = React__default.lazy(function () {
-  return new Promise(function (resolve) { resolve(require('./Dfp-f75c65fd.js')); });
+  return new Promise(function (resolve) { resolve(require('./Dfp-f871551d.js')); });
 });
 
 var AD = function AD(props) {

package/dist/cjs/GridContent.js

@@ -22,12 +22,12 @@ require('react-dom');
 require('./index-39beccb3.js');
 require('./index-fa0fb52c.js');
 require('./entities-310b46ee.js');
-require('./slicedToArray-e38fb29d.js');
-require('./AdSlot-405b39eb.js');
+require('./slicedToArray-bed4d943.js');
+require('./AdSlot-29aee917.js');
 require('./promise-2c453658.js');
-require('./ADInfeed-824fcfb6.js');
+require('./ADInfeed-6b94763a.js');
 require('./get-de2660c3.js');
-var GridContent = require('./GridContent-929798bf.js');
+var GridContent = require('./GridContent-380b5f9c.js');
 
 
 

package/dist/cjs/{Normal-d3a56ac1.js → Normal-71e6f75e.js}

@@ -9,8 +9,8 @@ var Container = _interopDefault(require('react-bootstrap/Container'));
 var Row = _interopDefault(require('react-bootstrap/Row'));
 var Col = _interopDefault(require('react-bootstrap/Col'));
 var Link = _interopDefault(require('next/link'));
-var slicedToArray = require('./slicedToArray-e38fb29d.js');
-var AdSlot = require('./AdSlot-405b39eb.js');
+var slicedToArray = require('./slicedToArray-bed4d943.js');
+var AdSlot = require('./AdSlot-29aee917.js');
 var get$1 = require('./get-de2660c3.js');
 var reactSocialIcons = require('./react-social-icons-cd0d9d3b.js');
 var reactBootstrap = require('react-bootstrap');
@@ -647,6 +647,7 @@ var NavMagazine = function NavMagazine(props) {
   Example Nav with acceptable props
     <MagazineNav
      showLogin
+     user={props.cache.user}
      logo={props.settings.logo}
      dataObject={props.cache.mainNavCache}
      website={website}
@@ -735,21 +736,24 @@ var NavMagazine = function NavMagazine(props) {
     }
   };
 
-  var handleLogin = function handleLogin(e) {
-    if (typeof GCN !== 'undefined' && GCN && GCN.onecount) {
-      GCN.onecount.login();
-    } else {
-      console.error('GCN not defined');
-    }
-  };
+  //const userLoggedIn = props.user ? true : false
 
-  var handleLogout = function handleLogout(e) {
-    if (typeof GCN !== 'undefined' && GCN && GCN.onecount) {
-      GCN.onecount.logout();
-    } else {
-      console.error('GCN not defined');
+  var _useState5 = React.useState(false),
+      _useState6 = slicedToArray._slicedToArray(_useState5, 2),
+      userLoggedIn = _useState6[0],
+      setUserLoggedIn = _useState6[1];
+
+  var _useState7 = React.useState(false),
+      _useState8 = slicedToArray._slicedToArray(_useState7, 2),
+      userChecked = _useState8[0],
+      setUserChecked = _useState8[1];
+
+  React.useEffect(function () {
+    setUserLoggedIn(props.user ? true : false);
+    if (!userChecked) {
+      setUserChecked(true);
     }
-  };
+  }, [props.user, userChecked]);
 
   return React__default.createElement(
     React__default.Fragment,
@@ -763,20 +767,6 @@ var NavMagazine = function NavMagazine(props) {
         React__default.createElement(
           Nav,
           { id: 'navbar-top', className: 'justify-content-center navbar-top', style: { margin: '0 auto' } },
-          showLogin && React__default.createElement(
-            Nav.Item,
-            { id: 'nav-mobile-register', className: 'hide-on-login', style: { display: 'none' } },
-            React__default.createElement(
-              'a',
-              { href: '/register' },
-              React__default.createElement(
-                'div',
-                { className: 'px-2 py-2' },
-                React__default.createElement(MdEmail, null),
-                ' Register'
-              )
-            )
-          ),
           React__default.createElement(
             Nav.Item,
             { className: 'nav-mobile-logo' },
@@ -786,81 +776,73 @@ var NavMagazine = function NavMagazine(props) {
               mobileLogo && screenWidth < 776 ? React__default.createElement('img', { src: mobileLogo }) : React__default.createElement('img', { src: logo, className: 'logo', style: { height: '55px' } })
             )
           ),
-          showLogin && React__default.createElement(
-            Nav.Item,
-            { id: 'nav-mobile-login', className: 'hide-on-login', style: { display: 'none' } },
-            React__default.createElement(
-              'div',
-              { className: 'px-2 py-2 ', onClick: function onClick(e) {
-                  return handleLogin();
-                } },
-              React__default.createElement(index_esm.IoMdLogIn, null),
-              ' Login'
-            )
-          ),
-          showLogin && React__default.createElement(
-            React__default.Fragment,
-            null,
-            React__default.createElement(
-              Nav.Item,
-              { id: 'nav-mobile-logout', className: 'hide-on-logout', style: { display: 'none' } },
-              React__default.createElement(
-                'div',
-                { className: 'pl-2 pr-3 py-2 text-right', onClick: function onClick(e) {
-                    return handleLogout();
-                  } },
-                React__default.createElement(index_esm.IoMdLogIn, null),
-                ' Logout'
-              )
-            )
-          )
+          false    ,
+          false    
         ),
         React__default.createElement(
           Nav,
           { style: { position: 'absolute', right: '15px' }, className: 'justify-content-end rightHeader' },
-          showLogin && React__default.createElement(
+          showLogin && userChecked && !userLoggedIn && React__default.createElement(
             React__default.Fragment,
             null,
             React__default.createElement(
               Nav.Item,
-              { className: 'hide-on-login', style: { display: 'none' } },
+              null,
               React__default.createElement(
                 'a',
-                { href: '/register' },
+                { href: '/auth/signup' },
                 React__default.createElement(
                   'div',
                   { className: 'px-2 py-2 mr-2', id: 'nav-register' },
                   React__default.createElement(MdEmail, null),
-                  ' Register'
+                  ' Sign Up'
                 )
               )
             ),
             React__default.createElement(
               Nav.Item,
-              { className: 'hide-on-login', style: { display: 'none' } },
+              null,
               React__default.createElement(
-                'div',
-                { className: 'px-2 py-2', id: 'nav-login', onClick: function onClick(e) {
-                    return handleLogin();
-                  } },
-                React__default.createElement(index_esm.IoMdLogIn, null),
-                ' Login'
+                'a',
+                { href: '/auth/login' },
+                React__default.createElement(
+                  'div',
+                  { className: 'px-2 py-2', id: 'nav-login' },
+                  React__default.createElement(index_esm.IoMdLogIn, null),
+                  ' Login'
+                )
               )
             )
           ),
-          showLogin && React__default.createElement(
+          showLogin && userChecked && userLoggedIn && React__default.createElement(
             React__default.Fragment,
             null,
             React__default.createElement(
               Nav.Item,
-              { className: 'hide-on-logout', style: { display: 'none' } },
+              null,
               React__default.createElement(
-                'div',
-                { className: 'px-2 py-2', id: 'nav-logout', onClick: function onClick(e) {
-                    return handleLogout();
-                  } },
-                React__default.createElement(index_esm.IoMdLogIn, null),
-                ' Logout'
+                'a',
+                { href: '/auth/profile' },
+                React__default.createElement(
+                  'div',
+                  { className: 'px-2 py-2', id: 'nav-profile' },
+                  React__default.createElement(MdEmail, null),
+                  ' Profile'
+                )
+              )
+            ),
+            React__default.createElement(
+              Nav.Item,
+              null,
+              React__default.createElement(
+                'a',
+                { href: '/api/auth/logout' },
+                React__default.createElement(
+                  'div',
+                  { className: 'px-2 py-2', id: 'nav-logout' },
+                  React__default.createElement(index_esm.IoMdLogIn, null),
+                  ' Logout'
+                )
               )
             )
           )
@@ -925,6 +907,34 @@ var NavMagazine = function NavMagazine(props) {
           React__default.createElement(
             Nav,
             { className: 'mr-auto' },
+            showLogin && userChecked && userLoggedIn && React__default.createElement(
+              React__default.Fragment,
+              null,
+              React__default.createElement(
+                'a',
+                { key: 'mobile-profile', href: '/auth/profile', className: 'nav-link' },
+                'Profile'
+              ),
+              React__default.createElement(
+                'a',
+                { key: 'mobile-logout', href: '/api/auth/logout', className: 'nav-link' },
+                'Log Out'
+              )
+            ),
+            showLogin && userChecked && !userLoggedIn && React__default.createElement(
+              React__default.Fragment,
+              null,
+              React__default.createElement(
+                'a',
+                { key: 'mobile-signup', href: '/auth/signup', className: 'nav-link' },
+                'Sign Up'
+              ),
+              React__default.createElement(
+                'a',
+                { key: 'mobile-login', href: '/auth/login', className: 'nav-link' },
+                'Log In'
+              )
+            ),
             dataObject && dataObject.map(function (row, index) {
               if (row.subQuery && row.subQuery.length > 0) {
                 return row.name ? React__default.createElement(

package/dist/cjs/QueueDeckExpanded.js

@@ -22,10 +22,10 @@ require('react-dom');
 var index = require('./index-39beccb3.js');
 var index$1 = require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
-var slicedToArray = require('./slicedToArray-e38fb29d.js');
-require('./AdSlot-405b39eb.js');
+var slicedToArray = require('./slicedToArray-bed4d943.js');
+require('./AdSlot-29aee917.js');
 require('./promise-2c453658.js');
-var ADInfeed = require('./ADInfeed-824fcfb6.js');
+var ADInfeed = require('./ADInfeed-6b94763a.js');
 var reactBootstrap = require('react-bootstrap');
 
 var urlFor = function urlFor(source, builder) {

package/dist/cjs/TemplateNormal.js

@@ -12,15 +12,15 @@ require('react-bootstrap/Container');
 require('react-bootstrap/Row');
 require('react-bootstrap/Col');
 require('next/link');
-require('./slicedToArray-e38fb29d.js');
-require('./AdSlot-405b39eb.js');
+require('./slicedToArray-bed4d943.js');
+require('./AdSlot-29aee917.js');
 require('./promise-2c453658.js');
 require('./get-de2660c3.js');
 require('./react-social-icons-cd0d9d3b.js');
 require('react-bootstrap');
 require('./index.esm-340d3792.js');
 require('react-bootstrap/Button');
-var TemplateNormal = require('./Normal-d3a56ac1.js');
+var TemplateNormal = require('./Normal-71e6f75e.js');
 require('react-bootstrap/ListGroup');
 require('next/head');
 require('react-bootstrap/Nav');