From 21d7a41a6a40d86ade82b7037a33e8f2c0cdf2c5 Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Fri, 13 Jul 2018 22:42:13 +0800
Subject: [PATCH 01/14] starting with redux form #18

---
 README.md         |  3 +--
 package-lock.json | 23 +++++++++++++++++++++--
 package.json      |  1 +
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e16408f..3c8ef72 100644
--- a/README.md
+++ b/README.md
@@ -16,8 +16,7 @@ Minimal starter kit with hot module replacement (HMR) for rapid development.
 - **[Redux](https://redux.js.org/)** Manage the Component states.
 - **[Redux-Thunk](https://github.com/reduxjs/redux-thunk)** The middle-ware of Redux
 - **[Redux-toolbelt](https://github.com/welldone-software/redux-toolbelt)** A set of tools for quicker, easier, less verbose and safer Redux development by [welldone-software](http://welldone-software.com/).
-- ESLINT for Javascript and ReactJs
-- JSHINT standard configuration.
+- ESLINT for Javascript and ReactJs.
 - This project also using **babel-runtime** and **babel-plugin-transform-runtime** to speperate the commonns functions to the other module so the size of the file will be reduced. For details please refer [here](babel-plugin-transform-runtime)
 
 * Convert CSS to LESS: http://kronus.me/cn/css2less/
diff --git a/package-lock.json b/package-lock.json
index 4f8a861..70b6845 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3633,6 +3633,11 @@
                 "next-tick": "1.0.0"
             }
         },
+        "es6-error": {
+            "version": "4.1.1",
+            "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+            "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="
+        },
         "es6-iterator": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
@@ -6768,8 +6773,7 @@
         "is-promise": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-            "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-            "dev": true
+            "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
         },
         "is-regex": {
             "version": "1.0.4",
@@ -11933,6 +11937,21 @@
                 }
             }
         },
+        "redux-form": {
+            "version": "7.4.2",
+            "resolved": "https://registry.npmjs.org/redux-form/-/redux-form-7.4.2.tgz",
+            "integrity": "sha512-QxC36s4Lelx5Cr8dbpxqvl23dwYOydeAX8c6YPmgkz/Dhj053C16S2qoyZN6LO6HJ2oUF00rKsAyE94GwOUhFA==",
+            "requires": {
+                "es6-error": "4.1.1",
+                "hoist-non-react-statics": "2.5.5",
+                "invariant": "2.2.4",
+                "is-promise": "2.1.0",
+                "lodash": "4.17.10",
+                "lodash-es": "4.17.10",
+                "prop-types": "15.6.2",
+                "react-lifecycles-compat": "3.0.4"
+            }
+        },
         "redux-immutable-state-invariant": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/redux-immutable-state-invariant/-/redux-immutable-state-invariant-2.1.0.tgz",
diff --git a/package.json b/package.json
index cd85df1..55eaf8c 100644
--- a/package.json
+++ b/package.json
@@ -102,6 +102,7 @@
     "react-router-redux": "^4.0.8",
     "react-swipeable-views": "0.12.14",
     "redux": "4.0.0",
+    "redux-form": "^7.4.2",
     "redux-thunk": "2.3.0",
     "redux-toolbelt": "2.1.5",
     "redux-toolbelt-thunk": "^2.0.3"

From c2e091bb37c5709322d713dafd17651445b5b2e0 Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Fri, 13 Jul 2018 22:51:25 +0800
Subject: [PATCH 02/14] add react-redux --save #18

---
 package-lock.json | 23 ++---------------------
 package.json      |  3 +--
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 70b6845..4f8a861 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3633,11 +3633,6 @@
                 "next-tick": "1.0.0"
             }
         },
-        "es6-error": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-            "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="
-        },
         "es6-iterator": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
@@ -6773,7 +6768,8 @@
         "is-promise": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-            "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+            "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+            "dev": true
         },
         "is-regex": {
             "version": "1.0.4",
@@ -11937,21 +11933,6 @@
                 }
             }
         },
-        "redux-form": {
-            "version": "7.4.2",
-            "resolved": "https://registry.npmjs.org/redux-form/-/redux-form-7.4.2.tgz",
-            "integrity": "sha512-QxC36s4Lelx5Cr8dbpxqvl23dwYOydeAX8c6YPmgkz/Dhj053C16S2qoyZN6LO6HJ2oUF00rKsAyE94GwOUhFA==",
-            "requires": {
-                "es6-error": "4.1.1",
-                "hoist-non-react-statics": "2.5.5",
-                "invariant": "2.2.4",
-                "is-promise": "2.1.0",
-                "lodash": "4.17.10",
-                "lodash-es": "4.17.10",
-                "prop-types": "15.6.2",
-                "react-lifecycles-compat": "3.0.4"
-            }
-        },
         "redux-immutable-state-invariant": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/redux-immutable-state-invariant/-/redux-immutable-state-invariant-2.1.0.tgz",
diff --git a/package.json b/package.json
index 55eaf8c..0f7a280 100644
--- a/package.json
+++ b/package.json
@@ -96,13 +96,12 @@
     "react-chartist": "0.13.1",
     "react-dom": "^16.4.1",
     "react-google-maps": "^9.4.5",
-    "react-redux": "5.0.7",
+    "react-redux": "^5.0.7",
     "react-redux-thunk-store": "0.0.6",
     "react-router-dom": "4.3.1",
     "react-router-redux": "^4.0.8",
     "react-swipeable-views": "0.12.14",
     "redux": "4.0.0",
-    "redux-form": "^7.4.2",
     "redux-thunk": "2.3.0",
     "redux-toolbelt": "2.1.5",
     "redux-toolbelt-thunk": "^2.0.3"

From 6e88261515f84b6ad68384394becc6ae46d346ad Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Fri, 13 Jul 2018 22:57:30 +0800
Subject: [PATCH 03/14] update displayIn to save testing time

---
 tests/components/notification/NotificationItem.test.jsx | 8 ++++----
 tests/components/notification/index.test.jsx            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/components/notification/NotificationItem.test.jsx b/tests/components/notification/NotificationItem.test.jsx
index 31b1ce0..c9e9d8d 100644
--- a/tests/components/notification/NotificationItem.test.jsx
+++ b/tests/components/notification/NotificationItem.test.jsx
@@ -36,12 +36,12 @@ const promiseComponent = ({ displayIn, ...rest }) =>
 
     setTimeout(() => {
       if (!called) reject(called);
-    }, displayIn + 10);
+    }, displayIn + 2);
   });
 
 describe(`Testing ${NotificationItem.displayName} component`, () => {
   test("closeNotification will be called", () => {
-    const pm = promiseComponent({ displayIn: 200 });
+    const pm = promiseComponent({ displayIn: 5 });
     return expect(pm).resolves.toBe(true);
   });
 
@@ -61,9 +61,9 @@ describe(`Testing ${NotificationItem.displayName} component`, () => {
     //closeNotification called
     await expect(p1).rejects.toBe(false);
 
-    //DisplayIn = 10
+    //DisplayIn = 5ms
     const p2 = new Promise((resolve, reject) => {
-      item.setProps({ displayIn: 10, closeNotification: () => resolve(true) });
+      item.setProps({ displayIn: 5, closeNotification: () => resolve(true) });
     });
 
     //closeNotification called
diff --git a/tests/components/notification/index.test.jsx b/tests/components/notification/index.test.jsx
index e4950e9..26f3ecd 100644
--- a/tests/components/notification/index.test.jsx
+++ b/tests/components/notification/index.test.jsx
@@ -74,7 +74,7 @@ describe(`Render ${Notification.displayName} tests`, () => {
           closeNotification: () => true
         }
       ],
-      displayIn: 10,
+      displayIn: 2,
       subsequentDelay: 1
     });
 

From c8f93a5e7ffa7c1ff2a8853d6b15b6ec14a049f9 Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Fri, 13 Jul 2018 22:58:42 +0800
Subject: [PATCH 04/14] update timeout

---
 tests/components/notification/NotificationItem.test.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/components/notification/NotificationItem.test.jsx b/tests/components/notification/NotificationItem.test.jsx
index c9e9d8d..2bdb338 100644
--- a/tests/components/notification/NotificationItem.test.jsx
+++ b/tests/components/notification/NotificationItem.test.jsx
@@ -56,7 +56,7 @@ describe(`Testing ${NotificationItem.displayName} component`, () => {
     //DisplayIn = 0
     const p1 = new Promise((resolve, reject) => {
       item.setProps({ closeNotification: () => resolve(true) });
-      setTimeout(() => reject(false), 10);
+      setTimeout(() => reject(false), 5);
     });
     //closeNotification called
     await expect(p1).rejects.toBe(false);

From f5dd9431628191a3e012448f49e359465b33be67 Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Sat, 14 Jul 2018 16:19:01 +0800
Subject: [PATCH 05/14] add npm check to cicleci

---
 .circleci/config.yml | 5 ++++-
 src/index.jsx        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e342181..70fcc4b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,6 +28,7 @@ jobs:
 
       - run: npm install
       - run: npm install codecov
+      - run: npm install npm-check
 
       - save_cache:
           paths:
@@ -38,7 +39,9 @@ jobs:
       - run: npm run build
       # lint
       - run: npm run lint
-      # run tests!
+      # run tests
       - run: npm run test-ci
+       # run Check
+      - run: npm-check
 
 
diff --git a/src/index.jsx b/src/index.jsx
index ce9fc64..b1f1b2d 100644
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -16,7 +16,7 @@ import indexRoutes from "routes/index.jsx";
 
 //Update for Reserved proxy
 window._base = document.getElementsByTagName("base")[0].getAttribute("href");
-console.info(`base URL ${window._base}`);
+console.log(`base URL ${window._base}`);
 
 const hist = createBrowserHistory({ basename: window._base });
 

From 0be59b1e03e436ea8f97d949f27952f49c19710b Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Sat, 14 Jul 2018 16:22:28 +0800
Subject: [PATCH 06/14] update cpmmand

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 70fcc4b..4924ff0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,6 +42,6 @@ jobs:
       # run tests
       - run: npm run test-ci
        # run Check
-      - run: npm-check
+      - run: npm run npm-check
 
 

From f3765815b3ca0790a987b76df8bbcab03b2915ca Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Sat, 14 Jul 2018 16:38:54 +0800
Subject: [PATCH 07/14] update

---
 .circleci/config.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4924ff0..d15f200 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,7 +41,5 @@ jobs:
       - run: npm run lint
       # run tests
       - run: npm run test-ci
-       # run Check
-      - run: npm run npm-check
 
 

From 98c9f25b60caac98f32fcf1de4f61288fad85be8 Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Sat, 14 Jul 2018 19:12:24 +0800
Subject: [PATCH 08/14] moving the style to their components

---
 .../dropdownStyle.jsx                         | 162 +++++++++---------
 src/components/Card/Card.jsx                  |   2 +-
 src/components/Card/CardAvatar.jsx            |   2 +-
 src/components/Card/CardBody.jsx              |   2 +-
 src/components/Card/CardFooter.jsx            |   2 +-
 src/components/Card/CardHeader.jsx            |   2 +-
 src/components/Card/CardIcon.jsx              |   2 +-
 .../Card}/cardAvatarStyle.jsx                 |   0
 .../Card}/cardBodyStyle.jsx                   |   0
 .../Card}/cardFooterStyle.jsx                 |   0
 .../Card}/cardHeaderStyle.jsx                 |   0
 .../Card}/cardIconStyle.jsx                   |   0
 .../Card}/cardStyle.jsx                       |   0
 src/components/CustomButtons/Button.jsx       |   2 +-
 .../CustomButtons}/buttonStyle.jsx            |   0
 src/components/CustomInput/CustomInput.jsx    |   2 +-
 .../CustomInput}/customInputStyle.jsx         |   0
 src/components/CustomTabs/CustomTabs.jsx      |   4 +-
 .../CustomTabs}/customTabsStyle.jsx           |   0
 src/components/Footer/Footer.jsx              |   2 +-
 .../Footer}/footerStyle.jsx                   |   0
 src/components/Header/Header.jsx              |   2 +-
 src/components/Header/HeaderLinks.jsx         |  32 ++--
 .../Header}/headerLinksStyle.jsx              |   0
 .../Header}/headerStyle.jsx                   |   0
 src/components/Sidebar/Sidebar.jsx            |   4 +-
 .../Sidebar}/sidebarStyle.jsx                 |   0
 src/components/Snackbar/Snackbar.jsx          |   6 +-
 src/components/Snackbar/SnackbarContent.jsx   |   2 +-
 .../Snackbar}/snackbarContentStyle.jsx        |   0
 src/components/Table/Table.jsx                |   2 +-
 .../Table}/tableStyle.jsx                     |   0
 src/components/Tasks/Tasks.jsx                |   2 +-
 .../Tasks}/tasksStyle.jsx                     |   0
 src/components/Typography/Danger.jsx          |   2 +-
 src/components/Typography/Info.jsx            |   2 +-
 src/components/Typography/Muted.jsx           |   2 +-
 src/components/Typography/Primary.jsx         |   2 +-
 src/components/Typography/Quote.jsx           |   2 +-
 src/components/Typography/Success.jsx         |   2 +-
 src/components/Typography/Warning.jsx         |   2 +-
 .../Typography}/typographyStyle.jsx           |   0
 src/layouts/Dashboard.jsx                     |   2 +-
 .../layouts/dashboardStyle.jsx                |   0
 src/views/Dashboard/Dashboard.jsx             | 116 ++++++++-----
 .../Dashboard}/dashboardStyle.jsx             |   0
 src/views/Icons/Icons.jsx                     |   2 +-
 .../views => views/Icons}/iconsStyle.jsx      |   0
 48 files changed, 197 insertions(+), 171 deletions(-)
 rename src/{assets/jss/material-dashboard-react/components => components/Card}/cardAvatarStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/Card}/cardBodyStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/Card}/cardFooterStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/Card}/cardHeaderStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/Card}/cardIconStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/Card}/cardStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/CustomButtons}/buttonStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/CustomInput}/customInputStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/CustomTabs}/customTabsStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/Footer}/footerStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/Header}/headerLinksStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/Header}/headerStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/Sidebar}/sidebarStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/Snackbar}/snackbarContentStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/Table}/tableStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/Tasks}/tasksStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/components => components/Typography}/typographyStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react => }/layouts/dashboardStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/views => views/Dashboard}/dashboardStyle.jsx (100%)
 rename src/{assets/jss/material-dashboard-react/views => views/Icons}/iconsStyle.jsx (100%)

diff --git a/src/assets/jss/material-dashboard-react/dropdownStyle.jsx b/src/assets/jss/material-dashboard-react/dropdownStyle.jsx
index 60613b8..9738a4a 100644
--- a/src/assets/jss/material-dashboard-react/dropdownStyle.jsx
+++ b/src/assets/jss/material-dashboard-react/dropdownStyle.jsx
@@ -5,87 +5,87 @@ import {
 } from "assets/jss/material-dashboard-react.jsx";
 
 const dropdownStyle = theme => ({
-    buttonLink: {
-        [theme.breakpoints.down('md')]:{
-            display: 'flex',
-            marginLeft: '30px',
-            width: 'auto',
-        },
-    },
-    links:{
-        width: '20px',
-        height: '20px',
-        zIndex: '4',
-        [theme.breakpoints.down('md')]:{
-            display: 'block',
-            width: '30px',
-            height: '30px',
-            color: '#a9afbb',
-            marginRight: '15px',
-        },
-    },
-    linkText: {
-        zIndex: '4',
-        ...defaultFont,
-        fontSize: '14px',
-    },
-    popperClose: {
-      pointerEvents: 'none',
-    },
-    pooperResponsive: {
-        [theme.breakpoints.down('md')]: {
-            zIndex: '1640',
-            position: 'static',
-            float: 'none',
-            width: 'auto',
-            marginTop: '0',
-            backgroundColor: 'transparent',
-            border: '0',
-            WebkitBoxShadow: 'none',
-            boxShadow: 'none',
-            color: 'black'
-        }
-    },
-    dropdown: {
-        borderRadius: '3px',
-        border: '0',
-        boxShadow: '0 2px 5px 0 rgba(0, 0, 0, 0.26)',
-        top: '100%',
-        zIndex: '1000',
-        minWidth: '160px',
-        padding: '5px 0',
-        margin: '2px 0 0',
-        fontSize: '14px',
-        textAlign: 'left',
-        listStyle: 'none',
-        backgroundColor: '#fff',
-        WebkitBackgroundClip: 'padding-box',
-        backgroundClip: 'padding-box',
-    },
-    dropdownItem: {
-        ...defaultFont,
-        fontSize: '13px',
-        padding: '10px 20px',
-        margin: '0 5px',
-        borderRadius: '2px',
-        WebkitTransition: 'all 150ms linear',
-        MozTransition: 'all 150ms linear',
-        OTransition: 'all 150ms linear',
-        MsTransition: 'all 150ms linear',
-        transition: 'all 150ms linear',
-        display: 'block',
-        clear: 'both',
-        fontWeight: '400',
-        lineHeight: '1.42857143',
-        color: '#333',
-        whiteSpace: 'nowrap',
-        height: "unset",
-        '&:hover': {
-            backgroundColor: primaryColor,
-            color: '#FFFFFF',
-            ...primaryBoxShadow,
-        }
-    },
+  buttonLink: {
+    [theme.breakpoints.down("md")]: {
+      display: "flex",
+      marginLeft: "30px",
+      width: "auto"
+    }
+  },
+  links: {
+    width: "20px",
+    height: "20px",
+    zIndex: "4",
+    [theme.breakpoints.down("md")]: {
+      display: "block",
+      width: "30px",
+      height: "30px",
+      color: "#a9afbb",
+      marginRight: "15px"
+    }
+  },
+  linkText: {
+    zIndex: "4",
+    ...defaultFont,
+    fontSize: "14px"
+  },
+  popperClose: {
+    pointerEvents: "none"
+  },
+  pooperResponsive: {
+    [theme.breakpoints.down("md")]: {
+      zIndex: "1640",
+      position: "static",
+      float: "none",
+      width: "auto",
+      marginTop: "0",
+      backgroundColor: "transparent",
+      border: "0",
+      WebkitBoxShadow: "none",
+      boxShadow: "none",
+      color: "black"
+    }
+  },
+  dropdown: {
+    borderRadius: "3px",
+    border: "0",
+    boxShadow: "0 2px 5px 0 rgba(0, 0, 0, 0.26)",
+    top: "100%",
+    zIndex: "1000",
+    minWidth: "160px",
+    padding: "5px 0",
+    margin: "2px 0 0",
+    fontSize: "14px",
+    textAlign: "left",
+    listStyle: "none",
+    backgroundColor: "#fff",
+    WebkitBackgroundClip: "padding-box",
+    backgroundClip: "padding-box"
+  },
+  dropdownItem: {
+    ...defaultFont,
+    fontSize: "13px",
+    padding: "10px 20px",
+    margin: "0 5px",
+    borderRadius: "2px",
+    WebkitTransition: "all 150ms linear",
+    MozTransition: "all 150ms linear",
+    OTransition: "all 150ms linear",
+    MsTransition: "all 150ms linear",
+    transition: "all 150ms linear",
+    display: "block",
+    clear: "both",
+    fontWeight: "400",
+    lineHeight: "1.42857143",
+    color: "#333",
+    whiteSpace: "nowrap",
+    height: "unset",
+    "&:hover": {
+      backgroundColor: primaryColor,
+      color: "#FFFFFF",
+      ...primaryBoxShadow
+    }
+  }
 });
 
 export default dropdownStyle;
