@mjhls/mjh-framework 1.0.25 → 1.0.27

package/dist/index.js

@@ -22,6 +22,7 @@ var NavDropdown = _interopDefault(require('react-bootstrap/NavDropdown'));
 var Form = _interopDefault(require('react-bootstrap/Form'));
 var FormControl = _interopDefault(require('react-bootstrap/FormControl'));
 var Button = _interopDefault(require('react-bootstrap/Button'));
+var router = require('next/router');
 var PropTypes = _interopDefault(require('prop-types'));
 var reactBootstrap = require('react-bootstrap');
 
@@ -648,8 +649,8 @@ var DeckContent = function (_React$Component) {
                   null,
                   React__default.createElement(Card.Img, {
                     variant: 'top',
-                    src: row.thumbnail.asset ? row.thumbnail.asset.url : _this.defaultImage,
-                    alt: row.thumbnail.asset ? row.thumbnail.asset.originalFilename : ''
+                    src: row.thumbnail && row.thumbnail.asset ? row.thumbnail.asset.url : _this.defaultImage,
+                    alt: row.thumbnail && row.thumbnail.asset ? row.thumbnail.asset.originalFilename : ''
                   })
                 )
               ),
@@ -1091,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,
@@ -1129,7 +1137,11 @@ var LeftNav = function LeftNav(props) {
               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(
@@ -1682,30 +1694,38 @@ var NavNormal = function NavNormal(props) {
 };
 
 var Search = function Search(_ref) {
-  var placeholder = _ref.placeholder,
-      disabled = _ref.disabled,
-      type = _ref.type,
-      btnText = _ref.btnText,
-      handleSearch = _ref.handleSearch;
+  var _ref$placeholder = _ref.placeholder,
+      placeholder = _ref$placeholder === undefined ? 'Search' : _ref$placeholder,
+      _ref$btnText = _ref.btnText,
+      btnText = _ref$btnText === undefined ? 'Search' : _ref$btnText,
+      router$$1 = _ref.router;
 
   var _useState = React.useState(''),
       _useState2 = slicedToArray(_useState, 2),
       searchKey = _useState2[0],
       setSearchKey = _useState2[1];
 
-  var onChangeSearch = function onChangeSearch(e) {
-    setSearchKey(e.target.value);
+  var handleSearch = function handleSearch(value) {
+    router$$1.push({
+      pathname: '/search',
+      query: { searchTerm: value }
+    });
   };
 
   return React__default.createElement(
-    'div',
-    { className: 'd-flex' },
-    React__default.createElement('input', { className: 'form-control', placeholder: placeholder, disabled: disabled, type: type, value: searchKey, onChange: function onChange(e) {
-        return onChangeSearch(e);
+    Form,
+    {
+      inline: true,
+      onSubmit: function onSubmit(e) {
+        e.preventDefault();
+        handleSearch(searchKey);
+      } },
+    React__default.createElement(FormControl, { type: 'text', placeholder: placeholder, className: 'mr-sm-2', value: searchKey, onChange: function onChange(e) {
+        return setSearchKey(e.target.value);
       } }),
     React__default.createElement(
-      'button',
-      { className: 'test', onClick: function onClick() {
+      Button,
+      { variant: 'secondary', onClick: function onClick() {
           return handleSearch(searchKey);
         } },
       btnText
@@ -1713,11 +1733,12 @@ var Search = function Search(_ref) {
   );
 };
 
+var Search$1 = router.withRouter(Search);
+
 var NavDvm = function NavDvm(props) {
   var logo = props.logo,
       dataObject = props.dataObject,
-      subNavHeads = props.subNavHeads,
-      onSearch = props.onSearch;
+      subNavHeads = props.subNavHeads;
 
 
   return React__default.createElement(
@@ -1732,11 +1753,19 @@ var NavDvm = function NavDvm(props) {
         React__default.createElement(
           'div',
           { className: 'd-flex' },
-          React__default.createElement('img', { src: logo, className: 'h-100', style: { width: '120px' } }),
+          React__default.createElement(
+            Link,
+            { href: '/' },
+            React__default.createElement(
+              'a',
+              null,
+              React__default.createElement('img', { src: logo, className: 'h-100', style: { width: '120px' } })
+            )
+          ),
           React__default.createElement(
             'div',
             { className: ' ml-4 d-flex align-items-center' },
-            React__default.createElement(Search, { btnText: 'Search', handleSearch: onSearch })
+            React__default.createElement(Search$1, { btnText: 'Search' })
           )
         ),
         React__default.createElement(
@@ -1807,30 +1836,6 @@ var NavDvm = function NavDvm(props) {
                 );
               }
             })
-          ),
-          React__default.createElement(
-            'div',
-            { className: 'login-subscibe', style: { fontSize: '12px' } },
-            React__default.createElement(
-              'span',
-              { style: { color: '#FFDC3F' } },
-              '>> ',
-              React__default.createElement(
-                'span',
-                { style: { color: '#fff' } },
-                ' Login'
-              )
-            ),
-            React__default.createElement(
-              'span',
-              { style: { color: '#FFDC3F' } },
-              '>> ',
-              React__default.createElement(
-                'span',
-                { style: { color: '#fff' } },
-                ' Register'
-              )
-            )
           )
         )
       )
@@ -3566,7 +3571,7 @@ var TemplateNormal = function TemplateNormal(props) {
       case 'native':
         return React__default.createElement(NavNative, { logo: website.logo, dataObject: config.navItems });
       case 'dvm':
-        return React__default.createElement(NavDvm, { logo: website.logo, dataObject: config.navItems, onSearch: onSearch });
+        return React__default.createElement(NavDvm, { logo: website.logo, dataObject: config.navItems });
       default:
         return React__default.createElement('noNav', null);
     }
@@ -6430,5 +6435,5 @@ exports.AD300x250x600 = AD300x250x600;
 exports.AD728x90 = AD728x90;
 exports.getSerializers = getSerializers;
 exports.SearchResult = searchResult;
-exports.Search = Search;
+exports.Search = Search$1;
 //# sourceMappingURL=index.js.map