@mjhls/mjh-framework 1.0.754 → 1.0.755-ad-test

package/README.md

@@ -1,167 +1,167 @@
-# mjh-framework v. 1.0.754
-[![NPM](https://img.shields.io/npm/v/mjh-framework.svg)](https://www.npmjs.com/package/mjh-framework) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
-
-## Install
-
-```bash
-npm install --save @mjhls/mjh-framework
-```
-
-## Usage
-
-```jsx
-import React, { Component } from 'react'
-
-import { NavMagazine, DeckQueue } from 'mjh-framework'
-
-export default class App extends Component {
-  render() {
-    return (
-      <div>
-        <NavMagazine />
-        <DeckQueue />
-      </div>
-    )
-  }
-}
-```
-
-## Publish new updates to the npm registry
-
-```bash
-npm publish
-```
-
-## For getting updates in the template without publishing each time a change is made in the framework
-
-Link react and react-dom of the template repo, so that it can be used by the framework.
-This is to avoid the error arising due to multiple instances of React.
-
-```bash
-cd ../mjh-template/node_modules/react
-
-yarn link
-
-cd ../react-dom
-
-yarn link
-
-cd ../../../mjh-framework
-
-yarn link react && yarn link react-dom
-```
-
-Link the framework repo so that it can be used in the template
-
-```bash
-npm link
-
-cd ../mjh-template
-
-npm link @mjhls/mjh-framework
-```
-
-## Components and "props"
-
-### Deck Components
-
-- #### DeckContent
-
-  ##### Props
-
-  - mapping
-  - dataRecord
-  - query
-  - params
-  - pointer
-  - pointerArray
-  - defaultImage
-
-- #### DeckQueue
-  ##### Props
-  - page
-  - dataRecord
-  - query
-  - params
-  - pointer
-  - pointerArray
-
-### Layout Components
-
-- #### Column1
-- #### Column2
-  ##### Props
-  - rightItems
-- #### Column3
-  ##### Props
-  - leftItems
-  - rightItems
-  ##### Common Props (Column1, Column2, Column3)
-  - title
-  - children
-- #### Header
-  ##### Props
-  - title
-  - keyword
-  - description
-- #### LeftNav
-  ##### Props
-  - leftItems
-- #### AccordionPanel
-  ##### Props
-  - accordionClassName
-  - data
-
-### Navigation Components
-
-- #### NavMagazine
-  ##### Props
-  - logo
-  - dataObject
-- #### NavNative
-  ##### Props
-  - logo
-  - dataObject
-- #### NavNormal
-  ##### Props
-  - logo
-  - dataObject
-  - variant
-- #### NavDvm
-  ##### Props
-  - logo
-  - dataObject
-  - subNavHeads
-
-### Template Components
-
-- #### TemplateNormal
-  ##### Props
-  - config
-  - title
-  - keywords
-  - description
-  - website
-
-### Ad Components
-
-- #### AD300x250
-- #### AD300x250x600
-- #### AD728x90
-  ##### Common Props
-  - networkID
-  - adUnit
-
-### Serializers
-
-- #### getSerializers (function)
-  ##### arguments
-  - client
-  ##### types
-  - youtube
-  - figure
-  - slideshow
-
-## License
-
-MIT © [mjh-framework](https://github.com/mjh-framework)
+# mjh-framework v. 1.0.755
+[![NPM](https://img.shields.io/npm/v/mjh-framework.svg)](https://www.npmjs.com/package/mjh-framework) [![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
+
+## Install
+
+```bash
+npm install --save @mjhls/mjh-framework
+```
+
+## Usage
+
+```jsx
+import React, { Component } from 'react'
+
+import { NavMagazine, DeckQueue } from 'mjh-framework'
+
+export default class App extends Component {
+  render() {
+    return (
+      <div>
+        <NavMagazine />
+        <DeckQueue />
+      </div>
+    )
+  }
+}
+```
+
+## Publish new updates to the npm registry
+
+```bash
+npm publish
+```
+
+## For getting updates in the template without publishing each time a change is made in the framework
+
+Link react and react-dom of the template repo, so that it can be used by the framework.
+This is to avoid the error arising due to multiple instances of React.
+
+```bash
+cd ../mjh-template/node_modules/react
+
+yarn link
+
+cd ../react-dom
+
+yarn link
+
+cd ../../../mjh-framework
+
+yarn link react && yarn link react-dom
+```
+
+Link the framework repo so that it can be used in the template
+
+```bash
+npm link
+
+cd ../mjh-template
+
+npm link @mjhls/mjh-framework
+```
+
+## Components and "props"
+
+### Deck Components
+
+- #### DeckContent
+
+  ##### Props
+
+  - mapping
+  - dataRecord
+  - query
+  - params
+  - pointer
+  - pointerArray
+  - defaultImage
+
+- #### DeckQueue
+  ##### Props
+  - page
+  - dataRecord
+  - query
+  - params
+  - pointer
+  - pointerArray
+
+### Layout Components
+
+- #### Column1
+- #### Column2
+  ##### Props
+  - rightItems
+- #### Column3
+  ##### Props
+  - leftItems
+  - rightItems
+  ##### Common Props (Column1, Column2, Column3)
+  - title
+  - children
+- #### Header
+  ##### Props
+  - title
+  - keyword
+  - description
+- #### LeftNav
+  ##### Props
+  - leftItems
+- #### AccordionPanel
+  ##### Props
+  - accordionClassName
+  - data
+
+### Navigation Components
+
+- #### NavMagazine
+  ##### Props
+  - logo
+  - dataObject
+- #### NavNative
+  ##### Props
+  - logo
+  - dataObject
+- #### NavNormal
+  ##### Props
+  - logo
+  - dataObject
+  - variant
+- #### NavDvm
+  ##### Props
+  - logo
+  - dataObject
+  - subNavHeads
+
+### Template Components
+
+- #### TemplateNormal
+  ##### Props
+  - config
+  - title
+  - keywords
+  - description
+  - website
+
+### Ad Components
+
+- #### AD300x250
+- #### AD300x250x600
+- #### AD728x90
+  ##### Common Props
+  - networkID
+  - adUnit
+
+### Serializers
+
+- #### getSerializers (function)
+  ##### arguments
+  - client
+  ##### types
+  - youtube
+  - figure
+  - slideshow
+
+## License
+
+MIT © [mjh-framework](https://github.com/mjh-framework)

package/dist/cjs/ADWelcome.js

@@ -59,35 +59,36 @@ var ADWelcome = function ADWelcome(_ref) {
     return --timeLeft;
   };
 
-  var _useState = React.useState(counter),
+  var _useState = React.useState(null),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
       timeLeft = _useState2[0],
       setTimeLeft = _useState2[1];
 
-  var _useState3 = React.useState(true),
-      _useState4 = slicedToArray._slicedToArray(_useState3, 2);
-      _useState4[0];
-      var setPreviewAd = _useState4[1];
-
   React.useEffect(function () {
-    var path = window && window.location && window.location.search;
-    // Setting flag for Ad-preview URLs
-    setPreviewAd(path.split('&').some(function (param) {
-      return param.includes('creativeId');
-    }));
-  }, []);
+    if (timeLeft !== null) {
+      if (timeLeft > 0) {
+        setTimeout(function () {
+          setTimeLeft(calculateTimeLeft(timeLeft));
+        }, 1000);
+      } else {
+        document.body.style.overflow = 'auto';
+        setFlag(true);
+      }
+    }
+  }, [timeLeft]);
 
-  React.useEffect(function () {
-    if (timeLeft > 0) {
-      document.body.style.overflow = 'hidden'; //To hide scrollbar while displaying Welcome Ad
-      setTimeout(function () {
-        setTimeLeft(calculateTimeLeft(timeLeft));
-      }, 1000);
+  var checkIsAdFound = function checkIsAdFound(isFound, adData) {
+    if (isFound) {
+      var parent = document.getElementById('welcome-modal');
+      document.body.style.overflow = 'hidden';
+      parent.style.display = 'block';
+      parent.style.opacity = '1';
+      setTimeLeft(counter);
     } else {
       document.body.style.overflow = 'auto';
       setFlag(true);
     }
-  });
+  };
 
   return (
     // Setting welcome ad to display:none and Setting to display:block after checking for cookie in site level.
@@ -142,9 +143,8 @@ var ADWelcome = function ADWelcome(_ref) {
           sizes: sizes,
           adUnit: adUnit,
           targeting: adTargeting,
-          refreshFlag: false
-          /* Passing function to check for ad creative only if it is not in preview. */
-          // checkIsAdFound={previewAd ? null : checkIsAdFound}
+          refreshFlag: false,
+          checkIsAdFound: checkIsAdFound
         })
       ),
       React__default['default'].createElement(

package/dist/cjs/AdSlot.js

@@ -37,8 +37,7 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
       targeting = _ref$targeting === undefined ? {} : _ref$targeting,
       _ref$refreshFlag = _ref.refreshFlag,
       refreshFlag = _ref$refreshFlag === undefined ? true : _ref$refreshFlag,
-      _ref$checkIsAdFound = _ref.checkIsAdFound,
-      checkIsAdFound = _ref$checkIsAdFound === undefined ? function () {} : _ref$checkIsAdFound,
+      checkIsAdFound = _ref.checkIsAdFound,
       _ref$setStickyAd = _ref.setStickyAd,
       setStickyAd = _ref$setStickyAd === undefined ? function () {} : _ref$setStickyAd;
 
@@ -98,11 +97,13 @@ var DFPAdSlot = function DFPAdSlot(_ref) {
       },
       onSlotRender: function onSlotRender(eventData) {
         // Updating the condition to remove the dependency on static slotId.
-        if (eventData && eventData.event && checkIsAdFound !== null) {
-          if (eventData.event.creativeId == null && eventData.event.campaignId == null && eventData.event.advertiserId == null) {
-            checkIsAdFound(false, eventData);
-          } else {
+        console.log(eventData.event, 'EVENT DATA');
+        if (eventData && eventData.event && checkIsAdFound && checkIsAdFound !== null) {
+
+          if (eventData.event.size !== null && eventData.event.size.length) {
             checkIsAdFound(true, eventData);
+          } else {
+            checkIsAdFound(false, eventData);
           }
         }
 

package/dist/cjs/ArticleProgramLandingPage.js

@@ -5,7 +5,7 @@ var slicedToArray = require('./slicedToArray-db24842a.js');
 var _extends = require('./extends-1e24fc8d.js');
 var React = require('react');
 var BlockContent = require('./BlockContent-eca358e4.js');
-var getSerializers = require('./index-00b7a18a.js');
+var getSerializers = require('./index-5093052e.js');
 var ArticleSeriesListing = require('./ArticleSeriesListing.js');
 require('./_commonjsHelpers-06173234.js');
 require('./es6.string.iterator-20d42c53.js');

package/dist/cjs/ArticleSeriesLandingPage.js

@@ -34,14 +34,14 @@ require('./index.es-f3e47207.js');
 require('./visibility-sensor-8b54af99.js');
 require('react-dom');
 require('./index-d48b231c.js');
-require('./ADlgInfeed-a62d2f9b.js');
+require('./ADlgInfeed-a3199e28.js');
 require('./slicedToArray-db24842a.js');
 require('./AdSlot.js');
 require('./Beam.js');
 require('./stringify-01cf47f7.js');
 require('./Segment.js');
 require('./main-dc082238.js');
-require('./ADInfeed-5fe7fd9d.js');
+require('./ADInfeed-bc6fea23.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 

package/dist/cjs/ConferenceArticleCard.js

@@ -9,21 +9,21 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-/*
-Example usage - targetedonc.com/latest-conference
-const query = `*[!(_id in path("drafts.**")) && _type == "article" && defined(title) && is_visible == true && published <= '${today}' && references('b49d36b8-aa56-4183-a2bc-1568c229fb72') ] | order(published desc) [$from...$to] {
-                    ...,
-                    title,
-                    summary,
-                    thumbnail,
-                    url,
-                    published,
-                    documentGroup->,
-                    contentCategory->,
-                    'pageNumber': ${currentPage}
-                  }`
-
-  const posts = await client.fetch(query, params)
+/*
+Example usage - targetedonc.com/latest-conference
+const query = `*[!(_id in path("drafts.**")) && _type == "article" && defined(title) && is_visible == true && published <= '${today}' && references('b49d36b8-aa56-4183-a2bc-1568c229fb72') ] | order(published desc) [$from...$to] {
+                    ...,
+                    title,
+                    summary,
+                    thumbnail,
+                    url,
+                    published,
+                    documentGroup->,
+                    contentCategory->,
+                    'pageNumber': ${currentPage}
+                  }`
+
+  const posts = await client.fetch(query, params)
 */
 
 var ConferenceArticleCard = function ConferenceArticleCard(props) {

package/dist/cjs/DeckContent.js

@@ -18,7 +18,7 @@ var index = require('./index-d48b231c.js');
 var index$2 = require('./index-80f57cff.js');
 var main = require('./main-dc082238.js');
 var entities = require('./entities-3f9d0f2f.js');
-var ADInfeed = require('./ADInfeed-5fe7fd9d.js');
+var ADInfeed = require('./ADInfeed-bc6fea23.js');
 require('./_commonjsHelpers-06173234.js');
 require('./es6.string.iterator-20d42c53.js');
 require('./_to-object-821a2927.js');
@@ -189,14 +189,14 @@ var DeckContent = function (_React$Component) {
             var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
 
             // please leave this for later debug purpose : Yong Jun.
-            /* console.log('page change reported', {
-              currentPage: currentPage,
-              pageNumber: pageNumber,
-              pathname: pathname,
-              path: path,
-              newPath: newPath,
-              firstPage: pageNumber === 1,
-              queryString: queryString
+            /* console.log('page change reported', {
+              currentPage: currentPage,
+              pageNumber: pageNumber,
+              pathname: pathname,
+              path: path,
+              newPath: newPath,
+              firstPage: pageNumber === 1,
+              queryString: queryString
             }) */
 
             if (pageview) {

package/dist/cjs/EventsDeck.js

@@ -18,7 +18,7 @@ var Card = require('react-bootstrap/Card');
 var Form = require('react-bootstrap/Form');
 var Button = require('react-bootstrap/Button');
 require('./main-dc082238.js');
-var index = require('./index-4d74ffd6.js');
+var index = require('./index-cb6ed1fc.js');
 var js_cookie = require('./js.cookie-a511c430.js');
 var Router = require('next/router');
 require('./define-property-aff11f8a.js');
@@ -258,23 +258,23 @@ var EventsDeck = function EventsDeck(_ref) {
     if (cventAccessToken && cventAccessToken !== 'undefined') {
       setAccessToken(cventAccessToken);
     } else {
-      /*const encodedData = window.btoa(clientId + ':' + clientSecret)
-      //const url = `${corsProxy}https://api-platform.cvent.com/ea/oauth2/token`
-      const url = `https://api-platform.cvent.com/ea/oauth2/token`
-      fetch(url, {
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded',
-          Authorization: `Basic ${encodedData}`
-        },
-        method: 'POST',
-        body: `grant_type=client_credentials&client_id=${clientId}`
-      })
-        .then((response) => response.json())
-        .then((json) => {
-          const inOneHour = new Date(new Date().getTime() + 60 * 60 * 1000)
-          Cookies.set('cvent_access_token', json.access_token, { expires: inOneHour })
-          setAccessToken(json.access_token)
-        })
+      /*const encodedData = window.btoa(clientId + ':' + clientSecret)
+      //const url = `${corsProxy}https://api-platform.cvent.com/ea/oauth2/token`
+      const url = `https://api-platform.cvent.com/ea/oauth2/token`
+      fetch(url, {
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          Authorization: `Basic ${encodedData}`
+        },
+        method: 'POST',
+        body: `grant_type=client_credentials&client_id=${clientId}`
+      })
+        .then((response) => response.json())
+        .then((json) => {
+          const inOneHour = new Date(new Date().getTime() + 60 * 60 * 1000)
+          Cookies.set('cvent_access_token', json.access_token, { expires: inOneHour })
+          setAccessToken(json.access_token)
+        })
         .catch((e) => console.log(e))*/
       // hello
       var url = 'https://beam.mjhlifesciences.com/api/cvent/token';

package/dist/cjs/ExternalResources.js

@@ -4,8 +4,8 @@ var _extends = require('./extends-1e24fc8d.js');
 var slicedToArray = require('./slicedToArray-db24842a.js');
 var React = require('react');
 var BlockContent = require('./BlockContent-eca358e4.js');
-var getSerializers = require('./index-00b7a18a.js');
-var index = require('./index-4d74ffd6.js');
+var getSerializers = require('./index-5093052e.js');
+var index = require('./index-cb6ed1fc.js');
 var Router = require('next/router');
 var Button = require('react-bootstrap/Button');
 require('./_commonjsHelpers-06173234.js');

package/dist/cjs/GridContent.js

@@ -14,9 +14,9 @@ var moment = require('./moment-aca40de1.js');
 var Router = require('next/router');
 var index$2 = require('./index-80f57cff.js');
 var entities = require('./entities-3f9d0f2f.js');
-var ADInfeed = require('./ADInfeed-5fe7fd9d.js');
+var ADInfeed = require('./ADInfeed-bc6fea23.js');
 var lodash = require('./lodash-4ef21f0f.js');
-var ADlgInfeed = require('./ADlgInfeed-a62d2f9b.js');
+var ADlgInfeed = require('./ADlgInfeed-a3199e28.js');
 var getContentCategory = require('./getContentCategory-f38a4c00.js');
 var get = require('./get-68c52cb1.js');
 var debounce = require('./debounce-eb287781.js');

package/dist/cjs/HamMagazine.js

@@ -41,15 +41,15 @@ var Navbar__default = /*#__PURE__*/_interopDefaultLegacy(Navbar);
 var NavDropdown__default = /*#__PURE__*/_interopDefaultLegacy(NavDropdown);
 
 var HamMagazine = function HamMagazine(props) {
-  /*
-  Example Nav with acceptable props
-  <MagazineNav
-     showLogin
-     logo={props.settings.logo}
-     dataObject={props.cache.mainNavCache}
-     website={website}
-     subNav={props.cache.subNavCache}
-      />
+  /*
+  Example Nav with acceptable props
+  <MagazineNav
+     showLogin
+     logo={props.settings.logo}
+     dataObject={props.cache.mainNavCache}
+     website={website}
+     subNav={props.cache.subNavCache}
+      />
   */
 
   // Setting 'socialIconVariant' as 'light' as default to make the social icons and search icon black

package/dist/cjs/HorizontalArticleListing.js

@@ -5,7 +5,7 @@ var React = require('react');
 var ArticleCarousel = require('./ArticleCarousel.js');
 var index_esm = require('./index.esm-974f47d9.js');
 var BlockContent = require('./BlockContent-eca358e4.js');
-var getSerializers = require('./index-00b7a18a.js');
+var getSerializers = require('./index-5093052e.js');
 require('./_commonjsHelpers-06173234.js');
 require('./_to-object-821a2927.js');
 require('./_object-pie-68c5bcbc.js');