diff --git a/src/components/Card/Card.jsx b/src/components/Card/Card.jsx
index d03efb9..dbf9f0f 100644
--- a/src/components/Card/Card.jsx
+++ b/src/components/Card/Card.jsx
@@ -8,7 +8,7 @@ import withStyles from "@material-ui/core/styles/withStyles";
 // @material-ui/icons
 
 // core components
-import cardStyle from "assets/jss/material-dashboard-react/components/cardStyle.jsx";
+import cardStyle from "./cardStyle.jsx";
 
 function Card({ ...props }) {
   const {
diff --git a/src/components/Card/CardAvatar.jsx b/src/components/Card/CardAvatar.jsx
index 3616c26..ff88ff1 100644
--- a/src/components/Card/CardAvatar.jsx
+++ b/src/components/Card/CardAvatar.jsx
@@ -8,7 +8,7 @@ import withStyles from "@material-ui/core/styles/withStyles";
 // @material-ui/icons
 // core components
 
-import cardAvatarStyle from "assets/jss/material-dashboard-react/components/cardAvatarStyle.jsx";
+import cardAvatarStyle from "./cardAvatarStyle.jsx";
 
 function CardAvatar({ ...props }) {
   const { classes, children, className, plain, profile, ...rest } = props;
diff --git a/src/components/Card/CardBody.jsx b/src/components/Card/CardBody.jsx
index b886d9c..2ee8b30 100644
--- a/src/components/Card/CardBody.jsx
+++ b/src/components/Card/CardBody.jsx
@@ -8,7 +8,7 @@ import withStyles from "@material-ui/core/styles/withStyles";
 // @material-ui/icons
 
 // core components
-import cardBodyStyle from "assets/jss/material-dashboard-react/components/cardBodyStyle.jsx";
+import cardBodyStyle from "./cardBodyStyle.jsx";
 
 function CardBody({ ...props }) {
   const { classes, className, children, plain, profile, ...rest } = props;
diff --git a/src/components/Card/CardFooter.jsx b/src/components/Card/CardFooter.jsx
index dcffbc0..5807a0c 100644
--- a/src/components/Card/CardFooter.jsx
+++ b/src/components/Card/CardFooter.jsx
@@ -8,7 +8,7 @@ import withStyles from "@material-ui/core/styles/withStyles";
 // @material-ui/icons
 
 // core components
-import cardFooterStyle from "assets/jss/material-dashboard-react/components/cardFooterStyle.jsx";
+import cardFooterStyle from "./cardFooterStyle.jsx";
 
 function CardFooter({ ...props }) {
   const {
diff --git a/src/components/Card/CardHeader.jsx b/src/components/Card/CardHeader.jsx
index 4c0f614..63726fc 100644
--- a/src/components/Card/CardHeader.jsx
+++ b/src/components/Card/CardHeader.jsx
@@ -8,7 +8,7 @@ import withStyles from "@material-ui/core/styles/withStyles";
 // @material-ui/icons
 
 // core components
-import cardHeaderStyle from "assets/jss/material-dashboard-react/components/cardHeaderStyle.jsx";
+import cardHeaderStyle from "./cardHeaderStyle.jsx";
 
 function CardHeader({ ...props }) {
   const {
diff --git a/src/components/Card/CardIcon.jsx b/src/components/Card/CardIcon.jsx
index 681e644..eabb006 100644
--- a/src/components/Card/CardIcon.jsx
+++ b/src/components/Card/CardIcon.jsx
@@ -8,7 +8,7 @@ import withStyles from "@material-ui/core/styles/withStyles";
 // @material-ui/icons
 
 // core components
-import cardIconStyle from "assets/jss/material-dashboard-react/components/cardIconStyle.jsx";
+import cardIconStyle from "./cardIconStyle.jsx";
 
 function CardIcon({ ...props }) {
   const { classes, className, children, color, ...rest } = props;
diff --git a/src/assets/jss/material-dashboard-react/components/cardAvatarStyle.jsx b/src/components/Card/cardAvatarStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/cardAvatarStyle.jsx
rename to src/components/Card/cardAvatarStyle.jsx
diff --git a/src/assets/jss/material-dashboard-react/components/cardBodyStyle.jsx b/src/components/Card/cardBodyStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/cardBodyStyle.jsx
rename to src/components/Card/cardBodyStyle.jsx
diff --git a/src/assets/jss/material-dashboard-react/components/cardFooterStyle.jsx b/src/components/Card/cardFooterStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/cardFooterStyle.jsx
rename to src/components/Card/cardFooterStyle.jsx
diff --git a/src/assets/jss/material-dashboard-react/components/cardHeaderStyle.jsx b/src/components/Card/cardHeaderStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/cardHeaderStyle.jsx
rename to src/components/Card/cardHeaderStyle.jsx
diff --git a/src/assets/jss/material-dashboard-react/components/cardIconStyle.jsx b/src/components/Card/cardIconStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/cardIconStyle.jsx
rename to src/components/Card/cardIconStyle.jsx
diff --git a/src/assets/jss/material-dashboard-react/components/cardStyle.jsx b/src/components/Card/cardStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/cardStyle.jsx
rename to src/components/Card/cardStyle.jsx
diff --git a/src/components/CustomButtons/Button.jsx b/src/components/CustomButtons/Button.jsx
index b6a83a7..66c395a 100644
--- a/src/components/CustomButtons/Button.jsx
+++ b/src/components/CustomButtons/Button.jsx
@@ -8,7 +8,7 @@ import PropTypes from "prop-types";
 import withStyles from "@material-ui/core/styles/withStyles";
 import Button from "@material-ui/core/Button";
 
-import buttonStyle from "assets/jss/material-dashboard-react/components/buttonStyle.jsx";
+import buttonStyle from "./buttonStyle.jsx";
 function RegularButton({ ...props }) {
   const {
     classes,
diff --git a/src/assets/jss/material-dashboard-react/components/buttonStyle.jsx b/src/components/CustomButtons/buttonStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/buttonStyle.jsx
rename to src/components/CustomButtons/buttonStyle.jsx
diff --git a/src/components/CustomInput/CustomInput.jsx b/src/components/CustomInput/CustomInput.jsx
index 613e9b6..8660f25 100644
--- a/src/components/CustomInput/CustomInput.jsx
+++ b/src/components/CustomInput/CustomInput.jsx
@@ -10,7 +10,7 @@ import Input from "@material-ui/core/Input";
 import Clear from "@material-ui/icons/Clear";
 import Check from "@material-ui/icons/Check";
 // core components
-import customInputStyle from "assets/jss/material-dashboard-react/components/customInputStyle";
+import customInputStyle from "./customInputStyle";
 
 function CustomInput({ ...props }) {
   const {
diff --git a/src/assets/jss/material-dashboard-react/components/customInputStyle.jsx b/src/components/CustomInput/customInputStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/customInputStyle.jsx
rename to src/components/CustomInput/customInputStyle.jsx
diff --git a/src/components/CustomTabs/CustomTabs.jsx b/src/components/CustomTabs/CustomTabs.jsx
index 259f18a..44d0710 100644
--- a/src/components/CustomTabs/CustomTabs.jsx
+++ b/src/components/CustomTabs/CustomTabs.jsx
@@ -12,9 +12,9 @@ import Tab from "@material-ui/core/Tab";
 import Card from "components/Card/Card.jsx";
 import CardBody from "components/Card/CardBody.jsx";
 import CardHeader from "components/Card/CardHeader.jsx";
-import LinearProgress from '@material-ui/core/LinearProgress';
+import LinearProgress from "@material-ui/core/LinearProgress";
 
-import customTabsStyle from "assets/jss/material-dashboard-react/components/customTabsStyle.jsx";
+import customTabsStyle from "./customTabsStyle.jsx";
 
 class CustomTabs extends React.Component {
   state = {
diff --git a/src/assets/jss/material-dashboard-react/components/customTabsStyle.jsx b/src/components/CustomTabs/customTabsStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/customTabsStyle.jsx
rename to src/components/CustomTabs/customTabsStyle.jsx
diff --git a/src/components/Footer/Footer.jsx b/src/components/Footer/Footer.jsx
index c2f477e..ee718d6 100644
--- a/src/components/Footer/Footer.jsx
+++ b/src/components/Footer/Footer.jsx
@@ -5,7 +5,7 @@ import withStyles from "@material-ui/core/styles/withStyles";
 import ListItem from "@material-ui/core/ListItem";
 import List from "@material-ui/core/List";
 // core components
-import footerStyle from "assets/jss/material-dashboard-react/components/footerStyle";
+import footerStyle from "./footerStyle";
 
 function Footer({ ...props }) {
   const { classes } = props;
diff --git a/src/assets/jss/material-dashboard-react/components/footerStyle.jsx b/src/components/Footer/footerStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/footerStyle.jsx
rename to src/components/Footer/footerStyle.jsx
diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx
index d90f133..4f6cd02 100644
--- a/src/components/Header/Header.jsx
+++ b/src/components/Header/Header.jsx
@@ -13,7 +13,7 @@ import Menu from "@material-ui/icons/Menu";
 import HeaderLinks from "./HeaderLinks";
 import Button from "components/CustomButtons/Button";
 
-import headerStyle from "assets/jss/material-dashboard-react/components/headerStyle.jsx";
+import headerStyle from "./headerStyle.jsx";
 
 function Header({ ...props }) {
   function makeBrand() {
diff --git a/src/components/Header/HeaderLinks.jsx b/src/components/Header/HeaderLinks.jsx
index 1ac926b..d1f730b 100644
--- a/src/components/Header/HeaderLinks.jsx
+++ b/src/components/Header/HeaderLinks.jsx
@@ -18,7 +18,7 @@ import Search from "@material-ui/icons/Search";
 import CustomInput from "components/CustomInput/CustomInput.jsx";
 import Button from "components/CustomButtons/Button.jsx";
 
-import headerLinksStyle from "assets/jss/material-dashboard-react/components/headerLinksStyle";
+import headerLinksStyle from "./headerLinksStyle";
 
 class HeaderLinks extends React.Component {
   state = {
@@ -37,21 +37,21 @@ class HeaderLinks extends React.Component {
     return (
       <div>
         <div className={classes.searchWrapper}>
-        <CustomInput
-          formControlProps={{
-            className: classes.margin + " " + classes.search
-          }}
-          inputProps={{
-            placeholder: "Search",
-            inputProps: {
-              "aria-label": "Search"
-            }
-          }}
-        />
-        <Button color="white" aria-label="edit" justIcon round>
-          <Search />
-        </Button>
-      </div>
+          <CustomInput
+            formControlProps={{
+              className: classes.margin + " " + classes.search
+            }}
+            inputProps={{
+              placeholder: "Search",
+              inputProps: {
+                "aria-label": "Search"
+              }
+            }}
+          />
+          <Button color="white" aria-label="edit" justIcon round>
+            <Search />
+          </Button>
+        </div>
         <Button
           color={window.innerWidth > 959 ? "transparent" : "white"}
           justIcon={window.innerWidth > 959}
diff --git a/src/assets/jss/material-dashboard-react/components/headerLinksStyle.jsx b/src/components/Header/headerLinksStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/headerLinksStyle.jsx
rename to src/components/Header/headerLinksStyle.jsx
diff --git a/src/assets/jss/material-dashboard-react/components/headerStyle.jsx b/src/components/Header/headerStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/headerStyle.jsx
rename to src/components/Header/headerStyle.jsx
diff --git a/src/components/Sidebar/Sidebar.jsx b/src/components/Sidebar/Sidebar.jsx
index d9fb847..2dad3e9 100644
--- a/src/components/Sidebar/Sidebar.jsx
+++ b/src/components/Sidebar/Sidebar.jsx
@@ -13,7 +13,7 @@ import ListItemText from "@material-ui/core/ListItemText";
 // core components
 import HeaderLinks from "components/Header/HeaderLinks.jsx";
 
-import sidebarStyle from "assets/jss/material-dashboard-react/components/sidebarStyle.jsx";
+import sidebarStyle from "./sidebarStyle.jsx";
 
 const Sidebar = ({ ...props }) => {
   // verifies if routeName is the one active (in browser input)
@@ -27,7 +27,7 @@ const Sidebar = ({ ...props }) => {
         if (prop.redirect) return null;
         var activePro = " ";
         var listItemClasses;
-        if(prop.path === "/upgrade-to-pro"){
+        if (prop.path === "/upgrade-to-pro") {
           activePro = classes.activePro + " ";
           listItemClasses = classNames({
             [" " + classes[color]]: true
diff --git a/src/assets/jss/material-dashboard-react/components/sidebarStyle.jsx b/src/components/Sidebar/sidebarStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/sidebarStyle.jsx
rename to src/components/Sidebar/sidebarStyle.jsx
diff --git a/src/components/Snackbar/Snackbar.jsx b/src/components/Snackbar/Snackbar.jsx
index 14d1171..64ac0a6 100644
--- a/src/components/Snackbar/Snackbar.jsx
+++ b/src/components/Snackbar/Snackbar.jsx
@@ -8,7 +8,7 @@ import IconButton from "@material-ui/core/IconButton";
 // @material-ui/icons
 import Close from "@material-ui/icons/Close";
 // core components
-import snackbarContentStyle from "assets/jss/material-dashboard-react/components/snackbarContentStyle.jsx";
+import snackbarContentStyle from "./snackbarContentStyle.jsx";
 
 function Snackbar({ ...props }) {
   const { classes, message, color, close, icon, place, open } = props;
@@ -36,7 +36,9 @@ function Snackbar({ ...props }) {
         horizontal:
           place.indexOf("l") !== -1
             ? "left"
-            : place.indexOf("c") !== -1 ? "center" : "right"
+            : place.indexOf("c") !== -1
+              ? "center"
+              : "right"
       }}
       open={open}
       message={
diff --git a/src/components/Snackbar/SnackbarContent.jsx b/src/components/Snackbar/SnackbarContent.jsx
index 3c2037f..4fcc324 100644
--- a/src/components/Snackbar/SnackbarContent.jsx
+++ b/src/components/Snackbar/SnackbarContent.jsx
@@ -8,7 +8,7 @@ import IconButton from "@material-ui/core/IconButton";
 // @material-ui/icons
 import Close from "@material-ui/icons/Close";
 // core components
-import snackbarContentStyle from "assets/jss/material-dashboard-react/components/snackbarContentStyle.jsx";
+import snackbarContentStyle from "./snackbarContentStyle.jsx";
 
 function SnackbarContent({ ...props }) {
   const { classes, message, color, close, icon } = props;
diff --git a/src/assets/jss/material-dashboard-react/components/snackbarContentStyle.jsx b/src/components/Snackbar/snackbarContentStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/snackbarContentStyle.jsx
rename to src/components/Snackbar/snackbarContentStyle.jsx
diff --git a/src/components/Table/Table.jsx b/src/components/Table/Table.jsx
index 80e6d2d..980bd75 100644
--- a/src/components/Table/Table.jsx
+++ b/src/components/Table/Table.jsx
@@ -8,7 +8,7 @@ import TableRow from "@material-ui/core/TableRow";
 import TableBody from "@material-ui/core/TableBody";
 import TableCell from "@material-ui/core/TableCell";
 // core components
-import tableStyle from "assets/jss/material-dashboard-react/components/tableStyle";
+import tableStyle from "./tableStyle";
 
 function CustomTable({ ...props }) {
   const { classes, tableHead, tableData, tableHeaderColor } = props;
diff --git a/src/assets/jss/material-dashboard-react/components/tableStyle.jsx b/src/components/Table/tableStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/tableStyle.jsx
rename to src/components/Table/tableStyle.jsx
diff --git a/src/components/Tasks/Tasks.jsx b/src/components/Tasks/Tasks.jsx
index 6e6ff0b..98c2af1 100644
--- a/src/components/Tasks/Tasks.jsx
+++ b/src/components/Tasks/Tasks.jsx
@@ -14,7 +14,7 @@ import Edit from "@material-ui/icons/Edit";
 import Close from "@material-ui/icons/Close";
 import Check from "@material-ui/icons/Check";
 // core components
-import tasksStyle from "assets/jss/material-dashboard-react/components/tasksStyle.jsx";
+import tasksStyle from "./tasksStyle.jsx";
 
 class Tasks extends React.Component {
   state = {
diff --git a/src/assets/jss/material-dashboard-react/components/tasksStyle.jsx b/src/components/Tasks/tasksStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/tasksStyle.jsx
rename to src/components/Tasks/tasksStyle.jsx
diff --git a/src/components/Typography/Danger.jsx b/src/components/Typography/Danger.jsx
index a11814c..5149a43 100644
--- a/src/components/Typography/Danger.jsx
+++ b/src/components/Typography/Danger.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 // @material-ui/core components
 import withStyles from "@material-ui/core/styles/withStyles";
 // core components
-import typographyStyle from "assets/jss/material-dashboard-react/components/typographyStyle.jsx";
+import typographyStyle from "./typographyStyle.jsx";
 
 function Danger({ ...props }) {
   const { classes, children } = props;
diff --git a/src/components/Typography/Info.jsx b/src/components/Typography/Info.jsx
index 6a42451..554d462 100644
--- a/src/components/Typography/Info.jsx
+++ b/src/components/Typography/Info.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 // @material-ui/core components
 import withStyles from "@material-ui/core/styles/withStyles";
 // core components
-import typographyStyle from "assets/jss/material-dashboard-react/components/typographyStyle.jsx";
+import typographyStyle from "./typographyStyle.jsx";
 
 function Info({ ...props }) {
   const { classes, children } = props;
diff --git a/src/components/Typography/Muted.jsx b/src/components/Typography/Muted.jsx
index c881e4e..8412157 100644
--- a/src/components/Typography/Muted.jsx
+++ b/src/components/Typography/Muted.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 // @material-ui/core components
 import withStyles from "@material-ui/core/styles/withStyles";
 // core components
-import typographyStyle from "assets/jss/material-dashboard-react/components/typographyStyle.jsx";
+import typographyStyle from "./typographyStyle.jsx";
 
 function Muted({ ...props }) {
   const { classes, children } = props;
diff --git a/src/components/Typography/Primary.jsx b/src/components/Typography/Primary.jsx
index dd808da..b118343 100644
--- a/src/components/Typography/Primary.jsx
+++ b/src/components/Typography/Primary.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 // @material-ui/core components
 import withStyles from "@material-ui/core/styles/withStyles";
 // core components
-import typographyStyle from "assets/jss/material-dashboard-react/components/typographyStyle.jsx";
+import typographyStyle from "./typographyStyle.jsx";
 
 function Primary({ ...props }) {
   const { classes, children } = props;
diff --git a/src/components/Typography/Quote.jsx b/src/components/Typography/Quote.jsx
index bec19a2..3a8cd79 100644
--- a/src/components/Typography/Quote.jsx
+++ b/src/components/Typography/Quote.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 // @material-ui/core components
 import withStyles from "@material-ui/core/styles/withStyles";
 // core components
-import typographyStyle from "assets/jss/material-dashboard-react/components/typographyStyle.jsx";
+import typographyStyle from "./typographyStyle.jsx";
 
 function Quote({ ...props }) {
   const { classes, text, author } = props;
diff --git a/src/components/Typography/Success.jsx b/src/components/Typography/Success.jsx
index 19b310f..22f8f12 100644
--- a/src/components/Typography/Success.jsx
+++ b/src/components/Typography/Success.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 // @material-ui/core components
 import withStyles from "@material-ui/core/styles/withStyles";
 // core components
-import typographyStyle from "assets/jss/material-dashboard-react/components/typographyStyle.jsx";
+import typographyStyle from "./typographyStyle.jsx";
 
 function Success({ ...props }) {
   const { classes, children } = props;
diff --git a/src/components/Typography/Warning.jsx b/src/components/Typography/Warning.jsx
index 1cb798f..a08a0a7 100644
--- a/src/components/Typography/Warning.jsx
+++ b/src/components/Typography/Warning.jsx
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 // @material-ui/core components
 import withStyles from "@material-ui/core/styles/withStyles";
 // core components
-import typographyStyle from "assets/jss/material-dashboard-react/components/typographyStyle.jsx";
+import typographyStyle from "./typographyStyle.jsx";
 
 function Warning({ ...props }) {
   const { classes, children } = props;
diff --git a/src/assets/jss/material-dashboard-react/components/typographyStyle.jsx b/src/components/Typography/typographyStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/components/typographyStyle.jsx
rename to src/components/Typography/typographyStyle.jsx
diff --git a/src/layouts/Dashboard.jsx b/src/layouts/Dashboard.jsx
index 3e0ea14..bbebe79 100644
--- a/src/layouts/Dashboard.jsx
+++ b/src/layouts/Dashboard.jsx
@@ -11,7 +11,7 @@ import Footer from "components/Footer/Footer.jsx";
 import Sidebar from "components/Sidebar/Sidebar.jsx";
 
 import dashboardRoutes from "routes/dashboard.jsx";
-import dashboardStyle from "assets/jss/material-dashboard-react/layouts/dashboardStyle.jsx";
+import dashboardStyle from "./dashboardStyle.jsx";
 
 import { getImgSrc } from "../commons/commonFuncs";
 //Import may not working with Reserved proxy so using require instead.
diff --git a/src/assets/jss/material-dashboard-react/layouts/dashboardStyle.jsx b/src/layouts/dashboardStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/layouts/dashboardStyle.jsx
rename to src/layouts/dashboardStyle.jsx
diff --git a/src/views/Dashboard/Dashboard.jsx b/src/views/Dashboard/Dashboard.jsx
index 5a9cf23..2aceb1d 100644
--- a/src/views/Dashboard/Dashboard.jsx
+++ b/src/views/Dashboard/Dashboard.jsx
@@ -35,29 +35,36 @@ import CardIcon from "components/Card/CardIcon.jsx";
 import CardBody from "components/Card/CardBody.jsx";
 import CardFooter from "components/Card/CardFooter.jsx";
 
-import dashboardStyle from "assets/jss/material-dashboard-react/views/dashboardStyle.jsx";
+import dashboardStyle from "./dashboardStyle.jsx";
 
 //Connect component to Redux store.
-@connect(state => {
-  return {
-    charts: state.charts.data || {},
-    general: state.general.data || {},
-    loading: state.general.loading || state.charts.loading
-  };
-}, dispatch => {
-  return { actions: bindActionCreators(actions, dispatch) };
-})
+@connect(
+  state => {
+    return {
+      charts: state.charts.data || {},
+      general: state.general.data || {},
+      loading: state.general.loading || state.charts.loading
+    };
+  },
+  dispatch => {
+    return { actions: bindActionCreators(actions, dispatch) };
+  }
+)
 class Dashboard extends React.Component {
   constructor(props, context) {
     super(props, context);
 
     this.state = {
-      value: 0,
+      value: 0
     };
   }
 
   async componentDidMount() {
-    const { dailySalesChart, emailsSubscriptionChart, completedTasksChart } = this.props.charts;
+    const {
+      dailySalesChart,
+      emailsSubscriptionChart,
+      completedTasksChart
+    } = this.props.charts;
     const { bugs, website, server } = this.props.general;
 
     //Check and load data from Server
@@ -65,8 +72,7 @@ class Dashboard extends React.Component {
       await this.props.actions.getChartData();
 
     //Check and load data from Server
-    if (!bugs || !website || !server)
-      await this.props.actions.getGeneral();
+    if (!bugs || !website || !server) await this.props.actions.getGeneral();
   }
 
   handleChange = (_, value) => {
@@ -79,7 +85,11 @@ class Dashboard extends React.Component {
 
   render() {
     const { classes } = this.props;
-    const { dailySalesChart, emailsSubscriptionChart, completedTasksChart } = this.props.charts;
+    const {
+      dailySalesChart,
+      emailsSubscriptionChart,
+      completedTasksChart
+    } = this.props.charts;
     const { bugs, website, server } = this.props.general;
     const loading = this.props.loading;
 
@@ -165,13 +175,15 @@ class Dashboard extends React.Component {
           <GridItem xs={12} sm={12} md={4}>
             <Card chart>
               <CardHeader color="success">
-                {dailySalesChart && <ChartistGraph
-                  className="ct-chart"
-                  data={dailySalesChart.data}
-                  type="Line"
-                  options={dailySalesChart.options}
-                  listener={dailySalesChart.animation}
-                />}
+                {dailySalesChart && (
+                  <ChartistGraph
+                    className="ct-chart"
+                    data={dailySalesChart.data}
+                    type="Line"
+                    options={dailySalesChart.options}
+                    listener={dailySalesChart.animation}
+                  />
+                )}
               </CardHeader>
               <CardBody>
                 <h4 className={classes.cardTitle}>Daily Sales</h4>
@@ -192,14 +204,18 @@ class Dashboard extends React.Component {
           <GridItem xs={12} sm={12} md={4}>
             <Card chart>
               <CardHeader color="warning">
-                {emailsSubscriptionChart && <ChartistGraph
-                  className="ct-chart"
-                  data={emailsSubscriptionChart.data}
-                  type="Bar"
-                  options={emailsSubscriptionChart.options}
-                  responsiveOptions={emailsSubscriptionChart.responsiveOptions}
-                  listener={emailsSubscriptionChart.animation}
-                />}
+                {emailsSubscriptionChart && (
+                  <ChartistGraph
+                    className="ct-chart"
+                    data={emailsSubscriptionChart.data}
+                    type="Bar"
+                    options={emailsSubscriptionChart.options}
+                    responsiveOptions={
+                      emailsSubscriptionChart.responsiveOptions
+                    }
+                    listener={emailsSubscriptionChart.animation}
+                  />
+                )}
               </CardHeader>
               <CardBody>
                 <h4 className={classes.cardTitle}>Email Subscriptions</h4>
@@ -217,13 +233,15 @@ class Dashboard extends React.Component {
           <GridItem xs={12} sm={12} md={4}>
             <Card chart>
               <CardHeader color="danger">
-                {completedTasksChart && <ChartistGraph
-                  className="ct-chart"
-                  data={completedTasksChart.data}
-                  type="Line"
-                  options={completedTasksChart.options}
-                  listener={completedTasksChart.animation}
-                />}
+                {completedTasksChart && (
+                  <ChartistGraph
+                    className="ct-chart"
+                    data={completedTasksChart.data}
+                    type="Line"
+                    options={completedTasksChart.options}
+                    listener={completedTasksChart.animation}
+                  />
+                )}
               </CardHeader>
               <CardBody>
                 <h4 className={classes.cardTitle}>Completed Tasks</h4>
@@ -249,34 +267,40 @@ class Dashboard extends React.Component {
                 {
                   tabName: "Bugs",
                   tabIcon: BugReport,
-                  tabContent: (
-                    bugs ? <Tasks
+                  tabContent: bugs ? (
+                    <Tasks
                       checkedIndexes={[0, 3]}
                       tasksIndexes={[0, 1, 2, 3]}
                       tasks={bugs}
-                    /> : <p>No data</p>
+                    />
+                  ) : (
+                    <p>No data</p>
                   )
                 },
                 {
                   tabName: "Website",
                   tabIcon: Code,
-                  tabContent: (
-                    website ? <Tasks
+                  tabContent: website ? (
+                    <Tasks
                       checkedIndexes={[0]}
                       tasksIndexes={[0, 1]}
                       tasks={website}
-                    /> : <p>No data</p>
+                    />
+                  ) : (
+                    <p>No data</p>
                   )
                 },
                 {
                   tabName: "Server",
                   tabIcon: Cloud,
-                  tabContent: (
-                    server ? <Tasks
+                  tabContent: server ? (
+                    <Tasks
                       checkedIndexes={[1]}
                       tasksIndexes={[0, 1, 2]}
                       tasks={server}
-                    /> : <p>No data</p>
+                    />
+                  ) : (
+                    <p>No data</p>
                   )
                 }
               ]}
diff --git a/src/assets/jss/material-dashboard-react/views/dashboardStyle.jsx b/src/views/Dashboard/dashboardStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/views/dashboardStyle.jsx
rename to src/views/Dashboard/dashboardStyle.jsx
diff --git a/src/views/Icons/Icons.jsx b/src/views/Icons/Icons.jsx
index 7dbd571..6e70b7c 100644
--- a/src/views/Icons/Icons.jsx
+++ b/src/views/Icons/Icons.jsx
@@ -10,7 +10,7 @@ import Card from "components/Card/Card.jsx";
 import CardHeader from "components/Card/CardHeader.jsx";
 import CardBody from "components/Card/CardBody.jsx";
 
-import iconsStyle from "assets/jss/material-dashboard-react/views/iconsStyle.jsx";
+import iconsStyle from "./iconsStyle.jsx";
 
 function Icons(props) {
   const { classes } = props;
diff --git a/src/assets/jss/material-dashboard-react/views/iconsStyle.jsx b/src/views/Icons/iconsStyle.jsx
similarity index 100%
rename from src/assets/jss/material-dashboard-react/views/iconsStyle.jsx
rename to src/views/Icons/iconsStyle.jsx

From 441832a43ab1da7830922b37ed2e2ad216aeb899 Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Sat, 14 Jul 2018 19:17:05 +0800
Subject: [PATCH 09/14] update style

---
 src/assets/jss/material-dashboard-react.jsx              | 2 +-
 src/assets/jss/material-dashboard-react/tooltipStyle.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/jss/material-dashboard-react.jsx b/src/assets/jss/material-dashboard-react.jsx
index b9d088d..aa661d5 100644
--- a/src/assets/jss/material-dashboard-react.jsx
+++ b/src/assets/jss/material-dashboard-react.jsx
@@ -48,7 +48,7 @@ const card = {
 };
 
 const defaultFont = {
-  fontFamily: '"Roboto", "Helvetica", "Arial", sans-serif',
+  fontFamily: "'Roboto', 'Helvetica', 'Arial', sans-serif",
   fontWeight: "300",
   lineHeight: "1.5em"
 };
diff --git a/src/assets/jss/material-dashboard-react/tooltipStyle.jsx b/src/assets/jss/material-dashboard-react/tooltipStyle.jsx
index a36af7e..2df738f 100644
--- a/src/assets/jss/material-dashboard-react/tooltipStyle.jsx
+++ b/src/assets/jss/material-dashboard-react/tooltipStyle.jsx
@@ -11,7 +11,7 @@ const tooltipStyle = {
       "0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.2)",
     maxWidth: "200px",
     textAlign: "center",
-    fontFamily: '"Helvetica Neue",Helvetica,Arial,sans-serif',
+    fontFamily: "'Helvetica Neue',Helvetica,Arial,sans-serif",
     fontSize: "12px",
     fontStyle: "normal",
     fontWeight: "400",

From 2dc6626675f5090c06e25c67b27cbb13b23f528e Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Sat, 14 Jul 2018 19:18:19 +0800
Subject: [PATCH 10/14] remobe bit

---
 .bitmap  | 462 -------------------------------------------------------
 bit.json |   6 -
 2 files changed, 468 deletions(-)
 delete mode 100644 .bitmap
 delete mode 100644 bit.json

diff --git a/.bitmap b/.bitmap
deleted file mode 100644
index f135336..0000000
--- a/.bitmap
+++ /dev/null
@@ -1,462 +0,0 @@
-/* THIS IS A BIT-AUTO-GENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. */
-
-{
-    "react-start-kit/src": {
-        "files": [
-            {
-                "relativePath": "src/api/chartApi.js",
-                "test": false,
-                "name": "chartApi.js"
-            },
-            {
-                "relativePath": "src/api/generalApi.js",
-                "test": false,
-                "name": "generalApi.js"
-            },
-            {
-                "relativePath": "src/api/index.js",
-                "test": false,
-                "name": "index.js"
-            },
-            {
-                "relativePath": "src/assets/img/apple-icon.png",
-                "test": false,
-                "name": "apple-icon.png"
-            },
-            {
-                "relativePath": "src/assets/img/cover.jpeg",
-                "test": false,
-                "name": "cover.jpeg"
-            },
-            {
-                "relativePath": "src/assets/img/faces/marc.jpg",
-                "test": false,
-                "name": "marc.jpg"
-            },
-            {
-                "relativePath": "src/assets/img/favicon.png",
-                "test": false,
-                "name": "favicon.png"
-            },
-            {
-                "relativePath": "src/assets/img/mask.png",
-                "test": false,
-                "name": "mask.png"
-            },
-            {
-                "relativePath": "src/assets/img/new_logo.png",
-                "test": false,
-                "name": "new_logo.png"
-            },
-            {
-                "relativePath": "src/assets/img/react_logo.svg",
-                "test": false,
-                "name": "react_logo.svg"
-            },
-            {
-                "relativePath": "src/assets/img/sidebar-1.jpg",
-                "test": false,
-                "name": "sidebar-1.jpg"
-            },
-            {
-                "relativePath": "src/assets/img/sidebar-2.jpg",
-                "test": false,
-                "name": "sidebar-2.jpg"
-            },
-            {
-                "relativePath": "src/assets/img/sidebar-3.jpg",
-                "test": false,
-                "name": "sidebar-3.jpg"
-            },
-            {
-                "relativePath": "src/assets/img/sidebar-4.jpg",
-                "test": false,
-                "name": "sidebar-4.jpg"
-            },
-            {
-                "relativePath": "src/assets/img/tim_80x80.png",
-                "test": false,
-                "name": "tim_80x80.png"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react.jsx",
-                "test": false,
-                "name": "material-dashboard-react.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/cardImagesStyles.jsx",
-                "test": false,
-                "name": "cardImagesStyles.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/checkboxAdnRadioStyle.jsx",
-                "test": false,
-                "name": "checkboxAdnRadioStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/buttonStyle.jsx",
-                "test": false,
-                "name": "buttonStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/cardAvatarStyle.jsx",
-                "test": false,
-                "name": "cardAvatarStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/cardBodyStyle.jsx",
-                "test": false,
-                "name": "cardBodyStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/cardFooterStyle.jsx",
-                "test": false,
-                "name": "cardFooterStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/cardHeaderStyle.jsx",
-                "test": false,
-                "name": "cardHeaderStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/cardIconStyle.jsx",
-                "test": false,
-                "name": "cardIconStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/cardStyle.jsx",
-                "test": false,
-                "name": "cardStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/customInputStyle.jsx",
-                "test": false,
-                "name": "customInputStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/customTabsStyle.jsx",
-                "test": false,
-                "name": "customTabsStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/footerStyle.jsx",
-                "test": false,
-                "name": "footerStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/headerLinksStyle.jsx",
-                "test": false,
-                "name": "headerLinksStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/headerStyle.jsx",
-                "test": false,
-                "name": "headerStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/sidebarStyle.jsx",
-                "test": false,
-                "name": "sidebarStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/snackbarContentStyle.jsx",
-                "test": false,
-                "name": "snackbarContentStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/tableStyle.jsx",
-                "test": false,
-                "name": "tableStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/tasksStyle.jsx",
-                "test": false,
-                "name": "tasksStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/components/typographyStyle.jsx",
-                "test": false,
-                "name": "typographyStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/dropdownStyle.jsx",
-                "test": false,
-                "name": "dropdownStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/layouts/dashboardStyle.jsx",
-                "test": false,
-                "name": "dashboardStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/tooltipStyle.jsx",
-                "test": false,
-                "name": "tooltipStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/views/dashboardStyle.jsx",
-                "test": false,
-                "name": "dashboardStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/jss/material-dashboard-react/views/iconsStyle.jsx",
-                "test": false,
-                "name": "iconsStyle.jsx"
-            },
-            {
-                "relativePath": "src/assets/less/material-dashboard-react.less",
-                "test": false,
-                "name": "material-dashboard-react.less"
-            },
-            {
-                "relativePath": "src/components/Card/Card.jsx",
-                "test": false,
-                "name": "Card.jsx"
-            },
-            {
-                "relativePath": "src/components/Card/CardAvatar.jsx",
-                "test": false,
-                "name": "CardAvatar.jsx"
-            },
-            {
-                "relativePath": "src/components/Card/CardBody.jsx",
-                "test": false,
-                "name": "CardBody.jsx"
-            },
-            {
-                "relativePath": "src/components/Card/CardFooter.jsx",
-                "test": false,
-                "name": "CardFooter.jsx"
-            },
-            {
-                "relativePath": "src/components/Card/CardHeader.jsx",
-                "test": false,
-                "name": "CardHeader.jsx"
-            },
-            {
-                "relativePath": "src/components/Card/CardIcon.jsx",
-                "test": false,
-                "name": "CardIcon.jsx"
-            },
-            {
-                "relativePath": "src/components/CustomButtons/Button.jsx",
-                "test": false,
-                "name": "Button.jsx"
-            },
-            {
-                "relativePath": "src/components/CustomInput/CustomInput.jsx",
-                "test": false,
-                "name": "CustomInput.jsx"
-            },
-            {
-                "relativePath": "src/components/CustomTabs/CustomTabs.jsx",
-                "test": false,
-                "name": "CustomTabs.jsx"
-            },
-            {
-                "relativePath": "src/components/Footer/Footer.jsx",
-                "test": false,
-                "name": "Footer.jsx"
-            },
-            {
-                "relativePath": "src/components/Grid/GridItem.jsx",
-                "test": false,
-                "name": "GridItem.jsx"
-            },
-            {
-                "relativePath": "src/components/Header/Header.jsx",
-                "test": false,
-                "name": "Header.jsx"
-            },
-            {
-                "relativePath": "src/components/Header/HeaderLinks.jsx",
-                "test": false,
-                "name": "HeaderLinks.jsx"
-            },
-            {
-                "relativePath": "src/components/Sidebar/Sidebar.jsx",
-                "test": false,
-                "name": "Sidebar.jsx"
-            },
-            {
-                "relativePath": "src/components/Snackbar/Snackbar.jsx",
-                "test": false,
-                "name": "Snackbar.jsx"
-            },
-            {
-                "relativePath": "src/components/Snackbar/SnackbarContent.jsx",
-                "test": false,
-                "name": "SnackbarContent.jsx"
-            },
-            {
-                "relativePath": "src/components/Table/Table.jsx",
-                "test": false,
-                "name": "Table.jsx"
-            },
-            {
-                "relativePath": "src/components/Tasks/Tasks.jsx",
-                "test": false,
-                "name": "Tasks.jsx"
-            },
-            {
-                "relativePath": "src/components/Typography/Danger.jsx",
-                "test": false,
-                "name": "Danger.jsx"
-            },
-            {
-                "relativePath": "src/components/Typography/Info.jsx",
-                "test": false,
-                "name": "Info.jsx"
-            },
-            {
-                "relativePath": "src/components/Typography/Muted.jsx",
-                "test": false,
-                "name": "Muted.jsx"
-            },
-            {
-                "relativePath": "src/components/Typography/Primary.jsx",
-                "test": false,
-                "name": "Primary.jsx"
-            },
-            {
-                "relativePath": "src/components/Typography/Quote.jsx",
-                "test": false,
-                "name": "Quote.jsx"
-            },
-            {
-                "relativePath": "src/components/Typography/Success.jsx",
-                "test": false,
-                "name": "Success.jsx"
-            },
-            {
-                "relativePath": "src/components/Typography/Warning.jsx",
-                "test": false,
-                "name": "Warning.jsx"
-            },
-            {
-                "relativePath": "src/envconfigs/dev.js",
-                "test": false,
-                "name": "dev.js"
-            },
-            {
-                "relativePath": "src/envconfigs/index.js",
-                "test": false,
-                "name": "index.js"
-            },
-            {
-                "relativePath": "src/envconfigs/prd.js",
-                "test": false,
-                "name": "prd.js"
-            },
-            {
-                "relativePath": "src/index.html.ejs",
-                "test": false,
-                "name": "index.html.ejs"
-            },
-            {
-                "relativePath": "src/index.jsx",
-                "test": false,
-                "name": "index.jsx"
-            },
-            {
-                "relativePath": "src/layouts/Dashboard/Dashboard.jsx",
-                "test": false,
-                "name": "Dashboard.jsx"
-            },
-            {
-                "relativePath": "src/logo.svg",
-                "test": false,
-                "name": "logo.svg"
-            },
-            {
-                "relativePath": "src/reducers/index.js",
-                "test": false,
-                "name": "index.js"
-            },
-            {
-                "relativePath": "src/reducers/initialState.js",
-                "test": false,
-                "name": "initialState.js"
-            },
-            {
-                "relativePath": "src/routes/dashboard.jsx",
-                "test": false,
-                "name": "dashboard.jsx"
-            },
-            {
-                "relativePath": "src/routes/index.jsx",
-                "test": false,
-                "name": "index.jsx"
-            },
-            {
-                "relativePath": "src/store/dev.js",
-                "test": false,
-                "name": "dev.js"
-            },
-            {
-                "relativePath": "src/store/index.js",
-                "test": false,
-                "name": "index.js"
-            },
-            {
-                "relativePath": "src/store/prd.js",
-                "test": false,
-                "name": "prd.js"
-            },
-            {
-                "relativePath": "src/views/Dashboard/Actions.js",
-                "test": false,
-                "name": "Actions.js"
-            },
-            {
-                "relativePath": "src/views/Dashboard/Dashboard.jsx",
-                "test": false,
-                "name": "Dashboard.jsx"
-            },
-            {
-                "relativePath": "src/views/Dashboard/Reducer.jsx",
-                "test": false,
-                "name": "Reducer.jsx"
-            },
-            {
-                "relativePath": "src/views/Icons/Icons.jsx",
-                "test": false,
-                "name": "Icons.jsx"
-            },
-            {
-                "relativePath": "src/views/Maps/Maps.jsx",
-                "test": false,
-                "name": "Maps.jsx"
-            },
-            {
-                "relativePath": "src/views/Notifications/Notifications.jsx",
-                "test": false,
-                "name": "Notifications.jsx"
-            },
-            {
-                "relativePath": "src/views/TableList/TableList.jsx",
-                "test": false,
-                "name": "TableList.jsx"
-            },
-            {
-                "relativePath": "src/views/Typography/Typography.jsx",
-                "test": false,
-                "name": "Typography.jsx"
-            },
-            {
-                "relativePath": "src/views/UpgradeToPro/UpgradeToPro.jsx",
-                "test": false,
-                "name": "UpgradeToPro.jsx"
-            },
-            {
-                "relativePath": "src/views/UserProfile/UserProfile.jsx",
-                "test": false,
-                "name": "UserProfile.jsx"
-            }
-        ],
-        "mainFile": "src/api/index.js",
-        "trackDir": "src",
-        "origin": "AUTHORED"
-    },
-    "version": "13.0.1"
-}
\ No newline at end of file
diff --git a/bit.json b/bit.json
deleted file mode 100644
index a453bd5..0000000
--- a/bit.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "env": {},
-    "dependencies": {},
-    "componentsDefaultDirectory": "components/{namespace}/{name}",
-    "packageManager": "npm"
-}
\ No newline at end of file

From 3908b50add3990eed0a793a8751df77fa32c9df1 Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Sat, 14 Jul 2018 19:23:43 +0800
Subject: [PATCH 11/14] update to latest packages

---
 package-lock.json | 2283 +++++++++++----------------------------------
 package.json      |   16 +-
 2 files changed, 575 insertions(+), 1724 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4f8a861..26c2c86 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -716,7 +716,6 @@
             "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
             "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "arr-flatten": "1.1.0"
             }
@@ -780,8 +779,7 @@
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
             "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "arrify": {
             "version": "1.0.1",
@@ -962,9 +960,9 @@
             }
         },
         "babel-eslint": {
-            "version": "8.2.5",
-            "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.5.tgz",
-            "integrity": "sha512-TcdEGCHHquOPQOlH6Fe6MLwPWWWJLdeKhcGoLfOTShETpoH8XYWhjWJw38KCKaTca7c/EdxLolnbakixKxnXDg==",
+            "version": "8.2.6",
+            "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.6.tgz",
+            "integrity": "sha512-aCdHjhzcILdP8c9lej7hvXKvQieyRt20SF102SIGyY4cUIiw6UaAtK4j2o3dXX74jEmy0TJ0CEhv4fTIM3SzcA==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "7.0.0-beta.44",
@@ -1148,9 +1146,9 @@
             }
         },
         "babel-jest": {
-            "version": "23.2.0",
-            "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-23.2.0.tgz",
-            "integrity": "sha1-FKnWo/QSLf6mBp03CFrfJqU6Tbo=",
+            "version": "23.4.0",
+            "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-23.4.0.tgz",
+            "integrity": "sha1-IsNMOS4hdvakw2eZKn/P9p0uhVc=",
             "dev": true,
             "requires": {
                 "babel-plugin-istanbul": "4.1.6",
@@ -1982,7 +1980,6 @@
             "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
             "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "expand-range": "1.8.2",
                 "preserve": "0.2.0",
@@ -2044,19 +2041,20 @@
             "dev": true,
             "requires": {
                 "browserify-aes": "1.2.0",
-                "browserify-des": "1.0.1",
+                "browserify-des": "1.0.2",
                 "evp_bytestokey": "1.0.3"
             }
         },
         "browserify-des": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz",
-            "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==",
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+            "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
             "dev": true,
             "requires": {
                 "cipher-base": "1.0.4",
                 "des.js": "1.0.0",
-                "inherits": "2.0.3"
+                "inherits": "2.0.3",
+                "safe-buffer": "5.1.2"
             }
         },
         "browserify-rsa": {
@@ -2504,12 +2502,6 @@
                 }
             }
         },
-        "clorox": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/clorox/-/clorox-1.0.3.tgz",
-            "integrity": "sha512-w3gKAUKMJYmmaJyc+p+iDrDtLvsFasrx/y6/zWo2U1TZfsz3y4Vl4T9PHCZrOwk1eMTOSRI6xHdpDR4PhTdy8Q==",
-            "dev": true
-        },
         "co": {
             "version": "4.6.0",
             "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -3469,7 +3461,7 @@
             "requires": {
                 "bn.js": "4.11.8",
                 "brorand": "1.1.0",
-                "hash.js": "1.1.4",
+                "hash.js": "1.1.5",
                 "hmac-drbg": "1.0.1",
                 "inherits": "2.0.3",
                 "minimalistic-assert": "1.0.1",
@@ -3695,9 +3687,9 @@
             }
         },
         "eslint": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.0.1.tgz",
-            "integrity": "sha512-D5nG2rErquLUstgUaxJlWB5+gu+U/3VDY0fk/Iuq8y9CUFy/7Y6oF4N2cR1tV8knzQvciIbfqfohd359xTLIKQ==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.1.0.tgz",
+            "integrity": "sha512-DyH6JsoA1KzA5+OSWFjg56DFJT+sDLO0yokaPZ9qY0UEmYrPA1gEX/G1MnVkmRDsksG4H1foIVz2ZXXM3hHYvw==",
             "dev": true,
             "requires": {
                 "ajv": "6.5.2",
@@ -3707,6 +3699,7 @@
                 "debug": "3.1.0",
                 "doctrine": "2.1.0",
                 "eslint-scope": "4.0.0",
+                "eslint-utils": "1.3.1",
                 "eslint-visitor-keys": "1.0.0",
                 "espree": "4.0.0",
                 "esquery": "1.0.1",
@@ -3785,28 +3778,12 @@
                         "estraverse": "4.2.0"
                     }
                 },
-                "esprima": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-                    "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
-                    "dev": true
-                },
                 "globals": {
                     "version": "11.7.0",
                     "resolved": "https://registry.npmjs.org/globals/-/globals-11.7.0.tgz",
                     "integrity": "sha512-K8BNSPySfeShBQXsahYB/AbbWruVOTyVpgoIDnl8odPpeSfP2J5QO2oLFFdl2j7GfDCtZj2bMKar2T49itTPCg==",
                     "dev": true
                 },
-                "js-yaml": {
-                    "version": "3.12.0",
-                    "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-                    "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
-                    "dev": true,
-                    "requires": {
-                        "argparse": "1.0.10",
-                        "esprima": "4.0.0"
-                    }
-                },
                 "strip-ansi": {
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
@@ -3849,6 +3826,12 @@
                 "estraverse": "4.2.0"
             }
         },
+        "eslint-utils": {
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz",
+            "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==",
+            "dev": true
+        },
         "eslint-visitor-keys": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
@@ -3866,9 +3849,9 @@
             }
         },
         "esprima": {
-            "version": "2.7.3",
-            "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-            "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
             "dev": true
         },
         "esquery": {
@@ -3986,7 +3969,6 @@
             "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
             "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "is-posix-bracket": "0.1.1"
             }
@@ -3996,22 +3978,21 @@
             "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
             "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "fill-range": "2.2.4"
             }
         },
         "expect": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/expect/-/expect-23.3.0.tgz",
-            "integrity": "sha1-7LBRrcvcQKxNtXbBYGfxL9sTzGE=",
+            "version": "23.4.0",
+            "resolved": "https://registry.npmjs.org/expect/-/expect-23.4.0.tgz",
+            "integrity": "sha1-baTsyZwUcSU+cogziYOtHrrbYMM=",
             "dev": true,
             "requires": {
                 "ansi-styles": "3.2.1",
                 "jest-diff": "23.2.0",
                 "jest-get-type": "22.4.3",
                 "jest-matcher-utils": "23.2.0",
-                "jest-message-util": "23.3.0",
+                "jest-message-util": "23.4.0",
                 "jest-regex-util": "23.3.0"
             },
             "dependencies": {
@@ -4121,7 +4102,6 @@
             "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
             "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "is-extglob": "1.0.0"
             }
@@ -4552,8 +4532,7 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
             "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "fileset": {
             "version": "2.0.3",
@@ -4570,7 +4549,6 @@
             "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
             "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "is-number": "2.1.0",
                 "isobject": "2.1.0",
@@ -4583,15 +4561,13 @@
                     "version": "1.0.0",
                     "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
                     "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "isobject": {
                     "version": "2.1.0",
                     "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
                     "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
                     "dev": true,
-                    "optional": true,
                     "requires": {
                         "isarray": "1.0.0"
                     }
@@ -4702,7 +4678,6 @@
             "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
             "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "for-in": "1.0.2"
             }
@@ -5389,7 +5364,6 @@
             "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
             "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "glob-parent": "2.0.0",
                 "is-glob": "2.0.1"
@@ -5687,9 +5661,9 @@
             }
         },
         "hash.js": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz",
-            "integrity": "sha512-A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw==",
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.5.tgz",
+            "integrity": "sha512-eWI5HG9Np+eHV1KQhisXWwM+4EPPYe5dFX1UZZH7k/E3JzDEazVH+VGlZi6R94ZqImq+A3D1mCEtrFIfg/E7sA==",
             "dev": true,
             "requires": {
                 "inherits": "2.0.3",
@@ -5730,7 +5704,7 @@
             "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
             "dev": true,
             "requires": {
-                "hash.js": "1.1.4",
+                "hash.js": "1.1.5",
                 "minimalistic-assert": "1.0.1",
                 "minimalistic-crypto-utils": "1.0.1"
             }
@@ -6365,6 +6339,32 @@
                 "loader-utils": "1.1.0"
             }
         },
+        "import-cwd": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+            "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+            "dev": true,
+            "requires": {
+                "import-from": "2.1.0"
+            }
+        },
+        "import-from": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+            "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+            "dev": true,
+            "requires": {
+                "resolve-from": "3.0.0"
+            },
+            "dependencies": {
+                "resolve-from": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+                    "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+                    "dev": true
+                }
+            }
+        },
         "import-local": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz",
@@ -6638,15 +6638,13 @@
             "version": "1.0.3",
             "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
             "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "is-equal-shallow": {
             "version": "0.1.3",
             "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
             "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "is-primitive": "2.0.0"
             }
@@ -6708,7 +6706,6 @@
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
             "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "kind-of": "3.2.2"
             }
@@ -6755,15 +6752,13 @@
             "version": "0.1.1",
             "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
             "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "is-primitive": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
             "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "is-promise": {
             "version": "2.1.0",
@@ -6879,7 +6874,7 @@
                 "istanbul-lib-report": "1.1.4",
                 "istanbul-lib-source-maps": "1.2.5",
                 "istanbul-reports": "1.3.0",
-                "js-yaml": "3.7.0",
+                "js-yaml": "3.12.0",
                 "mkdirp": "0.5.1",
                 "once": "1.4.0"
             }
@@ -6977,13 +6972,13 @@
             }
         },
         "jest": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/jest/-/jest-23.3.0.tgz",
-            "integrity": "sha1-E1XNeS84zyD7pNoC3dt8oU2UhLU=",
+            "version": "23.4.1",
+            "resolved": "https://registry.npmjs.org/jest/-/jest-23.4.1.tgz",
+            "integrity": "sha512-HTOuA9epknN7RKdzhmp9qrbP0z3TibAMXI+sluLOcrEoF54ZCG8/urFB2DK/sOINcMeyX6epMUqka8i0+d0xOA==",
             "dev": true,
             "requires": {
                 "import-local": "1.0.0",
-                "jest-cli": "23.3.0"
+                "jest-cli": "23.4.1"
             },
             "dependencies": {
                 "ansi-regex": {
@@ -7001,45 +6996,161 @@
                         "color-convert": "1.9.2"
                     }
                 },
-                "arr-diff": {
+                "chalk": {
+                    "version": "2.4.1",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+                    "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-styles": "3.2.1",
+                        "escape-string-regexp": "1.0.5",
+                        "supports-color": "5.4.0"
+                    }
+                },
+                "jest-cli": {
+                    "version": "23.4.1",
+                    "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-23.4.1.tgz",
+                    "integrity": "sha512-Cmd7bex+kYmMGwGrIh/crwUieUFr+4PCTaK32tEA0dm0wklXV8zGgWh8n+8WbhsFPNzacolxdtcfBKIorcV5FQ==",
+                    "dev": true,
+                    "requires": {
+                        "ansi-escapes": "3.1.0",
+                        "chalk": "2.4.1",
+                        "exit": "0.1.2",
+                        "glob": "7.1.2",
+                        "graceful-fs": "4.1.11",
+                        "import-local": "1.0.0",
+                        "is-ci": "1.1.0",
+                        "istanbul-api": "1.3.1",
+                        "istanbul-lib-coverage": "1.2.0",
+                        "istanbul-lib-instrument": "1.10.1",
+                        "istanbul-lib-source-maps": "1.2.5",
+                        "jest-changed-files": "23.4.0",
+                        "jest-config": "23.4.1",
+                        "jest-environment-jsdom": "23.4.0",
+                        "jest-get-type": "22.4.3",
+                        "jest-haste-map": "23.4.1",
+                        "jest-message-util": "23.4.0",
+                        "jest-regex-util": "23.3.0",
+                        "jest-resolve-dependencies": "23.4.1",
+                        "jest-runner": "23.4.1",
+                        "jest-runtime": "23.4.1",
+                        "jest-snapshot": "23.4.1",
+                        "jest-util": "23.4.0",
+                        "jest-validate": "23.4.0",
+                        "jest-watcher": "23.4.0",
+                        "jest-worker": "23.2.0",
+                        "micromatch": "2.3.11",
+                        "node-notifier": "5.2.1",
+                        "prompts": "0.1.12",
+                        "realpath-native": "1.0.1",
+                        "rimraf": "2.6.2",
+                        "slash": "1.0.0",
+                        "string-length": "2.0.0",
+                        "strip-ansi": "4.0.0",
+                        "which": "1.3.1",
+                        "yargs": "11.0.0"
+                    }
+                },
+                "strip-ansi": {
                     "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-                    "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-                    "dev": true
+                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+                    "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+                    "dev": true,
+                    "requires": {
+                        "ansi-regex": "3.0.0"
+                    }
                 },
-                "array-unique": {
-                    "version": "0.3.2",
-                    "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-                    "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-                    "dev": true
+                "supports-color": {
+                    "version": "5.4.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "3.0.0"
+                    }
+                }
+            }
+        },
+        "jest-changed-files": {
+            "version": "23.4.0",
+            "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-23.4.0.tgz",
+            "integrity": "sha1-8bME+YwjWvXZox7FJCYsXk3jxv8=",
+            "dev": true,
+            "requires": {
+                "throat": "4.1.0"
+            }
+        },
+        "jest-config": {
+            "version": "23.4.1",
+            "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-23.4.1.tgz",
+            "integrity": "sha512-OT29qlcw9Iw7u0PC04wD9tjLJL4vpGdMZrrHMFwYSO3HxOikbHywjmtQ7rntW4qvBcpbi7iCMTPPRmpDjImQEw==",
+            "dev": true,
+            "requires": {
+                "babel-core": "6.26.3",
+                "babel-jest": "23.4.0",
+                "chalk": "2.4.1",
+                "glob": "7.1.2",
+                "jest-environment-jsdom": "23.4.0",
+                "jest-environment-node": "23.4.0",
+                "jest-get-type": "22.4.3",
+                "jest-jasmine2": "23.4.1",
+                "jest-regex-util": "23.3.0",
+                "jest-resolve": "23.4.1",
+                "jest-util": "23.4.0",
+                "jest-validate": "23.4.0",
+                "pretty-format": "23.2.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+                    "dev": true,
+                    "requires": {
+                        "color-convert": "1.9.2"
+                    }
                 },
-                "braces": {
-                    "version": "2.3.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-                    "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+                "chalk": {
+                    "version": "2.4.1",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+                    "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
                     "dev": true,
                     "requires": {
-                        "arr-flatten": "1.1.0",
-                        "array-unique": "0.3.2",
-                        "extend-shallow": "2.0.1",
-                        "fill-range": "4.0.0",
-                        "isobject": "3.0.1",
-                        "repeat-element": "1.1.2",
-                        "snapdragon": "0.8.2",
-                        "snapdragon-node": "2.1.1",
-                        "split-string": "3.1.0",
-                        "to-regex": "3.0.2"
-                    },
-                    "dependencies": {
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        }
+                        "ansi-styles": "3.2.1",
+                        "escape-string-regexp": "1.0.5",
+                        "supports-color": "5.4.0"
+                    }
+                },
+                "supports-color": {
+                    "version": "5.4.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "3.0.0"
+                    }
+                }
+            }
+        },
+        "jest-diff": {
+            "version": "23.2.0",
+            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.2.0.tgz",
+            "integrity": "sha1-nyz0tR4Sx5FVAgCrwWtHEwrxBio=",
+            "dev": true,
+            "requires": {
+                "chalk": "2.4.1",
+                "diff": "3.5.0",
+                "jest-get-type": "22.4.3",
+                "pretty-format": "23.2.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+                    "dev": true,
+                    "requires": {
+                        "color-convert": "1.9.2"
                     }
                 },
                 "chalk": {
@@ -7053,1163 +7164,146 @@
                         "supports-color": "5.4.0"
                     }
                 },
-                "expand-brackets": {
-                    "version": "2.1.4",
-                    "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-                    "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+                "supports-color": {
+                    "version": "5.4.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
                     "dev": true,
                     "requires": {
-                        "debug": "2.6.9",
-                        "define-property": "0.2.5",
-                        "extend-shallow": "2.0.1",
-                        "posix-character-classes": "0.1.1",
-                        "regex-not": "1.0.2",
-                        "snapdragon": "0.8.2",
-                        "to-regex": "3.0.2"
-                    },
-                    "dependencies": {
-                        "define-property": {
-                            "version": "0.2.5",
-                            "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                            "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                            "dev": true,
-                            "requires": {
-                                "is-descriptor": "0.1.6"
-                            }
-                        },
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        },
-                        "is-accessor-descriptor": {
-                            "version": "0.1.6",
-                            "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-                            "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-                            "dev": true,
-                            "requires": {
-                                "kind-of": "3.2.2"
-                            },
-                            "dependencies": {
-                                "kind-of": {
-                                    "version": "3.2.2",
-                                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                    "dev": true,
-                                    "requires": {
-                                        "is-buffer": "1.1.6"
-                                    }
-                                }
-                            }
-                        },
-                        "is-data-descriptor": {
-                            "version": "0.1.4",
-                            "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-                            "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-                            "dev": true,
-                            "requires": {
-                                "kind-of": "3.2.2"
-                            },
-                            "dependencies": {
-                                "kind-of": {
-                                    "version": "3.2.2",
-                                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                    "dev": true,
-                                    "requires": {
-                                        "is-buffer": "1.1.6"
-                                    }
-                                }
-                            }
-                        },
-                        "is-descriptor": {
-                            "version": "0.1.6",
-                            "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                            "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                            "dev": true,
-                            "requires": {
-                                "is-accessor-descriptor": "0.1.6",
-                                "is-data-descriptor": "0.1.4",
-                                "kind-of": "5.1.0"
-                            }
-                        },
-                        "kind-of": {
-                            "version": "5.1.0",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                            "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                            "dev": true
-                        }
-                    }
-                },
-                "extglob": {
-                    "version": "2.0.4",
-                    "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-                    "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-                    "dev": true,
-                    "requires": {
-                        "array-unique": "0.3.2",
-                        "define-property": "1.0.0",
-                        "expand-brackets": "2.1.4",
-                        "extend-shallow": "2.0.1",
-                        "fragment-cache": "0.2.1",
-                        "regex-not": "1.0.2",
-                        "snapdragon": "0.8.2",
-                        "to-regex": "3.0.2"
-                    },
-                    "dependencies": {
-                        "define-property": {
-                            "version": "1.0.0",
-                            "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-                            "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-                            "dev": true,
-                            "requires": {
-                                "is-descriptor": "1.0.2"
-                            }
-                        },
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        }
-                    }
-                },
-                "fill-range": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-                    "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-                    "dev": true,
-                    "requires": {
-                        "extend-shallow": "2.0.1",
-                        "is-number": "3.0.0",
-                        "repeat-string": "1.6.1",
-                        "to-regex-range": "2.1.1"
-                    },
-                    "dependencies": {
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        }
-                    }
-                },
-                "is-accessor-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "6.0.2"
-                    }
-                },
-                "is-data-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "6.0.2"
-                    }
-                },
-                "is-descriptor": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-                    "dev": true,
-                    "requires": {
-                        "is-accessor-descriptor": "1.0.0",
-                        "is-data-descriptor": "1.0.0",
-                        "kind-of": "6.0.2"
-                    }
-                },
-                "is-number": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-                    "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
-                    }
-                },
-                "jest-cli": {
-                    "version": "23.3.0",
-                    "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-23.3.0.tgz",
-                    "integrity": "sha1-MH6b53M0Q7eJqCedaUBU0FGp5eI=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-escapes": "3.1.0",
-                        "chalk": "2.4.1",
-                        "exit": "0.1.2",
-                        "glob": "7.1.2",
-                        "graceful-fs": "4.1.11",
-                        "import-local": "1.0.0",
-                        "is-ci": "1.1.0",
-                        "istanbul-api": "1.3.1",
-                        "istanbul-lib-coverage": "1.2.0",
-                        "istanbul-lib-instrument": "1.10.1",
-                        "istanbul-lib-source-maps": "1.2.5",
-                        "jest-changed-files": "23.2.0",
-                        "jest-config": "23.3.0",
-                        "jest-environment-jsdom": "23.3.0",
-                        "jest-get-type": "22.4.3",
-                        "jest-haste-map": "23.2.0",
-                        "jest-message-util": "23.3.0",
-                        "jest-regex-util": "23.3.0",
-                        "jest-resolve-dependencies": "23.3.0",
-                        "jest-runner": "23.3.0",
-                        "jest-runtime": "23.3.0",
-                        "jest-snapshot": "23.3.0",
-                        "jest-util": "23.3.0",
-                        "jest-validate": "23.3.0",
-                        "jest-watcher": "23.2.0",
-                        "jest-worker": "23.2.0",
-                        "micromatch": "3.1.10",
-                        "node-notifier": "5.2.1",
-                        "prompts": "0.1.10",
-                        "realpath-native": "1.0.1",
-                        "rimraf": "2.6.2",
-                        "slash": "1.0.0",
-                        "string-length": "2.0.0",
-                        "strip-ansi": "4.0.0",
-                        "which": "1.3.1",
-                        "yargs": "11.0.0"
-                    }
-                },
-                "kind-of": {
-                    "version": "6.0.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-                    "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-                    "dev": true
-                },
-                "micromatch": {
-                    "version": "3.1.10",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-                    "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-                    "dev": true,
-                    "requires": {
-                        "arr-diff": "4.0.0",
-                        "array-unique": "0.3.2",
-                        "braces": "2.3.2",
-                        "define-property": "2.0.2",
-                        "extend-shallow": "3.0.2",
-                        "extglob": "2.0.4",
-                        "fragment-cache": "0.2.1",
-                        "kind-of": "6.0.2",
-                        "nanomatch": "1.2.13",
-                        "object.pick": "1.3.0",
-                        "regex-not": "1.0.2",
-                        "snapdragon": "0.8.2",
-                        "to-regex": "3.0.2"
-                    }
-                },
-                "strip-ansi": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-                    "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-                    "dev": true,
-                    "requires": {
-                        "ansi-regex": "3.0.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "5.4.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "3.0.0"
-                    }
-                }
-            }
-        },
-        "jest-changed-files": {
-            "version": "23.2.0",
-            "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-23.2.0.tgz",
-            "integrity": "sha1-oUWm5LZtASn8fJnO4TTck3pkPZw=",
-            "dev": true,
-            "requires": {
-                "throat": "4.1.0"
-            }
-        },
-        "jest-config": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-23.3.0.tgz",
-            "integrity": "sha1-u01Ttw+VAPr933GNImq7U7E7gyM=",
-            "dev": true,
-            "requires": {
-                "babel-core": "6.26.3",
-                "babel-jest": "23.2.0",
-                "chalk": "2.4.1",
-                "glob": "7.1.2",
-                "jest-environment-jsdom": "23.3.0",
-                "jest-environment-node": "23.3.0",
-                "jest-get-type": "22.4.3",
-                "jest-jasmine2": "23.3.0",
-                "jest-regex-util": "23.3.0",
-                "jest-resolve": "23.2.0",
-                "jest-util": "23.3.0",
-                "jest-validate": "23.3.0",
-                "pretty-format": "23.2.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "1.9.2"
-                    }
-                },
-                "chalk": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-                    "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "3.2.1",
-                        "escape-string-regexp": "1.0.5",
-                        "supports-color": "5.4.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "5.4.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "3.0.0"
-                    }
-                }
-            }
-        },
-        "jest-diff": {
-            "version": "23.2.0",
-            "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-23.2.0.tgz",
-            "integrity": "sha1-nyz0tR4Sx5FVAgCrwWtHEwrxBio=",
-            "dev": true,
-            "requires": {
-                "chalk": "2.4.1",
-                "diff": "3.5.0",
-                "jest-get-type": "22.4.3",
-                "pretty-format": "23.2.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "1.9.2"
-                    }
-                },
-                "chalk": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-                    "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "3.2.1",
-                        "escape-string-regexp": "1.0.5",
-                        "supports-color": "5.4.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "5.4.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "3.0.0"
-                    }
-                }
-            }
-        },
-        "jest-docblock": {
-            "version": "23.2.0",
-            "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-23.2.0.tgz",
-            "integrity": "sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=",
-            "dev": true,
-            "requires": {
-                "detect-newline": "2.1.0"
-            }
-        },
-        "jest-each": {
-            "version": "23.2.0",
-            "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-23.2.0.tgz",
-            "integrity": "sha1-pAD4HIVwg/UMT1M5mxCfEgI/sZ0=",
-            "dev": true,
-            "requires": {
-                "chalk": "2.4.1",
-                "pretty-format": "23.2.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "1.9.2"
-                    }
-                },
-                "chalk": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-                    "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "3.2.1",
-                        "escape-string-regexp": "1.0.5",
-                        "supports-color": "5.4.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "5.4.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "3.0.0"
-                    }
-                }
-            }
-        },
-        "jest-environment-jsdom": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-23.3.0.tgz",
-            "integrity": "sha1-GQRX+RyeYVRUxBhgVgZdtu16Tio=",
-            "dev": true,
-            "requires": {
-                "jest-mock": "23.2.0",
-                "jest-util": "23.3.0",
-                "jsdom": "11.11.0"
-            }
-        },
-        "jest-environment-node": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-23.3.0.tgz",
-            "integrity": "sha1-Ho3yHIR6pdA7dlc/DcFvzeUDTDI=",
-            "dev": true,
-            "requires": {
-                "jest-mock": "23.2.0",
-                "jest-util": "23.3.0"
-            }
-        },
-        "jest-get-type": {
-            "version": "22.4.3",
-            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
-            "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==",
-            "dev": true
-        },
-        "jest-haste-map": {
-            "version": "23.2.0",
-            "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-23.2.0.tgz",
-            "integrity": "sha1-0Qy6wAfGlZSMjvGCGisu0tTy1Ng=",
-            "dev": true,
-            "requires": {
-                "fb-watchman": "2.0.0",
-                "graceful-fs": "4.1.11",
-                "jest-docblock": "23.2.0",
-                "jest-serializer": "23.0.1",
-                "jest-worker": "23.2.0",
-                "micromatch": "3.1.10",
-                "sane": "2.5.2"
-            },
-            "dependencies": {
-                "arr-diff": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-                    "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-                    "dev": true
-                },
-                "array-unique": {
-                    "version": "0.3.2",
-                    "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-                    "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-                    "dev": true
-                },
-                "braces": {
-                    "version": "2.3.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-                    "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-                    "dev": true,
-                    "requires": {
-                        "arr-flatten": "1.1.0",
-                        "array-unique": "0.3.2",
-                        "extend-shallow": "2.0.1",
-                        "fill-range": "4.0.0",
-                        "isobject": "3.0.1",
-                        "repeat-element": "1.1.2",
-                        "snapdragon": "0.8.2",
-                        "snapdragon-node": "2.1.1",
-                        "split-string": "3.1.0",
-                        "to-regex": "3.0.2"
-                    },
-                    "dependencies": {
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        }
-                    }
-                },
-                "expand-brackets": {
-                    "version": "2.1.4",
-                    "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-                    "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-                    "dev": true,
-                    "requires": {
-                        "debug": "2.6.9",
-                        "define-property": "0.2.5",
-                        "extend-shallow": "2.0.1",
-                        "posix-character-classes": "0.1.1",
-                        "regex-not": "1.0.2",
-                        "snapdragon": "0.8.2",
-                        "to-regex": "3.0.2"
-                    },
-                    "dependencies": {
-                        "define-property": {
-                            "version": "0.2.5",
-                            "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                            "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                            "dev": true,
-                            "requires": {
-                                "is-descriptor": "0.1.6"
-                            }
-                        },
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        },
-                        "is-accessor-descriptor": {
-                            "version": "0.1.6",
-                            "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-                            "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-                            "dev": true,
-                            "requires": {
-                                "kind-of": "3.2.2"
-                            },
-                            "dependencies": {
-                                "kind-of": {
-                                    "version": "3.2.2",
-                                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                    "dev": true,
-                                    "requires": {
-                                        "is-buffer": "1.1.6"
-                                    }
-                                }
-                            }
-                        },
-                        "is-data-descriptor": {
-                            "version": "0.1.4",
-                            "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-                            "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-                            "dev": true,
-                            "requires": {
-                                "kind-of": "3.2.2"
-                            },
-                            "dependencies": {
-                                "kind-of": {
-                                    "version": "3.2.2",
-                                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                    "dev": true,
-                                    "requires": {
-                                        "is-buffer": "1.1.6"
-                                    }
-                                }
-                            }
-                        },
-                        "is-descriptor": {
-                            "version": "0.1.6",
-                            "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                            "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                            "dev": true,
-                            "requires": {
-                                "is-accessor-descriptor": "0.1.6",
-                                "is-data-descriptor": "0.1.4",
-                                "kind-of": "5.1.0"
-                            }
-                        },
-                        "kind-of": {
-                            "version": "5.1.0",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                            "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                            "dev": true
-                        }
-                    }
-                },
-                "extglob": {
-                    "version": "2.0.4",
-                    "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-                    "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-                    "dev": true,
-                    "requires": {
-                        "array-unique": "0.3.2",
-                        "define-property": "1.0.0",
-                        "expand-brackets": "2.1.4",
-                        "extend-shallow": "2.0.1",
-                        "fragment-cache": "0.2.1",
-                        "regex-not": "1.0.2",
-                        "snapdragon": "0.8.2",
-                        "to-regex": "3.0.2"
-                    },
-                    "dependencies": {
-                        "define-property": {
-                            "version": "1.0.0",
-                            "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-                            "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-                            "dev": true,
-                            "requires": {
-                                "is-descriptor": "1.0.2"
-                            }
-                        },
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        }
-                    }
-                },
-                "fill-range": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-                    "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-                    "dev": true,
-                    "requires": {
-                        "extend-shallow": "2.0.1",
-                        "is-number": "3.0.0",
-                        "repeat-string": "1.6.1",
-                        "to-regex-range": "2.1.1"
-                    },
-                    "dependencies": {
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        }
-                    }
-                },
-                "is-accessor-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "6.0.2"
-                    }
-                },
-                "is-data-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "6.0.2"
-                    }
-                },
-                "is-descriptor": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-                    "dev": true,
-                    "requires": {
-                        "is-accessor-descriptor": "1.0.0",
-                        "is-data-descriptor": "1.0.0",
-                        "kind-of": "6.0.2"
-                    }
-                },
-                "is-number": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-                    "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-                    "dev": true,
-                    "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
-                    }
-                },
-                "kind-of": {
-                    "version": "6.0.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-                    "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-                    "dev": true
-                },
-                "micromatch": {
-                    "version": "3.1.10",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-                    "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-                    "dev": true,
-                    "requires": {
-                        "arr-diff": "4.0.0",
-                        "array-unique": "0.3.2",
-                        "braces": "2.3.2",
-                        "define-property": "2.0.2",
-                        "extend-shallow": "3.0.2",
-                        "extglob": "2.0.4",
-                        "fragment-cache": "0.2.1",
-                        "kind-of": "6.0.2",
-                        "nanomatch": "1.2.13",
-                        "object.pick": "1.3.0",
-                        "regex-not": "1.0.2",
-                        "snapdragon": "0.8.2",
-                        "to-regex": "3.0.2"
-                    }
-                }
-            }
-        },
-        "jest-jasmine2": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-23.3.0.tgz",
-            "integrity": "sha1-qHBrqsI8ihMNWqjvVGSp1JCW0bU=",
-            "dev": true,
-            "requires": {
-                "chalk": "2.4.1",
-                "co": "4.6.0",
-                "expect": "23.3.0",
-                "is-generator-fn": "1.0.0",
-                "jest-diff": "23.2.0",
-                "jest-each": "23.2.0",
-                "jest-matcher-utils": "23.2.0",
-                "jest-message-util": "23.3.0",
-                "jest-snapshot": "23.3.0",
-                "jest-util": "23.3.0",
-                "pretty-format": "23.2.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "1.9.2"
-                    }
-                },
-                "chalk": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-                    "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "3.2.1",
-                        "escape-string-regexp": "1.0.5",
-                        "supports-color": "5.4.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "5.4.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "3.0.0"
-                    }
-                }
-            }
-        },
-        "jest-leak-detector": {
-            "version": "23.2.0",
-            "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-23.2.0.tgz",
-            "integrity": "sha1-wonZYdxjjxQ1fU75bgQx7MGqN30=",
-            "dev": true,
-            "requires": {
-                "pretty-format": "23.2.0"
-            }
-        },
-        "jest-matcher-utils": {
-            "version": "23.2.0",
-            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.2.0.tgz",
-            "integrity": "sha1-TUmB8jIT6Tnjzt8j3DTHR7WuGRM=",
-            "dev": true,
-            "requires": {
-                "chalk": "2.4.1",
-                "jest-get-type": "22.4.3",
-                "pretty-format": "23.2.0"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "1.9.2"
-                    }
-                },
-                "chalk": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-                    "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "3.2.1",
-                        "escape-string-regexp": "1.0.5",
-                        "supports-color": "5.4.0"
-                    }
-                },
-                "supports-color": {
-                    "version": "5.4.0",
-                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-                    "dev": true,
-                    "requires": {
-                        "has-flag": "3.0.0"
-                    }
-                }
-            }
-        },
-        "jest-message-util": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-23.3.0.tgz",
-            "integrity": "sha1-vAexHOxpcftd2d4t+2DrwiFQwWA=",
-            "dev": true,
-            "requires": {
-                "@babel/code-frame": "7.0.0-beta.44",
-                "chalk": "2.4.1",
-                "micromatch": "3.1.10",
-                "slash": "1.0.0",
-                "stack-utils": "1.0.1"
-            },
-            "dependencies": {
-                "ansi-styles": {
-                    "version": "3.2.1",
-                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-                    "dev": true,
-                    "requires": {
-                        "color-convert": "1.9.2"
-                    }
-                },
-                "arr-diff": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-                    "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-                    "dev": true
-                },
-                "array-unique": {
-                    "version": "0.3.2",
-                    "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-                    "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-                    "dev": true
-                },
-                "braces": {
-                    "version": "2.3.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-                    "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-                    "dev": true,
-                    "requires": {
-                        "arr-flatten": "1.1.0",
-                        "array-unique": "0.3.2",
-                        "extend-shallow": "2.0.1",
-                        "fill-range": "4.0.0",
-                        "isobject": "3.0.1",
-                        "repeat-element": "1.1.2",
-                        "snapdragon": "0.8.2",
-                        "snapdragon-node": "2.1.1",
-                        "split-string": "3.1.0",
-                        "to-regex": "3.0.2"
-                    },
-                    "dependencies": {
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        }
-                    }
-                },
-                "chalk": {
-                    "version": "2.4.1",
-                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-                    "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
-                    "dev": true,
-                    "requires": {
-                        "ansi-styles": "3.2.1",
-                        "escape-string-regexp": "1.0.5",
-                        "supports-color": "5.4.0"
-                    }
-                },
-                "expand-brackets": {
-                    "version": "2.1.4",
-                    "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-                    "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-                    "dev": true,
-                    "requires": {
-                        "debug": "2.6.9",
-                        "define-property": "0.2.5",
-                        "extend-shallow": "2.0.1",
-                        "posix-character-classes": "0.1.1",
-                        "regex-not": "1.0.2",
-                        "snapdragon": "0.8.2",
-                        "to-regex": "3.0.2"
-                    },
-                    "dependencies": {
-                        "define-property": {
-                            "version": "0.2.5",
-                            "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                            "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                            "dev": true,
-                            "requires": {
-                                "is-descriptor": "0.1.6"
-                            }
-                        },
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        },
-                        "is-accessor-descriptor": {
-                            "version": "0.1.6",
-                            "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-                            "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-                            "dev": true,
-                            "requires": {
-                                "kind-of": "3.2.2"
-                            },
-                            "dependencies": {
-                                "kind-of": {
-                                    "version": "3.2.2",
-                                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                    "dev": true,
-                                    "requires": {
-                                        "is-buffer": "1.1.6"
-                                    }
-                                }
-                            }
-                        },
-                        "is-data-descriptor": {
-                            "version": "0.1.4",
-                            "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-                            "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-                            "dev": true,
-                            "requires": {
-                                "kind-of": "3.2.2"
-                            },
-                            "dependencies": {
-                                "kind-of": {
-                                    "version": "3.2.2",
-                                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                    "dev": true,
-                                    "requires": {
-                                        "is-buffer": "1.1.6"
-                                    }
-                                }
-                            }
-                        },
-                        "is-descriptor": {
-                            "version": "0.1.6",
-                            "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                            "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                            "dev": true,
-                            "requires": {
-                                "is-accessor-descriptor": "0.1.6",
-                                "is-data-descriptor": "0.1.4",
-                                "kind-of": "5.1.0"
-                            }
-                        },
-                        "kind-of": {
-                            "version": "5.1.0",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                            "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                            "dev": true
-                        }
-                    }
-                },
-                "extglob": {
-                    "version": "2.0.4",
-                    "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-                    "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-                    "dev": true,
-                    "requires": {
-                        "array-unique": "0.3.2",
-                        "define-property": "1.0.0",
-                        "expand-brackets": "2.1.4",
-                        "extend-shallow": "2.0.1",
-                        "fragment-cache": "0.2.1",
-                        "regex-not": "1.0.2",
-                        "snapdragon": "0.8.2",
-                        "to-regex": "3.0.2"
-                    },
-                    "dependencies": {
-                        "define-property": {
-                            "version": "1.0.0",
-                            "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-                            "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-                            "dev": true,
-                            "requires": {
-                                "is-descriptor": "1.0.2"
-                            }
-                        },
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        }
-                    }
-                },
-                "fill-range": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-                    "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-                    "dev": true,
-                    "requires": {
-                        "extend-shallow": "2.0.1",
-                        "is-number": "3.0.0",
-                        "repeat-string": "1.6.1",
-                        "to-regex-range": "2.1.1"
-                    },
-                    "dependencies": {
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        }
+                        "has-flag": "3.0.0"
                     }
