@mjhls/mjh-framework 1.0.301 → 1.0.303

package/README.md

@@ -1,5 +1,5 @@
 
-# mjh-framework v. 1.0.301
+# mjh-framework v. 1.0.303
 
 > Foundation Framework
 

package/dist/cjs/index.js

@@ -2033,20 +2033,20 @@ var EventsDeck = function EventsDeck(_ref) {
 
         var now = momentTimezone$1().tz(timezone);
         var isRegister = momentTimezone$1(now).isBefore(end);
-        var discussionTopic = row.customFields.reduce(function (result, item) {
+        var discussionTopic = row.customFields ? row.customFields.reduce(function (result, item) {
           if (item.name === 'Discussion Topic' && item.value) {
             result = item.value[0];
             return result;
           }
           return result;
-        }, '');
-        var eventRegion = row.customFields.reduce(function (result, item) {
+        }, '') : row.title;
+        var eventRegion = row.customFields ? row.customFields.reduce(function (result, item) {
           if (item.name === 'Event Region' && item.value) {
             result = item.value[0];
             return result;
           }
           return result;
-        }, '');
+        }, '') : '';
 
         var pageNumber = row.pageNumber || 1;
         return React__default.createElement(
@@ -2090,12 +2090,7 @@ var EventsDeck = function EventsDeck(_ref) {
                 React__default.createElement(
                   Col,
                   { xs: 12, sm: 5 },
-                  React__default.createElement('h6', { className: 'mb-1', dangerouslySetInnerHTML: { __html: discussionTopic } }),
-                  virtual && React__default.createElement(
-                    'h5',
-                    null,
-                    'VIRTUAL MEETING'
-                  )
+                  React__default.createElement('h6', { className: 'mb-1', dangerouslySetInnerHTML: { __html: discussionTopic } })
                 ),
                 React__default.createElement(
                   Col,
@@ -16953,9 +16948,9 @@ var LoginForm = function LoginForm(props) {
                 break;
               }
 
-              // here, Router.push() does not carry new cookie value. 
+              // here, Router.push() does not carry new cookie value.
               // so need hard redirect
-              window.location.href = '/';
+              window.location.href = callbackUrl;
               _context.next = 18;
               break;
 
@@ -16991,6 +16986,10 @@ var LoginForm = function LoginForm(props) {
     };
   }();
 
+  var _props$callbackUrl = props.callbackUrl,
+      callbackUrl = _props$callbackUrl === undefined ? '/' : _props$callbackUrl;
+
+
   React.useEffect(function () {
     if (props.user) {
       window.location.href = '/auth/profile';
@@ -17043,13 +17042,7 @@ var LoginForm = function LoginForm(props) {
         loading && React__default.createElement(
           reactBootstrap.Button,
           { variant: 'primary', disabled: true },
-          React__default.createElement(reactBootstrap.Spinner, {
-            as: 'span',
-            animation: 'border',
-            role: 'status',
-            'aria-hidden': 'true',
-            size: 'sm'
-          }),
+          React__default.createElement(reactBootstrap.Spinner, { as: 'span', animation: 'border', role: 'status', 'aria-hidden': 'true', size: 'sm' }),
           React__default.createElement(
             'span',
             { className: 'sr-only' },
@@ -17066,7 +17059,7 @@ var LoginForm = function LoginForm(props) {
     React__default.createElement(
       'style',
       { jsx: 'true'.toString() },
-      ' \n        .login {\n          margin: 0 auto;\n          padding: 1rem;\n          border: 1px solid #ccc;\n          border-radius: 4px;\n        }\n        .error {\n          color: red;\n          margin: 1rem 0 0;\n        }\n      '
+      '\n        .login {\n          margin: 0 auto;\n          padding: 1rem;\n          border: 1px solid #ccc;\n          border-radius: 4px;\n        }\n        .error {\n          color: red;\n          margin: 1rem 0 0;\n        }\n      '
     )
   );
 };

package/dist/esm/index.js

@@ -2031,20 +2031,20 @@ var EventsDeck = function EventsDeck(_ref) {
 
         var now = momentTimezone$1().tz(timezone);
         var isRegister = momentTimezone$1(now).isBefore(end);
-        var discussionTopic = row.customFields.reduce(function (result, item) {
+        var discussionTopic = row.customFields ? row.customFields.reduce(function (result, item) {
           if (item.name === 'Discussion Topic' && item.value) {
             result = item.value[0];
             return result;
           }
           return result;
-        }, '');
-        var eventRegion = row.customFields.reduce(function (result, item) {
+        }, '') : row.title;
+        var eventRegion = row.customFields ? row.customFields.reduce(function (result, item) {
           if (item.name === 'Event Region' && item.value) {
             result = item.value[0];
             return result;
           }
           return result;
-        }, '');
+        }, '') : '';
 
         var pageNumber = row.pageNumber || 1;
         return React__default.createElement(
@@ -2088,12 +2088,7 @@ var EventsDeck = function EventsDeck(_ref) {
                 React__default.createElement(
                   Col,
                   { xs: 12, sm: 5 },
-                  React__default.createElement('h6', { className: 'mb-1', dangerouslySetInnerHTML: { __html: discussionTopic } }),
-                  virtual && React__default.createElement(
-                    'h5',
-                    null,
-                    'VIRTUAL MEETING'
-                  )
+                  React__default.createElement('h6', { className: 'mb-1', dangerouslySetInnerHTML: { __html: discussionTopic } })
                 ),
                 React__default.createElement(
                   Col,
@@ -16951,9 +16946,9 @@ var LoginForm = function LoginForm(props) {
                 break;
               }
 
-              // here, Router.push() does not carry new cookie value. 
+              // here, Router.push() does not carry new cookie value.
               // so need hard redirect
-              window.location.href = '/';
+              window.location.href = callbackUrl;
               _context.next = 18;
               break;
 
@@ -16989,6 +16984,10 @@ var LoginForm = function LoginForm(props) {
     };
   }();
 
+  var _props$callbackUrl = props.callbackUrl,
+      callbackUrl = _props$callbackUrl === undefined ? '/' : _props$callbackUrl;
+
+
   useEffect(function () {
     if (props.user) {
       window.location.href = '/auth/profile';
@@ -17041,13 +17040,7 @@ var LoginForm = function LoginForm(props) {
         loading && React__default.createElement(
           Button$1,
           { variant: 'primary', disabled: true },
-          React__default.createElement(Spinner$1, {
-            as: 'span',
-            animation: 'border',
-            role: 'status',
-            'aria-hidden': 'true',
-            size: 'sm'
-          }),
+          React__default.createElement(Spinner$1, { as: 'span', animation: 'border', role: 'status', 'aria-hidden': 'true', size: 'sm' }),
           React__default.createElement(
             'span',
             { className: 'sr-only' },
@@ -17064,7 +17057,7 @@ var LoginForm = function LoginForm(props) {
     React__default.createElement(
       'style',
       { jsx: 'true'.toString() },
-      ' \n        .login {\n          margin: 0 auto;\n          padding: 1rem;\n          border: 1px solid #ccc;\n          border-radius: 4px;\n        }\n        .error {\n          color: red;\n          margin: 1rem 0 0;\n        }\n      '
+      '\n        .login {\n          margin: 0 auto;\n          padding: 1rem;\n          border: 1px solid #ccc;\n          border-radius: 4px;\n        }\n        .error {\n          color: red;\n          margin: 1rem 0 0;\n        }\n      '
     )
   );
 };

package/package.json

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