@mjhls/mjh-framework 1.0.26 → 1.0.28

package/dist/index.js

@@ -701,7 +701,7 @@ var DeckContent = function (_React$Component) {
 
 
       return React__default.createElement(
-        'deck',
+        'div',
         { className: 'contentDeck' },
         autoScroll ? React__default.createElement(
           React__default.Fragment,
@@ -1092,6 +1092,13 @@ var LeftNav = function LeftNav(props) {
   var leftItems = props.leftItems;
 
 
+  var checkUrlIsExternal = function checkUrlIsExternal(url) {
+    if (/(http|https?)([^\s]+)/g.test(url)) {
+      return true;
+    }
+    return false;
+  };
+
   return React__default.createElement(
     'section',
     null,
@@ -1102,7 +1109,7 @@ var LeftNav = function LeftNav(props) {
         row.subQuery && row.subQuery.map(function (subRow, subIndex) {
           if (subIndex === 0) {
             return React__default.createElement(
-              'enclosed',
+              React__default.Fragment,
               { key: subIndex },
               React__default.createElement(
                 ListGroup.Item,
@@ -1125,12 +1132,16 @@ var LeftNav = function LeftNav(props) {
             );
           } else {
             return React__default.createElement(
-              'enclosed',
+              React__default.Fragment,
               { key: subIndex },
               React__default.createElement(
                 ListGroup.Item,
                 { as: 'li' },
-                React__default.createElement(
+                checkUrlIsExternal(subRow.url) ? React__default.createElement(
+                  'a',
+                  { target: '_blank', href: subRow.url },
+                  subRow.name
+                ) : React__default.createElement(
                   Link,
                   { href: subRow.url || '#' },
                   React__default.createElement(
@@ -1726,8 +1737,7 @@ var Search$1 = router.withRouter(Search);
 
 var NavDvm = function NavDvm(props) {
   var logo = props.logo,
-      dataObject = props.dataObject,
-      subNavHeads = props.subNavHeads;
+      dataObject = props.dataObject;
 
 
   return React__default.createElement(
@@ -1735,53 +1745,34 @@ var NavDvm = function NavDvm(props) {
     null,
     React__default.createElement(
       Navbar,
-      { expand: 'md', className: 'header-container', style: { background: '#151F5D' } },
+      { expand: 'md' },
       React__default.createElement(
         Container,
-        { className: 'd-flex px-0' },
+        null,
+        React__default.createElement(Nav, { className: 'justify-content-start leftHeader' }),
         React__default.createElement(
-          'div',
-          { className: 'd-flex' },
+          Nav,
+          { className: 'justify-content-center', style: { margin: '0 auto' } },
           React__default.createElement(
-            Link,
-            { href: '/' },
+            Nav.Item,
+            null,
             React__default.createElement(
-              'a',
-              null,
-              React__default.createElement('img', { src: logo, className: 'h-100', style: { width: '120px' } })
+              Link,
+              { href: '/' },
+              React__default.createElement(
+                'a',
+                null,
+                React__default.createElement('img', { src: logo, style: { height: '55px' } })
+              )
             )
-          ),
-          React__default.createElement(
-            'div',
-            { className: ' ml-4 d-flex align-items-center' },
-            React__default.createElement(Search$1, { btnText: 'Search' })
           )
         ),
-        React__default.createElement(
-          'div',
-          { className: 'login-right-wrapper w-50  my-3', style: { background: 'linear-gradient(to right,#104676,#01ABB5)' } },
-          React__default.createElement(
-            'div',
-            { className: 'row' },
-            subNavHeads && subNavHeads.map(function (item, index) {
-              return React__default.createElement(
-                'div',
-                { key: index, className: 'col-3 py-1', style: { fontSize: '12px' } },
-                React__default.createElement(
-                  'span',
-                  { style: { color: '#fff' } },
-                  item.name,
-                  ' '
-                )
-              );
-            })
-          )
-        )
+        React__default.createElement(Nav, { className: 'justify-content-end rightHeader' })
       )
     ),
     React__default.createElement(
       Navbar,
-      { variant: 'dark', className: 'dvm-nav p-0', style: { background: 'linear-gradient(to right,#FFB71C,#ED4303,#EB3300)' } },
+      { variant: 'dark', expand: 'lg', bg: 'primary' },
       React__default.createElement(
         Container,
         null,
@@ -1803,10 +1794,10 @@ var NavDvm = function NavDvm(props) {
                     } else {
                       return React__default.createElement(
                         Link,
-                        { href: ddRow.url },
+                        { key: subIndex, href: ddRow.url || '#' },
                         React__default.createElement(
                           'a',
-                          { key: subIndex, className: 'dropdown-item' },
+                          { className: 'dropdown-item' },
                           ddRow.name
                         )
                       );
@@ -1814,18 +1805,21 @@ var NavDvm = function NavDvm(props) {
                   })
                 );
               } else {
+                // Link default
+                // return <Nav.Link href={row.url} key={index}>{row.name}</Nav.Link>
                 return React__default.createElement(
                   Link,
-                  { href: row.url },
+                  { key: index, href: row.url },
                   React__default.createElement(
                     'a',
-                    { key: index, className: 'nav-link' },
+                    { className: 'nav-link' },
                     row.name
                   )
                 );
               }
             })
-          )
+          ),
+          React__default.createElement(Search$1, null)
         )
       )
     )
@@ -3632,20 +3626,23 @@ var FigureComponent = function FigureComponent(_ref) {
   var caption = _ref.caption,
       asset = _ref.asset;
 
-  return React__default.createElement(
-    'div',
-    { style: { textAlign: 'center', marginTop: '1em', marginBottom: '1em' } },
-    React__default.createElement(
-      reactBootstrap.Figure,
-      null,
-      React__default.createElement(reactBootstrap.Figure.Image, { alt: asset ? asset.originalFilename : '', src: asset.url ? asset.url : '/placeholder.jpg' }),
-      caption && React__default.createElement(
-        reactBootstrap.Figure.Caption,
+  if (asset && asset.url) {
+    return React__default.createElement(
+      'div',
+      { style: { textAlign: 'center', marginTop: '1em', marginBottom: '1em' } },
+      React__default.createElement(
+        reactBootstrap.Figure,
         null,
-        caption
+        React__default.createElement(reactBootstrap.Figure.Image, { alt: asset ? asset.originalFilename : '', src: asset.url }),
+        caption && React__default.createElement(
+          reactBootstrap.Figure.Caption,
+          null,
+          caption
+        )
       )
-    )
-  );
+    );
+  }
+  return null;
 };
 
 var Slideshow = function Slideshow(_ref) {