-                },
-                "is-accessor-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                }
+            }
+        },
+        "jest-docblock": {
+            "version": "23.2.0",
+            "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-23.2.0.tgz",
+            "integrity": "sha1-8IXh8YVI2Z/dabICB+b9VdkTg6c=",
+            "dev": true,
+            "requires": {
+                "detect-newline": "2.1.0"
+            }
+        },
+        "jest-each": {
+            "version": "23.4.0",
+            "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-23.4.0.tgz",
+            "integrity": "sha1-L6nt2J2qGk7cn/m/YGKja3E0UUM=",
+            "dev": true,
+            "requires": {
+                "chalk": "2.4.1",
+                "pretty-format": "23.2.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
                     "dev": true,
                     "requires": {
-                        "kind-of": "6.0.2"
+                        "color-convert": "1.9.2"
                     }
                 },
-                "is-data-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                "chalk": {
+                    "version": "2.4.1",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+                    "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
                     "dev": true,
                     "requires": {
-                        "kind-of": "6.0.2"
+                        "ansi-styles": "3.2.1",
+                        "escape-string-regexp": "1.0.5",
+                        "supports-color": "5.4.0"
                     }
                 },
-                "is-descriptor": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                "supports-color": {
+                    "version": "5.4.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
                     "dev": true,
                     "requires": {
-                        "is-accessor-descriptor": "1.0.0",
-                        "is-data-descriptor": "1.0.0",
-                        "kind-of": "6.0.2"
+                        "has-flag": "3.0.0"
                     }
-                },
-                "is-number": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-                    "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+                }
+            }
+        },
+        "jest-environment-jsdom": {
+            "version": "23.4.0",
+            "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-23.4.0.tgz",
+            "integrity": "sha1-BWp5UrP+pROsYqFAosNox52eYCM=",
+            "dev": true,
+            "requires": {
+                "jest-mock": "23.2.0",
+                "jest-util": "23.4.0",
+                "jsdom": "11.11.0"
+            }
+        },
+        "jest-environment-node": {
+            "version": "23.4.0",
+            "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-23.4.0.tgz",
+            "integrity": "sha1-V+gO0IQd6jAxZ8zozXlSHeuv3hA=",
+            "dev": true,
+            "requires": {
+                "jest-mock": "23.2.0",
+                "jest-util": "23.4.0"
+            }
+        },
+        "jest-get-type": {
+            "version": "22.4.3",
+            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz",
+            "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==",
+            "dev": true
+        },
+        "jest-haste-map": {
+            "version": "23.4.1",
+            "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-23.4.1.tgz",
+            "integrity": "sha512-PGQxOEGAfRbTyJkmZeOKkVSs+KVeWgG625p89KUuq+sIIchY5P8iPIIc+Hw2tJJPBzahU3qopw1kF/qyhDdNBw==",
+            "dev": true,
+            "requires": {
+                "fb-watchman": "2.0.0",
+                "graceful-fs": "4.1.11",
+                "jest-docblock": "23.2.0",
+                "jest-serializer": "23.0.1",
+                "jest-worker": "23.2.0",
+                "micromatch": "2.3.11",
+                "sane": "2.5.2"
+            }
+        },
+        "jest-jasmine2": {
+            "version": "23.4.1",
+            "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-23.4.1.tgz",
+            "integrity": "sha512-nHmRgTtM9fuaK3RBz2z4j9mYVEJwB7FdoflQSvrwHV8mCT5z4DeHoKCvPp2R27F8fZTYJUYVMb36xn+ydg0tfA==",
+            "dev": true,
+            "requires": {
+                "chalk": "2.4.1",
+                "co": "4.6.0",
+                "expect": "23.4.0",
+                "is-generator-fn": "1.0.0",
+                "jest-diff": "23.2.0",
+                "jest-each": "23.4.0",
+                "jest-matcher-utils": "23.2.0",
+                "jest-message-util": "23.4.0",
+                "jest-snapshot": "23.4.1",
+                "jest-util": "23.4.0",
+                "pretty-format": "23.2.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
                     "dev": true,
                     "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
+                        "color-convert": "1.9.2"
                     }
                 },
