@mjhls/mjh-framework 1.0.295 → 1.0.297

package/dist/cjs/{Normal-d3a56ac1.js → Normal-c3f4eec3.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'
+                )
               )
             )
           )
@@ -885,6 +867,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'
+              )
+            ),
             subNav && subNav.map(function (row, index) {
               if (row.subQuery && row.subQuery.length > 0) {
                 return row.name ? React__default.createElement(
@@ -925,6 +935,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-c3f4eec3.js');
 require('react-bootstrap/ListGroup');
 require('next/head');
 require('react-bootstrap/Nav');

package/dist/cjs/{Ustream-85b14a8d.js → Ustream-3a3c56b8.js}

@@ -4,7 +4,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var React = require('react');
 var React__default = _interopDefault(React);
-var slicedToArray = require('./slicedToArray-e38fb29d.js');
+var slicedToArray = require('./slicedToArray-bed4d943.js');
 var index_esm = require('./index.esm-340d3792.js');
 
 // THIS FILE IS AUTO GENERATED

package/dist/cjs/Ustream.js

@@ -5,9 +5,9 @@ require('./_to-object-329a650b.js');
 require('./web.dom.iterable-0998bdc3.js');
 require('./core.get-iterator-method-e049ca4a.js');
 require('react');
-require('./slicedToArray-e38fb29d.js');
+require('./slicedToArray-bed4d943.js');
 require('./index.esm-340d3792.js');
-var Ustream = require('./Ustream-85b14a8d.js');
+var Ustream = require('./Ustream-3a3c56b8.js');
 
 
 

package/dist/cjs/VideoSeriesListing.js

@@ -7,7 +7,7 @@ require('./_to-object-329a650b.js');
 require('./web.dom.iterable-0998bdc3.js');
 var debounce = require('./debounce-ba3eaee2.js');
 var _extends$2 = require('./extends-e94dbea5.js');
-var inherits$2 = require('./inherits-dd435947.js');
+var inherits$2 = require('./inherits-663e8f74.js');
 var React = require('react');
 var React__default = _interopDefault(React);
 require('prop-types');