@mjhls/mjh-framework 1.0.285 → 1.0.286

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.285
+# mjh-framework v. 1.0.286
 
 > Foundation Framework
 

package/dist/cjs/{ADInfeed-a33644bc.js → ADInfeed-db54195d.js}

@@ -6,7 +6,7 @@ var React = require('react');
 var React__default = _interopDefault(React);
 var Card = _interopDefault(require('react-bootstrap/Card'));
 var slicedToArray = require('./slicedToArray-e38fb29d.js');
-var AdSlot = require('./AdSlot-1886ea26.js');
+var AdSlot = require('./AdSlot-0cd6f861.js');
 
 var ADInfeed = function ADInfeed(_ref) {
   var index = _ref.index,

package/dist/cjs/{AdSlot-1886ea26.js → AdSlot-0cd6f861.js}

@@ -1112,10 +1112,6 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
     }
   }, 500);
 
-  var matchAd = function matchAd(element) {
-    return slotId && slotId.includes(element);
-  };
-
   return React__default.createElement(
     'div',
     { className: className, style: { textAlign: 'center' } },
@@ -1126,8 +1122,12 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
       sizeMapping: sizeMapping,
       targetingArguments: targeting,
       onSlotRender: function onSlotRender(eventData) {
-        if (['floating-ad', 'infeed'].some(matchAd) && eventData && eventData.event && eventData.event.creativeId == null) {
-          setShowAd(false);
+        if (eventData && eventData.slotId && ['floating-ad', 'infeed', 'welcome-ad'].includes(eventData.slotId)) {
+          if (eventData.event && eventData.event.creativeId == null) {
+            setShowAd(false);
+          } else {
+            setShowAd(true);
+          }
         }
         setAdRendered(true);
         if (eventData && eventData.event) {

package/dist/cjs/DeckContent.js

@@ -27,9 +27,9 @@ 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-1886ea26.js');
+require('./AdSlot-0cd6f861.js');
 require('./promise-2c453658.js');
-var ADInfeed = require('./ADInfeed-a33644bc.js');
+var ADInfeed = require('./ADInfeed-db54195d.js');
 
 var DeckContent = function (_React$Component) {
   inherits$2._inherits(DeckContent, _React$Component);

package/dist/cjs/{GridContent-26572c38.js → GridContent-02acbd72.js}

@@ -20,7 +20,7 @@ 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-a33644bc.js');
+var ADInfeed = require('./ADInfeed-db54195d.js');
 var get$1 = require('./get-de2660c3.js');
 
 var Dfp = React__default.lazy(function () {

package/dist/cjs/GridContent.js

@@ -23,11 +23,11 @@ require('./index-39beccb3.js');
 require('./index-fa0fb52c.js');
 require('./entities-310b46ee.js');
 require('./slicedToArray-e38fb29d.js');
-require('./AdSlot-1886ea26.js');
+require('./AdSlot-0cd6f861.js');
 require('./promise-2c453658.js');
-require('./ADInfeed-a33644bc.js');
+require('./ADInfeed-db54195d.js');
 require('./get-de2660c3.js');
-var GridContent = require('./GridContent-26572c38.js');
+var GridContent = require('./GridContent-02acbd72.js');
 
 
 

package/dist/cjs/{Normal-92be86eb.js → Normal-2514655c.js}

@@ -12,7 +12,7 @@ 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-1886ea26.js');
+var AdSlot = require('./AdSlot-0cd6f861.js');
 var get$1 = require('./get-de2660c3.js');
 var reactBootstrap = require('react-bootstrap');
 var index_esm = require('./index.esm-340d3792.js');

package/dist/cjs/QueueDeckExpanded.js

@@ -23,9 +23,9 @@ 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-1886ea26.js');
+require('./AdSlot-0cd6f861.js');
 require('./promise-2c453658.js');
-var ADInfeed = require('./ADInfeed-a33644bc.js');
+var ADInfeed = require('./ADInfeed-db54195d.js');
 var reactBootstrap = require('react-bootstrap');
 
 var urlFor = function urlFor(source, builder) {

package/dist/cjs/TemplateNormal.js

@@ -13,13 +13,13 @@ require('react-bootstrap/Row');
 require('react-bootstrap/Col');
 require('next/link');
 require('./slicedToArray-e38fb29d.js');
-require('./AdSlot-1886ea26.js');
+require('./AdSlot-0cd6f861.js');
 require('./promise-2c453658.js');
 require('./get-de2660c3.js');
 require('react-bootstrap');
 require('./index.esm-340d3792.js');
 require('react-bootstrap/Button');
-var TemplateNormal = require('./Normal-92be86eb.js');
+var TemplateNormal = require('./Normal-2514655c.js');
 require('react-bootstrap/ListGroup');
 require('next/head');
 require('react-bootstrap/Nav');

package/dist/cjs/index.js

@@ -29,12 +29,12 @@ var index = require('./index-39beccb3.js');
 require('./index-fa0fb52c.js');
 var entities = require('./entities-310b46ee.js');
 var slicedToArray = require('./slicedToArray-e38fb29d.js');
-var AdSlot = require('./AdSlot-1886ea26.js');
+var AdSlot = require('./AdSlot-0cd6f861.js');
 require('./promise-2c453658.js');
-require('./ADInfeed-a33644bc.js');
+require('./ADInfeed-db54195d.js');
 var DeckContent = require('./DeckContent.js');
 var get$1 = require('./get-de2660c3.js');
-var GridContent = require('./GridContent-26572c38.js');
+var GridContent = require('./GridContent-02acbd72.js');
 var DeckQueue = require('./DeckQueue.js');
 require('react-bootstrap/Media');
 var ThumbnailCard = require('./ThumbnailCard.js');
@@ -52,7 +52,7 @@ var IssueDeck = require('./IssueDeck.js');
 require('react-bootstrap/Badge');
 var IssueContentDeck = require('./IssueContentDeck.js');
 var Spinner = _interopDefault(require('react-bootstrap/Spinner'));
-var TemplateNormal = require('./Normal-92be86eb.js');
+var TemplateNormal = require('./Normal-2514655c.js');
 require('react-bootstrap/ListGroup');
 var Head = _interopDefault(require('next/head'));
 var Accordion = _interopDefault(require('react-bootstrap/Accordion'));
@@ -63,7 +63,6 @@ require('react-bootstrap/Navbar');
 require('react-bootstrap/NavDropdown');
 require('react-bootstrap/Form');
 require('react-bootstrap/FormControl');
-var Modal = _interopDefault(require('react-bootstrap/Modal'));
 var Pagination = _interopDefault(require('react-bootstrap/Pagination'));
 var dynamic = _interopDefault(require('next/dynamic'));
 var Carousel = _interopDefault(require('react-bootstrap/Carousel'));
@@ -3029,14 +3028,21 @@ var ADWelcome = function ADWelcome(_ref) {
       adTargeting = _useState2[0],
       setTargeting = _useState2[1];
 
+  var adRef = React.useRef(null);
+
+  var _useState3 = React.useState(),
+      _useState4 = slicedToArray._slicedToArray(_useState3, 2),
+      showAd = _useState4[0],
+      setShowAd = _useState4[1];
+
   var calculateTimeLeft = function calculateTimeLeft(timeLeft) {
     return --timeLeft;
   };
 
-  var _useState3 = React.useState(calculateTimeLeft(counter)),
-      _useState4 = slicedToArray._slicedToArray(_useState3, 2),
-      timeLeft = _useState4[0],
-      setTimeLeft = _useState4[1];
+  var _useState5 = React.useState(calculateTimeLeft(counter + 1)),
+      _useState6 = slicedToArray._slicedToArray(_useState5, 2),
+      timeLeft = _useState6[0],
+      setTimeLeft = _useState6[1];
 
   React.useEffect(function () {
     if (timeLeft > 0) {
@@ -3048,9 +3054,17 @@ var ADWelcome = function ADWelcome(_ref) {
     }
   });
 
+  React.useEffect(function () {
+    if (typeof showAd !== 'undefined' && showAd) {
+      adRef.current.style.opacity = '1';
+    } else if (typeof showAd !== 'undefined' && !showAd) {
+      setFlag(true);
+    }
+  }, [showAd]);
+
   return React__default.createElement(
-    Modal,
-    { show: true, 'aria-labelledby': 'contained-modal-title-vcenter', backdrop: 'static', style: { outline: 'none' }, dialogClassName: 'welcome-modal' },
+    'div',
+    { ref: adRef, style: { outline: 'none', opacity: 0 }, className: 'welcome-modal' },
     React__default.createElement(
       'div',
       { className: 'right-top', style: { position: 'absolute', top: 0, right: 0, textAlign: 'center', margin: '2rem' } },
@@ -3085,14 +3099,14 @@ var ADWelcome = function ADWelcome(_ref) {
       React__default.createElement('img', { style: { width: '100%' }, src: Website.logo, alt: Website.title })
     ),
     React__default.createElement(
-      Modal.Body,
+      'div',
       { className: title, style: { position: 'relative', width: '300px', height: '250px', margin: 'auto', top: '10rem' } },
-      React__default.createElement(AdSlot.DFPAdSlot, { className: className, slotId: slotId, networkID: networkID, sizes: sizes, adUnit: adUnit, targeting: adTargeting, refreshFlag: false })
+      React__default.createElement(AdSlot.DFPAdSlot, { className: className, slotId: slotId, networkID: networkID, sizes: sizes, adUnit: adUnit, targeting: adTargeting, refreshFlag: false, setShowAd: setShowAd })
     ),
     React__default.createElement(
       'style',
       { jsx: 'true' },
-      '\n        .modal.show {\n          padding: 0px;\n        }\n        .continue-site:hover {\n          cursor: pointer;\n        }\n\n        .welcome-modal {\n          max-width: 100% !important;\n          margin: 0px !important;\n        }\n        @media (min-width: 1200px) {\n          .modal-backdrop {\n            display: block;\n          }\n          .modal-content {\n            display: block;\n            height: 100vh;\n          }\n        }\n      '
+      '\n        .continue-site:hover {\n          cursor: pointer;\n        }\n\n        .welcome-modal {\n          max-width: 100% !important;\n          margin: 0px !important;\n        }\n      '
     )
   );
 };

package/dist/esm/{ADInfeed-fd816c1f.js → ADInfeed-ac3ac372.js}

@@ -1,7 +1,7 @@
 import React__default, { useState } from 'react';
 import Card from 'react-bootstrap/Card';
 import { _ as _slicedToArray } from './slicedToArray-d0a9593a.js';
-import { D as DFPAdSlot } from './AdSlot-cc6a4f74.js';
+import { D as DFPAdSlot } from './AdSlot-03043ffb.js';
 
 var ADInfeed = function ADInfeed(_ref) {
   var index = _ref.index,

package/dist/esm/{AdSlot-cc6a4f74.js → AdSlot-03043ffb.js}

@@ -1107,10 +1107,6 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
     }
   }, 500);
 
-  var matchAd = function matchAd(element) {
-    return slotId && slotId.includes(element);
-  };
-
   return React__default.createElement(
     'div',
     { className: className, style: { textAlign: 'center' } },
@@ -1121,8 +1117,12 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
       sizeMapping: sizeMapping,
       targetingArguments: targeting,
       onSlotRender: function onSlotRender(eventData) {
-        if (['floating-ad', 'infeed'].some(matchAd) && eventData && eventData.event && eventData.event.creativeId == null) {
-          setShowAd(false);
+        if (eventData && eventData.slotId && ['floating-ad', 'infeed', 'welcome-ad'].includes(eventData.slotId)) {
+          if (eventData.event && eventData.event.creativeId == null) {
+            setShowAd(false);
+          } else {
+            setShowAd(true);
+          }
         }
         setAdRendered(true);
         if (eventData && eventData.event) {

package/dist/esm/DeckContent.js

@@ -21,9 +21,9 @@ 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 './slicedToArray-d0a9593a.js';
-import './AdSlot-cc6a4f74.js';
+import './AdSlot-03043ffb.js';
 import './promise-e3480f1c.js';
-import { A as ADInfeed } from './ADInfeed-fd816c1f.js';
+import { A as ADInfeed } from './ADInfeed-ac3ac372.js';
 
 var DeckContent = function (_React$Component) {
   _inherits(DeckContent, _React$Component);

package/dist/esm/{GridContent-2e9e7528.js → GridContent-96716e42.js}

@@ -14,7 +14,7 @@ import { withRouter } from 'next/router';
 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 { A as ADInfeed } from './ADInfeed-fd816c1f.js';
+import { A as ADInfeed } from './ADInfeed-ac3ac372.js';
 import { g as get_1 } from './get-9c285a85.js';
 
 var Dfp = React__default.lazy(function () {

package/dist/esm/GridContent.js

@@ -21,8 +21,8 @@ import './index-3849e3fe.js';
 import './index-5f9f807a.js';
 import './entities-7cc3bf45.js';
 import './slicedToArray-d0a9593a.js';
-import './AdSlot-cc6a4f74.js';
+import './AdSlot-03043ffb.js';
 import './promise-e3480f1c.js';
-import './ADInfeed-fd816c1f.js';
+import './ADInfeed-ac3ac372.js';
 import './get-9c285a85.js';
-export { G as default } from './GridContent-2e9e7528.js';
+export { G as default } from './GridContent-96716e42.js';

package/dist/esm/{Normal-319bc9fb.js → Normal-d27184f4.js}

@@ -7,7 +7,7 @@ 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-cc6a4f74.js';
+import { D as DFPAdSlot } from './AdSlot-03043ffb.js';
 import { g as get_1 } from './get-9c285a85.js';
 import { Dropdown } from 'react-bootstrap';
 import { G as GenIcon, b as IoMdLogIn, c as IoIosHome } from './index.esm-536609db.js';

package/dist/esm/QueueDeckExpanded.js

@@ -17,9 +17,9 @@ 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-cc6a4f74.js';
+import './AdSlot-03043ffb.js';
 import './promise-e3480f1c.js';
-import { A as ADInfeed } from './ADInfeed-fd816c1f.js';
+import { A as ADInfeed } from './ADInfeed-ac3ac372.js';
 import { Container, Media } from 'react-bootstrap';
 
 var urlFor = function urlFor(source, builder) {

package/dist/esm/TemplateNormal.js

@@ -11,13 +11,13 @@ import 'react-bootstrap/Row';
 import 'react-bootstrap/Col';
 import 'next/link';
 import './slicedToArray-d0a9593a.js';
-import './AdSlot-cc6a4f74.js';
+import './AdSlot-03043ffb.js';
 import './promise-e3480f1c.js';
 import './get-9c285a85.js';
 import 'react-bootstrap';
 import './index.esm-536609db.js';
 import 'react-bootstrap/Button';
-export { T as default } from './Normal-319bc9fb.js';
+export { T as default } from './Normal-d27184f4.js';
 import 'react-bootstrap/ListGroup';
 import 'next/head';
 import 'react-bootstrap/Nav';

package/dist/esm/index.js

@@ -21,13 +21,13 @@ import { i as imageUrlBuilder } from './index-3849e3fe.js';
 import './index-5f9f807a.js';
 import { h as html_decode_1, c as clean_html_1 } from './entities-7cc3bf45.js';
 import { _ as _slicedToArray } from './slicedToArray-d0a9593a.js';
-import { _ as _JSON$stringify, a as _asyncToGenerator, r as regenerator, D as DFPAdSlot, B as Beam } from './AdSlot-cc6a4f74.js';
-export { D as AdSlot, B as Beam } from './AdSlot-cc6a4f74.js';
+import { _ as _JSON$stringify, a as _asyncToGenerator, r as regenerator, D as DFPAdSlot, B as Beam } from './AdSlot-03043ffb.js';
+export { D as AdSlot, B as Beam } from './AdSlot-03043ffb.js';
 import './promise-e3480f1c.js';
-import './ADInfeed-fd816c1f.js';
+import './ADInfeed-ac3ac372.js';
 export { default as DeckContent } from './DeckContent.js';
 import { i as isFunction_1, a as isArray_1, _ as _arrayMap } from './get-9c285a85.js';
-export { A as AD, G as GridContent } from './GridContent-2e9e7528.js';
+export { A as AD, G as GridContent } from './GridContent-96716e42.js';
 export { default as DeckQueue } from './DeckQueue.js';
 import 'react-bootstrap/Media';
 export { default as ThumbnailCard } from './ThumbnailCard.js';
@@ -48,8 +48,8 @@ export { default as IssueDeck } from './IssueDeck.js';
 import 'react-bootstrap/Badge';
 export { default as IssueContentDeck } from './IssueContentDeck.js';
 import Spinner from 'react-bootstrap/Spinner';
-import { M as MdPictureAsPdf, T as TemplateNormal } from './Normal-319bc9fb.js';
-export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-319bc9fb.js';
+import { M as MdPictureAsPdf, T as TemplateNormal } from './Normal-d27184f4.js';
+export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-d27184f4.js';
 import 'react-bootstrap/ListGroup';
 import Head from 'next/head';
 import Accordion from 'react-bootstrap/Accordion';
@@ -60,7 +60,6 @@ import 'react-bootstrap/Navbar';
 import 'react-bootstrap/NavDropdown';
 import 'react-bootstrap/Form';
 import 'react-bootstrap/FormControl';
-import Modal from 'react-bootstrap/Modal';
 import Pagination from 'react-bootstrap/Pagination';
 import dynamic from 'next/dynamic';
 import Carousel$1 from 'react-bootstrap/Carousel';
@@ -3027,14 +3026,21 @@ var ADWelcome = function ADWelcome(_ref) {
       adTargeting = _useState2[0],
       setTargeting = _useState2[1];
 
+  var adRef = useRef(null);
+
+  var _useState3 = useState(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      showAd = _useState4[0],
+      setShowAd = _useState4[1];
+
   var calculateTimeLeft = function calculateTimeLeft(timeLeft) {
     return --timeLeft;
   };
 
-  var _useState3 = useState(calculateTimeLeft(counter)),
-      _useState4 = _slicedToArray(_useState3, 2),
-      timeLeft = _useState4[0],
-      setTimeLeft = _useState4[1];
+  var _useState5 = useState(calculateTimeLeft(counter + 1)),
+      _useState6 = _slicedToArray(_useState5, 2),
+      timeLeft = _useState6[0],
+      setTimeLeft = _useState6[1];
 
   useEffect(function () {
     if (timeLeft > 0) {
@@ -3046,9 +3052,17 @@ var ADWelcome = function ADWelcome(_ref) {
     }
   });
 
+  useEffect(function () {
+    if (typeof showAd !== 'undefined' && showAd) {
+      adRef.current.style.opacity = '1';
+    } else if (typeof showAd !== 'undefined' && !showAd) {
+      setFlag(true);
+    }
+  }, [showAd]);
+
   return React__default.createElement(
-    Modal,
-    { show: true, 'aria-labelledby': 'contained-modal-title-vcenter', backdrop: 'static', style: { outline: 'none' }, dialogClassName: 'welcome-modal' },
+    'div',
+    { ref: adRef, style: { outline: 'none', opacity: 0 }, className: 'welcome-modal' },
     React__default.createElement(
       'div',
       { className: 'right-top', style: { position: 'absolute', top: 0, right: 0, textAlign: 'center', margin: '2rem' } },
@@ -3083,14 +3097,14 @@ var ADWelcome = function ADWelcome(_ref) {
       React__default.createElement('img', { style: { width: '100%' }, src: Website.logo, alt: Website.title })
     ),
     React__default.createElement(
-      Modal.Body,
+      'div',
       { className: title, style: { position: 'relative', width: '300px', height: '250px', margin: 'auto', top: '10rem' } },
-      React__default.createElement(DFPAdSlot, { className: className, slotId: slotId, networkID: networkID, sizes: sizes, adUnit: adUnit, targeting: adTargeting, refreshFlag: false })
+      React__default.createElement(DFPAdSlot, { className: className, slotId: slotId, networkID: networkID, sizes: sizes, adUnit: adUnit, targeting: adTargeting, refreshFlag: false, setShowAd: setShowAd })
     ),
     React__default.createElement(
       'style',
       { jsx: 'true' },
-      '\n        .modal.show {\n          padding: 0px;\n        }\n        .continue-site:hover {\n          cursor: pointer;\n        }\n\n        .welcome-modal {\n          max-width: 100% !important;\n          margin: 0px !important;\n        }\n        @media (min-width: 1200px) {\n          .modal-backdrop {\n            display: block;\n          }\n          .modal-content {\n            display: block;\n            height: 100vh;\n          }\n        }\n      '
+      '\n        .continue-site:hover {\n          cursor: pointer;\n        }\n\n        .welcome-modal {\n          max-width: 100% !important;\n          margin: 0px !important;\n        }\n      '
     )
   );
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mjhls/mjh-framework",
-  "version": "1.0.285",
+  "version": "1.0.286",
   "description": "Foundation Framework",
   "author": "mjh-framework",
   "license": "MIT",