-                "kind-of": {
-                    "version": "6.0.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-                    "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-                    "dev": true
-                },
-                "micromatch": {
-                    "version": "3.1.10",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-                    "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+                "chalk": {
+                    "version": "2.4.1",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+                    "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
                     "dev": true,
                     "requires": {
-                        "arr-diff": "4.0.0",
-                        "array-unique": "0.3.2",
-                        "braces": "2.3.2",
-                        "define-property": "2.0.2",
-                        "extend-shallow": "3.0.2",
-                        "extglob": "2.0.4",
-                        "fragment-cache": "0.2.1",
-                        "kind-of": "6.0.2",
-                        "nanomatch": "1.2.13",
-                        "object.pick": "1.3.0",
-                        "regex-not": "1.0.2",
-                        "snapdragon": "0.8.2",
-                        "to-regex": "3.0.2"
+                        "ansi-styles": "3.2.1",
+                        "escape-string-regexp": "1.0.5",
+                        "supports-color": "5.4.0"
                     }
                 },
                 "supports-color": {
@@ -8223,27 +7317,24 @@
                 }
             }
         },
-        "jest-mock": {
+        "jest-leak-detector": {
             "version": "23.2.0",
-            "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-23.2.0.tgz",
-            "integrity": "sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=",
-            "dev": true
-        },
-        "jest-regex-util": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-23.3.0.tgz",
-            "integrity": "sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=",
-            "dev": true
+            "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-23.2.0.tgz",
+            "integrity": "sha1-wonZYdxjjxQ1fU75bgQx7MGqN30=",
+            "dev": true,
+            "requires": {
+                "pretty-format": "23.2.0"
+            }
         },
