@mjhls/mjh-framework 1.0.296 → 1.0.297

package/dist/esm/{Normal-4180d06d.js → Normal-0bf73d75.js}

@@ -4,8 +4,8 @@ import Container from 'react-bootstrap/Container';
 import Row from 'react-bootstrap/Row';
 import Col from 'react-bootstrap/Col';
 import Link from 'next/link';
-import { _ as _slicedToArray } from './slicedToArray-d0a9593a.js';
-import { D as DFPAdSlot } from './AdSlot-b4f04c96.js';
+import { _ as _slicedToArray } from './slicedToArray-d1db3163.js';
+import { D as DFPAdSlot } from './AdSlot-3d2ecc87.js';
 import { g as get_1 } from './get-9c285a85.js';
 import { r as reactSocialIcons_1 } from './react-social-icons-a7d5c5c7.js';
 import { Dropdown } from 'react-bootstrap';
@@ -642,6 +642,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}
@@ -730,21 +731,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 = useState(false),
+      _useState6 = _slicedToArray(_useState5, 2),
+      userLoggedIn = _useState6[0],
+      setUserLoggedIn = _useState6[1];
+
+  var _useState7 = useState(false),
+      _useState8 = _slicedToArray(_useState7, 2),
+      userChecked = _useState8[0],
+      setUserChecked = _useState8[1];
+
+  useEffect(function () {
+    setUserLoggedIn(props.user ? true : false);
+    if (!userChecked) {
+      setUserChecked(true);
     }
-  };
+  }, [props.user, userChecked]);
 
   return React__default.createElement(
     React__default.Fragment,
@@ -758,20 +762,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' },
@@ -781,81 +771,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(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(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(IoMdLogIn, null),
-                ' Login'
+                'a',
+                { href: '/auth/login' },
+                React__default.createElement(
+                  'div',
+                  { className: 'px-2 py-2', id: 'nav-login' },
+                  React__default.createElement(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(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(IoMdLogIn, null),
+                  ' Logout'
+                )
               )
             )
           )
@@ -880,6 +862,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(
@@ -920,6 +930,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/esm/QueueDeckExpanded.js

@@ -16,10 +16,10 @@ import 'react-dom';
 import { i as imageUrlBuilder } from './index-3849e3fe.js';
 import { L as LazyLoad } from './index-5f9f807a.js';
 import { c as clean_html_1 } from './entities-7cc3bf45.js';
-import { _ as _slicedToArray } from './slicedToArray-d0a9593a.js';
-import './AdSlot-b4f04c96.js';
+import { _ as _slicedToArray } from './slicedToArray-d1db3163.js';
+import './AdSlot-3d2ecc87.js';
 import './promise-e3480f1c.js';
-import { A as ADInfeed } from './ADInfeed-a1d8cb44.js';
+import { A as ADInfeed } from './ADInfeed-94f767ec.js';
 import { Container, Media } from 'react-bootstrap';
 
 var urlFor = function urlFor(source, builder) {

package/dist/esm/TemplateNormal.js

@@ -10,15 +10,15 @@ import 'react-bootstrap/Container';
 import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
 import 'next/link';
-import './slicedToArray-d0a9593a.js';
-import './AdSlot-b4f04c96.js';
+import './slicedToArray-d1db3163.js';
+import './AdSlot-3d2ecc87.js';
 import './promise-e3480f1c.js';
 import './get-9c285a85.js';
 import './react-social-icons-a7d5c5c7.js';
 import 'react-bootstrap';
 import './index.esm-536609db.js';
 import 'react-bootstrap/Button';
-export { T as default } from './Normal-4180d06d.js';
+export { T as default } from './Normal-0bf73d75.js';
 import 'react-bootstrap/ListGroup';
 import 'next/head';
 import 'react-bootstrap/Nav';

package/dist/esm/{Ustream-d51b9b11.js → Ustream-c153a835.js}

@@ -1,5 +1,5 @@
 import React__default, { useState, useRef, useEffect } from 'react';
-import { _ as _slicedToArray } from './slicedToArray-d0a9593a.js';
+import { _ as _slicedToArray } from './slicedToArray-d1db3163.js';
 import { G as GenIcon, d as IoIosOpen } from './index.esm-536609db.js';
 
 // THIS FILE IS AUTO GENERATED

package/dist/esm/Ustream.js

@@ -3,6 +3,6 @@ import './_to-object-b9b796ec.js';
 import './web.dom.iterable-3be50d6c.js';
 import './core.get-iterator-method-31c1fb1a.js';
 import 'react';
-import './slicedToArray-d0a9593a.js';
+import './slicedToArray-d1db3163.js';
 import './index.esm-536609db.js';
-export { U as default } from './Ustream-d51b9b11.js';
+export { U as default } from './Ustream-c153a835.js';

package/dist/esm/VideoSeriesListing.js

@@ -3,7 +3,7 @@ import './_to-object-b9b796ec.js';
 import './web.dom.iterable-3be50d6c.js';
 import { d as debounce_1, l as lib_3 } from './debounce-93ab8f80.js';
 import { _ as _extends } from './extends-dbbe308d.js';
-import { a as _inherits, b as _classCallCheck, c as _possibleConstructorReturn, d as _Object$getPrototypeOf, e as _createClass } from './inherits-2a854891.js';
+import { a as _inherits, b as _classCallCheck, c as _possibleConstructorReturn, d as _Object$getPrototypeOf, e as _createClass } from './inherits-4cae443b.js';
 import React__default from 'react';
 import 'prop-types';
 import Container from 'react-bootstrap/Container';