@mjhls/mjh-framework 1.0.367 → 1.0.368

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.367
+# mjh-framework v. 1.0.368
 
 
 > Foundation Framework

package/dist/cjs/index.js

@@ -2430,7 +2430,9 @@ var itemsPerPage = 200;
 var EventsDeck = function EventsDeck(_ref) {
   var rightItems = _ref.rightItems,
       _ref$filter = _ref.filter,
-      filter = _ref$filter === undefined ? 'start gt \'' + currentTime + '\' and status eq \'Active\'' : _ref$filter;
+      filter = _ref$filter === undefined ? 'start gt \'' + currentTime + '\' and status eq \'Active\'' : _ref$filter,
+      _ref$hardCodedEvents = _ref.hardCodedEvents,
+      hardCodedEvents = _ref$hardCodedEvents === undefined ? null : _ref$hardCodedEvents;
 
   var _useState = React.useState(true),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
@@ -2471,11 +2473,31 @@ var EventsDeck = function EventsDeck(_ref) {
       return response.json();
     }).then(function (events) {
       setIsLoading(false);
+
+      if (hardCodedEvents) {
+        var temp = [].concat(toConsumableArray._toConsumableArray(events.data));
+        if (filter.indexOf('start') >= 0 && hardCodedEvents.upcomingEvents.length > 0) {
+          for (var event in hardCodedEvents.upcomingEvents) {
+            temp.push(hardCodedEvents.upcomingEvents[event]);
+          }
+        }
+        if (filter.indexOf('end') >= 0 && hardCodedEvents.pastEvents.length > 0) {
+          for (var _event in hardCodedEvents.pastEvents) {
+            temp.push(hardCodedEvents.pastEvents[_event]);
+          }
+        }
+        events.data = temp;
+      }
+
       if (events.data && events.data.length > 0) {
         var filteredEventsByTestMode = events.data.filter(function (event) {
           return event.testMode === false;
         });
         var sortedEventsByStartData = filteredEventsByTestMode.sort(function (a, b) {
+          console.log(a.start);
+          if (a.start.indexOf('TBD') >= 0 || b.start.indexOf('TBD') >= 0) {
+            return -1;
+          }
           if (momentTimezone$1(a.start).isAfter(b.start)) {
             return 1;
           } else if (momentTimezone$1(a.start).isBefore(b.start)) {
@@ -2546,10 +2568,10 @@ var EventsDeck = function EventsDeck(_ref) {
       fetch(url, {
         headers: {
           'Content-Type': 'application/json',
-          'Accept': 'application/json'
+          Accept: 'application/json'
         },
         method: 'post',
-        credentials: "include",
+        credentials: 'include',
         body: AdSlot._JSON$stringify({
           clientId: clientId,
           clientSecret: clientSecret
@@ -2577,6 +2599,17 @@ var EventsDeck = function EventsDeck(_ref) {
       )
     );
   };
+  var renderLearnMoreButton = function renderLearnMoreButton(links) {
+    return React__default.createElement(
+      'a',
+      { href: links.summary.href || '#', target: '_blank' },
+      React__default.createElement(
+        Button,
+        { size: 'sm', className: 'registration-button', style: { borderRadius: '8px' } },
+        'Learn More'
+      )
+    );
+  };
 
   var cardLoader = function cardLoader() {
     var numberOfItemsBeforeAd = 5;
@@ -2593,7 +2626,7 @@ var EventsDeck = function EventsDeck(_ref) {
             }
           });
         }
-
+        var isHardcoded = row.hardCoded;
         var start = row.start,
             end = row.end,
             venues = row.venues,
@@ -2616,14 +2649,24 @@ var EventsDeck = function EventsDeck(_ref) {
           }
           return result;
         }, '') : '';
-
+        var startDay = momentTimezone$1(start).tz(timezone).format();
+        var endDay = momentTimezone$1(end).tz(timezone).format();
+        var showEndTime = momentTimezone$1(startDay.split('T')[0]).isBefore(endDay.split('T')[0]) ? ' to ' + momentTimezone$1(end).tz(timezone).format('LLL zz') : null;
         return React__default.createElement(
           React__default.Fragment,
           { key: index },
           React__default.createElement(
             Card,
             null,
-            isRegister && _links && React__default.createElement(
+            isHardcoded ? _links && React__default.createElement(
+              Row,
+              null,
+              React__default.createElement(
+                Col,
+                null,
+                renderLearnMoreButton(_links)
+              )
+            ) : isRegister && _links && React__default.createElement(
               Row,
               null,
               React__default.createElement(
@@ -2647,10 +2690,15 @@ var EventsDeck = function EventsDeck(_ref) {
               React__default.createElement(
                 Col,
                 null,
-                React__default.createElement(
+                start.indexOf('TBD') >= 0 ? React__default.createElement(
+                  'p',
+                  { className: 'start-time', style: { padding: 0, margin: 0 } },
+                  start
+                ) : React__default.createElement(
                   'p',
                   { className: 'start-time', style: { padding: 0, margin: 0 } },
-                  momentTimezone$1(start).tz(timezone).format('LLL')
+                  start.indexOf('T') >= 0 ? momentTimezone$1(start).tz(timezone).format('LLL zz') : momentTimezone$1(start).format('LL'),
+                  showEndTime
                 )
               )
             ),

package/dist/esm/index.js

@@ -2427,7 +2427,9 @@ var itemsPerPage = 200;
 var EventsDeck = function EventsDeck(_ref) {
   var rightItems = _ref.rightItems,
       _ref$filter = _ref.filter,
-      filter = _ref$filter === undefined ? 'start gt \'' + currentTime + '\' and status eq \'Active\'' : _ref$filter;
+      filter = _ref$filter === undefined ? 'start gt \'' + currentTime + '\' and status eq \'Active\'' : _ref$filter,
+      _ref$hardCodedEvents = _ref.hardCodedEvents,
+      hardCodedEvents = _ref$hardCodedEvents === undefined ? null : _ref$hardCodedEvents;
 
   var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
@@ -2468,11 +2470,31 @@ var EventsDeck = function EventsDeck(_ref) {
       return response.json();
     }).then(function (events) {
       setIsLoading(false);
+
+      if (hardCodedEvents) {
+        var temp = [].concat(_toConsumableArray(events.data));
+        if (filter.indexOf('start') >= 0 && hardCodedEvents.upcomingEvents.length > 0) {
+          for (var event in hardCodedEvents.upcomingEvents) {
+            temp.push(hardCodedEvents.upcomingEvents[event]);
+          }
+        }
+        if (filter.indexOf('end') >= 0 && hardCodedEvents.pastEvents.length > 0) {
+          for (var _event in hardCodedEvents.pastEvents) {
+            temp.push(hardCodedEvents.pastEvents[_event]);
+          }
+        }
+        events.data = temp;
+      }
+
       if (events.data && events.data.length > 0) {
         var filteredEventsByTestMode = events.data.filter(function (event) {
           return event.testMode === false;
         });
         var sortedEventsByStartData = filteredEventsByTestMode.sort(function (a, b) {
+          console.log(a.start);
+          if (a.start.indexOf('TBD') >= 0 || b.start.indexOf('TBD') >= 0) {
+            return -1;
+          }
           if (momentTimezone$1(a.start).isAfter(b.start)) {
             return 1;
           } else if (momentTimezone$1(a.start).isBefore(b.start)) {
@@ -2543,10 +2565,10 @@ var EventsDeck = function EventsDeck(_ref) {
       fetch(url, {
         headers: {
           'Content-Type': 'application/json',
-          'Accept': 'application/json'
+          Accept: 'application/json'
         },
         method: 'post',
-        credentials: "include",
+        credentials: 'include',
         body: _JSON$stringify({
           clientId: clientId,
           clientSecret: clientSecret
@@ -2574,6 +2596,17 @@ var EventsDeck = function EventsDeck(_ref) {
       )
     );
   };
+  var renderLearnMoreButton = function renderLearnMoreButton(links) {
+    return React__default.createElement(
+      'a',
+      { href: links.summary.href || '#', target: '_blank' },
+      React__default.createElement(
+        Button,
+        { size: 'sm', className: 'registration-button', style: { borderRadius: '8px' } },
+        'Learn More'
+      )
+    );
+  };
 
   var cardLoader = function cardLoader() {
     var numberOfItemsBeforeAd = 5;
@@ -2590,7 +2623,7 @@ var EventsDeck = function EventsDeck(_ref) {
             }
           });
         }
-
+        var isHardcoded = row.hardCoded;
         var start = row.start,
             end = row.end,
             venues = row.venues,
@@ -2613,14 +2646,24 @@ var EventsDeck = function EventsDeck(_ref) {
           }
           return result;
         }, '') : '';
-
+        var startDay = momentTimezone$1(start).tz(timezone).format();
+        var endDay = momentTimezone$1(end).tz(timezone).format();
+        var showEndTime = momentTimezone$1(startDay.split('T')[0]).isBefore(endDay.split('T')[0]) ? ' to ' + momentTimezone$1(end).tz(timezone).format('LLL zz') : null;
         return React__default.createElement(
           React__default.Fragment,
           { key: index },
           React__default.createElement(
             Card,
             null,
-            isRegister && _links && React__default.createElement(
+            isHardcoded ? _links && React__default.createElement(
+              Row,
+              null,
+              React__default.createElement(
+                Col,
+                null,
+                renderLearnMoreButton(_links)
+              )
+            ) : isRegister && _links && React__default.createElement(
               Row,
               null,
               React__default.createElement(
@@ -2644,10 +2687,15 @@ var EventsDeck = function EventsDeck(_ref) {
               React__default.createElement(
                 Col,
                 null,
-                React__default.createElement(
+                start.indexOf('TBD') >= 0 ? React__default.createElement(
+                  'p',
+                  { className: 'start-time', style: { padding: 0, margin: 0 } },
+                  start
+                ) : React__default.createElement(
                   'p',
                   { className: 'start-time', style: { padding: 0, margin: 0 } },
-                  momentTimezone$1(start).tz(timezone).format('LLL')
+                  start.indexOf('T') >= 0 ? momentTimezone$1(start).tz(timezone).format('LLL zz') : momentTimezone$1(start).format('LL'),
+                  showEndTime
                 )
               )
             ),

package/package.json

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