-        "jest-resolve": {
+        "jest-matcher-utils": {
             "version": "23.2.0",
-            "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-23.2.0.tgz",
-            "integrity": "sha1-oHkK1aO5kAKrTb/L+Nni1qabPZk=",
+            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-23.2.0.tgz",
+            "integrity": "sha1-TUmB8jIT6Tnjzt8j3DTHR7WuGRM=",
             "dev": true,
             "requires": {
-                "browser-resolve": "1.11.3",
                 "chalk": "2.4.1",
-                "realpath-native": "1.0.1"
+                "jest-get-type": "22.4.3",
+                "pretty-format": "23.2.0"
             },
             "dependencies": {
                 "ansi-styles": {
@@ -8277,82 +7368,17 @@
                 }
             }
         },
-        "jest-resolve-dependencies": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-23.3.0.tgz",
-            "integrity": "sha1-hETTsLEoi4CGTYgB/1C0Sk1pXR0=",
-            "dev": true,
-            "requires": {
-                "jest-regex-util": "23.3.0",
-                "jest-snapshot": "23.3.0"
-            }
-        },
-        "jest-runner": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-23.3.0.tgz",
-            "integrity": "sha1-BMfkWKYXUBpIddsNf/vg48vUO/s=",
-            "dev": true,
-            "requires": {
-                "exit": "0.1.2",
-                "graceful-fs": "4.1.11",
-                "jest-config": "23.3.0",
-                "jest-docblock": "23.2.0",
-                "jest-haste-map": "23.2.0",
-                "jest-jasmine2": "23.3.0",
-                "jest-leak-detector": "23.2.0",
-                "jest-message-util": "23.3.0",
-                "jest-runtime": "23.3.0",
-                "jest-util": "23.3.0",
-                "jest-worker": "23.2.0",
-                "source-map-support": "0.5.6",
-                "throat": "4.1.0"
-            },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.6.1",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-                    "dev": true
-                },
-                "source-map-support": {
-                    "version": "0.5.6",
-                    "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
-                    "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
-                    "dev": true,
-                    "requires": {
-                        "buffer-from": "1.1.0",
-                        "source-map": "0.6.1"
-                    }
-                }
-            }
-        },
-        "jest-runtime": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-23.3.0.tgz",
-            "integrity": "sha1-SGWqtM7/gvnOxjNf164UIswd598=",
+        "jest-message-util": {
+            "version": "23.4.0",
+            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-23.4.0.tgz",
+            "integrity": "sha1-F2EMUJQjSVCNAaPR4L2iwHkIap8=",
             "dev": true,
             "requires": {
-                "babel-core": "6.26.3",
-                "babel-plugin-istanbul": "4.1.6",
+                "@babel/code-frame": "7.0.0-beta.44",
                 "chalk": "2.4.1",
-                "convert-source-map": "1.5.1",
-                "exit": "0.1.2",
-                "fast-json-stable-stringify": "2.0.0",
-                "graceful-fs": "4.1.11",
-                "jest-config": "23.3.0",
-                "jest-haste-map": "23.2.0",
-                "jest-message-util": "23.3.0",
-                "jest-regex-util": "23.3.0",
-                "jest-resolve": "23.2.0",
-                "jest-snapshot": "23.3.0",
-                "jest-util": "23.3.0",
-                "jest-validate": "23.3.0",
-                "micromatch": "3.1.10",
-                "realpath-native": "1.0.1",
+                "micromatch": "2.3.11",
                 "slash": "1.0.0",
-                "strip-bom": "3.0.0",
-                "write-file-atomic": "2.3.0",
-                "yargs": "11.0.0"
+                "stack-utils": "1.0.1"
             },
             "dependencies": {
                 "ansi-styles": {
@@ -8364,47 +7390,6 @@
                         "color-convert": "1.9.2"
                     }
                 },
-                "arr-diff": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-                    "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-                    "dev": true
-                },
-                "array-unique": {
-                    "version": "0.3.2",
-                    "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-                    "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-                    "dev": true
-                },
-                "braces": {
-                    "version": "2.3.2",
-                    "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-                    "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-                    "dev": true,
-                    "requires": {
-                        "arr-flatten": "1.1.0",
-                        "array-unique": "0.3.2",
-                        "extend-shallow": "2.0.1",
-                        "fill-range": "4.0.0",
-                        "isobject": "3.0.1",
-                        "repeat-element": "1.1.2",
-                        "snapdragon": "0.8.2",
-                        "snapdragon-node": "2.1.1",
-                        "split-string": "3.1.0",
-                        "to-regex": "3.0.2"
-                    },
-                    "dependencies": {
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        }
-                    }
-                },
                 "chalk": {
                     "version": "2.4.1",
                     "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
@@ -8416,231 +7401,167 @@
                         "supports-color": "5.4.0"
                     }
                 },
