@mjhls/mjh-framework 1.0.351 → 1.0.353

package/dist/cjs/index.js

@@ -1800,20 +1800,13 @@ var clientId = process.env.CVENT_CLIENT_ID;
 var clientSecret = process.env.CVENT_CLIENT_SECRET;
 var corsProxy = 'https://cors-anywhere.herokuapp.com/';
 var currentTime = momentTimezone$1().toISOString();
-var itemsPerPage = 10;
+var itemsPerPage = 200;
 
 var EventsDeck = function EventsDeck(_ref) {
-  var _ref$autoScroll = _ref.autoScroll,
-      autoScroll = _ref$autoScroll === undefined ? true : _ref$autoScroll,
-      rightItems = _ref.rightItems,
-      _ref$seoPaginate = _ref.seoPaginate,
-      seoPaginate = _ref$seoPaginate === undefined ? true : _ref$seoPaginate,
-      pageview = _ref.pageview,
+  var rightItems = _ref.rightItems,
       _ref$filter = _ref.filter,
       filter = _ref$filter === undefined ? 'start gt \'' + currentTime + '\' and status eq \'Active\'' : _ref$filter;
 
-  var router = Router.useRouter();
-
   var _useState = React.useState(true),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
       isLoading = _useState2[0],
@@ -1839,16 +1832,7 @@ var EventsDeck = function EventsDeck(_ref) {
       scrolling = _useState10[0],
       setScrolling = _useState10[1];
 
-  var _useState11 = React.useState(1),
-      _useState12 = slicedToArray._slicedToArray(_useState11, 2),
-      currentPage = _useState12[0],
-      setCurrentPage = _useState12[1];
-
-  var currentPageRef = React.useRef(currentPage);
-
-  var getEvents = function getEvents(params) {
-    var url = params.url;
-
+  var getEvents = function getEvents(url) {
     fetch(url, {
       headers: {
         Accept: 'application/json',
@@ -1863,43 +1847,49 @@ var EventsDeck = function EventsDeck(_ref) {
     }).then(function (events) {
       setIsLoading(false);
       if (events.data && events.data.length > 0) {
-        var newData = events.data.map(function (item) {
-          return _extends$2._extends({}, item, {
-            pageNumber: currentPage
-          });
+        var filteredEventsByTestMode = events.data.filter(function (event) {
+          return event.testMode === false;
+        });
+        var sortedEventsByStartData = filteredEventsByTestMode.sort(function (a, b) {
+          if (momentTimezone$1(a.start).isAfter(b.start)) {
+            return 1;
+          } else if (momentTimezone$1(a.start).isBefore(b.start)) {
+            return -1;
+          }
+          return 0;
         });
         setData(function (prevData) {
-          return [].concat(toConsumableArray._toConsumableArray(prevData), toConsumableArray._toConsumableArray(newData));
+          return [].concat(toConsumableArray._toConsumableArray(prevData), toConsumableArray._toConsumableArray(sortedEventsByStartData));
         });
         setNextPageLink(events.paging._links.next ? events.paging._links.next.href : null);
-        newData.length === itemsPerPage ? setScrolling(true) : setScrolling(false);
+        setScrolling(events.paging._links.next ? true : false);
       } else {
         setScrolling(false);
       }
+    }).catch(function (e) {
+      console.error(e);
     });
   };
 
   React.useEffect(function () {
     // load initial data
-    if (accessToken && currentPage === 1) {
+    if (accessToken) {
       var initailUrl = 'https://api-platform.cvent.com/event/v1/events/filter?limit=' + itemsPerPage;
-      getEvents({ url: initailUrl });
+      getEvents(initailUrl);
     }
-  }, [accessToken, currentPage, filter]);
+  }, [accessToken, filter]);
 
-  React.useEffect(function () {
+  var loadMore = function loadMore() {
     // load more events
-    if (accessToken && nextPageLink && currentPage !== 1 && currentPage !== currentPageRef.current) {
-      getEvents({ url: nextPageLink });
+    if (accessToken && nextPageLink) {
+      getEvents(nextPageLink);
     }
-  }, [currentPage]);
+  };
 
   React.useEffect(function () {
     // reset state when filter changes
     setIsLoading(true);
     setData([]);
-    setCurrentPage(1);
-    currentPageRef.current = 1;
   }, [filter]);
 
   React.useEffect(function () {
@@ -1929,63 +1919,7 @@ var EventsDeck = function EventsDeck(_ref) {
     }
   }, []);
 
-  var loadMore = debounce.debounce_1(function () {
-    setCurrentPage(function (prevCurrentPage) {
-      return prevCurrentPage + 1;
-    });
-  }, 0);
-
-  var changePageNumber = function changePageNumber(pageNumber) {
-    if (seoPaginate) {
-      var path = router.asPath;
-      var qrIndex = path.indexOf('?');
-      var pathname = router.pathname;
-      var queryString = '';
-      if (qrIndex > 0) {
-        path = path.substring(1, qrIndex);
-
-        var partialQS = router.asPath.substring(qrIndex + 1);
-        var partialQSArr = partialQS.split('&');
-
-        // exclude page=xxx from query string
-        partialQSArr.map(function (item) {
-          var itemArr = item.split('=');
-          var key = itemArr[0];
-          var val = itemArr[1];
-
-          if (key !== 'page') {
-            queryString += (queryString.length === 0 ? '' : '&') + key + '=' + val;
-          }
-        });
-      }
-
-      if (queryString.length > 0) {
-        path += '?' + queryString;
-      }
-
-      pageNumber = parseInt(pageNumber);
-
-      if (pageNumber !== currentPageRef.current) {
-        debounce.lib_3.refresh();
-
-        currentPageRef.current = pageNumber;
-        if (path[0] !== '/') {
-          path = '/' + path;
-        }
-        var newPath = pageNumber === 1 ? '' + path : path + '?page=' + pageNumber;
-
-        if (pageview) {
-          pageview(newPath);
-        }
-
-        router.push(pathname, newPath, {
-          shallow: true
-        });
-      }
-    }
-  };
-
-  var renderRegisterButton = function renderRegisterButton(links, closeAfter, timezone) {
+  var renderRegisterButton = function renderRegisterButton(links) {
     return React__default.createElement(
       'a',
       { href: links.summary.href || '#', target: '_blank' },
@@ -1995,33 +1929,13 @@ var EventsDeck = function EventsDeck(_ref) {
         'Register Now'
       )
     );
-    // const now = moment().tz(timezone)
-    // closeAfter = moment(closeAfter).tz(timezone)
-    // const isRegister = moment(now).isBefore(closeAfter)
-    // if (isRegister) {
-    //   return (
-    //     <a href={links.registration.href || '#'} target='_blank'>
-    //       <Button size='sm' className='event-registration-button'>
-    //         Register Now
-    //       </Button>
-    //     </a>
-    //   )
-    // } else {
-    //   return (
-    //     <a href={links.summary.href || '#'} target='_blank'>
-    //       <Button size='sm' className='event-registration-button'>
-    //         Learn more
-    //       </Button>
-    //     </a>
-    //   )
-    // }
   };
 
   var cardLoader = function cardLoader() {
     var numberOfItemsBeforeAd = 5;
     return React__default.createElement(
-      React__default.Fragment,
-      null,
+      Container,
+      { style: { padding: 1 } },
       data && data.map(function (row, index) {
         var speakerInfo = [];
         if (row.customFields) {
@@ -2055,105 +1969,97 @@ var EventsDeck = function EventsDeck(_ref) {
           return result;
         }, '') : '';
 
-        var pageNumber = row.pageNumber || 1;
         return React__default.createElement(
           React__default.Fragment,
           { key: index },
           React__default.createElement(
-            visibilitySensor.VisibilitySensor,
-            {
-              onChange: function onChange(isVisible) {
-                isVisible && changePageNumber(pageNumber);
-              } },
-            React__default.createElement(
-              Card,
+            Card,
+            null,
+            isRegister && _links && React__default.createElement(
+              Row,
               null,
-              isRegister && _links && React__default.createElement(
-                Row,
+              React__default.createElement(
+                Col,
                 null,
-                React__default.createElement(
-                  Col,
-                  null,
-                  renderRegisterButton(_links)
-                )
-              ),
-              discussionTopic && React__default.createElement(
-                Row,
+                renderRegisterButton(_links)
+              )
+            ),
+            discussionTopic && React__default.createElement(
+              Row,
+              null,
+              React__default.createElement(
+                Col,
                 null,
-                React__default.createElement(
-                  Col,
-                  null,
-                  React__default.createElement('h5', { className: 'topic', style: { fontWeight: '500', marginBottom: 0 }, dangerouslySetInnerHTML: { __html: discussionTopic } })
-                )
-              ),
-              start && timezone && React__default.createElement(
-                Row,
+                React__default.createElement('h5', { className: 'topic', style: { fontWeight: '500', marginBottom: 0 }, dangerouslySetInnerHTML: { __html: discussionTopic } })
+              )
+            ),
+            start && timezone && React__default.createElement(
+              Row,
+              null,
+              React__default.createElement(
+                Col,
                 null,
                 React__default.createElement(
-                  Col,
-                  null,
-                  React__default.createElement(
-                    'p',
-                    { className: 'start-time', style: { padding: 0, margin: 0 } },
-                    momentTimezone$1(start).tz(timezone).format('LLL')
-                  )
+                  'p',
+                  { className: 'start-time', style: { padding: 0, margin: 0 } },
+                  momentTimezone$1(start).tz(timezone).format('LLL')
                 )
-              ),
-              eventRegion && React__default.createElement(
-                Row,
+              )
+            ),
+            eventRegion && React__default.createElement(
+              Row,
+              null,
+              React__default.createElement(
+                Col,
                 null,
                 React__default.createElement(
-                  Col,
-                  null,
-                  React__default.createElement(
-                    'p',
-                    { className: 'event-region', style: { padding: 0, margin: 0 } },
-                    eventRegion
-                  )
+                  'p',
+                  { className: 'event-region', style: { padding: 0, margin: 0 } },
+                  eventRegion
                 )
-              ),
-              venues && venues.length && venues[0].name && React__default.createElement(
-                Row,
+              )
+            ),
+            venues && venues.length && venues[0].name && React__default.createElement(
+              Row,
+              null,
+              React__default.createElement(
+                Col,
                 null,
                 React__default.createElement(
-                  Col,
-                  null,
-                  React__default.createElement(
-                    'p',
-                    { className: 'venue', style: { padding: 0, margin: 0 } },
-                    venues[0].name
-                  )
+                  'p',
+                  { className: 'venue', style: { padding: 0, margin: 0 } },
+                  venues[0].name
                 )
-              ),
-              speakerInfo && speakerInfo.length && React__default.createElement(
-                Row,
+              )
+            ),
+            speakerInfo && speakerInfo.length && React__default.createElement(
+              Row,
+              null,
+              React__default.createElement(
+                Col,
                 null,
                 React__default.createElement(
-                  Col,
-                  null,
+                  'div',
+                  { className: 'speaker-section', style: { border: '1px solid', borderRadius: '8px', padding: '8px' } },
                   React__default.createElement(
-                    'div',
-                    { className: 'speaker-section', style: { border: '1px solid', borderRadius: '8px', padding: '8px' } },
-                    React__default.createElement(
-                      'h6',
-                      { className: 'speaker-title', style: { fontWeight: '600', marginBottom: '0', marginTop: '.25rem;' } },
-                      'SPEAKER'
-                    ),
-                    speakerInfo.map(function (info) {
-                      return React__default.createElement(
-                        'p',
-                        { style: { marginBottom: '0' } },
-                        info.value.map(function (speaker, index) {
-                          return React__default.createElement(
-                            'span',
-                            { key: index, className: 'kol-speaker' },
-                            speaker,
-                            info.value.length > index + 1 ? ', ' : ''
-                          );
-                        })
-                      );
-                    })
-                  )
+                    'h6',
+                    { className: 'speaker-title', style: { fontWeight: '600', marginBottom: '0', marginTop: '.25rem' } },
+                    'SPEAKER'
+                  ),
+                  speakerInfo.map(function (info, index) {
+                    return React__default.createElement(
+                      'p',
+                      { key: index, style: { marginBottom: '0' } },
+                      info.value.map(function (speaker, index) {
+                        return React__default.createElement(
+                          'b',
+                          { key: index, className: 'kol-speaker' },
+                          speaker,
+                          info.value.length > index + 1 ? ', ' : ''
+                        );
+                      })
+                    );
+                  })
                 )
               )
             )
@@ -2182,20 +2088,6 @@ var EventsDeck = function EventsDeck(_ref) {
     );
   };
 
-  var renderManualPagination = function renderManualPagination() {
-    var currentPage = 1;
-    return React__default.createElement(
-      'div',
-      { className: 'd-flex justify-content-between' },
-       currentPage > 1 ,
-      React__default.createElement(
-        'a',
-        { href: '?page=' + (currentPage + 1) },
-        'Next >>'
-      )
-    );
-  };
-
   if (isLoading) {
     return React__default.createElement(
       'div',
@@ -2218,57 +2110,10 @@ var EventsDeck = function EventsDeck(_ref) {
     return React__default.createElement(
       'div',
       { className: 'cvent-events' },
-      autoScroll ? React__default.createElement(
-        React__default.Fragment,
-        null,
-        React__default.createElement(
-          visibilitySensor.InfiniteScroll,
-          { dataLength: data.length, next: loadMore, hasMore: scrolling, scrollThreshold: 0.9 },
-          React__default.createElement(
-            Container,
-            null,
-            cardLoader()
-          )
-        ),
-        React__default.createElement(
-          'noscript',
-          null,
-          renderManualPagination()
-        )
-      ) : React__default.createElement(
-        React__default.Fragment,
-        null,
-        React__default.createElement(
-          Container,
-          null,
-          cardLoader()
-        ),
-        React__default.createElement(
-          'div',
-          { style: { padding: '0px 10px' } },
-          scrolling ? React__default.createElement(
-            'button',
-            {
-              style: { margin: 'auto', width: '100%' },
-              onClick: function onClick(e) {
-                loadMore();
-              } },
-            'Load More'
-          ) : React__default.createElement(
-            'p',
-            { style: { textAlign: 'center' } },
-            React__default.createElement(
-              'b',
-              null,
-              'End of data'
-            )
-          )
-        ),
-        React__default.createElement(
-          'noscript',
-          null,
-          renderManualPagination()
-        )
+      React__default.createElement(
+        visibilitySensor.InfiniteScroll,
+        { dataLength: data.length, next: loadMore, hasMore: scrolling, scrollThreshold: 0.9 },
+        cardLoader()
       )
     );
   } else {
@@ -16713,6 +16558,7 @@ var Article = function Article(props) {
         );
       }
     }),
+    React__default.createElement('div', { className: 'clearfix', style: { minHeight: '1px' } }),
     React__default.createElement('hr', { className: 'article-seperater' })
   );
 };
@@ -16932,7 +16778,7 @@ var ArticleQueue = function ArticleQueue(props) {
 
   return React__default.createElement(
     visibilitySensor.InfiniteScroll,
-    { dataLength: queueData.length, next: loadmore, scrollThreshold: '60%', hasMore: true },
+    { dataLength: queueData.length, next: loadmore, scrollThreshold: '60%', hasMore: true, style: { overflow: 'hidden' } },
     queueData.map(function (article, index) {
       if (!checkSponseredArticle(article) && Ads.getNativeContextualAD) {
         article.contextualAD = Ads.getNativeContextualAD(getTargeting(article, 'native-ad'));

package/dist/esm/IssueContentDeck.js

@@ -48,61 +48,65 @@ var PublicationDeckStack = function PublicationDeckStack(props) {
 
   return React__default.createElement(
     Col,
-    { md: 12, lg: 12, style: { display: 'flex', flex: '1 0 auto' }, key: index },
+    { md: 12, lg: 12, key: index },
     React__default.createElement(
       Card,
       { style: { boxShadow: 'none', borderBottom: '1px solid #aaa', paddingBottom: '1rem' } },
       React__default.createElement(
         'a',
         { href: '/view/' + link },
-        coverImage && React__default.createElement(
-          LazyLoad,
-          { height: imageHeight },
-          React__default.createElement(Card.Img, {
-            variant: 'right',
-            src: renderCardImage({ coverImage: coverImage, imageHeight: imageHeight, imageWidth: imageWidth, client: client, Settings: Settings }),
-            alt: title,
-            style: { width: '170px', height: 'auto', objectFit: 'contain', padding: '1rem', float: 'left', marginTop: '1rem', paddingBottom: '1rem' }
-          })
-        ),
         React__default.createElement(
-          Card.Body,
-          null,
-          section ? React__default.createElement(
-            Badge,
-            { variant: 'success' },
-            section.name
-          ) : '',
-          React__default.createElement(
-            Card.Title,
-            { style: { color: '#121212', fontSize: '1.1rem' } },
-            React__default.createElement(
-              'span',
-              null,
-              title
-            ),
-            React__default.createElement('br', null)
+          'div',
+          { style: { display: 'flex', flex: '1 0 auto' } },
+          coverImage && React__default.createElement(
+            LazyLoad,
+            { height: imageHeight },
+            React__default.createElement(Card.Img, {
+              variant: 'right',
+              src: renderCardImage({ coverImage: coverImage, imageHeight: imageHeight, imageWidth: imageWidth, client: client, Settings: Settings }),
+              alt: title,
+              style: { width: '170px', height: 'auto', objectFit: 'contain', padding: '0.25rem', float: 'left', paddingBottom: '1rem' }
+            })
           ),
           React__default.createElement(
-            'div',
-            { style: { float: 'left' } },
+            Card.Body,
+            { style: { padding: '0.5rem' } },
+            section ? React__default.createElement(
+              Badge,
+              { variant: 'success' },
+              section.name
+            ) : '',
             React__default.createElement(
-              'p',
-              { style: { color: '#484848', fontSize: '.9rem', fontWeight: '600' }, className: 'mb-0' },
-              moment(published).format('MMMM DD, YYYY ')
-            ),
-            author.length > 0 && React__default.createElement(
-              'p',
-              { style: { color: '#484848', fontSize: '.9rem', fontWeight: '600' }, className: 'mb-0' },
-              'By ',
-              author
+              Card.Title,
+              { style: { color: '#121212', fontSize: '1.1rem' } },
+              React__default.createElement(
+                'span',
+                null,
+                title
+              ),
+              React__default.createElement('br', null)
             ),
             React__default.createElement(
-              'p',
-              null,
-              summary
+              'div',
+              { style: { float: 'left' } },
+              React__default.createElement(
+                'p',
+                { style: { color: '#484848', fontSize: '.9rem', fontWeight: '600' }, className: 'mb-0' },
+                moment(published).format('MMMM DD, YYYY ')
+              ),
+              author.length > 0 && React__default.createElement(
+                'p',
+                { style: { color: '#484848', fontSize: '.9rem', fontWeight: '600' }, className: 'mb-0' },
+                'By ',
+                author
+              )
             )
           )
+        ),
+        React__default.createElement(
+          'p',
+          { style: { paddingLeft: '0.5rem' } },
+          summary
         )
       )
     )