@mjhls/mjh-framework 1.0.90 → 1.0.92

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.90
+# mjh-framework v. 1.0.92
 
 
 > Foundation Framework

package/dist/index.es.js

@@ -1,15 +1,15 @@
-import React__default, { Component, useState, useEffect, useRef, createContext, createElement } from 'react';
+import React__default, { Component, useState, useEffect, useRef, createElement, createContext } from 'react';
 import PropTypes from 'prop-types';
 import reactDom from 'react-dom';
 import Container from 'react-bootstrap/Container';
 import Row from 'react-bootstrap/Row';
 import Col from 'react-bootstrap/Col';
 import Card from 'react-bootstrap/Card';
+import moment from 'moment';
 import Link from 'next/link';
 import { withRouter, useRouter } from 'next/router';
 import Media from 'react-bootstrap/Media';
-import { Media as Media$1, Card as Card$1, Container as Container$1, Figure, Carousel, Table } from 'react-bootstrap';
-import moment from 'moment';
+import { Media as Media$1, Container as Container$1, Figure, Carousel, Table } from 'react-bootstrap';
 import ListGroup from 'react-bootstrap/ListGroup';
 import Head from 'next/head';
 import Accordion from 'react-bootstrap/Accordion';
@@ -4010,6 +4010,11 @@ var DeckContent = function (_React$Component) {
                         null,
                         row.title
                       ),