-                "expand-brackets": {
-                    "version": "2.1.4",
-                    "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-                    "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-                    "dev": true,
-                    "requires": {
-                        "debug": "2.6.9",
-                        "define-property": "0.2.5",
-                        "extend-shallow": "2.0.1",
-                        "posix-character-classes": "0.1.1",
-                        "regex-not": "1.0.2",
-                        "snapdragon": "0.8.2",
-                        "to-regex": "3.0.2"
-                    },
-                    "dependencies": {
-                        "define-property": {
-                            "version": "0.2.5",
-                            "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-                            "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-                            "dev": true,
-                            "requires": {
-                                "is-descriptor": "0.1.6"
-                            }
-                        },
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        },
-                        "is-accessor-descriptor": {
-                            "version": "0.1.6",
-                            "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-                            "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-                            "dev": true,
-                            "requires": {
-                                "kind-of": "3.2.2"
-                            },
-                            "dependencies": {
-                                "kind-of": {
-                                    "version": "3.2.2",
-                                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                    "dev": true,
-                                    "requires": {
-                                        "is-buffer": "1.1.6"
-                                    }
-                                }
-                            }
-                        },
-                        "is-data-descriptor": {
-                            "version": "0.1.4",
-                            "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-                            "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-                            "dev": true,
-                            "requires": {
-                                "kind-of": "3.2.2"
-                            },
-                            "dependencies": {
-                                "kind-of": {
-                                    "version": "3.2.2",
-                                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                                    "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                                    "dev": true,
-                                    "requires": {
-                                        "is-buffer": "1.1.6"
-                                    }
-                                }
-                            }
-                        },
-                        "is-descriptor": {
-                            "version": "0.1.6",
-                            "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-                            "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-                            "dev": true,
-                            "requires": {
-                                "is-accessor-descriptor": "0.1.6",
-                                "is-data-descriptor": "0.1.4",
-                                "kind-of": "5.1.0"
-                            }
-                        },
-                        "kind-of": {
-                            "version": "5.1.0",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-                            "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-                            "dev": true
-                        }
-                    }
-                },
-                "extglob": {
-                    "version": "2.0.4",
-                    "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-                    "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+                "supports-color": {
+                    "version": "5.4.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
                     "dev": true,
                     "requires": {
-                        "array-unique": "0.3.2",
-                        "define-property": "1.0.0",
-                        "expand-brackets": "2.1.4",
-                        "extend-shallow": "2.0.1",
-                        "fragment-cache": "0.2.1",
-                        "regex-not": "1.0.2",
-                        "snapdragon": "0.8.2",
-                        "to-regex": "3.0.2"
-                    },
-                    "dependencies": {
-                        "define-property": {
-                            "version": "1.0.0",
-                            "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-                            "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-                            "dev": true,
-                            "requires": {
-                                "is-descriptor": "1.0.2"
-                            }
-                        },
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        }
+                        "has-flag": "3.0.0"
                     }
-                },
-                "fill-range": {
-                    "version": "4.0.0",
-                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-                    "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+                }
+            }
+        },
+        "jest-mock": {
+            "version": "23.2.0",
+            "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-23.2.0.tgz",
+            "integrity": "sha1-rRxg8p6HGdR8JuETgJi20YsmETQ=",
+            "dev": true
+        },
+        "jest-regex-util": {
+            "version": "23.3.0",
+            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-23.3.0.tgz",
+            "integrity": "sha1-X4ZylUfCeFxAAs6qj4Sf6MpHG8U=",
+            "dev": true
+        },
+        "jest-resolve": {
+            "version": "23.4.1",
+            "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-23.4.1.tgz",
+            "integrity": "sha512-VNk4YRNR5gsHhNS0Lp46/DzTT11e+ecbUC61ikE593cKbtdrhrMO+zXkOJaE8YDD5sHxH9W6OfssNn4FkZBzZQ==",
+            "dev": true,
+            "requires": {
+                "browser-resolve": "1.11.3",
+                "chalk": "2.4.1",
+                "realpath-native": "1.0.1"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
                     "dev": true,
                     "requires": {
-                        "extend-shallow": "2.0.1",
-                        "is-number": "3.0.0",
-                        "repeat-string": "1.6.1",
-                        "to-regex-range": "2.1.1"
-                    },
-                    "dependencies": {
-                        "extend-shallow": {
-                            "version": "2.0.1",
-                            "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-                            "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-                            "dev": true,
-                            "requires": {
-                                "is-extendable": "0.1.1"
-                            }
-                        }
+                        "color-convert": "1.9.2"
                     }
                 },
-                "is-accessor-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+                "chalk": {
+                    "version": "2.4.1",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+                    "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
                     "dev": true,
                     "requires": {
-                        "kind-of": "6.0.2"
+                        "ansi-styles": "3.2.1",
+                        "escape-string-regexp": "1.0.5",
+                        "supports-color": "5.4.0"
                     }
                 },
-                "is-data-descriptor": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-                    "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+                "supports-color": {
+                    "version": "5.4.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
+                    "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
                     "dev": true,
                     "requires": {
-                        "kind-of": "6.0.2"
+                        "has-flag": "3.0.0"
                     }
+                }
+            }
+        },
+        "jest-resolve-dependencies": {
+            "version": "23.4.1",
+            "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-23.4.1.tgz",
+            "integrity": "sha512-Jp0wgNJg3OYPvXJfNVX4k4/niwGS6ARuKacum/vue48+4A1XPJ2H3aVFuNb3gUaiB/6Le7Zyl8AUb4MELBfcmg==",
+            "dev": true,
+            "requires": {
+                "jest-regex-util": "23.3.0",
+                "jest-snapshot": "23.4.1"
+            }
+        },
+        "jest-runner": {
+            "version": "23.4.1",
+            "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-23.4.1.tgz",
+            "integrity": "sha512-78KyhObsx0VEuUQ74ikGt68NpP6PApTjGpJPSyZ7AvwOFRqFlxdHpCU/lFPQxW/fLEghl4irz9OHjRLGcGFNyQ==",
+            "dev": true,
+            "requires": {
+                "exit": "0.1.2",
+                "graceful-fs": "4.1.11",
+                "jest-config": "23.4.1",
+                "jest-docblock": "23.2.0",
+                "jest-haste-map": "23.4.1",
+                "jest-jasmine2": "23.4.1",
+                "jest-leak-detector": "23.2.0",
+                "jest-message-util": "23.4.0",
+                "jest-runtime": "23.4.1",
+                "jest-util": "23.4.0",
+                "jest-worker": "23.2.0",
+                "source-map-support": "0.5.6",
+                "throat": "4.1.0"
+            },
+            "dependencies": {
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true
                 },
-                "is-descriptor": {
-                    "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-                    "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+                "source-map-support": {
+                    "version": "0.5.6",
+                    "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
+                    "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
                     "dev": true,
                     "requires": {
-                        "is-accessor-descriptor": "1.0.0",
-                        "is-data-descriptor": "1.0.0",
-                        "kind-of": "6.0.2"
+                        "buffer-from": "1.1.0",
+                        "source-map": "0.6.1"
                     }
-                },
-                "is-number": {
-                    "version": "3.0.0",
-                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-                    "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+                }
+            }
+        },
+        "jest-runtime": {
+            "version": "23.4.1",
+            "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-23.4.1.tgz",
+            "integrity": "sha512-fnInrsEAbLpNctQa+RLnKZyQLMmb5u4YdoT9CbRKWhjMY7q6ledOu+x+ORZ3glQOK/vJIS701RaJRp1pc5ziaA==",
+            "dev": true,
+            "requires": {
+                "babel-core": "6.26.3",
+                "babel-plugin-istanbul": "4.1.6",
+                "chalk": "2.4.1",
+                "convert-source-map": "1.5.1",
+                "exit": "0.1.2",
+                "fast-json-stable-stringify": "2.0.0",
+                "graceful-fs": "4.1.11",
+                "jest-config": "23.4.1",
+                "jest-haste-map": "23.4.1",
+                "jest-message-util": "23.4.0",
+                "jest-regex-util": "23.3.0",
+                "jest-resolve": "23.4.1",
+                "jest-snapshot": "23.4.1",
+                "jest-util": "23.4.0",
+                "jest-validate": "23.4.0",
+                "micromatch": "2.3.11",
+                "realpath-native": "1.0.1",
+                "slash": "1.0.0",
+                "strip-bom": "3.0.0",
+                "write-file-atomic": "2.3.0",
+                "yargs": "11.0.0"
+            },
+            "dependencies": {
+                "ansi-styles": {
+                    "version": "3.2.1",
+                    "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+                    "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
                     "dev": true,
                     "requires": {
-                        "kind-of": "3.2.2"
-                    },
-                    "dependencies": {
-                        "kind-of": {
-                            "version": "3.2.2",
-                            "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-                            "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-                            "dev": true,
-                            "requires": {
-                                "is-buffer": "1.1.6"
-                            }
-                        }
+                        "color-convert": "1.9.2"
                     }
                 },
-                "kind-of": {
-                    "version": "6.0.2",
-                    "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-                    "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-                    "dev": true
-                },
-                "micromatch": {
-                    "version": "3.1.10",
-                    "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-                    "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+                "chalk": {
+                    "version": "2.4.1",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
+                    "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
                     "dev": true,
                     "requires": {
-                        "arr-diff": "4.0.0",
-                        "array-unique": "0.3.2",
-                        "braces": "2.3.2",
-                        "define-property": "2.0.2",
-                        "extend-shallow": "3.0.2",
-                        "extglob": "2.0.4",
-                        "fragment-cache": "0.2.1",
-                        "kind-of": "6.0.2",
-                        "nanomatch": "1.2.13",
-                        "object.pick": "1.3.0",
-                        "regex-not": "1.0.2",
-                        "snapdragon": "0.8.2",
-                        "to-regex": "3.0.2"
+                        "ansi-styles": "3.2.1",
+                        "escape-string-regexp": "1.0.5",
+                        "supports-color": "5.4.0"
                     }
                 },
                 "strip-bom": {
@@ -8667,9 +7588,9 @@
             "dev": true
         },
         "jest-snapshot": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.3.0.tgz",
-            "integrity": "sha1-/E6fgeRUMtEFB+J/ULzmD0TYFCQ=",
+            "version": "23.4.1",
+            "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-23.4.1.tgz",
+            "integrity": "sha512-oMjaQ4vB4uT211zx00X0R7hg+oLVRDvhVKiC6+vSg7Be9S/AmkDMCVUoaPcLRK/0NkZBTzrh4WCzrSZgUEZW3g==",
             "dev": true,
             "requires": {
                 "babel-traverse": "6.26.0",
@@ -8677,8 +7598,8 @@
                 "chalk": "2.4.1",
                 "jest-diff": "23.2.0",
                 "jest-matcher-utils": "23.2.0",
-                "jest-message-util": "23.3.0",
-                "jest-resolve": "23.2.0",
+                "jest-message-util": "23.4.0",
+                "jest-resolve": "23.4.1",
                 "mkdirp": "0.5.1",
                 "natural-compare": "1.4.0",
                 "pretty-format": "23.2.0",
@@ -8717,16 +7638,16 @@
             }
         },
         "jest-util": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-23.3.0.tgz",
-            "integrity": "sha1-efNbsMMBAO9hHZY+5riPjthzqB0=",
+            "version": "23.4.0",
+            "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-23.4.0.tgz",
+            "integrity": "sha1-TQY8uSe68KI4Mf9hvsLLv0l5NWE=",
             "dev": true,
             "requires": {
                 "callsites": "2.0.0",
                 "chalk": "2.4.1",
                 "graceful-fs": "4.1.11",
                 "is-ci": "1.1.0",
-                "jest-message-util": "23.3.0",
+                "jest-message-util": "23.4.0",
                 "mkdirp": "0.5.1",
                 "slash": "1.0.0",
                 "source-map": "0.6.1"
@@ -8776,9 +7697,9 @@
             }
         },
         "jest-validate": {
-            "version": "23.3.0",
-            "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.3.0.tgz",
-            "integrity": "sha1-1Jvqaq2YwwrNLLtUJDR5igzBP3Y=",
+            "version": "23.4.0",
+            "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.4.0.tgz",
+            "integrity": "sha1-2W7t4B7wOskJwAnpyORVGX1IwgE=",
             "dev": true,
             "requires": {
                 "chalk": "2.4.1",
@@ -8819,9 +7740,9 @@
             }
         },
         "jest-watcher": {
-            "version": "23.2.0",
-            "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-23.2.0.tgz",
-            "integrity": "sha1-Z46FKJbpGenZoOtLi68a4nliDqk=",
+            "version": "23.4.0",
+            "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-23.4.0.tgz",
+            "integrity": "sha1-0uKM50+NrWxq/JIrksq+9u0FyRw=",
             "dev": true,
             "requires": {
                 "ansi-escapes": "3.1.0",
@@ -8881,13 +7802,13 @@
             "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
         },
         "js-yaml": {
-            "version": "3.7.0",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
-            "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
+            "version": "3.12.0",
+            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
+            "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
             "dev": true,
             "requires": {
                 "argparse": "1.0.10",
-                "esprima": "2.7.3"
+                "esprima": "4.0.1"
             }
         },
         "jsbn": {
@@ -8914,7 +7835,7 @@
                 "escodegen": "1.10.0",
                 "html-encoding-sniffer": "1.0.2",
                 "left-pad": "1.3.0",
-                "nwsapi": "2.0.4",
+                "nwsapi": "2.0.5",
                 "parse5": "4.0.0",
                 "pn": "1.1.0",
                 "request": "2.87.0",
@@ -9245,6 +8166,12 @@
                 "is-buffer": "1.1.6"
             }
         },
+        "kleur": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/kleur/-/kleur-1.0.1.tgz",
+            "integrity": "sha512-8srIZ5BK5PCJw1L/JN741xgNfSjuQNK9ImYbYzv7ZUD3WPfuywaY+yd7lQOphJ+2vwXnMLnRZoAh5X+orRt4LQ==",
+            "dev": true
+        },
         "lazy-cache": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -9268,9 +8195,9 @@
             "dev": true
         },
         "less": {
-            "version": "3.5.3",
-            "resolved": "https://registry.npmjs.org/less/-/less-3.5.3.tgz",
-            "integrity": "sha512-MMGXfVYMORHyfwWGOP04HNnDxX874A329FMZEiMuho+QvOXJMyjlsmnf3qUxr1KmwM1E8mVo2bOPbT4A8aF61w==",
+            "version": "3.7.0",
+            "resolved": "https://registry.npmjs.org/less/-/less-3.7.0.tgz",
+            "integrity": "sha512-U5UZUjkUjKmieLDb7o7GiMdD7xtBte2Ix0wGcvuVcHjm8z59CWvczoiUxRF5D1l3PqO9kYlvVHMx6eOLnQWTjQ==",
             "dev": true,
             "requires": {
                 "errno": "0.1.7",
@@ -9712,8 +8639,7 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
             "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "md5.js": {
             "version": "1.3.4",
@@ -9814,7 +8740,6 @@
             "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
             "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "arr-diff": "2.0.0",
                 "array-unique": "0.2.1",
@@ -10229,9 +9154,9 @@
             "dev": true
         },
         "nwsapi": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.4.tgz",
-            "integrity": "sha512-Zt6HRR6RcJkuj5/N9zeE7FN6YitRW//hK2wTOwX274IBphbY3Zf5+yn5mZ9v/SzAOTMjQNxZf9KkmPLWn0cV4g==",
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.0.5.tgz",
+            "integrity": "sha512-cqfA/wLUW6YbFQLkd5ZKq2SCaZkCoxehU9qt6ccMwH3fHbzUkcien9BzOgfBXfIkxeWnRFKb1ZKmjwaa9MYOMw==",
             "dev": true
         },
         "oauth-sign": {
@@ -10333,7 +9258,6 @@
             "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
             "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "for-own": "0.1.5",
                 "is-extendable": "0.1.1"
@@ -10575,7 +9499,6 @@
             "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
             "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
             "dev": true,
-            "optional": true,
             "requires": {
                 "glob-base": "0.3.0",
                 "is-dotfile": "1.0.3",
@@ -10815,115 +9738,48 @@
             }
         },
         "postcss-load-config": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz",