+                      _this.props.showPublished && row.published && React__default.createElement(
+                        Card.Subtitle,
+                        null,
+                        moment(row.published).format('MMMM DD, YYYY')
+                      ),
                       React__default.createElement(
                         Card.Text,
                         null,
@@ -5142,7 +5147,7 @@ var GridContent = function (_React$Component) {
       args[_key] = arguments[_key];
     }
 
-    return _ret = (_temp = (_this = possibleConstructorReturn(this, (_ref = GridContent.__proto__ || Object.getPrototypeOf(GridContent)).call.apply(_ref, [this].concat(args))), _this), _this.page = _this.props.page, _this.mapping = _this.props.mapping, _this.data = _this.props.dataRecord, _this.query = _this.props.query, _this.params = _this.props.params, _this.pointer = _this.props.pointer ? _this.props.pointer : false, _this.pointerArray = _this.props.pointerArray ? _this.props.pointerArray : false, _this.state = {
+    return _ret = (_temp = (_this = possibleConstructorReturn(this, (_ref = GridContent.__proto__ || Object.getPrototypeOf(GridContent)).call.apply(_ref, [this].concat(args))), _this), _this.page = _this.props.page, _this.mapping = _this.props.mapping, _this.data = _this.props.dataRecord, _this.query = _this.props.query, _this.params = _this.props.params, _this.pointer = _this.props.pointer ? _this.props.pointer : false, _this.pointerArray = _this.props.pointerArray ? _this.props.pointerArray : false, _this.defaultImage = _this.props.defaultImage ? _this.props.defaultImage : '/placeholder.jpg', _this.state = {
       data: _this.data,
       per: _this.params ? _this.params.to : 2,
       page: 1,
@@ -5254,7 +5259,7 @@ var GridContent = function (_React$Component) {
         pageNumber = parseInt(pageNumber);
 
         if (currentPage !== pageNumber) {
-          DFPManager.refresh();
+          lib_3.refresh();
           if (pageview) {
             _this.setState({
               currentPage: pageNumber
@@ -5288,12 +5293,12 @@ var GridContent = function (_React$Component) {
         return React__default.createElement(
           Row,
           null,
-          this.state.data && this.state.data.map(function (row, index) {
+          this.state.data && this.state.data.map(function (row, index$$1) {
             // const thumbnailURL = get(row, 'thumbnail.asset.url', this.props.defaultImage)
             var thumbnailURL = row.thumbnail ? _this2.urlFor(row.thumbnail).url() : _this2.props.defaultImage;
             return React__default.createElement(
               Col,
-              { key: index, md: 12, lg: lgVar, style: { display: 'flex', flex: '1 0 auto' } },
+              { key: index$$1, md: 12, lg: lgVar, style: { display: 'flex', flex: '1 0 auto' } },
               React__default.createElement(
                 Link,
                 { href: _this2.page + '/[url]', as: _this2.page + '/' + get_1(row, 'url.current') },
@@ -5322,6 +5327,11 @@ var GridContent = function (_React$Component) {
                             null,
                             row.title
                           ),
+                          _this2.props.showPublished && row.published && React__default.createElement(
+                            Card.Subtitle,
+                            null,
+                            moment(row.published).format('MMMM DD, YYYY')
+                          ),
                           React__default.createElement(
                             Card.Text,
                             null,
@@ -5340,7 +5350,7 @@ var GridContent = function (_React$Component) {
       return React__default.createElement(
         'div',
         { className: 'grid-container' },
-        this.state.data && this.state.data.map(function (row, index) {
+        this.state.data && this.state.data.map(function (row, index$$1) {
           var pageNumber = row.pageNumber || _this2.state.page;
           var contentCategoryName = row.contentCategory ? row.contentCategory.name : 'Articles';
           return React__default.createElement(
@@ -5355,13 +5365,13 @@ var GridContent = function (_React$Component) {
               { counter: itemCounter++, style: { display: 'flex', flex: '1 0 auto' } },
               React__default.createElement(
                 Card,
-                { className: 'content-card', style: { flexDirection: index === 0 || index % 4 === 0 ? 'top' : 'row' } },
+                { className: 'content-card', style: { flexDirection: index$$1 === 0 || index$$1 % 4 === 0 ? 'top' : 'row' } },
                 React__default.createElement(
                   Link,
                   { href: _this2.mapping[contentCategoryName] + '/[url]', as: _this2.mapping[contentCategoryName] + '/' + row.url.current },
                   React__default.createElement(
                     'a',
-                    { className: index === 0 || index % 4 === 0 ? '' : 'card-image' },
+                    { className: index$$1 === 0 || index$$1 % 4 === 0 ? '' : 'card-image' },
                     React__default.createElement(Card.Img, { variant: 'top', src: _this2.renderCardImage(row, page), alt: row.thumbnail && row.thumbnail.asset ? row.thumbnail.asset.originalFilename : '' })
                   )
                 ),
@@ -5381,7 +5391,7 @@ var GridContent = function (_React$Component) {
                       ),
                       React__default.createElement(
                         Card.Text,
-                        { className: index === 0 || index % 4 === 0 ? '' : 'card-subtext' },
+                        { className: index$$1 === 0 || index$$1 % 4 === 0 ? '' : 'card-subtext' },
                         row.summary
                       )
                     )
@@ -5452,6 +5462,8 @@ var GridContent = function (_React$Component) {
   return GridContent;
 }(React__default.Component);
 
+var GridContent$1 = withRouter(GridContent);
+
 var DeckQueue = function (_React$Component) {
   inherits(DeckQueue, _React$Component);
 
@@ -5555,38 +5567,57 @@ var DeckQueue = function (_React$Component) {
             Col,
             { key: index, md: 12, lg: lgVar, style: { display: 'flex', flex: '1 0 auto' } },
             React__default.createElement(
-              Link,
-              { href: _this2.page + '/[url]', as: _this2.page + '/' + get_1(row, 'url.current') },
+              Card,
+              { className: 'queue-card', style: { borderTop: '1px solid #EEE' } },
               React__default.createElement(
-                'a',
-                null,
+                Row,
+                { style: { flexDirection: mode } },
                 React__default.createElement(
-                  Card,
-                  { className: 'queue-card', style: { borderTop: '1px solid #EEE' } },
+                  Col,
+                  { md: 12, lg: 4 },
                   React__default.createElement(
-                    Row,
-                    { style: { flexDirection: mode } },
-                    React__default.createElement(
-                      Col,
-                      { md: 12, lg: 4 },
-                      React__default.createElement(Card.Img, { variant: 'top', src: thumbnailURL })
+                    Link,
+                    { href: _this2.page + '/[url]', as: _this2.page + '/' + get_1(row, 'url.current') },
+                    React__default.createElement(Card.Img, { variant: 'top', src: thumbnailURL })
+                  )
+                ),
+                React__default.createElement(
+                  Col,
+                  null,
+                  React__default.createElement(
+                    Card.Body,
+                    { style: { padding: '20px' } },
+                    row.title && React__default.createElement(
+                      Link,
+                      { href: _this2.page + '/[url]', as: _this2.page + '/' + get_1(row, 'url.current') },
+                      React__default.createElement(
+                        Card.Title,
+                        null,
+                        row.title
+                      )
                     ),
-                    React__default.createElement(
-                      Col,
+                    _this2.props.showPublished && row.published && React__default.createElement(
+                      Card.Subtitle,
+                      null,
+                      moment(row.published).format('MMMM DD, YYYY')
+                    ),
+                    _this2.props.showRecent && row.recent && row.recent.title && React__default.createElement(
+                      Card.Subtitle,
                       null,
+                      'Recent : ',
                       React__default.createElement(
-                        Card.Body,
-                        { style: { padding: '20px' } },
-                        React__default.createElement(
-                          Card.Title,
-                          null,
-                          row.title
-                        ),
-                        React__default.createElement(
-                          Card.Text,
-                          null,
-                          row.summary
-                        )
+                        Link,
+                        { href: 'view/' + row.recent.url.current },
+                        row.recent.title
+                      )
+                    ),
+                    row.summary && React__default.createElement(
+                      Link,
+                      { href: _this2.page + '/[url]', as: _this2.page + '/' + get_1(row, 'url.current') },
+                      React__default.createElement(
+                        Card.Text,
+                        null,
+                        row.summary
                       )
                     )
                   )
@@ -6159,8 +6190,6 @@ var YoutubeGroup = function YoutubeGroup(props) {
   );
 };
 
-var _this = undefined;
-
 var urlFor = function urlFor(builder, source) {
   return builder.image(source);
 };
@@ -6181,8 +6210,7 @@ var loadData = function loadData(values, query, client, params, setData, setScro
 
   client.fetch(query, params).then(function (dataArr) {
     if (pointer && pointerArray) {
-      var _pointer = _this.pointer;
-      dataArr = dataArr[pointerArray][_pointer];
+      dataArr = dataArr[pointerArray][pointer];
     }
     dataArr = dataArr.map(function (item) {
       return _extends({}, item, {
@@ -6241,7 +6269,6 @@ var changePageNumber = function changePageNumber(pageNumber, seoPaginate, pagevi
         }
         var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
         pageview(newPath);
-
         router.push(pathname, newPath, {
           shallow: true
         });
@@ -6272,8 +6299,7 @@ var renderAuthor = function renderAuthor(authorName, authorURL, index$$1, length
   }
 };
 
-var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage) {
-
+var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage) {
   return React__default.createElement(
     'div',
     null,
@@ -6299,7 +6325,11 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
               React__default.createElement(
                 'a',
                 null,
-                React__default.createElement('img', { width: 200, height: 130, className: 'mr-3', src: urlFor(builder, article.thumbnail.asset).url(), style: { objectFit: 'cover' }, alt: article.title })
+                article.thumbnail && article.thumbnail.asset ? React__default.createElement('img', {
+                  className: 'mr-3',
+                  src: urlFor(builder, article.thumbnail).width(200).height(130).url(),
+                  alt: article.title
+                }) : React__default.createElement('img', { src: defaultImage, className: 'mr-3', width: '200', height: '130' })
               )
             ),
             React__default.createElement(
@@ -6318,8 +6348,8 @@ var cardLoader = function cardLoader(data, builder, mapping, values, seoPaginate
                   )
                 )
               ),
-              article.published && React__default.createElement(
-                'p',
+              showPublished && article.published && React__default.createElement(
+                'h6',
                 { className: 'card-text', style: { color: 'var(--gray)', marginBottom: '.25rem' } },
                 moment(article.published).format('MMMM DD, YYYY')
               ),
@@ -6369,7 +6399,6 @@ var usePrevious = function usePrevious(value) {
 };
 
 var QueueDeckExpanded = function QueueDeckExpanded(props) {
-
   var router = useRouter();
   var initialData = props.dataRecord,
       client = props.client,
@@ -6380,8 +6409,10 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       pointerArray = props.pointerArray,
       mapping = props.mapping,
       seoPaginate = props.seoPaginate,
-      pageview = props.pageview;
-  var initialCurrentPage = props.currentPage;
+      pageview = props.pageview,
+      defaultImage = props.defaultImage;
+  var initialCurrentPage = props.currentPage,
+      showPublished = props.showPublished;
 
   var builder = imageUrlBuilder(client);
 
@@ -6438,7 +6469,7 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
         React__default.createElement(
           Container$1,
           null,
-          cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage)
+          cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage)
         )
       ),
       React__default.createElement(
@@ -6452,7 +6483,7 @@ var QueueDeckExpanded = function QueueDeckExpanded(props) {
       React__default.createElement(
         Container$1,
         null,
-        cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage)
+        cardLoader(data, builder, mapping, values, seoPaginate, pageview, router, currentPage, setCurrentPage, showPublished, defaultImage)
       ),
       React__default.createElement(
         'div',
@@ -7103,7 +7134,7 @@ var NavMagazine = function NavMagazine(props) {
             Nav,
             { className: 'mr-auto' },
             dataObject && dataObject.map(function (row, index) {
-              if (row.subQuery.length > 1) {
+              if (row.subQuery && row.subQuery.length > 0) {
                 return React__default.createElement(
                   NavDropdown,
                   { key: index, title: row.name, id: 'basic-nav-dropdown' },
@@ -8424,13 +8455,13 @@ var FigureComponent = function FigureComponent(_ref) {
   var imgFloat = alignment.toLowerCase() === 'center' ? 'none' : alignment.toLowerCase();
   var figureMargin = void 0;
   if (imgFloat === 'none') {
-    figureMargin = '0 auto 2rem';
+    figureMargin = '0 auto 1rem';
   }
   if (imgFloat === 'left') {
-    figureMargin = '0 2rem 2rem 0';
+    figureMargin = '0 1rem 1rem 10%';
   }
   if (imgFloat === 'right') {
-    figureMargin = '0 0 2rem 2rem';
+    figureMargin = '0 10% 1rem 1rem';
   }
   return React__default.createElement(
     Figure,
@@ -12040,13 +12071,13 @@ var Sidebar = function Sidebar(_ref) {
       content = _ref.content;
 
   return React__default.createElement(
-    Card$1,
-    { className: 'sidebar' },
+    'article',
+    { className: 'sidebar', style: { background: '#eee', marginRight: '10%', marginLeft: '1rem', width: '40%', padding: '1rem 0 0' } },
     React__default.createElement(
-      Card$1.Body,
+      'div',
       null,
       React__default.createElement(
-        Card$1.Title,
+        'h3',
         null,
         caption
       ),
@@ -12146,6 +12177,27 @@ var IFrame = function IFrame(_ref) {
   );
 };
 
+var Audio = function Audio(_ref) {
+  var node = _ref.node;
+
+  return React__default.createElement(
+    'div',
+    { className: 'd-block text-center mb-3' },
+    React__default.createElement(
+      'audio',
+      { controls: true },
+      React__default.createElement('source', { src: node.uploadAudio ? node.uploadAudio.asset.url : node.audioFilePth, type: 'audio/ogg' }),
+      React__default.createElement('source', { src: node.uploadAudio ? node.uploadAudio.asset.url : node.audioFilePth, type: 'audio/mpeg' }),
+      'Your browser does not support the audio element.'
+    ),
+    node.caption && React__default.createElement(
+      'p',
+      null,
+      node.caption
+    )
+  );
+};
+
 var YouTubeGallery = function YouTubeGallery(_ref) {
   var nodes = _ref.nodes,
       client = _ref.client;
@@ -12369,6 +12421,11 @@ var getSerializers$1 = function getSerializers(client, pageview) {
         var node = _ref8.node;
 
         return React__default.createElement(IFrame, { url: node.url });
+      },
+      audio: function audio(_ref9) {
+        var node = _ref9.node;
+
+        return React__default.createElement(Audio, { node: node });
       }
     },
     marks: {
@@ -12455,5 +12512,5 @@ var Feature = function Feature(props) {
   );
 };
 
-export { ContentCard as DeckContent, GridContent, DeckQueue, ThumbnailCard, TaxonomyCard, GroupDeck, YoutubeGroup, QueueDeckExpanded, Column1, Column2, Column3, Header, LeftNav, AccordionPanel, SocialShare, NavMagazine, NavNative, NavNormal, NavDvm, TemplateNormal, AD300x250, AD300x250x600, AD728x90, getSerializers$1 as getSerializers, Search, Feature };
+export { ContentCard as DeckContent, GridContent$1 as GridContent, DeckQueue, ThumbnailCard, TaxonomyCard, GroupDeck, YoutubeGroup, QueueDeckExpanded, Column1, Column2, Column3, Header, LeftNav, AccordionPanel, SocialShare, NavMagazine, NavNative, NavNormal, NavDvm, TemplateNormal, AD300x250, AD300x250x600, AD728x90, getSerializers$1 as getSerializers, Search, Feature };
 //# sourceMappingURL=index.es.js.map