-            "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=",
-            "dev": true,
-            "requires": {
-                "cosmiconfig": "2.2.2",
-                "object-assign": "4.1.1",
-                "postcss-load-options": "1.2.0",
-                "postcss-load-plugins": "2.3.0"
-            },
-            "dependencies": {
-                "cosmiconfig": {
-                    "version": "2.2.2",
-                    "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-                    "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
-                    "dev": true,
-                    "requires": {
-                        "is-directory": "0.3.1",
-                        "js-yaml": "3.7.0",
-                        "minimist": "1.2.0",
-                        "object-assign": "4.1.1",
-                        "os-homedir": "1.0.2",
-                        "parse-json": "2.2.0",
-                        "require-from-string": "1.2.1"
-                    }
-                },
-                "minimist": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-                    "dev": true
-                }
-            }
-        },
-        "postcss-load-options": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz",
-            "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz",
+            "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
             "dev": true,
             "requires": {
-                "cosmiconfig": "2.2.2",
-                "object-assign": "4.1.1"
+                "cosmiconfig": "4.0.0",
+                "import-cwd": "2.1.0"
             },
             "dependencies": {
                 "cosmiconfig": {
-                    "version": "2.2.2",
-                    "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-                    "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
+                    "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
                     "dev": true,
                     "requires": {
                         "is-directory": "0.3.1",
-                        "js-yaml": "3.7.0",
-                        "minimist": "1.2.0",
-                        "object-assign": "4.1.1",
-                        "os-homedir": "1.0.2",
-                        "parse-json": "2.2.0",
-                        "require-from-string": "1.2.1"
+                        "js-yaml": "3.12.0",
+                        "parse-json": "4.0.0",
+                        "require-from-string": "2.0.2"
                     }
                 },
-                "minimist": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-                    "dev": true
-                }
-            }
-        },
-        "postcss-load-plugins": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz",
-            "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=",
-            "dev": true,
-            "requires": {
-                "cosmiconfig": "2.2.2",
-                "object-assign": "4.1.1"
-            },
-            "dependencies": {
-                "cosmiconfig": {
-                    "version": "2.2.2",
-                    "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-                    "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
+                "parse-json": {
+                    "version": "4.0.0",
+                    "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+                    "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
                     "dev": true,
                     "requires": {
-                        "is-directory": "0.3.1",
-                        "js-yaml": "3.7.0",
-                        "minimist": "1.2.0",
-                        "object-assign": "4.1.1",
-                        "os-homedir": "1.0.2",
-                        "parse-json": "2.2.0",
-                        "require-from-string": "1.2.1"
+                        "error-ex": "1.3.2",
+                        "json-parse-better-errors": "1.0.2"
                     }
-                },
-                "minimist": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-                    "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-                    "dev": true
                 }
             }
         },
         "postcss-loader": {
-            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.5.tgz",
-            "integrity": "sha512-pV7kB5neJ0/1tZ8L1uGOBNTVBCSCXQoIsZMsrwvO8V2rKGa2tBl/f80GGVxow2jJnRJ2w1ocx693EKhZAb9Isg==",
+            "version": "2.1.6",
+            "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.6.tgz",
+            "integrity": "sha512-hgiWSc13xVQAq25cVw80CH0l49ZKlAnU1hKPOdRrNj89bokRr/bZF2nT+hebPPF9c9xs8c3gw3Fr2nxtmXYnNg==",
             "dev": true,
             "requires": {
                 "loader-utils": "1.1.0",
                 "postcss": "6.0.23",
-                "postcss-load-config": "1.2.0",
+                "postcss-load-config": "2.0.0",
                 "schema-utils": "0.4.5"
             },
             "dependencies": {
@@ -11233,8 +10089,7 @@
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
             "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
-            "dev": true,
-            "optional": true
+            "dev": true
         },
         "pretty-error": {
             "version": "2.1.1",
@@ -11311,12 +10166,12 @@
             "dev": true
         },
         "prompts": {
-            "version": "0.1.10",
-            "resolved": "https://registry.npmjs.org/prompts/-/prompts-0.1.10.tgz",
-            "integrity": "sha512-/MPwms6+g/m6fvXZlQyOL4m4ziDim2+Wc6CdWVjp+nVCkzEkK2N4rR74m/bbGf+dkta+/SBpo1FfES8Wgrk/Fw==",
+            "version": "0.1.12",
+            "resolved": "https://registry.npmjs.org/prompts/-/prompts-0.1.12.tgz",
+            "integrity": "sha512-pgR1GE1JM8q8UsHVIgjdK62DPwvrf0kvaKWJ/mfMoCm2lwfIReX/giQ1p0AlMoUXNhQap/8UiOdqi3bOROm/eg==",
             "dev": true,
             "requires": {
-                "clorox": "1.0.3",
+                "kleur": "1.0.1",
                 "sisteransi": "0.1.1"
             }
         },
@@ -11458,7 +10313,6 @@
             "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
             "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "is-number": "4.0.0",
                 "kind-of": "6.0.2",
@@ -11469,15 +10323,13 @@
                     "version": "4.0.0",
                     "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
                     "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 },
                 "kind-of": {
                     "version": "6.0.2",
                     "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
                     "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-                    "dev": true,
-                    "optional": true
+                    "dev": true
                 }
             }
         },
@@ -11959,9 +10811,9 @@
             }
         },
         "redux-toolbelt-thunk": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/redux-toolbelt-thunk/-/redux-toolbelt-thunk-2.0.3.tgz",
-            "integrity": "sha1-clRMZtk5qwMUkkEXprZZkp+V1Oc=",
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/redux-toolbelt-thunk/-/redux-toolbelt-thunk-2.0.4.tgz",
+            "integrity": "sha1-kiLNSQpqHoFnv9lMddP1TBilrc0=",
             "requires": {
                 "redux-toolbelt": "2.1.5"
             }
@@ -11993,7 +10845,6 @@
             "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
             "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
             "dev": true,
-            "optional": true,
             "requires": {
                 "is-equal-shallow": "0.1.3"
             }
@@ -12189,9 +11040,9 @@
             "dev": true
         },
         "require-from-string": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz",
-            "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
             "dev": true
         },
         "require-main-filename": {
@@ -14754,9 +13605,9 @@
             "dev": true
         },
         "webpack": {
-            "version": "4.15.1",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.15.1.tgz",
-            "integrity": "sha512-UwfFQ2plA5EMhhzwi/hl5xpLk7mNK7p0853Ml04z1Bqw553pY+oS8Xke3funcVy7eG/yMpZPvnlFTUyGKyKoyw==",
+            "version": "4.16.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.16.0.tgz",
+            "integrity": "sha512-oNx9djAd6uAcccyfqN3hyXLNMjZHiRySZmBQ4c8FNmf1SNJGhx7n9TSvHNyXxgToRdH65g/Q97s94Ip9N6F7xg==",
             "dev": true,
             "requires": {
                 "@webassemblyjs/ast": "1.5.13",
diff --git a/package.json b/package.json
index 0f7a280..be2ef93 100644
--- a/package.json
+++ b/package.json
@@ -39,8 +39,8 @@
     "@types/prop-types": "^15.5.3",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.3",
-    "babel-eslint": "^8.2.5",
-    "babel-jest": "23.2.0",
+    "babel-eslint": "8.2.6",
+    "babel-jest": "23.4.0",
     "babel-loader": "7.1.5",
     "babel-plugin-module-resolver": "3.1.1",
     "babel-plugin-transform-async-to-generator": "6.24.1",
@@ -56,7 +56,7 @@
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "enzyme-to-json": "^3.3.4",
-    "eslint": "^5.0.1",
+    "eslint": "5.1.0",
     "eslint-plugin-react": "^7.10.0",
     "express": "^4.16.3",
     "file-loader": "^1.1.11",
@@ -64,18 +64,18 @@
     "identity-obj-proxy": "^3.0.0",
     "imagemin": "5.3.1",
     "img-loader": "^3.0.0",
-    "jest": "^23.3.0",
+    "jest": "23.4.1",
     "jshint": "^2.9.5",
-    "less": "^3.5.3",
+    "less": "3.7.0",
     "less-loader": "^4.1.0",
     "lesshint": "^5.1.0",
-    "postcss-loader": "^2.1.5",
+    "postcss-loader": "2.1.6",
     "react-addons-test-utils": "^15.6.2",
     "react-hot-loader": "^4.3.3",
     "redux-immutable-state-invariant": "^2.1.0",
     "style-loader": "^0.21.0",
     "url-loader": "^1.0.1",
-    "webpack": "^4.15.1",
+    "webpack": "4.16.0",
     "webpack-cli": "^3.0.8",
     "webpack-dev-middleware": "^3.1.3",
     "webpack-dev-server": "^3.1.4",
@@ -104,7 +104,7 @@
     "redux": "4.0.0",
     "redux-thunk": "2.3.0",
     "redux-toolbelt": "2.1.5",
-    "redux-toolbelt-thunk": "^2.0.3"
+    "redux-toolbelt-thunk": "2.0.4"
   },
   "postcss": {},
   "jest": {

From 20b3e8e5e8a355c3f7def32edb057a8ee37be1c4 Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Sat, 14 Jul 2018 19:29:19 +0800
Subject: [PATCH 12/14] move config to sub module

---
 configs/webpack/common.js | 105 --------------------------------------
 configs/webpack/dev.js    |  28 ----------
 configs/webpack/prod.js   |  17 ------
 package-lock.json         |   6 +--
 package.json              |   2 +-
 5 files changed, 4 insertions(+), 154 deletions(-)
 delete mode 100644 configs/webpack/common.js
 delete mode 100644 configs/webpack/dev.js
 delete mode 100644 configs/webpack/prod.js

diff --git a/configs/webpack/common.js b/configs/webpack/common.js
deleted file mode 100644
index fd28353..0000000
--- a/configs/webpack/common.js
+++ /dev/null
@@ -1,105 +0,0 @@
-// shared config (dev and prod)
-const { resolve } = require("path");
-
-const HtmlWebpackPlugin = require("html-webpack-plugin");
-const webpack = require("webpack");
-
-module.exports = {
-  resolve: {
-    extensions: [".js", ".jsx"]
-  },
-  context: resolve(__dirname, "../../src"),
-  module: {
-    rules: [
-      {
-        test: /\.(js|jsx)$/,
-        use: {
-          loader: "babel-loader"
-        },
-        exclude: /node_modules/
-      },
-      {
-        test: /\.css$/,
-        use: [
-          "style-loader",
-          {
-            loader: "css-loader",
-            options: {
-              importLoaders: 1
-            }
-          },
-          "postcss-loader"
-        ]
-      },
-      {
-        rules: [
-          {
-            test: /\.less$/,
-            use: [
-              {
-                loader: "style-loader" // creates style nodes from JS strings
-              },
-              {
-                loader: "css-loader" // translates CSS into CommonJS
-              },
-              {
-                loader: "less-loader" // compiles Less to CSS
-              }
-            ]
-          }
-        ]
-      },
-      {
-        test: /\.(jpe?g|png|gif)$/i,
-        use: ["file-loader?name=img/[name].[ext]", "img-loader"]
-      },
-      {
-        test: /\.(svg)$/i,
-        use: ["url-loader?mimetype=image/svg+xml", "img-loader"]
-      },
-      {
-        test: /\.eot(\?v=\d+\.\d+\.\d+)?$/,
-        loader: "file-loader",
-        options: {
-          name: "fonts/[name].[ext]"
-        }
-      },
-      {
-        test: /\.(woff|woff2)$/,
-        loader: "file-loader?name=fonts/[name].[ext]"
-      },
-      {
-        test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/,
-        loader: "url-loader?mimetype=application/octet-stream"
-      },
-      //copy Web config file to dist folder
-      {
-        test: /web.config/,
-        loader: "file-loader?name=[name].[ext]"
-      }
-    ]
-  },
-  plugins: [
-    new HtmlWebpackPlugin({
-      template: "index.html.ejs",
-      favicon: "favicon.ico"
-    }),
-    new webpack.ProvidePlugin({
-      React: "react",
-      ReactDOM: "react-dom"
-    })
-  ],
-  externals: {
-    React: "react",
-    ReactDOM: "react-dom",
-    jsdom: "window",
-    "react/addons": true,
-    "react/lib/ExecutionEnvironment": true,
-    "react/lib/ReactContext": "window",
-    "react-dom/test-utils": true,
-    "react-test-renderer/shallow": true
-  },
-  performance: {
-    hints: false
-  }
-};
diff --git a/configs/webpack/dev.js b/configs/webpack/dev.js
deleted file mode 100644
index 0929a26..0000000
--- a/configs/webpack/dev.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// development config
-const merge = require("webpack-merge");
-const webpack = require("webpack");
-const commonConfig = require("./common");
-
-const port = 8080;
-const url = `http://localhost:${port}`;
-
-module.exports = merge(commonConfig, {
-  mode: "development",
-  entry: [
-    "react-hot-loader/patch", // activate HMR for React
-    `webpack-dev-server/client?${url}`, // bundle the client for webpack-dev-server and connect to the provided endpoint
-    "webpack/hot/only-dev-server", // bundle the client for hot reloading, only- means to only hot reload for successful updates
-    "./index.jsx" // the entry point of our app
-  ],
-  devServer: {
-    hot: true, // enable HMR on the server
-    open: true,
-    port: port,
-    historyApiFallback: true
-  },
-  devtool: "cheap-module-source-map", //cheap-module-eval-source-map
-  plugins: [
-    new webpack.HotModuleReplacementPlugin(), // enable HMR globally
-    new webpack.NamedModulesPlugin() // prints more readable module names in the browser console on HMR updates
-  ]
-});
diff --git a/configs/webpack/prod.js b/configs/webpack/prod.js
deleted file mode 100644
index 60afc77..0000000
--- a/configs/webpack/prod.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// production config
-const merge = require("webpack-merge");
-const { resolve } = require("path");
-
-const commonConfig = require("./common");
-
-module.exports = merge(commonConfig, {
-  mode: "production",
-  entry: ["./index.jsx"],
-  //devtool: "source-map", // source map for testing only so disable it in PRD
-  output: {
-    filename: "js/bundle.min.js",
-    path: resolve(__dirname, "../../dist"),
-    publicPath: "/"
-  },
-  plugins: []
-});
diff --git a/package-lock.json b/package-lock.json
index 26c2c86..dcefd15 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8195,9 +8195,9 @@
             "dev": true
         },
         "less": {
-            "version": "3.7.0",
-            "resolved": "https://registry.npmjs.org/less/-/less-3.7.0.tgz",
-            "integrity": "sha512-U5UZUjkUjKmieLDb7o7GiMdD7xtBte2Ix0wGcvuVcHjm8z59CWvczoiUxRF5D1l3PqO9kYlvVHMx6eOLnQWTjQ==",
+            "version": "3.7.1",
+            "resolved": "https://registry.npmjs.org/less/-/less-3.7.1.tgz",
+            "integrity": "sha512-Cmf5XJlzNklkBC8eAa+Ef16AHUBAkApHNAw3x9Vmn84h2BvGrri5Id7kf6H1n6SN74Fc0WdHIRPlFMxsl0eJkA==",
             "dev": true,
             "requires": {
                 "errno": "0.1.7",
diff --git a/package.json b/package.json
index be2ef93..3c0c5ee 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "img-loader": "^3.0.0",
     "jest": "23.4.1",
     "jshint": "^2.9.5",
-    "less": "3.7.0",
+    "less": "3.7.1",
     "less-loader": "^4.1.0",
     "lesshint": "^5.1.0",
     "postcss-loader": "2.1.6",

From 8e46ea4b78a0daa5226230dbf702f1664defbaef Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Sat, 14 Jul 2018 19:30:15 +0800
Subject: [PATCH 13/14] add sub modules configs

---
 .gitmodules | 3 +++
 configs     | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 configs

diff --git a/.gitmodules b/.gitmodules
index 55b0da8..ab60562 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "sm-react-node-express"]
 	path = sm-react-node-express
 	url = https://github.com/baoduy/sm-react-node-express
+[submodule "configs"]
+	path = configs
+	url = https://github.com/baoduy/sm-webpack-config
diff --git a/configs b/configs
new file mode 160000
index 0000000..8925986
--- /dev/null
+++ b/configs
@@ -0,0 +1 @@
+Subproject commit 89259863a5649c1b803a6f1da5afd361108ae32e

From 9396ce20c2f074a211ed9a7e04be43da4b25b67e Mon Sep 17 00:00:00 2001
From: Steven Hoang <drunkcoding@outlook.com>
Date: Sat, 14 Jul 2018 19:45:23 +0800
Subject: [PATCH 14/14] move jest to sub module

---
 .gitignore                   |  2 +-
 configs                      |  2 +-
 package.json                 |  4 ++--
 tests/__mocks__/fileMock.js  |  1 -
 tests/__mocks__/shim.js      |  3 ---
 tests/__mocks__/styleMock.js |  1 -
 tests/jest.json              | 20 --------------------
 tests/testSetup.js           |  8 --------
 8 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 tests/__mocks__/fileMock.js
 delete mode 100644 tests/__mocks__/shim.js
 delete mode 100644 tests/__mocks__/styleMock.js
 delete mode 100644 tests/jest.json
 delete mode 100644 tests/testSetup.js

diff --git a/.gitignore b/.gitignore
index 553d8f6..a548073 100644
--- a/.gitignore
+++ b/.gitignore
@@ -332,4 +332,4 @@ ASALocalRun/
 .idea/
 dist/
 node_modules/
-tests/__coverage__/
+**/__coverage__/
diff --git a/configs b/configs
index 8925986..09cdfdb 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 89259863a5649c1b803a6f1da5afd361108ae32e
+Subproject commit 09cdfdb163ea78a3d8a112f79860da55a997ab1a
diff --git a/package.json b/package.json
index 3c0c5ee..8a41221 100644
--- a/package.json
+++ b/package.json
@@ -32,8 +32,8 @@
     "start": "npm run start-dev",
     "start-dev": "webpack-dev-server --config=configs/webpack/dev",
     "start-prod": "npm run build && node sm-react-node-express/express.js",
-    "test": "jest --watch --coverage --config=tests/jest.json",
-    "test-ci": "jest --ci --coverage --config=tests/jest.json && codecov -t 75b11d17-22d7-4b30-81b1-4c39fa2f7582"
+    "test": "jest --watch --coverage --config=configs/jest/jest.json",
+    "test-ci": "jest --ci --coverage --config=configs/jest/jest.json && codecov -t 75b11d17-22d7-4b30-81b1-4c39fa2f7582"
   },
   "devDependencies": {
     "@types/prop-types": "^15.5.3",
diff --git a/tests/__mocks__/fileMock.js b/tests/__mocks__/fileMock.js
deleted file mode 100644
index 86059f3..0000000
--- a/tests/__mocks__/fileMock.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = 'test-file-stub';
diff --git a/tests/__mocks__/shim.js b/tests/__mocks__/shim.js
deleted file mode 100644
index 7947f08..0000000
--- a/tests/__mocks__/shim.js
+++ /dev/null
@@ -1,3 +0,0 @@
-global.requestAnimationFrame = (callback) => {
-  setTimeout(callback, 0);
-};
diff --git a/tests/__mocks__/styleMock.js b/tests/__mocks__/styleMock.js
deleted file mode 100644
index f053ebf..0000000
--- a/tests/__mocks__/styleMock.js
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = {};
diff --git a/tests/jest.json b/tests/jest.json
deleted file mode 100644
index fef61a1..0000000
--- a/tests/jest.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "rootDir": "..",
-  "coverageDirectory": "<rootDir>/tests/__coverage__/",
-  "setupTestFrameworkScriptFile": "<rootDir>/tests/testSetup.js",
-  "setupFiles": ["<rootDir>/tests/__mocks__/shim.js"],
-  "roots": ["<rootDir>/tests/"],
-  "moduleNameMapper": {
-    "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$":
-      "<rootDir>/tests/__mocks__/fileMock.js",
-    "\\.(css|scss|less)$": "<rootDir>/tests/__mocks__/styleMock.js"
-  },
-  "moduleFileExtensions": ["js", "jsx"],
-  "transformIgnorePatterns": ["/node_modules/"],
-  "testRegex": "/tests/.*\\.test\\.(js|jsx)$",
-  "moduleDirectories": ["node_modules"],
-  "globals": {
-    "DEVELOPMENT": false,
-    "FAKE_SERVER": false
-  }
-}
diff --git a/tests/testSetup.js b/tests/testSetup.js
deleted file mode 100644
index 7db822f..0000000
--- a/tests/testSetup.js
+++ /dev/null
@@ -1,8 +0,0 @@
-//Setup enzyme
-import enzyme from "enzyme";
-import Adapter from "enzyme-adapter-react-16";
-enzyme.configure({ adapter: new Adapter() });
-
-//Setup Jest
-import { createSerializer } from "enzyme-to-json";
-expect.addSnapshotSerializer(createSerializer({ mode: "deep" })); //deep,shallow