From ee9cd27e6ec072411f47cefd23be3a6374fd6431 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Sun, 18 Aug 2019 09:23:49 +1200
Subject: [PATCH 01/57] update readme.md

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 68c81ff..3ac4663 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,18 @@
-## 简介
+## DESCRIPTION
 一个基于 `Node` + `React` + `Webpack` + `MongoDB` 实现的 ToDoList 应用。
 
 
-## 功能：
+## FUNCTION
 
 - 添加 ToDo
 - 删除 ToDo
 
-## 安装
+## INSTALL
 ```js
 npm install
 ```
 
-## 启动
+## START
 ```js
 mongod --dbpath D:/mongodb/data
 ```
@@ -25,7 +25,7 @@ webpack -w
 npm start
 ```
 
-## 相关
+## ABOUT
 
 **项目和代码分析**
 

From 89fb1ddd0d935d13b36b26dcc8956d9826ea9cd5 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Sun, 18 Aug 2019 09:24:44 +1200
Subject: [PATCH 02/57] update readme.md again

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3ac4663..840ac21 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
 
 ## FUNCTION
 
-- 添加 ToDo
-- 删除 ToDo
+- Add ToDo
+- Delete ToDo
 
 ## INSTALL
 ```js

From b3ba466df21b8d6d0feeb7b92919d530f5d1e433 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Sun, 18 Aug 2019 09:35:36 +1200
Subject: [PATCH 03/57] change README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 840ac21..08e14e1 100644
--- a/README.md
+++ b/README.md
@@ -39,5 +39,5 @@ Windows：[http://www.cnblogs.com/wx1993/p/5206587.html]([http://www.cnblogs.com
 
 [http://www.cnblogs.com/wx1993/p/6518248.html](http://www.cnblogs.com/wx1993/p/6518248.html?_blank)
 
-## 效果
+## SCREENSHOT
 ![](https://camo.githubusercontent.com/3e21821d6a9aefbbdf9b0b3625ae5e6c4e0338d2/687474703a2f2f696d61676573323031352e636e626c6f67732e636f6d2f626c6f672f3738313436342f3230313730332f3738313436342d32303137303332303134323332393533332d313631373830363535362e706e67)

From a53d2cf41706202ee073bbbdf09ff2d940f11c41 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Sun, 18 Aug 2019 09:56:45 +1200
Subject: [PATCH 04/57] add travis.yml and some test files

---
 .travis.yml                                   |  2 ++
 hello.js                                      |  7 ++++++
 test/hello-test.js                            | 24 +++++++++++++++++++
 ...7\245\344\275\234\346\265\201\347\250\213" |  8 +++++++
 4 files changed, 41 insertions(+)
 create mode 100644 .travis.yml
 create mode 100644 hello.js
 create mode 100644 test/hello-test.js
 create mode 100644 "test/\345\267\245\344\275\234\346\265\201\347\250\213"

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..d4a0133
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,2 @@
+language: node_js
+node_js: "12"
diff --git a/hello.js b/hello.js
new file mode 100644
index 0000000..d939089
--- /dev/null
+++ b/hello.js
@@ -0,0 +1,7 @@
+module.exports = function (...rest) {
+    var sum = 0;
+    for (let n of rest) {
+        sum += n;
+    }
+    return sum;
+};
\ No newline at end of file
diff --git a/test/hello-test.js b/test/hello-test.js
new file mode 100644
index 0000000..73e11a7
--- /dev/null
+++ b/test/hello-test.js
@@ -0,0 +1,24 @@
+const assert = require('assert');
+
+const sum = require('../hello');
+
+describe('#hello.js', () => {
+
+    describe('#sum()', () => {
+        it('sum() should return 0', () => {
+            assert.strictEqual(sum(), 0);
+        });
+
+        it('sum(1) should return 1', () => {
+            assert.strictEqual(sum(1), 1);
+        });
+
+        it('sum(1, 2) should return 3', () => {
+            assert.strictEqual(sum(1, 2), 3);
+        });
+
+        it('sum(1, 2, 3) should return 6', () => {
+            assert.strictEqual(sum(1, 2, 3), 6);
+        });
+    });
+});
\ No newline at end of file
diff --git "a/test/\345\267\245\344\275\234\346\265\201\347\250\213" "b/test/\345\267\245\344\275\234\346\265\201\347\250\213"
new file mode 100644
index 0000000..d5954a0
--- /dev/null
+++ "b/test/\345\267\245\344\275\234\346\265\201\347\250\213"
@@ -0,0 +1,8 @@
+工作流程
+
+1.fork项目
+2.使用workflow工作模式
+3.增加travis-CI调用mocha测试
+4.设置heroku自动发布
+5.增加mlab应用并修改链接 重新提交github 自动发布 
+6.完成
\ No newline at end of file

From 863478fb5e49fe46171cb95db441086b8949264e Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Sun, 18 Aug 2019 10:02:06 +1200
Subject: [PATCH 05/57] only want to CI in mater branch

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d4a0133..213c5af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,2 +1,4 @@
 language: node_js
 node_js: "12"
+branches:
+  only: master

From 13cd52dfc882fe2a6dd43fadde904df15ca44c27 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Sun, 18 Aug 2019 10:45:38 +1200
Subject: [PATCH 06/57] add passing icon

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 08e14e1..20ba46f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/grr6525/Node-React-MongoDB-TodoList.svg?branch=master)](https://travis-ci.org/grr6525/Node-React-MongoDB-TodoList)
+
 ## DESCRIPTION
 一个基于 `Node` + `React` + `Webpack` + `MongoDB` 实现的 ToDoList 应用。
 

From ed0f444a2b5ea137bbeb309dbb63e87bc7862a23 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Sun, 18 Aug 2019 11:13:39 +1200
Subject: [PATCH 07/57] connet mongoDB in mlab

---
 app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.js b/app.js
index eac9fa6..5c792ee 100644
--- a/app.js
+++ b/app.js
@@ -9,7 +9,7 @@ var index = require('./routes/index');
 var users = require('./routes/users');
 
 var mongoose = require('mongoose')
-mongoose.connect('mongodb://localhost:27017/todo')
+mongoose.connect('mongodb://heroku_bqszzqcw:d1fcgvmgq3astipgea67pquhm3@ds263927.mlab.com:63927/heroku_bqszzqcw')
 
 var app = express();
 

From 20dd6b5af2fd4243d06b23c5826e665525c5538f Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Sun, 18 Aug 2019 11:24:51 +1200
Subject: [PATCH 08/57] add gitignore and mocha and chai

---
 .gitignore   | 2 ++
 package.json | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5171c54
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+npm-debug.log
\ No newline at end of file
diff --git a/package.json b/package.json
index 105712f..6b4439a 100644
--- a/package.json
+++ b/package.json
@@ -7,11 +7,13 @@
   },
   "dependencies": {
     "body-parser": "~1.16.0",
+    "chai": "^4.2.0",
     "cookie-parser": "~1.4.3",
     "debug": "~2.6.0",
     "ejs": "~2.5.5",
     "express": "~4.14.1",
     "jquery": "^3.1.1",
+    "mocha": "^6.2.0",
     "mongoose": "^4.8.6",
     "morgan": "~1.7.0",
     "serve-favicon": "~2.3.2"

From 0cf702c3821f9207df9514caa71916a852b04958 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Sun, 18 Aug 2019 11:34:12 +1200
Subject: [PATCH 09/57] use mocha and chai to test code

---
 hello.js           | 12 +++++-------
 test/hello-test.js | 24 ------------------------
 test/hello.test.js |  8 ++++++++
 3 files changed, 13 insertions(+), 31 deletions(-)
 delete mode 100644 test/hello-test.js
 create mode 100644 test/hello.test.js

diff --git a/hello.js b/hello.js
index d939089..3f2b505 100644
--- a/hello.js
+++ b/hello.js
@@ -1,7 +1,5 @@
-module.exports = function (...rest) {
-    var sum = 0;
-    for (let n of rest) {
-        sum += n;
-    }
-    return sum;
-};
\ No newline at end of file
+function add(x, y) {
+    return x + y;
+  }
+  
+  module.exports = add;
\ No newline at end of file
diff --git a/test/hello-test.js b/test/hello-test.js
deleted file mode 100644
index 73e11a7..0000000
--- a/test/hello-test.js
+++ /dev/null
@@ -1,24 +0,0 @@
-const assert = require('assert');
-
-const sum = require('../hello');
-
-describe('#hello.js', () => {
-
-    describe('#sum()', () => {
-        it('sum() should return 0', () => {
-            assert.strictEqual(sum(), 0);
-        });
-
-        it('sum(1) should return 1', () => {
-            assert.strictEqual(sum(1), 1);
-        });
-
-        it('sum(1, 2) should return 3', () => {
-            assert.strictEqual(sum(1, 2), 3);
-        });
-
-        it('sum(1, 2, 3) should return 6', () => {
-            assert.strictEqual(sum(1, 2, 3), 6);
-        });
-    });
-});
\ No newline at end of file
diff --git a/test/hello.test.js b/test/hello.test.js
new file mode 100644
index 0000000..6c7715a
--- /dev/null
+++ b/test/hello.test.js
@@ -0,0 +1,8 @@
+var add = require('./add.js');
+var expect = require('chai').expect;
+
+describe('test for add function', function() {
+  it('1 + 1 should be 2', function() {
+    expect(add(1, 1)).to.be.equal(2);
+  });
+});
\ No newline at end of file

From 7de34e1d3dcec1dc62d9959a6a539aa4ca0abe53 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Sun, 18 Aug 2019 11:58:14 +1200
Subject: [PATCH 10/57] a simple to use mocha and chai

---
 test/hello.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/hello.test.js b/test/hello.test.js
index 6c7715a..e765e9f 100644
--- a/test/hello.test.js
+++ b/test/hello.test.js
@@ -1,4 +1,4 @@
-var add = require('./add.js');
+var add = require('./../hello.js');
 var expect = require('chai').expect;
 
 describe('test for add function', function() {

From 628b4c5c47729b6daff7b36b74ab849140b4e50e Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Sun, 18 Aug 2019 12:07:22 +1200
Subject: [PATCH 11/57] use mocha test

---
 package.json | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 6b4439a..837ff08 100644
--- a/package.json
+++ b/package.json
@@ -3,20 +3,21 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "start": "node ./bin/www"
+    "start": "node ./bin/www",
+    "test": "mocha test"
   },
   "dependencies": {
-    "body-parser": "~1.16.0",
+    "body-parser": "^1.19.0",
     "chai": "^4.2.0",
     "cookie-parser": "~1.4.3",
     "debug": "~2.6.0",
     "ejs": "~2.5.5",
-    "express": "~4.14.1",
+    "express": "^4.17.1",
     "jquery": "^3.1.1",
     "mocha": "^6.2.0",
     "mongoose": "^4.8.6",
-    "morgan": "~1.7.0",
-    "serve-favicon": "~2.3.2"
+    "morgan": "^1.9.1",
+    "serve-favicon": "^2.5.0"
   },
   "devDependencies": {
     "babel": "^6.23.0",

From 3218bb08ebb98e3a640ce45e327e22ea987d0521 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Sun, 18 Aug 2019 12:18:14 +1200
Subject: [PATCH 12/57] update some details about README.md

---
 README.md | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 20ba46f..ede39ec 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.org/grr6525/Node-React-MongoDB-TodoList.svg?branch=master)](https://travis-ci.org/grr6525/Node-React-MongoDB-TodoList)
 
 ## DESCRIPTION
-一个基于 `Node` + `React` + `Webpack` + `MongoDB` 实现的 ToDoList 应用。
+A TODO LIST APPLICATION BASED ON Node-React-express-MongoDB
 
 
 ## FUNCTION
@@ -15,13 +15,6 @@ npm install
 ```
 
 ## START
-```js
-mongod --dbpath D:/mongodb/data
-```
-
-```js
-webpack -w
-```
 
 ```js
 npm start
@@ -29,11 +22,11 @@ npm start
 
 ## ABOUT
 
-**项目和代码分析**
+**HOW IT WORKS**
 
 [http://www.cnblogs.com/wx1993/p/6550111.html](http://www.cnblogs.com/wx1993/p/6550111.html?_blank)
  
-**MongoDB 的安装和配置**
+**HOW TO INSTALL MongoDB**
 
 Mac：[http://www.cnblogs.com/wx1993/p/5187530.html](http://www.cnblogs.com/wx1993/p/5187530.html?_blank)
 

From b1012d2305c301b714ca4bb60013dfd355326868 Mon Sep 17 00:00:00 2001
From: Jason <52952606+grr6525@users.noreply.github.com>
Date: Thu, 10 Oct 2019 14:53:46 +1300
Subject: [PATCH 13/57] Update index.js

---
 src/pages/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/index.js b/src/pages/index.js
index 7375d8c..1f9ed57 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -130,7 +130,7 @@ class Todo extends React.Component {
   	render() {
 	  	return (
 	  		<div className="container">
-				<h2 className="header">Todo List</h2>
+				<h2 className="header">TodoWoCAOList</h2>
 				<form className="todoForm" ref="todoForm" onSubmit={ this.handleSubmit.bind(this) }>
 					<input ref="content" type="text" placeholder="Type content here..." className="todoContent" />
 					{ this.state.showTooltip &&

From 9503775587664dddc13288040818cc8dfc9fc242 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Thu, 10 Oct 2019 16:21:46 +1300
Subject: [PATCH 14/57] change some layout

---
 public/css/style.css | 32 ++++++++++++++----
 public/js/bundle.js  | 77 +++++++++++++++++++++++++++++++++-----------
 src/pages/index.js   |  2 +-
 3 files changed, 85 insertions(+), 26 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index 5dfd0f0..f52f080 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -13,20 +13,34 @@ button {
 }
 
 .container {
-	position: absolute;
+	position:absolute;
 	top: 15%;
-	right: 15%;
+	left: 1%;
 	width: 400px;
 	height: 475px;
-	overflow-x: hidden;
-	overflow-y: auto;
-	padding: 20px;
+	
+	border: 1px solid #666;
+	border-radius: 5px;
+	box-shadow: 5px 5px 20px #000;
+	background: rgba(60,60,60,0.3);
+}
+
+.container2 {
+
+	position:absolute;
+	top: 15%;
+	left: 450px;
+	width: 800px;
+	height: 475px;
+
 	border: 1px solid #666;
 	border-radius: 5px;
 	box-shadow: 5px 5px 20px #000;
 	background: rgba(60,60,60,0.3);
 }
 
+
+
 .header h2 {
 	padding: 0;
 	margin: 0;
@@ -34,7 +48,13 @@ button {
 	text-align: center;
 	letter-spacing: 1px;
 }
-
+.header2 h2 {
+	padding: 0;
+	margin: 0;
+	font-size: 25px;
+	text-align: center;
+	letter-spacing: 1px;
+}
 .todoForm {
 	margin: 20px 0 30px 0;
 }
diff --git a/public/js/bundle.js b/public/js/bundle.js
index 77db085..4fd60b9 100644
--- a/public/js/bundle.js
+++ b/public/js/bundle.js
@@ -9658,25 +9658,64 @@ var Todo = function (_React$Component) {
 		key: 'render',
 		value: function render() {
 			return _react2.default.createElement(
-				'div',
-				{ className: 'container' },
-				_react2.default.createElement(
-					'h2',
-					{ className: 'header' },
-					'Todo List'
-				),
-				_react2.default.createElement(
-					'form',
-					{ className: 'todoForm', ref: 'todoForm', onSubmit: this.handleSubmit.bind(this) },
-					_react2.default.createElement('input', { ref: 'content', type: 'text', placeholder: 'Type content here...', className: 'todoContent' }),
-					this.state.showTooltip && _react2.default.createElement(
-						'span',
-						{ className: 'tooltip' },
-						'Content is required !'
-					)
-				),
-				_react2.default.createElement(_todoList2.default, { todoList: this.state.todoList, onDeleteItem: this._onDeleteItem.bind(this) })
-			);
+        'div',
+        {classname:'bigcontainer'},
+        _react2.default.createElement(
+          'div',
+          { className: 'container' },
+          _react2.default.createElement(
+            'h2',
+            { className: 'header' },
+            'Discription'
+          ),
+          _react2.default.createElement(
+            'input',
+            { ref: 'content', type:'text', className: 'DiscriptionIn' }
+          ),
+          _react2.default.createElement(
+            'input',
+            { ref: 'content', type:'text', className: 'Year1' }
+          ),
+          _react2.default.createElement(
+            'input',
+            { ref: 'content', type:'text', className: 'Year2' }
+          ),
+          _react2.default.createElement(
+            'form',
+            { className: 'todoForm', ref: 'todoForm', onSubmit: this.handleSubmit.bind(this) },
+            _react2.default.createElement('input', { ref: 'content', type: 'text', placeholder: 'Type content here...', className: 'todoContent' }),
+            this.state.showTooltip && _react2.default.createElement(
+              'span',
+              { className: 'tooltip' },
+              'Content is required !'
+            )
+          ),
+          _react2.default.createElement(_todoList2.default, { todoList: this.state.todoList, onDeleteItem: this._onDeleteItem.bind(this) })
+        
+          ),
+        _react2.default.createElement(
+          'div',
+          { className: 'container2' },
+          _react2.default.createElement(
+            'h2',
+            { className: 'header' },
+            'Result'
+          ),
+
+          _react2.default.createElement(
+            'form',
+            { className: 'todoForm', ref: 'todoForm', onSubmit: this.handleSubmit.bind(this) },
+            _react2.default.createElement('input', { ref: 'content', type: 'text', placeholder: 'Type content here...', className: 'todoContent' }),
+            this.state.showTooltip && _react2.default.createElement(
+              'span',
+              { className: 'tooltip' },
+              'Content is required !'
+            )
+          ),
+          _react2.default.createElement(_todoList2.default, { todoList: this.state.todoList, onDeleteItem: this._onDeleteItem.bind(this) })
+        
+            )
+				);
 		}
 	}]);
 
diff --git a/src/pages/index.js b/src/pages/index.js
index 1f9ed57..7375d8c 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -130,7 +130,7 @@ class Todo extends React.Component {
   	render() {
 	  	return (
 	  		<div className="container">
-				<h2 className="header">TodoWoCAOList</h2>
+				<h2 className="header">Todo List</h2>
 				<form className="todoForm" ref="todoForm" onSubmit={ this.handleSubmit.bind(this) }>
 					<input ref="content" type="text" placeholder="Type content here..." className="todoContent" />
 					{ this.state.showTooltip &&

From e419b1c3349d9467d435283529a6f788baf3f4c2 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Thu, 10 Oct 2019 20:47:44 +1300
Subject: [PATCH 15/57] #2 feature 2 add if conditions

---
 public/css/style.css |  82 +++++++++++++---
 public/js/bundle.js  | 227 ++++++++++++++++++++++++++++++++++---------
 src/pages/index.js   |   9 +-
 3 files changed, 252 insertions(+), 66 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index f52f080..03ba608 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -12,7 +12,7 @@ button {
 	cursor: pointer;
 }
 
-.container {
+/* .container {
 	position:absolute;
 	top: 15%;
 	left: 1%;
@@ -23,7 +23,7 @@ button {
 	border-radius: 5px;
 	box-shadow: 5px 5px 20px #000;
 	background: rgba(60,60,60,0.3);
-}
+} */
 
 .container2 {
 
@@ -39,31 +39,87 @@ button {
 	background: rgba(60,60,60,0.3);
 }
 
+.searchcondition {
+	position:absolute;
+	width: 36.2%;
+	height: 80%;
+	left: 2%;
+	border: 1px solid #666;
+	border-radius: 5px;
+	box-shadow: 5px 5px 20px #000;
+	background: rgba(60,60,60,0.3);
+}
 
+.searchresult {
+	position:absolute;
+	width: 60.8%;
+	height: 80%;
+	left: 38.4%;
+	border: 1px solid #666;
+	border-radius: 5px;
+	box-shadow: 5px 5px 20px #000;
+	background: rgba(60,60,60,0.3);
+}
 
-.header h2 {
-	padding: 0;
-	margin: 0;
-	font-size: 25px;
-	text-align: center;
-	letter-spacing: 1px;
+.layer {
+	float: none;
+	align-items:center;
+	margin-top: 2px;
+	height: 15%;
 }
-.header2 h2 {
-	padding: 0;
-	margin: 0;
+
+.yeartext {
+	Float: left;
+	margin-left:-40px;
+	width: 30%;
+	height: 35%;
+}
+
+.divyear {
+	Float: left;
+	margin-Left: 5%;
+	width: 20%;
+}
+
+.ifsection {
+	margin-left: 5%;
+	height: 50%;
+	width: 20%;
+}
+
+.iftext {
+	margin-left: 5%;
+	height: 35%;
+	width: 30%;
+}
+
+.ifbutton {
+	margin-left: 2px;
+	height: 55%;
+	width: 5%;
+}
+
+.conditiontitle {
+	margin-left: 5%;
+}
+
+.header h2 {
+	margin-left: 5%;
 	font-size: 25px;
 	text-align: center;
 	letter-spacing: 1px;
 }
+
 .todoForm {
 	margin: 20px 0 30px 0;
+	width: 500px;
+	height: 268px;
 }
 
 .todoContent {
-	display: block;
 	width: 380px;
 	padding: 10px;
-	margin-bottom: 20px;
+	margin-top: 20px;
 	border: none;
 	border-radius: 3px;
 }
diff --git a/public/js/bundle.js b/public/js/bundle.js
index 4fd60b9..62c579a 100644
--- a/public/js/bundle.js
+++ b/public/js/bundle.js
@@ -9640,7 +9640,7 @@ var Todo = function (_React$Component) {
 
 			// 生成参数
 			var newItem = {
-				content: this.refs.content.value,
+        content: this.refs.content.value,
 				date: month + "/" + date + " " + hours + ":" + minutes + ":" + seconds
 			};
 
@@ -9658,64 +9658,201 @@ var Todo = function (_React$Component) {
 		key: 'render',
 		value: function render() {
 			return _react2.default.createElement(
-        'div',
-        {classname:'bigcontainer'},
+        'span',
+        {classname:'container'},
         _react2.default.createElement(
           'div',
-          { className: 'container' },
+          { className: 'searchcondition' },
           _react2.default.createElement(
-            'h2',
-            { className: 'header' },
-            'Discription'
-          ),
-          _react2.default.createElement(
-            'input',
-            { ref: 'content', type:'text', className: 'DiscriptionIn' }
-          ),
-          _react2.default.createElement(
-            'input',
-            { ref: 'content', type:'text', className: 'Year1' }
-          ),
-          _react2.default.createElement(
-            'input',
-            { ref: 'content', type:'text', className: 'Year2' }
+            'div',
+            {className: 'conditiontitle'},
+            _react2.default.createElement(
+              'h2',
+              { className: 'header' },
+              'Discription'
+            ),
           ),
+
           _react2.default.createElement(
             'form',
             { className: 'todoForm', ref: 'todoForm', onSubmit: this.handleSubmit.bind(this) },
-            _react2.default.createElement('input', { ref: 'content', type: 'text', placeholder: 'Type content here...', className: 'todoContent' }),
-            this.state.showTooltip && _react2.default.createElement(
-              'span',
-              { className: 'tooltip' },
-              'Content is required !'
+            _react2.default.createElement(
+              'div',
+              { className:'layer' },
+                _react2.default.createElement(
+                'div', 
+                {className: 'divyear' },
+                'From'
+                ),
+                _react2.default.createElement(
+                'input', 
+                { ref: 'content', type: 'text', placeholder: '2018', className: 'yeartext' }),
+
+                _react2.default.createElement(
+                  'div', 
+                  {className: 'divyear' },
+                  'TO'
+                  ),
+                _react2.default.createElement(
+                  'input', 
+                  { ref: 'content', type: 'text', placeholder: '2019', className: 'yeartext' })
+            ),
+            
+            _react2.default.createElement(
+              'div',
+              { className : 'layer'},
+              _react2.default.createElement(
+                'select',
+                { className : 'ifsection'},
+                
+                _react2.default.createElement(
+                  'option',
+                  { value : 'Article title'},
+                  'Article title'
+                ),
+                
+                _react2.default.createElement(
+                  'option',
+                  { value : 'Article Source'},
+                  'Article Source'
+                ),
+                
+                _react2.default.createElement(
+                  'option',
+                  { value : 'Author'},
+                  'Author'
+                ),
+              ),
+
+              _react2.default.createElement(
+                'select',
+                { className : 'ifsection'},
+                
+                _react2.default.createElement(
+                  'option',
+                  { value : 'Contains'},
+                  'Contains'
+                ),
+                
+                _react2.default.createElement(
+                  'option',
+                  { value : 'Not contain'},
+                  'Not contain'
+                ),
+                
+                _react2.default.createElement(
+                  'option',
+                  { value : 'Begins with'},
+                  'Begins with'
+                ),
+                
+                _react2.default.createElement(
+                  'option',
+                  { value : 'End with'},
+                  'end with'
+                ),
+                
+                _react2.default.createElement(
+                  'option',
+                  { value : 'Equal'},
+                  'Equal'
+                ),
+              ),
+
+              
+              _react2.default.createElement(
+                'input', 
+                { ref: 'content', type: 'text', placeholder: 'value', className: 'iftext' }),
+
+                _react2.default.createElement(
+                  'button', 
+                  { type: 'button', className: 'ifbutton', onClick: this.handleSubmit.bind(this)},
+                  '+'
+                  ),
+                  _react2.default.createElement(
+                    'button', 
+                    { type: 'button', className: 'ifbutton'},
+                    '-'
+                    ),
+                    
+
             )
           ),
           _react2.default.createElement(_todoList2.default, { todoList: this.state.todoList, onDeleteItem: this._onDeleteItem.bind(this) })
-        
-          ),
+        ),
+
         _react2.default.createElement(
           'div',
-          { className: 'container2' },
+          {className: 'searchresult'},
+          // _react2.default.createElement(
+          //   'div',
+          //   { className : 'layer'},
+          //   _react2.default.createElement(
+          //     'select',
+          //     { className : 'searchsection'},
+              
+          //     _react2.default.createElement(
+          //       'option',
+          //       { value : 'Contains'},
+          //       'Contains'
+          //     ),
+              
+          //     _react2.default.createElement(
+          //       'option',
+          //       { value : 'Not contain'},
+          //       'Not contain'
+          //     ),
+              
+          //     _react2.default.createElement(
+          //       'option',
+          //       { value : 'Begins with'},
+          //       'Begins with'
+          //     ),
+              
+          //     _react2.default.createElement(
+          //       'option',
+          //       { value : 'End with'},
+          //       'end with'
+          //     ),
+              
+          //     _react2.default.createElement(
+          //       'option',
+          //       { value : 'Equal'},
+          //       'Equal'
+          //     ),
+          //   ),
+          // ),
+          
+
+          // _react2.default.createElement(
+          //   'form',
+          //   { className: 'todoForm', ref: 'todoForm', onSubmit: this.handleSubmit.bind(this) },
+          //   _react2.default.createElement('input', { ref: 'content', type: 'text', placeholder: 'Type content here...', className: 'todoContent' }),
+          //   this.state.showTooltip && _react2.default.createElement(
+          //     'span',
+          //     { className: 'tooltip' },
+          //     'Content is required !'
+          //   )
+          // ),
+          
           _react2.default.createElement(
-            'h2',
-            { className: 'header' },
-            'Result'
+            'div',
+            {className: 'conditiontitle'},
+            _react2.default.createElement(
+              'h2',
+              { className: 'header' },
+              'Results'
+            ),
           ),
-
-          _react2.default.createElement(
-            'form',
-            { className: 'todoForm', ref: 'todoForm', onSubmit: this.handleSubmit.bind(this) },
-            _react2.default.createElement('input', { ref: 'content', type: 'text', placeholder: 'Type content here...', className: 'todoContent' }),
-            this.state.showTooltip && _react2.default.createElement(
-              'span',
-              { className: 'tooltip' },
-              'Content is required !'
-            )
-          ),
-          _react2.default.createElement(_todoList2.default, { todoList: this.state.todoList, onDeleteItem: this._onDeleteItem.bind(this) })
-        
-            )
-				);
+          // _react2.default.createElement(_todoList2.default, { todoList: this.state.todoList})
+          // _react2.default.createElement(
+          //   'textarea',
+          //   {value : this.state.todoList}
+            
+          // )
+
+        )
+			);
 		}
 	}]);
 
diff --git a/src/pages/index.js b/src/pages/index.js
index 7375d8c..827f3f9 100644
--- a/src/pages/index.js
+++ b/src/pages/index.js
@@ -130,14 +130,7 @@ class Todo extends React.Component {
   	render() {
 	  	return (
 	  		<div className="container">
-				<h2 className="header">Todo List</h2>
-				<form className="todoForm" ref="todoForm" onSubmit={ this.handleSubmit.bind(this) }>
-					<input ref="content" type="text" placeholder="Type content here..." className="todoContent" />
-					{ this.state.showTooltip &&
-						<span className="tooltip">Content is required !</span>
-					}
-				</form>
-				<TodoList todoList={this.state.todoList} onDeleteItem={this._onDeleteItem.bind(this)} />
+
 	  		</div>
   		)
   	}

From 4638f539f1c325ce0e9d793db14f7b7551fa747e Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Fri, 11 Oct 2019 00:22:47 +1300
Subject: [PATCH 16/57] # feature 3 Saving the search conditions.

---
 public/css/style.css |  30 ++++++++++++-
 public/js/bundle.js  | 102 +++++++++++++++++++++++++++++--------------
 views/index.ejs      |   3 +-
 3 files changed, 100 insertions(+), 35 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index 03ba608..dced210 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -42,7 +42,7 @@ button {
 .searchcondition {
 	position:absolute;
 	width: 36.2%;
-	height: 80%;
+	height: 70%;
 	left: 2%;
 	border: 1px solid #666;
 	border-radius: 5px;
@@ -53,7 +53,7 @@ button {
 .searchresult {
 	position:absolute;
 	width: 60.8%;
-	height: 80%;
+	height: 70%;
 	left: 38.4%;
 	border: 1px solid #666;
 	border-radius: 5px;
@@ -68,18 +68,33 @@ button {
 	height: 15%;
 }
 
+.maintitle{
+	float: right;
+}
+
 .yeartext {
 	Float: left;
 	margin-left:-40px;
 	width: 30%;
 	height: 35%;
 }
+.yeartext2 {
+	Float: left;
+	margin-left:-50px;
+	width: 30%;
+	height: 35%;
+}
 
 .divyear {
 	Float: left;
 	margin-Left: 5%;
 	width: 20%;
 }
+.divyear2 {
+	Float: left;
+	margin-Left: 8%;
+	width: 20%;
+}
 
 .ifsection {
 	margin-left: 5%;
@@ -98,9 +113,20 @@ button {
 	height: 55%;
 	width: 5%;
 }
+.searchbutton {
+	margin-left: 45.5%;
+	height: 55%;
+	width: 25%;
+}
+.savebutton {
+	margin-left: 1%;
+	height: 55%;
+	width: 25%;
+}
 
 .conditiontitle {
 	margin-left: 5%;
+	margin-right: 10%;
 }
 
 .header h2 {
diff --git a/public/js/bundle.js b/public/js/bundle.js
index 62c579a..5d7b7ef 100644
--- a/public/js/bundle.js
+++ b/public/js/bundle.js
@@ -9511,7 +9511,8 @@ var Todo = function (_React$Component) {
 		var _this = _possibleConstructorReturn(this, (Todo.__proto__ || Object.getPrototypeOf(Todo)).call(this, props));
 
 		_this.state = {
-			todoList: [],
+      todoList: [],
+      todoListALL:[],
 			showTooltip: false // 控制 tooltip 的显示隐藏
 		};
 		return _this;
@@ -9526,7 +9527,7 @@ var Todo = function (_React$Component) {
 
 		// 获取 todolist
 
-	}, {
+	},{
 		key: '_getTodoList',
 		value: function _getTodoList() {
 			var that = this;
@@ -9535,10 +9536,12 @@ var Todo = function (_React$Component) {
 				type: 'get',
 				dataType: 'json',
 				success: function success(data) {
+
 					console.log(data);
 					// const todoList = that.todoSort(data)
 					that.setState({
-						todoList: data
+            todoList: data,
+            todoListALL: data
 					});
 				},
 				error: function error(err) {
@@ -9655,11 +9658,20 @@ var Todo = function (_React$Component) {
 			});
 		}
 	}, {
+    key: '_addcondition',
+    value: function _addcondition(){
+      return _react2.default.createElement(
+        'h2',
+        { className: '123'},
+        '12321312'
+      )
+    }
+  }, {
 		key: 'render',
 		value: function render() {
 			return _react2.default.createElement(
         'span',
-        {classname:'container'},
+        {className:'container'},
         _react2.default.createElement(
           'div',
           { className: 'searchcondition' },
@@ -9679,23 +9691,24 @@ var Todo = function (_React$Component) {
             _react2.default.createElement(
               'div',
               { className:'layer' },
-                _react2.default.createElement(
+              _react2.default.createElement(
+              'div', 
+              {className: 'divyear' },
+              'From'
+              ),
+              _react2.default.createElement(
+              'input', 
+              { ref: 'content', type: 'text', placeholder: '2018', className: 'yeartext' }),
+
+              _react2.default.createElement(
                 'div', 
-                {className: 'divyear' },
-                'From'
+                {className: 'divyear2' },
+                'TO'
                 ),
-                _react2.default.createElement(
+              _react2.default.createElement(
                 'input', 
-                { ref: 'content', type: 'text', placeholder: '2018', className: 'yeartext' }),
-
-                _react2.default.createElement(
-                  'div', 
-                  {className: 'divyear' },
-                  'TO'
-                  ),
-                _react2.default.createElement(
-                  'input', 
-                  { ref: 'content', type: 'text', placeholder: '2019', className: 'yeartext' })
+                { ref: 'content', type: 'text', placeholder: '2019', className: 'yeartext2' }
+              )
             ),
             
             _react2.default.createElement(
@@ -9758,27 +9771,51 @@ var Todo = function (_React$Component) {
                   'Equal'
                 ),
               ),
-
               
               _react2.default.createElement(
                 'input', 
-                { ref: 'content', type: 'text', placeholder: 'value', className: 'iftext' }),
+                { ref: 'content', type: 'text', placeholder: 'value', className: 'iftext' }
+              ),
 
-                _react2.default.createElement(
+              _react2.default.createElement(
                   'button', 
-                  { type: 'button', className: 'ifbutton', onClick: this.handleSubmit.bind(this)},
+                  { type: 'button', className: 'ifbutton'},
                   '+'
-                  ),
-                  _react2.default.createElement(
-                    'button', 
-                    { type: 'button', className: 'ifbutton'},
-                    '-'
-                    ),
-                    
-
-            )
+              ),
+              _react2.default.createElement(
+                  'button', 
+                  { type: 'button', className: 'ifbutton'},
+                  '-'
+              ),
+            ),
+            
+            _react2.default.createElement(
+              'div',
+              { className : 'layer'},
+              
+              _react2.default.createElement(
+                'button', 
+                { type: 'button', className: 'searchbutton'},
+                'Search'
+              ),
+              _react2.default.createElement(
+                'button', 
+                { type: 'button', className: 'savebutton', onClick: this.handleSubmit.bind(this)},
+                'Save'
+              ),
+            ),
           ),
-          _react2.default.createElement(_todoList2.default, { todoList: this.state.todoList, onDeleteItem: this._onDeleteItem.bind(this) })
+          _react2.default.createElement(
+            'div',
+            {className: 'conditiontitle'},
+            _react2.default.createElement(
+              'h2',
+              { className: 'header' },
+              'History'
+            ),
+            
+            _react2.default.createElement(_todoList2.default, { todoList: this.state.todoList, onDeleteItem: this._onDeleteItem.bind(this) })  
+          ),          
         ),
 
         _react2.default.createElement(
@@ -9844,6 +9881,7 @@ var Todo = function (_React$Component) {
               'Results'
             ),
           ),
+
           // _react2.default.createElement(_todoList2.default, { todoList: this.state.todoList})
           // _react2.default.createElement(
           //   'textarea',
diff --git a/views/index.ejs b/views/index.ejs
index 3545827..5240865 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -5,7 +5,8 @@
 	<link rel='stylesheet' href='/css/style.css' />
 </head>
 <body>
-
+	<span><img src="/images/logo.jpg"><div class="maintitle"><h1>SERLER</h1></div></span>
+	
 	<div id="app">
 		
 	</div>

From 4061b8eeb63fab8d70d960b57ccdaaf25d80cccd Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Fri, 11 Oct 2019 00:32:21 +1300
Subject: [PATCH 17/57] # feature 3 add logo.png

---
 public/css/style.css   |   4 +++-
 public/images/logo.png | Bin 0 -> 23780 bytes
 views/index.ejs        |   2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 public/images/logo.png

diff --git a/public/css/style.css b/public/css/style.css
index dced210..37d8181 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -60,7 +60,9 @@ button {
 	box-shadow: 5px 5px 20px #000;
 	background: rgba(60,60,60,0.3);
 }
-
+h1{	
+	font-size: 75px;
+}
 .layer {
 	float: none;
 	align-items:center;
diff --git a/public/images/logo.png b/public/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..297fd8cc6c9b2fd16e6980e723ade91112d458ae
GIT binary patch
literal 23780
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
Lsmhj1Lj(T@PHvI+

literal 0
HcmV?d00001

diff --git a/views/index.ejs b/views/index.ejs
index 5240865..f8c6abb 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -5,7 +5,7 @@
 	<link rel='stylesheet' href='/css/style.css' />
 </head>
 <body>
-	<span><img src="/images/logo.jpg"><div class="maintitle"><h1>SERLER</h1></div></span>
+	<span><img src="/images/logo.png"><div class="maintitle"><h1 font-size>SERLER</h1></div></span>
 	
 	<div id="app">
 		

From aab9398d201d91cf2c174dc778cbd2bccffded73 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Fri, 11 Oct 2019 00:54:16 +1300
Subject: [PATCH 18/57] # feature 2 adjust logo

---
 public/css/style.css | 15 +++++++++------
 views/index.ejs      |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/public/css/style.css b/public/css/style.css
index 37d8181..ab1ef22 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -42,7 +42,7 @@ button {
 .searchcondition {
 	position:absolute;
 	width: 36.2%;
-	height: 70%;
+	height: 75%;
 	left: 2%;
 	border: 1px solid #666;
 	border-radius: 5px;
@@ -53,7 +53,7 @@ button {
 .searchresult {
 	position:absolute;
 	width: 60.8%;
-	height: 70%;
+	height: 75%;
 	left: 38.4%;
 	border: 1px solid #666;
 	border-radius: 5px;
@@ -61,7 +61,7 @@ button {
 	background: rgba(60,60,60,0.3);
 }
 h1{	
-	font-size: 75px;
+	font-size: 55px;
 }
 .layer {
 	float: none;
@@ -73,6 +73,9 @@ h1{
 .maintitle{
 	float: right;
 }
+.logo{
+	margin-top: -40px;
+}
 
 .yeartext {
 	Float: left;
@@ -82,7 +85,7 @@ h1{
 }
 .yeartext2 {
 	Float: left;
-	margin-left:-50px;
+	margin-left:-56px;
 	width: 30%;
 	height: 35%;
 }
@@ -140,8 +143,8 @@ h1{
 
 .todoForm {
 	margin: 20px 0 30px 0;
-	width: 500px;
-	height: 268px;
+	width: 99%;
+	height: 40%;
 }
 
 .todoContent {
diff --git a/views/index.ejs b/views/index.ejs
index f8c6abb..e095ecb 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -5,7 +5,7 @@
 	<link rel='stylesheet' href='/css/style.css' />
 </head>
 <body>
-	<span><img src="/images/logo.png"><div class="maintitle"><h1 font-size>SERLER</h1></div></span>
+	<span><img src="/images/logo.png" class="logo"><div class="maintitle"><h1 font-size>SERLER</h1></div></span>
 	
 	<div id="app">
 		

From 31000abb0e21fe20b89866f197a39af3b6b58e97 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Fri, 11 Oct 2019 09:06:26 +1300
Subject: [PATCH 19/57] change some details of the page

---
 public/js/bundle.js | 12 ++++++------
 routes/index.js     | 11 +++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/public/js/bundle.js b/public/js/bundle.js
index 5d7b7ef..aa3cba4 100644
--- a/public/js/bundle.js
+++ b/public/js/bundle.js
@@ -9720,20 +9720,20 @@ var Todo = function (_React$Component) {
                 
                 _react2.default.createElement(
                   'option',
-                  { value : 'Article title'},
-                  'Article title'
+                  { value : 'Method'},
+                  'Method'
                 ),
                 
                 _react2.default.createElement(
                   'option',
-                  { value : 'Article Source'},
-                  'Article Source'
+                  { value : 'Methodology'},
+                  'Methodology'
                 ),
                 
                 _react2.default.createElement(
                   'option',
-                  { value : 'Author'},
-                  'Author'
+                  { value : 'Benifit'},
+                  'Benifit'
                 ),
               ),
 
diff --git a/routes/index.js b/routes/index.js
index a9c5765..4074da5 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -19,6 +19,17 @@ router.get('/getAllItems', (req, res, next) => {
 	})
 });
 
+
+router.get('/getFakeData', (req, res, next) => {
+	Todo.find({}).sort({'date': -1}).exec((err, todoList) => {
+		if (err) {
+			console.log(err);
+		}else {
+			res.json(todoList);
+		}
+	})
+});
+
 // 添加todo
 router.post('/addItem', (req, res, next) => {
 	let newItem = req.body;

From 215a6792d7cb095edd5f9f5e317fe29e2f7a7fef Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Fri, 11 Oct 2019 11:08:38 +1300
Subject: [PATCH 20/57] change some spelling mistake

---
 public/js/bundle.js | 72 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 59 insertions(+), 13 deletions(-)

diff --git a/public/js/bundle.js b/public/js/bundle.js
index aa3cba4..01a855b 100644
--- a/public/js/bundle.js
+++ b/public/js/bundle.js
@@ -9658,15 +9658,61 @@ var Todo = function (_React$Component) {
 			});
 		}
 	}, {
-    key: '_addcondition',
-    value: function _addcondition(){
-      return _react2.default.createElement(
-        'h2',
-        { className: '123'},
-        '12321312'
-      )
-    }
-  }, {
+    key: 'searchData',
+    value: function _searchData(){
+
+      event.preventDefault();
+			// 表单输入为空验证
+			if (this.refs.contentFrom.value == "") {
+				this.refs.contentFrom.focus();
+				return;
+			}else if (this.refs.contentEnd.value == "") {
+				this.refs.contentEnd.focus();
+				return;
+      }
+
+      	// 生成参数
+			var newItem = {
+        beginYear: this.refs.contentFrom.value,
+				endYear:this.refs.contentEnd.value
+			};
+      
+      console.log(newItem);
+      //this._onSearchData(newItem);
+
+
+     
+    
+    }
+  }, 
+
+  {
+		key: '_onSearchData',
+		value: function _onSearchData(newItem) {
+			var that = this;
+			_jquery2.default.ajax({
+				url: '/SearchData',
+				type: 'get',
+				dataType: 'json',
+				data: newItem,
+				success: function success(data) {
+					console.log(data);
+					var todoList = that.todoSort(data);
+					that.setState({
+						todoList: todoList
+					});
+				},
+				error: function error(err) {
+					console.log(err);
+				}
+			});
+		}
+
+		// 删除 todo
+
+  },
+  
+  {
 		key: 'render',
 		value: function render() {
 			return _react2.default.createElement(
@@ -9681,7 +9727,7 @@ var Todo = function (_React$Component) {
             _react2.default.createElement(
               'h2',
               { className: 'header' },
-              'Discription'
+              'Description'
             ),
           ),
 
@@ -9698,7 +9744,7 @@ var Todo = function (_React$Component) {
               ),
               _react2.default.createElement(
               'input', 
-              { ref: 'content', type: 'text', placeholder: '2018', className: 'yeartext' }),
+              { ref: 'contentFrom', type: 'text', placeholder: '2018', className: 'yeartext' }),
 
               _react2.default.createElement(
                 'div', 
@@ -9707,7 +9753,7 @@ var Todo = function (_React$Component) {
                 ),
               _react2.default.createElement(
                 'input', 
-                { ref: 'content', type: 'text', placeholder: '2019', className: 'yeartext2' }
+                { ref: 'contentEnd', type: 'text', placeholder: '2019', className: 'yeartext2' }
               )
             ),
             
@@ -9795,7 +9841,7 @@ var Todo = function (_React$Component) {
               
               _react2.default.createElement(
                 'button', 
-                { type: 'button', className: 'searchbutton'},
+                { type: 'button', className: 'searchbutton',onClick: this.searchData.bind(this)},
                 'Search'
               ),
               _react2.default.createElement(

From 0d71417c2f25f1fa1a2caea2573d7d6b53e779f6 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Fri, 11 Oct 2019 19:46:20 +1300
Subject: [PATCH 21/57] change the route

---
 routes/index.js | 31 +++++++++++++++++++------------
 routes/users.js |  2 +-
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/routes/index.js b/routes/index.js
index 4074da5..2b53943 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -4,7 +4,7 @@ var Todo = require('../src/models/todo')
 
 router.get('/', (req, res, next) => {
 	res.render('index', {
-		title: 'React TodoList'
+		title: 'SERLER'
 	});
 });
 
@@ -19,17 +19,6 @@ router.get('/getAllItems', (req, res, next) => {
 	})
 });
 
-
-router.get('/getFakeData', (req, res, next) => {
-	Todo.find({}).sort({'date': -1}).exec((err, todoList) => {
-		if (err) {
-			console.log(err);
-		}else {
-			res.json(todoList);
-		}
-	})
-});
-
 // 添加todo
 router.post('/addItem', (req, res, next) => {
 	let newItem = req.body;
@@ -48,6 +37,24 @@ router.post('/addItem', (req, res, next) => {
 	})
 })
 
+
+router.all('/SearchData', (req, res, next) => {
+
+	// let newItem = req.body;
+	// Todo.find({"context":newItem.beginYear }).sort({'date': -1}).exec((err, todoList) => {
+	// 	if (err) {
+	// 		console.log(err);
+	// 	}else {
+	// 		res.json(todoList);
+	// 	}
+	// })
+	  res.send('GET request to the homepage');
+
+	
+})
+
+
+
 // 删除todo
 router.post('/deleteItem', (req, res, next) => {
 	console.log(req.body);
diff --git a/routes/users.js b/routes/users.js
index 927484c..48c1172 100644
--- a/routes/users.js
+++ b/routes/users.js
@@ -3,7 +3,7 @@ var router = express.Router();
 
 router.get('/', (req, res, next) => {
 	res.render('index', {
-		title: 'React TodoList'
+		title: 'SERLER'
 	});
 });
 

From 828978c83aed467bb2c3b04ba15a7043899206fb Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Fri, 11 Oct 2019 20:11:09 +1300
Subject: [PATCH 22/57] search function done

---
 public/js/bundle.js | 22 +++++++++++-----------
 routes/index.js     | 20 ++++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/public/js/bundle.js b/public/js/bundle.js
index 01a855b..ca40bee 100644
--- a/public/js/bundle.js
+++ b/public/js/bundle.js
@@ -9661,24 +9661,24 @@ var Todo = function (_React$Component) {
     key: 'searchData',
     value: function _searchData(){
 
-      event.preventDefault();
-			// 表单输入为空验证
-			if (this.refs.contentFrom.value == "") {
-				this.refs.contentFrom.focus();
-				return;
-			}else if (this.refs.contentEnd.value == "") {
-				this.refs.contentEnd.focus();
-				return;
-      }
+   //    event.preventDefault();
+			// // 表单输入为空验证
+			// if (this.refs.contentFrom.value == "") {
+			// 	this.refs.contentFrom.focus();
+			// 	return;
+			// }else if (this.refs.contentEnd.value == "") {
+			// 	this.refs.contentEnd.focus();
+			// 	return;
+   //    }
 
       	// 生成参数
 			var newItem = {
         beginYear: this.refs.contentFrom.value,
 				endYear:this.refs.contentEnd.value
 			};
-      
+          
       console.log(newItem);
-      //this._onSearchData(newItem);
+      this._onSearchData(newItem);
 
 
      
diff --git a/routes/index.js b/routes/index.js
index 2b53943..4e3a97a 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -40,16 +40,16 @@ router.post('/addItem', (req, res, next) => {
 
 router.all('/SearchData', (req, res, next) => {
 
-	// let newItem = req.body;
-	// Todo.find({"context":newItem.beginYear }).sort({'date': -1}).exec((err, todoList) => {
-	// 	if (err) {
-	// 		console.log(err);
-	// 	}else {
-	// 		res.json(todoList);
-	// 	}
-	// })
-	  res.send('GET request to the homepage');
-
+	 let beginYear = req.query.beginYear;
+	 let endYear = req.query.endYear;
+	 Todo.find({content: beginYear}).sort({'date': -1}).exec((err, todoList) => {
+		if (err) {
+			console.log(err);
+		}else {
+			res.json(todoList);
+		}
+	})
+	// res.json(beginYear + endYear);
 	
 })
 

From b586e4039c1e82d1216b0ab67312f2d1e4eeec6a Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Mon, 14 Oct 2019 09:38:55 +1300
Subject: [PATCH 23/57] multiple queries

---
 routes/index.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/routes/index.js b/routes/index.js
index 4e3a97a..374a4e2 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -42,15 +42,13 @@ router.all('/SearchData', (req, res, next) => {
 
 	 let beginYear = req.query.beginYear;
 	 let endYear = req.query.endYear;
-	 Todo.find({content: beginYear}).sort({'date': -1}).exec((err, todoList) => {
+	 Todo.find({content:{$in:[beginYear,endYear]}}).sort({'date': -1}).exec((err, todoList) => {
 		if (err) {
 			console.log(err);
 		}else {
 			res.json(todoList);
 		}
-	})
-	// res.json(beginYear + endYear);
-	
+	})	
 })
 
 

From 788580d00093784f6e72c6a99205ebc6f04c6efc Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Mon, 14 Oct 2019 19:49:00 +1300
Subject: [PATCH 24/57] fix search problem

---
 public/js/bundle.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/public/js/bundle.js b/public/js/bundle.js
index ca40bee..10e9db1 100644
--- a/public/js/bundle.js
+++ b/public/js/bundle.js
@@ -9538,7 +9538,7 @@ var Todo = function (_React$Component) {
 				success: function success(data) {
 
 					console.log(data);
-					// const todoList = that.todoSort(data)
+				 // const todoList = that.todoSort(data)
 					that.setState({
             todoList: data,
             todoListALL: data
@@ -9857,7 +9857,7 @@ var Todo = function (_React$Component) {
             _react2.default.createElement(
               'h2',
               { className: 'header' },
-              'History'
+              'Histories'
             ),
             
             _react2.default.createElement(_todoList2.default, { todoList: this.state.todoList, onDeleteItem: this._onDeleteItem.bind(this) })  
@@ -32092,6 +32092,16 @@ var TodoItem = function (_React$Component) {
 						{ className: "itemCont" },
 						this.props.content
 					),
+          _react2.default.createElement(
+            "span",
+            { className: "itemMethods" },
+            this.props.methods
+          ),
+           _react2.default.createElement(
+            "span",
+            { className: "itemAuthor" },
+            this.props.author
+          ),
 					_react2.default.createElement(
 						"span",
 						{ className: "itemTime" },
@@ -32160,8 +32170,9 @@ var TodoList = function (_React$Component) {
                   // 循环生成每一条 todoItem，并将 delete 方法传递给子组件 
                   var todoItems = todoList.map(function (item, index) {
                         return _react2.default.createElement(_todoItem2.default, {
-                              key: index,
-                              content: item.content,
+                              content: item.publishTime,
+                              methods: item.methods,
+                              author: item.author,
                               date: item.date,
                               onDeleteItem: _this2.props.onDeleteItem
                         });

From 7881c3f7ddb0f398a19f34f863b3928e47dc3a6b Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Mon, 14 Oct 2019 19:55:54 +1300
Subject: [PATCH 25/57] add detail of search bar

---
 public/js/bundle.js |  4 +++-
 routes/index.js     | 33 ++++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/public/js/bundle.js b/public/js/bundle.js
index 10e9db1..626cc42 100644
--- a/public/js/bundle.js
+++ b/public/js/bundle.js
@@ -9860,7 +9860,7 @@ var Todo = function (_React$Component) {
               'Histories'
             ),
             
-            _react2.default.createElement(_todoList2.default, { todoList: this.state.todoList, onDeleteItem: this._onDeleteItem.bind(this) })  
+            //_react2.default.createElement(_todoList2.default, { todoList: this.state.todoList, onDeleteItem: this._onDeleteItem.bind(this) })  
           ),          
         ),
 
@@ -9926,6 +9926,8 @@ var Todo = function (_React$Component) {
               { className: 'header' },
               'Results'
             ),
+            _react2.default.createElement(_todoList2.default, { todoList: this.state.todoList, onDeleteItem: this._onDeleteItem.bind(this) })  
+
           ),
 
           // _react2.default.createElement(_todoList2.default, { todoList: this.state.todoList})
diff --git a/routes/index.js b/routes/index.js
index 374a4e2..9041259 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -42,7 +42,7 @@ router.all('/SearchData', (req, res, next) => {
 
 	 let beginYear = req.query.beginYear;
 	 let endYear = req.query.endYear;
-	 Todo.find({content:{$in:[beginYear,endYear]}}).sort({'date': -1}).exec((err, todoList) => {
+	 Todo.find({title : {$regex : beginYear}}).sort({'date': -1}).exec((err, todoList) => {
 		if (err) {
 			console.log(err);
 		}else {
@@ -52,6 +52,37 @@ router.all('/SearchData', (req, res, next) => {
 })
 
 
+router.get('/addFakeData', (req, res, next) => {
+
+const newItem={
+
+		title : 'Pinning Down Variables, and Taking an Agile Approach.',
+		methods : 'ADD',
+		source : 'http://eds.b.ebscohost.com.ezproxy.aut.ac.nz/eds/pdfviewer/pdfviewer?vid=12&sid=9b5bb43f-5e08-4432-a1b6-a607f840d694%40sessionmgr103',
+		PublicationType : 'Academic Journals',
+	    author  : 'Torres, Edwin',
+	    addTime : '2019',
+	    publishTime : '2019'
+
+		};
+
+
+	Todo.create(newItem, (err) => {
+		if (err) {
+			console.log(err);
+		}else {
+			Todo.find({}, (err, todoList) => {
+				if (err) {
+					console.log(err);
+				}else {
+					res.json(todoList);
+				}
+			});
+		}
+	})
+})
+
+
 
 // 删除todo
 router.post('/deleteItem', (req, res, next) => {

From 9134017ef4d0f4c2f8223d1342fd2107729b3390 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Tue, 15 Oct 2019 17:19:31 +1300
Subject: [PATCH 26/57] # 1 use a new way to imp the search method and add new
 function.

---
 .gitignore                                    |    24 +-
 README.md                                     |    37 -
 config/env.js                                 |    91 +
 config/jest/cssTransform.js                   |    14 +
 config/jest/fileTransform.js                  |    12 +
 config/paths.js                               |    55 +
 config/polyfills.js                           |    16 +
 config/webpack.config.dev.js                  |   265 +
 config/webpack.config.prod.js                 |   334 +
 config/webpackDevServer.config.js             |    92 +
 controller/dept.js                            |    81 +
 controller/staff.js                           |    84 +
 model/department.js                           |     4 +
 model/staff.js                                |     4 +
 package-lock.json                             | 12369 ++++++++++++++++
 package.json                                  |   124 +-
 public/favicon.ico                            |   Bin 0 -> 3870 bytes
 public/images/logo.jpg                        |   Bin 0 -> 6694 bytes
 public/index.html                             |    40 +
 public/manifest.json                          |    15 +
 route/index.js                                |    16 +
 schema/department.js                          |    17 +
 schema/staff.js                               |    20 +
 scripts/build.js                              |   150 +
 scripts/start.js                              |    86 +
 scripts/test.js                               |    27 +
 src/App.css                                   |   272 +
 src/App.js                                    |    30 +
 src/App.test.js                               |     8 +
 src/components/container/baseDataTree.js      |   117 +
 src/components/content.js                     |    21 +
 src/components/g-breadcrumb.js                |    26 +
 src/components/g-filter-dept.js               |    36 +
 src/components/g-filter-letter.js             |    63 +
 src/components/g-headerImg.js                 |    26 +
 src/components/g-list.js                      |    73 +
 src/components/g-search.js                    |    12 +
 src/components/g-selectData.js                |    95 +
 src/components/headerImg.css                  |    18 +
 src/components/layout.css                     |    20 +
 src/components/layout.js                      |    37 +
 src/components/menu.js                        |    15 +
 src/css/leftNav.css                           |    24 +
 src/css/menu.css                              |    25 +
 src/css/tree.css                              |    66 +
 src/global/fixHeight.js                       |     5 +
 src/global/initBaseData.js                    |    42 +
 src/index.css                                 |    70 +
 src/index.js                                  |    21 +
 src/logo.svg                                  |     7 +
 src/pages/att/container/delGroup.js           |    26 +
 src/pages/att/container/groupdetail.js        |    77 +
 src/pages/att/container/groupedit.js          |   224 +
 src/pages/att/container/grouplist.js          |    17 +
 src/pages/att/css/att_group.css               |    26 +
 src/pages/att/group.js                        |    99 +
 src/pages/att/index.js                        |    10 +
 src/pages/attendence/common.js                |    20 +
 src/pages/attendence/commonList.js            |    34 +
 src/pages/attendence/components/Header.js     |    15 +
 src/pages/attendence/components/MemberList.js |    36 +
 src/pages/attendence/components/leftNav.js    |    12 +
 src/pages/attendence/components/list.js       |    80 +
 src/pages/attendence/components/listItem.js   |    82 +
 src/pages/attendence/detail.css               |    42 +
 src/pages/attendence/detail.js                |   111 +
 src/pages/attendence/external.js              |    23 +
 src/pages/attendence/externalEdit.css         |     7 +
 src/pages/attendence/externalEdit.js          |   263 +
 src/pages/attendence/externalList.js          |    40 +
 src/pages/attendence/index.js                 |    15 +
 src/pages/attendence/list.css                 |   117 +
 src/pages/attendence/main.js                  |    19 +
 src/pages/attendence/staff.js                 |    20 +
 src/pages/attendence/staffList.js             |    35 +
 src/pages/department/deptTree.js              |   219 +
 src/pages/department/index.css                |    46 +
 src/pages/department/index.js                 |    24 +
 src/pages/department/list.js                  |   168 +
 src/pages/holiday/annual.js                   |    50 +
 src/pages/holiday/annual_list.js              |   186 +
 src/pages/holiday/award.js                    |   188 +
 src/pages/holiday/components/Main.js          |    24 +
 src/pages/holiday/components/leftNav.js       |    13 +
 src/pages/holiday/container/annualList.js     |    18 +
 .../holiday/container/annualRule_edit.js      |   162 +
 .../holiday/container/annualRule_list.js      |    31 +
 src/pages/holiday/container/awardList.js      |    34 +
 src/pages/holiday/container/dayOffList.js     |    36 +
 .../holiday/container/dayOffRule_edit.js      |   116 +
 .../holiday/container/dayOffRule_show.js      |    39 +
 src/pages/holiday/container/editModel.js      |    21 +
 src/pages/holiday/container/popTip.js         |    56 +
 src/pages/holiday/container/typeList.js       |    46 +
 src/pages/holiday/css/dayoffrule.css          |    12 +
 src/pages/holiday/css/list.css                |     3 +
 src/pages/holiday/day_off.js                  |    19 +
 src/pages/holiday/day_off_list.js             |   176 +
 src/pages/holiday/day_off_rule.js             |    25 +
 src/pages/holiday/index.js                    |    11 +
 src/pages/holiday/type.js                     |   166 +
 src/pages/member/editMenber.js                |   124 +
 src/pages/member/index.css                    |     9 +
 src/pages/member/index.js                     |   119 +
 src/pages/member/listMember.js                |    17 +
 src/pages/warn/index.css                      |    13 +
 src/pages/warn/index.js                       |    15 +
 src/registerServiceWorker.js                  |   108 +
 src/router/index.js                           |    10 +
 src/store/index.js                            |    11 +
 src/store/reducer/att/index.js                |    61 +
 src/store/reducer/attrendance/index.js        |   113 +
 src/store/reducer/baseData/index.js           |    75 +
 src/store/reducer/holiday/index.js            |   253 +
 114 files changed, 19307 insertions(+), 66 deletions(-)
 create mode 100644 config/env.js
 create mode 100644 config/jest/cssTransform.js
 create mode 100644 config/jest/fileTransform.js
 create mode 100644 config/paths.js
 create mode 100644 config/polyfills.js
 create mode 100644 config/webpack.config.dev.js
 create mode 100644 config/webpack.config.prod.js
 create mode 100644 config/webpackDevServer.config.js
 create mode 100644 controller/dept.js
 create mode 100644 controller/staff.js
 create mode 100644 model/department.js
 create mode 100644 model/staff.js
 create mode 100644 package-lock.json
 create mode 100644 public/favicon.ico
 create mode 100644 public/images/logo.jpg
 create mode 100644 public/index.html
 create mode 100644 public/manifest.json
 create mode 100644 route/index.js
 create mode 100644 schema/department.js
 create mode 100644 schema/staff.js
 create mode 100644 scripts/build.js
 create mode 100644 scripts/start.js
 create mode 100644 scripts/test.js
 create mode 100644 src/App.css
 create mode 100644 src/App.js
 create mode 100644 src/App.test.js
 create mode 100644 src/components/container/baseDataTree.js
 create mode 100644 src/components/content.js
 create mode 100644 src/components/g-breadcrumb.js
 create mode 100644 src/components/g-filter-dept.js
 create mode 100644 src/components/g-filter-letter.js
 create mode 100644 src/components/g-headerImg.js
 create mode 100644 src/components/g-list.js
 create mode 100644 src/components/g-search.js
 create mode 100644 src/components/g-selectData.js
 create mode 100644 src/components/headerImg.css
 create mode 100644 src/components/layout.css
 create mode 100644 src/components/layout.js
 create mode 100644 src/components/menu.js
 create mode 100644 src/css/leftNav.css
 create mode 100644 src/css/menu.css
 create mode 100644 src/css/tree.css
 create mode 100644 src/global/fixHeight.js
 create mode 100644 src/global/initBaseData.js
 create mode 100644 src/index.css
 create mode 100644 src/index.js
 create mode 100644 src/logo.svg
 create mode 100644 src/pages/att/container/delGroup.js
 create mode 100644 src/pages/att/container/groupdetail.js
 create mode 100644 src/pages/att/container/groupedit.js
 create mode 100644 src/pages/att/container/grouplist.js
 create mode 100644 src/pages/att/css/att_group.css
 create mode 100644 src/pages/att/group.js
 create mode 100644 src/pages/att/index.js
 create mode 100644 src/pages/attendence/common.js
 create mode 100644 src/pages/attendence/commonList.js
 create mode 100644 src/pages/attendence/components/Header.js
 create mode 100644 src/pages/attendence/components/MemberList.js
 create mode 100644 src/pages/attendence/components/leftNav.js
 create mode 100644 src/pages/attendence/components/list.js
 create mode 100644 src/pages/attendence/components/listItem.js
 create mode 100644 src/pages/attendence/detail.css
 create mode 100644 src/pages/attendence/detail.js
 create mode 100644 src/pages/attendence/external.js
 create mode 100644 src/pages/attendence/externalEdit.css
 create mode 100644 src/pages/attendence/externalEdit.js
 create mode 100644 src/pages/attendence/externalList.js
 create mode 100644 src/pages/attendence/index.js
 create mode 100644 src/pages/attendence/list.css
 create mode 100644 src/pages/attendence/main.js
 create mode 100644 src/pages/attendence/staff.js
 create mode 100644 src/pages/attendence/staffList.js
 create mode 100644 src/pages/department/deptTree.js
 create mode 100644 src/pages/department/index.css
 create mode 100644 src/pages/department/index.js
 create mode 100644 src/pages/department/list.js
 create mode 100644 src/pages/holiday/annual.js
 create mode 100644 src/pages/holiday/annual_list.js
 create mode 100644 src/pages/holiday/award.js
 create mode 100644 src/pages/holiday/components/Main.js
 create mode 100644 src/pages/holiday/components/leftNav.js
 create mode 100644 src/pages/holiday/container/annualList.js
 create mode 100644 src/pages/holiday/container/annualRule_edit.js
 create mode 100644 src/pages/holiday/container/annualRule_list.js
 create mode 100644 src/pages/holiday/container/awardList.js
 create mode 100644 src/pages/holiday/container/dayOffList.js
 create mode 100644 src/pages/holiday/container/dayOffRule_edit.js
 create mode 100644 src/pages/holiday/container/dayOffRule_show.js
 create mode 100644 src/pages/holiday/container/editModel.js
 create mode 100644 src/pages/holiday/container/popTip.js
 create mode 100644 src/pages/holiday/container/typeList.js
 create mode 100644 src/pages/holiday/css/dayoffrule.css
 create mode 100644 src/pages/holiday/css/list.css
 create mode 100644 src/pages/holiday/day_off.js
 create mode 100644 src/pages/holiday/day_off_list.js
 create mode 100644 src/pages/holiday/day_off_rule.js
 create mode 100644 src/pages/holiday/index.js
 create mode 100644 src/pages/holiday/type.js
 create mode 100644 src/pages/member/editMenber.js
 create mode 100644 src/pages/member/index.css
 create mode 100644 src/pages/member/index.js
 create mode 100644 src/pages/member/listMember.js
 create mode 100644 src/pages/warn/index.css
 create mode 100644 src/pages/warn/index.js
 create mode 100644 src/registerServiceWorker.js
 create mode 100644 src/router/index.js
 create mode 100644 src/store/index.js
 create mode 100644 src/store/reducer/att/index.js
 create mode 100644 src/store/reducer/attrendance/index.js
 create mode 100644 src/store/reducer/baseData/index.js
 create mode 100644 src/store/reducer/holiday/index.js

diff --git a/.gitignore b/.gitignore
index 5171c54..14222eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,22 @@
-node_modules
-npm-debug.log
\ No newline at end of file
+# See https://help.github.com/ignore-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+../.idea/
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/README.md b/README.md
index ede39ec..8b13789 100644
--- a/README.md
+++ b/README.md
@@ -1,38 +1 @@
-[![Build Status](https://travis-ci.org/grr6525/Node-React-MongoDB-TodoList.svg?branch=master)](https://travis-ci.org/grr6525/Node-React-MongoDB-TodoList)
 
-## DESCRIPTION
-A TODO LIST APPLICATION BASED ON Node-React-express-MongoDB
-
-
-## FUNCTION
-
-- Add ToDo
-- Delete ToDo
-
-## INSTALL
-```js
-npm install
-```
-
-## START
-
-```js
-npm start
-```
-
-## ABOUT
-
-**HOW IT WORKS**
-
-[http://www.cnblogs.com/wx1993/p/6550111.html](http://www.cnblogs.com/wx1993/p/6550111.html?_blank)
- 
-**HOW TO INSTALL MongoDB**
-
-Mac：[http://www.cnblogs.com/wx1993/p/5187530.html](http://www.cnblogs.com/wx1993/p/5187530.html?_blank)
-
-Windows：[http://www.cnblogs.com/wx1993/p/5206587.html]([http://www.cnblogs.com/wx1993/p/5206587.html?_blank)
-
-[http://www.cnblogs.com/wx1993/p/6518248.html](http://www.cnblogs.com/wx1993/p/6518248.html?_blank)
-
-## SCREENSHOT
-![](https://camo.githubusercontent.com/3e21821d6a9aefbbdf9b0b3625ae5e6c4e0338d2/687474703a2f2f696d61676573323031352e636e626c6f67732e636f6d2f626c6f672f3738313436342f3230313730332f3738313436342d32303137303332303134323332393533332d313631373830363535362e706e67)
diff --git a/config/env.js b/config/env.js
new file mode 100644
index 0000000..97b77c9
--- /dev/null
+++ b/config/env.js
@@ -0,0 +1,91 @@
+'use strict';
+
+const fs = require('fs');
+const path = require('path');
+const paths = require('./paths');
+
+// Make sure that including paths.js after env.js will read .env variables.
+delete require.cache[require.resolve('./paths')];
+
+const NODE_ENV = process.env.NODE_ENV;
+if (!NODE_ENV) {
+  throw new Error(
+    'The NODE_ENV environment variable is required but was not specified.'
+  );
+}
+
+// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use
+var dotenvFiles = [
+  `${paths.dotenv}.${NODE_ENV}.local`,
+  `${paths.dotenv}.${NODE_ENV}`,
+  // Don't include `.env.local` for `test` environment
+  // since normally you expect tests to produce the same
+  // results for everyone
+  NODE_ENV !== 'test' && `${paths.dotenv}.local`,
+  paths.dotenv,
+].filter(Boolean);
+
+// Load environment variables from .env* files. Suppress warnings using silent
+// if this file is missing. dotenv will never modify any environment variables
+// that have already been set.
+// https://github.com/motdotla/dotenv
+dotenvFiles.forEach(dotenvFile => {
+  if (fs.existsSync(dotenvFile)) {
+    require('dotenv').config({
+      path: dotenvFile,
+    });
+  }
+});
+
+// We support resolving modules according to `NODE_PATH`.
+// This lets you use absolute paths in imports inside large monorepos:
+// https://github.com/facebookincubator/create-react-app/issues/253.
+// It works similar to `NODE_PATH` in Node itself:
+// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders
+// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored.
+// Otherwise, we risk importing Node.js core modules into an app instead of Webpack shims.
+// https://github.com/facebookincubator/create-react-app/issues/1023#issuecomment-265344421
+// We also resolve them to make sure all tools using them work consistently.
+const appDirectory = fs.realpathSync(process.cwd());
+process.env.NODE_PATH = (process.env.NODE_PATH || '')
+  .split(path.delimiter)
+  .filter(folder => folder && !path.isAbsolute(folder))
+  .map(folder => path.resolve(appDirectory, folder))
+  .join(path.delimiter);
+
+// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be
+// injected into the application via DefinePlugin in Webpack configuration.
+const REACT_APP = /^REACT_APP_/i;
+
+function getClientEnvironment(publicUrl) {
+  const raw = Object.keys(process.env)
+    .filter(key => REACT_APP.test(key))
+    .reduce(
+      (env, key) => {
+        env[key] = process.env[key];
+        return env;
+      },
+      {
+        // Useful for determining whether we’re running in production mode.
+        // Most importantly, it switches React into the correct mode.
+        NODE_ENV: process.env.NODE_ENV || 'development',
+        // Useful for resolving the correct path to static assets in `public`.
+        // For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
+        // This should only be used as an escape hatch. Normally you would put
+        // images into the `src` and `import` them in code to get their paths.
+        PUBLIC_URL: publicUrl,
+        connect_database:''
+      }
+    );
+  // Stringify all values so we can feed into Webpack DefinePlugin
+  const stringified = {
+    'process.env': Object.keys(raw).reduce((env, key) => {
+      env[key] = JSON.stringify(raw[key]);
+      return env;
+    }, {}),
+  };
+
+  return { raw, stringified };
+}
+
+module.exports = getClientEnvironment;
diff --git a/config/jest/cssTransform.js b/config/jest/cssTransform.js
new file mode 100644
index 0000000..f1534f6
--- /dev/null
+++ b/config/jest/cssTransform.js
@@ -0,0 +1,14 @@
+'use strict';
+
+// This is a custom Jest transformer turning style imports into empty objects.
+// http://facebook.github.io/jest/docs/tutorial-webpack.html
+
+module.exports = {
+  process() {
+    return 'module.exports = {};';
+  },
+  getCacheKey() {
+    // The output is always the same.
+    return 'cssTransform';
+  },
+};
diff --git a/config/jest/fileTransform.js b/config/jest/fileTransform.js
new file mode 100644
index 0000000..ffce0da
--- /dev/null
+++ b/config/jest/fileTransform.js
@@ -0,0 +1,12 @@
+'use strict';
+
+const path = require('path');
+
+// This is a custom Jest transformer turning file imports into filenames.
+// http://facebook.github.io/jest/docs/tutorial-webpack.html
+
+module.exports = {
+  process(src, filename) {
+    return `module.exports = ${JSON.stringify(path.basename(filename))};`;
+  },
+};
diff --git a/config/paths.js b/config/paths.js
new file mode 100644
index 0000000..6d16efc
--- /dev/null
+++ b/config/paths.js
@@ -0,0 +1,55 @@
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const url = require('url');
+
+// Make sure any symlinks in the project folder are resolved:
+// https://github.com/facebookincubator/create-react-app/issues/637
+const appDirectory = fs.realpathSync(process.cwd());
+const resolveApp = relativePath => path.resolve(appDirectory, relativePath);
+
+const envPublicUrl = process.env.PUBLIC_URL;
+
+function ensureSlash(path, needsSlash) {
+  const hasSlash = path.endsWith('/');
+  if (hasSlash && !needsSlash) {
+    return path.substr(path, path.length - 1);
+  } else if (!hasSlash && needsSlash) {
+    return `${path}/`;
+  } else {
+    return path;
+  }
+}
+
+const getPublicUrl = appPackageJson =>
+  envPublicUrl || require(appPackageJson).homepage;
+
+// We use `PUBLIC_URL` environment variable or "homepage" field to infer
+// "public path" at which the app is served.
+// Webpack needs to know it to put the right <script> hrefs into HTML even in
+// single-page apps that may serve index.html for nested URLs like /todos/42.
+// We can't use a relative path in HTML because we don't want to load something
+// like /todos/42/static/js/bundle.7289d.js. We have to know the root.
+function getServedPath(appPackageJson) {
+  const publicUrl = getPublicUrl(appPackageJson);
+  const servedUrl =
+    envPublicUrl || (publicUrl ? url.parse(publicUrl).pathname : '/');
+  return ensureSlash(servedUrl, true);
+}
+
+// config after eject: we're in ./config/
+module.exports = {
+  dotenv: resolveApp('.env'),
+  appBuild: resolveApp('build'),
+  appPublic: resolveApp('public'),
+  appHtml: resolveApp('public/index.html'),
+  appIndexJs: resolveApp('src/index.js'),
+  appPackageJson: resolveApp('package.json'),
+  appSrc: resolveApp('src'),
+  yarnLockFile: resolveApp('yarn.lock'),
+  testsSetup: resolveApp('src/setupTests.js'),
+  appNodeModules: resolveApp('node_modules'),
+  publicUrl: getPublicUrl(resolveApp('package.json')),
+  servedPath: getServedPath(resolveApp('package.json')),
+};
diff --git a/config/polyfills.js b/config/polyfills.js
new file mode 100644
index 0000000..5c1d866
--- /dev/null
+++ b/config/polyfills.js
@@ -0,0 +1,16 @@
+'use strict';
+
+if (typeof Promise === 'undefined') {
+  // Rejection tracking prevents a common issue where React gets into an
+  // inconsistent state due to an error, but it gets swallowed by a Promise,
+  // and the user has no idea what causes React's erratic future behavior.
+  require('promise/lib/rejection-tracking').enable();
+  window.Promise = require('promise/lib/es6-extensions.js');
+}
+
+// fetch() polyfill for making API calls.
+require('whatwg-fetch');
+
+// Object.assign() is commonly used with React.
+// It will use the native implementation if it's present and isn't buggy.
+Object.assign = require('object-assign');
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
new file mode 100644
index 0000000..3a74d1a
--- /dev/null
+++ b/config/webpack.config.dev.js
@@ -0,0 +1,265 @@
+'use strict';
+
+const autoprefixer = require('autoprefixer');
+const path = require('path');
+const webpack = require('webpack');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin');
+const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
+const WatchMissingNodeModulesPlugin = require('react-dev-utils/WatchMissingNodeModulesPlugin');
+const eslintFormatter = require('react-dev-utils/eslintFormatter');
+const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
+const getClientEnvironment = require('./env');
+const paths = require('./paths');
+
+// Webpack uses `publicPath` to determine where the app is being served from.
+// In development, we always serve from the root. This makes config easier.
+const publicPath = '/';
+// `publicUrl` is just like `publicPath`, but we will provide it to our app
+// as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
+// Omit trailing slash as %PUBLIC_PATH%/xyz looks better than %PUBLIC_PATH%xyz.
+const publicUrl = '';
+// Get environment variables to inject into our app.
+const env = getClientEnvironment(publicUrl);
+
+// This is the development configuration.
+// It is focused on developer experience and fast rebuilds.
+// The production configuration is different and lives in a separate file.
+module.exports = {
+  // You may want 'eval' instead if you prefer to see the compiled output in DevTools.
+  // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.
+  devtool: 'cheap-module-source-map',
+  // These are the "entry points" to our application.
+  // This means they will be the "root" imports that are included in JS bundle.
+  // The first two entry points enable "hot" CSS and auto-refreshes for JS.
+  entry: [
+    // We ship a few polyfills by default:
+    require.resolve('./polyfills'),
+    // Include an alternative client for WebpackDevServer. A client's job is to
+    // connect to WebpackDevServer by a socket and get notified about changes.
+    // When you save a file, the client will either apply hot updates (in case
+    // of CSS changes), or refresh the page (in case of JS changes). When you
+    // make a syntax error, this client will display a syntax error overlay.
+    // Note: instead of the default WebpackDevServer client, we use a custom one
+    // to bring better experience for Create React App users. You can replace
+    // the line below with these two lines if you prefer the stock client:
+    // require.resolve('webpack-dev-server/client') + '?/',
+    // require.resolve('webpack/hot/dev-server'),
+    // Finally, this is your app's code:
+    paths.appIndexJs,
+    'webpack-hot-middleware/client?reload=true&path=/__webpack_hmr&timeout=10000'
+    // We include the app code last so that if there is a runtime error during
+    // initialization, it doesn't blow up the WebpackDevServer client, and
+    // changing JS code would still trigger a refresh.
+  ],
+  output: {
+    // Next line is not used in dev but WebpackDevServer crashes without it:
+    path: paths.appBuild,
+    // Add /* filename */ comments to generated require()s in the output.
+    pathinfo: true,
+    // This does not produce a real file. It's just the virtual path that is
+    // served by WebpackDevServer in development. This is the JS bundle
+    // containing code from all our entry points, and the Webpack runtime.
+    filename: 'static/js/bundle.js',
+    // There are also additional JS chunk files if you use code splitting.
+    chunkFilename: 'static/js/[name].chunk.js',
+    // This is the URL that app is served from. We use "/" in development.
+    publicPath: publicPath,
+    // Point sourcemap entries to original disk location (format as URL on Windows)
+    devtoolModuleFilenameTemplate: info =>
+      path.resolve(info.absoluteResourcePath).replace(/\\/g, '/'),
+  },
+  resolve: {
+    // This allows you to set a fallback for where Webpack should look for modules.
+    // We placed these paths second because we want `node_modules` to "win"
+    // if there are any conflicts. This matches Node resolution mechanism.
+    // https://github.com/facebookincubator/create-react-app/issues/253
+    modules: ['node_modules', paths.appNodeModules].concat(
+      // It is guaranteed to exist because we tweak it in `env.js`
+      process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
+    ),
+    // These are the reasonable defaults supported by the Node ecosystem.
+    // We also include JSX as a common component filename extension to support
+    // some tools, although we do not recommend using it, see:
+    // https://github.com/facebookincubator/create-react-app/issues/290
+    // `web` extension prefixes have been added for better support
+    // for React Native Web.
+    extensions: ['.web.js', '.js', '.json', '.web.jsx', '.jsx'],
+    alias: {
+      
+      // Support React Native Web
+      // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
+      'react-native': 'react-native-web',
+    },
+    plugins: [
+      // Prevents users from importing files from outside of src/ (or node_modules/).
+      // This often causes confusion because we only process files within src/ with babel.
+      // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
+      // please link the files into your node_modules/ and let module-resolution kick in.
+      // Make sure your source files are compiled, as they will not be processed in any way.
+      new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
+    ],
+  },
+  module: {
+    strictExportPresence: true,
+    rules: [
+      // TODO: Disable require.ensure as it's not a standard language feature.
+      // We are waiting for https://github.com/facebookincubator/create-react-app/issues/2176.
+      // { parser: { requireEnsure: false } },
+
+      // First, run the linter.
+      // It's important to do this before Babel processes the JS.
+      {
+        test: /\.(js|jsx)$/,
+        enforce: 'pre',
+        use: [
+          {
+            options: {
+              formatter: eslintFormatter,
+              eslintPath: require.resolve('eslint'),
+              
+            },
+            loader: require.resolve('eslint-loader'),
+          },
+        ],
+        include: paths.appSrc,
+      },
+      {
+        // "oneOf" will traverse all following loaders until one will
+        // match the requirements. When no loader matches it will fall
+        // back to the "file" loader at the end of the loader list.
+        oneOf: [
+          // "url" loader works like "file" loader except that it embeds assets
+          // smaller than specified limit in bytes as data URLs to avoid requests.
+          // A missing `test` is equivalent to a match.
+          {
+            test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
+            loader: require.resolve('url-loader'),
+            options: {
+              limit: 10000,
+              name: 'static/media/[name].[hash:8].[ext]',
+            },
+          },
+          // Process JS with Babel.
+          {
+            test: /\.(js|jsx)$/,
+            include: paths.appSrc,
+            loader: require.resolve('babel-loader'),
+            options: {
+              
+              // This is a feature of `babel-loader` for webpack (not Babel itself).
+              // It enables caching results in ./node_modules/.cache/babel-loader/
+              // directory for faster rebuilds.
+              cacheDirectory: true,
+            },
+          },
+          // "postcss" loader applies autoprefixer to our CSS.
+          // "css" loader resolves paths in CSS and adds assets as dependencies.
+          // "style" loader turns CSS into JS modules that inject <style> tags.
+          // In production, we use a plugin to extract that CSS to a file, but
+          // in development "style" loader enables hot editing of CSS.
+          {
+            test: /\.css$/,
+            use: [
+              require.resolve('style-loader'),
+              {
+                loader: require.resolve('css-loader'),
+                options: {
+                  importLoaders: 1,
+                },
+              },
+              {
+                loader: require.resolve('postcss-loader'),
+                options: {
+                  // Necessary for external CSS imports to work
+                  // https://github.com/facebookincubator/create-react-app/issues/2677
+                  ident: 'postcss',
+                  plugins: () => [
+                    require('postcss-flexbugs-fixes'),
+                    autoprefixer({
+                      browsers: [
+                        '>1%',
+                        'last 4 versions',
+                        'Firefox ESR',
+                        'not ie < 9', // React doesn't support IE8 anyway
+                      ],
+                      flexbox: 'no-2009',
+                    }),
+                  ],
+                },
+              },
+            ],
+          },
+          // "file" loader makes sure those assets get served by WebpackDevServer.
+          // When you `import` an asset, you get its (virtual) filename.
+          // In production, they would get copied to the `build` folder.
+          // This loader don't uses a "test" so it will catch all modules
+          // that fall through the other loaders.
+          {
+            // Exclude `js` files to keep "css" loader working as it injects
+            // it's runtime that would otherwise processed through "file" loader.
+            // Also exclude `html` and `json` extensions so they get processed
+            // by webpacks internal loaders.
+            exclude: [/\.js$/, /\.html$/, /\.json$/],
+            loader: require.resolve('file-loader'),
+            options: {
+              name: 'static/media/[name].[hash:8].[ext]',
+            },
+          },
+        ],
+      },
+      // ** STOP ** Are you adding a new loader?
+      // Make sure to add the new loader(s) before the "file" loader.
+    ],
+  },
+  plugins: [
+    // Makes some environment variables available in index.html.
+    // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
+    // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    // In development, this will be an empty string.
+    new InterpolateHtmlPlugin(env.raw),
+    // Generates an `index.html` file with the <script> injected.
+    new HtmlWebpackPlugin({
+      inject: true,
+      template: paths.appHtml,
+    }),
+    // Add module names to factory functions so they appear in browser profiler.
+    new webpack.NamedModulesPlugin(),
+    // Makes some environment variables available to the JS code, for example:
+    // if (process.env.NODE_ENV === 'development') { ... }. See `./env.js`.
+    new webpack.DefinePlugin(env.stringified),
+    // This is necessary to emit hot updates (currently CSS only):
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NoEmitOnErrorsPlugin(),
+    // Watcher doesn't work well if you mistype casing in a path so we use
+    // a plugin that prints an error when you attempt to do this.
+    // See https://github.com/facebookincubator/create-react-app/issues/240
+    new CaseSensitivePathsPlugin(),
+    // If you require a missing module and then `npm install` it, you still have
+    // to restart the development server for Webpack to discover it. This plugin
+    // makes the discovery automatic so you don't have to restart.
+    // See https://github.com/facebookincubator/create-react-app/issues/186
+    new WatchMissingNodeModulesPlugin(paths.appNodeModules),
+    // Moment.js is an extremely popular library that bundles large locale files
+    // by default due to how Webpack interprets its code. This is a practical
+    // solution that requires the user to opt into importing specific locales.
+    // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
+    // You can remove this if you don't use Moment.js:
+    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+  ],
+  // Some libraries import Node modules but don't use them in the browser.
+  // Tell Webpack to provide empty mocks for them so importing them works.
+  node: {
+    dgram: 'empty',
+    fs: 'empty',
+    net: 'empty',
+    tls: 'empty',
+    child_process: 'empty',
+  },
+  // Turn off performance hints during development because we don't do any
+  // splitting or minification in interest of speed. These warnings become
+  // cumbersome.
+  performance: {
+    hints: false,
+  },
+};
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
new file mode 100644
index 0000000..d5e00fb
--- /dev/null
+++ b/config/webpack.config.prod.js
@@ -0,0 +1,334 @@
+'use strict';
+
+const autoprefixer = require('autoprefixer');
+const path = require('path');
+const webpack = require('webpack');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const ManifestPlugin = require('webpack-manifest-plugin');
+const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
+const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
+const eslintFormatter = require('react-dev-utils/eslintFormatter');
+const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
+const paths = require('./paths');
+const getClientEnvironment = require('./env');
+
+// Webpack uses `publicPath` to determine where the app is being served from.
+// It requires a trailing slash, or the file assets will get an incorrect path.
+const publicPath = paths.servedPath;
+// Some apps do not use client-side routing with pushState.
+// For these, "homepage" can be set to "." to enable relative asset paths.
+const shouldUseRelativeAssetPaths = publicPath === './';
+// Source maps are resource heavy and can cause out of memory issue for large source files.
+const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
+// `publicUrl` is just like `publicPath`, but we will provide it to our app
+// as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
+// Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
+const publicUrl = publicPath.slice(0, -1);
+// Get environment variables to inject into our app.
+const env = getClientEnvironment(publicUrl);
+
+// Assert this just to be safe.
+// Development builds of React are slow and not intended for production.
+if (env.stringified['process.env'].NODE_ENV !== '"production"') {
+  throw new Error('Production builds must have NODE_ENV=production.');
+}
+
+// Note: defined here because it will be used more than once.
+const cssFilename = 'static/css/[name].[contenthash:8].css';
+
+// ExtractTextPlugin expects the build output to be flat.
+// (See https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/27)
+// However, our output is structured with css, js and media folders.
+// To have this structure working with relative paths, we have to use custom options.
+const extractTextPluginOptions = shouldUseRelativeAssetPaths
+  ? // Making sure that the publicPath goes back to to build folder.
+    { publicPath: Array(cssFilename.split('/').length).join('../') }
+  : {};
+
+// This is the production configuration.
+// It compiles slowly and is focused on producing a fast and minimal bundle.
+// The development configuration is different and lives in a separate file.
+module.exports = {
+  // Don't attempt to continue if there are any errors.
+  bail: true,
+  // We generate sourcemaps in production. This is slow but gives good results.
+  // You can exclude the *.map files from the build during deployment.
+  devtool: shouldUseSourceMap ? 'source-map' : false,
+  // In production, we only want to load the polyfills and the app code.
+  entry: [require.resolve('./polyfills'), paths.appIndexJs],
+  output: {
+    // The build folder.
+    path: paths.appBuild,
+    // Generated JS file names (with nested folders).
+    // There will be one main bundle, and one file per asynchronous chunk.
+    // We don't currently advertise code splitting but Webpack supports it.
+    filename: 'static/js/[name].[chunkhash:8].js',
+    chunkFilename: 'static/js/[name].[chunkhash:8].chunk.js',
+    // We inferred the "public path" (such as / or /my-project) from homepage.
+    publicPath: publicPath,
+    // Point sourcemap entries to original disk location (format as URL on Windows)
+    devtoolModuleFilenameTemplate: info =>
+      path
+        .relative(paths.appSrc, info.absoluteResourcePath)
+        .replace(/\\/g, '/'),
+  },
+  resolve: {
+    // This allows you to set a fallback for where Webpack should look for modules.
+    // We placed these paths second because we want `node_modules` to "win"
+    // if there are any conflicts. This matches Node resolution mechanism.
+    // https://github.com/facebookincubator/create-react-app/issues/253
+    modules: ['node_modules', paths.appNodeModules].concat(
+      // It is guaranteed to exist because we tweak it in `env.js`
+      process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
+    ),
+    // These are the reasonable defaults supported by the Node ecosystem.
+    // We also include JSX as a common component filename extension to support
+    // some tools, although we do not recommend using it, see:
+    // https://github.com/facebookincubator/create-react-app/issues/290
+    // `web` extension prefixes have been added for better support
+    // for React Native Web.
+    extensions: ['.web.js', '.js', '.json', '.web.jsx', '.jsx'],
+    alias: {
+      
+      // Support React Native Web
+      // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
+      'react-native': 'react-native-web',
+    },
+    plugins: [
+      // Prevents users from importing files from outside of src/ (or node_modules/).
+      // This often causes confusion because we only process files within src/ with babel.
+      // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
+      // please link the files into your node_modules/ and let module-resolution kick in.
+      // Make sure your source files are compiled, as they will not be processed in any way.
+      new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
+    ],
+  },
+  module: {
+    strictExportPresence: true,
+    rules: [
+      // TODO: Disable require.ensure as it's not a standard language feature.
+      // We are waiting for https://github.com/facebookincubator/create-react-app/issues/2176.
+      // { parser: { requireEnsure: false } },
+
+      // First, run the linter.
+      // It's important to do this before Babel processes the JS.
+      {
+        test: /\.(js|jsx)$/,
+        enforce: 'pre',
+        use: [
+          {
+            options: {
+              formatter: eslintFormatter,
+              eslintPath: require.resolve('eslint'),
+              
+            },
+            loader: require.resolve('eslint-loader'),
+          },
+        ],
+        include: paths.appSrc,
+      },
+      {
+        // "oneOf" will traverse all following loaders until one will
+        // match the requirements. When no loader matches it will fall
+        // back to the "file" loader at the end of the loader list.
+        oneOf: [
+          // "url" loader works just like "file" loader but it also embeds
+          // assets smaller than specified size as data URLs to avoid requests.
+          {
+            test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
+            loader: require.resolve('url-loader'),
+            options: {
+              limit: 10000,
+              name: 'static/media/[name].[hash:8].[ext]',
+            },
+          },
+          // Process JS with Babel.
+          {
+            test: /\.(js|jsx)$/,
+            include: paths.appSrc,
+            loader: require.resolve('babel-loader'),
+            options: {
+              
+              compact: true,
+            },
+          },
+          // The notation here is somewhat confusing.
+          // "postcss" loader applies autoprefixer to our CSS.
+          // "css" loader resolves paths in CSS and adds assets as dependencies.
+          // "style" loader normally turns CSS into JS modules injecting <style>,
+          // but unlike in development configuration, we do something different.
+          // `ExtractTextPlugin` first applies the "postcss" and "css" loaders
+          // (second argument), then grabs the result CSS and puts it into a
+          // separate file in our build process. This way we actually ship
+          // a single CSS file in production instead of JS code injecting <style>
+          // tags. If you use code splitting, however, any async bundles will still
+          // use the "style" loader inside the async code so CSS from them won't be
+          // in the main CSS file.
+          {
+            test: /\.css$/,
+            loader: ExtractTextPlugin.extract(
+              Object.assign(
+                {
+                  fallback: require.resolve('style-loader'),
+                  use: [
+                    {
+                      loader: require.resolve('css-loader'),
+                      options: {
+                        importLoaders: 1,
+                        minimize: true,
+                        sourceMap: shouldUseSourceMap,
+                      },
+                    },
+                    {
+                      loader: require.resolve('postcss-loader'),
+                      options: {
+                        // Necessary for external CSS imports to work
+                        // https://github.com/facebookincubator/create-react-app/issues/2677
+                        ident: 'postcss',
+                        plugins: () => [
+                          require('postcss-flexbugs-fixes'),
+                          autoprefixer({
+                            browsers: [
+                              '>1%',
+                              'last 4 versions',
+                              'Firefox ESR',
+                              'not ie < 9', // React doesn't support IE8 anyway
+                            ],
+                            flexbox: 'no-2009',
+                          }),
+                        ],
+                      },
+                    },
+                  ],
+                },
+                extractTextPluginOptions
+              )
+            ),
+            // Note: this won't work without `new ExtractTextPlugin()` in `plugins`.
+          },
+          // "file" loader makes sure assets end up in the `build` folder.
+          // When you `import` an asset, you get its filename.
+          // This loader don't uses a "test" so it will catch all modules
+          // that fall through the other loaders.
+          {
+            loader: require.resolve('file-loader'),
+            // Exclude `js` files to keep "css" loader working as it injects
+            // it's runtime that would otherwise processed through "file" loader.
+            // Also exclude `html` and `json` extensions so they get processed
+            // by webpacks internal loaders.
+            exclude: [/\.js$/, /\.html$/, /\.json$/],
+            options: {
+              name: 'static/media/[name].[hash:8].[ext]',
+            },
+          },
+          // ** STOP ** Are you adding a new loader?
+          // Make sure to add the new loader(s) before the "file" loader.
+        ],
+      },
+    ],
+  },
+  plugins: [
+    // Makes some environment variables available in index.html.
+    // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
+    // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    // In production, it will be an empty string unless you specify "homepage"
+    // in `package.json`, in which case it will be the pathname of that URL.
+    new InterpolateHtmlPlugin(env.raw),
+    // Generates an `index.html` file with the <script> injected.
+    new HtmlWebpackPlugin({
+      inject: true,
+      template: paths.appHtml,
+      minify: {
+        removeComments: true,
+        collapseWhitespace: true,
+        removeRedundantAttributes: true,
+        useShortDoctype: true,
+        removeEmptyAttributes: true,
+        removeStyleLinkTypeAttributes: true,
+        keepClosingSlash: true,
+        minifyJS: true,
+        minifyCSS: true,
+        minifyURLs: true,
+      },
+    }),
+    // Makes some environment variables available to the JS code, for example:
+    // if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
+    // It is absolutely essential that NODE_ENV was set to production here.
+    // Otherwise React will be compiled in the very slow development mode.
+    new webpack.DefinePlugin(env.stringified),
+    // Minify the code.
+    new webpack.optimize.UglifyJsPlugin({
+      compress: {
+        warnings: false,
+        // Disabled because of an issue with Uglify breaking seemingly valid code:
+        // https://github.com/facebookincubator/create-react-app/issues/2376
+        // Pending further investigation:
+        // https://github.com/mishoo/UglifyJS2/issues/2011
+        comparisons: false,
+      },
+      output: {
+        comments: false,
+        // Turned on because emoji and regex is not minified properly using default
+        // https://github.com/facebookincubator/create-react-app/issues/2488
+        ascii_only: true,
+      },
+      sourceMap: shouldUseSourceMap,
+    }),
+    // Note: this won't work without ExtractTextPlugin.extract(..) in `loaders`.
+    new ExtractTextPlugin({
+      filename: cssFilename,
+    }),
+    // Generate a manifest file which contains a mapping of all asset filenames
+    // to their corresponding output file so that tools can pick it up without
+    // having to parse `index.html`.
+    new ManifestPlugin({
+      fileName: 'asset-manifest.json',
+    }),
+    // Generate a service worker script that will precache, and keep up to date,
+    // the HTML & assets that are part of the Webpack build.
+    new SWPrecacheWebpackPlugin({
+      // By default, a cache-busting query parameter is appended to requests
+      // used to populate the caches, to ensure the responses are fresh.
+      // If a URL is already hashed by Webpack, then there is no concern
+      // about it being stale, and the cache-busting can be skipped.
+      dontCacheBustUrlsMatching: /\.\w{8}\./,
+      filename: 'service-worker.js',
+      logger(message) {
+        if (message.indexOf('Total precache size is') === 0) {
+          // This message occurs for every build and is a bit too noisy.
+          return;
+        }
+        if (message.indexOf('Skipping static resource') === 0) {
+          // This message obscures real errors so we ignore it.
+          // https://github.com/facebookincubator/create-react-app/issues/2612
+          return;
+        }
+        console.log(message);
+      },
+      minify: true,
+      // For unknown URLs, fallback to the index page
+      navigateFallback: publicUrl + '/index.html',
+      // Ignores URLs starting from /__ (useful for Firebase):
+      // https://github.com/facebookincubator/create-react-app/issues/2237#issuecomment-302693219
+      navigateFallbackWhitelist: [/^(?!\/__).*/],
+      // Don't precache sourcemaps (they're large) and build asset manifest:
+      staticFileGlobsIgnorePatterns: [/\.map$/, /asset-manifest\.json$/],
+    }),
+    // Moment.js is an extremely popular library that bundles large locale files
+    // by default due to how Webpack interprets its code. This is a practical
+    // solution that requires the user to opt into importing specific locales.
+    // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
+    // You can remove this if you don't use Moment.js:
+    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+  ],
+  // Some libraries import Node modules but don't use them in the browser.
+  // Tell Webpack to provide empty mocks for them so importing them works.
+  node: {
+    dgram: 'empty',
+    fs: 'empty',
+    net: 'empty',
+    tls: 'empty',
+    child_process: 'empty',
+  },
+};
diff --git a/config/webpackDevServer.config.js b/config/webpackDevServer.config.js
new file mode 100644
index 0000000..0fb049d
--- /dev/null
+++ b/config/webpackDevServer.config.js
@@ -0,0 +1,92 @@
+'use strict';
+
+const errorOverlayMiddleware = require('react-dev-utils/errorOverlayMiddleware');
+const noopServiceWorkerMiddleware = require('react-dev-utils/noopServiceWorkerMiddleware');
+const config = require('./webpack.config.dev');
+const paths = require('./paths');
+
+const protocol = process.env.HTTPS === 'true' ? 'https' : 'http';
+const host = process.env.HOST || '0.0.0.0';
+
+module.exports = function(proxy, allowedHost) {
+  return {
+    // WebpackDevServer 2.4.3 introduced a security fix that prevents remote
+    // websites from potentially accessing local content through DNS rebinding:
+    // https://github.com/webpack/webpack-dev-server/issues/887
+    // https://medium.com/webpack/webpack-dev-server-middleware-security-issues-1489d950874a
+    // However, it made several existing use cases such as development in cloud
+    // environment or subdomains in development significantly more complicated:
+    // https://github.com/facebookincubator/create-react-app/issues/2271
+    // https://github.com/facebookincubator/create-react-app/issues/2233
+    // While we're investigating better solutions, for now we will take a
+    // compromise. Since our WDS configuration only serves files in the `public`
+    // folder we won't consider accessing them a vulnerability. However, if you
+    // use the `proxy` feature, it gets more dangerous because it can expose
+    // remote code execution vulnerabilities in backends like Django and Rails.
+    // So we will disable the host check normally, but enable it if you have
+    // specified the `proxy` setting. Finally, we let you override it if you
+    // really know what you're doing with a special environment variable.
+    disableHostCheck:
+      !proxy || process.env.DANGEROUSLY_DISABLE_HOST_CHECK === 'true',
+    // Enable gzip compression of generated files.
+    compress: true,
+    // Silence WebpackDevServer's own logs since they're generally not useful.
+    // It will still show compile warnings and errors with this setting.
+    clientLogLevel: 'none',
+    // By default WebpackDevServer serves physical files from current directory
+    // in addition to all the virtual build products that it serves from memory.
+    // This is confusing because those files won’t automatically be available in
+    // production build folder unless we copy them. However, copying the whole
+    // project directory is dangerous because we may expose sensitive files.
+    // Instead, we establish a convention that only files in `public` directory
+    // get served. Our build script will copy `public` into the `build` folder.
+    // In `index.html`, you can get URL of `public` folder with %PUBLIC_URL%:
+    // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    // In JavaScript code, you can access it with `process.env.PUBLIC_URL`.
+    // Note that we only recommend to use `public` folder as an escape hatch
+    // for files like `favicon.ico`, `manifest.json`, and libraries that are
+    // for some reason broken when imported through Webpack. If you just want to
+    // use an image, put it in `src` and `import` it from JavaScript instead.
+    contentBase: paths.appPublic,
+    // By default files from `contentBase` will not trigger a page reload.
+    watchContentBase: true,
+    // Enable hot reloading server. It will provide /sockjs-node/ endpoint
+    // for the WebpackDevServer client so it can learn when the files were
+    // updated. The WebpackDevServer client is included as an entry point
+    // in the Webpack development configuration. Note that only changes
+    // to CSS are currently hot reloaded. JS changes will refresh the browser.
+    hot: true,
+    // It is important to tell WebpackDevServer to use the same "root" path
+    // as we specified in the config. In development, we always serve from /.
+    publicPath: config.output.publicPath,
+    // WebpackDevServer is noisy by default so we emit custom message instead
+    // by listening to the compiler events with `compiler.plugin` calls above.
+    quiet: true,
+    // Reportedly, this avoids CPU overload on some systems.
+    // https://github.com/facebookincubator/create-react-app/issues/293
+    watchOptions: {
+      ignored: /node_modules/,
+    },
+    // Enable HTTPS if the HTTPS environment variable is set to 'true'
+    https: protocol === 'https',
+    host: host,
+    overlay: false,
+    historyApiFallback: {
+      // Paths with dots should still use the history fallback.
+      // See https://github.com/facebookincubator/create-react-app/issues/387.
+      disableDotRule: true,
+    },
+    public: allowedHost,
+    proxy,
+    setup(app) {
+      // This lets us open files from the runtime error overlay.
+      app.use(errorOverlayMiddleware());
+      // This service worker file is effectively a 'no-op' that will reset any
+      // previous service worker registered for the same host:port combination.
+      // We do this in development to avoid hitting the production cache if
+      // it used the same host and port.
+      // https://github.com/facebookincubator/create-react-app/issues/2272#issuecomment-302832432
+      app.use(noopServiceWorkerMiddleware());
+    },
+  };
+};
diff --git a/controller/dept.js b/controller/dept.js
new file mode 100644
index 0000000..ad2f8be
--- /dev/null
+++ b/controller/dept.js
@@ -0,0 +1,81 @@
+var DeptModel = require('./../model/department.js');
+exports.deptList =  function (req, res) {
+    const department_id = req.body.department_id;
+    let param = {};
+    if(department_id){
+        param = {
+            department_id:department_id
+        };
+    }
+  DeptModel
+    .find(param)
+    .exec(function (err, depts) {
+      if(err){
+        res.status(err.status).json({code:122,msg:'部门列表获取失败'});
+      } else{
+        res.json({data:depts,code:0,msg:'部门列表获取成功'});
+      }
+    });
+};
+exports.addDept = function (req, res) {
+  const reqBody = req.body;
+  if(!reqBody.department_name){
+    res.status(200).send('缺少部门名称，添加失败').end();
+  }
+    const MS = new Date().getTime();
+    const uid = (MS + '').slice(-3) * 1 + (Math.random() * (MS + '').slice(0,3) + '').replace('.','') * 1;
+  // 获得现在存在的部门数
+          const dept = new DeptModel({
+              department_name:reqBody.department_name,
+              department_pid:reqBody.department_pid,
+              department_id:uid
+          });
+          dept.save(function (err) {
+              if(!err){
+                  res.status(200).send({code:0,msg:'部门添加成功'}).end();
+              }
+              else{
+                  res.status(200).send({code:111,msg:'部门添加成功'}).end();
+              }
+          });
+};
+exports.editDept = function (req, res) {
+    const resBody = req.body;
+    if(!resBody.department_id){
+        res.status(200).send({code:123,msg:'缺少部门id，编辑失败'}).end();
+    }
+    let updateParm = {};
+    if(resBody.department_name !== undefined){
+        updateParm.department_name = resBody.department_name;
+    }
+    if(resBody.leader_member_name !== undefined){
+        updateParm.leader_member_name = resBody.leader_member_name;
+    }
+    if(resBody.leader_member_id !== undefined){
+        updateParm.leader_member_id = resBody.leader_member_id;
+    }
+    DeptModel.findOneAndUpdate({
+        department_id:resBody.department_id
+    },updateParm,{new:false},function (err,result) {
+      if(!err){
+        res.status(200).send({code:0,msg:'部门编辑成功',data:result}).end();
+      }else{
+        res.status(200).send({code:125,msg:err+'部门编辑失败'}).end()
+      }
+    })
+};
+exports.delDept = function (req, res) {
+  const resBody = req.body;
+  if(!resBody.department_id){
+    res.status(200).send({code:123,msg:'缺少部门id，删除失败'}).end();
+  }
+  DeptModel.remove({
+    department_id:resBody.department_id
+  },function (err) {
+    if(err){
+      res.status(200).send({code:124,msg:err+'删除部门失败'}).end();
+    } else {
+      res.status(200).send({code:0,msg:'删除部门成功'}).end();
+    }
+  });
+}
\ No newline at end of file
diff --git a/controller/staff.js b/controller/staff.js
new file mode 100644
index 0000000..94e20d5
--- /dev/null
+++ b/controller/staff.js
@@ -0,0 +1,84 @@
+var StaffModel = require('./../model/staff.js');
+// 获取职员列表
+exports.staffList = function (req, res) {
+    const dept_id = req.body.department_id;
+    let param = {};
+    if(dept_id){
+        param = {
+            department_id:dept_id
+        };
+    }
+  StaffModel
+    .find(param)
+    .populate('Department','department_name')
+    .exec(function (err, staffs) {
+      if(err){
+        res.status(err.status).end();
+      } else {
+        res.json({code :0,data:staffs});
+      }
+    });
+}
+// 添加职员
+exports.addStaff =  function (req, res) {
+  const reqBody = req.body;
+  if(!reqBody.member_name){
+    res.status(200).send({code:124,msg:'缺少员工姓名'}).end();
+  }
+  if(!reqBody.department_id){
+    res.status(200).send({code:125,msg:'缺少部门id'}).end();
+  }
+  const MS = new Date().getTime();
+  const uid = (MS + '').slice(-3) * 1 + (Math.random() * (MS + '').slice(0,3) + '').replace('.','') * 1;
+      const staff = new StaffModel({
+          member_name:reqBody.member_name,
+          work_num:reqBody.work_num,
+          department_id:reqBody.department_id,
+          member_id:uid,
+          department_name:reqBody.department_name
+      });
+      staff.save(function (err) {
+          if(!err){
+              res.status(200).send({code:0,msg:'员工添加成功'}).end();
+          }
+          else{
+              res.status(200).send({code:125,msg:'员工添加失败'}).end();
+          }
+      });
+
+};
+// 删除员工
+exports.delStaff =  function (req, res) {
+  const resBody = req.body;
+  if(!resBody.member_id){
+    res.status(200).send({msg:'缺少员工id',code:134}).end();
+  }
+  StaffModel.remove({
+    member_id:resBody.member_id
+  },function (err) {
+    if(err){
+      res.status(200).send({code:126,msg:'删除职员失败'}).end();
+    } else {
+      res.status(200).send({code:0,msg:'删除职员成功'}).end();
+    }
+  });
+};
+// 编辑员工
+exports.editStaff = function (req, res) {
+  const reqBody = req.body;
+  if(!reqBody.member_id){
+    res.status(200).send({code:123,msg:'缺少员工id'}).end();
+  }
+  StaffModel.findOneAndUpdate({member_id:reqBody.member_id},{
+    member_name:reqBody.member_name,
+    department_id:reqBody.department_id,
+    work_num:reqBody.work_num,
+      department_name:reqBody.department_name
+  },{new:false},function (err, result) {
+      if(!err){
+        res.status(200).send({code:0,data:result}).end();
+      } else {
+        res.status(200).send({code:124,msg:'部门编辑失败'}).end();
+      }
+  })
+};
\ No newline at end of file
diff --git a/model/department.js b/model/department.js
new file mode 100644
index 0000000..8421e61
--- /dev/null
+++ b/model/department.js
@@ -0,0 +1,4 @@
+var mongoose = require('mongoose');
+var deptSchma = require('./../schema/department.js');
+const deptModel = mongoose.model('Department',deptSchma);
+module.exports = deptModel;
diff --git a/model/staff.js b/model/staff.js
new file mode 100644
index 0000000..a914a76
--- /dev/null
+++ b/model/staff.js
@@ -0,0 +1,4 @@
+var mongoose = require('mongoose');
+var staffSchma = require('./../schema/staff.js');
+const staffModel = mongoose.model('Staff',staffSchma);
+module.exports =  staffModel;
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..475ff12
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,12369 @@
+{
+  "name": "my-app",
+  "version": "0.1.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@babel/runtime": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.3.tgz",
+      "integrity": "sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==",
+      "dev": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.2"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.13.3",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
+          "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==",
+          "dev": true
+        }
+      }
+    },
+    "abab": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz",
+      "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4="
+    },
+    "accepts": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+      "requires": {
+        "mime-types": "~2.1.24",
+        "negotiator": "0.6.2"
+      }
+    },
+    "acorn": {
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
+      "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
+    },
+    "acorn-dynamic-import": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz",
+      "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=",
+      "requires": {
+        "acorn": "^4.0.3"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "4.0.13",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
+        }
+      }
+    },
+    "acorn-globals": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz",
+      "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=",
+      "requires": {
+        "acorn": "^4.0.4"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "4.0.13",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
+        }
+      }
+    },
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
+      "requires": {
+        "acorn": "^3.0.4"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
+        }
+      }
+    },
+    "add-dom-event-listener": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz",
+      "integrity": "sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==",
+      "dev": true,
+      "requires": {
+        "object-assign": "4.x"
+      }
+    },
+    "address": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/address/-/address-1.0.3.tgz",
+      "integrity": "sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg=="
+    },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "requires": {
+        "co": "^4.6.0",
+        "fast-deep-equal": "^1.0.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.3.0"
+      }
+    },
+    "ajv-keywords": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+      "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ=="
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
+      "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
+      "requires": {
+        "kind-of": "^3.0.2",
+        "longest": "^1.0.1",
+        "repeat-string": "^1.5.2"
+      }
+    },
+    "alphanum-sort": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz",
+      "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM="
+    },
+    "ansi-align": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
+      "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
+      "requires": {
+        "string-width": "^2.0.0"
+      }
+    },
+    "ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
+    },
+    "ansi-html": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+      "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4="
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+    },
+    "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==",
+      "requires": {
+        "color-convert": "^1.9.0"
+      }
+    },
+    "antd": {
+      "version": "2.13.14",
+      "resolved": "https://registry.npmjs.org/antd/-/antd-2.13.14.tgz",
+      "integrity": "sha512-8qtu6VYSXUExVPx6H8s8+OhQo0UQP7ogAoOa2bOPCvnhlpaGVYf3yh45WNa7PhhdWSOGQW3DdblqMX8UJ7Cu6g==",
+      "dev": true,
+      "requires": {
+        "array-tree-filter": "~1.0.0",
+        "babel-runtime": "6.x",
+        "classnames": "~2.2.0",
+        "create-react-class": "^15.6.0",
+        "css-animation": "^1.2.5",
+        "dom-closest": "^0.2.0",
+        "lodash.debounce": "^4.0.8",
+        "lodash.uniqby": "^4.7.0",
+        "moment": "^2.19.3",
+        "omit.js": "^1.0.0",
+        "prop-types": "^15.5.7",
+        "rc-animate": "^2.4.1",
+        "rc-calendar": "~9.0.0",
+        "rc-cascader": "~0.11.3",
+        "rc-checkbox": "~2.0.3",
+        "rc-collapse": "~1.7.5",
+        "rc-dialog": "~6.5.10",
+        "rc-dropdown": "~1.5.0",
+        "rc-editor-mention": "~0.6.12",
+        "rc-form": "~1.4.0",
+        "rc-input-number": "~3.6.0",
+        "rc-menu": "~5.0.10",
+        "rc-notification": "~2.0.0",
+        "rc-pagination": "~1.12.4",
+        "rc-progress": "~2.2.2",
+        "rc-rate": "~2.1.1",
+        "rc-select": "~6.9.0",
+        "rc-slider": "~8.3.0",
+        "rc-steps": "~2.5.1",
+        "rc-switch": "~1.5.1",
+        "rc-table": "~5.6.9",
+        "rc-tabs": "~9.1.2",
+        "rc-time-picker": "~2.4.1",
+        "rc-tooltip": "~3.4.6",
+        "rc-tree": "~1.7.0",
+        "rc-tree-select": "~1.10.2",
+        "rc-upload": "~2.4.0",
+        "rc-util": "^4.0.4",
+        "react-lazy-load": "^3.0.12",
+        "react-slick": "~0.15.4",
+        "shallowequal": "^1.0.1",
+        "warning": "~3.0.0"
+      }
+    },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "requires": {
+        "micromatch": "^2.1.5",
+        "normalize-path": "^2.0.0"
+      }
+    },
+    "append-transform": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz",
+      "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=",
+      "requires": {
+        "default-require-extensions": "^1.0.0"
+      }
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "requires": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "aria-query": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-0.7.1.tgz",
+      "integrity": "sha1-Jsu1r/ZBRLCoJb4YRuCxbPoAsR4=",
+      "requires": {
+        "ast-types-flow": "0.0.7",
+        "commander": "^2.11.0"
+      }
+    },
+    "arr-diff": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+      "requires": {
+        "arr-flatten": "^1.0.1"
+      }
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="
+    },
+    "arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ="
+    },
+    "array-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
+      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM="
+    },
+    "array-filter": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
+      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw="
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
+      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E="
+    },
+    "array-flatten": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ=="
+    },
+    "array-includes": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+      "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.7.0"
+      }
+    },
+    "array-map": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
+      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI="
+    },
+    "array-reduce": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
+      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys="
+    },
+    "array-tree-filter": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-1.0.1.tgz",
+      "integrity": "sha1-CorR7v04zoiFhjL5zAQj12NOTV0=",
+      "dev": true
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY="
+    },
+    "array-unique": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM="
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+    },
+    "asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+    },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "asn1.js": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "assert": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
+        },
+        "util": {
+          "version": "0.10.3",
+          "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+          "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+          "requires": {
+            "inherits": "2.0.1"
+          }
+        }
+      }
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
+    "assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
+    },
+    "ast-types-flow": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+      "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0="
+    },
+    "async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "async-each": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="
+    },
+    "async-validator": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.12.2.tgz",
+      "integrity": "sha512-57EETfCPFiB7M4QscvQzWSGNsmtkjjzZv318SK1CBlstk+hycV72ocjriMOOM48HjvmoAoJGpJNjC7Z76RlnZA==",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
+    },
+    "autoprefixer": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.2.tgz",
+      "integrity": "sha1-++rwfUj9h44Ggr98vurecorbKxg=",
+      "requires": {
+        "browserslist": "^2.1.5",
+        "caniuse-lite": "^1.0.30000697",
+        "normalize-range": "^0.1.2",
+        "num2fraction": "^1.2.2",
+        "postcss": "^6.0.6",
+        "postcss-value-parser": "^3.2.3"
+      }
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
+    },
+    "axios": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
+      "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
+      "dev": true,
+      "requires": {
+        "follow-redirects": "1.5.10",
+        "is-buffer": "^2.0.2"
+      },
+      "dependencies": {
+        "is-buffer": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
+          "dev": true
+        }
+      }
+    },
+    "axobject-query": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-0.1.0.tgz",
+      "integrity": "sha1-YvWdvFnJ+SQnWco0mWDnov48NsA=",
+      "requires": {
+        "ast-types-flow": "0.0.7"
+      }
+    },
+    "babel-code-frame": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
+      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
+      }
+    },
+    "babel-core": {
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz",
+      "integrity": "sha1-fdQrBGPHQunVKW3rPsZ6kyLa1yk=",
+      "requires": {
+        "babel-code-frame": "^6.22.0",
+        "babel-generator": "^6.25.0",
+        "babel-helpers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-register": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.25.0",
+        "babel-traverse": "^6.25.0",
+        "babel-types": "^6.25.0",
+        "babylon": "^6.17.2",
+        "convert-source-map": "^1.1.0",
+        "debug": "^2.1.1",
+        "json5": "^0.5.0",
+        "lodash": "^4.2.0",
+        "minimatch": "^3.0.2",
+        "path-is-absolute": "^1.0.0",
+        "private": "^0.1.6",
+        "slash": "^1.0.0",
+        "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
+      }
+    },
+    "babel-eslint": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-7.2.3.tgz",
+      "integrity": "sha1-sv4tgBJkcPXBlELcdXJTqJdxCCc=",
+      "requires": {
+        "babel-code-frame": "^6.22.0",
+        "babel-traverse": "^6.23.1",
+        "babel-types": "^6.23.0",
+        "babylon": "^6.17.0"
+      }
+    },
+    "babel-generator": {
+      "version": "6.26.1",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
+      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
+      "requires": {
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "detect-indent": "^4.0.0",
+        "jsesc": "^1.3.0",
+        "lodash": "^4.17.4",
+        "source-map": "^0.5.7",
+        "trim-right": "^1.0.1"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
+      }
+    },
+    "babel-helper-builder-binary-assignment-operator-visitor": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
+      "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
+      "requires": {
+        "babel-helper-explode-assignable-expression": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-builder-react-jsx": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz",
+      "integrity": "sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=",
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "esutils": "^2.0.2"
+      }
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+      "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
+      "requires": {
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-define-map": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
+      "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-helper-explode-assignable-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
+      "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+      "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
+      "requires": {
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+      "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+      "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+      "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-regex": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
+      "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-helper-remap-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+      "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
+      "requires": {
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-helpers": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+      "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-jest": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-20.0.3.tgz",
+      "integrity": "sha1-5KA7E9wQOJ4UD8ZF0J/8TO0wFnE=",
+      "requires": {
+        "babel-core": "^6.0.0",
+        "babel-plugin-istanbul": "^4.0.0",
+        "babel-preset-jest": "^20.0.3"
+      }
+    },
+    "babel-loader": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.1.tgz",
+      "integrity": "sha1-uHE0yLEuPkwqlOBUYIW8aAorhIg=",
+      "requires": {
+        "find-cache-dir": "^1.0.0",
+        "loader-utils": "^1.0.2",
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "babel-messages": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+      "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-dynamic-import-node": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-1.1.0.tgz",
+      "integrity": "sha512-tTfZbM9Ecwj3GK50mnPrUpinTwA4xXmDiQGCk/aBYbvl1+X8YqldK86wZ1owVJ4u3mrKbRlXMma80J18qwiaTQ==",
+      "requires": {
+        "babel-plugin-syntax-dynamic-import": "^6.18.0",
+        "babel-template": "^6.26.0",
+        "babel-types": "^6.26.0"
+      }
+    },
+    "babel-plugin-istanbul": {
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz",
+      "integrity": "sha512-PWP9FQ1AhZhS01T/4qLSKoHGY/xvkZdVBGlKM/HuxxS3+sC66HhTNR7+MpbO/so/cz/wY94MeSWJuP1hXIPfwQ==",
+      "requires": {
+        "babel-plugin-syntax-object-rest-spread": "^6.13.0",
+        "find-up": "^2.1.0",
+        "istanbul-lib-instrument": "^1.10.1",
+        "test-exclude": "^4.2.1"
+      }
+    },
+    "babel-plugin-jest-hoist": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-20.0.3.tgz",
+      "integrity": "sha1-r+3IU70/jcNUjqZx++adA8wsF2c="
+    },
+    "babel-plugin-syntax-async-functions": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz",
+      "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU="
+    },
+    "babel-plugin-syntax-class-properties": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz",
+      "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94="
+    },
+    "babel-plugin-syntax-dynamic-import": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz",
+      "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo="
+    },
+    "babel-plugin-syntax-exponentiation-operator": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz",
+      "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4="
+    },
+    "babel-plugin-syntax-flow": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz",
+      "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0="
+    },
+    "babel-plugin-syntax-jsx": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz",
+      "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY="
+    },
+    "babel-plugin-syntax-object-rest-spread": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
+      "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U="
+    },
+    "babel-plugin-syntax-trailing-function-commas": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz",
+      "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM="
+    },
+    "babel-plugin-transform-async-to-generator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
+      "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
+      "requires": {
+        "babel-helper-remap-async-to-generator": "^6.24.1",
+        "babel-plugin-syntax-async-functions": "^6.8.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-class-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
+      "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-plugin-syntax-class-properties": "^6.8.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+      "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+      "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
+      "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+      "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
+      "requires": {
+        "babel-helper-define-map": "^6.24.1",
+        "babel-helper-function-name": "^6.24.1",
+        "babel-helper-optimise-call-expression": "^6.24.1",
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+      "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+      "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
+      "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+      "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+      "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
+      "requires": {
+        "babel-helper-function-name": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+      "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-amd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
+      "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
+      "requires": {
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.26.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
+      "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
+      "requires": {
+        "babel-plugin-transform-strict-mode": "^6.24.1",
+        "babel-runtime": "^6.26.0",
+        "babel-template": "^6.26.0",
+        "babel-types": "^6.26.0"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-systemjs": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
+      "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
+      "requires": {
+        "babel-helper-hoist-variables": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-modules-umd": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
+      "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
+      "requires": {
+        "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+      "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
+      "requires": {
+        "babel-helper-replace-supers": "^6.24.1",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+      "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
+      "requires": {
+        "babel-helper-call-delegate": "^6.24.1",
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+      "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+      "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+      "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
+      "requires": {
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+      "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+      "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+      "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
+      "requires": {
+        "babel-helper-regex": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "regexpu-core": "^2.0.0"
+      }
+    },
+    "babel-plugin-transform-exponentiation-operator": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
+      "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
+      "requires": {
+        "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
+        "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-flow-strip-types": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
+      "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
+      "requires": {
+        "babel-plugin-syntax-flow": "^6.18.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-object-rest-spread": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
+      "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
+      "requires": {
+        "babel-plugin-syntax-object-rest-spread": "^6.8.0",
+        "babel-runtime": "^6.26.0"
+      }
+    },
+    "babel-plugin-transform-react-constant-elements": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-constant-elements/-/babel-plugin-transform-react-constant-elements-6.23.0.tgz",
+      "integrity": "sha1-LxGb9NLN1F65uqrldAU8YE9hR90=",
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-react-display-name": {
+      "version": "6.25.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz",
+      "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=",
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz",
+      "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=",
+      "requires": {
+        "babel-helper-builder-react-jsx": "^6.24.1",
+        "babel-plugin-syntax-jsx": "^6.8.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx-self": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz",
+      "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=",
+      "requires": {
+        "babel-plugin-syntax-jsx": "^6.8.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-react-jsx-source": {
+      "version": "6.22.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz",
+      "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=",
+      "requires": {
+        "babel-plugin-syntax-jsx": "^6.8.0",
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
+      "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
+      "requires": {
+        "regenerator-transform": "^0.10.0"
+      }
+    },
+    "babel-plugin-transform-runtime": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
+      "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
+      "requires": {
+        "babel-runtime": "^6.22.0"
+      }
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+      "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
+      "requires": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
+    },
+    "babel-preset-env": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.1.tgz",
+      "integrity": "sha512-W6VIyA6Ch9ePMI7VptNn2wBM6dbG0eSz25HEiL40nQXCsXGTGZSTZu1Iap+cj3Q0S5a7T9+529l/5Bkvd+afNA==",
+      "requires": {
+        "babel-plugin-check-es2015-constants": "^6.22.0",
+        "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
+        "babel-plugin-transform-async-to-generator": "^6.22.0",
+        "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+        "babel-plugin-transform-es2015-block-scoping": "^6.23.0",
+        "babel-plugin-transform-es2015-classes": "^6.23.0",
+        "babel-plugin-transform-es2015-computed-properties": "^6.22.0",
+        "babel-plugin-transform-es2015-destructuring": "^6.23.0",
+        "babel-plugin-transform-es2015-duplicate-keys": "^6.22.0",
+        "babel-plugin-transform-es2015-for-of": "^6.23.0",
+        "babel-plugin-transform-es2015-function-name": "^6.22.0",
+        "babel-plugin-transform-es2015-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-amd": "^6.22.0",
+        "babel-plugin-transform-es2015-modules-commonjs": "^6.23.0",
+        "babel-plugin-transform-es2015-modules-systemjs": "^6.23.0",
+        "babel-plugin-transform-es2015-modules-umd": "^6.23.0",
+        "babel-plugin-transform-es2015-object-super": "^6.22.0",
+        "babel-plugin-transform-es2015-parameters": "^6.23.0",
+        "babel-plugin-transform-es2015-shorthand-properties": "^6.22.0",
+        "babel-plugin-transform-es2015-spread": "^6.22.0",
+        "babel-plugin-transform-es2015-sticky-regex": "^6.22.0",
+        "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+        "babel-plugin-transform-es2015-typeof-symbol": "^6.23.0",
+        "babel-plugin-transform-es2015-unicode-regex": "^6.22.0",
+        "babel-plugin-transform-exponentiation-operator": "^6.22.0",
+        "babel-plugin-transform-regenerator": "^6.22.0",
+        "browserslist": "^2.1.2",
+        "invariant": "^2.2.2",
+        "semver": "^5.3.0"
+      }
+    },
+    "babel-preset-flow": {
+      "version": "6.23.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz",
+      "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=",
+      "requires": {
+        "babel-plugin-transform-flow-strip-types": "^6.22.0"
+      }
+    },
+    "babel-preset-jest": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-20.0.3.tgz",
+      "integrity": "sha1-y6yq3stdaJyh4d4TYOv8ZoYsF4o=",
+      "requires": {
+        "babel-plugin-jest-hoist": "^20.0.3"
+      }
+    },
+    "babel-preset-react": {
+      "version": "6.24.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
+      "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
+      "requires": {
+        "babel-plugin-syntax-jsx": "^6.3.13",
+        "babel-plugin-transform-react-display-name": "^6.23.0",
+        "babel-plugin-transform-react-jsx": "^6.24.1",
+        "babel-plugin-transform-react-jsx-self": "^6.22.0",
+        "babel-plugin-transform-react-jsx-source": "^6.22.0",
+        "babel-preset-flow": "^6.23.0"
+      }
+    },
+    "babel-preset-react-app": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-3.1.2.tgz",
+      "integrity": "sha512-/sh5Qd5T08PYa6t4kuCdKh9tXp6/m/Jwyx7PJTqugsYMfsDUJMlBXOs5EwFODHprzjWrmQ0SydnMZu9FY4MZYg==",
+      "requires": {
+        "babel-plugin-dynamic-import-node": "1.1.0",
+        "babel-plugin-syntax-dynamic-import": "6.18.0",
+        "babel-plugin-transform-class-properties": "6.24.1",
+        "babel-plugin-transform-es2015-destructuring": "6.23.0",
+        "babel-plugin-transform-object-rest-spread": "6.26.0",
+        "babel-plugin-transform-react-constant-elements": "6.23.0",
+        "babel-plugin-transform-react-jsx": "6.24.1",
+        "babel-plugin-transform-react-jsx-self": "6.22.0",
+        "babel-plugin-transform-react-jsx-source": "6.22.0",
+        "babel-plugin-transform-regenerator": "6.26.0",
+        "babel-plugin-transform-runtime": "6.23.0",
+        "babel-preset-env": "1.6.1",
+        "babel-preset-react": "6.24.1"
+      }
+    },
+    "babel-register": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
+      "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
+      "requires": {
+        "babel-core": "^6.26.0",
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "home-or-tmp": "^2.0.0",
+        "lodash": "^4.17.4",
+        "mkdirp": "^0.5.1",
+        "source-map-support": "^0.4.15"
+      },
+      "dependencies": {
+        "babel-core": {
+          "version": "6.26.3",
+          "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz",
+          "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
+          "requires": {
+            "babel-code-frame": "^6.26.0",
+            "babel-generator": "^6.26.0",
+            "babel-helpers": "^6.24.1",
+            "babel-messages": "^6.23.0",
+            "babel-register": "^6.26.0",
+            "babel-runtime": "^6.26.0",
+            "babel-template": "^6.26.0",
+            "babel-traverse": "^6.26.0",
+            "babel-types": "^6.26.0",
+            "babylon": "^6.18.0",
+            "convert-source-map": "^1.5.1",
+            "debug": "^2.6.9",
+            "json5": "^0.5.1",
+            "lodash": "^4.17.4",
+            "minimatch": "^3.0.4",
+            "path-is-absolute": "^1.0.1",
+            "private": "^0.1.8",
+            "slash": "^1.0.0",
+            "source-map": "^0.5.7"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
+      }
+    },
+    "babel-runtime": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
+      "requires": {
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
+      }
+    },
+    "babel-template": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
+      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-traverse": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
+      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
+      "requires": {
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
+      }
+    },
+    "babel-types": {
+      "version": "6.26.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
+      }
+    },
+    "babylon": {
+      "version": "6.18.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "requires": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.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==",
+          "requires": {
+            "kind-of": "^6.0.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==",
+          "requires": {
+            "kind-of": "^6.0.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==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        }
+      }
+    },
+    "base64-js": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+      "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+    },
+    "batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
+    },
+    "binary-extensions": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="
+    },
+    "bluebird": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz",
+      "integrity": "sha512-aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg=="
+    },
+    "bn.js": {
+      "version": "4.11.8",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
+    },
+    "body-parser": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+      "requires": {
+        "bytes": "3.1.0",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "on-finished": "~2.3.0",
+        "qs": "6.7.0",
+        "raw-body": "2.4.0",
+        "type-is": "~1.6.17"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+        },
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+        }
+      }
+    },
+    "bonjour": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+      "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+      "requires": {
+        "array-flatten": "^2.1.0",
+        "deep-equal": "^1.0.1",
+        "dns-equal": "^1.0.0",
+        "dns-txt": "^2.0.2",
+        "multicast-dns": "^6.0.1",
+        "multicast-dns-service-types": "^1.1.0"
+      }
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
+    },
+    "boxen": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
+      "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
+      "requires": {
+        "ansi-align": "^2.0.0",
+        "camelcase": "^4.0.0",
+        "chalk": "^2.0.1",
+        "cli-boxes": "^1.0.0",
+        "string-width": "^2.0.0",
+        "term-size": "^1.2.0",
+        "widest-line": "^2.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        }
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+      "requires": {
+        "expand-range": "^1.8.1",
+        "preserve": "^0.2.0",
+        "repeat-element": "^1.1.2"
+      }
+    },
+    "brorand": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+      "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
+    },
+    "browser-resolve": {
+      "version": "1.11.3",
+      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
+      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
+      "requires": {
+        "resolve": "1.1.7"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.1.7",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
+          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs="
+        }
+      }
+    },
+    "browserify-aes": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+      "requires": {
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "browserify-cipher": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+      "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+      "requires": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "browserify-des": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+      "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "browserify-rsa": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "browserify-sign": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "requires": {
+        "bn.js": "^4.1.1",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.2",
+        "elliptic": "^6.0.0",
+        "inherits": "^2.0.1",
+        "parse-asn1": "^5.0.0"
+      }
+    },
+    "browserify-zlib": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+      "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+      "requires": {
+        "pako": "~1.0.5"
+      }
+    },
+    "browserslist": {
+      "version": "2.11.3",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz",
+      "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==",
+      "requires": {
+        "caniuse-lite": "^1.0.30000792",
+        "electron-to-chromium": "^1.3.30"
+      }
+    },
+    "bser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.0.tgz",
+      "integrity": "sha512-8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==",
+      "requires": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "bson": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.9.tgz",
+      "integrity": "sha512-IQX9/h7WdMBIW/q/++tGd+emQr0XMdeZ6icnT/74Xk9fnabWn+gZgpE+9V+gujL3hhJOoNrnDVY7tWdzc7NUTg==",
+      "dev": true
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+      "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
+      "requires": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
+    },
+    "buffer-indexof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+      "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
+    },
+    "buffer-shims": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+      "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E=",
+      "dev": true
+    },
+    "buffer-xor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+      "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
+    },
+    "builtin-status-codes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+      "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
+    },
+    "cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "requires": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        }
+      }
+    },
+    "caller-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+      "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
+      "requires": {
+        "callsites": "^0.2.0"
+      }
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
+      "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo="
+    },
+    "camel-case": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
+      "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
+      "requires": {
+        "no-case": "^2.2.0",
+        "upper-case": "^1.1.1"
+      }
+    },
+    "camelcase": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "requires": {
+        "camelcase": "^2.0.0",
+        "map-obj": "^1.0.0"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
+          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
+        }
+      }
+    },
+    "can-use-dom": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/can-use-dom/-/can-use-dom-0.1.0.tgz",
+      "integrity": "sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo=",
+      "dev": true
+    },
+    "caniuse-api": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz",
+      "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=",
+      "requires": {
+        "browserslist": "^1.3.6",
+        "caniuse-db": "^1.0.30000529",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      },
+      "dependencies": {
+        "browserslist": {
+          "version": "1.7.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
+          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
+          "requires": {
+            "caniuse-db": "^1.0.30000639",
+            "electron-to-chromium": "^1.2.7"
+          }
+        }
+      }
+    },
+    "caniuse-db": {
+      "version": "1.0.30000999",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000999.tgz",
+      "integrity": "sha512-NzRdDmSmg/kp+eNIE1FT+/aXsyGy0PPoAmSrRAR4kFFOs+P19csnJWx4OeIKo6sxurr4xzlsso3rO7SkK71SGw=="
+    },
+    "caniuse-lite": {
+      "version": "1.0.30000999",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz",
+      "integrity": "sha512-1CUyKyecPeksKwXZvYw0tEoaMCo/RwBlXmEtN5vVnabvO0KPd9RQLcaAuR9/1F+KDMv6esmOFWlsXuzDk+8rxg=="
+    },
+    "capture-stack-trace": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
+      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="
+    },
+    "case-sensitive-paths-webpack-plugin": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.1.1.tgz",
+      "integrity": "sha1-PSnO2MHxJL9vU4Rvs/WJRzH9yQk="
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz",
+      "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
+      "requires": {
+        "align-text": "^0.1.3",
+        "lazy-cache": "^1.0.3"
+      }
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "requires": {
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        }
+      }
+    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
+    },
+    "chokidar": {
+      "version": "2.1.8",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "requires": {
+        "anymatch": "^2.0.0",
+        "async-each": "^1.0.1",
+        "braces": "^2.3.2",
+        "fsevents": "^1.2.7",
+        "glob-parent": "^3.1.0",
+        "inherits": "^2.0.3",
+        "is-binary-path": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "normalize-path": "^3.0.0",
+        "path-is-absolute": "^1.0.0",
+        "readdirp": "^2.2.1",
+        "upath": "^1.1.1"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "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.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "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=",
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "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=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "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=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.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=="
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "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.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "requires": {
+                "is-extglob": "^2.1.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==",
+          "requires": {
+            "kind-of": "^6.0.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==",
+          "requires": {
+            "kind-of": "^6.0.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==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+        },
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "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.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
+        }
+      }
+    },
+    "ci-info": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="
+    },
+    "cipher-base": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "circular-json": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz",
+      "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="
+    },
+    "clap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz",
+      "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==",
+      "requires": {
+        "chalk": "^1.1.3"
+      }
+    },
+    "class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "requires": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "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=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        }
+      }
+    },
+    "classnames": {
+      "version": "2.2.6",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
+      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==",
+      "dev": true
+    },
+    "clean-css": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
+      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+      "requires": {
+        "source-map": "~0.6.0"
+      }
+    },
+    "cli-boxes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
+      "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM="
+    },
+    "cli-cursor": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "requires": {
+        "restore-cursor": "^2.0.0"
+      }
+    },
+    "cli-width": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+    },
+    "cliui": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
+      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1",
+        "wrap-ansi": "^2.0.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
+      }
+    },
+    "clone": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ="
+    },
+    "coa": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz",
+      "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=",
+      "requires": {
+        "q": "^1.1.2"
+      }
+    },
+    "code-point-at": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz",
+      "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=",
+      "requires": {
+        "clone": "^1.0.2",
+        "color-convert": "^1.3.0",
+        "color-string": "^0.3.0"
+      }
+    },
+    "color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "requires": {
+        "color-name": "1.1.3"
+      }
+    },
+    "color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "color-string": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz",
+      "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=",
+      "requires": {
+        "color-name": "^1.0.0"
+      }
+    },
+    "colormin": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz",
+      "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=",
+      "requires": {
+        "color": "^0.11.0",
+        "css-color-names": "0.0.4",
+        "has": "^1.0.1"
+      }
+    },
+    "colors": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+      "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM="
+    },
+    "combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs="
+    },
+    "component-classes": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/component-classes/-/component-classes-1.2.6.tgz",
+      "integrity": "sha1-xkI5TDYYpNiwuJGe/Mu9kw5c1pE=",
+      "dev": true,
+      "requires": {
+        "component-indexof": "0.0.3"
+      }
+    },
+    "component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="
+    },
+    "component-indexof": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/component-indexof/-/component-indexof-0.0.3.tgz",
+      "integrity": "sha1-EdCRMSI5648yyPJa6csAL/6NPCQ=",
+      "dev": true
+    },
+    "compressible": {
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
+      "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
+      "requires": {
+        "mime-db": ">= 1.40.0 < 2"
+      }
+    },
+    "compression": {
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "requires": {
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "requires": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "configstore": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz",
+      "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
+      "requires": {
+        "dot-prop": "^4.1.0",
+        "graceful-fs": "^4.1.2",
+        "make-dir": "^1.0.0",
+        "unique-string": "^1.0.0",
+        "write-file-atomic": "^2.0.0",
+        "xdg-basedir": "^3.0.0"
+      }
+    },
+    "connect-history-api-fallback": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+      "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
+      "requires": {
+        "date-now": "^0.1.4"
+      }
+    },
+    "constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
+    },
+    "contains-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo="
+    },
+    "content-disposition": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+      "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
+    },
+    "content-type-parser": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.2.tgz",
+      "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ=="
+    },
+    "convert-source-map": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
+      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
+      "requires": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "cookie": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
+    },
+    "copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
+    },
+    "core-js": {
+      "version": "2.6.10",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
+      "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "cosmiconfig": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
+      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
+      "requires": {
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.4.3",
+        "minimist": "^1.2.0",
+        "object-assign": "^4.1.0",
+        "os-homedir": "^1.0.1",
+        "parse-json": "^2.2.0",
+        "require-from-string": "^1.1.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
+    "create-ecdh": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.0.0"
+      }
+    },
+    "create-error-class": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+      "requires": {
+        "capture-stack-trace": "^1.0.0"
+      }
+    },
+    "create-hash": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+      "requires": {
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
+      }
+    },
+    "create-hmac": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+      "requires": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "create-react-class": {
+      "version": "15.6.3",
+      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz",
+      "integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==",
+      "requires": {
+        "fbjs": "^0.8.9",
+        "loose-envify": "^1.3.1",
+        "object-assign": "^4.1.1"
+      }
+    },
+    "cross-spawn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+      "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      }
+    },
+    "crypto-browserify": {
+      "version": "3.12.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+      "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+      "requires": {
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      }
+    },
+    "crypto-random-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+      "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4="
+    },
+    "css-animation": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/css-animation/-/css-animation-1.6.1.tgz",
+      "integrity": "sha512-/48+/BaEaHRY6kNQ2OIPzKf9A6g8WjZYjhiNDNuIVbsm5tXCGIAsHDjB4Xu1C4vXJtUWZo26O68OQkDpNBaPog==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "component-classes": "^1.2.5"
+      }
+    },
+    "css-color-names": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
+      "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA="
+    },
+    "css-loader": {
+      "version": "0.28.4",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.4.tgz",
+      "integrity": "sha1-bPNXkZLONV6LONX0Ldeh8uyJjQ8=",
+      "requires": {
+        "babel-code-frame": "^6.11.0",
+        "css-selector-tokenizer": "^0.7.0",
+        "cssnano": ">=2.6.1 <4",
+        "icss-utils": "^2.1.0",
+        "loader-utils": "^1.0.2",
+        "lodash.camelcase": "^4.3.0",
+        "object-assign": "^4.0.1",
+        "postcss": "^5.0.6",
+        "postcss-modules-extract-imports": "^1.0.0",
+        "postcss-modules-local-by-default": "^1.0.1",
+        "postcss-modules-scope": "^1.0.0",
+        "postcss-modules-values": "^1.1.0",
+        "postcss-value-parser": "^3.3.0",
+        "source-list-map": "^0.1.7"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "css-select": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
+      "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
+      "requires": {
+        "boolbase": "~1.0.0",
+        "css-what": "2.1",
+        "domutils": "1.5.1",
+        "nth-check": "~1.0.1"
+      }
+    },
+    "css-selector-tokenizer": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
+      "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
+      "requires": {
+        "cssesc": "^0.1.0",
+        "fastparse": "^1.1.1",
+        "regexpu-core": "^1.0.0"
+      },
+      "dependencies": {
+        "regexpu-core": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
+          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
+          "requires": {
+            "regenerate": "^1.2.1",
+            "regjsgen": "^0.2.0",
+            "regjsparser": "^0.1.4"
+          }
+        }
+      }
+    },
+    "css-what": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
+      "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="
+    },
+    "cssesc": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
+      "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q="
+    },
+    "cssnano": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz",
+      "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=",
+      "requires": {
+        "autoprefixer": "^6.3.1",
+        "decamelize": "^1.1.2",
+        "defined": "^1.0.0",
+        "has": "^1.0.1",
+        "object-assign": "^4.0.1",
+        "postcss": "^5.0.14",
+        "postcss-calc": "^5.2.0",
+        "postcss-colormin": "^2.1.8",
+        "postcss-convert-values": "^2.3.4",
+        "postcss-discard-comments": "^2.0.4",
+        "postcss-discard-duplicates": "^2.0.1",
+        "postcss-discard-empty": "^2.0.1",
+        "postcss-discard-overridden": "^0.1.1",
+        "postcss-discard-unused": "^2.2.1",
+        "postcss-filter-plugins": "^2.0.0",
+        "postcss-merge-idents": "^2.1.5",
+        "postcss-merge-longhand": "^2.0.1",
+        "postcss-merge-rules": "^2.0.3",
+        "postcss-minify-font-values": "^1.0.2",
+        "postcss-minify-gradients": "^1.0.1",
+        "postcss-minify-params": "^1.0.4",
+        "postcss-minify-selectors": "^2.0.4",
+        "postcss-normalize-charset": "^1.1.0",
+        "postcss-normalize-url": "^3.0.7",
+        "postcss-ordered-values": "^2.1.0",
+        "postcss-reduce-idents": "^2.2.2",
+        "postcss-reduce-initial": "^1.0.0",
+        "postcss-reduce-transforms": "^1.0.3",
+        "postcss-svgo": "^2.1.1",
+        "postcss-unique-selectors": "^2.0.2",
+        "postcss-value-parser": "^3.2.3",
+        "postcss-zindex": "^2.0.1"
+      },
+      "dependencies": {
+        "autoprefixer": {
+          "version": "6.7.7",
+          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
+          "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
+          "requires": {
+            "browserslist": "^1.7.6",
+            "caniuse-db": "^1.0.30000634",
+            "normalize-range": "^0.1.2",
+            "num2fraction": "^1.2.2",
+            "postcss": "^5.2.16",
+            "postcss-value-parser": "^3.2.3"
+          }
+        },
+        "browserslist": {
+          "version": "1.7.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
+          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
+          "requires": {
+            "caniuse-db": "^1.0.30000639",
+            "electron-to-chromium": "^1.2.7"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "csso": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz",
+      "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=",
+      "requires": {
+        "clap": "^1.0.9",
+        "source-map": "^0.5.3"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
+      }
+    },
+    "cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
+    },
+    "cssstyle": {
+      "version": "0.2.37",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
+      "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
+      "requires": {
+        "cssom": "0.3.x"
+      }
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
+      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
+      "requires": {
+        "array-find-index": "^1.0.1"
+      }
+    },
+    "d": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
+      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
+      "requires": {
+        "es5-ext": "^0.10.50",
+        "type": "^1.0.1"
+      }
+    },
+    "damerau-levenshtein": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz",
+      "integrity": "sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA=="
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+      "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
+    },
+    "decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
+    },
+    "deep-equal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz",
+      "integrity": "sha512-ZbfWJq/wN1Z273o7mUSjILYqehAktR2NVoSrOukDkU9kg2v/Uv89yU4Cvz8seJeAmtN5oqiefKq8FPuXOboqLw==",
+      "requires": {
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.1",
+        "is-regex": "^1.0.4",
+        "object-is": "^1.0.1",
+        "object-keys": "^1.1.1",
+        "regexp.prototype.flags": "^1.2.0"
+      }
+    },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ="
+    },
+    "default-require-extensions": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz",
+      "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=",
+      "requires": {
+        "strip-bom": "^2.0.0"
+      }
+    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
+    "define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "requires": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "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==",
+          "requires": {
+            "kind-of": "^6.0.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==",
+          "requires": {
+            "kind-of": "^6.0.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==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        }
+      }
+    },
+    "defined": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+      "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM="
+    },
+    "del": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+      "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+      "requires": {
+        "globby": "^5.0.0",
+        "is-path-cwd": "^1.0.0",
+        "is-path-in-cwd": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
+    },
+    "des.js": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+      "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
+    "detect-node": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+      "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="
+    },
+    "detect-port-alt": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.3.tgz",
+      "integrity": "sha1-pNLwYddXoDTs83xRQmCph1DysTE=",
+      "requires": {
+        "address": "^1.0.1",
+        "debug": "^2.6.0"
+      }
+    },
+    "diff": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
+      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA=="
+    },
+    "diffie-hellman": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
+      }
+    },
+    "dns-equal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0="
+    },
+    "dns-packet": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+      "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+      "requires": {
+        "ip": "^1.1.0",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "dns-txt": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+      "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+      "requires": {
+        "buffer-indexof": "^1.0.0"
+      }
+    },
+    "doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "requires": {
+        "esutils": "^2.0.2"
+      }
+    },
+    "dom-align": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/dom-align/-/dom-align-1.10.2.tgz",
+      "integrity": "sha512-AYZUzLepy05E9bCY4ExoqHrrIlM49PEak9oF93JEFoibqKL0F7w5DLM70/rosLOawerWZ3MlepQcl+EmHskOyw==",
+      "dev": true
+    },
+    "dom-closest": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
+      "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
+      "dev": true,
+      "requires": {
+        "dom-matches": ">=1.0.1"
+      }
+    },
+    "dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "requires": {
+        "utila": "~0.4"
+      }
+    },
+    "dom-matches": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
+      "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw=",
+      "dev": true
+    },
+    "dom-scroll-into-view": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz",
+      "integrity": "sha1-6PNnMt0ImwIBqI14Fdw/iObWbH4=",
+      "dev": true
+    },
+    "dom-serializer": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz",
+      "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
+      "requires": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      },
+      "dependencies": {
+        "domelementtype": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
+          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ=="
+        }
+      }
+    },
+    "dom-urls": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/dom-urls/-/dom-urls-1.1.0.tgz",
+      "integrity": "sha1-AB3fgWKM0ecGElxxdvU8zsVdkY4=",
+      "requires": {
+        "urijs": "^1.16.1"
+      }
+    },
+    "domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
+    },
+    "domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
+    },
+    "domhandler": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+      "requires": {
+        "domelementtype": "1"
+      }
+    },
+    "domutils": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
+      "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
+      "requires": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "dot-prop": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
+      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "requires": {
+        "is-obj": "^1.0.0"
+      }
+    },
+    "dotenv": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz",
+      "integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0="
+    },
+    "draft-js": {
+      "version": "0.10.5",
+      "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.10.5.tgz",
+      "integrity": "sha512-LE6jSCV9nkPhfVX2ggcRLA4FKs6zWq9ceuO/88BpXdNCS7mjRTgs0NsV6piUCJX9YxMsB9An33wnkMmU2sD2Zg==",
+      "dev": true,
+      "requires": {
+        "fbjs": "^0.8.15",
+        "immutable": "~3.7.4",
+        "object-assign": "^4.1.0"
+      }
+    },
+    "duplexer": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
+      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E="
+    },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
+    },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
+    },
+    "electron-to-chromium": {
+      "version": "1.3.282",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.282.tgz",
+      "integrity": "sha512-irSaDeCGgfMu1OA30bhqIBr+dx+pDJjRbwCpob7YWqVZbzXblybNzPGklVnWqv4EXxbkEAzQYqiNCqNTgu00lQ=="
+    },
+    "elliptic": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz",
+      "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==",
+      "requires": {
+        "bn.js": "^4.4.0",
+        "brorand": "^1.0.1",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.0"
+      }
+    },
+    "emoji-regex": {
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.5.1.tgz",
+      "integrity": "sha512-PAHp6TxrCy7MGMFidro8uikr+zlJJKJ/Q6mm2ExZ7HwkyR9lSVFfE3kt36qcwa24BQL7y0G9axycGjK1A/0uNQ=="
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
+    },
+    "encoding": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+      "requires": {
+        "iconv-lite": "~0.4.13"
+      }
+    },
+    "enhanced-resolve": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz",
+      "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "memory-fs": "^0.4.0",
+        "object-assign": "^4.0.1",
+        "tapable": "^0.2.7"
+      }
+    },
+    "enquire.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
+      "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ=",
+      "dev": true
+    },
+    "entities": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
+      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw=="
+    },
+    "errno": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+      "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+      "requires": {
+        "prr": "~1.0.1"
+      }
+    },
+    "error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "requires": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "es-abstract": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.15.0.tgz",
+      "integrity": "sha512-bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ==",
+      "requires": {
+        "es-to-primitive": "^1.2.0",
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.0",
+        "is-callable": "^1.1.4",
+        "is-regex": "^1.0.4",
+        "object-inspect": "^1.6.0",
+        "object-keys": "^1.1.1",
+        "string.prototype.trimleft": "^2.1.0",
+        "string.prototype.trimright": "^2.1.0"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz",
+      "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==",
+      "requires": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      }
+    },
+    "es5-ext": {
+      "version": "0.10.51",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.51.tgz",
+      "integrity": "sha512-oRpWzM2WcLHVKpnrcyB7OW8j/s67Ba04JCm0WnNv3RiABSvs7mrQlutB8DBv793gKcp0XENR8Il8WxGTlZ73gQ==",
+      "requires": {
+        "es6-iterator": "~2.0.3",
+        "es6-symbol": "~3.1.1",
+        "next-tick": "^1.0.0"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.35",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "es6-map": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+      "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-set": "~0.1.5",
+        "es6-symbol": "~3.1.1",
+        "event-emitter": "~0.3.5"
+      }
+    },
+    "es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="
+    },
+    "es6-set": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+      "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14",
+        "es6-iterator": "~2.0.1",
+        "es6-symbol": "3.1.1",
+        "event-emitter": "~0.3.5"
+      },
+      "dependencies": {
+        "es6-symbol": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+          "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+          "requires": {
+            "d": "1",
+            "es5-ext": "~0.10.14"
+          }
+        }
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.2.tgz",
+      "integrity": "sha512-/ZypxQsArlv+KHpGvng52/Iz8by3EQPxhmbuz8yFG89N/caTFBSbcXONDw0aMjy827gQg26XAjP4uXFvnfINmQ==",
+      "requires": {
+        "d": "^1.0.1",
+        "es5-ext": "^0.10.51"
+      }
+    },
+    "es6-weak-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
+      "requires": {
+        "d": "1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.1"
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+    },
+    "escodegen": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
+      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
+      "requires": {
+        "esprima": "^3.1.3",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM="
+        }
+      }
+    },
+    "escope": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+      "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
+      "requires": {
+        "es6-map": "^0.1.3",
+        "es6-weak-map": "^2.0.1",
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "eslint": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.4.1.tgz",
+      "integrity": "sha1-mc1+r8/8ov+Zpcj18qR01jZLS9M=",
+      "requires": {
+        "ajv": "^5.2.0",
+        "babel-code-frame": "^6.22.0",
+        "chalk": "^1.1.3",
+        "concat-stream": "^1.6.0",
+        "cross-spawn": "^5.1.0",
+        "debug": "^2.6.8",
+        "doctrine": "^2.0.0",
+        "eslint-scope": "^3.7.1",
+        "espree": "^3.5.0",
+        "esquery": "^1.0.0",
+        "estraverse": "^4.2.0",
+        "esutils": "^2.0.2",
+        "file-entry-cache": "^2.0.0",
+        "functional-red-black-tree": "^1.0.1",
+        "glob": "^7.1.2",
+        "globals": "^9.17.0",
+        "ignore": "^3.3.3",
+        "imurmurhash": "^0.1.4",
+        "inquirer": "^3.0.6",
+        "is-resolvable": "^1.0.0",
+        "js-yaml": "^3.9.1",
+        "json-stable-stringify": "^1.0.1",
+        "levn": "^0.3.0",
+        "lodash": "^4.17.4",
+        "minimatch": "^3.0.2",
+        "mkdirp": "^0.5.1",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.8.2",
+        "path-is-inside": "^1.0.2",
+        "pluralize": "^4.0.0",
+        "progress": "^2.0.0",
+        "require-uncached": "^1.0.3",
+        "semver": "^5.3.0",
+        "strip-json-comments": "~2.0.1",
+        "table": "^4.0.1",
+        "text-table": "~0.2.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+        },
+        "js-yaml": {
+          "version": "3.13.1",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+          "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^4.0.0"
+          }
+        }
+      }
+    },
+    "eslint-config-react-app": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-2.1.0.tgz",
+      "integrity": "sha512-8QZrKWuHVC57Fmu+SsKAVxnI9LycZl7NFQ4H9L+oeISuCXhYdXqsOOIVSjQFW6JF5MXZLFE+21Syhd7mF1IRZQ=="
+    },
+    "eslint-import-resolver-node": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
+      "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
+      "requires": {
+        "debug": "^2.6.9",
+        "resolve": "^1.5.0"
+      }
+    },
+    "eslint-loader": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/eslint-loader/-/eslint-loader-1.9.0.tgz",
+      "integrity": "sha512-40aN976qSNPyb9ejTqjEthZITpls1SVKtwguahmH1dzGCwQU/vySE+xX33VZmD8csU0ahVNCtFlsPgKqRBiqgg==",
+      "requires": {
+        "loader-fs-cache": "^1.0.0",
+        "loader-utils": "^1.0.2",
+        "object-assign": "^4.0.1",
+        "object-hash": "^1.1.4",
+        "rimraf": "^2.6.1"
+      }
+    },
+    "eslint-module-utils": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz",
+      "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==",
+      "requires": {
+        "debug": "^2.6.8",
+        "pkg-dir": "^2.0.0"
+      }
+    },
+    "eslint-plugin-flowtype": {
+      "version": "2.35.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.35.0.tgz",
+      "integrity": "sha512-zjXGjOsHds8b84C0Ad3VViKh+sUA9PeXKHwPRlSLwwSX0v1iUJf/6IX7wxc+w2T2tnDH8PT6B/YgtcEuNI3ssA==",
+      "requires": {
+        "lodash": "^4.15.0"
+      }
+    },
+    "eslint-plugin-import": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.7.0.tgz",
+      "integrity": "sha512-HGYmpU9f/zJaQiKNQOVfHUh2oLWW3STBrCgH0sHTX1xtsxYlH1zjLh8FlQGEIdZSdTbUMaV36WaZ6ImXkenGxQ==",
+      "requires": {
+        "builtin-modules": "^1.1.1",
+        "contains-path": "^0.1.0",
+        "debug": "^2.6.8",
+        "doctrine": "1.5.0",
+        "eslint-import-resolver-node": "^0.3.1",
+        "eslint-module-utils": "^2.1.1",
+        "has": "^1.0.1",
+        "lodash.cond": "^4.3.0",
+        "minimatch": "^3.0.3",
+        "read-pkg-up": "^2.0.0"
+      },
+      "dependencies": {
+        "doctrine": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "requires": {
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
+          }
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "requires": {
+            "pify": "^2.0.0"
+          }
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "requires": {
+            "load-json-file": "^2.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^2.0.0"
+          }
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+        }
+      }
+    },
+    "eslint-plugin-jsx-a11y": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-5.1.1.tgz",
+      "integrity": "sha512-5I9SpoP7gT4wBFOtXT8/tXNPYohHBVfyVfO17vkbC7r9kEIxYJF12D3pKqhk8+xnk12rfxKClS3WCFpVckFTPQ==",
+      "requires": {
+        "aria-query": "^0.7.0",
+        "array-includes": "^3.0.3",
+        "ast-types-flow": "0.0.7",
+        "axobject-query": "^0.1.0",
+        "damerau-levenshtein": "^1.0.0",
+        "emoji-regex": "^6.1.0",
+        "jsx-ast-utils": "^1.4.0"
+      }
+    },
+    "eslint-plugin-react": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.1.0.tgz",
+      "integrity": "sha1-J3cKzzn1/UnNCvQIPOWBBOs5DUw=",
+      "requires": {
+        "doctrine": "^2.0.0",
+        "has": "^1.0.1",
+        "jsx-ast-utils": "^1.4.1"
+      }
+    },
+    "eslint-scope": {
+      "version": "3.7.3",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-3.7.3.tgz",
+      "integrity": "sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA==",
+      "requires": {
+        "esrecurse": "^4.1.0",
+        "estraverse": "^4.1.1"
+      }
+    },
+    "espree": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz",
+      "integrity": "sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==",
+      "requires": {
+        "acorn": "^5.5.0",
+        "acorn-jsx": "^3.0.0"
+      }
+    },
+    "esprima": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+      "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE="
+    },
+    "esquery": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "requires": {
+        "estraverse": "^4.0.0"
+      }
+    },
+    "esrecurse": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "requires": {
+        "estraverse": "^4.1.0"
+      }
+    },
+    "estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+    },
+    "esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+    },
+    "etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
+    },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "requires": {
+        "d": "1",
+        "es5-ext": "~0.10.14"
+      }
+    },
+    "eventemitter3": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
+      "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg=="
+    },
+    "eventlistener": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/eventlistener/-/eventlistener-0.0.1.tgz",
+      "integrity": "sha1-7Suqu4UiJ68rz4iRUscsY8pTLrg=",
+      "dev": true
+    },
+    "events": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="
+    },
+    "eventsource": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz",
+      "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=",
+      "requires": {
+        "original": ">=0.0.5"
+      }
+    },
+    "evp_bytestokey": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "requires": {
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "exec-sh": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.2.tgz",
+      "integrity": "sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw==",
+      "requires": {
+        "merge": "^1.2.0"
+      }
+    },
+    "execa": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+      "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+      "requires": {
+        "cross-spawn": "^5.0.1",
+        "get-stream": "^3.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      }
+    },
+    "expand-brackets": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+      "requires": {
+        "is-posix-bracket": "^0.1.0"
+      }
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "requires": {
+        "fill-range": "^2.1.0"
+      }
+    },
+    "expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+      "requires": {
+        "homedir-polyfill": "^1.0.1"
+      }
+    },
+    "express": {
+      "version": "4.17.1",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+      "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+      "requires": {
+        "accepts": "~1.3.7",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.19.0",
+        "content-disposition": "0.5.3",
+        "content-type": "~1.0.4",
+        "cookie": "0.4.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "~1.1.2",
+        "fresh": "0.5.2",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.5",
+        "qs": "6.7.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.1.2",
+        "send": "0.17.1",
+        "serve-static": "1.14.1",
+        "setprototypeof": "1.1.1",
+        "statuses": "~1.5.0",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "array-flatten": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+          "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
+        },
+        "path-to-regexp": {
+          "version": "0.1.7",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+          "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
+        },
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
+        }
+      }
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
+    "extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "requires": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "external-editor": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+      "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
+      "requires": {
+        "chardet": "^0.4.0",
+        "iconv-lite": "^0.4.17",
+        "tmp": "^0.0.33"
+      }
+    },
+    "extglob": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+      "requires": {
+        "is-extglob": "^1.0.0"
+      }
+    },
+    "extract-text-webpack-plugin": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.0.tgz",
+      "integrity": "sha1-kMqnkHvESfM1AF46x1MrQbAN5hI=",
+      "requires": {
+        "async": "^2.4.1",
+        "loader-utils": "^1.1.0",
+        "schema-utils": "^0.3.0",
+        "webpack-sources": "^1.0.1"
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
+    "fast-deep-equal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ="
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+    },
+    "fastparse": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
+      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="
+    },
+    "faye-websocket": {
+      "version": "0.11.3",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+      "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+      "requires": {
+        "websocket-driver": ">=0.5.1"
+      }
+    },
+    "fb-watchman": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.0.tgz",
+      "integrity": "sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=",
+      "requires": {
+        "bser": "^2.0.0"
+      }
+    },
+    "fbjs": {
+      "version": "0.8.17",
+      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
+      "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
+      "requires": {
+        "core-js": "^1.0.0",
+        "isomorphic-fetch": "^2.1.1",
+        "loose-envify": "^1.0.0",
+        "object-assign": "^4.1.0",
+        "promise": "^7.1.1",
+        "setimmediate": "^1.0.5",
+        "ua-parser-js": "^0.7.18"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+        },
+        "promise": {
+          "version": "7.3.1",
+          "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+          "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+          "requires": {
+            "asap": "~2.0.3"
+          }
+        }
+      }
+    },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
+    "file-entry-cache": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+      "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
+      "requires": {
+        "flat-cache": "^1.2.1",
+        "object-assign": "^4.0.1"
+      }
+    },
+    "file-loader": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz",
+      "integrity": "sha512-N+uhF3mswIFeziHQjGScJ/yHXYt3DiLBeC+9vWW+WjUBiClMSOlV1YrXQi+7KM2aA3Rn4Bybgv+uXFQbfkzpvg==",
+      "requires": {
+        "loader-utils": "^1.0.2"
+      }
+    },
+    "filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY="
+    },
+    "fileset": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz",
+      "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=",
+      "requires": {
+        "glob": "^7.0.3",
+        "minimatch": "^3.0.3"
+      }
+    },
+    "filesize": {
+      "version": "3.5.11",
+      "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz",
+      "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g=="
+    },
+    "fill-range": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+      "requires": {
+        "is-number": "^2.1.0",
+        "isobject": "^2.0.0",
+        "randomatic": "^3.0.0",
+        "repeat-element": "^1.1.2",
+        "repeat-string": "^1.5.2"
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      }
+    },
+    "find-cache-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+      "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+      "requires": {
+        "commondir": "^1.0.1",
+        "make-dir": "^1.0.0",
+        "pkg-dir": "^2.0.0"
+      }
+    },
+    "find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "requires": {
+        "locate-path": "^2.0.0"
+      }
+    },
+    "flat-cache": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
+      "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
+      "requires": {
+        "circular-json": "^0.3.1",
+        "graceful-fs": "^4.1.2",
+        "rimraf": "~2.6.2",
+        "write": "^0.2.1"
+      }
+    },
+    "flatten": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
+      "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I="
+    },
+    "follow-redirects": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+      "requires": {
+        "debug": "=3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "requires": {
+        "for-in": "^1.0.1"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
+    "form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "forwarded": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
+    },
+    "fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "requires": {
+        "map-cache": "^0.2.2"
+      }
+    },
+    "fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
+    },
+    "fs-extra": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
+      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^3.0.0",
+        "universalify": "^0.1.0"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "fsevents": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+      "optional": true,
+      "requires": {
+        "nan": "^2.12.1",
+        "node-pre-gyp": "^0.12.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.5",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "delegates": "^1.0.0",
+            "readable-stream": "^2.0.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "balanced-match": "^1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true,
+          "optional": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true,
+          "optional": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "deep-extend": {
+          "version": "0.6.0",
+          "bundled": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "aproba": "^1.0.3",
+            "console-control-strings": "^1.0.0",
+            "has-unicode": "^2.0.0",
+            "object-assign": "^4.1.0",
+            "signal-exit": "^3.0.0",
+            "string-width": "^1.0.1",
+            "strip-ansi": "^3.0.1",
+            "wide-align": "^1.1.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.3",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.24",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "^3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "once": "^1.3.0",
+            "wrappy": "1"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true,
+          "optional": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true,
+          "optional": true
+        },
+        "minipass": {
+          "version": "2.3.5",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.0"
+          }
+        },
+        "minizlib": {
+          "version": "1.2.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "minipass": "^2.2.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.3.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "debug": "^4.1.0",
+            "iconv-lite": "^0.4.4",
+            "sax": "^1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.12.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "^1.0.2",
+            "mkdirp": "^0.5.1",
+            "needle": "^2.2.1",
+            "nopt": "^4.0.1",
+            "npm-packlist": "^1.1.6",
+            "npmlog": "^4.0.2",
+            "rc": "^1.2.7",
+            "rimraf": "^2.6.1",
+            "semver": "^5.3.0",
+            "tar": "^4"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1",
+            "osenv": "^0.1.4"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.6",
+          "bundled": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.4.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "^3.0.1",
+            "npm-bundled": "^1.0.1"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "~1.1.2",
+            "console-control-strings": "~1.1.0",
+            "gauge": "~2.7.3",
+            "set-blocking": "~2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "wrappy": "1"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "^1.0.0",
+            "os-tmpdir": "^1.0.0"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.8",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "^0.6.0",
+            "ini": "~1.3.0",
+            "minimist": "^1.2.0",
+            "strip-json-comments": "~2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.3",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~2.0.0",
+            "safe-buffer": "~5.1.1",
+            "string_decoder": "~1.1.1",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.2",
+          "bundled": true,
+          "optional": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.7.0",
+          "bundled": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.8",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "chownr": "^1.1.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.3.4",
+            "minizlib": "^1.1.1",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.2",
+            "yallist": "^3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.3",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "string-width": "^1.0.2 || 2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "yallist": {
+          "version": "3.0.3",
+          "bundled": true,
+          "optional": true
+        }
+      }
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+    },
+    "get-caller-file": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
+      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4="
+    },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+    },
+    "get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+      "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "requires": {
+        "glob-parent": "^2.0.0",
+        "is-glob": "^2.0.0"
+      }
+    },
+    "glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "requires": {
+        "is-glob": "^2.0.0"
+      }
+    },
+    "global-dirs": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+      "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+      "requires": {
+        "ini": "^1.3.4"
+      }
+    },
+    "global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "requires": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      }
+    },
+    "global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+      "requires": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      }
+    },
+    "globals": {
+      "version": "9.18.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
+      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ=="
+    },
+    "globby": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+      "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+      "requires": {
+        "array-union": "^1.0.1",
+        "arrify": "^1.0.0",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "got": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+      "requires": {
+        "create-error-class": "^3.0.0",
+        "duplexer3": "^0.1.4",
+        "get-stream": "^3.0.0",
+        "is-redirect": "^1.0.0",
+        "is-retry-allowed": "^1.0.0",
+        "is-stream": "^1.0.0",
+        "lowercase-keys": "^1.0.0",
+        "safe-buffer": "^5.0.1",
+        "timed-out": "^4.0.0",
+        "unzip-response": "^2.0.1",
+        "url-parse-lax": "^1.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
+      "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
+    },
+    "growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE="
+    },
+    "gzip-size": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-3.0.0.tgz",
+      "integrity": "sha1-VGGI6b3DN/Zzdy+BZgRks4nc5SA=",
+      "requires": {
+        "duplexer": "^0.1.1"
+      }
+    },
+    "hammerjs": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=",
+      "dev": true
+    },
+    "handle-thing": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz",
+      "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ="
+    },
+    "handlebars": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.3.tgz",
+      "integrity": "sha512-B0W4A2U1ww3q7VVthTKfh+epHx+q4mCt6iK+zEAzbMBpWQAwxCeKxEGpj/1oQTpzPXDNSOG7hmG14TsISH50yw==",
+      "requires": {
+        "neo-async": "^2.6.0",
+        "optimist": "^0.6.1",
+        "source-map": "^0.6.1",
+        "uglify-js": "^3.1.4"
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+      "requires": {
+        "ajv": "^6.5.5",
+        "har-schema": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+        }
+      }
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    },
+    "has-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
+      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q="
+    },
+    "has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "requires": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        }
+      }
+    },
+    "has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "requires": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "kind-of": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "requires": {
+            "is-buffer": "^1.1.5"
+          }
+        }
+      }
+    },
+    "hash-base": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "hash.js": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+      "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+      "requires": {
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
+      }
+    },
+    "he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+    },
+    "history": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
+      "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "loose-envify": "^1.2.0",
+        "resolve-pathname": "^3.0.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0",
+        "value-equal": "^1.0.1"
+      }
+    },
+    "hmac-drbg": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+      "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+      "requires": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
+      }
+    },
+    "hoist-non-react-statics": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz",
+      "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=",
+      "dev": true
+    },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+      "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
+      "requires": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.1"
+      }
+    },
+    "homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "requires": {
+        "parse-passwd": "^1.0.0"
+      }
+    },
+    "hooks-fixed": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-2.0.2.tgz",
+      "integrity": "sha512-YurCM4gQSetcrhwEtpQHhQ4M7Zo7poNGqY4kQGeBS6eZtOcT3tnNs01ThFa0jYBByAiYt1MjMjP/YApG0EnAvQ==",
+      "dev": true
+    },
+    "hosted-git-info": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
+      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg=="
+    },
+    "hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+      "requires": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "html-comment-regex": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz",
+      "integrity": "sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="
+    },
+    "html-encoding-sniffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
+      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
+      "requires": {
+        "whatwg-encoding": "^1.0.1"
+      }
+    },
+    "html-entities": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8="
+    },
+    "html-minifier": {
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
+      "integrity": "sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==",
+      "requires": {
+        "camel-case": "3.0.x",
+        "clean-css": "4.2.x",
+        "commander": "2.17.x",
+        "he": "1.2.x",
+        "param-case": "2.1.x",
+        "relateurl": "0.2.x",
+        "uglify-js": "3.4.x"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.17.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
+        }
+      }
+    },
+    "html-webpack-plugin": {
+      "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-2.29.0.tgz",
+      "integrity": "sha1-6Yf0IYU9O2k4yMTIFxhC5f0XryM=",
+      "requires": {
+        "bluebird": "^3.4.7",
+        "html-minifier": "^3.2.3",
+        "loader-utils": "^0.2.16",
+        "lodash": "^4.17.3",
+        "pretty-error": "^2.0.2",
+        "toposort": "^1.0.0"
+      },
+      "dependencies": {
+        "big.js": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
+        },
+        "loader-utils": {
+          "version": "0.2.17",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
+          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+          "requires": {
+            "big.js": "^3.1.3",
+            "emojis-list": "^2.0.0",
+            "json5": "^0.5.0",
+            "object-assign": "^4.0.1"
+          }
+        }
+      }
+    },
+    "htmlparser2": {
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+      "requires": {
+        "domelementtype": "^1.3.1",
+        "domhandler": "^2.3.0",
+        "domutils": "^1.5.1",
+        "entities": "^1.1.1",
+        "inherits": "^2.0.1",
+        "readable-stream": "^3.1.1"
+      },
+      "dependencies": {
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+        },
+        "readable-stream": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
+    "http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc="
+    },
+    "http-errors": {
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+      "requires": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.1",
+        "statuses": ">= 1.5.0 < 2",
+        "toidentifier": "1.0.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        }
+      }
+    },
+    "http-parser-js": {
+      "version": "0.4.10",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
+      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q="
+    },
+    "http-proxy": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
+      "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
+      "requires": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "http-proxy-middleware": {
+      "version": "0.20.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.20.0.tgz",
+      "integrity": "sha512-dNJAk71nEJhPiAczQH9hGvE/MT9kEs+zn2Dh+Hi94PGZe1GluQirC7mw5rdREUtWx6qGS1Gu0bZd4qEAg+REgw==",
+      "dev": true,
+      "requires": {
+        "http-proxy": "^1.17.0",
+        "is-glob": "^4.0.1",
+        "lodash": "^4.17.14",
+        "micromatch": "^4.0.2"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+          "dev": true
+        },
+        "is-glob": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+          "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+          "dev": true,
+          "requires": {
+            "is-extglob": "^2.1.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "micromatch": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
+          "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
+          "dev": true,
+          "requires": {
+            "braces": "^3.0.1",
+            "picomatch": "^2.0.5"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
+    "https-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+      "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
+    },
+    "iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "requires": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      }
+    },
+    "icss-replace-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0="
+    },
+    "icss-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz",
+      "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
+      "requires": {
+        "postcss": "^6.0.1"
+      }
+    },
+    "ieee754": {
+      "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+      "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+    },
+    "ignore": {
+      "version": "3.3.10",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug=="
+    },
+    "immutable": {
+      "version": "3.7.6",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
+      "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks=",
+      "dev": true
+    },
+    "import-lazy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
+      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM="
+    },
+    "imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+      "requires": {
+        "repeating": "^2.0.0"
+      }
+    },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
+    },
+    "inquirer": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
+      "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
+      "requires": {
+        "ansi-escapes": "^3.0.0",
+        "chalk": "^2.0.0",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^2.0.4",
+        "figures": "^2.0.0",
+        "lodash": "^4.3.0",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rx-lite": "^4.0.8",
+        "rx-lite-aggregates": "^4.0.8",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^4.0.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "internal-ip": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz",
+      "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=",
+      "requires": {
+        "meow": "^3.3.0"
+      }
+    },
+    "interpret": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
+      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="
+    },
+    "invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
+      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo="
+    },
+    "ipaddr.js": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
+    },
+    "is-absolute-url": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz",
+      "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY="
+    },
+    "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=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      }
+    },
+    "is-arguments": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+      "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "requires": {
+        "binary-extensions": "^1.0.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "requires": {
+        "builtin-modules": "^1.0.0"
+      }
+    },
+    "is-callable": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA=="
+    },
+    "is-ci": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
+      "requires": {
+        "ci-info": "^1.5.0"
+      }
+    },
+    "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=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      }
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+    },
+    "is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "requires": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "dependencies": {
+        "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=="
+        }
+      }
+    },
+    "is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE="
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE="
+    },
+    "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=",
+      "requires": {
+        "is-primitive": "^2.0.0"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik="
+    },
+    "is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA="
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
+      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
+      "requires": {
+        "number-is-nan": "^1.0.0"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+    },
+    "is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "requires": {
+        "is-extglob": "^1.0.0"
+      }
+    },
+    "is-installed-globally": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
+      "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
+      "requires": {
+        "global-dirs": "^0.1.0",
+        "is-path-inside": "^1.0.0"
+      }
+    },
+    "is-npm": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
+      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ="
+    },
+    "is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      }
+    },
+    "is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
+    },
+    "is-path-cwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0="
+    },
+    "is-path-in-cwd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
+      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "requires": {
+        "is-path-inside": "^1.0.0"
+      }
+    },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "requires": {
+        "path-is-inside": "^1.0.1"
+      }
+    },
+    "is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "requires": {
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        }
+      }
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q="
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU="
+    },
+    "is-promise": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+    },
+    "is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "requires": {
+        "has": "^1.0.1"
+      }
+    },
+    "is-resolvable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="
+    },
+    "is-retry-allowed": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz",
+      "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg=="
+    },
+    "is-root": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz",
+      "integrity": "sha1-B7bCM7w5TNnQK6FclmvWZg1jQtU="
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
+    "is-svg": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz",
+      "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=",
+      "requires": {
+        "html-comment-regex": "^1.1.0"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz",
+      "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==",
+      "requires": {
+        "has-symbols": "^1.0.0"
+      }
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
+      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI="
+    },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
+    },
+    "is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "requires": {
+        "isarray": "1.0.0"
+      }
+    },
+    "isomorphic-fetch": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+      "requires": {
+        "node-fetch": "^1.0.1",
+        "whatwg-fetch": ">=0.10.0"
+      }
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
+    "istanbul-api": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.3.7.tgz",
+      "integrity": "sha512-4/ApBnMVeEPG3EkSzcw25wDe4N66wxwn+KKn6b47vyek8Xb3NBAcg4xfuQbS7BqcZuTX4wxfD5lVagdggR3gyA==",
+      "requires": {
+        "async": "^2.1.4",
+        "fileset": "^2.0.2",
+        "istanbul-lib-coverage": "^1.2.1",
+        "istanbul-lib-hook": "^1.2.2",
+        "istanbul-lib-instrument": "^1.10.2",
+        "istanbul-lib-report": "^1.1.5",
+        "istanbul-lib-source-maps": "^1.2.6",
+        "istanbul-reports": "^1.5.1",
+        "js-yaml": "^3.7.0",
+        "mkdirp": "^0.5.1",
+        "once": "^1.4.0"
+      }
+    },
+    "istanbul-lib-coverage": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
+      "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ=="
+    },
+    "istanbul-lib-hook": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.2.2.tgz",
+      "integrity": "sha512-/Jmq7Y1VeHnZEQ3TL10VHyb564mn6VrQXHchON9Jf/AEcmQ3ZIiyD1BVzNOKTZf/G3gE+kiGK6SmpF9y3qGPLw==",
+      "requires": {
+        "append-transform": "^0.4.0"
+      }
+    },
+    "istanbul-lib-instrument": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
+      "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
+      "requires": {
+        "babel-generator": "^6.18.0",
+        "babel-template": "^6.16.0",
+        "babel-traverse": "^6.18.0",
+        "babel-types": "^6.18.0",
+        "babylon": "^6.18.0",
+        "istanbul-lib-coverage": "^1.2.1",
+        "semver": "^5.3.0"
+      }
+    },
+    "istanbul-lib-report": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.5.tgz",
+      "integrity": "sha512-UsYfRMoi6QO/doUshYNqcKJqVmFe9w51GZz8BS3WB0lYxAllQYklka2wP9+dGZeHYaWIdcXUx8JGdbqaoXRXzw==",
+      "requires": {
+        "istanbul-lib-coverage": "^1.2.1",
+        "mkdirp": "^0.5.1",
+        "path-parse": "^1.0.5",
+        "supports-color": "^3.1.2"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "istanbul-lib-source-maps": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.6.tgz",
+      "integrity": "sha512-TtbsY5GIHgbMsMiRw35YBHGpZ1DVFEO19vxxeiDMYaeOFOCzfnYVxvl6pOUIZR4dtPhAGpSMup8OyF8ubsaqEg==",
+      "requires": {
+        "debug": "^3.1.0",
+        "istanbul-lib-coverage": "^1.2.1",
+        "mkdirp": "^0.5.1",
+        "rimraf": "^2.6.1",
+        "source-map": "^0.5.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
+      }
+    },
+    "istanbul-reports": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.5.1.tgz",
+      "integrity": "sha512-+cfoZ0UXzWjhAdzosCPP3AN8vvef8XDkWtTfgaN+7L3YTpNYITnCaEkceo5SEYy644VkHka/P1FvkWvrG/rrJw==",
+      "requires": {
+        "handlebars": "^4.0.3"
+      }
+    },
+    "jest": {
+      "version": "20.0.4",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-20.0.4.tgz",
+      "integrity": "sha1-PdJgwpidba1nix6cxNkZRPbWAqw=",
+      "requires": {
+        "jest-cli": "^20.0.4"
+      },
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+          "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4="
+        },
+        "callsites": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+          "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA="
+        },
+        "jest-cli": {
+          "version": "20.0.4",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-20.0.4.tgz",
+          "integrity": "sha1-5TKxnYiuW8bEF+iwWTpv6VSx3JM=",
+          "requires": {
+            "ansi-escapes": "^1.4.0",
+            "callsites": "^2.0.0",
+            "chalk": "^1.1.3",
+            "graceful-fs": "^4.1.11",
+            "is-ci": "^1.0.10",
+            "istanbul-api": "^1.1.1",
+            "istanbul-lib-coverage": "^1.0.1",
+            "istanbul-lib-instrument": "^1.4.2",
+            "istanbul-lib-source-maps": "^1.1.0",
+            "jest-changed-files": "^20.0.3",
+            "jest-config": "^20.0.4",
+            "jest-docblock": "^20.0.3",
+            "jest-environment-jsdom": "^20.0.3",
+            "jest-haste-map": "^20.0.4",
+            "jest-jasmine2": "^20.0.4",
+            "jest-message-util": "^20.0.3",
+            "jest-regex-util": "^20.0.3",
+            "jest-resolve-dependencies": "^20.0.3",
+            "jest-runtime": "^20.0.4",
+            "jest-snapshot": "^20.0.3",
+            "jest-util": "^20.0.3",
+            "micromatch": "^2.3.11",
+            "node-notifier": "^5.0.2",
+            "pify": "^2.3.0",
+            "slash": "^1.0.0",
+            "string-length": "^1.0.1",
+            "throat": "^3.0.0",
+            "which": "^1.2.12",
+            "worker-farm": "^1.3.1",
+            "yargs": "^7.0.2"
+          }
+        }
+      }
+    },
+    "jest-changed-files": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-20.0.3.tgz",
+      "integrity": "sha1-k5TVzGXEOEBhSb7xv01Sto4D4/g="
+    },
+    "jest-config": {
+      "version": "20.0.4",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-20.0.4.tgz",
+      "integrity": "sha1-43kwqyIXyRNgXv8T5712PsSPruo=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "glob": "^7.1.1",
+        "jest-environment-jsdom": "^20.0.3",
+        "jest-environment-node": "^20.0.3",
+        "jest-jasmine2": "^20.0.4",
+        "jest-matcher-utils": "^20.0.3",
+        "jest-regex-util": "^20.0.3",
+        "jest-resolve": "^20.0.4",
+        "jest-validate": "^20.0.3",
+        "pretty-format": "^20.0.3"
+      }
+    },
+    "jest-diff": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-20.0.3.tgz",
+      "integrity": "sha1-gfKI/Z5nXw+yPHXxwrGURf5YZhc=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "diff": "^3.2.0",
+        "jest-matcher-utils": "^20.0.3",
+        "pretty-format": "^20.0.3"
+      }
+    },
+    "jest-docblock": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-20.0.3.tgz",
+      "integrity": "sha1-F76phDQswz2DxQ++FUXqDvqkRxI="
+    },
+    "jest-environment-jsdom": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-20.0.3.tgz",
+      "integrity": "sha1-BIqKwS7iJfcZBBdxODS7mZeH3pk=",
+      "requires": {
+        "jest-mock": "^20.0.3",
+        "jest-util": "^20.0.3",
+        "jsdom": "^9.12.0"
+      }
+    },
+    "jest-environment-node": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-20.0.3.tgz",
+      "integrity": "sha1-1Ii8RhKvLCRumG6K52caCZFj1AM=",
+      "requires": {
+        "jest-mock": "^20.0.3",
+        "jest-util": "^20.0.3"
+      }
+    },
+    "jest-haste-map": {
+      "version": "20.0.5",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-20.0.5.tgz",
+      "integrity": "sha512-0IKAQjUvuZjMCNi/0VNQQF74/H9KB67hsHJqGiwTWQC6XO5Azs7kLWm+6Q/dwuhvDUvABDOBMFK2/FwZ3sZ07Q==",
+      "requires": {
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.1.11",
+        "jest-docblock": "^20.0.3",
+        "micromatch": "^2.3.11",
+        "sane": "~1.6.0",
+        "worker-farm": "^1.3.1"
+      }
+    },
+    "jest-jasmine2": {
+      "version": "20.0.4",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-20.0.4.tgz",
+      "integrity": "sha1-/MWxQReA2RHQQpAu8YWehS5g1eE=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "graceful-fs": "^4.1.11",
+        "jest-diff": "^20.0.3",
+        "jest-matcher-utils": "^20.0.3",
+        "jest-matchers": "^20.0.3",
+        "jest-message-util": "^20.0.3",
+        "jest-snapshot": "^20.0.3",
+        "once": "^1.4.0",
+        "p-map": "^1.1.1"
+      }
+    },
+    "jest-matcher-utils": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-20.0.3.tgz",
+      "integrity": "sha1-s6a443yld4A7CDKpixZPRLeBVhI=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "pretty-format": "^20.0.3"
+      }
+    },
+    "jest-matchers": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-matchers/-/jest-matchers-20.0.3.tgz",
+      "integrity": "sha1-ymnbHDLbWm9wf6XgQBq7VXAN/WA=",
+      "requires": {
+        "jest-diff": "^20.0.3",
+        "jest-matcher-utils": "^20.0.3",
+        "jest-message-util": "^20.0.3",
+        "jest-regex-util": "^20.0.3"
+      }
+    },
+    "jest-message-util": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-20.0.3.tgz",
+      "integrity": "sha1-auwoRDBvyw5udNV5bBAG2W/dgxw=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "micromatch": "^2.3.11",
+        "slash": "^1.0.0"
+      }
+    },
+    "jest-mock": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-20.0.3.tgz",
+      "integrity": "sha1-i8Bw6QQUqhVcEajWTIaaDVxx2lk="
+    },
+    "jest-regex-util": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-20.0.3.tgz",
+      "integrity": "sha1-hburXRM+RGJbGfr4xqpRItCF12I="
+    },
+    "jest-resolve": {
+      "version": "20.0.4",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-20.0.4.tgz",
+      "integrity": "sha1-lEiz6La6/BVHlETGSZBFt//ll6U=",
+      "requires": {
+        "browser-resolve": "^1.11.2",
+        "is-builtin-module": "^1.0.0",
+        "resolve": "^1.3.2"
+      }
+    },
+    "jest-resolve-dependencies": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-20.0.3.tgz",
+      "integrity": "sha1-bhSntxevDyyzZnxUneQK8Bexcjo=",
+      "requires": {
+        "jest-regex-util": "^20.0.3"
+      }
+    },
+    "jest-runtime": {
+      "version": "20.0.4",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-20.0.4.tgz",
+      "integrity": "sha1-osgCIZxCA/dU3xQE5JAYYWnRJNg=",
+      "requires": {
+        "babel-core": "^6.0.0",
+        "babel-jest": "^20.0.3",
+        "babel-plugin-istanbul": "^4.0.0",
+        "chalk": "^1.1.3",
+        "convert-source-map": "^1.4.0",
+        "graceful-fs": "^4.1.11",
+        "jest-config": "^20.0.4",
+        "jest-haste-map": "^20.0.4",
+        "jest-regex-util": "^20.0.3",
+        "jest-resolve": "^20.0.4",
+        "jest-util": "^20.0.3",
+        "json-stable-stringify": "^1.0.1",
+        "micromatch": "^2.3.11",
+        "strip-bom": "3.0.0",
+        "yargs": "^7.0.2"
+      },
+      "dependencies": {
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+        }
+      }
+    },
+    "jest-snapshot": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-20.0.3.tgz",
+      "integrity": "sha1-W4R+GtsaTZCFKn+fElCG4YfHZWY=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "jest-diff": "^20.0.3",
+        "jest-matcher-utils": "^20.0.3",
+        "jest-util": "^20.0.3",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^20.0.3"
+      }
+    },
+    "jest-util": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-20.0.3.tgz",
+      "integrity": "sha1-DAf32A2C9OWmfG+LnD/n9lz9Mq0=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "graceful-fs": "^4.1.11",
+        "jest-message-util": "^20.0.3",
+        "jest-mock": "^20.0.3",
+        "jest-validate": "^20.0.3",
+        "leven": "^2.1.0",
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "jest-validate": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-20.0.3.tgz",
+      "integrity": "sha1-0M/R3k9XnymEhJJcKA+PHZTsPKs=",
+      "requires": {
+        "chalk": "^1.1.3",
+        "jest-matcher-utils": "^20.0.3",
+        "leven": "^2.1.0",
+        "pretty-format": "^20.0.3"
+      }
+    },
+    "jquery": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
+      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==",
+      "dev": true
+    },
+    "js-base64": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
+      "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
+    },
+    "js-tokens": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
+      "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
+    },
+    "js-yaml": {
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+        }
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
+    "jsdom": {
+      "version": "9.12.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.12.0.tgz",
+      "integrity": "sha1-6MVG//ywbADUgzyoRBD+1/igl9Q=",
+      "requires": {
+        "abab": "^1.0.3",
+        "acorn": "^4.0.4",
+        "acorn-globals": "^3.1.0",
+        "array-equal": "^1.0.0",
+        "content-type-parser": "^1.0.1",
+        "cssom": ">= 0.3.2 < 0.4.0",
+        "cssstyle": ">= 0.2.37 < 0.3.0",
+        "escodegen": "^1.6.1",
+        "html-encoding-sniffer": "^1.0.1",
+        "nwmatcher": ">= 1.3.9 < 2.0.0",
+        "parse5": "^1.5.1",
+        "request": "^2.79.0",
+        "sax": "^1.2.1",
+        "symbol-tree": "^3.2.1",
+        "tough-cookie": "^2.3.2",
+        "webidl-conversions": "^4.0.0",
+        "whatwg-encoding": "^1.0.1",
+        "whatwg-url": "^4.3.0",
+        "xml-name-validator": "^2.0.1"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "4.0.13",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+          "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
+        }
+      }
+    },
+    "jsesc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s="
+    },
+    "json-loader": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
+      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w=="
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A="
+    },
+    "json-stable-stringify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+      "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+      "requires": {
+        "jsonify": "~0.0.0"
+      }
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
+    "json2mq": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
+      "integrity": "sha1-tje9O6nqvhIsg+lyBIOusQ0skEo=",
+      "dev": true,
+      "requires": {
+        "string-convert": "^0.2.0"
+      }
+    },
+    "json3": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
+      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA=="
+    },
+    "json5": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
+    },
+    "jsonfile": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
+      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM="
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "jsx-ast-utils": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz",
+      "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE="
+    },
+    "kareem": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.5.0.tgz",
+      "integrity": "sha1-4+QQHZ3P3imXadr0tNtk2JXRdEg=",
+      "dev": true
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "requires": {
+        "is-buffer": "^1.1.5"
+      }
+    },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "requires": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
+    "latest-version": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
+      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
+      "requires": {
+        "package-json": "^4.0.0"
+      }
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4="
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
+      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+      "requires": {
+        "invert-kv": "^1.0.0"
+      }
+    },
+    "leven": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz",
+      "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA="
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "requires": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      }
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      }
+    },
+    "loader-fs-cache": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz",
+      "integrity": "sha512-70IzT/0/L+M20jUlEqZhZyArTU6VKLRTYRDAYN26g4jfzpJqjipLL3/hgYpySqI9PwsVRHHFja0LfEmsx9X2Cw==",
+      "requires": {
+        "find-cache-dir": "^0.1.1",
+        "mkdirp": "0.5.1"
+      },
+      "dependencies": {
+        "find-cache-dir": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
+          "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
+          "requires": {
+            "commondir": "^1.0.1",
+            "mkdirp": "^0.5.1",
+            "pkg-dir": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "pkg-dir": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
+          "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
+          "requires": {
+            "find-up": "^1.0.0"
+          }
+        }
+      }
+    },
+    "loader-runner": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+      "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw=="
+    },
+    "loader-utils": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^2.0.0",
+        "json5": "^1.0.1"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
+    "locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "requires": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+    },
+    "lodash-es": {
+      "version": "4.17.15",
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
+      "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==",
+      "dev": true
+    },
+    "lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
+      "dev": true
+    },
+    "lodash._reinterpolate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+      "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0="
+    },
+    "lodash.camelcase": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
+      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY="
+    },
+    "lodash.cond": {
+      "version": "4.5.2",
+      "resolved": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
+      "integrity": "sha1-9HGh2khr5g9quVXRcRVSPdHSVdU="
+    },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
+    "lodash.defaults": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
+      "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw="
+    },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
+      "dev": true
+    },
+    "lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
+      "dev": true
+    },
+    "lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
+      "dev": true
+    },
+    "lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
+      "dev": true,
+      "requires": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4="
+    },
+    "lodash.template": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
+      "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+      "requires": {
+        "lodash._reinterpolate": "^3.0.0",
+        "lodash.templatesettings": "^4.0.0"
+      }
+    },
+    "lodash.templatesettings": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
+      "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+      "requires": {
+        "lodash._reinterpolate": "^3.0.0"
+      }
+    },
+    "lodash.throttle": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=",
+      "dev": true
+    },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M="
+    },
+    "lodash.uniqby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz",
+      "integrity": "sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=",
+      "dev": true
+    },
+    "loglevel": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz",
+      "integrity": "sha512-p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g=="
+    },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc="
+    },
+    "loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "requires": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
+      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
+      "requires": {
+        "currently-unhandled": "^0.4.1",
+        "signal-exit": "^3.0.0"
+      }
+    },
+    "lower-case": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz",
+      "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw="
+    },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "make-dir": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
+      "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+      "requires": {
+        "pify": "^3.0.0"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+        }
+      }
+    },
+    "makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "requires": {
+        "tmpl": "1.0.x"
+      }
+    },
+    "map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8="
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
+    },
+    "map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "requires": {
+        "object-visit": "^1.0.0"
+      }
+    },
+    "math-expression-evaluator": {
+      "version": "1.2.17",
+      "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz",
+      "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw="
+    },
+    "math-random": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
+      "integrity": "sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="
+    },
+    "md5.js": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+      "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
+    },
+    "mem": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
+      "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "memory-fs": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+      "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+      "requires": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "meow": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "requires": {
+        "camelcase-keys": "^2.0.0",
+        "decamelize": "^1.1.2",
+        "loud-rejection": "^1.0.0",
+        "map-obj": "^1.0.1",
+        "minimist": "^1.1.3",
+        "normalize-package-data": "^2.3.4",
+        "object-assign": "^4.0.1",
+        "read-pkg-up": "^1.0.1",
+        "redent": "^1.0.0",
+        "trim-newlines": "^1.0.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
+    "merge": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+    },
+    "micromatch": {
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+      "requires": {
+        "arr-diff": "^2.0.0",
+        "array-unique": "^0.2.1",
+        "braces": "^1.8.2",
+        "expand-brackets": "^0.1.4",
+        "extglob": "^0.3.1",
+        "filename-regex": "^2.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.1",
+        "kind-of": "^3.0.2",
+        "normalize-path": "^2.0.1",
+        "object.omit": "^2.0.0",
+        "parse-glob": "^3.0.4",
+        "regex-cache": "^0.4.2"
+      }
+    },
+    "miller-rabin": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+      "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+      "requires": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      }
+    },
+    "mime": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz",
+      "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA="
+    },
+    "mime-db": {
+      "version": "1.40.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
+      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA=="
+    },
+    "mime-types": {
+      "version": "2.1.24",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
+      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
+      "requires": {
+        "mime-db": "1.40.0"
+      }
+    },
+    "mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
+    },
+    "minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    },
+    "minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+      "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+    },
+    "mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "requires": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "dependencies": {
+        "is-extendable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+          "requires": {
+            "is-plain-object": "^2.0.4"
+          }
+        }
+      }
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==",
+      "dev": true
+    },
+    "mongodb": {
+      "version": "2.2.34",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.34.tgz",
+      "integrity": "sha1-o09Zu+thdUrsQy3nLD/iFSakTBo=",
+      "dev": true,
+      "requires": {
+        "es6-promise": "3.2.1",
+        "mongodb-core": "2.1.18",
+        "readable-stream": "2.2.7"
+      },
+      "dependencies": {
+        "es6-promise": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz",
+          "integrity": "sha1-7FYjOGgDKQkgcXDDlEjiREndH8Q=",
+          "dev": true
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "2.2.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz",
+          "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE=",
+          "dev": true,
+          "requires": {
+            "buffer-shims": "~1.0.0",
+            "core-util-is": "~1.0.0",
+            "inherits": "~2.0.1",
+            "isarray": "~1.0.0",
+            "process-nextick-args": "~1.0.6",
+            "string_decoder": "~1.0.0",
+            "util-deprecate": "~1.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+          "dev": true,
+          "requires": {
+            "safe-buffer": "~5.1.0"
+          }
+        }
+      }
+    },
+    "mongodb-core": {
+      "version": "2.1.18",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.18.tgz",
+      "integrity": "sha1-TEYTm986HwMt7ZHbSfOO7AFlkFA=",
+      "dev": true,
+      "requires": {
+        "bson": "~1.0.4",
+        "require_optional": "~1.0.0"
+      }
+    },
+    "mongoose": {
+      "version": "4.13.19",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.13.19.tgz",
+      "integrity": "sha512-O41XmkbAZtLK6Uw4cqjI30s0sP8oZeG+aWweOIyE2VYHMQiYDWhVkBMtsv+Kv8chDizaBhO5oErTHexLQKzU+w==",
+      "dev": true,
+      "requires": {
+        "async": "2.6.0",
+        "bson": "~1.0.4",
+        "hooks-fixed": "2.0.2",
+        "kareem": "1.5.0",
+        "lodash.get": "4.4.2",
+        "mongodb": "2.2.34",
+        "mpath": "0.5.1",
+        "mpromise": "0.5.5",
+        "mquery": "2.3.3",
+        "ms": "2.0.0",
+        "muri": "1.3.0",
+        "regexp-clone": "0.0.1",
+        "sliced": "1.0.1"
+      },
+      "dependencies": {
+        "async": {
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
+          "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.14.0"
+          }
+        }
+      }
+    },
+    "mpath": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.5.1.tgz",
+      "integrity": "sha512-H8OVQ+QEz82sch4wbODFOz+3YQ61FYz/z3eJ5pIdbMEaUzDqA268Wd+Vt4Paw9TJfvDgVKaayC0gBzMIw2jhsg==",
+      "dev": true
+    },
+    "mpromise": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.5.tgz",
+      "integrity": "sha1-9bJCWddjrMIlewoMjG2Gb9UXMuY=",
+      "dev": true
+    },
+    "mquery": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/mquery/-/mquery-2.3.3.tgz",
+      "integrity": "sha512-NC8L14kn+qxJbbJ1gbcEMDxF0sC3sv+1cbRReXXwVvowcwY1y9KoVZFq0ebwARibsadu8lx8nWGvm3V0Pf0ZWQ==",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.0",
+        "debug": "2.6.9",
+        "regexp-clone": "0.0.1",
+        "sliced": "0.0.5"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+          "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=",
+          "dev": true
+        },
+        "sliced": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz",
+          "integrity": "sha1-XtwETKTrb3gW1Qui/GPiXY/kcH8=",
+          "dev": true
+        }
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "multicast-dns": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+      "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+      "requires": {
+        "dns-packet": "^1.3.1",
+        "thunky": "^1.0.2"
+      }
+    },
+    "multicast-dns-service-types": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+      "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE="
+    },
+    "muri": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/muri/-/muri-1.3.0.tgz",
+      "integrity": "sha512-FiaFwKl864onHFFUV/a2szAl7X0fxVlSKNdhTf+BM8i8goEgYut8u5P9MqQqIYwvaMxjzVESsoEm/2kfkFH1rg==",
+      "dev": true
+    },
+    "mute-stream": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
+    },
+    "nan": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+      "optional": true
+    },
+    "nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "requires": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "dependencies": {
+        "arr-diff": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+          "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA="
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        }
+      }
+    },
+    "natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    },
+    "negotiator": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
+    },
+    "neo-async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
+    },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw="
+    },
+    "no-case": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
+      "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
+      "requires": {
+        "lower-case": "^1.1.1"
+      }
+    },
+    "node-fetch": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+      "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+      "requires": {
+        "encoding": "^0.1.11",
+        "is-stream": "^1.0.1"
+      }
+    },
+    "node-forge": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
+      "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="
+    },
+    "node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs="
+    },
+    "node-libs-browser": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+      "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+      "requires": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+        }
+      }
+    },
+    "node-notifier": {
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
+      "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
+      "requires": {
+        "growly": "^1.3.0",
+        "is-wsl": "^1.1.0",
+        "semver": "^5.5.0",
+        "shellwords": "^0.1.1",
+        "which": "^1.3.0"
+      }
+    },
+    "normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "requires": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "requires": {
+        "remove-trailing-separator": "^1.0.1"
+      }
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI="
+    },
+    "normalize-url": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz",
+      "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
+      "requires": {
+        "object-assign": "^4.0.1",
+        "prepend-http": "^1.0.0",
+        "query-string": "^4.1.0",
+        "sort-keys": "^1.0.0"
+      }
+    },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "requires": {
+        "path-key": "^2.0.0"
+      }
+    },
+    "nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "requires": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+    },
+    "nwmatcher": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz",
+      "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ=="
+    },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+    },
+    "object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "requires": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "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=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "object-hash": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz",
+      "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA=="
+    },
+    "object-inspect": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz",
+      "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="
+    },
+    "object-is": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
+      "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY="
+    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+    },
+    "object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "requires": {
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        }
+      }
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "requires": {
+        "for-own": "^0.1.4",
+        "is-extendable": "^0.1.1"
+      }
+    },
+    "object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "requires": {
+        "isobject": "^3.0.1"
+      },
+      "dependencies": {
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        }
+      }
+    },
+    "obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
+    },
+    "omit.js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/omit.js/-/omit.js-1.0.2.tgz",
+      "integrity": "sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.23.0"
+      }
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "requires": {
+        "mimic-fn": "^1.0.0"
+      }
+    },
+    "opn": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz",
+      "integrity": "sha512-iPNl7SyM8L30Rm1sjGdLLheyHVw5YXVfi3SKWJzBI7efxRwHojfRFjwE/OLM6qp9xJYMgab8WicTU1cPoY+Hpg==",
+      "requires": {
+        "is-wsl": "^1.1.0"
+      }
+    },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "requires": {
+        "minimist": "~0.0.1",
+        "wordwrap": "~0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
+        }
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "requires": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.4",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "wordwrap": "~1.0.0"
+      }
+    },
+    "original": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+      "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
+      "requires": {
+        "url-parse": "^1.4.3"
+      }
+    },
+    "os-browserify": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+      "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
+      "requires": {
+        "lcid": "^1.0.0"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
+    "p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "requires": {
+        "p-try": "^1.0.0"
+      }
+    },
+    "p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "requires": {
+        "p-limit": "^1.1.0"
+      }
+    },
+    "p-map": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA=="
+    },
+    "p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+    },
+    "package-json": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+      "requires": {
+        "got": "^6.7.1",
+        "registry-auth-token": "^3.0.1",
+        "registry-url": "^3.0.3",
+        "semver": "^5.1.0"
+      }
+    },
+    "pako": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
+    },
+    "param-case": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
+      "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
+      "requires": {
+        "no-case": "^2.2.0"
+      }
+    },
+    "parse-asn1": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
+      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+      "requires": {
+        "asn1.js": "^4.0.0",
+        "browserify-aes": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "requires": {
+        "glob-base": "^0.3.0",
+        "is-dotfile": "^1.0.0",
+        "is-extglob": "^1.0.0",
+        "is-glob": "^2.0.0"
+      }
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "requires": {
+        "error-ex": "^1.2.0"
+      }
+    },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY="
+    },
+    "parse5": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
+      "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ="
+    },
+    "parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
+    },
+    "pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
+    },
+    "path-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+      "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ=="
+    },
+    "path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA="
+    },
+    "path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+    },
+    "path-parse": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+    },
+    "path-to-regexp": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz",
+      "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=",
+      "requires": {
+        "isarray": "0.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        }
+      }
+    },
+    "path-type": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
+      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      }
+    },
+    "pbkdf2": {
+      "version": "3.0.17",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "requires": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      }
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+    },
+    "picomatch": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz",
+      "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==",
+      "dev": true
+    },
+    "pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA="
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pkg-dir": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+      "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+      "requires": {
+        "find-up": "^2.1.0"
+      }
+    },
+    "pluralize": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-4.0.0.tgz",
+      "integrity": "sha1-WbcIwcAZCi9pLxx2GMRGsFL9F2I="
+    },
+    "portfinder": {
+      "version": "1.0.24",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.24.tgz",
+      "integrity": "sha512-ekRl7zD2qxYndYflwiryJwMioBI7LI7rVXg3EnLK3sjkouT5eOuhS3gS255XxBksa30VG8UPZYZCdgfGOfkSUg==",
+      "requires": {
+        "async": "^1.5.2",
+        "debug": "^2.2.0",
+        "mkdirp": "0.5.x"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
+        }
+      }
+    },
+    "posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs="
+    },
+    "postcss": {
+      "version": "6.0.23",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+      "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+      "requires": {
+        "chalk": "^2.4.1",
+        "source-map": "^0.6.1",
+        "supports-color": "^5.4.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        }
+      }
+    },
+    "postcss-calc": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz",
+      "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=",
+      "requires": {
+        "postcss": "^5.0.2",
+        "postcss-message-helpers": "^2.0.0",
+        "reduce-css-calc": "^1.2.6"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-colormin": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz",
+      "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=",
+      "requires": {
+        "colormin": "^1.0.5",
+        "postcss": "^5.0.13",
+        "postcss-value-parser": "^3.2.3"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-convert-values": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz",
+      "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=",
+      "requires": {
+        "postcss": "^5.0.11",
+        "postcss-value-parser": "^3.1.2"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-discard-comments": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz",
+      "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=",
+      "requires": {
+        "postcss": "^5.0.14"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-discard-duplicates": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz",
+      "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=",
+      "requires": {
+        "postcss": "^5.0.4"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-discard-empty": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz",
+      "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=",
+      "requires": {
+        "postcss": "^5.0.14"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-discard-overridden": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz",
+      "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=",
+      "requires": {
+        "postcss": "^5.0.16"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-discard-unused": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz",
+      "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=",
+      "requires": {
+        "postcss": "^5.0.14",
+        "uniqs": "^2.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-filter-plugins": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz",
+      "integrity": "sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==",
+      "requires": {
+        "postcss": "^5.0.4"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-flexbugs-fixes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-3.2.0.tgz",
+      "integrity": "sha512-0AuD9HG1Ey3/3nqPWu9yqf7rL0KCPu5VgjDsjf5mzEcuo9H/z8nco/fljKgjsOUrZypa95MI0kS4xBZeBzz2lw==",
+      "requires": {
+        "postcss": "^6.0.1"
+      }
+    },
+    "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=",
+      "requires": {
+        "cosmiconfig": "^2.1.0",
+        "object-assign": "^4.1.0",
+        "postcss-load-options": "^1.2.0",
+        "postcss-load-plugins": "^2.3.0"
+      }
+    },
+    "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=",
+      "requires": {
+        "cosmiconfig": "^2.1.0",
+        "object-assign": "^4.1.0"
+      }
+    },
+    "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=",
+      "requires": {
+        "cosmiconfig": "^2.1.1",
+        "object-assign": "^4.1.0"
+      }
+    },
+    "postcss-loader": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.0.6.tgz",
+      "integrity": "sha512-HIq7yy1hh9KI472Y38iSRV4WupZUNy6zObkxQM/ZuInoaE2+PyX4NcO6jjP5HG5mXL7j5kcNEl0fAG4Kva7O9w==",
+      "requires": {
+        "loader-utils": "^1.1.0",
+        "postcss": "^6.0.2",
+        "postcss-load-config": "^1.2.0",
+        "schema-utils": "^0.3.0"
+      }
+    },
+    "postcss-merge-idents": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz",
+      "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=",
+      "requires": {
+        "has": "^1.0.1",
+        "postcss": "^5.0.10",
+        "postcss-value-parser": "^3.1.1"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-merge-longhand": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz",
+      "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=",
+      "requires": {
+        "postcss": "^5.0.4"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-merge-rules": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz",
+      "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=",
+      "requires": {
+        "browserslist": "^1.5.2",
+        "caniuse-api": "^1.5.2",
+        "postcss": "^5.0.4",
+        "postcss-selector-parser": "^2.2.2",
+        "vendors": "^1.0.0"
+      },
+      "dependencies": {
+        "browserslist": {
+          "version": "1.7.7",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz",
+          "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=",
+          "requires": {
+            "caniuse-db": "^1.0.30000639",
+            "electron-to-chromium": "^1.2.7"
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-message-helpers": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz",
+      "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4="
+    },
+    "postcss-minify-font-values": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz",
+      "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=",
+      "requires": {
+        "object-assign": "^4.0.1",
+        "postcss": "^5.0.4",
+        "postcss-value-parser": "^3.0.2"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-minify-gradients": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz",
+      "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=",
+      "requires": {
+        "postcss": "^5.0.12",
+        "postcss-value-parser": "^3.3.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-minify-params": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz",
+      "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=",
+      "requires": {
+        "alphanum-sort": "^1.0.1",
+        "postcss": "^5.0.2",
+        "postcss-value-parser": "^3.0.2",
+        "uniqs": "^2.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-minify-selectors": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz",
+      "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=",
+      "requires": {
+        "alphanum-sort": "^1.0.2",
+        "has": "^1.0.1",
+        "postcss": "^5.0.14",
+        "postcss-selector-parser": "^2.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-modules-extract-imports": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz",
+      "integrity": "sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==",
+      "requires": {
+        "postcss": "^6.0.1"
+      }
+    },
+    "postcss-modules-local-by-default": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
+      "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
+      "requires": {
+        "css-selector-tokenizer": "^0.7.0",
+        "postcss": "^6.0.1"
+      }
+    },
+    "postcss-modules-scope": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
+      "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
+      "requires": {
+        "css-selector-tokenizer": "^0.7.0",
+        "postcss": "^6.0.1"
+      }
+    },
+    "postcss-modules-values": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
+      "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
+      "requires": {
+        "icss-replace-symbols": "^1.1.0",
+        "postcss": "^6.0.1"
+      }
+    },
+    "postcss-normalize-charset": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz",
+      "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=",
+      "requires": {
+        "postcss": "^5.0.5"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-normalize-url": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz",
+      "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=",
+      "requires": {
+        "is-absolute-url": "^2.0.0",
+        "normalize-url": "^1.4.0",
+        "postcss": "^5.0.14",
+        "postcss-value-parser": "^3.2.3"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-ordered-values": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz",
+      "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=",
+      "requires": {
+        "postcss": "^5.0.4",
+        "postcss-value-parser": "^3.0.1"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-reduce-idents": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz",
+      "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=",
+      "requires": {
+        "postcss": "^5.0.4",
+        "postcss-value-parser": "^3.0.2"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-reduce-initial": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz",
+      "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=",
+      "requires": {
+        "postcss": "^5.0.4"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-reduce-transforms": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz",
+      "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=",
+      "requires": {
+        "has": "^1.0.1",
+        "postcss": "^5.0.8",
+        "postcss-value-parser": "^3.0.1"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-selector-parser": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz",
+      "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=",
+      "requires": {
+        "flatten": "^1.0.2",
+        "indexes-of": "^1.0.1",
+        "uniq": "^1.0.1"
+      }
+    },
+    "postcss-svgo": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz",
+      "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=",
+      "requires": {
+        "is-svg": "^2.0.0",
+        "postcss": "^5.0.14",
+        "postcss-value-parser": "^3.2.3",
+        "svgo": "^0.7.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-unique-selectors": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz",
+      "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=",
+      "requires": {
+        "alphanum-sort": "^1.0.1",
+        "postcss": "^5.0.4",
+        "uniqs": "^2.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
+    },
+    "postcss-zindex": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz",
+      "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=",
+      "requires": {
+        "has": "^1.0.1",
+        "postcss": "^5.0.4",
+        "uniqs": "^2.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "postcss": {
+          "version": "5.2.18",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
+          "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
+          "requires": {
+            "chalk": "^1.1.3",
+            "js-base64": "^2.1.9",
+            "source-map": "^0.5.6",
+            "supports-color": "^3.2.3"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        }
+      }
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+    },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks="
+    },
+    "pretty-bytes": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
+      "integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk="
+    },
+    "pretty-error": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
+      "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+      "requires": {
+        "renderkid": "^2.0.1",
+        "utila": "~0.4"
+      }
+    },
+    "pretty-format": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-20.0.3.tgz",
+      "integrity": "sha1-Ag41ClYKH+GpjcO+tsz/s4beixQ=",
+      "requires": {
+        "ansi-regex": "^2.1.1",
+        "ansi-styles": "^3.0.0"
+      }
+    },
+    "private": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg=="
+    },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+    },
+    "process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
+    "progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+    },
+    "promise": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-8.0.1.tgz",
+      "integrity": "sha1-5F1osAoXZHttpxG/he1u1HII9FA=",
+      "requires": {
+        "asap": "~2.0.3"
+      }
+    },
+    "prop-types": {
+      "version": "15.7.2",
+      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+      "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+      "requires": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.8.1"
+      }
+    },
+    "proxy-addr": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
+      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
+      "requires": {
+        "forwarded": "~0.1.2",
+        "ipaddr.js": "1.9.0"
+      }
+    },
+    "prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+    },
+    "psl": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
+      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw=="
+    },
+    "public-encrypt": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+      "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+      "requires": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+    },
+    "q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+    },
+    "query-string": {
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+      "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+      "requires": {
+        "object-assign": "^4.1.0",
+        "strict-uri-encode": "^1.0.0"
+      }
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
+    },
+    "querystringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
+    },
+    "raf": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+      "dev": true,
+      "requires": {
+        "performance-now": "^2.1.0"
+      }
+    },
+    "randomatic": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.1.1.tgz",
+      "integrity": "sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw==",
+      "requires": {
+        "is-number": "^4.0.0",
+        "kind-of": "^6.0.0",
+        "math-random": "^1.0.1"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        }
+      }
+    },
+    "randombytes": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "requires": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "randomfill": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+      "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+      "requires": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "range-parser": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="
+    },
+    "raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="
+        }
+      }
+    },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "requires": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
+    "rc-align": {
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/rc-align/-/rc-align-2.4.5.tgz",
+      "integrity": "sha512-nv9wYUYdfyfK+qskThf4BQUSIadeI/dCsfaMZfNEoxm9HwOIioQ+LyqmMK6jWHAZQgOzMLaqawhuBXlF63vgjw==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.26.0",
+        "dom-align": "^1.7.0",
+        "prop-types": "^15.5.8",
+        "rc-util": "^4.0.4"
+      }
+    },
+    "rc-animate": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.10.1.tgz",
+      "integrity": "sha512-yfP3g5fNf8wB5eh85nim2IGrqNu5u7TKrrSh710+1vlUqZvnI2R5YHK99IBCQNgkLCAWjT0sHtkcYdynjly39w==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "classnames": "^2.2.6",
+        "css-animation": "^1.3.2",
+        "prop-types": "15.x",
+        "raf": "^3.4.0",
+        "rc-util": "^4.8.0",
+        "react-lifecycles-compat": "^3.0.4"
+      }
+    },
+    "rc-calendar": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/rc-calendar/-/rc-calendar-9.0.4.tgz",
+      "integrity": "sha512-Ut/QLqkm8QfnomyOduQxb8XEz84Dgrk0H2nmuhWbNNQ5ReoK6ZbFzbyjHAECeIHslL19PxU7aE/8A/MOOCxITw==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "classnames": "2.x",
+        "create-react-class": "^15.5.2",
+        "moment": "2.x",
+        "prop-types": "^15.5.8",
+        "rc-trigger": "1.x",
+        "rc-util": "^4.0.4"
+      }
+    },
+    "rc-cascader": {
+      "version": "0.11.6",
+      "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-0.11.6.tgz",
+      "integrity": "sha512-j9HXC3HrxBy8vpIE/UKtHCLHRWRd9xj2gIMYOnrvnjehRKFdrHxizIdz4Tx7EuN8cVDZe6GYngxFTtBlWCfBFQ==",
+      "dev": true,
+      "requires": {
+        "array-tree-filter": "^1.0.0",
+        "prop-types": "^15.5.8",
+        "rc-trigger": "1.x",
+        "rc-util": "4.x",
+        "shallow-equal": "^1.0.0"
+      }
+    },
+    "rc-checkbox": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-2.0.3.tgz",
+      "integrity": "sha1-Q2qdUIlI4iSYDwU16nOLSBd6jyU=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.23.0",
+        "classnames": "2.x",
+        "prop-types": "15.x",
+        "rc-util": "^4.0.4"
+      }
+    },
+    "rc-collapse": {
+      "version": "1.7.7",
+      "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-1.7.7.tgz",
+      "integrity": "sha512-F9eWCcFtwb/H7ot1e/Z9CamVM1bQ0GaTx3Agkle6LrhrcPxuWTH00dldmtk0HelCBK43TyhTWoHEFB5S4biPLA==",
+      "dev": true,
+      "requires": {
+        "classnames": "2.x",
+        "css-animation": "1.x",
+        "prop-types": "^15.5.6",
+        "rc-animate": "2.x"
+      }
+    },
+    "rc-dialog": {
+      "version": "6.5.11",
+      "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-6.5.11.tgz",
+      "integrity": "sha512-FGifsGYvCO8vZQ6SBezXUf60JZ2wa2tHv+qLnUPA7HJaR52v4l4pVwQJgdbNiE3lvveH0Qq4x6C9ZQjTAK5SVA==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "create-react-class": "^15.5.2",
+        "object-assign": "~4.1.0",
+        "rc-animate": "2.x",
+        "rc-util": "^4.0.4"
+      }
+    },
+    "rc-dropdown": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-1.5.1.tgz",
+      "integrity": "sha512-nq+9ZShevzvJXOQyYaACQKlMYWUqnzJCh+TEEy1qpsj5lYeTd9FqFnG6mn2PiL/BeWBWW/lbjaHn56o5e9GJ8Q==",
+      "dev": true,
+      "requires": {
+        "prop-types": "^15.5.8",
+        "rc-trigger": "1.x"
+      }
+    },
+    "rc-editor-core": {
+      "version": "0.7.9",
+      "resolved": "https://registry.npmjs.org/rc-editor-core/-/rc-editor-core-0.7.9.tgz",
+      "integrity": "sha1-3+j6IPM66kG8rBykhJNLYA27dm0=",
+      "dev": true,
+      "requires": {
+        "draft-js": "^0.10.0",
+        "immutable": "^3.7.4",
+        "lodash": "^4.16.5",
+        "prop-types": "^15.5.8",
+        "setimmediate": "^1.0.5"
+      }
+    },
+    "rc-editor-mention": {
+      "version": "0.6.14",
+      "resolved": "https://registry.npmjs.org/rc-editor-mention/-/rc-editor-mention-0.6.14.tgz",
+      "integrity": "sha512-2fhxptmTLoWF0qs3pz+6Dh40xi0mKuUCFxo17sKi9x1OpAnp1JGB27dc9iV1oP1l8dJCLRKMtInTMGbCX18OzA==",
+      "dev": true,
+      "requires": {
+        "classnames": "^2.2.5",
+        "dom-scroll-into-view": "^1.2.0",
+        "draft-js": "~0.10.0",
+        "immutable": "~3.7.4",
+        "prop-types": "^15.5.8",
+        "rc-animate": "^2.3.0",
+        "rc-editor-core": "~0.7.7"
+      }
+    },
+    "rc-form": {
+      "version": "1.4.8",
+      "resolved": "https://registry.npmjs.org/rc-form/-/rc-form-1.4.8.tgz",
+      "integrity": "sha512-OISgu4LdHmLg/RvnbVmQoRoP2nbthge+bZ6/IKqPm4j4P2s5wQJTSuAKLR4kJoJla0V69czwd7MsOwQN45eBaA==",
+      "dev": true,
+      "requires": {
+        "async-validator": "1.x",
+        "babel-runtime": "6.x",
+        "create-react-class": "^15.5.3",
+        "dom-scroll-into-view": "1.x",
+        "hoist-non-react-statics": "1.x",
+        "lodash": "^4.17.4",
+        "warning": "^3.0.0"
+      }
+    },
+    "rc-hammerjs": {
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/rc-hammerjs/-/rc-hammerjs-0.6.9.tgz",
+      "integrity": "sha512-4llgWO3RgLyVbEqUdGsDfzUDqklRlQW5VEhE3x35IvhV+w//VPRG34SBavK3D2mD/UaLKaohgU41V4agiftC8g==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "hammerjs": "^2.0.8",
+        "prop-types": "^15.5.9"
+      }
+    },
+    "rc-input-number": {
+      "version": "3.6.10",
+      "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-3.6.10.tgz",
+      "integrity": "sha512-IlZBLfSzGQTFE6CgYDid8gthSWlC015JsNpfHdTmhDgGbagmBNijJD9rS+SMcDCADyz5VpIlPg2ZCzsg6C07HQ==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "classnames": "^2.2.0",
+        "create-react-class": "^15.5.2",
+        "prop-types": "^15.5.7",
+        "rc-touchable": "^1.0.0"
+      }
+    },
+    "rc-menu": {
+      "version": "5.0.14",
+      "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-5.0.14.tgz",
+      "integrity": "sha512-Ks6GOB9obVvrHCtbp5X8xCK+D08Hwlrjkx60sa4RYPuimuUS4uQo8yV1FJLPTvRCx1PXxM8Clj23jawuoPDs3g==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "classnames": "2.x",
+        "create-react-class": "^15.5.2",
+        "dom-scroll-into-view": "1.x",
+        "prop-types": "^15.5.6",
+        "rc-animate": "2.x",
+        "rc-util": "^4.0.2"
+      }
+    },
+    "rc-notification": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-2.0.6.tgz",
+      "integrity": "sha512-KD5JcCIiZQaTvbGsbevRFQbHcxTkj49A5ceCBQ2RAnLbCaC9H+plXTZJEUUDMDmESVVx7491CvTzWVAvR9z/Pw==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "classnames": "2.x",
+        "prop-types": "^15.5.8",
+        "rc-animate": "2.x",
+        "rc-util": "^4.0.4"
+      }
+    },
+    "rc-pagination": {
+      "version": "1.12.12",
+      "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-1.12.12.tgz",
+      "integrity": "sha512-q3JfDfQjIem+88ELFqt3beoee4UQep8PZOdCkkMIlebEuMZMPXKOaChcmCyii0qkn3akoVfIChUjVOCCHtXhnw==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "prop-types": "^15.5.7"
+      }
+    },
+    "rc-progress": {
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-2.2.7.tgz",
+      "integrity": "sha512-uLHHpQO4/yFa/AX6Uw2dJFUIfAkfI6430h0a1XJX/A0Ja0wmuwjEa03biuKfKwwqz2skFiAaXco1GlgaJK9mKA==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "prop-types": "^15.5.8"
+      }
+    },
+    "rc-rate": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.1.1.tgz",
+      "integrity": "sha1-iK7aiz1kcLuuT2UYxlKgKpWb3cU=",
+      "dev": true,
+      "requires": {
+        "classnames": "^2.2.5",
+        "prop-types": "^15.5.8"
+      }
+    },
+    "rc-select": {
+      "version": "6.9.8",
+      "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-6.9.8.tgz",
+      "integrity": "sha512-PO665G7iD0+CWTXQBd+wsVrDd/Y4FRrjppOYbc0R5O/di92Aj8NItVFYFtBN4olqvdUh5yXDkvf2TW0QAPQJvQ==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.23.0",
+        "classnames": "2.x",
+        "component-classes": "1.x",
+        "dom-scroll-into-view": "1.x",
+        "prop-types": "^15.5.8",
+        "rc-animate": "2.x",
+        "rc-menu": "^5.0.11",
+        "rc-trigger": "1.x",
+        "rc-util": "^4.0.4",
+        "warning": "^3.0.0"
+      }
+    },
+    "rc-slider": {
+      "version": "8.3.5",
+      "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-8.3.5.tgz",
+      "integrity": "sha512-zg2fa8WOH101eMCsTShUKFPJ/t74B0m1gE4Icb+gjQ//viX/HrWdF03yiSaXHrgIyXu7go0+uaKgVFXv4r/jHA==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "classnames": "^2.2.5",
+        "prop-types": "^15.5.4",
+        "rc-tooltip": "^3.4.3",
+        "rc-util": "^4.0.4",
+        "shallowequal": "^1.0.1",
+        "warning": "^3.0.0"
+      }
+    },
+    "rc-steps": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-2.5.2.tgz",
+      "integrity": "sha512-FsKpogxMaF2GYX3G9pn0pwTm9XTS+fAge/7F9uN0sDRPULUODBaUtlVUAOrDXIFOcIxxeku2UWBA6WfUvmcfTw==",
+      "dev": true,
+      "requires": {
+        "classnames": "^2.2.3",
+        "lodash.debounce": "^4.0.8",
+        "prop-types": "^15.5.7"
+      }
+    },
+    "rc-switch": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-1.5.3.tgz",
+      "integrity": "sha512-mOs6ZRgtioWt34CBrxC0nH5vJcg8cJ6RuDExN7qua3m9WYmd6NoSMgK3hXI7VDXuAsSLUGiE9MhJyIeeGcr57A==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.23.0",
+        "classnames": "^2.2.1",
+        "prop-types": "^15.5.6"
+      }
+    },
+    "rc-table": {
+      "version": "5.6.13",
+      "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-5.6.13.tgz",
+      "integrity": "sha512-gyhtFKXgj1TlWzJ2eA5nFWsjXuqb0bSZP8pyjXbXOoCvWSHRRf8CAJK9sF+8x9JJjXDVNSqsZtj+GvDpW4B4MA==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "component-classes": "^1.2.6",
+        "lodash.get": "^4.4.2",
+        "prop-types": "^15.5.8",
+        "rc-util": "4.x",
+        "shallowequal": "^0.2.2",
+        "warning": "^3.0.0"
+      },
+      "dependencies": {
+        "shallowequal": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-0.2.2.tgz",
+          "integrity": "sha1-HjL9W8q2rWiKSBLLDMBO/HXHAU4=",
+          "dev": true,
+          "requires": {
+            "lodash.keys": "^3.1.2"
+          }
+        }
+      }
+    },
+    "rc-tabs": {
+      "version": "9.1.11",
+      "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-9.1.11.tgz",
+      "integrity": "sha512-pepWb6YYqvskWyXxc2klJR6GH4//4rSEFAttIJaRuZn++uSf3k5nOSPvO0x0qGOoX+Dz8P8DIcnoZQADvYcr7g==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "classnames": "2.x",
+        "create-react-class": "15.x",
+        "lodash.debounce": "^4.0.8",
+        "prop-types": "15.x",
+        "rc-hammerjs": "~0.6.0",
+        "rc-util": "^4.0.4",
+        "warning": "^3.0.0"
+      }
+    },
+    "rc-time-picker": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/rc-time-picker/-/rc-time-picker-2.4.1.tgz",
+      "integrity": "sha1-B049EgjogO2w2Zp7nMFbk1BdqMY=",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "classnames": "2.x",
+        "moment": "2.x",
+        "prop-types": "^15.5.8",
+        "rc-trigger": "1.x"
+      }
+    },
+    "rc-tooltip": {
+      "version": "3.4.9",
+      "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-3.4.9.tgz",
+      "integrity": "sha512-D9VFsy+0sB6s3zZ/DSTI+AJB106mOrRVTw3IXwF1mMhjHaCvEO+CGzHcTfyj9k6tY+5c4E+fd+r2g4DnkjgSNg==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "prop-types": "^15.5.8",
+        "rc-trigger": "1.x"
+      }
+    },
+    "rc-touchable": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/rc-touchable/-/rc-touchable-1.3.2.tgz",
+      "integrity": "sha512-zuUZj7jvtaHFUf80r9BUZLjmlZCnKVK29pP7IPtPPVfEk6b+fMsUuMyU4ICog+VSkdnfrpuo+LveQg7/hLSSsg==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x"
+      }
+    },
+    "rc-tree": {
+      "version": "1.7.12",
+      "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-1.7.12.tgz",
+      "integrity": "sha512-xT9s+lsUyhCz63vLd8V6l1am7OYtunbS+SUPuzmhXgB2T3C2Km1syBtZRJ18rj5bn+zPkuy90CWp5GutAV3L6Q==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.23.0",
+        "classnames": "2.x",
+        "prop-types": "^15.5.8",
+        "rc-animate": "2.x",
+        "rc-util": "^4.0.4",
+        "warning": "^3.0.0"
+      }
+    },
+    "rc-tree-select": {
+      "version": "1.10.13",
+      "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-1.10.13.tgz",
+      "integrity": "sha512-OqyuN3WvizIaH0aa07FBK0BPWQOqm67A2Xv1gzqsHIXaLAs5yO1EEtx3UncfCDLyk6Uk/h580pepNp4Cby/i5Q==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "^6.23.0",
+        "classnames": "^2.2.1",
+        "object-assign": "^4.0.1",
+        "prop-types": "^15.5.8",
+        "rc-animate": "^2.0.2",
+        "rc-tree": "~1.7.1",
+        "rc-trigger": "1.x",
+        "rc-util": "^4.0.2"
+      }
+    },
+    "rc-trigger": {
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-1.11.5.tgz",
+      "integrity": "sha512-MBuUPw1nFzA4K7jQOwb7uvFaZFjXGd00EofUYiZ+l/fgKVq8wnLC0lkv36kwqM7vfKyftRo2sh7cWVpdPuNnnw==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "create-react-class": "15.x",
+        "prop-types": "15.x",
+        "rc-align": "2.x",
+        "rc-animate": "2.x",
+        "rc-util": "4.x"
+      }
+    },
+    "rc-upload": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-2.4.4.tgz",
+      "integrity": "sha512-EQgGSFiqZWkQ93kC997c1Uan9VgMzJvlaUQt16PrHvmHw/boUs3M/lf0GhYlmpe7YSnN0jGpMNUcENUFwDVAHA==",
+      "dev": true,
+      "requires": {
+        "babel-runtime": "6.x",
+        "classnames": "^2.2.5",
+        "prop-types": "^15.5.7",
+        "warning": "2.x"
+      },
+      "dependencies": {
+        "warning": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/warning/-/warning-2.1.0.tgz",
+          "integrity": "sha1-ISINnGOvx3qMkhEeARr3Bc4MaQE=",
+          "dev": true,
+          "requires": {
+            "loose-envify": "^1.0.0"
+          }
+        }
+      }
+    },
+    "rc-util": {
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.13.0.tgz",
+      "integrity": "sha512-rjfPy+afc2n40APHp6GYScXfgwHuUnYLz/4SCEWRaF8CHXKR8xw598LtPA36J3fEXENuMm6liO/CoKBoSrYCDw==",
+      "dev": true,
+      "requires": {
+        "add-dom-event-listener": "^1.1.0",
+        "babel-runtime": "6.x",
+        "prop-types": "^15.5.10",
+        "react-lifecycles-compat": "^3.0.4",
+        "shallowequal": "^0.2.2"
+      },
+      "dependencies": {
+        "shallowequal": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-0.2.2.tgz",
+          "integrity": "sha1-HjL9W8q2rWiKSBLLDMBO/HXHAU4=",
+          "dev": true,
+          "requires": {
+            "lodash.keys": "^3.1.2"
+          }
+        }
+      }
+    },
+    "react": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
+      "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=",
+      "requires": {
+        "create-react-class": "^15.6.0",
+        "fbjs": "^0.8.9",
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.0",
+        "prop-types": "^15.5.10"
+      }
+    },
+    "react-dev-utils": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-4.2.3.tgz",
+      "integrity": "sha512-uvmkwl5uMexCmC0GUv1XGQP0YjfYePJufGg4YYiukhqk2vN1tQxwWJIBERqhOmSi80cppZg8mZnPP/kOMf1sUQ==",
+      "requires": {
+        "address": "1.0.3",
+        "babel-code-frame": "6.26.0",
+        "chalk": "1.1.3",
+        "cross-spawn": "5.1.0",
+        "detect-port-alt": "1.1.3",
+        "escape-string-regexp": "1.0.5",
+        "filesize": "3.5.11",
+        "global-modules": "1.0.0",
+        "gzip-size": "3.0.0",
+        "inquirer": "3.3.0",
+        "is-root": "1.0.0",
+        "opn": "5.1.0",
+        "react-error-overlay": "^3.0.0",
+        "recursive-readdir": "2.2.1",
+        "shell-quote": "1.6.1",
+        "sockjs-client": "1.1.4",
+        "strip-ansi": "3.0.1",
+        "text-table": "0.2.0"
+      }
+    },
+    "react-dom": {
+      "version": "15.6.2",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz",
+      "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=",
+      "requires": {
+        "fbjs": "^0.8.9",
+        "loose-envify": "^1.1.0",
+        "object-assign": "^4.1.0",
+        "prop-types": "^15.5.10"
+      }
+    },
+    "react-error-overlay": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-3.0.0.tgz",
+      "integrity": "sha512-XzgvowFrwDo6TWcpJ/WTiarb9UI6lhA4PMzS7n1joK3sHfBBBOQHUc0U4u57D6DWO9vHv6lVSWx2Q/Ymfyv4hw=="
+    },
+    "react-is": {
+      "version": "16.10.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.10.2.tgz",
+      "integrity": "sha512-INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA=="
+    },
+    "react-lazy-load": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/react-lazy-load/-/react-lazy-load-3.0.13.tgz",
+      "integrity": "sha1-OwqS0zbUPT8Nc8vm81sXBQsIuCQ=",
+      "dev": true,
+      "requires": {
+        "eventlistener": "0.0.1",
+        "lodash.debounce": "^4.0.0",
+        "lodash.throttle": "^4.0.0",
+        "prop-types": "^15.5.8"
+      }
+    },
+    "react-lifecycles-compat": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
+      "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==",
+      "dev": true
+    },
+    "react-redux": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.1.2.tgz",
+      "integrity": "sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q==",
+      "dev": true,
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "hoist-non-react-statics": "^3.3.0",
+        "invariant": "^2.2.4",
+        "loose-envify": "^1.1.0",
+        "prop-types": "^15.6.1",
+        "react-is": "^16.6.0",
+        "react-lifecycles-compat": "^3.0.0"
+      },
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz",
+          "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==",
+          "dev": true,
+          "requires": {
+            "react-is": "^16.7.0"
+          }
+        }
+      }
+    },
+    "react-router": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz",
+      "integrity": "sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==",
+      "dev": true,
+      "requires": {
+        "history": "^4.7.2",
+        "hoist-non-react-statics": "^2.5.0",
+        "invariant": "^2.2.4",
+        "loose-envify": "^1.3.1",
+        "path-to-regexp": "^1.7.0",
+        "prop-types": "^15.6.1",
+        "warning": "^4.0.1"
+      },
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "2.5.5",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
+          "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==",
+          "dev": true
+        },
+        "warning": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+          "dev": true,
+          "requires": {
+            "loose-envify": "^1.0.0"
+          }
+        }
+      }
+    },
+    "react-router-dom": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.3.1.tgz",
+      "integrity": "sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==",
+      "dev": true,
+      "requires": {
+        "history": "^4.7.2",
+        "invariant": "^2.2.4",
+        "loose-envify": "^1.3.1",
+        "prop-types": "^15.6.1",
+        "react-router": "^4.3.1",
+        "warning": "^4.0.1"
+      },
+      "dependencies": {
+        "warning": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+          "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+          "dev": true,
+          "requires": {
+            "loose-envify": "^1.0.0"
+          }
+        }
+      }
+    },
+    "react-slick": {
+      "version": "0.15.4",
+      "resolved": "https://registry.npmjs.org/react-slick/-/react-slick-0.15.4.tgz",
+      "integrity": "sha512-RXKA8V6NmpTz6Ngo3XB5dg4GrGwDln89j5uG9Z4NXOedlVCzfG3LcHBVC5Pqs411Arbcp8nlzcg39g+rT6OPHw==",
+      "dev": true,
+      "requires": {
+        "can-use-dom": "^0.1.0",
+        "classnames": "^2.2.5",
+        "create-react-class": "^15.5.2",
+        "enquire.js": "^2.1.6",
+        "json2mq": "^0.2.0",
+        "object-assign": "^4.1.0",
+        "slick-carousel": "^1.6.0"
+      }
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
+      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "requires": {
+        "load-json-file": "^1.0.0",
+        "normalize-package-data": "^2.3.2",
+        "path-type": "^1.0.0"
+      }
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
+      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "requires": {
+        "find-up": "^1.0.0",
+        "read-pkg": "^1.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
+          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "requires": {
+            "path-exists": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "path-exists": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+          "requires": {
+            "pinkie-promise": "^2.0.0"
+          }
+        }
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "readdirp": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "micromatch": "^3.1.10",
+        "readable-stream": "^2.0.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="
+        },
+        "array-unique": {
+          "version": "0.3.2",
+          "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+          "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="
+        },
+        "braces": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+          "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.1",
+            "snapdragon-node": "^2.0.1",
+            "split-string": "^3.0.2",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "expand-brackets": {
+          "version": "2.1.4",
+          "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+          "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+          "requires": {
+            "debug": "^2.3.3",
+            "define-property": "^0.2.5",
+            "extend-shallow": "^2.0.1",
+            "posix-character-classes": "^0.1.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "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=",
+              "requires": {
+                "is-descriptor": "^0.1.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            },
+            "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=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "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=",
+              "requires": {
+                "kind-of": "^3.0.2"
+              },
+              "dependencies": {
+                "kind-of": {
+                  "version": "3.2.2",
+                  "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+                  "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+                  "requires": {
+                    "is-buffer": "^1.1.5"
+                  }
+                }
+              }
+            },
+            "is-descriptor": {
+              "version": "0.1.6",
+              "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+              "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+              "requires": {
+                "is-accessor-descriptor": "^0.1.6",
+                "is-data-descriptor": "^0.1.4",
+                "kind-of": "^5.0.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=="
+            }
+          }
+        },
+        "extglob": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+          "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+          "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.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.1"
+          },
+          "dependencies": {
+            "define-property": {
+              "version": "1.0.0",
+              "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+              "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+              "requires": {
+                "is-descriptor": "^1.0.0"
+              }
+            },
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.0"
+              }
+            }
+          }
+        },
+        "fill-range": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-number": "^3.0.0",
+            "repeat-string": "^1.6.1",
+            "to-regex-range": "^2.1.0"
+          },
+          "dependencies": {
+            "extend-shallow": {
+              "version": "2.0.1",
+              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+              "requires": {
+                "is-extendable": "^0.1.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==",
+          "requires": {
+            "kind-of": "^6.0.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==",
+          "requires": {
+            "kind-of": "^6.0.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==",
+          "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=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          },
+          "dependencies": {
+            "kind-of": {
+              "version": "3.2.2",
+              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+              "requires": {
+                "is-buffer": "^1.1.5"
+              }
+            }
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        },
+        "micromatch": {
+          "version": "3.1.10",
+          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+          "requires": {
+            "arr-diff": "^4.0.0",
+            "array-unique": "^0.3.2",
+            "braces": "^2.3.1",
+            "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.9",
+            "object.pick": "^1.3.0",
+            "regex-not": "^1.0.0",
+            "snapdragon": "^0.8.1",
+            "to-regex": "^3.0.2"
+          }
+        }
+      }
+    },
+    "recursive-readdir": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.1.tgz",
+      "integrity": "sha1-kO8jHQd4xc4JPJpI105cVCLROpk=",
+      "requires": {
+        "minimatch": "3.0.3"
+      },
+      "dependencies": {
+        "minimatch": {
+          "version": "3.0.3",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz",
+          "integrity": "sha1-Kk5AkLlrLbBqnX3wEFWmKnfJt3Q=",
+          "requires": {
+            "brace-expansion": "^1.0.0"
+          }
+        }
+      }
+    },
+    "redent": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
+      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "requires": {
+        "indent-string": "^2.1.0",
+        "strip-indent": "^1.0.1"
+      }
+    },
+    "reduce-css-calc": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz",
+      "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=",
+      "requires": {
+        "balanced-match": "^0.4.2",
+        "math-expression-evaluator": "^1.2.14",
+        "reduce-function-call": "^1.0.1"
+      },
+      "dependencies": {
+        "balanced-match": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+          "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg="
+        }
+      }
+    },
+    "reduce-function-call": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.3.tgz",
+      "integrity": "sha512-Hl/tuV2VDgWgCSEeWMLwxLZqX7OK59eU1guxXsRKTAyeYimivsKdtcV4fu3r710tpG5GmDKDhQ0HSZLExnNmyQ==",
+      "requires": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "redux": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz",
+      "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==",
+      "dev": true,
+      "requires": {
+        "lodash": "^4.2.1",
+        "lodash-es": "^4.2.1",
+        "loose-envify": "^1.1.0",
+        "symbol-observable": "^1.0.3"
+      }
+    },
+    "regenerate": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+      "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="
+    },
+    "regenerator-runtime": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+    },
+    "regenerator-transform": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
+      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+      "requires": {
+        "babel-runtime": "^6.18.0",
+        "babel-types": "^6.19.0",
+        "private": "^0.1.6"
+      }
+    },
+    "regex-cache": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "requires": {
+        "is-equal-shallow": "^0.1.3"
+      }
+    },
+    "regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "requires": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "regexp-clone": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz",
+      "integrity": "sha1-p8LgmJH9vzj7sQ03b7cwA+aKxYk=",
+      "dev": true
+    },
+    "regexp.prototype.flags": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz",
+      "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==",
+      "requires": {
+        "define-properties": "^1.1.2"
+      }
+    },
+    "regexpu-core": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
+      "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
+      "requires": {
+        "regenerate": "^1.2.1",
+        "regjsgen": "^0.2.0",
+        "regjsparser": "^0.1.4"
+      }
+    },
+    "registry-auth-token": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+      "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
+      "requires": {
+        "rc": "^1.1.6",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "registry-url": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
+      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
+      "requires": {
+        "rc": "^1.0.1"
+      }
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+      "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc="
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
+      "requires": {
+        "jsesc": "~0.5.0"
+      },
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0="
+        }
+      }
+    },
+    "relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk="
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8="
+    },
+    "renderkid": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
+      "integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
+      "requires": {
+        "css-select": "^1.1.0",
+        "dom-converter": "^0.2",
+        "htmlparser2": "^3.3.0",
+        "strip-ansi": "^3.0.0",
+        "utila": "^0.4.0"
+      }
+    },
+    "repeat-element": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
+      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
+      "requires": {
+        "is-finite": "^1.0.0"
+      }
+    },
+    "request": {
+      "version": "2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.0",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.4.3",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.4.1",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+        },
+        "tough-cookie": {
+          "version": "2.4.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+          "requires": {
+            "psl": "^1.1.24",
+            "punycode": "^1.4.1"
+          }
+        }
+      }
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+    },
+    "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="
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE="
+    },
+    "require-uncached": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+      "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
+      "requires": {
+        "caller-path": "^0.1.0",
+        "resolve-from": "^1.0.0"
+      }
+    },
+    "require_optional": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
+      "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
+      "dev": true,
+      "requires": {
+        "resolve-from": "^2.0.0",
+        "semver": "^5.1.0"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
+          "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=",
+          "dev": true
+        }
+      }
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
+    },
+    "resolve": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+      "requires": {
+        "path-parse": "^1.0.6"
+      }
+    },
+    "resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+      "requires": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      }
+    },
+    "resolve-from": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
+      "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY="
+    },
+    "resolve-pathname": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
+      "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==",
+      "dev": true
+    },
+    "resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
+    },
+    "restore-cursor": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "requires": {
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz",
+      "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
+      "requires": {
+        "align-text": "^0.1.1"
+      }
+    },
+    "rimraf": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "ripemd160": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+      "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+      "requires": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1"
+      }
+    },
+    "run-async": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "requires": {
+        "is-promise": "^2.1.0"
+      }
+    },
+    "rx-lite": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
+      "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="
+    },
+    "rx-lite-aggregates": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz",
+      "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=",
+      "requires": {
+        "rx-lite": "*"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "requires": {
+        "ret": "~0.1.10"
+      }
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+    },
+    "sane": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-1.6.0.tgz",
+      "integrity": "sha1-lhDEUjB6E10pwf3+JUcDQYDEZ3U=",
+      "requires": {
+        "anymatch": "^1.3.0",
+        "exec-sh": "^0.2.0",
+        "fb-watchman": "^1.8.0",
+        "minimatch": "^3.0.2",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5",
+        "watch": "~0.10.0"
+      },
+      "dependencies": {
+        "bser": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/bser/-/bser-1.0.2.tgz",
+          "integrity": "sha1-OBEWlwsqbe6lZG3RXdcnhES1YWk=",
+          "requires": {
+            "node-int64": "^0.4.0"
+          }
+        },
+        "fb-watchman": {
+          "version": "1.9.2",
+          "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-1.9.2.tgz",
+          "integrity": "sha1-okz0eCf4LTj7Waaa1wt247auc4M=",
+          "requires": {
+            "bser": "1.0.2"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
+      }
+    },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+    },
+    "schema-utils": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz",
+      "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=",
+      "requires": {
+        "ajv": "^5.0.0"
+      }
+    },
+    "select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo="
+    },
+    "selfsigned": {
+      "version": "1.10.7",
+      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
+      "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
+      "requires": {
+        "node-forge": "0.9.0"
+      }
+    },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+    },
+    "semver-diff": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
+      "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
+      "requires": {
+        "semver": "^5.0.3"
+      }
+    },
+    "send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+      "requires": {
+        "debug": "2.6.9",
+        "depd": "~1.1.2",
+        "destroy": "~1.0.4",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "~1.7.2",
+        "mime": "1.6.0",
+        "ms": "2.1.1",
+        "on-finished": "~2.3.0",
+        "range-parser": "~1.2.1",
+        "statuses": "~1.5.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+        }
+      }
+    },
+    "serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+      "requires": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "dependencies": {
+        "http-errors": {
+          "version": "1.6.3",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+          "requires": {
+            "depd": "~1.1.2",
+            "inherits": "2.0.3",
+            "setprototypeof": "1.1.0",
+            "statuses": ">= 1.4.0 < 2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        },
+        "setprototypeof": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+        }
+      }
+    },
+    "serve-static": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+      "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+      "requires": {
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "parseurl": "~1.3.3",
+        "send": "0.17.1"
+      }
+    },
+    "serviceworker-cache-polyfill": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz",
+      "integrity": "sha1-3hnuc77yGrPAdAo3sz22JGS6ves="
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc="
+    },
+    "set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "requires": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        }
+      }
+    },
+    "setimmediate": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+    },
+    "setprototypeof": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
+    },
+    "sha.js": {
+      "version": "2.4.11",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+      "requires": {
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "shallow-equal": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.0.tgz",
+      "integrity": "sha512-Z21pVxR4cXsfwpMKMhCEIO1PCi5sp7KEp+CmOpBQ+E8GpHwKOw2sEzk7sgblM3d/j4z4gakoWEoPcjK0VJQogA==",
+      "dev": true
+    },
+    "shallowequal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
+      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==",
+      "dev": true
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
+    "shell-quote": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
+      "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
+      "requires": {
+        "array-filter": "~0.0.0",
+        "array-map": "~0.0.0",
+        "array-reduce": "~0.0.0",
+        "jsonify": "~0.0.0"
+      }
+    },
+    "shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
+    },
+    "slash": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU="
+    },
+    "slice-ansi": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
+      "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0"
+      }
+    },
+    "sliced": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
+      "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E=",
+      "dev": true
+    },
+    "slick-carousel": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/slick-carousel/-/slick-carousel-1.8.1.tgz",
+      "integrity": "sha512-XB9Ftrf2EEKfzoQXt3Nitrt/IPbT+f1fgqBdoxO3W/+JYvtEOW6EgxnWfr9GH6nmULv7Y2tPmEX3koxThVmebA==",
+      "dev": true
+    },
+    "snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "requires": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "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=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        },
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
+      }
+    },
+    "snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "requires": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "dependencies": {
+        "define-property": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "requires": {
+            "is-descriptor": "^1.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==",
+          "requires": {
+            "kind-of": "^6.0.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==",
+          "requires": {
+            "kind-of": "^6.0.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==",
+          "requires": {
+            "is-accessor-descriptor": "^1.0.0",
+            "is-data-descriptor": "^1.0.0",
+            "kind-of": "^6.0.2"
+          }
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
+        }
+      }
+    },
+    "snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "requires": {
+        "kind-of": "^3.2.0"
+      }
+    },
+    "sockjs": {
+      "version": "0.3.18",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz",
+      "integrity": "sha1-2bKJMWyn33dZXvKZ4HXw+TfrQgc=",
+      "requires": {
+        "faye-websocket": "^0.10.0",
+        "uuid": "^2.0.2"
+      },
+      "dependencies": {
+        "faye-websocket": {
+          "version": "0.10.0",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+          "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+          "requires": {
+            "websocket-driver": ">=0.5.1"
+          }
+        },
+        "uuid": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+          "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho="
+        }
+      }
+    },
+    "sockjs-client": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz",
+      "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=",
+      "requires": {
+        "debug": "^2.6.6",
+        "eventsource": "0.1.6",
+        "faye-websocket": "~0.11.0",
+        "inherits": "^2.0.1",
+        "json3": "^3.3.2",
+        "url-parse": "^1.1.8"
+      }
+    },
+    "sort-keys": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+      "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+      "requires": {
+        "is-plain-obj": "^1.0.0"
+      }
+    },
+    "source-list-map": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz",
+      "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY="
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+    },
+    "source-map-resolve": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "requires": {
+        "atob": "^2.1.1",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "source-map-support": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz",
+      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
+      "requires": {
+        "source-map": "^0.5.6"
+      },
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
+      }
+    },
+    "source-map-url": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
+    },
+    "spdx-correct": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "requires": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-exceptions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
+    },
+    "spdx-expression-parse": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "requires": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "spdx-license-ids": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="
+    },
+    "spdy": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz",
+      "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=",
+      "requires": {
+        "debug": "^2.6.8",
+        "handle-thing": "^1.2.5",
+        "http-deceiver": "^1.2.7",
+        "safe-buffer": "^5.0.1",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^2.0.18"
+      }
+    },
+    "spdy-transport": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.1.tgz",
+      "integrity": "sha512-q7D8c148escoB3Z7ySCASadkegMmUZW8Wb/Q1u0/XBgDKMO880rLQDj8Twiew/tYi7ghemKUi/whSYOwE17f5Q==",
+      "requires": {
+        "debug": "^2.6.8",
+        "detect-node": "^2.0.3",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.1",
+        "readable-stream": "^2.2.9",
+        "safe-buffer": "^5.0.1",
+        "wbuf": "^1.7.2"
+      }
+    },
+    "split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "requires": {
+        "extend-shallow": "^3.0.0"
+      }
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
+    "static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "requires": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "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=",
+          "requires": {
+            "is-descriptor": "^0.1.0"
+          }
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
+    },
+    "stream-browserify": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+      "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+      "requires": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "stream-http": {
+      "version": "2.8.3",
+      "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+      "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+      "requires": {
+        "builtin-status-codes": "^3.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.3.6",
+        "to-arraybuffer": "^1.0.0",
+        "xtend": "^4.0.0"
+      }
+    },
+    "strict-uri-encode": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+      "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
+    },
+    "string-convert": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz",
+      "integrity": "sha1-aYLMMEn7tM2F+LJFaLnZvznu/5c=",
+      "dev": true
+    },
+    "string-length": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
+      "integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w=",
+      "requires": {
+        "strip-ansi": "^3.0.0"
+      }
+    },
+    "string-width": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+      "requires": {
+        "is-fullwidth-code-point": "^2.0.0",
+        "strip-ansi": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "^3.0.0"
+          }
+        }
+      }
+    },
+    "string.prototype.trimleft": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
+      "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string.prototype.trimright": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
+      "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+      "requires": {
+        "define-properties": "^1.1.3",
+        "function-bind": "^1.1.1"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "requires": {
+        "ansi-regex": "^2.0.0"
+      }
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
+      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
+      "requires": {
+        "is-utf8": "^0.2.0"
+      }
+    },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
+      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
+      "requires": {
+        "get-stdin": "^4.0.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+    },
+    "style-loader": {
+      "version": "0.18.2",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.18.2.tgz",
+      "integrity": "sha512-WPpJPZGUxWYHWIUMNNOYqql7zh85zGmr84FdTVWq52WTIkqlW9xSxD3QYWi/T31cqn9UNSsietVEgGn2aaSCzw==",
+      "requires": {
+        "loader-utils": "^1.0.2",
+        "schema-utils": "^0.3.0"
+      }
+    },
+    "supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "requires": {
+        "has-flag": "^3.0.0"
+      }
+    },
+    "svgo": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz",
+      "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=",
+      "requires": {
+        "coa": "~1.0.1",
+        "colors": "~1.1.2",
+        "csso": "~2.3.1",
+        "js-yaml": "~3.7.0",
+        "mkdirp": "~0.5.1",
+        "sax": "~1.2.1",
+        "whet.extend": "~0.9.9"
+      },
+      "dependencies": {
+        "js-yaml": {
+          "version": "3.7.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz",
+          "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
+          "requires": {
+            "argparse": "^1.0.7",
+            "esprima": "^2.6.0"
+          }
+        }
+      }
+    },
+    "sw-precache": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/sw-precache/-/sw-precache-5.2.1.tgz",
+      "integrity": "sha512-8FAy+BP/FXE+ILfiVTt+GQJ6UEf4CVHD9OfhzH0JX+3zoy2uFk7Vn9EfXASOtVmmIVbL3jE/W8Z66VgPSZcMhw==",
+      "requires": {
+        "dom-urls": "^1.1.0",
+        "es6-promise": "^4.0.5",
+        "glob": "^7.1.1",
+        "lodash.defaults": "^4.2.0",
+        "lodash.template": "^4.4.0",
+        "meow": "^3.7.0",
+        "mkdirp": "^0.5.1",
+        "pretty-bytes": "^4.0.2",
+        "sw-toolbox": "^3.4.0",
+        "update-notifier": "^2.3.0"
+      }
+    },
+    "sw-precache-webpack-plugin": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/sw-precache-webpack-plugin/-/sw-precache-webpack-plugin-0.11.4.tgz",
+      "integrity": "sha1-ppUBflTu1XVVFJOlGdwdqNotxeA=",
+      "requires": {
+        "del": "^2.2.2",
+        "sw-precache": "^5.1.1",
+        "uglify-js": "^3.0.13"
+      }
+    },
+    "sw-toolbox": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/sw-toolbox/-/sw-toolbox-3.6.0.tgz",
+      "integrity": "sha1-Jt8dHHA0hljk3qKIQxkUm3sxg7U=",
+      "requires": {
+        "path-to-regexp": "^1.0.1",
+        "serviceworker-cache-polyfill": "^4.0.0"
+      }
+    },
+    "symbol-observable": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+      "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
+      "dev": true
+    },
+    "symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
+    },
+    "table": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/table/-/table-4.0.3.tgz",
+      "integrity": "sha512-S7rnFITmBH1EnyKcvxBh1LjYeQMmnZtCXSEbHcH6S0NoKit24ZuFO/T1vDcLdYsLQkM188PVVhQmzKIuThNkKg==",
+      "requires": {
+        "ajv": "^6.0.1",
+        "ajv-keywords": "^3.0.0",
+        "chalk": "^2.1.0",
+        "lodash": "^4.17.4",
+        "slice-ansi": "1.0.0",
+        "string-width": "^2.1.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+          "requires": {
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+        }
+      }
+    },
+    "tapable": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz",
+      "integrity": "sha512-2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A=="
+    },
+    "term-size": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
+      "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
+      "requires": {
+        "execa": "^0.7.0"
+      }
+    },
+    "test-exclude": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.2.3.tgz",
+      "integrity": "sha512-SYbXgY64PT+4GAL2ocI3HwPa4Q4TBKm0cwAVeKOt/Aoc0gSpNRjJX8w0pA1LMKZ3LBmd8pYBqApFNQLII9kavA==",
+      "requires": {
+        "arrify": "^1.0.1",
+        "micromatch": "^2.3.11",
+        "object-assign": "^4.1.0",
+        "read-pkg-up": "^1.0.1",
+        "require-main-filename": "^1.0.1"
+      }
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+    },
+    "throat": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-3.2.0.tgz",
+      "integrity": "sha512-/EY8VpvlqJ+sFtLPeOgc8Pl7kQVOWv0woD87KTXVHPIAE842FGT+rokxIhe8xIUP1cfgrkt0as0vDLjDiMtr8w=="
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+    },
+    "thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
+    },
+    "time-stamp": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.2.0.tgz",
+      "integrity": "sha512-zxke8goJQpBeEgD82CXABeMh0LSJcj7CXEd0OHOg45HgcofF7pxNwZm9+RknpxpDhwN4gFpySkApKfFYfRQnUA=="
+    },
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
+    },
+    "timers-browserify": {
+      "version": "2.0.11",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "requires": {
+        "setimmediate": "^1.0.4"
+      }
+    },
+    "tiny-invariant": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.6.tgz",
+      "integrity": "sha512-FOyLWWVjG+aC0UqG76V53yAWdXfH8bO6FNmyZOuUrzDzK8DI3/JRY25UD7+g49JWM1LXwymsKERB+DzI0dTEQA==",
+      "dev": true
+    },
+    "tiny-warning": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
+      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==",
+      "dev": true
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "tmpl": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
+      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE="
+    },
+    "to-arraybuffer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+      "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
+    },
+    "to-fast-properties": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
+    },
+    "to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "requires": {
+        "kind-of": "^3.0.2"
+      }
+    },
+    "to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "requires": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      }
+    },
+    "to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "requires": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+          "requires": {
+            "kind-of": "^3.0.2"
+          }
+        }
+      }
+    },
+    "toidentifier": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
+    },
+    "toposort": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz",
+      "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk="
+    },
+    "tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "requires": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      }
+    },
+    "tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o="
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
+      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM="
+    },
+    "trim-right": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
+      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+    },
+    "type": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "requires": {
+        "prelude-ls": "~1.1.2"
+      }
+    },
+    "type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
+    },
+    "ua-parser-js": {
+      "version": "0.7.20",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz",
+      "integrity": "sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw=="
+    },
+    "uglify-js": {
+      "version": "3.4.10",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
+      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
+      "requires": {
+        "commander": "~2.19.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg=="
+        }
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "optional": true
+    },
+    "uglifyjs-webpack-plugin": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
+      "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+      "requires": {
+        "source-map": "^0.5.6",
+        "uglify-js": "^2.8.29",
+        "webpack-sources": "^1.0.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+          "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk="
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+          "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
+          "requires": {
+            "center-align": "^0.1.1",
+            "right-align": "^0.1.1",
+            "wordwrap": "0.0.2"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "uglify-js": {
+          "version": "2.8.29",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz",
+          "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
+          "requires": {
+            "source-map": "~0.5.1",
+            "uglify-to-browserify": "~1.0.0",
+            "yargs": "~3.10.0"
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8="
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz",
+          "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
+          "requires": {
+            "camelcase": "^1.0.2",
+            "cliui": "^2.1.0",
+            "decamelize": "^1.0.0",
+            "window-size": "0.1.0"
+          }
+        }
+      }
+    },
+    "union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "requires": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      }
+    },
+    "uniq": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8="
+    },
+    "uniqs": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz",
+      "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI="
+    },
+    "unique-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+      "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
+      "requires": {
+        "crypto-random-string": "^1.0.0"
+      }
+    },
+    "universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
+    },
+    "unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "requires": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "dependencies": {
+        "has-value": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+          "requires": {
+            "get-value": "^2.0.3",
+            "has-values": "^0.1.4",
+            "isobject": "^2.0.0"
+          },
+          "dependencies": {
+            "isobject": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+              "requires": {
+                "isarray": "1.0.0"
+              }
+            }
+          }
+        },
+        "has-values": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E="
+        },
+        "isobject": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+          "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
+        }
+      }
+    },
+    "unzip-response": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c="
+    },
+    "upath": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="
+    },
+    "update-notifier": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+      "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
+      "requires": {
+        "boxen": "^1.2.1",
+        "chalk": "^2.0.1",
+        "configstore": "^3.0.0",
+        "import-lazy": "^2.1.0",
+        "is-ci": "^1.0.10",
+        "is-installed-globally": "^0.1.0",
+        "is-npm": "^1.0.0",
+        "latest-version": "^3.0.0",
+        "semver-diff": "^2.0.0",
+        "xdg-basedir": "^3.0.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        }
+      }
+    },
+    "upper-case": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
+      "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg="
+    },
+    "uri-js": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+      "requires": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "urijs": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.1.tgz",
+      "integrity": "sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg=="
+    },
+    "urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
+    },
+    "url": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+      "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+      "requires": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      },
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+          "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
+        }
+      }
+    },
+    "url-loader": {
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz",
+      "integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==",
+      "requires": {
+        "loader-utils": "^1.0.2",
+        "mime": "1.3.x"
+      }
+    },
+    "url-parse": {
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "requires": {
+        "prepend-http": "^1.0.1"
+      }
+    },
+    "use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
+    },
+    "util": {
+      "version": "0.11.1",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+      "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+      "requires": {
+        "inherits": "2.0.3"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw="
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
+    },
+    "uuid": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "requires": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "value-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
+      "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==",
+      "dev": true
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
+    },
+    "vendors": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz",
+      "integrity": "sha512-fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw=="
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "vm-browserify": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
+      "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="
+    },
+    "walker": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "requires": {
+        "makeerror": "1.0.x"
+      }
+    },
+    "warning": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
+      "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
+      "dev": true,
+      "requires": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "watch": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/watch/-/watch-0.10.0.tgz",
+      "integrity": "sha1-d3mLLaD5kQ1ZXxrOWwwiWFIfIdw="
+    },
+    "watchpack": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "requires": {
+        "chokidar": "^2.0.2",
+        "graceful-fs": "^4.1.2",
+        "neo-async": "^2.5.0"
+      }
+    },
+    "wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "requires": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
+    "webidl-conversions": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="
+    },
+    "webpack": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.5.1.tgz",
+      "integrity": "sha1-t0nuPStaEY2tU+jkFYWz9x51SZo=",
+      "requires": {
+        "acorn": "^5.0.0",
+        "acorn-dynamic-import": "^2.0.0",
+        "ajv": "^5.1.5",
+        "ajv-keywords": "^2.0.0",
+        "async": "^2.1.2",
+        "enhanced-resolve": "^3.4.0",
+        "escope": "^3.6.0",
+        "interpret": "^1.0.0",
+        "json-loader": "^0.5.4",
+        "json5": "^0.5.1",
+        "loader-runner": "^2.3.0",
+        "loader-utils": "^1.1.0",
+        "memory-fs": "~0.4.1",
+        "mkdirp": "~0.5.0",
+        "node-libs-browser": "^2.0.0",
+        "source-map": "^0.5.3",
+        "supports-color": "^4.2.1",
+        "tapable": "^0.2.7",
+        "uglifyjs-webpack-plugin": "^0.4.6",
+        "watchpack": "^1.4.0",
+        "webpack-sources": "^1.0.1",
+        "yargs": "^8.0.2"
+      },
+      "dependencies": {
+        "ajv-keywords": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+          "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I="
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+        },
+        "has-flag": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
+          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE="
+        },
+        "load-json-file": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "parse-json": "^2.2.0",
+            "pify": "^2.0.0",
+            "strip-bom": "^3.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
+          "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+          "requires": {
+            "execa": "^0.7.0",
+            "lcid": "^1.0.0",
+            "mem": "^1.1.0"
+          }
+        },
+        "path-type": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+          "requires": {
+            "pify": "^2.0.0"
+          }
+        },
+        "read-pkg": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+          "requires": {
+            "load-json-file": "^2.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^2.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^2.0.0"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        },
+        "strip-bom": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+        },
+        "supports-color": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
+          "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
+          "requires": {
+            "has-flag": "^2.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
+        },
+        "yargs": {
+          "version": "8.0.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
+          "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=",
+          "requires": {
+            "camelcase": "^4.1.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^2.0.0",
+            "read-pkg-up": "^2.0.0",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^2.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^7.0.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz",
+          "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=",
+          "requires": {
+            "camelcase": "^4.1.0"
+          }
+        }
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz",
+      "integrity": "sha512-FCrqPy1yy/sN6U/SaEZcHKRXGlqU0DUaEBL45jkUYoB8foVb6wCnbIJ1HKIx+qUFTW+3JpVcCJCxZ8VATL4e+A==",
+      "requires": {
+        "memory-fs": "~0.4.1",
+        "mime": "^1.5.0",
+        "path-is-absolute": "^1.0.0",
+        "range-parser": "^1.0.3",
+        "time-stamp": "^2.0.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+        }
+      }
+    },
+    "webpack-dev-server": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.7.1.tgz",
+      "integrity": "sha1-IVgPWgjNBlxxFEz29hw0W8pZqLg=",
+      "requires": {
+        "ansi-html": "0.0.7",
+        "bonjour": "^3.5.0",
+        "chokidar": "^1.6.0",
+        "compression": "^1.5.2",
+        "connect-history-api-fallback": "^1.3.0",
+        "del": "^3.0.0",
+        "express": "^4.13.3",
+        "html-entities": "^1.2.0",
+        "http-proxy-middleware": "~0.17.4",
+        "internal-ip": "^1.2.0",
+        "ip": "^1.1.5",
+        "loglevel": "^1.4.1",
+        "opn": "4.0.2",
+        "portfinder": "^1.0.9",
+        "selfsigned": "^1.9.1",
+        "serve-index": "^1.7.2",
+        "sockjs": "0.3.18",
+        "sockjs-client": "1.1.4",
+        "spdy": "^3.4.1",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^3.1.1",
+        "webpack-dev-middleware": "^1.11.0",
+        "yargs": "^6.0.0"
+      },
+      "dependencies": {
+        "chokidar": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+          "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+          "requires": {
+            "anymatch": "^1.3.0",
+            "async-each": "^1.0.0",
+            "fsevents": "^1.0.0",
+            "glob-parent": "^2.0.0",
+            "inherits": "^2.0.1",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^2.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.0.0"
+          }
+        },
+        "del": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+          "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+          "requires": {
+            "globby": "^6.1.0",
+            "is-path-cwd": "^1.0.0",
+            "is-path-in-cwd": "^1.0.0",
+            "p-map": "^1.1.1",
+            "pify": "^3.0.0",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "requires": {
+            "array-union": "^1.0.1",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+            }
+          }
+        },
+        "has-flag": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
+          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo="
+        },
+        "http-proxy-middleware": {
+          "version": "0.17.4",
+          "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz",
+          "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=",
+          "requires": {
+            "http-proxy": "^1.16.2",
+            "is-glob": "^3.1.0",
+            "lodash": "^4.17.2",
+            "micromatch": "^2.3.11"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "is-extglob": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+          "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "opn": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz",
+          "integrity": "sha1-erwi5kTf9jsKltWrfyeQwPAavJU=",
+          "requires": {
+            "object-assign": "^4.0.1",
+            "pinkie-promise": "^2.0.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY="
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "3.2.3",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
+          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
+          "requires": {
+            "has-flag": "^1.0.0"
+          }
+        },
+        "yargs": {
+          "version": "6.6.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
+          "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=",
+          "requires": {
+            "camelcase": "^3.0.0",
+            "cliui": "^3.2.0",
+            "decamelize": "^1.1.1",
+            "get-caller-file": "^1.0.1",
+            "os-locale": "^1.4.0",
+            "read-pkg-up": "^1.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^1.0.1",
+            "set-blocking": "^2.0.0",
+            "string-width": "^1.0.2",
+            "which-module": "^1.0.0",
+            "y18n": "^3.2.1",
+            "yargs-parser": "^4.2.0"
+          }
+        },
+        "yargs-parser": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
+          "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=",
+          "requires": {
+            "camelcase": "^3.0.0"
+          }
+        }
+      }
+    },
+    "webpack-hot-middleware": {
+      "version": "2.25.0",
+      "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.25.0.tgz",
+      "integrity": "sha512-xs5dPOrGPCzuRXNi8F6rwhawWvQQkeli5Ro48PRuQh8pYPCPmNnltP9itiUPT4xI8oW+y0m59lyyeQk54s5VgA==",
+      "dev": true,
+      "requires": {
+        "ansi-html": "0.0.7",
+        "html-entities": "^1.2.0",
+        "querystring": "^0.2.0",
+        "strip-ansi": "^3.0.0"
+      }
+    },
+    "webpack-manifest-plugin": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-1.2.1.tgz",
+      "integrity": "sha512-9oLMhGlez5JSRv0dWCoxGHHdrYWrDJa8gIHeMFVuY8Fp4noQebXyFlE3fFE/BCYC4C1rG3RyEBPz0aWq1dtYDw==",
+      "requires": {
+        "fs-extra": "^0.30.0",
+        "lodash": ">=3.5 <5"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "0.30.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+          "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^2.1.0",
+            "klaw": "^1.0.0",
+            "path-is-absolute": "^1.0.0",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "jsonfile": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+          "requires": {
+            "graceful-fs": "^4.1.6"
+          }
+        }
+      }
+    },
+    "webpack-sources": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+      "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+      "requires": {
+        "source-list-map": "^2.0.0",
+        "source-map": "~0.6.1"
+      },
+      "dependencies": {
+        "source-list-map": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+          "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
+        }
+      }
+    },
+    "websocket-driver": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
+      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
+      "requires": {
+        "http-parser-js": ">=0.4.0 <0.4.11",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      }
+    },
+    "websocket-extensions": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+      "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg=="
+    },
+    "whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "requires": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "whatwg-fetch": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz",
+      "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ="
+    },
+    "whatwg-url": {
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-4.8.0.tgz",
+      "integrity": "sha1-0pgaqRSMHgCkHFphMRZqtGg7vMA=",
+      "requires": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      },
+      "dependencies": {
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE="
+        }
+      }
+    },
+    "whet.extend": {
+      "version": "0.9.9",
+      "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz",
+      "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE="
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "which-module": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
+      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
+    },
+    "widest-line": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
+      "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
+      "requires": {
+        "string-width": "^2.1.1"
+      }
+    },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0="
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
+    },
+    "worker-farm": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+      "requires": {
+        "errno": "~0.1.7"
+      }
+    },
+    "wrap-ansi": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+      "requires": {
+        "string-width": "^1.0.1",
+        "strip-ansi": "^3.0.1"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "write": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
+      "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
+      "requires": {
+        "mkdirp": "^0.5.1"
+      }
+    },
+    "write-file-atomic": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.3.tgz",
+      "integrity": "sha512-GaETH5wwsX+GcnzhPgKcKjJ6M2Cq3/iZp1WyY/X1CSqrW+jVNM9Y7D8EC2sM4ZG/V8wZlSniJnCKWPmBYAucRQ==",
+      "requires": {
+        "graceful-fs": "^4.1.11",
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.2"
+      }
+    },
+    "xdg-basedir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz",
+      "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ="
+    },
+    "xml-name-validator": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz",
+      "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU="
+    },
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+    },
+    "y18n": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
+      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE="
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+    },
+    "yargs": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
+      "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
+      "requires": {
+        "camelcase": "^3.0.0",
+        "cliui": "^3.2.0",
+        "decamelize": "^1.1.1",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^1.4.0",
+        "read-pkg-up": "^1.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^1.0.2",
+        "which-module": "^1.0.0",
+        "y18n": "^3.2.1",
+        "yargs-parser": "^5.0.0"
+      },
+      "dependencies": {
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        }
+      }
+    },
+    "yargs-parser": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
+      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
+      "requires": {
+        "camelcase": "^3.0.0"
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
index 837ff08..2cf8412 100644
--- a/package.json
+++ b/package.json
@@ -1,34 +1,104 @@
 {
-  "name": "demo",
-  "version": "0.0.0",
+  "name": "my-app",
+  "version": "0.1.0",
   "private": true,
-  "scripts": {
-    "start": "node ./bin/www",
-    "test": "mocha test"
-  },
   "dependencies": {
-    "body-parser": "^1.19.0",
-    "chai": "^4.2.0",
-    "cookie-parser": "~1.4.3",
-    "debug": "~2.6.0",
-    "ejs": "~2.5.5",
-    "express": "^4.17.1",
-    "jquery": "^3.1.1",
-    "mocha": "^6.2.0",
-    "mongoose": "^4.8.6",
-    "morgan": "^1.9.1",
-    "serve-favicon": "^2.5.0"
+    "autoprefixer": "7.1.2",
+    "babel-core": "6.25.0",
+    "babel-eslint": "7.2.3",
+    "babel-jest": "20.0.3",
+    "babel-loader": "7.1.1",
+    "babel-preset-react-app": "^3.0.2",
+    "babel-runtime": "6.26.0",
+    "case-sensitive-paths-webpack-plugin": "2.1.1",
+    "chalk": "1.1.3",
+    "css-loader": "0.28.4",
+    "dotenv": "4.0.0",
+    "eslint": "4.4.1",
+    "eslint-config-react-app": "^2.0.0",
+    "eslint-loader": "1.9.0",
+    "eslint-plugin-flowtype": "2.35.0",
+    "eslint-plugin-import": "2.7.0",
+    "eslint-plugin-jsx-a11y": "5.1.1",
+    "eslint-plugin-react": "7.1.0",
+    "extract-text-webpack-plugin": "3.0.0",
+    "file-loader": "0.11.2",
+    "fs-extra": "3.0.1",
+    "html-webpack-plugin": "2.29.0",
+    "jest": "20.0.4",
+    "object-assign": "4.1.1",
+    "postcss-flexbugs-fixes": "3.2.0",
+    "postcss-loader": "2.0.6",
+    "promise": "8.0.1",
+    "react": "^15.6.1",
+    "react-dev-utils": "^4.0.1",
+    "react-dom": "^15.6.1",
+    "style-loader": "0.18.2",
+    "sw-precache-webpack-plugin": "0.11.4",
+    "url-loader": "0.5.9",
+    "webpack": "3.5.1",
+    "webpack-dev-server": "2.7.1",
+    "webpack-manifest-plugin": "1.2.1",
+    "whatwg-fetch": "2.0.3"
+  },
+  "scripts": {
+    "start": "node scripts/start.js",
+    "build": "node scripts/build.js",
+    "test": "node scripts/test.js --env=jsdom"
   },
   "devDependencies": {
-    "babel": "^6.23.0",
-    "babel-cli": "^6.23.0",
-    "babel-core": "^6.23.1",
-    "babel-loader": "^6.4.0",
-    "babel-preset-es2015": "^6.22.0",
-    "babel-preset-react": "^6.23.0",
-    "jquery": "^3.1.1",
-    "react": "^15.4.2",
-    "react-dom": "^15.4.2",
-    "webpack": "^2.2.1"
+    "antd": "^2.13.6",
+    "axios": "^0.19.0",
+    "connect-history-api-fallback": "^1.5.0",
+    "express": "^4.16.2",
+    "http-proxy-middleware": "^0.20.0",
+    "jquery": "^3.2.1",
+    "mongoose": "^4.13.6",
+    "react-redux": "^5.0.6",
+    "react-router-dom": "^4.2.2",
+    "redux": "^3.7.2",
+    "webpack-dev-middleware": "^1.12.2",
+    "webpack-hot-middleware": "^2.21.0"
+  },
+  "jest": {
+    "collectCoverageFrom": [
+      "src/**/*.{js,jsx}"
+    ],
+    "setupFiles": [
+      "<rootDir>/config/polyfills.js"
+    ],
+    "testMatch": [
+      "<rootDir>/src/**/__tests__/**/*.js?(x)",
+      "<rootDir>/src/**/?(*.)(spec|test).js?(x)"
+    ],
+    "testEnvironment": "node",
+    "testURL": "http://localhost",
+    "transform": {
+      "^.+\\.(js|jsx)$": "<rootDir>/node_modules/babel-jest",
+      "^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
+      "^(?!.*\\.(js|jsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
+    },
+    "transformIgnorePatterns": [
+      "[/\\\\]node_modules[/\\\\].+\\.(js|jsx)$"
+    ],
+    "moduleNameMapper": {
+      "^react-native$": "react-native-web"
+    },
+    "moduleFileExtensions": [
+      "web.js",
+      "js",
+      "json",
+      "web.jsx",
+      "jsx",
+      "node"
+    ]
+  },
+  "babel": {
+    "presets": [
+      "react-app"
+    ]
+  },
+  "eslintConfig": {
+    "extends": "react-app"
   }
 }
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a11777cc471a4344702741ab1c8a588998b1311a
GIT binary patch
literal 3870
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
baj7?x%VD!5Cxk2YbYLNVeiXvvpMCWYo=by@

literal 0
HcmV?d00001

diff --git a/public/images/logo.jpg b/public/images/logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..febcab912c1abae76bf8f6b1dae88279b568e24b
GIT binary patch
literal 6694
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

literal 0
HcmV?d00001

diff --git a/public/index.html b/public/index.html
new file mode 100644
index 0000000..7bee027
--- /dev/null
+++ b/public/index.html
@@ -0,0 +1,40 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="theme-color" content="#000000">
+    <!--
+      manifest.json provides metadata used when your web app is added to the
+      homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
+    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>React App</title>
+  </head>
+  <body>
+    <noscript>
+      You need to enable JavaScript to run this app.
+    </noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>
diff --git a/public/manifest.json b/public/manifest.json
new file mode 100644
index 0000000..be607e4
--- /dev/null
+++ b/public/manifest.json
@@ -0,0 +1,15 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "192x192",
+      "type": "image/png"
+    }
+  ],
+  "start_url": "./index.html",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
diff --git a/route/index.js b/route/index.js
new file mode 100644
index 0000000..deb76f1
--- /dev/null
+++ b/route/index.js
@@ -0,0 +1,16 @@
+var dept = require('./../controller/dept.js');
+var staff = require('./../controller/staff.js');
+module.exports = function (app) {
+  app.get('/check_connect',function (req,res) {
+      res.json({code:0,data:{connect_database:process.env.connect_database}});
+  });
+  app.post('/staff/list',staff.staffList);
+  app.post('/staff/add',staff.addStaff);
+  app.post('/staff/del',staff.delStaff);
+  app.post('/staff/edit',staff.editStaff)
+
+  app.post('/dept/list',dept.deptList);
+  app.post('/dept/add',dept.addDept);
+  app.post('/dept/del',dept.delDept);
+  app.post('/dept/edit',dept.editDept);
+};
\ No newline at end of file
diff --git a/schema/department.js b/schema/department.js
new file mode 100644
index 0000000..05ef790
--- /dev/null
+++ b/schema/department.js
@@ -0,0 +1,17 @@
+var mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+// 部门Schema
+const deptSchema = new Schema({
+  department_name:String,
+  leader_member_name:String,
+  leader_member_id:Number,
+  department_id:{
+    type:Number,
+    unique:true
+  },
+  department_pid:{
+    type:Number,
+    default:0
+  }
+ });
+module.exports = deptSchema;
\ No newline at end of file
diff --git a/schema/staff.js b/schema/staff.js
new file mode 100644
index 0000000..2c35e70
--- /dev/null
+++ b/schema/staff.js
@@ -0,0 +1,20 @@
+var mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+// 公司职员Schema
+const articleSchema = new Schema({
+  member_name:String,
+  member_id:{
+    type:Number
+  },
+  department_id:Number,
+  work_num:[String,Number],
+  department_name:String
+  // article_name:String,
+  // article_year:{
+  //   type:Number
+  // },
+  // field_id:Number,
+  // work_num:[String,Number],
+  // author_name:String
+});
+module.exports =  articleSchema;
\ No newline at end of file
diff --git a/scripts/build.js b/scripts/build.js
new file mode 100644
index 0000000..5709f48
--- /dev/null
+++ b/scripts/build.js
@@ -0,0 +1,150 @@
+'use strict';
+
+// Do this as the first thing so that any code reading it knows the right env.
+process.env.BABEL_ENV = 'production';
+process.env.NODE_ENV = 'production';
+
+// Makes the script crash on unhandled rejections instead of silently
+// ignoring them. In the future, promise rejections that are not handled will
+// terminate the Node.js process with a non-zero exit code.
+process.on('unhandledRejection', err => {
+  throw err;
+});
+
+// Ensure environment variables are read.
+require('../config/env');
+
+const path = require('path');
+const chalk = require('chalk');
+const fs = require('fs-extra');
+const webpack = require('webpack');
+const config = require('../config/webpack.config.prod');
+const paths = require('../config/paths');
+const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
+const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
+const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
+const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
+const printBuildError = require('react-dev-utils/printBuildError');
+
+const measureFileSizesBeforeBuild =
+  FileSizeReporter.measureFileSizesBeforeBuild;
+const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild;
+const useYarn = fs.existsSync(paths.yarnLockFile);
+
+// These sizes are pretty large. We'll warn for bundles exceeding them.
+const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
+const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
+
+// Warn and crash if required files are missing
+if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
+  process.exit(1);
+}
+
+// First, read the current file sizes in build directory.
+// This lets us display how much they changed later.
+measureFileSizesBeforeBuild(paths.appBuild)
+  .then(previousFileSizes => {
+    // Remove all content but keep the directory so that
+    // if you're in it, you don't end up in Trash
+    fs.emptyDirSync(paths.appBuild);
+    // Merge with the public folder
+    copyPublicFolder();
+    // Start the webpack build
+    return build(previousFileSizes);
+  })
+  .then(
+    ({ stats, previousFileSizes, warnings }) => {
+      if (warnings.length) {
+        console.log(chalk.yellow('Compiled with warnings.\n'));
+        console.log(warnings.join('\n\n'));
+        console.log(
+          '\nSearch for the ' +
+            chalk.underline(chalk.yellow('keywords')) +
+            ' to learn more about each warning.'
+        );
+        console.log(
+          'To ignore, add ' +
+            chalk.cyan('// eslint-disable-next-line') +
+            ' to the line before.\n'
+        );
+      } else {
+        console.log(chalk.green('Compiled successfully.\n'));
+      }
+
+      console.log('File sizes after gzip:\n');
+      printFileSizesAfterBuild(
+        stats,
+        previousFileSizes,
+        paths.appBuild,
+        WARN_AFTER_BUNDLE_GZIP_SIZE,
+        WARN_AFTER_CHUNK_GZIP_SIZE
+      );
+      console.log();
+
+      const appPackage = require(paths.appPackageJson);
+      const publicUrl = paths.publicUrl;
+      const publicPath = config.output.publicPath;
+      const buildFolder = path.relative(process.cwd(), paths.appBuild);
+      printHostingInstructions(
+        appPackage,
+        publicUrl,
+        publicPath,
+        buildFolder,
+        useYarn
+      );
+    },
+    err => {
+      console.log(chalk.red('Failed to compile.\n'));
+      printBuildError(err);
+      process.exit(1);
+    }
+  );
+
+// Create the production build and print the deployment instructions.
+function build(previousFileSizes) {
+  console.log('Creating an optimized production build...');
+
+  let compiler = webpack(config);
+  return new Promise((resolve, reject) => {
+    compiler.run((err, stats) => {
+      if (err) {
+        return reject(err);
+      }
+      const messages = formatWebpackMessages(stats.toJson({}, true));
+      if (messages.errors.length) {
+        // Only keep the first error. Others are often indicative
+        // of the same problem, but confuse the reader with noise.
+        if (messages.errors.length > 1) {
+          messages.errors.length = 1;
+        }
+        return reject(new Error(messages.errors.join('\n\n')));
+      }
+      if (
+        process.env.CI &&
+        (typeof process.env.CI !== 'string' ||
+          process.env.CI.toLowerCase() !== 'false') &&
+        messages.warnings.length
+      ) {
+        console.log(
+          chalk.yellow(
+            '\nTreating warnings as errors because process.env.CI = true.\n' +
+              'Most CI servers set it automatically.\n'
+          )
+        );
+        return reject(new Error(messages.warnings.join('\n\n')));
+      }
+      return resolve({
+        stats,
+        previousFileSizes,
+        warnings: messages.warnings,
+      });
+    });
+  });
+}
+
+function copyPublicFolder() {
+  fs.copySync(paths.appPublic, paths.appBuild, {
+    dereference: true,
+    filter: file => file !== paths.appHtml,
+  });
+}
diff --git a/scripts/start.js b/scripts/start.js
new file mode 100644
index 0000000..a875ad6
--- /dev/null
+++ b/scripts/start.js
@@ -0,0 +1,86 @@
+'use strict';
+
+// Do this as the first thing so that any code reading it knows the right env.
+process.env.BABEL_ENV = 'development';
+process.env.NODE_ENV = 'development';
+
+// Makes the script crash on unhandled rejections instead of silently
+// ignoring them. In the future, promise rejections that are not handled will
+// terminate the Node.js process with a non-zero exit code.
+process.on('unhandledRejection', err => {
+  throw err;
+});
+
+// Ensure environment variables are read.
+require('../config/env');
+
+const webpack = require('webpack');
+const express = require('express');
+const mongoose = require('mongoose');
+const bodyParser = require('body-parser');
+const {
+  choosePort
+} = require('react-dev-utils/WebpackDevServerUtils');
+const openBrowser = require('react-dev-utils/openBrowser');
+const config = require('../config/webpack.config.dev');
+
+const app = new express();
+const compiler = webpack(config);
+app.use(bodyParser.json()); // for parsing application/json
+app.use(bodyParser.urlencoded({ extended: true })); // for parsing application/x-www-form-urlencoded
+require('./../route/index.js')(app);
+// connect to database
+mongoose.connect('mongodb://heroku_bqszzqcw:d1fcgvmgq3astipgea67pquhm3@ds263927.mlab.com:63927/heroku_bqszzqcw')
+mongoose.connection
+    .on('open',function () {
+        process.env.connect_database = 1;
+        console.log('connection successful');
+
+    })
+    .on('error',function () {
+        process.env.connect_database = 0;
+      console.log('connection error');
+
+    });
+// Tools like Cloud9 rely on this.
+const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000;
+const HOST = process.env.HOST || '0.0.0.0';
+
+// We attempt to use the default port but if it is busy, we offer the user to
+// run on a different port. `detect()` Promise resolves to the next free port.
+choosePort(HOST, DEFAULT_PORT)
+  .then(port => {
+    if (port == null) {
+      // We have not found a port.
+      return;
+    }
+    // Create a webpack compiler that is configured with custom messages.
+
+    const devMiddleware = require('webpack-dev-middleware')(compiler, {
+      publicPath: config.output.publicPath
+    });
+    const hotMiddleware = require('webpack-hot-middleware')(compiler, {
+      log: () => {},
+      heartbeat: 2000
+    });
+    app.use(devMiddleware);
+    app.use(hotMiddleware);
+    app.use(express.static('public'));
+    const uri = 'http://localhost:' + port;
+    console.log('> Starting dev server...');
+    devMiddleware.waitUntilValid(() => {
+      console.log('> Listening at ' + uri + '\n');
+      // when env is testing, don't need open it
+      if ( process.env.NODE_ENV !== 'testing') {
+        openBrowser(uri);
+      }
+    });
+  app.listen(port)
+  })
+  .catch(err => {
+    if (err && err.message) {
+      console.log(err.message);
+    }
+    process.exit(1);
+  });
+
diff --git a/scripts/test.js b/scripts/test.js
new file mode 100644
index 0000000..399bfd3
--- /dev/null
+++ b/scripts/test.js
@@ -0,0 +1,27 @@
+'use strict';
+
+// Do this as the first thing so that any code reading it knows the right env.
+process.env.BABEL_ENV = 'test';
+process.env.NODE_ENV = 'test';
+process.env.PUBLIC_URL = '';
+
+// Makes the script crash on unhandled rejections instead of silently
+// ignoring them. In the future, promise rejections that are not handled will
+// terminate the Node.js process with a non-zero exit code.
+process.on('unhandledRejection', err => {
+  throw err;
+});
+
+// Ensure environment variables are read.
+require('../config/env');
+
+const jest = require('jest');
+const argv = process.argv.slice(2);
+
+// Watch unless on CI or in coverage mode
+if (!process.env.CI && argv.indexOf('--coverage') < 0) {
+  argv.push('--watch');
+}
+
+
+jest.run(argv);
diff --git a/src/App.css b/src/App.css
new file mode 100644
index 0000000..8b81adb
--- /dev/null
+++ b/src/App.css
@@ -0,0 +1,272 @@
+@import '~antd/dist/antd.css';
+.g-header{
+    width: 100%;
+    padding: 13px 20px;
+    border-bottom: 1px solid #ebebeb;
+}
+.g-header .link.bread{
+    color: #24c875;
+    cursor: pointer;
+}
+.g-header .bread{
+    margin: 0 5px;
+    font-size: 14px;
+    color: #8899a9;
+}
+.g-search{
+    width: 200px;
+}
+.g-filter-letter{
+    position: relative;
+}
+.g-filter-letter .list{
+    position: absolute;
+    width: 400px;
+    top:35px;
+    left: 0;
+    background: #ffffff;
+    padding: 5px 10px;
+    border-radius: 4px;
+    box-shadow: 0 0 4px #e1e1e1;
+}
+.g-filter-letter li{
+    cursor: pointer;
+    font-size: 14px;
+    padding: 5px 8px;
+    border-radius: 2px;
+}
+.g-filter-letter li.active{
+    background: #19be6b;
+    color: #ffffff;
+}
+.g-filter-letter li:hover{
+    background: #f3f3f3;
+}
+.g-navActive{
+    color: #19be6b !important;
+}
+.g-navActive{
+    background: #f6f6f6 !important;
+}
+.g-breadcrumd{
+    height: 50px;
+    line-height: 50px;
+    border-bottom: 1px solid #cadeee;
+    padding-left: 20px;
+    font-size: 13px;
+}
+.g-breadcrumd a{
+    color: #19be6b;
+}
+.g-breadcrumd .separator{
+    margin: 0 5px;
+}
+.g-from{
+    font-size: 14px;
+}
+.g-from .result-p{
+    display: inline-block;
+    padding: 5px 10px;
+    border-radius: 10px;
+    background-color: #a6cccc;
+    margin: 5px;
+    cursor: pointer;
+}
+.g-from .result-p:hover{
+    background-color: #98d7c7;
+}
+.g-from tr{
+    padding-bottom: 20px;
+}
+.g-from .in-star{
+    font-size: 14px;
+    color: #ff6533;
+}
+.g-from .in-h{
+    color: #8899a9;
+    padding-right: 40px;
+    text-align: right;
+}
+.g-from td{
+    height: 48px;
+}
+.g-from label{
+    margin-right: 20px;
+}
+.g-from input{
+    border: none;
+    border-bottom: 1px solid #8899a9;
+}
+.g-from input.small{
+    width: 50px;
+    text-align: center;
+}
+.g-from button:focus{
+    outline: none;
+}
+.g-from .input{
+    width: 256px;
+    height: 35px;
+    padding-left: .5em;
+    border: none;
+    border-bottom: 1px solid #e9e9e9;
+    margin-bottom: 10px;
+}
+.g-from .input:focus{
+    border-bottom: 1px solid #24c875;
+}
+.g-from .cancel{
+    border: 1px solid #8899a9;
+    color: #8899a9;
+    background: #ffffff;
+    border-radius: 4px;
+    padding: 5px 10px;
+    font-size: 12px;
+    cursor: pointer;
+}
+.g-from .submit{
+    border: none;
+    color: #ffffff;
+    background: #24c875;
+    border-radius: 4px;
+    padding: 5px 10px;
+    font-size: 12px;
+    cursor: pointer;
+}
+.g-top-col{
+     border-bottom: 1px solid #cadeee;
+    padding: 10px 0 10px 20px;
+}
+.g-list-warp .g-list-header{
+    border: 1px solid #b7c8d0;
+    border-bottom: none;
+    line-height: 50px;
+    height: 50px;
+    padding-left: 20px;
+    font-size: 14px;
+    color: #333333;
+    border-radius: 4px 4px 0 0;
+}
+.g-list-warp .g-list-table-head{
+    border: 1px solid #b7c8d0;
+    border-style: none solid none solid;
+}
+.g-list-warp .g-list-table-main{
+    border: 1px solid #b7c8d0;
+    border-top: none;
+    overflow-y: auto;
+    border-radius: 0 0 4px 4px;
+}
+.g-list-warp .g-list-table{
+    border-collapse: collapse;
+    width: 100%;
+}
+.g-list-warp  td{
+    height: 48px;
+    color: #8899a9;
+    font-size: 14px;
+}
+.g-list-warp thead{
+    background: #f2f5f9;
+}
+.g-list-warp thead td{
+    color: #333333;
+    font-size: 14px;
+}
+.g-list-warp tbody td{
+    border-bottom: 1px solid #e9eaec;
+}
+.g-list-warp tbody .action{
+    cursor: pointer;
+    font-size: 14px;
+    color: #24c875;
+    margin-right: 15px;
+}
+.g-list-warp tbody tr:hover{
+    background-color: #defef5;
+}
+.g-list-warp td{
+    padding: 0 20px;
+}
+.g-empty{
+    padding-top: 200px;
+    text-align: center;
+}
+.g-empty .word{
+    font-size: 14px;
+    margin-top: 20px;
+    color: #b8e0c8;
+}
+.ant-tabs-bar{
+    margin: 20px 0 16px 20px;
+}
+.ant-btn-primary{
+    background: #24c875;
+    border: none;
+}
+.ant-btn-primary:hover,
+.ant-btn-primary:focus{
+    background: #24c875;
+    border: none;
+}
+.ant-btn-default:hover,
+.ant-btn-default:focus{
+    color: #555;
+    border: 1px solid #8899a9;
+}
+.ant-modal-header{
+    border-bottom: none;
+}
+.ant-modal-footer{
+    border-top: none;
+}
+.ant-modal-footer .ant-btn{
+    border: none;
+    color: #8899a9;
+}
+.ant-modal-footer .ant-btn-primary{
+    background: transparent;
+    color: #24c875;
+}
+.ant-modal-title{
+    font-size: 14px;
+    font-weight: bold;
+    color: #444;
+}
+.g-filter-depts{
+    outline: none;
+}
+.g-filter-depts .ant-select-selection{
+    border-style: none none solid none;
+    border-radius: 0;
+    box-shadow: none;
+}
+.g-filter-depts .name{
+    font-size: 14px;
+}
+.g-popup-sure .title{
+    color: #333;
+    font-size: 14px;
+}
+.g-popup-sure .info{
+    font-size: 14px;
+    color: #8899a9;
+    margin-top: 8px;
+}
+.f-di{
+    display: inline-block;
+}
+.f-fr{
+    float: right;
+}
+.f-fl{
+    float: left;
+}
+.f-clearFix:after{
+    content: '';
+    display: block;
+    clear: both;
+    overflow: hidden;
+    height: 0;
+    visibility: hidden;
+}
diff --git a/src/App.js b/src/App.js
new file mode 100644
index 0000000..80d1661
--- /dev/null
+++ b/src/App.js
@@ -0,0 +1,30 @@
+import React, { Component } from 'react';
+import {Route,Switch} from 'react-router-dom'
+import Layout from './components/layout.js'
+import './App.css';
+import './css/leftNav.css'
+import Menu from './components/menu.js'
+import Main from './components/content.js'
+import Warn from './pages/warn/index.js'
+export default class  extends Component {
+    componentDidMount(){
+        this.$http.get('/check_connect').then((res) => {
+            const resData = res.data;
+            if(resData.code + '' === '0'){
+                if(!(resData.data.connect_database * 1)){
+                    this.props.history.push('/warn')
+                }
+            }
+        });
+    }
+    render(){
+        return (
+               <Switch>
+                    <Route path="/warn" component={Warn}/>
+                    <Route path="/" render={(props) => {
+                        return <Layout type={2} left={<Menu {...props}/>} right={<Main {...props}/>}/>
+                    }}/>
+                </Switch>
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/App.test.js b/src/App.test.js
new file mode 100644
index 0000000..b84af98
--- /dev/null
+++ b/src/App.test.js
@@ -0,0 +1,8 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import App from './App';
+
+it('renders without crashing', () => {
+  const div = document.createElement('div');
+  ReactDOM.render(<App />, div);
+});
diff --git a/src/components/container/baseDataTree.js b/src/components/container/baseDataTree.js
new file mode 100644
index 0000000..fad78ed
--- /dev/null
+++ b/src/components/container/baseDataTree.js
@@ -0,0 +1,117 @@
+import React,{Component} from 'react';
+import {connect} from 'react-redux';
+import {Icon} from 'antd';
+import GHeaderImg from './../g-headerImg.js'
+class Person extends Component{
+    render(){
+        const {data,type} = this.props;
+        let key = type==='dept'?'department_id':'member_id'
+
+        return <li>
+            <input type="checkbox" checked={this.props.checked(data[key])} onChange={() => this.props.changeChecked(data)}/>
+            {type !== 'dept'?<GHeaderImg {...data} style={{height:'30px',width:'30px'}}/>:null}
+            <span>{type !== 'dept'?data.member_name:data.department_name}</span>
+        </li>
+    }
+}
+class BaseDataTree extends Component{
+    constructor(props){
+        super(props);
+        this.verifyChecked = this.verifyChecked.bind(this);
+        this.changeChecked = this.changeChecked.bind(this);
+    }
+    changeChecked(data){
+        let filed;
+        if(this.props.type !== 'dept'){
+            filed = 'member_id';
+        }  else {
+            filed = 'department_id';
+        }
+        const id = data[filed];
+        const len = this.props.selectedData.length;
+        let index = -1;
+        for(let i = 0;i<len;i++){
+            const cur = this.props.selectedData[i];
+            if(id === cur[filed]){
+                index = i;
+                break;
+            }
+        }
+        if(index > -1){
+            const data = [...this.props.selectedData];
+            data.splice(index,1);
+            this.props.changeSelectedData(data);
+        } else {
+            this.props.changeSelectedData([...this.props.selectedData,data]);
+        }
+    }
+    verifyChecked(id){
+        const ids = this.props.selectedData.map(data => {
+            if(this.props.type !== 'dept') return data.member_id;
+            else return data.department_id
+        });
+        return ids.some(curId => id *1 === curId * 1);
+    }
+    render(){
+        const props = this.props;
+        return (
+            <div className={'m-baseTree '+ (props.className ? props.className:'')} style={props.style?this.props.style:{}}>
+                {props.type === 'staff' || props.keyword || props.letter?
+                    <ul>
+                        {props.staff.map((data,index) => {
+                            return <Person type={props.type}  data={data} index={index} key={index} checked={this.verifyChecked} changeChecked={this.changeChecked}/>
+                        })}
+                    </ul>
+                    :null
+                }
+                {props.type === 'dept'?
+                    <ul>
+                        {props.dept.map((data,index) => {
+                            return <Person type={props.type} data={data} index={index} key={index} checked={this.verifyChecked} changeChecked={this.changeChecked}/>
+                        })}
+                    </ul>
+                    :null
+                }
+                {props.type === 'dept_and_staff' && !props.keyword && !props.letter?
+                    props.dept.map(data => {
+                        if(data.dept_pid === props.pid){
+                            return <div key={data.dept_id} style={{paddingLeft:5*this.props.level + 'px'}}>
+                                <span>
+                                    <Icon type="caret-right" />
+                                    {data.dept_name}
+                                </span>
+                                <ul >
+                                {props.staff.map(staff => {
+                                    if(staff.dept_id === data.dept_id){
+                                        return <Person data={staff}  key={staff.member_id} checked={this.verifyChecked} changeChecked={this.changeChecked}/>
+                                    } else return null
+                                })}
+                                </ul>
+                                <BaseDataTree {...props} type="dept_and_staff"  pid={data.dept_id} level={this.props.level+1}/>
+                            </div>
+                        }
+                    })
+                    :null
+                }
+            </div>
+        )
+    }
+}
+BaseDataTree.defaultProps = {
+    pid:-1,
+    level:0
+}
+function getStaff(staffs,keyword,letter) {
+    return staffs.filter(staff => {
+        if(!keyword && !letter) return true;
+        else if(letter && !keyword) return [staff.member_name,staff.letter].join(',').indexOf(letter) >= 0;
+        else if(!letter && keyword) return [staff.member_name,staff.letter].join(',').indexOf(keyword) >= 0;
+        else return [staff.member_name,staff.letter].join(',').indexOf(keyword) >= 0 && [staff.member_name,staff.letter].join(',').indexOf(letter) >= 0
+    })
+}
+export default connect((state,ownProps) => {
+    return {
+        staff:getStaff(state.baseData.staff,ownProps.keyword,ownProps.letter),
+        dept:state.baseData.dept
+    }
+})(BaseDataTree)
\ No newline at end of file
diff --git a/src/components/content.js b/src/components/content.js
new file mode 100644
index 0000000..b922ccf
--- /dev/null
+++ b/src/components/content.js
@@ -0,0 +1,21 @@
+import React, { Component } from 'react';
+import {Route,Switch} from 'react-router-dom'
+import Attendence from './../pages/attendence/index.js'
+import Holiday from './../pages/holiday/index.js'
+import Att from './../pages/att/index.js';
+import Department from './../pages/department/index.js';
+import Member from './../pages/member/index.js';
+export default class  extends Component{
+    render(){
+        return <div>
+            <Switch>
+                <Route path='/attendence' component={Attendence}/>
+                <Route path='/holiday' component={Holiday}/>
+                <Route path='/att' component={Att}/>
+                <Route path='/department' component={Department}/>
+                <Route path='/member' component={Member}/>
+                <Route component={Attendence}/>
+            </Switch>
+        </div>
+    }
+}
\ No newline at end of file
diff --git a/src/components/g-breadcrumb.js b/src/components/g-breadcrumb.js
new file mode 100644
index 0000000..242b71d
--- /dev/null
+++ b/src/components/g-breadcrumb.js
@@ -0,0 +1,26 @@
+import React ,{Component} from 'react';
+import {Link} from 'react-router-dom';
+class Breadcrumb extends Component {
+    render(){
+        const len = this.props.breadcrumbs.length;
+        const bread = this.props.breadcrumbs.map((item,index) => {
+            if(index < len -1){
+                return <li key={index} className='f-fl'>
+                    <Link className='link' to={`${item.link}`}>{item.label}</Link>
+                    <span className='separator'>{this.props.separator}</span>
+                </li>
+            }
+            return <li key={index} className='f-fl last'>{item.label}</li>
+        });
+        return (
+            <ul className='g-breadcrumd f-clearFix'>
+                {bread}
+            </ul>
+        )
+    }
+}
+Breadcrumb.defaultProps = {
+    breadcrumbs:[],
+    separator:'>'
+};
+export default Breadcrumb;
\ No newline at end of file
diff --git a/src/components/g-filter-dept.js b/src/components/g-filter-dept.js
new file mode 100644
index 0000000..0b1c86d
--- /dev/null
+++ b/src/components/g-filter-dept.js
@@ -0,0 +1,36 @@
+import React,{Component} from 'react';
+import {connect} from 'react-redux';
+import {Select} from 'antd';
+const Option = Select.Option;
+class DeptOption extends Component {
+    render(){
+        return <Select style={{ width: 300 }} dropdownClassName={'filterOpt'} className='g-filter-depts' onChange={this.props.onChange}>
+            {this.props.depts.map(dept => {
+                return <Option key={JSON.stringify({department_id:dept.department_id,department_name:dept.department_name})}>
+                    <span style={{paddingLeft:dept.level * 15 + 'px'}} className='name'>{dept.department_name}</span>
+                </Option>
+            })}
+        </Select>
+    }
+}
+function getOrderDepts(depts) {
+    const orderDept = [];
+    function fn(pid,level=0) {
+        const i = level;
+        depts.forEach(dep => {
+            if(dep.department_pid * 1 === pid * 1){
+                orderDept.push({...dep,level:i});
+                if(depts.find(subDep => subDep.department_pid * 1 === dep.department_id)){
+                    fn(dep.department_id,level+1);
+                }
+            }
+        })
+    }
+    fn(0,0);
+    return orderDept;
+}
+export  default connect((state) => {
+    return {
+        depts:getOrderDepts(state.baseData.dept)
+    }
+})(DeptOption);
\ No newline at end of file
diff --git a/src/components/g-filter-letter.js b/src/components/g-filter-letter.js
new file mode 100644
index 0000000..470086e
--- /dev/null
+++ b/src/components/g-filter-letter.js
@@ -0,0 +1,63 @@
+import React ,{Component} from 'react';
+import { Button } from 'antd';
+class ItemLetter extends Component {
+    selectLetter(){
+        this.props.changeSpread();
+        this.props.selectLetter(this.props.value);
+    }
+    render(){
+        return <li className={ 'f-di ' + (this.props.active ? 'active':'')} onClick={this.selectLetter.bind(this)}>
+            {this.props.label}
+        </li>
+    }
+}
+class ListLetter extends Component {
+    createListLetter(){
+        let listLetter = [];
+        for (let i = 65;i<= 90;i++){
+            listLetter.push(String.fromCharCode(i));
+        }
+        this.listLetter = listLetter;
+    }
+    componentWillMount(){
+        this.createListLetter();
+    }
+    render(){
+        const list = this.listLetter.map((item) => {
+            return <ItemLetter key={item} label={item} value={item} active={this.props.letter === item} changeSpread={this.props.changeSpread} selectLetter={this.props.selectLetter}/>
+        });
+        return (
+            <ul className="list">
+                <ItemLetter key='all' label="全部" value='' active={this.props.letter === '' || this.props.letter === ' '} changeSpread={this.props.changeSpread} selectLetter={this.props.selectLetter}/>
+                {list}
+            </ul>
+        )
+    }
+}
+class GFilterLetter extends Component {
+    constructor(props){
+        super(props);
+        this.state = {
+            spread:false
+        }
+    }
+    changeSpread(){
+        this.setState((prevState) => {
+            return {
+                spread:!prevState.spread
+            }
+        })
+    }
+    render(){
+        return (
+            <div className="f-di g-filter-letter" style={this.props.style}>
+                <Button onClick={this.changeSpread.bind(this)}>{this.props.letter === ''?'按字母筛选':'按'+this.props.letter + '筛选'}</Button>
+                {this.state.spread && <ListLetter letter={this.props.letter} changeSpread={this.changeSpread.bind(this)} selectLetter={this.props.selectLetter}/>}
+            </div>
+        )
+    }
+}
+GFilterLetter.defaultProps = {
+    letter:''
+};
+export default GFilterLetter;
\ No newline at end of file
diff --git a/src/components/g-headerImg.js b/src/components/g-headerImg.js
new file mode 100644
index 0000000..0935449
--- /dev/null
+++ b/src/components/g-headerImg.js
@@ -0,0 +1,26 @@
+import React,{Component} from 'react';
+import './headerImg.css'
+class HeaderImg extends Component{
+    constructor(props) {
+        super(props);
+        this.color = ['rgb(32, 167, 253)', 'rgb(255, 179, 52)', 'rgb(255, 131, 54)'];
+        this.img = props.imgSrc ? props.imgSrc : props.member_name[0];
+        this.style = Object.assign({background:this.color[props.member_id%3]},{...this.props.style});
+    }
+    render(){
+        return (
+            <div className={'m-headerImg '+this.props.className} style={this.style}>
+                <div className="headerImg-inner" onClick={this.props.onClick}>
+                    <div className='inner'>
+                        {this.img}
+                    </div>
+                </div>
+            </div>
+        )
+    }
+}
+HeaderImg.defaultProps = {
+    className:'',
+    onClick:function () {}
+};
+export default HeaderImg;
\ No newline at end of file
diff --git a/src/components/g-list.js b/src/components/g-list.js
new file mode 100644
index 0000000..0b97deb
--- /dev/null
+++ b/src/components/g-list.js
@@ -0,0 +1,73 @@
+import React,{Component} from 'react'
+import { Checkbox ,Button,Icon} from 'antd';
+import '../pages/holiday/css/list.css'
+import fixHeight from './../global/fixHeight.js'
+export default class  extends Component {
+    constructor(props){
+        super(props);
+        this.selectAll = this.selectAll.bind(this);
+        this.selectedAll = '';
+    }
+    selectAll(){
+        this.props.onSelectAll(!this.selectedAll);
+    }
+    render(){
+        this.height = fixHeight({offset:this.props.offset || 0})
+        this.selectedAll = this.props.data.filter((item) => {return item.checked}).length >= this.props.data.length;
+        return <div className='holiday_list'>
+            <div className='g-list-warp'>
+                {this.props.data.length > 0?<div className='g-list-header'>
+                    {this.props.title}
+                    {this.props.data.filter((item) => {return item.checked}).length > 0 ? <Button style={{marginLeft:'20px'}} onClick={() => this.props.delHandle({},true)}>批量删除</Button>:null}
+                </div>:null}
+                {this.props.data.length > 0 ?
+                    <div className='g-list-body'>
+                        <table className='g-list-table g-list-table-head'>
+                            <thead>
+                                <tr>
+                                    {this.props.cols.map((col,index) => {
+                                       if(col.type === 'action'){
+                                           return <td key={index} width={col.width&&col.width}>Operation</td>
+                                       } else if(col.type === 'selection'){
+                                            return <td key={index} width={col.width&&col.width}><Checkbox onChange={this.selectAll} checked={this.selectedAll}/></td>
+                                       } else {
+                                            return <td key={index} width={col.width&&col.width}>{col.title}</td>
+                                       }
+                                    })}
+                                </tr>
+                            </thead>
+                        </table>
+                        <div className="g-list-table-main" style={{height:(this.height-138)+'px'}}>
+                            <table className="g-list-table">
+                                <tbody>
+                                    {this.props.data.map(item => {
+                                        return <tr key={item.id}>
+                                            {this.props.cols.map((col,index) => {
+                                                if(col.type ==='action'){
+                                                    return <td key={index} width={col.width&&col.width}>{col.render(item)}</td>
+                                                } else if(col.type === 'selection') {
+                                                    return <td key={index} width={col.width&&col.width}>
+                                                        <Checkbox onChange={() => this.props.onSelectOne({...item,...{checked:!item.checked}})} checked={item.checked}/>
+                                                    </td>
+                                                } else if(col.render){
+                                                    return <td key={index} width={col.width&&col.width}>{col.render(item)}</td>
+                                                } else {
+                                                    return <td key={index} width={col.width&&col.width}>{item[col.key+'_text']?item[col.key+'_text']:item[col.key]}</td>
+                                                }
+                                            })}
+                                        </tr>
+                                    })}
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>:
+                    <div className="g-empty">
+                        <Icon type="frown-o" style={{color:'#b8e0c8',fontSize:'50px'}}/>
+                        <p className="word">No Data</p>
+                    </div>
+                }
+
+            </div>
+        </div>
+    }
+}
\ No newline at end of file
diff --git a/src/components/g-search.js b/src/components/g-search.js
new file mode 100644
index 0000000..07713cc
--- /dev/null
+++ b/src/components/g-search.js
@@ -0,0 +1,12 @@
+import React,{Component} from 'react';
+import { Input } from 'antd';
+const Search = Input.Search;
+class GSearch extends Component{
+    render(){
+        return <Search className="g-search f-di" style={this.props.style && this.props.style} placeholder={this.props.placeholder} onSearch={this.props.search}/>
+    }
+}
+GSearch.defaultProps = {
+    placeholder:'请输入...'
+};
+export default GSearch;
\ No newline at end of file
diff --git a/src/components/g-selectData.js b/src/components/g-selectData.js
new file mode 100644
index 0000000..70e21ad
--- /dev/null
+++ b/src/components/g-selectData.js
@@ -0,0 +1,95 @@
+import React,{Component} from 'react';
+import GSearch from './g-search.js'
+import {Modal} from 'antd'
+import Tree from './container/baseDataTree.js'
+import './../css/tree.css'
+class SelectData extends Component{
+    constructor(props){
+        super(props);
+        this.searchBarVal = ['全部'];
+        this.getSearchBarVal();
+        this.state = {
+            keyword:'',
+            letter:'',
+            selectedData:[...props.selectedData]
+        };
+        this.searchByKeyword = this.searchByKeyword.bind(this);
+        this.changeSelectedData = this.changeSelectedData.bind(this);
+	this.onOk = this.onOk.bind(this);
+    }
+    getSearchBarVal(){
+        for(let i = 65;i<91;i++){
+            this.searchBarVal.push(String.fromCharCode(i))
+        }
+    }
+    searchByKeyword(keyword){
+        this.setState({
+            keyword
+        })
+    }
+
+    searchByLetter(letter){
+        this.setState({
+            letter
+        })
+    }
+    delSelectData(id){
+        let result
+        if(this.props.type !== 'dept'){
+            result = this.state.selectedData.filter((item) => item.member_id !== id);
+        } else {
+            result = this.state.selectedData.filter((item) => item.department_id !== id);
+        }
+
+        this.changeSelectedData(result);
+    }
+    onOk(){
+      if(!this.props.maxNum || this.state.selectedData.length <= this.props.maxNum){
+         this.props.onOk(this.state.selectedData);
+
+         this.props.onChangeTree(false)
+       }
+    }
+    changeSelectedData(selectedData){
+        this.setState({
+            selectedData
+        })
+    }
+    createSearchBar(){
+        return <ul className="search-bar f-clearFix">
+            {this.searchBarVal.map((val,index) => {
+                return <li key={index} className={'f-fl '+ (val === this.state.letter?'active':'')} onClick={() => this.searchByLetter(val ==='全部'?'':val)}>{val}</li>
+            })}
+        </ul>
+    }
+    render(){
+        return (
+            <Modal visible={this.props.visible} width={661} onCancel={() => this.props.onChangeTree(false)} onOk={this.onOk}>
+                <div className="g-select-warp">
+                    <div className="search_inpt">
+                        <GSearch placeholder="请输入关键字" search={this.searchByKeyword} style={{width:'100%'}}/>
+                    </div>
+                    {this.createSearchBar()}
+                    <div className="data">
+                        <div className="left-result">
+                            <Tree type={this.props.type} keyword={this.state.keyword} letter={this.state.letter} selectedData={this.state.selectedData} changeSelectedData={this.changeSelectedData}/>
+                        </div>
+                        <div className="right-result">
+                             {this.props.maxNum?<p style={{margin:'10px 0 10px 10px',color:this.state.selectedData.length > this.props.maxNum?'red':'#444'}}>
+                               最多选择{this.props.maxNum}项，已选{this.state.selectedData.length}项</p>
+                              :null}
+                            {this.state.selectedData.map(data => {
+                                return <span key={data.member_id || data.department_id} className="result" onClick={() => this.delSelectData(this.props.type === 'dept'?data.department_id:data.member_id)}>{this.props.type !== 'dept'?data.member_name:data.department_name}</span>
+                            })}
+                        </div>
+                    </div>
+                </div>
+            </Modal>
+        );
+    }
+}
+SelectData.defaultProps = {
+    type:'dept',
+    selectedData:[]
+};
+export default SelectData;
\ No newline at end of file
diff --git a/src/components/headerImg.css b/src/components/headerImg.css
new file mode 100644
index 0000000..fc4819b
--- /dev/null
+++ b/src/components/headerImg.css
@@ -0,0 +1,18 @@
+.m-headerImg{
+    display: inline-block;
+    height: 50px;
+    width: 50px;
+    color: #ffffff;
+    font-size: 20px;
+    text-align: center;
+    border-radius: 50%;
+}
+.m-headerImg .headerImg-inner{
+    display: table;
+    width: 100%;
+    height: 100%;
+}
+.m-headerImg .inner{
+    display: table-cell;
+    vertical-align: middle;
+}
\ No newline at end of file
diff --git a/src/components/layout.css b/src/components/layout.css
new file mode 100644
index 0000000..a695d1b
--- /dev/null
+++ b/src/components/layout.css
@@ -0,0 +1,20 @@
+.g-layout{
+    height: 100%;
+}
+.g-clearfix:after{
+    content: '';
+    height: 0;
+    overflow: hidden;
+    display: block;
+    clear: both;
+    visibility: hidden;
+}
+.g-layout .g-left{
+    height: 100%;
+    float: left;
+    width: 200px;
+}
+.g-layout .g-right{
+    display: table-cell;
+    width: 9999px;
+}
\ No newline at end of file
diff --git a/src/components/layout.js b/src/components/layout.js
new file mode 100644
index 0000000..cbda17f
--- /dev/null
+++ b/src/components/layout.js
@@ -0,0 +1,37 @@
+import React ,{Component} from 'react'
+import './layout.css'
+import fixHeight from './../global/fixHeight.js';
+const height = fixHeight();
+class Layout extends Component {
+    render(){
+        if(this.props.type * 1 === 2){
+            return <div className="g-layout g-clearfix" style={{height:height+'px'}}>
+                <div className="g-left" >
+                    {this.props.left ? this.props.left:'暂无内容'}
+                </div>
+                <div className="g-right">
+                    {this.props.right ? this.props.right :'暂无内容'}
+                </div>
+            </div>
+        } else if(this.props.type * 1 === 1){
+            let content;
+            if(this.props.children){
+                content = this.props.children;
+            } else if(this.props.body){
+                content = this.props.body;
+            } else {
+                content = '暂无内容'
+            }
+            return <div className="g-layout" style={{height:height+'px'}}>
+                <div className="g-content">
+                    {content}
+                </div>
+            </div>
+        }
+
+    }
+}
+Layout.defaultProps = {
+    type:1
+};
+export default Layout
\ No newline at end of file
diff --git a/src/components/menu.js b/src/components/menu.js
new file mode 100644
index 0000000..a8adb8a
--- /dev/null
+++ b/src/components/menu.js
@@ -0,0 +1,15 @@
+import React,{Component} from 'react'
+import {NavLink as Link} from 'react-router-dom'
+import './../css/menu.css'
+class Menu extends Component {
+    render(){
+        return <ul className="g-menu">
+            {/* <li className="nav"><Link to={`/attendence`} activeClassName='g-navActive' className='link'>Home</Link></li> */}
+            {/* <li className="nav"><Link to={`/holiday`} activeClassName='g-navActive' className='link'>UserSetting</Link></li> */}
+            {/* <li className="nav"><Link to={`/att`} activeClassName='g-navActive' className='link'>考勤分组</Link></li> */}
+            <li className="nav"><Link to={`/member`} activeClassName='g-navActive' className='link'>Search</Link></li>
+            <li className="nav"><Link to={`/department`} activeClassName='g-navActive' className='link'>ArticleSetting</Link></li>
+        </ul>
+    }
+}
+export default Menu;
\ No newline at end of file
diff --git a/src/css/leftNav.css b/src/css/leftNav.css
new file mode 100644
index 0000000..25207e4
--- /dev/null
+++ b/src/css/leftNav.css
@@ -0,0 +1,24 @@
+.m-leftNav{
+    height: 100%;
+    background: #e9eef1;
+    padding-top: 30px;
+    overflow: auto;
+}
+.m-leftNav .nav{
+    height: 40px;
+    line-height: 40px;
+    font-size: 14px;
+
+    cursor: pointer;
+}
+.m-leftNav .link{
+    padding-left: 1em;
+    display: block;
+    height: 100%;
+}
+.m-leftNav .nav:hover{
+    background: #f6f6f6;
+}
+.m-leftNav .nav a{
+    color: #282828;
+}
\ No newline at end of file
diff --git a/src/css/menu.css b/src/css/menu.css
new file mode 100644
index 0000000..53ac0bd
--- /dev/null
+++ b/src/css/menu.css
@@ -0,0 +1,25 @@
+.g-menu{
+    height: 100%;
+    background: #ffffff;
+    padding-top: 30px;
+    overflow: auto;
+    border-right: 1px solid #ebebeb;
+}
+.g-menu .nav{
+    height: 40px;
+    line-height: 40px;
+    font-size: 14px;
+
+    cursor: pointer;
+}
+.g-menu .link{
+    padding-left: 1em;
+    display: block;
+    height: 100%;
+}
+.g-menu .nav:hover{
+    color: #8899a9;
+}
+.g-menu .nav a{
+    color: #282828;
+}
\ No newline at end of file
diff --git a/src/css/tree.css b/src/css/tree.css
new file mode 100644
index 0000000..2e4528f
--- /dev/null
+++ b/src/css/tree.css
@@ -0,0 +1,66 @@
+.g-select-warp{
+    margin-top: 20px;
+
+}
+.g-select-warp .search-bar{
+    border: 1px solid #8899a9;
+    border-left: none;
+    border-right: none;
+    height: 30px;
+    margin:10px 0;
+}
+.g-select-warp .search-bar li{
+    width: 3.65%;
+    height: 30px;
+    line-height: 30px;
+    font-size: 12px;
+    cursor: pointer;
+    color: #8899a9;
+    text-align: center;
+}
+.g-select-warp .search-bar li:first-child{
+    width: 5%;
+}
+.g-select-warp .search-bar li.active{
+    color: #24c875;
+}
+.g-select-warp .left-result ,.g-select-warp .right-result{
+    width: 50%;
+}
+.g-select-warp .left-result ul{
+    background: #ffffff;
+    min-height: 200px;
+    padding: 1px 0 10px 10px;
+}
+.right-result .result{
+    display: inline-block;
+    padding: 5px 10px;
+    border-radius: 10px;
+    background-color: #a6cccc;
+    margin: 5px;
+    cursor: pointer;
+}
+.right-result .result:hover{
+    background-color: #98d7c7;
+}
+.g-select-warp .m-baseTree li{
+    height: 30px;
+    line-height: 30px;
+}
+.g-select-warp .m-baseTree .m-headerImg {
+    margin: 0 10px;
+}
+.g-select-warp .m-baseTree li{
+    margin-top: 10px;
+}
+.g-select-warp .m-baseTree li *{
+    font-size: 14px;
+    vertical-align: middle;
+}
+.g-select-warp .data{
+    background-color: rgba(215, 235, 251, 0.72);
+    display: flex;
+    align-items:stretch;
+    max-height: 300px;
+    overflow-y: auto;
+}
\ No newline at end of file
diff --git a/src/global/fixHeight.js b/src/global/fixHeight.js
new file mode 100644
index 0000000..a2daa5c
--- /dev/null
+++ b/src/global/fixHeight.js
@@ -0,0 +1,5 @@
+import $ from 'jquery'
+function fixHeight(config = {}) {
+    return $(window).height() - (config.offset || 0 );
+}
+export default fixHeight;
\ No newline at end of file
diff --git a/src/global/initBaseData.js b/src/global/initBaseData.js
new file mode 100644
index 0000000..fdbee0e
--- /dev/null
+++ b/src/global/initBaseData.js
@@ -0,0 +1,42 @@
+import store from './../store/index.js';
+export function updateStaff () {
+   const dispatch = store.dispatch;
+    this.$http.post('/staff/list').then(res => {
+        const resData = res.data || {};
+        if(resData.code + '' === '0'){
+            dispatch({
+                type:'getStaff',
+                data:resData.data || []
+            });
+        }
+    });
+
+}
+
+export function search (dataset) {
+    const dispatch = store.dispatch;
+    alert('2');
+     this.$http.post('/staff/list').then(res => {
+         const resData = res.data || {};
+         if(resData.code + '' === '0'){
+             dispatch({
+                 type:'getStaff',
+                 data:resData.data || []
+             });
+         }
+     });
+ 
+ }
+
+export function updateDept() {
+    const dispatch = store.dispatch;
+    this.$http.post('/dept/list').then(res => {
+        const resData = res.data || {};
+        if(resData.code + '' === '0'){
+            dispatch({
+                type:'getDept',
+                data:resData.data || []
+            });
+        }
+    })
+}
diff --git a/src/index.css b/src/index.css
new file mode 100644
index 0000000..71f0246
--- /dev/null
+++ b/src/index.css
@@ -0,0 +1,70 @@
+body {
+  margin: 0;
+  padding: 0;
+  font-family: sans-serif;
+}
+*{
+    padding: 0;
+    margin: 0;
+    box-sizing: border-box;
+    list-style: none;
+}
+input:focus{
+    outline: none;
+    padding-left: 1em;
+}
+.warp{
+    width: 400px;
+    margin: auto;
+    margin-top: 100px;
+    border: 1px solid #ebebeb;
+    box-shadow: 0 0 10px #ebebeb;
+    border-radius: 8px;
+    padding:20px;
+}
+.warp .header{
+    text-align: center;
+    color: #333;
+    font-size: 16px;
+    font-weight: normal;
+    margin-bottom: 20px;
+}
+.warp .inputBox .input{
+    height: 40px;
+    width: 360px;
+    border: 1px solid #999;
+    font-size: 14px;
+    color: #333333;
+}
+.warp .inputBox .batchDel{
+    cursor: pointer;
+    font-size: 12px;
+    margin-left: 20px;
+    color: #333333;
+}
+.warp .inputBox label{
+   color: #333333;
+    font-size: 12px;
+}
+.warp .inputBox .ctr{
+    margin-top: 10px;
+}
+.warp .info{
+    color: #999999;
+    font-size: 12px;
+}
+.warp .list li{
+    position: relative;
+    height: 40px;
+    line-height: 40px;
+    color: #555;
+    font-size: 13px;
+    border-bottom: 1px solid #ebebeb;
+}
+.warp .list li .del{
+    position: absolute;
+    right: 0;
+    color: #333333;
+    font-size: 16px;
+    cursor: pointer;
+}
diff --git a/src/index.js b/src/index.js
new file mode 100644
index 0000000..38488e3
--- /dev/null
+++ b/src/index.js
@@ -0,0 +1,21 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import axios from 'axios';
+import './index.css';
+import Router from './router/index.js'
+import registerServiceWorker from './registerServiceWorker';
+import {Provider} from 'react-redux';
+import store from './store/index.js';
+import {updateStaff,updateDept} from './global/initBaseData.js';
+if (module.hot) {
+  // 模块自己就接收更新
+  module.hot.accept();
+}
+React.Component.prototype.$http = axios;
+// 取得部门数据和员工的数据
+updateStaff.bind(React.Component.prototype)();
+updateDept.bind(React.Component.prototype)();
+ReactDOM.render(<Provider store={store}>
+    <Router />
+</Provider>, document.getElementById('root'));
+registerServiceWorker();
diff --git a/src/logo.svg b/src/logo.svg
new file mode 100644
index 0000000..6b60c10
--- /dev/null
+++ b/src/logo.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
+    <g fill="#61DAFB">
+        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
+        <circle cx="420.9" cy="296.5" r="45.7"/>
+        <path d="M520.5 78.1z"/>
+    </g>
+</svg>
diff --git a/src/pages/att/container/delGroup.js b/src/pages/att/container/delGroup.js
new file mode 100644
index 0000000..59f2691
--- /dev/null
+++ b/src/pages/att/container/delGroup.js
@@ -0,0 +1,26 @@
+/**
+ * Created by Gouuse on 2018/1/16 0016.
+ */
+import React from 'react';
+import {connect} from 'react-redux';
+import {Modal} from 'antd';
+function DelGroup(props) {
+    return <Modal visible={true} wrapClassName='g-popup-sure' closable={false} onCancel={() => props.onCancel()} onOk={() => props.del(props.data)} title='删除考勤分组'>
+        <p className="title">您是否要删除该考勤分组？</p>
+        <p className="info">删除后该组成员将会根据规则自动进入其他分组
+            规则：员工>部门>默认分组</p>
+    </Modal>
+}
+export default connect(() => {
+    return {}
+},(dispatch,props) => {
+    return {
+        del(data){
+            dispatch({
+                type:'del_att_group',
+                data:data
+            });
+            props.onCancel();
+        }
+    }
+})(DelGroup);
\ No newline at end of file
diff --git a/src/pages/att/container/groupdetail.js b/src/pages/att/container/groupdetail.js
new file mode 100644
index 0000000..ab81a71
--- /dev/null
+++ b/src/pages/att/container/groupdetail.js
@@ -0,0 +1,77 @@
+/**
+ * Created by Gouuse on 2018/1/15 0015.
+ */
+import React,{Component} from 'react';
+import {connect} from 'react-redux';
+class Detail extends Component {
+    getAttType(){
+        switch (this.props.att_type + ''){
+            case "1":
+                return <span>固定班制-每日相同班次</span>;
+            case "2":
+                return <span>固定班制-每日不同班次</span>;
+            case "3":
+                return <span>排班制</span>;
+            default:
+                return <span>未知</span>
+        }
+    }
+    getIsFlexible(){
+        if(!this.props.is_flexible){
+            return <span>不弹性</span>
+        } else {
+            return <p>上下班之前的弹性时长{this.props.ex_time}分钟，上下班之后的弹性时长{this.props.last_time}分钟</p>
+        }
+    }
+    getAttClass(){
+        const curClass = this.props.att_classes.find(item => item.id * 1 === this.props.att_class * 1 );
+        return (curClass || {}).type || '未知';
+    }
+    getMembers(){
+        if(this.props.members && this.props.members.length > 0) {
+            return this.props.members.map(member => member.member_name).join(',');
+        } else {
+            return '未加入其它分组的全体員工';
+        }
+
+    }
+    render(){
+        return <div className={"m-group-detail" + ' '+this.props.className}>
+            {this.props.showBread? <div className="g-header">
+                <span className="link bread" onClick={this.props.onChangeState}>考勤分组</span> > <span className="bread">考勤分组详情</span>
+            </div>:null}
+            <table className="g-from">
+                <tbody>
+                    <tr>
+                        <td className="in-h">分组名称</td>
+                        <td>{this.props.group_name}</td>
+                    </tr>
+                    <tr>
+                        <td className="in-h">考勤类型</td>
+                        <td>{this.getAttType()}</td>
+                    </tr>
+                    <tr>
+                        <td className="in-h">弹性</td>
+                        <td>{this.getIsFlexible()}</td>
+                    </tr>
+                    <tr>
+                        <td className="in-h">考勤班次</td>
+                        <td>{this.getAttClass()}</td>
+                    </tr>
+                    <tr>
+                        <td className="in-h">分组成员</td>
+                        <td>{this.getMembers()}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    }
+}
+Detail.defaultProps = {
+    showBread:false
+}
+export default connect((state) => {
+    return {
+        att_classes:state.att.att_class
+    }
+})(Detail)
\ No newline at end of file
diff --git a/src/pages/att/container/groupedit.js b/src/pages/att/container/groupedit.js
new file mode 100644
index 0000000..32356a1
--- /dev/null
+++ b/src/pages/att/container/groupedit.js
@@ -0,0 +1,224 @@
+import React,{Component} from 'react'
+import {connect} from 'react-redux'
+import {Select} from 'antd';
+import { Steps,Button,message } from 'antd';
+import SelectPerson from './../../../components/g-selectData.js'
+import Detail from './groupdetail.js';
+const Step = Steps.Step;
+const Option = Select.Option;
+class Edit extends Component{
+    constructor(props){
+        super(props);
+        this.state = {
+            step:0,
+            selectPerson:false,
+            fromData:this.props.fromData || {
+                group_name:'',
+                members:[],
+                att_type:1,
+                is_flexible:0,
+                // 默认值为30分钟
+                ex_time:30,
+                last_time:30,
+                att_class:2
+            }
+        };
+        this.submit = this.submit.bind(this);
+    }
+    selectPerson(boolean){
+        this.setState({selectPerson:boolean});
+    }
+    changeFromData(filed,value){
+        if(filed === 'is_flexible') {
+            this.changeFromData('ex_time',30);
+            this.changeFromData('last_time',30);
+        }
+        this.setState((prevState) => {
+            const fromData = {...prevState.fromData,[filed]:value};
+            return {
+                fromData
+            }
+        });
+    }
+    delPerson(index){
+        const person = this.state.fromData.members;
+        person.splice(index,1);
+        this.changeFromData('members',person);
+    }
+
+    verifyFromData(step){
+        const needVerifyData = {
+            0:{
+                group_name:{
+                    is_required: true,
+                    msg:'请输入考勤分组名称'
+                },
+                members:{
+                    is_required: !this.state.fromData.is_default,
+                    msg:'请选择考勤分组成员'
+                }
+            },
+            1:{
+                ex_time:{
+                    is_required: !!this.state.fromData.is_flexible,
+                    msg:'请输入上/下班时间之前的弹性时间'
+                },
+                last_time:{
+                    is_required: !!this.state.fromData.is_flexible,
+                    msg:'请输入上/下班时间之后的弹性时间'
+                }
+            }
+        }[step];
+        const verifyKey = Object.keys(needVerifyData);
+        const len = verifyKey.length;
+        for(let i = 0;i < len ;i++){
+            const curKey = verifyKey[i];
+            const is_required = needVerifyData[curKey].is_required;
+            if(is_required && (this.state.fromData[curKey] + '').length <= 0){
+                message.warning(needVerifyData[curKey].msg);
+                return false;
+            }
+        }
+        return true;
+    }
+    changeStep(flag){
+        if(flag > 0 && !this.verifyFromData(this.state.step)) return;
+        this.setState(prevState=>{
+            return {
+               step:prevState.step+flag
+            }
+        })
+    }
+    submit(){
+        this.props.submit(this.state.fromData);
+        this.props.onChangeState();
+    }
+    createHeader(){
+       const text = this.props.fromData.id?'编辑考勤分组':'新增考勤分组';
+       return <div className="g-header">
+           <span className="bread link" onClick={this.props.onChangeState}>考勤分组</span> > <span className="bread">{text}</span>
+       </div>
+    }
+    render(){
+        return (
+            <div className="m-group-edit">
+                {this.createHeader()}
+                <div className="m-step">
+                    <Steps current={this.state.step}>
+                        <Step title="分组基本信息" />
+                        <Step title="设置规则" />
+                        <Step title="提交发布" />
+                    </Steps>
+                </div>
+                <div className="m-from">
+                    <table className="g-from">
+                        {this.state.step === 0 ? <tbody>
+                            <tr>
+                                <td className="in-h">考勤分组名称<span className="in-star">*</span></td>
+                                <td style={{height:'50px'}}>
+                                    <input type="text" className="input" value={this.state.fromData.group_name} onChange={(event) => this.changeFromData('group_name',event.target.value)}/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td className="in-h">考勤分组成员<span className="in-star">*</span></td>
+                                <td style={{height:'50px'}}>
+                                    <Button className="primary" onClick={() => {this.selectPerson(true)}}>选择人员</Button>
+                                    {this.state.fromData.members.map((p,index)=> {
+                                        return <span key={p.member_id} className="result-p" onClick={() => this.delPerson(index)}>{p.member_name}</span>
+                                    })}
+                                </td>
+                            </tr>
+                            <tr>
+                                <td className="in-h">考勤类型<span className="in-star">*</span></td>
+                                <td style={{height:'100px'}}>
+                                    <label>
+                                        <input type="radio" name="att_type" checked={this.state.fromData.att_type === 1} onChange={() => this.changeFromData('att_type',1)}/>固定班制-每日相同班次 （如每个工作日09:00-18:00,工作日相同班次）
+                                    </label>
+                                    <label>
+                                        <input type="radio" name="att_type" checked={this.state.fromData.att_type === 2} onChange={() => this.changeFromData('att_type',2)}/>固定班制-每日不同班次 （如周一09:00-18:00，周二08:00-19:00，工作日有不同班次，按周循环）
+                                    </label>
+                                    <label>
+                                        <input type="radio" name="att_type" checked={this.state.fromData.att_type === 3} onChange={() => this.changeFromData('att_type',3)}/>排版制（每天的考勤时间不固定，可以灵活的设置考勤时间）
+                                    </label>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td className="in-h"></td>
+                                <td>
+                                    <Button className="cancel" onClick={this.props.onChangeState}>取消</Button>
+                                    {this.state.step > 0?<Button className="submit" style={{margin:'0 10px'}} onClick={() => this.changeStep(-1)}>上一步</Button>:null}
+                                    <Button className="submit" style={{margin:'0 10px'}} onClick={() => this.changeStep(1)}>保存并进入下一步</Button>
+                                </td>
+                            </tr>
+                        </tbody>:null}
+                        {this.state.step === 1 ? <tbody>
+                           <tr>
+                                <td className="in-h">是否弹性</td>
+                                <td style={{height:'80px'}}>
+                                    <label>
+                                        <input type="radio" name="is_flexible" checked={this.state.fromData.is_flexible === 0} onChange={() => this.changeFromData('is_flexible',0)}/>无弹性(严格按照上下班时间考勤)
+                                    </label>
+                                    <label>
+                                        <input type="radio" name="is_flexible" checked={this.state.fromData.is_flexible === 1} onChange={() => this.changeFromData('is_flexible',1)}/>部分弹性(上下班时间前后弹性一段时间)
+                                    </label>
+                                    {this.state.fromData.is_flexible === 1?
+                                        <div>
+                                            上下班之前的弹性时长<input type='text' value={this.state.fromData.ex_time} onChange={(event) => this.changeFromData('ex_time',event.target.value)} className='input small'/>分钟，
+                                            上下班之后的弹性时长<input type='text' value={this.state.fromData.last_time} onChange={(event) => this.changeFromData('last_time',event.target.value)} className='input small'/>分钟
+                                        </div>
+                                    :null}
+                                </td>
+                            </tr>
+                            <tr style={{height:'50px'}}>
+                                <td className="in-h">考勤班次<span className="in-star">*</span></td>
+                                <td>
+                                    <Select style={{ width: 300 }} defaultValue={this.state.fromData.att_class + ''} placeholder='请选择考勤班次' dropdownClassName={'filterOpt'} className='g-filter-depts' onChange={(val) => this.changeFromData('att_class',val)}>
+                                        {this.props.att_class.map(cls => {
+                                            return <Option key={cls.id}>
+                                                <span className='name'>{cls.type}</span>
+                                            </Option>
+                                        })}
+                                    </Select>
+                                </td>
+                            </tr>
+                           <tr >
+                               <td className="in-h"></td>
+                               <td>
+                                   <Button className="cancel" onClick={this.props.onChangeState}>取消</Button>
+                                   {this.state.step > 0?<Button className="submit" style={{margin:'0 10px'}} onClick={() => this.changeStep(-1)}>上一步</Button>:null}
+                                   <Button className="submit" style={{margin:'0 10px'}} onClick={() => this.changeStep(1)}>保存并进入下一步</Button>
+                               </td>
+                           </tr>
+                        </tbody>:null}
+                        {this.state.step === 2 ? <tbody>
+                            <tr>
+                                <td>
+                                    <Detail {...this.state.fromData}/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                    <Button className="cancel" onClick={this.props.onChangeState}>取消</Button>
+                                    {this.state.step > 0?<Button className="submit" style={{margin:'0 10px'}} onClick={() => this.changeStep(-1)}>上一步</Button>:null}
+                                    <Button className="submit" style={{margin:'0 10px'}} onClick={this.submit}>提交</Button>
+                                </td>
+                            </tr>
+                        </tbody> : null}
+                    </table>
+                </div>
+                {this.state.selectPerson?<SelectPerson visible={this.state.selectPerson} type="staff" selectedData={this.state.fromData.members} onChangeTree={() => this.selectPerson(false)} onOk={(data) => this.changeFromData('members',data)}/>:null}
+            </div>
+        )
+    }
+}
+export default connect((state) => {
+    return {
+        att_class:state.att.att_class
+    }
+},(dispatch) => {
+    return {
+        submit(data){
+            dispatch({type:'edit_att_group',data:data})
+        }
+    }
+})(Edit)
\ No newline at end of file
diff --git a/src/pages/att/container/grouplist.js b/src/pages/att/container/grouplist.js
new file mode 100644
index 0000000..918bd9e
--- /dev/null
+++ b/src/pages/att/container/grouplist.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import {connect} from 'react-redux';
+import GList from './../../../components/g-list.js';
+import {Button} from 'antd'
+function List(props) {
+    return <div>
+            <div className="g-header f-clearFix">
+                <Button type='primary' className='f-fr' onClick={props.onChangeState}>新增分组</Button>
+            </div>
+            <GList cols={props.cols} title={props.title} data={props.data} offset={55}/>
+        </div>
+}
+export default connect((state) => {
+    return {
+        data:state.att.att_group
+    }
+})(List)
diff --git a/src/pages/att/css/att_group.css b/src/pages/att/css/att_group.css
new file mode 100644
index 0000000..b66b4e6
--- /dev/null
+++ b/src/pages/att/css/att_group.css
@@ -0,0 +1,26 @@
+.m-group-edit .m-step{
+    padding: 20px 30px;
+    border-bottom: 1px solid #ebebeb;
+}
+.m-group-edit .m-from{
+    margin-left: 100px;
+    margin-top: 30px;
+}
+.m-group-edit .m-from label{
+    display: block;
+    margin-bottom: 10px;
+    font-size: 14px;
+    color: #757575;
+}
+.m-group-edit .m-from input[type='radio']{
+    margin-right: 20px;
+}
+.m-group-edit .m-from td{
+    vertical-align: top
+}
+.m-group-edit .m-from .select1,.m-group-edit .m-from .select3,.m-group-edit .m-from .select5{
+    display: block;
+}
+.m-att_detail-page .g-from{
+    margin: 20px 0 0 40px;
+}
\ No newline at end of file
diff --git a/src/pages/att/group.js b/src/pages/att/group.js
new file mode 100644
index 0000000..c67054f
--- /dev/null
+++ b/src/pages/att/group.js
@@ -0,0 +1,99 @@
+import React ,{Component} from 'react';
+import Edit from './container/groupedit.js';
+import List from './container/grouplist.js';
+import Detail from './container/groupdetail.js';
+import DelGroup from './container/delGroup.js';
+import './css/att_group.css'
+class Group extends Component {
+    constructor(props){
+        super(props);
+        this.state = {
+            status:'list',
+            delGroup:false
+        };
+        this.fromData = '';
+        this.changeState = this.changeState.bind(this);
+        this.changeModelState = this.changeModelState.bind(this);
+        this.cols = [
+            {
+                title:'分组名称',
+                key:'group_name',
+                width:150
+            },
+            {
+                title:'考勤类型',
+                key:'att_type',
+                width:200,
+                render:(item) => {
+                    const text = {
+                        1:'固定班制-每日相同班次',
+                        2:'固定班制-每日不同班次',
+                        3:'排班制'
+                    }[item.att_type];
+                    return <div>{text}</div>
+                }
+            },
+            {
+                title:'弹性',
+                key:'is_flexible',
+                width:100,
+                render:(item) => {
+                    const text = {
+                        0:'不弹性',
+                        1:'弹性',
+                    }[item.is_flexible];
+                    return <div>{text}</div>
+                }
+            },
+            {
+                title:'分组成员',
+                key:'members',
+                render:(item) => {
+                    if(item.members.length <= 0){
+                        return <div>未加入其它分组的全体員工</div>
+                    } else {
+                        const member_names = item.members.map(member => member.member_name).join(',');
+                        return <div>{member_names}</div>
+                    }
+                }
+            },
+            {
+                type:'action',
+                width:200,
+                render:(item) => {
+                    return <div>
+                        <span className="action" onClick={() => this.changeState('edit',() => {this.getRowData(item)})}>编辑</span>
+                        {!item.is_default?<span className="action" onClick={() => this.changeModelState(true,() => {this.getRowData(item)})}>删除</span>:null}
+                        <span className="action" onClick={() => this.changeState('detail',() => {this.getRowData(item)})}>详情</span>
+                    </div>
+                }
+            }
+        ];
+    }
+    getRowData(data=''){
+        this.fromData = data;
+    }
+    changeState(status,callback){
+        callback && callback();
+        this.setState({
+            status
+        });
+    }
+    changeModelState(flag=false,callback){
+        callback && callback();
+        this.setState({
+            delGroup:flag
+        })
+    }
+    render(){
+        return (
+            <div className="m-att-group">
+                {this.state.status === 'edit'?<Edit onChangeState={() => this.changeState('list')} fromData={this.fromData}/>:null}
+                {this.state.status === 'list'?<List cols={this.cols} title='考勤分组' onChangeState={() => this.changeState('edit',() => {this.getRowData('')})}/>:null}
+                {this.state.status === 'detail' ?<Detail {...this.fromData} showBread={true} onChangeState={() => this.changeState('list')} className='m-att_detail-page'/>:null}
+                {this.state.delGroup?<DelGroup data={this.fromData} onCancel={this.changeModelState}/>:null}
+            </div>
+        )
+    }
+}
+export default Group;
\ No newline at end of file
diff --git a/src/pages/att/index.js b/src/pages/att/index.js
new file mode 100644
index 0000000..d634375
--- /dev/null
+++ b/src/pages/att/index.js
@@ -0,0 +1,10 @@
+import React ,{Component} from 'react';
+import {Route} from 'react-router-dom'
+import Group from './group.js';
+export default class Index extends Component{
+    render(){
+        return (
+            <Route component={Group}/>
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/pages/attendence/common.js b/src/pages/attendence/common.js
new file mode 100644
index 0000000..4d97cd4
--- /dev/null
+++ b/src/pages/attendence/common.js
@@ -0,0 +1,20 @@
+import React,{Component} from 'react'
+import {Route,Switch} from 'react-router-dom'
+import List from './commonList.js'
+import Detail from './detail.js'
+export default class extends Component {
+    componentDidMount(){
+        this.props.history.push('/attendence/common/list')
+    }
+    render(){
+        return (
+            <div>
+                <Switch>
+                    <Route path='/attendence/common/list' component={List}/>
+                    <Route path='/attendence/common/detail' render={props => <Detail {...props} type='common'/>}/>
+                    <Route component={List}/>
+                </Switch>
+            </div>
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/pages/attendence/commonList.js b/src/pages/attendence/commonList.js
new file mode 100644
index 0000000..3f66fa5
--- /dev/null
+++ b/src/pages/attendence/commonList.js
@@ -0,0 +1,34 @@
+import React,{Component} from 'react';
+import Header from './components/Header.js'
+import MemberList from "./components/MemberList.js";
+class Main extends Component {
+    constructor(props){
+        super(props);
+        this.state = {
+            letter:'',
+            keyword:''
+        };
+        this.gotoDetail = this.gotoDetail.bind(this);
+    }
+    // 按字母进行筛选
+    selectLetter(letter){
+        this.setState({letter})
+    }
+    // 按关键字搜索
+    search(keyword){
+        this.setState({keyword});
+    }
+    gotoDetail(){
+        this.props.history.push('/attendence/common/detail');
+    }
+    render(){
+        return (
+            <div style={{...this.props.style}}>
+                <Header selectLetter={this.selectLetter.bind(this)} letter={this.state.letter} search={this.search.bind(this)}
+                        placeholder='请输入姓名'/>
+                <MemberList type='getCommon' filed1='attrendance' filed2='commons' url="/api/get/commonList" title="常用联系人" letter={this.state.letter} keyword={this.state.keyword} gotoDetail={this.gotoDetail}/>
+            </div>
+        )
+    }
+}
+export default Main;
\ No newline at end of file
diff --git a/src/pages/attendence/components/Header.js b/src/pages/attendence/components/Header.js
new file mode 100644
index 0000000..ca02985
--- /dev/null
+++ b/src/pages/attendence/components/Header.js
@@ -0,0 +1,15 @@
+import React,{Component} from 'react';
+import GSearch from '../../../components/g-search.js'
+import GFilterLetter from '../../../components/g-filter-letter.js'
+class Header extends Component{
+    render(){
+        return(
+            <div className="g-header">
+                <GSearch search={this.props.search} placeholder={this.props.placeholder}/>
+                <GFilterLetter style={{marginLeft:'20px'}} letter={this.props.letter} selectLetter={this.props.selectLetter}/>
+                {this.props.addContact ? this.props.addContact:null}
+            </div>
+        )
+    }
+}
+export default Header;
\ No newline at end of file
diff --git a/src/pages/attendence/components/MemberList.js b/src/pages/attendence/components/MemberList.js
new file mode 100644
index 0000000..4696870
--- /dev/null
+++ b/src/pages/attendence/components/MemberList.js
@@ -0,0 +1,36 @@
+import React ,{Component} from 'react';
+import {Icon} from 'antd';
+import List from './list.js';
+import '../list.css';
+class MemberList extends Component{
+    constructor(props){
+        super(props);
+        this.state = {
+            type:'cart',
+            showModal:false
+        };
+        this.header = this.header.bind(this);
+    }
+    header(){
+        return <div className="listHeader">
+            <span>{this.props.title}</span>
+            <div className="switch f-fr">
+                <Icon type="bars" onClick={this.switchType.bind(this,'list')} className={'icon ' + (this.state.type === 'list' ? 'active' :'')} style={{fontSize:'16px'}}/>
+                <Icon type="appstore" onClick={this.switchType.bind(this,'cart')} className={'icon ' + (this.state.type === 'cart' ? 'active' :'')} style={{fontSize:'16px'}}/>
+            </div>
+        </div>;
+    }
+    render(){
+        return <div>
+            <List filed1={this.props.filed1} filed2={this.props.filed2} letter={this.props.letter} keyword={this.props.keyword} type={this.state.type} header={this.header} delIcon={this.props.delIcon} gotoDetail={this.props.gotoDetail}/>
+        </div>
+    }
+    switchType(type){
+        this.setState({type})
+    }
+}
+MemberList.defaultProps = {
+    title:'gouuse',
+    delIcon:false
+};
+export default MemberList;
\ No newline at end of file
diff --git a/src/pages/attendence/components/leftNav.js b/src/pages/attendence/components/leftNav.js
new file mode 100644
index 0000000..851310c
--- /dev/null
+++ b/src/pages/attendence/components/leftNav.js
@@ -0,0 +1,12 @@
+import React,{Component} from 'react'
+import {NavLink as Link} from 'react-router-dom'
+class LeftNav extends Component {
+    render(){
+        return <ul className="m-leftNav">
+            <li className="nav"><Link to={`/attendence/staff`} activeClassName='g-navActive' className='link'>公司职员</Link></li>
+            <li className="nav"><Link to={`/attendence/external`} activeClassName='g-navActive' className='link'>外部联系人</Link></li>
+            <li className="nav"><Link to={`/attendence/common`} activeClassName='g-navActive' className='link'>常用联系人</Link></li>
+        </ul>
+    }
+}
+export default LeftNav;
\ No newline at end of file
diff --git a/src/pages/attendence/components/list.js b/src/pages/attendence/components/list.js
new file mode 100644
index 0000000..3e5c6a6
--- /dev/null
+++ b/src/pages/attendence/components/list.js
@@ -0,0 +1,80 @@
+import React,{Component} from 'react'
+import {Icon} from 'antd';
+import ListItem from './listItem.js';
+import fixHeight from '../../../global/fixHeight.js'
+import {connect} from 'react-redux'
+const height = fixHeight({offset:95});
+class List extends Component {
+    render(){
+        if(this.props.data.length > 0){
+            const items = this.props.data.map((item) => {
+                return <ListItem key={item.member_id} type={this.props.type} {...item} member={item} changeCur = {this.props.changeCur} delCommon={this.props.delCommon} setCommon={this.props.setCommon} addCommon={this.props.addCommon} delIcon={this.props.delIcon} del={this.props.delExter} gotoDetail={this.props.gotoDetail}/>
+            });
+            return <div className="content" style={{height:height}}>
+                {this.props.header && this.props.header()}
+                {/*列表*/}
+                <ul className="list f-clearFix">{items}</ul>
+            </div>
+        } else {
+            return <div className="g-empty">
+                <Icon type="frown-o" style={{color:'#b8e0c8',fontSize:'50px'}}/>
+                <p className="word">暂无数据</p>
+            </div>
+        }
+    }
+}
+function getData(state, ownProps) {
+    return state[ownProps.filed1][ownProps.filed2].filter((item) => {
+            let match = true;
+            if(ownProps.letter !== '' && item.letter !== ownProps.letter) match = false;
+            if(match && ownProps.keyword !== '' && item.member_name.indexOf(ownProps.keyword) < 0) match = false;
+            return match;
+        });
+}
+export default connect((state,ownProps) => {
+    return {
+        data:getData(state,ownProps)
+    }
+},(dispatch,ownProps) => {
+    return{
+        setCommon(flag,member_id){
+            dispatch({
+                type:'changeCommon',
+                flag,
+                member_id
+            })
+        },
+        addCommon(member){
+            dispatch({
+                type:'addCommon',
+                member
+            });
+            dispatch({
+                type:'exitExternal',
+                params:{...member,like:!member.like * 1}
+            })
+        },
+        delCommon(member){
+            dispatch({
+                type:'delCommon',
+                member,
+            });
+            dispatch({
+                type:'exitExternal',
+                params:{...member,like:!member.like * 1}
+            })
+        },
+        changeCur(member){
+            dispatch({
+                type:'changeCur',
+                param:member
+            })
+        },
+        delExter(member_id){
+            dispatch({
+                type:'delExternal',
+                member_id
+            })
+        }
+    }
+})(List)
\ No newline at end of file
diff --git a/src/pages/attendence/components/listItem.js b/src/pages/attendence/components/listItem.js
new file mode 100644
index 0000000..d813c24
--- /dev/null
+++ b/src/pages/attendence/components/listItem.js
@@ -0,0 +1,82 @@
+import React,{Component} from 'react'
+import HeaderImg from '../../../components/g-headerImg.js'
+import {Icon,Tooltip,Row, Col} from 'antd'
+class Heart extends Component{
+    setLike(){
+        const flag = this.props.like ? 0:1;
+        if(this.props.type !== 'getCommon')  this.props.setCommon(flag,this.props.id);
+        if(flag === 0){
+            this.props.delCommon(this.props.member);
+        } else {
+            this.props.addCommon(this.props.member);
+        }
+    }
+    render(){
+        return <Tooltip placement="bottom" title={this.props.like===1?'取消关注':'关注'}>
+            <Icon onClick={this.setLike.bind(this)} type={this.props.like===1?'heart':"heart-o"} className={'heart '+ (this.props.like ? 'like':'')} style={{ fontSize: 16 }} />
+        </Tooltip>
+    }
+}
+class Del extends Component{
+    constructor(props){
+        super(props);
+        this.handleDel = this.handleDel.bind(this);
+    }
+    handleDel(){
+        this.props.del(this.props.id);
+        this.props.delCommon({member_id:this.props.id});
+    }
+    render(){
+        return <Icon type='delete' className='del' onClick={this.handleDel}/>
+    }
+}
+class ListItem extends Component{
+    constructor(props){
+        super(props);
+        this.gotoDetail = this.gotoDetail.bind(this);
+    }
+    gotoDetail(){
+        this.props.changeCur(this.props.member);
+        this.props.gotoDetail();
+    }
+    render(){
+        let content;
+        if(this.props.type === 'cart'){
+            content = <div className="f-clearFix" style={{position:'relative'}}>
+                <HeaderImg className="f-fl headimg" {...this.props} onClick={this.gotoDetail}/>
+                <div className="f-fl" style={{marginLeft:'10px'}}>
+                    <p>
+                        <span className="name" onClick={this.gotoDetail}>{this.props.member_name}</span>
+                        <span className="tel">{this.props.phone}</span>
+                    </p>
+                    <p>
+                        {this.props.position && <span className="position">{this.props.position}</span>}
+                        {this.props.leader && <span className="leader">部门负责人</span>}
+                    </p>
+                </div>
+                <Heart type={this.props.type} like={this.props.like} member={this.props.member} addCommon={this.props.addCommon} delCommon={this.props.delCommon} id={this.props.member_id} setCommon={this.props.setCommon}/>
+                {this.props.delIcon ? <Del id={this.props.member_id} delCommon={this.props.delCommon} del={this.props.del}/>:null}
+            </div>
+        } else {
+            content = <Row className="f-clearFix listRow">
+                <Col span={8} className='col col-1' onClick={this.gotoDetail}>
+                    {this.props.member_name}
+                    {this.props.leader && <span className="leader">部门负责人</span>}
+                </Col>
+                <Col span={6} className='col'>{this.props.position}</Col>
+                <Col span={6} className='col'>{this.props.phone}</Col>
+                <Col span={4} className='col'>
+                    <Heart type={this.props.type} like={this.props.like} member={this.props.member} addCommon={this.props.addCommon} delCommon={this.props.delCommon} id={this.props.member_id} setCommon={this.props.setCommon}/>
+                    {this.props.delIcon ? <Del id={this.props.member_id} delCommon={this.props.delCommon} del={this.props.del}/>:null}
+                </Col>
+            </Row>
+        }
+        return (
+            <li className={this.props.type+"Item"}>{content}</li>
+        );
+    }
+}
+ListItem.defaultProps = {
+    type:'cart'
+};
+export default ListItem
\ No newline at end of file
diff --git a/src/pages/attendence/detail.css b/src/pages/attendence/detail.css
new file mode 100644
index 0000000..d3a9557
--- /dev/null
+++ b/src/pages/attendence/detail.css
@@ -0,0 +1,42 @@
+.m-detail{
+    font-size: 14px;
+}
+.m-detail .img{
+    width: 120px;
+    height: 120px;
+    float: left;
+    font-size: 28px;
+}
+.m-detail .add{
+    padding: 30px;
+    padding-left: 100px;
+}
+.m-detail .base{
+    padding: 30px;
+    padding-left: 100px;
+    border-bottom: 1px solid #f2f5f9;
+}
+.m-detail .word{
+    float:left;
+    margin-top: 10px;
+    margin-left: 20px;
+}
+.m-detail .word .name{
+    display: block;
+    font-size: 16px;
+    margin-bottom: 20px;
+}
+.m-detail .word p{
+    margin-bottom: 10px;
+}
+.m-detail .title{
+    font-size: 14px;
+    color: #8899a9;
+    margin-right: 10px;
+}
+.m-detail .add p{
+    margin-bottom: 10px;
+}
+.m-detail .add .title{
+    margin-right: 40px;
+}
\ No newline at end of file
diff --git a/src/pages/attendence/detail.js b/src/pages/attendence/detail.js
new file mode 100644
index 0000000..6258deb
--- /dev/null
+++ b/src/pages/attendence/detail.js
@@ -0,0 +1,111 @@
+import React,{Component} from 'react'
+import GBreadcrumb from './../../components/g-breadcrumb.js'
+import GHeaderImg from './../../components/g-headerImg.js'
+import {Button} from 'antd'
+import {connect} from 'react-redux'
+import './detail.css';
+class Detail extends Component {
+    constructor(props){
+        super(props);
+        this.breadcrumbs = {
+            'common':[
+                {
+                    link:'/common/list',
+                    label:'常用联系人'
+                },
+                {
+                    label:'常用联系人详情'
+                }
+            ],
+            'external':[
+                {
+                    link:'/external/list',
+                    label:'外部联系人'
+                },
+                {
+                    label:'外部联系人详情'
+                }
+            ],
+            'staff':[
+                {
+                    link:'/staff/list',
+                    label:'公司职员'
+                },
+                {
+                    label:'公司职员详情'
+                }
+            ]
+        };
+        this.state = {
+            btn_loading:false
+        };
+        this.del = this.del.bind(this);
+        this.edit = this.edit.bind(this);
+    }
+    del(){
+        this.props.delExter(this.props.data.member_id);
+        this.props.delCommon(this.props.data);
+        this.props.history.push('/attendence/external/list');
+    }
+    edit(){
+        this.props.history.push('/attendence/external/edit');
+    }
+    render(){
+        const {data} = this.props;
+        return (
+            <div className='m-detail'>
+                <GBreadcrumb breadcrumbs={this.breadcrumbs[this.props.type]}/>
+                {this.props.type !== 'external'?null : (
+                    <div className='g-top-col'>
+                        <Button type='default' style={{marginRight:'20px'}} loading={this.state.btn_loading} onClick={this.del}>删除</Button>
+                        <Button type='primary' loading={this.state.btn_loading} onClick={this.edit}>编辑</Button>
+                    </div>
+                )}
+                <div className='m-content'>
+                    <div className='base f-clearFix'>
+                        <GHeaderImg {...data} className='img'/>
+                        <div className='word'>
+                            <span className='name'>{data.member_name}</span>
+                            <p>
+                                <span className='title'>部门:</span>
+                                {data.dpart_name}
+                            </p>
+                            <p>
+                                <span className='title'>职位:</span>
+                                {data.position}
+                            </p>
+                        </div>
+                    </div>
+                    <div className='add'>
+                        <p>
+                            <span className='title'>电话:</span>{data.phone}
+                        </p>
+                        <p>
+                            <span className='title'>邮箱:</span>{data.email}
+                        </p>
+                    </div>
+                </div>
+            </div>
+        )
+    }
+}
+export default connect((state) => {
+    return {
+        data:state.attrendance.curMember
+    }
+},(dispatch) => {
+    return {
+        delExter(member_id) {
+            dispatch({
+                type: 'delExternal',
+                member_id
+            })
+        },
+        delCommon(member){
+            dispatch({
+                type:'delCommon',
+                member
+            })
+        },
+    }
+})(Detail)
\ No newline at end of file
diff --git a/src/pages/attendence/external.js b/src/pages/attendence/external.js
new file mode 100644
index 0000000..fd6a563
--- /dev/null
+++ b/src/pages/attendence/external.js
@@ -0,0 +1,23 @@
+import React,{Component} from 'react'
+import {Route,Switch} from 'react-router-dom'
+import List from './externalList.js'
+import Edit from './externalEdit.js'
+import Detail from './detail.js'
+export default class extends Component {
+     componentDidMount(){
+        this.props.history.push('/attendence/external/list')
+    }
+    render(){
+        return (
+            <div>
+                <Switch>
+                    <Route path='/attendence/external/list' component={List}/>
+                    <Route path='/attendence/external/edit' render={props => <Edit {...props} type='edit'/>}/>
+                    <Route path='/attendence/external/add' render={props => <Edit {...props} type='add'/>}/>
+                    <Route path='/attendence/external/detail' render={props => <Detail {...props} type='external'/>}/>
+                    <Route component={List}/>
+                </Switch>
+            </div>
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/pages/attendence/externalEdit.css b/src/pages/attendence/externalEdit.css
new file mode 100644
index 0000000..7fe4e2c
--- /dev/null
+++ b/src/pages/attendence/externalEdit.css
@@ -0,0 +1,7 @@
+.m-external-edit .m-content{
+    margin-top: 20px;
+    margin-left: 40px;
+}
+.m-external-edit .m-content .btns{
+    margin-top: 20px;
+}
\ No newline at end of file
diff --git a/src/pages/attendence/externalEdit.js b/src/pages/attendence/externalEdit.js
new file mode 100644
index 0000000..685deef
--- /dev/null
+++ b/src/pages/attendence/externalEdit.js
@@ -0,0 +1,263 @@
+import React ,{Component} from 'react';
+import GBreadcrumb from './../../components/g-breadcrumb.js'
+import {connect} from 'react-redux'
+import {message,Button} from 'antd';
+import './externalEdit.css'
+class Phone extends Component{
+    constructor(props){
+        super(props);
+        this.addPhone = this.addPhone.bind(this);
+        this.changePhone = this.changePhone.bind(this);
+        this.delPhone = this.delPhone.bind(this);
+    }
+    addPhone(){
+        const phone = this.props.phone.concat();
+        phone.push('');
+        this.props.changePhone(phone);
+    }
+    delPhone(index){
+         const phone = this.props.phone.concat();
+        phone.splice(index,1);
+        this.props.changePhone(phone);
+    }
+    changePhone(event,index){
+        const target = event.target;
+        let value = target.value;
+        value = value.replace(/[^\d]/g,'');
+        value = value.replace(/^[^1]/,'');
+        if(value.length > 11) value = value.slice(0,11);
+        const phone = this.props.phone.concat();
+        phone.splice(index,1,value);
+        this.props.changePhone(phone);
+    }
+    render(){
+        const phone = this.props.phone.map((phone,index) => {
+            if(index === 0){
+                return <tr key={index}>
+                    <td className='in-h'>手机号<span className='in-star'>*</span></td>
+                    <td>
+                        <input value={phone}  className='input' data-filed='phone' onChange={(event) => {this.changePhone(event,index)}}/>
+                        <button type='button' className='submit' onClick={this.addPhone}>增加</button>
+                    </td>
+                </tr>
+            } else {
+                return <tr key={index}>
+                    <td className='in-h'>{`手机号${index+1}`}</td>
+                    <td>
+                        <input value={phone} className='input' data-filed='phone' onChange={(event) => {this.changePhone(event,index)}}/>
+                        <button type='button' className='cancel' onClick={() => {this.delPhone(index)}}>删除</button>
+                    </td>
+                </tr>
+            }
+        });
+        return <table><tbody>{phone}</tbody></table>
+    }
+}
+class Edit extends Component {
+    constructor(props){
+        super(props);
+        const curLabel = {
+            'add':'添加外部联系人',
+            'edit':'编辑外部联系人'
+        };
+        this.breadcrumb = [
+            {
+                link:'/attendence/external/list',
+                label:'外部联系人'
+            },
+            {
+                label:curLabel[this.props.type]
+            }
+        ];
+        this.changeValue = this.changeValue.bind(this);
+        this.changePhone = this.changePhone.bind(this);
+        this.cancel = this.cancel.bind(this);
+        this.gotoList = this.gotoList.bind(this);
+        this.saveGoto = this.saveGoto.bind(this);
+        this.saveNew = this.saveNew.bind(this);
+        this.isModify = false;
+        this.state = {
+            member_name:'',
+            phone:[''],
+            dept:'',
+            position:''
+        }
+    }
+    componentDidMount(){
+        if(this.props.type === 'edit'){
+            this.setState({
+                ...this.props.data
+            })
+        }
+    }
+    changeValue(event){
+        const target = event.target;
+        const filed = target.dataset.filed;
+        this.setState({
+            [filed]:target.value
+        });
+    }
+    changePhone(phone){
+        this.setState({
+            phone:phone
+        })
+    }
+    cancel(){
+        if(this.isModify){
+            this.setState({
+                showModal:true
+            })
+        } else {
+            this.gotoList();
+        }
+    }
+    static checkFrom(data){
+        const keys = Object.keys(data);
+        for(const key of keys){
+            const item = data[key];
+            if(item.required && item.value.length < 1){
+                message.warning('请输入'+item.label);
+                return false;
+            }
+            if(!item.exp.test(item.value)){
+                message.warning(item.label + '格式不正确');
+                return false;
+            }
+        }
+        return true;
+    }
+    static clearTrim(value){
+        if(value === undefined) return;
+        if(Array.isArray(value)){
+            value = value.filter(item =>{
+                item = Edit.clearTrim(item);
+                return item.length > 0;
+            });
+            if(value.length > 0){
+                value = (value.join().replace(/\s/g,'')).split(',')
+            }
+            return value;
+        } else {
+            value = value.replace(/\s/g,'');
+        }
+        return value;
+    }
+    save(callback){
+        const msg = {
+            member_name: {
+                label:'姓名',
+                value:Edit.clearTrim(this.state.member_name),
+                exp:/.+/,
+                required:true
+            },
+            phone: {
+                label:'手机号',
+                value:Edit.clearTrim(this.state.phone),
+                exp:/^1[34578]\d{9}$/,
+                required:true
+            },
+            dept: {
+                label:'部门',
+                value:Edit.clearTrim(this.state.dept),
+                exp:/.*/,
+                required:false
+            },
+            position: {
+                label:'职位',
+                value:Edit.clearTrim(this.state.position),
+                exp:/.*/,
+                required:false
+            }
+        };
+        if (!Edit.checkFrom(msg)) return;
+        if(this.props.type === 'add'){
+            this.props.addExternal(this.state);
+        } else {
+            this.props.exitExternal(this.state);
+        }
+       callback && callback();
+    }
+    saveNew(){
+        this.save(() => {
+            this.setState({
+                member_name:'',
+                phone:[''],
+                dept:'',
+                position:''
+            })
+        });
+    }
+    saveGoto(){
+        this.save(this.gotoList);
+    }
+    gotoList(){
+        this.props.history.push('/attendence/external/list');
+    }
+    render(){
+        return (
+            <div className='m-external-edit'>
+                <GBreadcrumb breadcrumbs={this.breadcrumb}/>
+                <div className='m-content'>
+                    <table className='g-from'>
+                        <tbody>
+                            <tr>
+                                <td className='in-h'>姓名<span className='in-star'>*</span></td>
+                                <td>
+                                    <input className='input' value={this.state.member_name} data-filed='member_name' onChange={this.changeValue}/>
+                                </td>
+                            </tr>
+                            <tr>
+
+                                <td colSpan={2}>
+                                    <Phone phone={this.state.phone} changePhone={this.changePhone}/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td className='in-h'>部门</td>
+                                <td>
+                                    <input className='input' value={this.state.dept} data-filed='dept' onChange={this.changeValue}/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td className='in-h'>职位</td>
+                                <td>
+                                    <input className='input' value={this.state.position} data-filed='position' onChange={this.changeValue}/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td className='in-h'></td>
+                                <td>
+                                    <div className='btns'>
+                                        <Button type="primary" className='cancel' style={{marginRight:'20px'}} loading={this.state.btn_loading} onClick={this.cancel}>取消</Button>
+                                        <Button type="primary" className='submit' style={{marginRight:'20px'}} loading={this.state.btn_loading} onClick={this.saveGoto}>保存</Button>
+                                        {this.props.type === 'add'?<Button type="primary" className='submit' loading={this.state.btn_loading} onClick={this.saveNew}>保存并新增</Button>:null}
+                                    </div>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        )
+    }
+}
+export default connect((state) => {
+    return {
+        data:state.attrendance.curMember
+    }
+},(dispatch) => {
+   return {
+       addExternal(data){
+           dispatch({
+            type:'addExternal',
+            params:data
+           })
+       },
+       exitExternal(data){
+           dispatch({
+               type:'exitExternal',
+               params:data
+           })
+       }
+   }
+})(Edit);
\ No newline at end of file
diff --git a/src/pages/attendence/externalList.js b/src/pages/attendence/externalList.js
new file mode 100644
index 0000000..751622c
--- /dev/null
+++ b/src/pages/attendence/externalList.js
@@ -0,0 +1,40 @@
+import React,{Component} from 'react';
+import Header from './components/Header.js'
+import MemberList from "./components/MemberList.js";
+import { Button } from 'antd';
+class Main extends Component {
+    constructor(props){
+        super(props);
+        this.state = {
+            letter:'',
+            keyword:''
+        };
+        this.gotoDetail = this.gotoDetail.bind(this);
+    }
+    // 按字母进行筛选
+    selectLetter(letter){
+        this.setState({letter})
+    }
+    // 按关键字搜索
+    search(keyword){
+        this.setState({keyword});
+    }
+    addContact() {
+        const {history} = this.props;
+        history.push('/attendence/external/add')
+    }
+     gotoDetail(){
+        this.props.history.push('/attendence/external/detail');
+    }
+    render(){
+        return (
+            <div style={{...this.props.style}}>
+                <Header selectLetter={this.selectLetter.bind(this)} letter={this.state.letter} search={this.search.bind(this)}
+                        placeholder='请输入姓名'
+                        addContact={<Button style={{float:'right'}} onClick={this.addContact.bind(this)}>添加联系人</Button>}/>
+                <MemberList type='getExternal' filed1='attrendance' filed2='externals' url="/api/get/externalList" title="外部联系人" letter={this.state.letter} keyword={this.state.keyword} delIcon={true} gotoDetail={this.gotoDetail}/>
+            </div>
+        )
+    }
+}
+export default Main;
\ No newline at end of file
diff --git a/src/pages/attendence/index.js b/src/pages/attendence/index.js
new file mode 100644
index 0000000..fcf929f
--- /dev/null
+++ b/src/pages/attendence/index.js
@@ -0,0 +1,15 @@
+import React,{Component} from 'react';
+import Main from './main.js'
+import LeftNav from './components/leftNav.js'
+import Layout from '../../components/layout.js'
+class Index extends Component {
+    componentDidMount(){
+        this.props.history.push('/attendence/staff')
+    }
+    render(){
+        return (
+            <Layout type={2} left={<LeftNav {...this.props}/>} right={<Main {...this.props}/>}></Layout>
+        )
+    }
+}
+export default Index;
\ No newline at end of file
diff --git a/src/pages/attendence/list.css b/src/pages/attendence/list.css
new file mode 100644
index 0000000..561a2f3
--- /dev/null
+++ b/src/pages/attendence/list.css
@@ -0,0 +1,117 @@
+.content{
+    margin: 20px 20px 0;
+    border-radius: 4px;
+    border: 1px solid #b7c8d0;
+    overflow: auto;
+}
+.listHeader{
+    height: 50px;
+    line-height: 50px;
+    background: #f2f5f9;
+    border-radius: 4px 4px 0 0;
+    padding: 0 0 0 20px;
+    border-bottom: 1px solid #e9eef1;
+}
+.listHeader .switch{
+    height: 100%;
+}
+.listHeader .icon{
+    vertical-align: top;
+    width: 50px;
+    text-align: center;
+    height: 100%;
+    line-height: 50px;
+    cursor: pointer;
+    border-left: 1px solid #b7c8d0;
+    color: #8899a9;
+}
+.listHeader .icon.active{
+    background: #ffffff;
+    color: #25c870;
+}
+.list{
+    padding-bottom: 10px;
+}
+.list .cartItem{
+    float: left;
+    width: 280px;
+    margin: 10px 0 0 10px;
+    padding: 10px;
+    font-size: 14px;
+    border-radius: 4px;
+    border: 1px solid #dee6ea;
+    -webkit-box-shadow: 1px 1px 5px #dee6ea;
+    box-shadow: 1px 1px 5px #dee6ea;
+}
+.cartItem .headimg{
+    cursor: pointer;
+}
+.list .cartItem .name{
+    cursor: pointer;
+}
+.list .cartItem .name:hover{
+    color: #24c875;
+}
+.list .cartItem .tel{
+    margin-left: 10px;
+}
+.cartItem .leader{
+    padding: 1px;
+    color: #ffffff;
+    font-size: 12px;
+    background: #25c870;
+}
+.heart.like{
+    color: #25c870;
+}
+.heart,.del{
+    position: absolute;
+    right: 0;
+    color: #8899a9;
+    cursor: pointer;
+    height: 16px;
+    top:0;
+    bottom: 0;
+    margin: auto;
+}
+.del{
+    color: #8899a9;
+    right: 30px;
+    font-size: 16px;
+
+}
+.listRow {
+    height: 48px;
+    padding-left: 20px;
+    line-height: 48px;
+    border-bottom: 1px solid #b7c8d0;
+}
+.listRow:hover{
+    background: rgba(36, 238, 145, 0.1);
+}
+.listRow .heart{
+    right: 80px;
+}
+.listRow .col{
+    height: 100%;
+}
+.listRow .col.col-1{
+    color: #24c875;
+    cursor: pointer;
+}
+.listRow .col .leader{
+    background: #24c875;
+    color: #ffffff;
+    font-size: 12px;
+    margin-left: 5px;
+    padding: 1px 2px;
+}
+.m-empty{
+    padding-top: 200px;
+    text-align: center;
+}
+.m-empty .word{
+    font-size: 14px;
+    margin-top: 20px;
+    color: #b8e0c8;
+}
diff --git a/src/pages/attendence/main.js b/src/pages/attendence/main.js
new file mode 100644
index 0000000..af3152c
--- /dev/null
+++ b/src/pages/attendence/main.js
@@ -0,0 +1,19 @@
+import React,{Component} from 'react'
+import {Route,Switch} from 'react-router-dom'
+import Staff from './staff.js'
+import Common from './common.js'
+import External from './external.js'
+export default class extends Component{
+    render(){
+        return (
+            <div>
+                <Switch>
+                    <Route path='/attendence/staff' component={Staff}/>
+                    <Route path='/attendence/external' component={External}/>
+                    <Route path='/attendence/common' component={Common}/>
+                    <Route component={Staff}/>
+                </Switch>
+            </div>
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/pages/attendence/staff.js b/src/pages/attendence/staff.js
new file mode 100644
index 0000000..68892e2
--- /dev/null
+++ b/src/pages/attendence/staff.js
@@ -0,0 +1,20 @@
+import React,{Component} from 'react'
+import {Route,Switch} from 'react-router-dom'
+import List from './staffList.js'
+import Detail from './detail.js'
+export default class  extends Component {
+    componentDidMount(){
+        this.props.history.push('/attendence/staff/list')
+    }
+    render(){
+        return (
+            <div>
+                <Switch>
+                    <Route path='/attendence/staff/list' component={List}/>
+                    <Route path='/attendence/staff/detail' render={(props) => <Detail {...props} type='staff'/>}/>
+                    <Route component={List}/>
+                </Switch>
+            </div>
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/pages/attendence/staffList.js b/src/pages/attendence/staffList.js
new file mode 100644
index 0000000..b3d3d55
--- /dev/null
+++ b/src/pages/attendence/staffList.js
@@ -0,0 +1,35 @@
+import React,{Component} from 'react';
+import Header from './components/Header.js'
+import MemberList from "./components/MemberList.js";
+class Main extends Component {
+    constructor(props){
+        super(props);
+        this.state = {
+            letter:'',
+            keyword:''
+        };
+        this.gotoDetail = this.gotoDetail.bind(this);
+    }
+    // 按字母进行筛选
+    selectLetter(letter){
+        this.setState({letter})
+    }
+    // 按关键字搜索
+    search(keyword){
+        this.setState({keyword});
+    }
+    gotoDetail(){
+        this.props.history.push('/attendence/staff/detail');
+    }
+    render(){
+        return (
+            <div style={{...this.props.style}}>
+                <Header selectLetter={this.selectLetter.bind(this)} letter={this.state.letter} search={this.search.bind(this)}
+                        placeholder='请输入姓名'/>
+                <MemberList filed1='attrendance' filed2='staffs' type='getStaffs' url="/api/get/staffList" title="公司职员" letter={this.state.letter} keyword={this.state.keyword} gotoDetail={this.gotoDetail}/>
+            </div>
+        )
+    }
+
+}
+export default Main;
\ No newline at end of file
diff --git a/src/pages/department/deptTree.js b/src/pages/department/deptTree.js
new file mode 100644
index 0000000..34d4fd8
--- /dev/null
+++ b/src/pages/department/deptTree.js
@@ -0,0 +1,219 @@
+import React,{Component} from 'react';
+import {Icon,Dropdown,Menu,Modal,message} from 'antd';
+import {updateDept} from '../../global/initBaseData.js';
+import {connect} from 'react-redux';
+// 递归遍历出部门的树状结构
+class Dept extends Component {
+    constructor(props){
+        super(props);
+        this.state = {
+            showHandle:false,
+            changeSpread:false
+        };
+        this.action = this.action.bind(this);
+        this.changeCaretState = this.changeCaretState.bind(this);
+    }
+    getMenu(dept_id,dept_name){
+       return (
+           <Menu onClick={({key}) => this.action(key,dept_id,dept_name)}>
+               <Menu.Item key="0" >
+                   addNewField
+               </Menu.Item>
+               {dept_id > 0?<Menu.Item key="1">
+                    editField
+               </Menu.Item>:null}
+               {!this.checkChildren(dept_id)?<Menu.Item key="2">
+                   delField
+               </Menu.Item>:null}
+           </Menu>
+       )
+    }
+    // 检查部门是否有子部门
+    checkChildren(dept_id){
+        return this.props.depts.find((dept) => dept.department_pid * 1 === dept_id * 1);
+    }
+    // 修改部门是否展开的状态
+    changeCaretState(dept){
+        this.props.depts.some(cur => {
+            if(cur.department_id * 1=== dept.department_id * 1){
+                cur.spread = !cur.spread;
+                return true
+            }
+        });
+        this.setState(function (prevState) {
+            return {
+                changeSpread:!prevState.changeSpread
+            }
+        })
+    }
+    action(key,dept_id,dept_name){
+        if(key * 1 === 0){
+            this.props.changeDept(dept_id,'add')
+        } else if(key * 1 === 1){
+            this.props.changeDept(dept_id,'edit',dept_name)
+        } else {
+            this.props.changeDept(dept_id,'del');
+        }
+    }
+    render(){
+        const props = this.props;
+        return (
+            <div data-changeSpread={this.state.changeSpread}>
+                {
+                    props.depts.map(dept => {
+                        if(dept.department_pid * 1 === props.pid * 1){
+                            return <div key={dept.department_id} style={{paddingLeft:8*props.level + 'px'}}>
+                                <span className='dept_name' onClick={(event) => {event.stopPropagation();props.selectDept(dept.department_id)}}>
+                                    { this.checkChildren(dept.department_id) ? <Icon style={{color:dept.department_id === props.selected_id?'#25c870':''}} className ='arrow' type={dept.spread?'caret-down':'caret-right'} onClick={() => this.changeCaretState(dept)}/> :null}
+                                    <span style={{color:dept.department_id === props.selected_id?'#25c870':''}}>{dept.department_name}</span>
+                                    <Dropdown overlay={this.getMenu(dept.department_id,dept.department_name)} trigger={['click']} >
+                                        <Icon type="edit" className='ellipsis' style={{color:dept.department_id === props.selected_id?'#25c870':''}}/>
+                                    </Dropdown>
+                                </span>
+                                {dept.spread?<Dept selected_id={props.selected_id} pid={dept.department_id} selectDept={props.selectDept } changeDept={props.changeDept} depts={props.depts} level={props.level + 1}/>:null}
+                            </div>
+                        }
+                    })
+                }
+            </div>
+        )
+    }
+}
+
+
+
+class Tree extends Component{
+    constructor(props){
+        super(props);
+        this.modelType = '';
+        this.param = '';
+        this.state = {
+            depts:[],
+            addDeptModel:false,
+            dept_name:''
+        };
+        this.changeDept = this.changeDept.bind(this);
+        this.okAction = this.okAction.bind(this);
+        this.closeModel = this.closeModel.bind(this);
+    }
+    // 修改部门
+    changeDept(dept_id,type,dept_name=''){
+        this.modelType = type;
+        this.param = {
+            add:{
+                url:'/dept/add',
+                params:{
+                    department_pid:dept_id
+                },
+                info:{
+                    error:'部门添加失败',
+                    success:'部门添加成功'
+                },
+                title:'新增子部门'
+            },
+            edit:{
+                'url':'/dept/edit',
+                params:{
+                    department_id:dept_id,
+                },
+                info:{
+                    error:'部门编辑失败',
+                    success:'部门编辑成功'
+                },
+                title:'编辑部门'
+            },
+            del:{
+                'url':'/dept/del',
+                params:{
+                    department_id:dept_id
+                },
+                info:{
+                    error:'部门删除失败',
+                    success:'部门删除成功'
+                },
+                title:'删除部门'
+            }
+        }[type];
+        this.setState({
+            addDeptModel:true,
+            dept_name:dept_name,
+        })
+    }
+    changeDeptName(event){
+        const value = event.target.value;
+        this.setState({
+            dept_name:value
+        })
+    }
+    closeModel(){
+        this.setState({
+            addDeptModel:false
+        })
+    }
+    updateList(){
+        updateDept.bind(this)();
+    }
+    verifyFrom(dept_name){
+        if(!dept_name){
+            message.warning('请输入部门名称');
+            return false;
+        } else {
+            return true;
+        }
+    }
+    // 确认操作
+    okAction(){
+        if(this.modelType !== 'del' && !this.verifyFrom(this.state.dept_name.replace(/^\s+|\s+$/g,''))) return false;
+        this.$http.post(this.param.url,{
+            ...this.param.params,
+            department_name:this.state.dept_name.replace(/^\s+|\s+$/g,''),
+        }).then((res) => {
+            const resData = res.data || {};
+            if(resData.code + '' ==='0'){
+                message.success(this.param.info.success);
+                this.updateList();
+                this.closeModel();
+            }else {
+                message.error(this.param.info.error);
+            }
+        });
+    }
+    render(){
+        return (
+            <div className='m-deptTree'>
+                <div className="name">All </div>
+                <Dept pid={-1} selected_id={this.props.selected_id} selectDept={this.props.selectDept } depts={this.props.depts} changeDept={this.changeDept} level={1}/>
+                {this.state.addDeptModel?<Modal wrapClassName='g-popup-sure' closable={false} title={this.param.title} onOk={this.okAction} onCancel={this.closeModel} width={400} visible={true}>
+                    {this.modelType !== 'del'
+                        ?<table className='g-from'>
+                            <tbody>
+                                <tr>
+                                    <td className='in-h'>部门名称<span className="in-star">*</span></td>
+                                    <td><input value={this.state.dept_name} className='input'  onChange={(event) => {this.changeDeptName(event)}}/></td>
+                                </tr>
+                            </tbody>
+
+                        </table>
+                        :<p className="title">部门中的职员也会被删除，确定删除该部门？</p>
+                    }
+                </Modal>:null}
+            </div>
+        )
+    }
+}
+export default connect((state) => {
+    return {
+        depts:(function (depts) {
+            const formatDepts = [
+                {
+                    department_name:'Articles',
+                    department_pid:-1,
+                    department_id:0,
+                    spread:true
+                },
+                ...depts
+            ];
+            return formatDepts.map(dept => ({...dept,key:dept.department_id}));
+        })(state.baseData.dept)
+    }
+})(Tree);
\ No newline at end of file
diff --git a/src/pages/department/index.css b/src/pages/department/index.css
new file mode 100644
index 0000000..158bc27
--- /dev/null
+++ b/src/pages/department/index.css
@@ -0,0 +1,46 @@
+.m-deptTree{
+    background: #e9eef1;
+    width: auto !important;
+    min-width: 200px;
+    height: 100%;
+    padding-top: 30px;
+    padding-left: 10px;
+}
+.m-deptTree >.name{
+    color: #333;
+    font-weight: bold;
+    font-size: 14px;
+}
+.m-deptTree .dept_name{
+    position: relative;
+    display: inline-block;
+    min-width: 100%;
+    cursor: pointer;
+    color: #555;
+    padding: 10px 0 10px 10px;
+    font-size: 14px;
+
+}
+.m-deptTree .dept_name .arrow{
+    position: absolute;
+    font-size: 12px;
+    color: #8b9fcb;
+    top:15px;
+    left: -7px;
+}
+.m-deptTree .ellipsis{
+    float: right;
+    margin-top: 10px;
+    margin-right: 20px;
+}
+.m-dept-member .g-header .opt-leader{
+    margin-left: 20px;
+}
+.m-dept-member .tab-list{
+    margin-top: 10px;
+}
+.m-dept-member .tab-list .action{
+    cursor: pointer;
+    font-size: 14px;
+    color: #24c875;
+}
\ No newline at end of file
diff --git a/src/pages/department/index.js b/src/pages/department/index.js
new file mode 100644
index 0000000..eb75501
--- /dev/null
+++ b/src/pages/department/index.js
@@ -0,0 +1,24 @@
+import React,{Component} from 'react';
+import Layout from './../../components/layout.js';
+import DeptTree from './deptTree.js'
+import RightList from './list.js';
+import './index.css'
+export default class  extends Component{
+    constructor(props){
+        super(props);
+        this.state = {
+            dept_id:0,
+            staff:[],
+            leader_member_name:''
+        };
+        this.selectDept = this.selectDept.bind(this);
+    }
+    selectDept(dept_id){
+        this.setState({
+            dept_id:dept_id * 1
+        });
+    }
+    render(){
+        return <Layout left={<DeptTree selected_id={this.state.dept_id} selectDept={this.selectDept}/>} type='2' right={<RightList tb_data={this.state.staff} dept_id={this.state.dept_id}/>} />
+    }
+}
\ No newline at end of file
diff --git a/src/pages/department/list.js b/src/pages/department/list.js
new file mode 100644
index 0000000..fe6af80
--- /dev/null
+++ b/src/pages/department/list.js
@@ -0,0 +1,168 @@
+import React,{Component} from 'react';
+import {Button,message,Modal} from 'antd';
+import SelectLeader from './../../components/g-selectData.js';
+import {updateDept,updateStaff} from './../../global/initBaseData.js';
+import FilterDept from './../../components/g-filter-dept.js';
+import Table from './../../components/g-list.js';
+import {connect} from 'react-redux';
+ class List extends Component{
+    constructor(props){
+        super(props);
+        this.state = {
+            visible:false,
+            changeDept:false
+        };
+        this.onChangeTree = this.onChangeTree.bind(this);
+        this.onOk = this.onOk.bind(this);
+        this.action = this.action.bind(this);
+        this.onChange = this.onChange.bind(this);
+        this.columns = [
+            {
+                title:'姓名',
+                key:'member_name',
+                dataIndex:'member_name'
+            },
+            {
+                title:'部门',
+                key:'department_name',
+                dataIndex:'department_name',
+                width:300
+            },
+            {
+                title:'工号',
+                key:'work_num',
+                dataIndex:'work_num',
+                width:300
+            },
+            {
+                title:'操作',
+                key:'action',
+                width:150,
+                render:(record) => {
+                    return (
+                        <div>
+                            <span className='action' onClick={() => this.handle(record)}>修改部门</span>
+                        </div>
+                    )
+                }
+            }
+        ]
+    }
+    onChangeTree(flag){
+        this.setState({
+            visible:flag
+        });
+    }
+    // 修改部门
+    handle(member){
+        this.member = member;
+        this.setState({
+            changeDept:true
+        })
+    }
+    action(){
+        this.$http.post('/staff/edit',{
+            ...this.member,
+            ...this.optDept
+        }).then(res => {
+            const resData = res.data || {};
+            if(resData.code + '' === '0'){
+                message.success('修改员工部门成功');
+                this.setState({
+                    changeDept:false
+                });
+                updateStaff.bind(this)();
+            } else {
+                message.error('修改员工部门失败');
+            }
+        });
+    }
+    onChange(data){
+        this.optDept = JSON.parse(data);
+    }
+    // 修改部门负责人
+    onOk(leader){
+        if(this.props.dept_id * 1 && leader.length <= 0) {
+            message.warning('请选择部门负责人');
+            return false;
+        }
+        this.$http.post('/dept/edit',{
+            department_id:this.props.dept_id,
+            leader_member_name:(leader[0]||{}).member_name || '',
+            leader_member_id:(leader[0] || {}).member_id||0
+        }).then(res => {
+            const resData = res.data || {};
+            if(resData.code + '' === '0'){
+                message.success('修改部门负责人成功');
+                updateDept.bind(this)();
+            } else {
+                message.error('修改部门负责人失败');
+            }
+        })
+    }
+    render(){
+        return <div className='m-dept-member'>
+            {this.props.dept_id * 1?<div className='g-header'>
+                <span>部门负责人:</span>
+                {this.props.dept_leader.member_name}
+                {this.offset}
+                <Button className="primary opt-leader" onClick={() => {this.onChangeTree(true)}}>{!this.props.dept_leader?'选择部门负责人':'修改部门负责人'}</Button>
+                {this.state.visible?<SelectLeader type='staff' selectedData={this.props.dept_leader.member_id?[this.props.dept_leader]:[]} maxNum={1} visible={this.state.visible} onChangeTree={this.onChangeTree} onOk={this.onOk}/>:null}
+            </div>:null}
+            <Table cols={this.columns} offset={this.props.offset} data={this.props.tb_data} title={this.props.dept_name}/>
+            {this.state.changeDept?
+                <Modal onOk={this.action} onCancel={() => {this.setState({changeDept:false})}} width={470} visible={true} title={'修改部门'} closable={true}>
+                    <table className='g-from'>
+                        <tbody>
+                            <tr>
+                                <td className='in-h' width="100">姓名</td>
+                                <td>{this.member.member_name}</td>
+                            </tr>
+                            <tr>
+                                <td className='in-h'>部门</td>
+                                <td>{this.member.department_name}</td>
+                            </tr>
+                            <tr>
+                                <td className='in-h'>新部门</td>
+                                <td>
+                                    <FilterDept onChange={this.onChange}/>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </Modal>
+            :null}
+        </div>
+    }
+}
+export default connect((state,props) => {
+    return {
+        tb_data:((staffs) => {
+            const resultStaff = [];
+            staffs.forEach(staff => {
+                if(!props.dept_id){
+                    resultStaff.push(staff);
+                } else if(staff.department_id * 1 === props.dept_id * 1){
+                    resultStaff.push(staff);
+                }
+            });
+            return resultStaff;
+        })(state.baseData.staff),
+        offset:props.dept_id * 1?60:0,
+        dept_name:(depts => {
+            const curDept = depts.find(dept => {
+                return dept.department_id * 1 === props.dept_id * 1;
+            });
+            return (curDept || {}).department_name || '全公司';
+        })(state.baseData.dept),
+        dept_leader:(depts => {
+            const curDept = depts.find(dept => {
+                return dept.department_id * 1 === props.dept_id * 1;
+            });
+            return {
+                member_name:(curDept || {}).leader_member_name,
+                member_id:(curDept || {}).leader_member_id
+            }
+        })(state.baseData.dept)
+    }
+})(List);
\ No newline at end of file
diff --git a/src/pages/holiday/annual.js b/src/pages/holiday/annual.js
new file mode 100644
index 0000000..35d7950
--- /dev/null
+++ b/src/pages/holiday/annual.js
@@ -0,0 +1,50 @@
+import React,{Component} from 'react'
+import { Tabs } from 'antd';
+import List from './annual_list'
+import RuleEdit from './container/annualRule_edit.js'
+import RuleList from './container/annualRule_list.js'
+const TabPane = Tabs.TabPane;
+export default class extends Component {
+    constructor(props){
+        super(props);
+        this.state={
+            type:'show'
+        };
+        this.cols = [
+            {
+                title:'类型',
+                key:'type_text'
+            },
+            {
+                title:'大于等于年数',
+                key:'gt'
+            },
+            {
+                title:'小于年数',
+                key:'lt'
+            },
+            {
+                title:'年假天数',
+                key:'annual'
+            }
+        ];
+        this.changeState = this.changeState.bind(this);
+    }
+    changeState(state){
+        this.setState({
+            type:state
+        })
+    }
+    render(){
+        return <div className='m-holiday_annual'>
+            <Tabs defaultActiveKey="1" type="card">
+                <TabPane tab="年假时间管理" key="1">
+                    <List />
+                </TabPane>
+                <TabPane tab="年假规则" key="2">
+                    {this.state.type ==='show'?<RuleList changeState={this.changeState} cols={this.cols}/>:<RuleEdit changeState={this.changeState}/>}
+                </TabPane>
+            </Tabs>
+        </div>
+    }
+}
\ No newline at end of file
diff --git a/src/pages/holiday/annual_list.js b/src/pages/holiday/annual_list.js
new file mode 100644
index 0000000..fc1450d
--- /dev/null
+++ b/src/pages/holiday/annual_list.js
@@ -0,0 +1,186 @@
+import React,{Component} from 'react';
+import {Button} from 'antd'
+import GSearch from "../../components/g-search.js";
+import List from './container/annualList.js';
+import EditModel from './container/editModel.js';
+import DelAnn from './container/popTip.js';
+import {message} from "antd/lib/index";
+export default class extends Component{
+    constructor(props){
+        super(props);
+        this.state = {
+            keyword:'',
+            editPop:false,
+            editData:'',
+            delPop:false
+        };
+        this.search = this.search.bind(this);
+        this.editAnn = this.editAnn.bind(this);
+        this.verifyFrom = this.verifyFrom.bind(this);
+        this.onClose = this.onClose.bind(this);
+        this.cols = [
+            {
+                title:'姓名',
+                key:'member_name'
+            },
+            {
+                title:'部门',
+                key:'department_name',
+                width:200,
+            },
+            {
+                title:'工号',
+                key:'work_num',
+                width:100,
+            },
+            {
+                title:'年假总额(小时)',
+                key:'all_time',
+                width:150,
+            },
+            {
+                title:'剩余年假(小时)',
+                key:'remove_time',
+                width:150,
+            },
+            {
+                title:'操作',
+                type:'action',
+                width:150,
+                render:(item) => {
+                    return <div>
+                        <span className="action" onClick={() => this.editAnn('编辑年假','edit_ann',item)}>编辑</span>
+                        <span className="action" onClick={() => this.delHandle(item)}>删除</span>
+                    </div>
+                }
+            }
+        ];
+        this.editType = '';
+        this.editModelTitle = '';
+    }
+    search(value){
+        this.setState({
+            keyword:value
+        })
+    }
+    onClose(){
+        this.setState({
+            editPop:false,
+            delPop:false
+        });
+    }
+    delHandle(data){
+        this.setState({
+            delPop:true
+        });
+        this.delData = data;
+    }
+    editAnn(title,type,data={member_name:'',department_name:'',remove_time:'',all_time:'',work_num:''}){
+        this.editModelTitle = title;
+        this.editType = type;
+        this.setState({
+            editPop:true,
+            editData:data
+        })
+    }
+    trim(value){
+        return (value + '').replace(/\s/g,'');
+    }
+    verifyFrom(){
+        if(this.trim(this.state.editData.member_name).length <= 0){
+            message.warning('请输入姓名');
+            return false;
+        } else if(this.trim(this.state.editData.department_name).length <= 0){
+            message.warning('请输入部门');
+            return false;
+        } else if(this.trim(this.state.editData.all_time).length <= 0){
+            message.warning('请输入年假总额');
+            return false;
+        } else if(this.trim(this.state.editData.remove_time).length <= 0){
+            message.warning('请输入剩余年假时间');
+            return false;
+        } else if(this.trim(this.state.editData.remove_time) * 1  > this.trim(this.state.editData.all_time) * 1){
+            message.warning('剩余年假时间不能大于年假总额');
+            return false;
+        }
+        else {
+            return true;
+        }
+    }
+    handleFromChange(filed,value,type='text',decimal=0){
+        if(type==='num' && decimal===0){
+            value = value.replace(/[^\d]/g,'')
+        }
+        if(type === 'num' && decimal > 0){
+            value = value.replace(/^\./,'');
+            value = value.replace(/[^\d\.]/g,'');
+            const valueArr = value.split('.');
+            if(valueArr[1] != undefined){
+                value = valueArr[0] +'.'+  valueArr[1].slice(0,decimal);
+            } else {
+                value = valueArr[0]
+            }
+
+        }
+        this.setState(function (prevS) {
+            return {
+                editData:{...prevS.editData,...{[filed]:value}}
+            }
+        });
+    }
+    // 表单
+    renderFrom(){
+        return <table className="g-from">
+            <tbody>
+            <tr>
+                <td className="in-h">
+                    姓名<span className="in-star">*</span></td>
+                <td>
+                    {this.editType === 'add_ann'?<input type="text" value={this.state.editData.member_name} onChange={(event) => this.handleFromChange('member_name',event.target.value)} className="input"/>:this.state.editData.member_name}
+                </td>
+            </tr>
+            <tr>
+                <td className="in-h">
+                    部门<span className="in-star">*</span>
+                </td>
+                <td>
+                    {this.editType === 'add_ann'?<input type="text" value={this.state.editData.department_name} onChange={(event) => this.handleFromChange('department_name',event.target.value)} className="input"/> :this.state.editData.department_name}
+                </td>
+            </tr>
+            <tr>
+                <td className="in-h">工号</td>
+                <td>
+                    {this.editType === 'add_ann'?<input type="text" value={this.state.editData.work_num} onChange={(event) => this.handleFromChange('work_num',event.target.value,'num')} className="input"/>:this.state.editData.work_num}
+                </td>
+            </tr>
+            <tr>
+                <td className="in-h">
+                    年假总额<span className="in-star">*</span></td>
+                <td>
+                    <input type="text" value={this.state.editData.all_time} onChange={(event) => this.handleFromChange('all_time',event.target.value,'num',1)} className="input"/>(小时)
+                </td>
+            </tr>
+            <tr>
+                <td className="in-h">
+                    剩余年假时间<span className="in-star">*</span></td>
+                <td>
+                    <input type="text" value={this.state.editData.remove_time} onChange={(event) => this.handleFromChange('remove_time',event.target.value,'num',1)} className="input"/>(小时)
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    }
+    render(){
+        return (
+            <div>
+                <div className="g-header">
+                    <GSearch placeholder='姓名/工号' search={this.search}/>
+                    <Button type='primary' className='f-fr' onClick={() => this.editAnn('新增年假','add_ann')}>新增年假</Button>
+                </div>
+                <List cols={this.cols} title='年假时间' keyword={this.state.keyword}/>
+                {this.state.editPop ?<EditModel render={() => this.renderFrom()} verifyFrom={this.verifyFrom} onClose={this.onClose} title={this.editModelTitle} type={this.editType} data={this.state.editData}/>:null}
+                {this.state.delPop?<DelAnn type='del_ann' title='删除年假' onClose={this.onClose} dispatch='del_ann' data={this.delData}/>:null}
+            </div>
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/pages/holiday/award.js b/src/pages/holiday/award.js
new file mode 100644
index 0000000..709588d
--- /dev/null
+++ b/src/pages/holiday/award.js
@@ -0,0 +1,188 @@
+import React,{Component} from 'react'
+import GSearch from './../../components/g-search.js'
+import {Button,message} from 'antd'
+import List from './container/awardList.js'
+import PopTip from './container/popTip.js'
+import EditModel from './container/editModel.js'
+export default class extends Component {
+    constructor(props){
+        super(props);
+        this.state = {
+            keyword:'',
+            showPopTip:false,
+            showEditModel:false,
+            editModelData:''
+        };
+        this.search = this.search.bind(this);
+        this.onClose = this.onClose.bind(this);
+        this.delAward = this.delAward.bind(this);
+        this.verifyFrom = this.verifyFrom.bind(this);
+        this.popTipTitle = '';
+        this.popTipType='';
+        this.popTipDispatch = '';
+        this.editModelType='';
+        this.editModelTitle='';
+        this.cols = [
+            {
+                type:'selection',
+                width:60
+            },
+            {
+                title:'姓名',
+                key:'member_name'
+            },
+            {
+                title:'工号',
+                key:'work_num',
+                width:100
+            },
+            {
+                title:'部门',
+                key:'department_name',
+                width:150
+            },
+            {
+                title:'总天数(天)',
+                key:'total_day',
+                width:150
+            },
+            {
+                title:'剩余时长(天)',
+                key:'remove_day',
+                width:150
+            },
+            {
+                type:'action',
+                title:'操作',
+                width:150,
+                render:(item) =>{
+                    return <div>
+                        <span className='action' onClick={() => this.editAward('编辑奖励假','edit_award',item)}>编辑</span>
+                        <span onClick={() => this.delAward(item)} className='action'>删除</span>
+                    </div>
+                }
+            }
+        ]
+    }
+    search(value){
+        this.setState({
+            keyword:value
+        })
+    }
+    onClose(){
+        this.setState({
+            showPopTip:false,
+            showEditModel:false
+        });
+    }
+    renderFrom(){
+        return <table className="g-from">
+            <tbody>
+            <tr>
+                <td className="in-h">
+                    姓名<span className="in-star">*</span></td>
+                <td>
+                    {this.editModelType === 'add_award'?<input type="text" value={this.state.editModelData.member_name} onChange={(event) => this.handleFromChange('member_name',event.target.value)} className="input"/>:this.state.editModelData.member_name}
+                </td>
+            </tr>
+            <tr>
+                <td className="in-h">
+                    部门<span className="in-star">*</span>
+                </td>
+                <td>
+                    {this.editModelType === 'add_award'?<input type="text" value={this.state.editModelData.department_name} onChange={(event) => this.handleFromChange('department_name',event.target.value)} className="input"/>:this.state.editModelData.department_name}
+                </td>
+            </tr>
+            <tr>
+                <td className="in-h">工号</td>
+                <td>
+                    {this.editModelType === 'add_award'?<input type="text" value={this.state.editModelData.work_num} onChange={(event) => this.handleFromChange('work_num',event.target.value)} className="input"/>:this.state.editModelData.work_num}
+                </td>
+            </tr>
+            <tr>
+                <td className="in-h">
+                    年假总额<span className="in-star">*</span>
+                </td>
+                <td>
+                    <input type="text" value={this.state.editModelData.total_day} onChange={(event) => this.handleFromChange('total_day',event.target.value,'num')} className="input"/>(天)
+                </td>
+            </tr>
+            <tr>
+                <td className="in-h">
+                    剩余年假<span className="in-star">*</span></td>
+                <td>
+                    <input type="text" value={this.state.editModelData.remove_day} onChange={(event) => this.handleFromChange('remove_day',event.target.value,'num')} className="input"/>(天)
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    }
+    verifyFrom(){
+        if(this.trim(this.state.editModelData.member_name).length <= 0){
+            message.warning('请输入姓名');
+            return false;
+        } else if (this.trim(this.state.editModelData.department_name).length <= 0){
+            message.warning('请输入部门');
+            return false;
+        } else if(this.trim(this.state.editModelData.total_day).length <= 0){
+            message.warning('请输入年假总额');
+            return false;
+        } else if(this.trim(this.state.editModelData.remove_day).length <= 0){
+             message.warning('请输入剩余年假');
+            return false;
+        } else if(this.state.editModelData.remove_day > this.state.editModelData.total_day){
+            message.warning('年假总额小于剩余年假');
+            return false
+        }
+        else {
+            return true
+        }
+    }
+     trim(value){
+        return (value+'').replace(/\s/g,'')
+    }
+    handleFromChange(filed,value,type='text'){
+         if(type === 'num'){
+             value = value.replace(/[^\d]/g,'')
+         }
+        this.setState(function (prevS) {
+            return {
+                editModelData:{...prevS.editModelData,...{[filed]:value}}
+            }
+        });
+    }
+    editAward(title,type,data={member_name:'',department_name:'',total_day:0,remove_day:0,work_num:''}){
+        this.editModelTitle = title;
+        this.editModelType = type;
+        this.setState({
+            editModelData:data,
+            showEditModel:true
+        })
+    }
+    delAward(item={},batch = false){
+        if(batch){
+            this.popTipTitle = '批量删除调休';
+            this.popTipType='delAwardBatch';
+            this.popTipDispatch = 'del_award_batch';
+        } else {
+            this.popTipTitle = '删除调休';
+            this.popTipType='delAward';
+            this.popTipDispatch = 'del_award';
+            this.popTipData = item
+        }
+        this.setState({
+           showPopTip:true
+        })
+    }
+    render(){
+        return <div className='m-holiday_award'>
+            <div className='g-header'>
+                <GSearch placeholder='姓名/工号' search={this.search}/>
+                <Button type='primary' className='f-fr' onClick={() => this.editAward('新增奖励假','add_award')}>新增奖励假</Button>
+            </div>
+            <List keyword={this.state.keyword} title='奖励假时间' cols={this.cols} delAward={this.delAward}/>
+            {this.state.showPopTip ? <PopTip onClose={this.onClose} data={this.popTipData} title={this.popTipTitle} type={this.popTipType} dispatch={this.popTipDispatch}/>:null}
+            {this.state.showEditModel ? <EditModel onClose={this.onClose} verifyFrom={this.verifyFrom} data={this.state.editModelData} title={this.editModelTitle} type={this.editModelType} render={() => this.renderFrom()}/> :null}
+        </div>
+    }
+}
\ No newline at end of file
diff --git a/src/pages/holiday/components/Main.js b/src/pages/holiday/components/Main.js
new file mode 100644
index 0000000..3058a98
--- /dev/null
+++ b/src/pages/holiday/components/Main.js
@@ -0,0 +1,24 @@
+import React, { Component } from 'react';
+import {Switch,Route} from 'react-router-dom'
+import Type from './../type.js'
+import Day_off from './../day_off.js'
+import Award from './../award.js'
+import Annual from './../annual.js'
+export default class  extends Component{
+    constructor(props){
+        super(props);
+        const {history} = props;
+        history.push('/holiday/type');
+    }
+    render(){
+        return <div>
+            <Switch>
+                <Route path='/holiday/type' component={Type}/>
+                <Route path='/holiday/day_off' component={Day_off}/>
+                <Route path='/holiday/award' component={Award}/>
+                <Route path='/holiday/annual' component={Annual}/>
+                <Route component={Type}/>
+            </Switch>
+        </div>
+    }
+}
\ No newline at end of file
diff --git a/src/pages/holiday/components/leftNav.js b/src/pages/holiday/components/leftNav.js
new file mode 100644
index 0000000..d5cc1e9
--- /dev/null
+++ b/src/pages/holiday/components/leftNav.js
@@ -0,0 +1,13 @@
+import React,{Component} from 'react'
+import {NavLink as Link} from 'react-router-dom'
+class LeftNav extends Component {
+    render(){
+        return <ul className="m-leftNav">
+            <li className="nav"><Link to={`/holiday/type`} activeClassName='g-navActive' className='link'>假期类型</Link></li>
+            <li className="nav"><Link to={`/holiday/day_off`} activeClassName='g-navActive' className='link'>调休</Link></li>
+            <li className="nav"><Link to={`/holiday/award`} activeClassName='g-navActive' className='link'>奖励假</Link></li>
+            <li className="nav"><Link to={`/holiday/annual`} activeClassName='g-navActive' className='link'>年假</Link></li>
+        </ul>
+    }
+}
+export default LeftNav;
\ No newline at end of file
diff --git a/src/pages/holiday/container/annualList.js b/src/pages/holiday/container/annualList.js
new file mode 100644
index 0000000..15d8530
--- /dev/null
+++ b/src/pages/holiday/container/annualList.js
@@ -0,0 +1,18 @@
+import React,{Component} from 'react';
+import {connect} from 'react-redux'
+import List from '../../../components/g-list.js';
+class AnnualList extends Component {
+    render(){
+        return <List data={this.props.data} cols={this.props.cols} title={this.props.title} offset={123}/>
+    }
+}
+export default connect((state,props) => {
+    return {
+        data:(function (annal, keyword) {
+            return annal.filter(item => {
+                if(!keyword) return true;
+                else return item.member_name.indexOf(keyword) >= 0 || (item.work_num + '').indexOf(keyword) >= 0;
+            })
+        })(state.holiday.annual,props.keyword)
+    }
+})(AnnualList);
\ No newline at end of file
diff --git a/src/pages/holiday/container/annualRule_edit.js b/src/pages/holiday/container/annualRule_edit.js
new file mode 100644
index 0000000..44f6148
--- /dev/null
+++ b/src/pages/holiday/container/annualRule_edit.js
@@ -0,0 +1,162 @@
+import React,{Component} from 'react';
+import {connect} from 'react-redux'
+import {Icon,message} from 'antd'
+class Edit extends Component{
+    constructor(props){
+        super(props);
+        this.state = {
+            type:props.ruleType,
+            rules:props.rules
+        };
+        this.submit = this.submit.bind(this);
+    }
+    changeType(type){
+        this.setState({
+            type:type
+        })
+    }
+    addRule(type){
+        this.setState(function (prevS) {
+            prevS.rules.push({
+                id:new Date(),
+                type,
+                gt:'',
+                lt:'',
+                annual:''
+            });
+            return {
+                rules:prevS.rules
+            }
+        })
+    }
+    delRule(index){
+        this.setState(function (prevS) {
+            if(prevS.rules.length === 1){
+                message.warning('至少要有一条累加规则');
+                return;
+            }
+            prevS.rules.splice(index,1);
+            return {
+                rules:prevS.rules
+            }
+        })
+    }
+    submit(){
+        if(this.verifyRule()) this.props.submit(this.state.type,this.state.rules);
+    }
+    verifyRule(){
+        const len = this.state.rules.length;
+        let flag = true;
+        for(let index = 0;index<len;++index){
+            const rule = this.state.rules[index];
+            if(!(rule.gt.length <= 0 && rule.lt.length <= 0 && rule.annual.length <= 0)){
+                if(rule.gt.length <= 0){
+                    message.warning('请输入第'+(index+1)+'条累计规则的起始时间');
+                    flag = false;
+                    break;
+                }
+                if(rule.lt.length <= 0){
+                    message.warning('请输入第'+(index+1)+'条累计规则的截至时间');
+                    flag = false;
+                    break;
+                }
+                if(rule.annual.length <= 0){
+                    message.warning('请输入第'+(index+1)+'条累计规则的年假时间');
+                    flag = false;
+                    break;
+                }
+                if(rule.annual * 1 === 0){
+                    message.warning('请输入第'+(index+1)+'条累计规则的年假时间为0');
+                    flag = false;
+                    break;
+                }
+                if(rule.gt > rule.lt){
+                    message.warning('请输入第'+(index+1)+'条累计规则的起始时间大于截至时间');
+                    flag = false;
+                    break;
+                }
+            }
+        }
+        return flag;
+
+    }
+    editRule(index,filed,value,type = 'text'){
+        if(type === 'num'){
+            value = value.replace(/[^\d]/g,'')
+        }
+        this.setState(function (prevS) {
+            prevS.rules[index][filed] = (value+'').trim();
+            return {
+                rules:prevS.rules
+            }
+        })
+    }
+    render(){
+        return <div style={{marginLeft:'100px'}}>
+            <table className="g-from">
+                <tbody>
+                    <tr height={30}>
+                        <td className="in-h">年假规则<span className="in-star">*</span></td>
+                        <td>
+                            <label><input type="radio" name='type' checked={this.state.type === 1} onChange={() => this.changeType(1)}/>手动维护</label>
+                            <label><input type="radio" name='type' checked={this.state.type === 2} onChange={() => this.changeType(2)}/>手动维护+自动累加</label>
+                        </td>
+                    </tr>
+                    {this.state.type === 2?<tr>
+                        <td className="in-h" style={{verticalAlign:'text-top'}}>累加规则<span className="in-star">*</span></td>
+                        <td>
+                            <table>
+                                <tbody>
+                                    <tr style={{height:'40px'}}>
+                                        <td>
+                                            <button className="submit" onClick={() => this.addRule(1)} style={{marginRight:'10px'}}>新增司龄</button>
+                                            <button className="submit" onClick={() => this.addRule(2)}>新增公龄</button>
+                                        </td>
+                                    </tr>
+                                    {this.state.rules.map((rule,index) => {
+                                        return <tr key={index}>
+                                            <td>
+                                                <input type="text" className="input small" value={rule.gt} onChange={(event) => this.editRule(index,'gt',event.target.value,'num')}/>年 小于等于
+                                                {rule.type === 1?'司龄':'工龄'}小于
+                                                <input type="text" className="input small" value={rule.lt} onChange={(event) => this.editRule(index,'lt',event.target.value,'num')}/>年
+                                                <span style={{marginLeft:'20px'}}>年假<input type="text" className="input small" value={rule.annual} onChange={(event) => this.editRule(index,'annual',event.target.value,'num')}/>天</span>
+                                                <Icon style={{marginLeft:'20px'}} onClick={() => this.delRule(index)} type="delete"/>
+                                            </td>
+                                        </tr>
+                                    })}
+                                </tbody>
+                            </table>
+                        </td>
+                    </tr>:null}
+                    <tr>
+                        <td className="in-h"></td>
+                        <td>
+                            <button className="cancel" onClick={() => this.props.changeState('show')}>取消</button>
+                            <button className="submit" onClick={this.submit} style={{marginLeft:'10px'}}>提交</button>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    }
+}
+export default connect((state) => {
+    return {
+        ruleType:state.holiday.annual_type,
+        rules:state.holiday.annual_type === 1?[{type:1,gt:'',lt:'',annual:'',id:new Date()}]:state.holiday.annual_rules
+    }
+},(dispatch,ownProps) => {
+    return {
+        submit(type,rules){
+            dispatch({
+                type:'edit_annual_type',
+                state:type
+            });
+            dispatch({
+                type:'edit_annual_rules',
+                rules
+            });
+            ownProps.changeState('show');
+        }
+    }
+})(Edit)
\ No newline at end of file
diff --git a/src/pages/holiday/container/annualRule_list.js b/src/pages/holiday/container/annualRule_list.js
new file mode 100644
index 0000000..380fb47
--- /dev/null
+++ b/src/pages/holiday/container/annualRule_list.js
@@ -0,0 +1,31 @@
+import React from 'react'
+import {connect} from 'react-redux'
+import {Button} from 'antd'
+import List from '../../../components/g-list.js'
+function ListRule(props) {
+    return (
+        <div>
+            <div className="g-header">
+                <Button type='primary' onClick={() => props.changeState('edit')}>修改规则</Button>
+            </div>
+            <div style={{padding:'20px 20px 0 20px'}}>{props.ruleType === 1?'手动维护':'手动维护+司龄（自动累加）+工龄（自动累加)'}</div>
+            {props.ruleType === 2?<List data={props.data} cols={props.cols} offset={162}/>:null}
+        </div>
+    )
+}
+const getRules = (rules) => {
+    return rules.map(rule => {
+        const type_text = {
+            1:'司龄',
+            2:'工龄'
+        };
+        rule.type_text = type_text[rule.type];
+        return rule
+    })
+};
+export default connect((state) => {
+    return {
+        data:getRules(state.holiday.annual_rules),
+        ruleType:state.holiday.annual_type
+    }
+})(ListRule)
\ No newline at end of file
diff --git a/src/pages/holiday/container/awardList.js b/src/pages/holiday/container/awardList.js
new file mode 100644
index 0000000..1e99c66
--- /dev/null
+++ b/src/pages/holiday/container/awardList.js
@@ -0,0 +1,34 @@
+import React from 'react'
+import List from '../../../components/g-list.js'
+import {connect} from 'react-redux'
+function AwardList(props) {
+    return <List offset={55} delHandle={props.delAward} cols={props.cols} data={props.data} title={props.title} onSelectAll={props.onSelectAll} onSelectOne={props.onSelectOne}/>
+}
+function filterData(data,keyword) {
+    return data.filter(item => {
+        if(!keyword) return true;
+        return item.member_name.indexOf(keyword) >= 0 || (item.work_num + '').indexOf(keyword) >= 0;
+    });
+}
+export default connect((state,ownsProps) => {
+    return {
+        data:filterData(state.holiday.award,ownsProps.keyword)
+    }
+},(dispatch) => {
+    return {
+        onSelectAll(flag){
+            dispatch({
+                type:'selectAll_award',
+                params:{
+                    checked:flag
+                }
+            });
+        },
+        onSelectOne(params){
+            dispatch({
+                type:'selectOne_award',
+                params
+            })
+        }
+    }
+})(AwardList)
\ No newline at end of file
diff --git a/src/pages/holiday/container/dayOffList.js b/src/pages/holiday/container/dayOffList.js
new file mode 100644
index 0000000..9335be8
--- /dev/null
+++ b/src/pages/holiday/container/dayOffList.js
@@ -0,0 +1,36 @@
+import React from 'react'
+import List from '../../../components/g-list.js'
+import {connect} from 'react-redux'
+function dayOffList(props) {
+    return <List offset={123} delHandle={props.delHandle} data={props.data} cols={props.cols} title={props.title} onSelectAll={props.onSelectAll} onSelectOne={props.onSelectOne}/>
+}
+function getData(day_off,keyword) {
+    if(!keyword) return day_off;
+    else{
+        return day_off.filter(item => {
+            return item.member_name.indexOf(keyword) >= 0 || (item.work_num + '').indexOf(keyword) >= 0;
+        })
+    }
+}
+export default connect((state,ownProps) => {
+    return {
+        data:getData(state.holiday.day_off,ownProps.keyword)
+    }
+},(dispatch) => {
+    return {
+        onSelectAll(flag){
+            dispatch({
+                type:'selectAll_day_off',
+                params:{
+                    checked:flag
+                }
+            })
+        },
+        onSelectOne(params){
+            dispatch({
+                type:'selectOne_day_off',
+                params:params
+            })
+        }
+    }
+})(dayOffList)
\ No newline at end of file
diff --git a/src/pages/holiday/container/dayOffRule_edit.js b/src/pages/holiday/container/dayOffRule_edit.js
new file mode 100644
index 0000000..9cd5b8d
--- /dev/null
+++ b/src/pages/holiday/container/dayOffRule_edit.js
@@ -0,0 +1,116 @@
+import React,{Component} from 'react';
+import {connect} from 'react-redux';
+import {message} from 'antd'
+class DayOffRule extends Component{
+    constructor(props){
+        super(props);
+        this.state = {
+            editData:props.rule
+        };
+        this.submit = this.submit.bind(this);
+    }
+    changeField(field,value,type='text'){
+        if(type==='num') value = value.replace(/[^\d]/g,'');
+        this.setState((prevS) => {
+            return {
+                editData:{...prevS.editData,...{[field]:value}}
+            }
+        })
+    }
+    submit(){
+        if(this.verifyFrom()) this.props.submit(this.state.editData);
+    }
+    verifyFrom(){
+        if(this.trim(this.state.editData.weekday).length <= 0){
+            message.warning('请输入工作日加班兑换规则');
+            return false
+        } else if(this.trim(this.state.editData.weekend).length <= 0){
+            message.warning('请输入休息日加班兑换规则');
+            return false
+        } else if(this.trim(this.state.editData.holiday).length <= 0){
+            message.warning('请输入节假日加班兑换规则');
+            return false
+        } else if(this.trim(this.state.editData.convery).length <= 0){
+            message.warning('请输入日时长折算规则');
+            return false
+        }
+        else {
+            return true;
+        }
+    }
+    trim(value){
+        return (value + '').replace(/\s/g,'')
+    }
+    render(){
+        return <table className="g-from dayOffRuleShow" style={{marginLeft:'50px'}}>
+            <tbody>
+            <tr>
+                <td className="in-h">
+                    调休规则<span className="in-star">*</span>
+                </td>
+                <td height='50'>
+                    <label><input type="radio" checked={this.state.editData.type+ '' === '1'} onChange={() => this.changeField('type',1)}/>手动维护</label>
+                    <label><input type="radio" checked={this.state.editData.type+ '' === '2'} onChange={() => this.changeField('type',2)}/>手动维护+加班兑换</label>
+                </td>
+            </tr>
+            {this.state.editData.type+ '' !== '1'?
+                <tr>
+                    <td className="in-h" style={{verticalAlign: 'top'}}>
+                        加班兑换规则<span className="in-star">*</span>
+                    </td>
+                    <td height='80' style={{verticalAlign: 'top'}}>
+                        <div className="item">工作日加班1小时换<input type="text" className="small input" value={this.state.editData.weekday} onChange={(event) => this.changeField('weekday',event.target.value,'num')}/>小时调休</div>
+                        <div className="item">休息日加班1小时换<input type="text" className="small input" value={this.state.editData.weekend} onChange={(event) => this.changeField('weekend',event.target.value,'num')}/>小时调休</div>
+                        <div className="item">法定节假日加班1小时换<input type="text" className="small input" value={this.state.editData.holiday} onChange={(event) => this.changeField('holiday',event.target.value,'num')}/>小时调休</div>
+                    </td>
+                </tr>
+            :null}
+            {this.state.editData.type+ '' !== '1'?
+                <tr>
+                    <td className="in-h">
+                        日时长折算规则<span className="in-star">*</span>
+                    </td>
+                    <td>
+                        <input type="text" className="small input" value={this.state.editData.convery} onChange={(event) => this.changeField('convery',event.target.value,'num')}/>小时=1天
+                    </td>
+                </tr>
+            :null
+            }
+            <tr>
+                <td></td>
+                <td height='50'>
+                    <button className="cancel" onClick={() => this.props.changeState(false)}>取消</button>
+                    <button className="submit" onClick={() => this.submit()} style={{marginLeft:'10px'}}>提交</button>
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    }
+}
+function getRule(rule) {
+    if(rule.type + '' === '1'){
+        return {
+            type:1,
+            weekday:1,
+            weekend:1,
+            holiday:1,
+            convery:8
+        }
+    }
+    return rule;
+}
+export default connect(state => {
+    return {
+        rule:getRule(state.holiday.day_off_rule)
+    }
+},((dispatch,ownProps) => {
+    return {
+        submit(params){
+            dispatch({
+                type:'editDayOffRule',
+                params
+            });
+            ownProps.changeState(false)
+        }
+    }
+}))(DayOffRule)
diff --git a/src/pages/holiday/container/dayOffRule_show.js b/src/pages/holiday/container/dayOffRule_show.js
new file mode 100644
index 0000000..0641c6f
--- /dev/null
+++ b/src/pages/holiday/container/dayOffRule_show.js
@@ -0,0 +1,39 @@
+import React from 'react';
+import {connect} from 'react-redux'
+import {Button} from 'antd'
+function DayOffRule(props) {
+    return <div className="dayOffRuleShow">
+        <div className="g-header">
+            <Button type="primary" onClick={() => props.changeState(true)}>修改</Button>
+        </div>
+        <div className="main">
+            <div className="item f-clearFix">
+                <span className="info f-fl">调休规则</span>
+                <div className="desc">
+                    {props.rule.type + '' === '1'?'手动维护':'手动维护+加班兑换 '}
+                </div>
+            </div>
+        {props.rule.type + '' !== '1' ?
+            <div className="item f-clearFix">
+                <span className="info f-fl">加班兑换规则</span>
+                <div className="desc f-fl">
+                    <p>工作日加班{props.rule.weekday}小时换1小时调休</p>
+                    <p>休息日加班{props.rule.weekend}小时换1小时调休</p>
+                    <p>法定节假日加班{props.rule.holiday}小时换1小时调休</p>
+                </div>
+            </div>
+        :null}
+    {props.rule.type + '' !== '1' ?
+            <div className="item f-clearFix">
+                <span className="info f-fl">日时长折算规则</span>
+                <div className="desc">{props.rule.convery}小时=1天</div>
+            </div>
+        :null}
+        </div>
+    </div>
+}
+export default connect(state => {
+    return {
+        rule:state.holiday.day_off_rule
+    }
+})(DayOffRule)
diff --git a/src/pages/holiday/container/editModel.js b/src/pages/holiday/container/editModel.js
new file mode 100644
index 0000000..ec31c08
--- /dev/null
+++ b/src/pages/holiday/container/editModel.js
@@ -0,0 +1,21 @@
+import React from 'react'
+import {Modal} from 'antd'
+import {connect} from 'react-redux'
+function EditModel(props) {
+    return <Modal onOk={props.onOk} onCancel={props.onClose} visible={true} title={props.title} closable={false}>
+        {props.render()}
+    </Modal>
+}
+export default connect(() => {return{}},(dispatch,ownProps) => {
+    return {
+        onOk(){
+            if(ownProps.verifyFrom()){
+                dispatch({
+                    type:ownProps.type,
+                    params:ownProps.data
+                });
+                ownProps.onClose();
+            }
+        }
+    }
+})(EditModel)
\ No newline at end of file
diff --git a/src/pages/holiday/container/popTip.js b/src/pages/holiday/container/popTip.js
new file mode 100644
index 0000000..797f084
--- /dev/null
+++ b/src/pages/holiday/container/popTip.js
@@ -0,0 +1,56 @@
+import React from 'react'
+import {Modal} from 'antd'
+import {connect} from 'react-redux'
+function Dialog(props) {
+    const popTips = {
+        stopType:{
+            title:'您是否要停用该假期类型?',
+            info:'停用后员工请假不能选择该类型假期'
+        },
+        startType:{
+            title:'您是否要启用该假期类型?',
+            info:'启用后员工请假可选择该类型假期'
+        },
+        delType:{
+            title:'您是否要删除该假期类型?',
+            info:'删除后员工请假不能选择该类型假期'
+        },
+        delAward:{
+            title:'您是否要删除该员工的调休?',
+            info:'删除后该员工的调休时间全部清零，将不能请调休'
+        },
+        delAwardBatch:{
+            title:'您是否要删除这些员工的调休?',
+            info:'删除后这些员工的调休时间全部清零，将不能请调休'
+        },
+        del_day_off_batch:{
+            title:'您是否要删除选中员工的调休?',
+            info:'删除后员工的调休时间全部清零,将不能请调休'
+        },
+        del_day_off:{
+            title:'您是否要删除该员工的调休?',
+            info:'删除后该员工的调休时间全部清零,将不能请调休'
+        },
+        del_ann:{
+            title:'您是否要删除该员工的年假?',
+            info:'删除后该员工的年假时间全部清零,将不能请年假'
+        }
+    };
+    return <Modal visible={true} wrapClassName='g-popup-sure' closable={false} title={props.title} onCancel={props.onClose} onOk={props.onOk}>
+        <div>
+            <p className='title'>{popTips[props.type].title}</p>
+            <p className='info'>{popTips[props.type].info}</p>
+        </div>
+    </Modal>
+}
+export default connect(()=> {return {}},(dispatch,ownProps) => {
+    return {
+        onOk(){
+            dispatch({
+                type:ownProps.dispatch,
+                params:ownProps.data
+            });
+            ownProps.onClose();
+        }
+    }
+})(Dialog)
\ No newline at end of file
diff --git a/src/pages/holiday/container/typeList.js b/src/pages/holiday/container/typeList.js
new file mode 100644
index 0000000..30a37a5
--- /dev/null
+++ b/src/pages/holiday/container/typeList.js
@@ -0,0 +1,46 @@
+import React from 'react'
+import {connect} from 'react-redux'
+import List from '../../../components/g-list.js'
+function TypeList(props) {
+    return <List offset={55} cols={props.cols} title={props.title} data={props.list}/>
+}
+function getTypeList(state) {
+    return state.holiday.holiday_type.map(type => {
+        let text = {
+            status_text:{
+                0:'停用',
+                1:'启用'
+            },
+            attachment_text:{
+                0:'否',
+                1:'是'
+            },
+            period_text:{
+                1:'每年',
+                2:'每月',
+                3:'永久'
+            },
+            max_time_text(value){
+                if(value === 0){
+                    return '不限'
+                }
+                return {
+                    [value]:value
+                }[value]
+            }
+        };
+        return Object.assign({},type,{
+            status_text:text.status_text[type.status],
+            attachment_text:text.attachment_text[type.attachment],
+            period_text:text.period_text[type.period],
+            max_time_text:text.max_time_text(type.max_time)
+        })
+    })
+}
+export default connect(
+    state=>{
+        return {
+            list:getTypeList(state)
+        }
+    }
+)(TypeList);
\ No newline at end of file
diff --git a/src/pages/holiday/css/dayoffrule.css b/src/pages/holiday/css/dayoffrule.css
new file mode 100644
index 0000000..9a50705
--- /dev/null
+++ b/src/pages/holiday/css/dayoffrule.css
@@ -0,0 +1,12 @@
+.dayOffRuleShow .main{
+    padding: 20px 0 20px 20px;
+}
+.dayOffRuleShow .item{
+    margin-bottom: 10px;
+}
+.dayOffRuleShow .info{
+    display: inline-block;
+    width: 120px;
+    text-align: right;
+    margin-right: 40px;
+}
\ No newline at end of file
diff --git a/src/pages/holiday/css/list.css b/src/pages/holiday/css/list.css
new file mode 100644
index 0000000..be0d6c1
--- /dev/null
+++ b/src/pages/holiday/css/list.css
@@ -0,0 +1,3 @@
+.holiday_list{
+    padding: 20px;
+}
\ No newline at end of file
diff --git a/src/pages/holiday/day_off.js b/src/pages/holiday/day_off.js
new file mode 100644
index 0000000..1d0d155
--- /dev/null
+++ b/src/pages/holiday/day_off.js
@@ -0,0 +1,19 @@
+import React,{Component} from 'react'
+import { Tabs } from 'antd';
+import List from './day_off_list.js'
+import Rule from './day_off_rule.js'
+const TabPane = Tabs.TabPane;
+export default class extends Component {
+    render(){
+        return <div className='m-holiday_dayOff'>
+                <Tabs defaultActiveKey="list" type="card">
+                    <TabPane tab="调休时间管理" key="list">
+                        <List/>
+                    </TabPane>
+                    <TabPane tab="调休规则" key="rule">
+                        <Rule/>
+                    </TabPane>
+                </Tabs>
+        </div>
+    }
+}
\ No newline at end of file
diff --git a/src/pages/holiday/day_off_list.js b/src/pages/holiday/day_off_list.js
new file mode 100644
index 0000000..9a1b070
--- /dev/null
+++ b/src/pages/holiday/day_off_list.js
@@ -0,0 +1,176 @@
+import React,{Component} from 'react'
+import GSearch from './../../components/g-search.js'
+import {Button,message} from 'antd'
+import List from './container/dayOffList.js'
+import PopTip from './container/popTip.js'
+import EditModel from './container/editModel.js'
+export default class  extends Component{
+    constructor(props){
+        super(props);
+        this.state={
+            keyword:'',
+            showPopTip:false,
+            showEditModel:false,
+            editModelData:''
+        };
+        this.popTipTitle='';
+        this.popTipData='';
+        this.popTipDispatch='';
+        this.popTipType='';
+        this.editModelTitle = '';
+        this.editModelType = '';
+        this.search = this.search.bind(this);
+        this.onClose = this.onClose.bind(this);
+        this.delHandle = this.delHandle.bind(this);
+        this.verifyFrom = this.verifyFrom.bind(this);
+        this.cols = [
+            {
+                type:'selection',
+                width:60
+            },
+            {
+                title:'姓名',
+                key:'member_name'
+            },
+            {
+                title:'部门',
+                key:'department_name',
+                width:200,
+            },
+            {
+                title:'可调休时间(小时)',
+                key:'remove_time',
+                width:200
+            },
+            {
+                type:'action',
+                width:200,
+                render:(item) => {
+                    return <div>
+                        <span className="action" onClick={() => this.editDayOff('编辑调休','edit_day_off',item)}>编辑</span>
+                        <span className="action" onClick={() => this.delHandle(item)}>删除</span>
+                    </div>
+                }
+            }
+        ]
+    }
+    search(keyword){
+        this.setState({
+            keyword
+        })
+    }
+    delHandle(item={},batch=false){
+        if(!batch){
+            this.popTipTitle = '删除调休';
+            this.popTipData = item;
+            this.popTipType = 'del_day_off';
+            this.popTipDispatch = 'del_day_off'
+        } else {
+            this.popTipTitle = '批量删除调休';
+            this.popTipData = item;
+            this.popTipType = 'del_day_off_batch';
+            this.popTipDispatch = 'del_day_off_batch'
+        }
+        this.setState({
+            showPopTip:true
+        })
+    }
+    onClose(){
+        this.setState({
+            showPopTip:false,
+            showEditModel:false
+        })
+    }
+    renderFrom(){
+        return <table className="g-from">
+            <tbody>
+            <tr>
+                <td className="in-h">
+                    姓名<span className="in-star">*</span></td>
+                <td>
+                    {this.editModelType === 'add_day_off'?<input type="text" value={this.state.editModelData.member_name} onChange={(event) => this.handleFromChange('member_name',event.target.value)} className="input"/>:this.state.editModelData.member_name}
+                </td>
+            </tr>
+            <tr>
+                <td className="in-h">
+                    部门<span className="in-star">*</span>
+                </td>
+                <td>
+                    {this.editModelType === 'add_day_off'?<input type="text" value={this.state.editModelData.department_name} onChange={(event) => this.handleFromChange('department_name',event.target.value)} className="input"/> :this.state.editModelData.department_name}
+                </td>
+            </tr>
+            <tr>
+                <td className="in-h">工号</td>
+                <td>
+                    {this.editModelType === 'add_day_off'?<input type="text" value={this.state.editModelData.work_num} onChange={(event) => this.handleFromChange('work_num',event.target.value,'num')} className="input"/>:this.state.editModelData.work_num}
+                </td>
+            </tr>
+            <tr>
+                <td className="in-h">
+                    剩余调休时间<span className="in-star">*</span></td>
+                <td>
+                    <input type="text" value={this.state.editModelData.remove_time} onChange={(event) => this.handleFromChange('remove_time',event.target.value,'num',1)} className="input"/>(小时)
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    }
+    verifyFrom(){
+        if(this.trim(this.state.editModelData.member_name).length <= 0){
+            message.warning('请输入姓名');
+            return false;
+        } else if(this.trim(this.state.editModelData.department_name).length <= 0){
+            message.warning('请输入部门');
+            return false;
+        } else if(this.trim(this.state.editModelData.remove_time).length <= 0){
+            message.warning('请输入剩余调休时间');
+            return false;
+        }
+        else {
+            return true;
+        }
+    }
+    trim(value){
+        return (value + '').replace(/\s/g,'');
+    }
+    handleFromChange(filed,value,type='text',decimal=0){
+        if(type==='num' && decimal===0){
+            value = value.replace(/[^\d]/g,'')
+        }
+        if(type === 'num' && decimal > 0){
+            value = value.replace(/^\./,'');
+            value = value.replace(/[^\d\.]/g,'');
+            const valueArr = value.split('.');
+            if(valueArr[1] != undefined){
+                value = valueArr[0] +'.'+  valueArr[1].slice(0,decimal);
+            } else {
+                value = valueArr[0]
+            }
+
+        }
+        this.setState(function (prevS) {
+            return {
+                editModelData:{...prevS.editModelData,...{[filed]:value}}
+            }
+        });
+    }
+    editDayOff(title,type,data={member_name:'',department_name:'',remove_time:0,work_num:''}){
+        this.editModelTitle = title;
+        this.editModelType = type;
+        this.setState({
+            editModelData:data,
+            showEditModel:true
+        })
+    }
+    render(){
+        return <div>
+            <div className="g-header">
+                <GSearch placeholder="姓名工号" search={this.search}/>
+                <Button type='primary' className='f-fr' onClick={() => this.editDayOff('新增调休','add_day_off')}>新增调休</Button>
+            </div>
+            <List keyword={this.state.keyword} cols={this.cols} title="调休时间" delHandle={this.delHandle}/>
+            {this.state.showPopTip?<PopTip onClose={this.onClose} title={this.popTipTitle} data={this.popTipData} dispatch={this.popTipDispatch} type={this.popTipType}/>:null}
+            {this.state.showEditModel ? <EditModel onClose={this.onClose} verifyFrom={this.verifyFrom} title={this.editModelTitle} type={this.editModelType} data={this.state.editModelData} render={() => this.renderFrom()}/>:null}
+        </div>
+    }
+}
\ No newline at end of file
diff --git a/src/pages/holiday/day_off_rule.js b/src/pages/holiday/day_off_rule.js
new file mode 100644
index 0000000..c489b74
--- /dev/null
+++ b/src/pages/holiday/day_off_rule.js
@@ -0,0 +1,25 @@
+import React,{Component} from 'react';
+import ShowRule from './container/dayOffRule_show.js';
+import EditRule from './container/dayOffRule_edit.js'
+import './css/dayoffrule.css'
+export default class extends Component {
+    constructor(props){
+        super(props);
+        this.state={
+            edit:false
+        };
+        this.changeState = this.changeState.bind(this);
+    }
+    changeState(boolean){
+        this.setState({
+            edit:boolean
+        })
+    }
+    render(){
+        if(this.state.edit){
+            return <EditRule changeState={this.changeState}/>
+        } else {
+            return <ShowRule changeState={this.changeState}/>
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/pages/holiday/index.js b/src/pages/holiday/index.js
new file mode 100644
index 0000000..5b5fd3c
--- /dev/null
+++ b/src/pages/holiday/index.js
@@ -0,0 +1,11 @@
+import React, { Component } from 'react';
+import Layout from './../../components/layout.js'
+import Main from './components/Main.js'
+import LeftNav from './components/leftNav.js'
+export default class  extends Component{
+    render(){
+        return (
+            <Layout type={2} left={<LeftNav {...this.props}/>} right={<Main {...this.props}/>}/>
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/pages/holiday/type.js b/src/pages/holiday/type.js
new file mode 100644
index 0000000..fa3284d
--- /dev/null
+++ b/src/pages/holiday/type.js
@@ -0,0 +1,166 @@
+import React,{Component} from 'react'
+import {Button,message} from 'antd'
+import List from './container/typeList.js'
+import PopTip from './container/popTip.js'
+import EditModel from './container/editModel.js';
+export default class extends Component {
+    constructor(props){
+        super(props);
+        this.cols = [
+            {
+                title:'假期类型',
+                key:'type'
+            },
+            {
+                title:'状态',
+                key:'status',
+                width:100
+            },
+            {
+                title:'假期上限(天)',
+                key:'max_time',
+                width:150
+            },
+            {
+                title:'周期',
+                key:'period',
+                width:150
+            },
+            {
+                title:'附件证明',
+                key:'attachment',
+                width:100
+            },
+            {
+                type:'action',
+                width:200,
+                title:'操作',
+                render:(item) => {
+                    return <div className='action'>
+                        <span className='action' onClick={() => this.editHandel('edit_type','编辑类型',item)}>编辑</span>
+                        {item.status === 1?<span className='action' onClick={() => this.actionHandle('停用假期类型','stopType','change_status',{...item,...{status:0}})}>停用</span>:<span className='action' onClick={() => this.actionHandle('启用假期类型','startType','change_status',{...item,...{status:1}})}>启用</span>}
+                        {item.default === 1?null:<span className='action' onClick={() => this.actionHandle('删除假期类型','delType','del_type',item)}>删除</span>}
+                    </div>
+                }
+            }
+        ];
+        this.closePopTip = this.closePopTip.bind(this);
+        this.actionHandle = this.actionHandle.bind(this);
+        this.renderFrom = this.renderFrom.bind(this);
+        this.verifyFrom = this.verifyFrom.bind(this);
+        this.changeTree = this.changeTree.bind(this);
+        this.popTipTitle = '';
+        this.popTipType = '';
+        this.popTipDispatch = '';
+        this.popTipData = '';
+        this.editModelTitle = '';
+        this.editModelType = '';
+        this.state = {
+            showPopTip:false,
+            showEditModel:false,
+            editData:'',
+            visible:true
+        };
+    }
+    closePopTip(){
+        this.setState({
+            showEditModel:false,
+            showPopTip:false
+        })
+    }
+    changeTree(boolean){
+        this.setState({
+            visible:boolean
+        });
+    }
+    renderFrom(){
+        return <table className='g-from'>
+            <tbody>
+             <tr className='item'>
+                <td className='in-h'>
+                    类型<span className='in-star'>*</span>
+                </td>
+                 <td>
+                     <input className='input' type='text' onChange={(event) =>this.formValueChange('type',event.target.value) } value={this.state.editData.type}/>
+                 </td>
+            </tr>
+            <tr className='item'>
+                <td className='in-h'>
+                    假期上限 <span className='in-star'>*</span>
+                </td>
+                 <td>
+                     <input type='text' className='input' onChange={(event) =>this.formValueChange('max_time',event.target.value,'num') } value={this.state.editData.max_time}/>
+                 </td>
+            </tr>
+            <tr className='item' height='40'>
+                <td className='in-h'>
+                    周期<span className='in-star'>*</span>
+                </td>
+                 <td>
+                     <label htmlFor="mouth">每月<input type='radio' onChange={(event) =>this.formValueChange('period',2) } classID='mouth' checked={this.state.editData.period === 2} name='period' value={2}/></label>
+                     <label htmlFor="year">每年<input type='radio' onChange={(event) =>this.formValueChange('period',1) } classID='year' checked={this.state.editData.period === 1} name='period' value={1}/></label>
+                     <label htmlFor="forever">永久<input type='radio' onChange={(event) =>this.formValueChange('period',3) } classID='forever' checked={this.state.editData.period === 3} name='period' value={3}/></label>
+                 </td>
+            </tr>
+            <tr className='item' height='40'>
+                <td className='in-h'>
+                    附件证明 <span className='in-star'>*</span>
+                </td>
+                 <td>
+                     <label htmlFor="yes">是<input type='radio' onChange={() =>this.formValueChange('attachment',1) } classID='yes' checked={this.state.editData.attachment === 1} name='attachment' value={1}/></label>
+                     <label htmlFor="no">否<input type='radio' onChange={() =>this.formValueChange('attachment',0) } classID='no' checked={this.state.editData.attachment === 0} name='attachment' value={0}/></label>
+                 </td>
+            </tr>
+            </tbody>
+        </table>
+    }
+    verifyFrom(){
+        if(this.state.editData.type.replace(/\s/g,'').length <= 0){
+            message.warning('请输入假期类型');
+            return false
+        } else if ((this.state.editData.max_time + '').replace(/\s/g,'').length <= 0) {
+             message.warning('请输入假期上限');
+            return false
+        } else {
+            return true;
+        }
+    }
+    actionHandle(title,type,dispatch,data){
+      this.popTipTitle = title;
+      this.popTipType = type;
+      this.popTipData = data;
+      this.popTipDispatch = dispatch;
+      this.setState({
+          showPopTip:true
+      });
+    }
+    formValueChange(filed,value,type='text'){
+        if(type === 'num'){
+            value = value.replace(/[^\d]/g,'')
+        }
+        this.setState((prevS) => {
+            Object.assign(prevS.editData,{[filed]:value});
+            return {
+                editData:prevS.editData
+            }
+        })
+    }
+    editHandel(type,title,data={max_time:0,period:1,attachment:0,type:''}){
+        this.editModelTitle = title;
+        this.editModelType = type;
+        this.setState({
+            showEditModel:true,
+            editData:data
+        });
+    }
+    render(){
+        return <div className='m-holiday_type'>
+            <div className="g-header">
+                <Button onClick={() => this.editHandel('add_type','新增类型')}>新增类型</Button>
+            </div>
+            <List cols={this.cols} title='假期类型'/>
+            {this.state.showPopTip ? <PopTip onClose={this.closePopTip} data={this.popTipData} title={this.popTipTitle} type={this.popTipType} dispatch={this.popTipDispatch}/>:null}
+            {this.state.showEditModel ? <EditModel onClose={this.closePopTip} render={() => this.renderFrom()} verifyFrom={this.verifyFrom} data={this.state.editData} title={this.editModelTitle} type={this.editModelType}/>:null}
+        </div>
+    }
+}
\ No newline at end of file
diff --git a/src/pages/member/editMenber.js b/src/pages/member/editMenber.js
new file mode 100644
index 0000000..7752436
--- /dev/null
+++ b/src/pages/member/editMenber.js
@@ -0,0 +1,124 @@
+import React ,{Component} from 'react';
+import {Button,message} from 'antd';
+import OptDept from './../../components/g-selectData.js';
+export default class  extends Component {
+    constructor(props){
+        super(props);
+        this.state={
+            optDept:false,
+            member_id:props.meberMsg.member_id || undefined,
+            member_name:props.meberMsg.member_name || '',
+            department_id:props.meberMsg.department_id || '',
+            department_name:props.meberMsg.department_name || '',
+            work_num:props.meberMsg.work_num || ''
+        };
+        this.onChangeTree = this.onChangeTree.bind(this);
+        this.getOptDept = this.getOptDept.bind(this);
+        this.submit = this.submit.bind(this);
+	    this.curDept = [];
+        if(props.meberMsg.department_id && props.meberMsg.department_name){
+           this.curDept = [{department_id:props.meberMsg.department_id,department_name:props.meberMsg.department_name}];
+        }
+    }
+    changeVal(filed,val,type='text'){
+        if(type === 'num'){
+            val = val.replace(/[^\d]/g,'');
+        }
+        this.setState({
+            [filed]:val
+        });
+    }
+    onChangeTree(flag){
+        this.setState({
+            optDept:flag
+        });
+    }
+    getOptDept(data = []){
+        this.curDept = data;
+        this.setState({
+            department_id:(data[0] || {}).department_id || '',
+            department_name:(data[0] || {}).department_name || ''
+        });
+    }
+    verifyFrom(param){
+        if(!param.member_name){
+            message.warning('请输入员工姓名');
+            return false;
+        } else if(!param.department_name || !param.department_id){
+            message.warning('请选择员工部门');
+            return false;
+        } else {
+            return true;
+        }
+    }
+    submit(){
+        const param = {
+            member_name:this.state.member_name.replace(/^\s+|\s+$/g,''),
+            department_id:this.state.department_id,
+            work_num:this.state.work_num ,
+            department_name:this.state.department_name
+        };
+        if(!this.verifyFrom(param)) return false;
+        const type = this.state.member_id?'edit':'add';
+        const data = {
+            add:{
+                url:'/staff/add',
+                param:param,
+                success:'新增员工成功',
+                error:',员工新增失败'
+            },
+            edit:{
+                url:'/staff/edit',
+                param:{...param,member_id:this.state.member_id},
+                success:'编辑员工成功',
+                error:',员工编辑失败'
+            }
+        }[type];
+        this.$http.post(data.url,data.param).then(res => {
+            const resData = res.data || {};
+            if(resData.code + '' === '0'){
+                message.success(data.success);
+                this.props.changeState('list',true);
+            } else {
+                message.error(resData.msg+data.error);
+            }
+        });
+    }
+    render(){
+        return (
+            <div className='m-member-edit'>
+                <table className='g-from'>
+                    <tbody>
+                        <tr>
+                            <td className='in-h'>姓名<span className='in-star'>*</span></td>
+                            <td>
+                                <input className='input' value={this.state.member_name} onChange={(event) => this.changeVal('member_name',event.target.value)}/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td className='in-h'>部门<span className='in-star'>*</span></td>
+                            <td>
+                                <Button onClick={() => this.onChangeTree(true)}>部门</Button>
+                                {this.state.department_name?<span className='result-p'>{this.state.department_name}</span>:null}
+                                {this.state.optDept?<OptDept maxNum={1} type='dept' visible={this.state.optDept} onOk={this.getOptDept} onChangeTree={this.onChangeTree} selectedData={this.curDept}/>:null}
+                            </td>
+                        </tr>
+                        <tr>
+                            <td className='in-h'>工号</td>
+                            <td>
+                                <input className='input' value={this.state.work_num} onChange={(event) => this.changeVal('work_num',event.target.value,'num')}/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td className='in-h'></td>
+                            <td>
+                                <button type='button' className='submit' style={{marginRight:'10px'}} onClick={this.submit}>确定</button>
+                                <button type='button' className='cancel' onClick={() => this.props.changeState('list')}>取消</button>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/pages/member/index.css b/src/pages/member/index.css
new file mode 100644
index 0000000..90f27c2
--- /dev/null
+++ b/src/pages/member/index.css
@@ -0,0 +1,9 @@
+.m-member-edit{
+    padding-top: 50px;
+    padding-left: 50px;
+}
+.m-list .action{
+    cursor: pointer;
+    font-size: 14px;
+    color: #24c875;
+}
\ No newline at end of file
diff --git a/src/pages/member/index.js b/src/pages/member/index.js
new file mode 100644
index 0000000..cf0c3f2
--- /dev/null
+++ b/src/pages/member/index.js
@@ -0,0 +1,119 @@
+import React ,{Component} from 'react';
+import {Button,message,Modal} from 'antd'
+import EditMember from './editMenber.js'
+import Layout from './../../components/layout.js';
+import {updateStaff, search} from './../../global/initBaseData.js';
+import './index.css';
+import ListMember from './listMember.js';
+export default class extends Component {
+    constructor(props){
+        super(props);
+        this.state = {
+            status:'list',
+            tb_data:[],
+            delModel:false
+        };
+        this.changeState= this.changeState.bind(this);
+        this.handle = this.handle.bind(this);
+        this.del = this.del.bind(this);
+        this.columns = [
+            {
+                title:'Article',
+                key:'member_name',
+                dataIndex:'member_name',
+                width:200
+            },
+            {
+                title:'Author',
+                key:'department_name',
+                dataIndex:'department_name',
+                width:400
+            },
+            {
+                title:'Year',
+                key:'work_num',
+                dataIndex:'work_num',
+                width:200
+            },
+            {
+                title:'Field',                
+                key:'department_name',
+                dataIndex:'department_name',
+                width:500
+                // render:(record) => {
+                //     return (
+                //         <div>
+                //             <span className="action" onClick={() => this.handle('edit',record)}>编辑</span>
+                //             <span className="action" style={{marginLeft:'10px'}} onClick={() => this.handle('del',record)}>删除</span>
+                //         </div>
+                //     )
+                // }
+            }
+        ]
+    }
+    handle(type,data={}){
+        this.rowData = data;
+        if(type !== 'del'){
+            this.changeState('edit');
+        } else {
+            this.setState({
+                delModel:true
+            })
+        }
+    }
+    updateList(){
+        updateStaff.bind(this)();
+    }
+
+    searchresults(){
+        alert('1');
+        const dataset = [
+            {
+                year: 2007,
+            }
+        ];
+        search.bind(this)(dataset);
+    }
+
+    del(){
+        this.$http.post('/staff/del',{
+            member_id:this.rowData.member_id
+        }).then(res => {
+            const resData = res.data || {};
+            if(resData.code + '' === '0'){
+                message.success('员工删除成功');
+                this.setState({
+                    delModel:false
+                });
+                this.updateList();
+            } else {
+                message.error('员工删除失败');
+            }
+        })
+    }
+    changeState(status,update){
+        this.setState({
+            status
+        });
+        update && this.updateList();
+    }
+    render(){
+        return (
+            <Layout type={1}>
+                <div className='m-members' >
+                    {this.state.status === 'list'?<div className='m-list'>
+                        <div className='g-header'>
+                            <input type='text' placeholder='2018'></input>
+                            <Button type="primary" onClick={() => this.searchresults()}>Search</Button>
+                        </div>
+                        <ListMember columns={this.columns}/>
+                    </div>:null}
+                    {this.state.status ==='edit'?<EditMember meberMsg={this.rowData} changeState={this.changeState}/>:null}
+                    {this.state.delModel?<Modal wrapClassName='g-popup-sure' closable={false} title='删除员工' onOk={this.del} onCancel={() => this.setState({delModel:false})} visible={true}>
+                        <p className="info">确定删除该员工，删除之后数据将无法恢复？</p>
+                    </Modal>:null}
+                </div>
+            </Layout>
+        )
+    }
+}
\ No newline at end of file
diff --git a/src/pages/member/listMember.js b/src/pages/member/listMember.js
new file mode 100644
index 0000000..2470417
--- /dev/null
+++ b/src/pages/member/listMember.js
@@ -0,0 +1,17 @@
+import React,{Component} from 'react';
+import {connect} from 'react-redux';
+import Table from './../../components/g-list.js'
+
+class List extends Component{
+    render(){
+        const {columns,tb_data} = this.props;
+        return <Table cols={columns} data={tb_data} offset={55} title='Search Results'/>
+    }
+}
+export default connect((state) => {
+    return {
+        tb_data:(function(staff){
+            return staff.map(data => ({...data,key:data.member_id}))
+        })(state.baseData.staff)
+    }
+})(List);
\ No newline at end of file
diff --git a/src/pages/warn/index.css b/src/pages/warn/index.css
new file mode 100644
index 0000000..6535312
--- /dev/null
+++ b/src/pages/warn/index.css
@@ -0,0 +1,13 @@
+.m-warn{
+    padding-top: 200px;
+    text-align: center;
+}
+.warning{
+    color: #ff3300;
+    font-size: 50px;
+}
+.info{
+    margin-top: 20px;
+    color: rgba(255, 120, 27, 0.78);
+    font-size: 14px;
+}
\ No newline at end of file
diff --git a/src/pages/warn/index.js b/src/pages/warn/index.js
new file mode 100644
index 0000000..4206495
--- /dev/null
+++ b/src/pages/warn/index.js
@@ -0,0 +1,15 @@
+/**
+ * Created by Gouuse on 2018/1/26 0026.
+ */
+import React ,{ Component }from 'react';
+import {Icon} from 'antd';
+import {NavLink as Link} from 'react-router-dom';
+import './index.css'
+export default class Warn extends Component{
+    render(){
+        return <div className="m-warn">
+            <Icon type="frown-o" className="warning"/>
+            <p className="info">你没有连接数据库，部分数据或功能会出现异常！！！<Link to={`/attendence`} >继续访问</Link></p>
+        </div>
+    }
+};
\ No newline at end of file
diff --git a/src/registerServiceWorker.js b/src/registerServiceWorker.js
new file mode 100644
index 0000000..4a3ccf0
--- /dev/null
+++ b/src/registerServiceWorker.js
@@ -0,0 +1,108 @@
+// In production, we register a service worker to serve assets from local cache.
+
+// This lets the app load faster on subsequent visits in production, and gives
+// it offline capabilities. However, it also means that developers (and users)
+// will only see deployed updates on the "N+1" visit to a page, since previously
+// cached resources are updated in the background.
+
+// To learn more about the benefits of this model, read https://goo.gl/KwvDNy.
+// This link also includes instructions on opting out of this behavior.
+
+const isLocalhost = Boolean(
+  window.location.hostname === 'localhost' ||
+    // [::1] is the IPv6 localhost address.
+    window.location.hostname === '[::1]' ||
+    // 127.0.0.1/8 is considered localhost for IPv4.
+    window.location.hostname.match(
+      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
+    )
+);
+
+export default function register() {
+  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+    // The URL constructor is available in all browsers that support SW.
+    const publicUrl = new URL(process.env.PUBLIC_URL, window.location);
+    if (publicUrl.origin !== window.location.origin) {
+      // Our service worker won't work if PUBLIC_URL is on a different origin
+      // from what our page is served on. This might happen if a CDN is used to
+      // serve assets; see https://github.com/facebookincubator/create-react-app/issues/2374
+      return;
+    }
+
+    window.addEventListener('load', () => {
+      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+
+      if (!isLocalhost) {
+        // Is not local host. Just register service worker
+        registerValidSW(swUrl);
+      } else {
+        // This is running on localhost. Lets check if a service worker still exists or not.
+        checkValidServiceWorker(swUrl);
+      }
+    });
+  }
+}
+
+function registerValidSW(swUrl) {
+  navigator.serviceWorker
+    .register(swUrl)
+    .then(registration => {
+      registration.onupdatefound = () => {
+        const installingWorker = registration.installing;
+        installingWorker.onstatechange = () => {
+          if (installingWorker.state === 'installed') {
+            if (navigator.serviceWorker.controller) {
+              // At this point, the old content will have been purged and
+              // the fresh content will have been added to the cache.
+              // It's the perfect time to display a "New content is
+              // available; please refresh." message in your web app.
+              console.log('New content is available; please refresh.');
+            } else {
+              // At this point, everything has been precached.
+              // It's the perfect time to display a
+              // "Content is cached for offline use." message.
+              console.log('Content is cached for offline use.');
+            }
+          }
+        };
+      };
+    })
+    .catch(error => {
+      console.error('Error during service worker registration:', error);
+    });
+}
+
+function checkValidServiceWorker(swUrl) {
+  // Check if the service worker can be found. If it can't reload the page.
+  fetch(swUrl)
+    .then(response => {
+      // Ensure service worker exists, and that we really are getting a JS file.
+      if (
+        response.status === 404 ||
+        response.headers.get('content-type').indexOf('javascript') === -1
+      ) {
+        // No service worker found. Probably a different app. Reload the page.
+        navigator.serviceWorker.ready.then(registration => {
+          registration.unregister().then(() => {
+            window.location.reload();
+          });
+        });
+      } else {
+        // Service worker found. Proceed as normal.
+        registerValidSW(swUrl);
+      }
+    })
+    .catch(() => {
+      console.log(
+        'No internet connection found. App is running in offline mode.'
+      );
+    });
+}
+
+export function unregister() {
+  if ('serviceWorker' in navigator) {
+    navigator.serviceWorker.ready.then(registration => {
+      registration.unregister();
+    });
+  }
+}
diff --git a/src/router/index.js b/src/router/index.js
new file mode 100644
index 0000000..ff47659
--- /dev/null
+++ b/src/router/index.js
@@ -0,0 +1,10 @@
+import React,{Component} from 'react'
+import {BrowserRouter as Router,Route} from 'react-router-dom'
+import App from './../App.js';
+export default class  extends Component {
+    render() {
+        return <Router>
+            <Route component={App}/>
+        </Router>
+    }
+}
\ No newline at end of file
diff --git a/src/store/index.js b/src/store/index.js
new file mode 100644
index 0000000..626a632
--- /dev/null
+++ b/src/store/index.js
@@ -0,0 +1,11 @@
+import {combineReducers,createStore} from 'redux';
+import attrendance from './reducer/attrendance/index.js';
+import holiday from './reducer/holiday/index.js';
+import baseData from './reducer/baseData/index.js';
+import att from './reducer/att/index.js';
+export default createStore(combineReducers({
+    attrendance,
+    holiday,
+    baseData,
+    att
+}));
\ No newline at end of file
diff --git a/src/store/reducer/att/index.js b/src/store/reducer/att/index.js
new file mode 100644
index 0000000..6651523
--- /dev/null
+++ b/src/store/reducer/att/index.js
@@ -0,0 +1,61 @@
+/**
+ * Created by Gouuse on 2018/1/15 0015.
+ */
+import {combineReducers} from 'redux'
+const default_group = [
+    {
+        id:1,
+        group_name:'默认分组',
+        is_default:1,
+        att_type:1,
+        is_flexible:0,
+        ex_time:0,
+        last_time:0,
+        att_class:2,
+        members:[]
+    }
+];
+const default_class=[
+    {
+       id:2,
+       type:'考勤默认班次9:00-18:00'
+    },
+    {
+        id:1,
+        type:'休息'
+    }
+];
+function att_group(group=default_group,action) {
+    switch (action.type){
+        case 'edit_att_group':
+            if(!action.data.is_flexible){
+                action.data.ex_time = 0;
+                action.data.last_time = 0;
+            }
+            if(!action.data.id) {
+                return [...group,{...action.data,id:new Date().getTime()}];
+            } else {
+                return group.map(item => {
+                    if(item.id * 1 === action.data.id * 1){
+                        return action.data;
+                    } else {
+                        return item;
+                    }
+                })
+            }
+        case 'del_att_group':
+            return group.filter(item => item.id !== action.data.id);
+        default:
+            return group
+    }
+}
+function att_class(classes = default_class, action) {
+    switch (action.type){
+        default:
+            return classes;
+    }
+}
+export default combineReducers({
+    att_group,
+    att_class
+})
\ No newline at end of file
diff --git a/src/store/reducer/attrendance/index.js b/src/store/reducer/attrendance/index.js
new file mode 100644
index 0000000..db824ae
--- /dev/null
+++ b/src/store/reducer/attrendance/index.js
@@ -0,0 +1,113 @@
+import {combineReducers} from 'redux'
+const defaultStaffs =  [
+                {
+        member_id:1,
+        member_name:'QxQstar',
+        phone:12345678,
+        leader:false,
+        letter:'Q',
+        position:'研究员',
+        like:1,
+        dpart_name:'web'
+    },
+                {
+                    member_id:2,
+                    member_name:'ZQxQsta2r',
+                    phone:123456738,
+                    leader:false,
+                    letter:'Z',
+                    like:0,
+                    position:'研究员',
+                    dpart_name:'web'
+                },
+                {
+                    member_id:3,
+                    member_name:'DQxQstar3',
+                    letter:'D',
+                    phone:12345878,
+                    leader:true,
+                    like:1,
+                    dpart_name:'web'
+                },
+                {
+                    member_id:4,
+                    member_name:'Huih',
+                    letter:'H',
+                    phone:12345866,
+                    leader:true,
+                    like:0,
+                    dpart_name:'web'
+                }
+            ];
+const defaultCommon = [];
+const defaultExter = [
+                {
+                    member_id:8,
+                    member_name:'梨花8',
+                    like:0,
+                    phone:['1234567']
+                }
+            ];
+function staffs(staffs=defaultStaffs, action) {
+    switch (action.type){
+        case 'changeCommon':
+            return staffs.map(staff =>{
+                if(staff.member_id === action.member_id){
+                  staff.like = action.flag
+                }
+                return staff;
+            });
+        default:
+            return staffs
+    }
+}
+function commons(commons=defaultCommon, action) {
+    switch (action.type){
+        case 'delCommon':
+            return commons.filter(common => {
+                return common.member_id !== action.member.member_id;
+            });
+        case 'addCommon':
+            return [...commons,Object.assign({},action.member,{like:1})];
+        default:
+            return commons
+    }
+}
+function externals(externals=defaultExter,action) {
+    switch (action.type){
+        case 'addExternal':
+            externals.push({...action.params,...{member_id:new Date().getTime()}});
+            return externals;
+        case 'exitExternal':
+            return externals.map(external => {
+                if(external.member_id === action.params.member_id){
+                    external = {...external,...action.params};
+                }
+                return external;
+            });
+        case 'delExternal':
+            return externals.filter(externals => externals.member_id !== action.member_id);
+        default :
+            return externals
+    }
+}
+function curMember(curMember, action) {
+    switch (action.type){
+        case 'changeCur':
+            return {...curMember,...action.param};
+        default:
+            return [
+                {
+                    member_id:1,
+                    member_name:'梨花',
+                    phone:[1234567]
+                }
+            ]
+    }
+}
+export default combineReducers({
+    staffs,
+    commons,
+    externals,
+    curMember
+})
\ No newline at end of file
diff --git a/src/store/reducer/baseData/index.js b/src/store/reducer/baseData/index.js
new file mode 100644
index 0000000..e41d41d
--- /dev/null
+++ b/src/store/reducer/baseData/index.js
@@ -0,0 +1,75 @@
+import {combineReducers} from 'redux';
+
+const defaultDept = [
+    {
+        dept_id:0,
+        dept_pid:-1,
+        dept_name:'QxQstar'
+    },
+    {
+        dept_id:1,
+        dept_pid:0,
+        dept_name:'研发部'
+    },
+    {
+        dept_id:2,
+        dept_pid:0,
+        dept_name:'产品部'
+    },
+    {
+        dept_id:3,
+        dept_pid:2,
+        dept_name:'销售部'
+    },
+    {
+        dept_id:4,
+        dept_pid:0,
+        dept_name:'web前端'
+    }
+];
+const defaultStaff = [
+    {
+        member_id:1,
+        letter:'Q',
+        member_name:"秦煜祺",
+        dept_id:1,
+    },
+    {
+        member_id:2,
+        letter:'Z',
+        member_name:"张玉洁",
+        dept_id:1,
+    },
+    {
+        member_id:3,
+        letter:'D',
+        member_name:"董宇环",
+        dept_id:2,
+    },
+    {
+        member_id:4,
+        letter:'D',
+        member_name:"杜江",
+        dept_id:3,
+    }
+];
+function dept(dept = defaultDept, action) {
+    switch (action.type){
+        case 'getDept':
+            return action.data;
+        default:
+            return dept;
+    }
+}
+function staff(staff = defaultStaff, action) {
+    switch (action.type){
+        case 'getStaff':
+            return action.data;
+        default:
+            return staff;
+    }
+}
+export default combineReducers({
+    dept,
+    staff
+})
\ No newline at end of file
diff --git a/src/store/reducer/holiday/index.js b/src/store/reducer/holiday/index.js
new file mode 100644
index 0000000..f344a1f
--- /dev/null
+++ b/src/store/reducer/holiday/index.js
@@ -0,0 +1,253 @@
+import {combineReducers} from 'redux'
+const default_holiday_type = [
+    {
+        id:1,
+        type:'年假',
+        status:1,
+        max_time:0,
+        period:1,
+        default:1,
+        attachment:0,
+    },
+    {
+        id:2,
+        type:'调休',
+        status:1,
+        max_time:0,
+        period:1,
+        default:1,
+        attachment:0,
+    },
+    {
+        id:3,
+        type:'奖励假',
+        status:1,
+        max_time:0,
+        period:1,
+        default:1,
+        attachment:0,
+    },
+    {
+        id:4,
+        type:'test',
+        status:1,
+        max_time:0,
+        period:1,
+        default:0,
+        attachment:0,
+    },
+];
+const default_award = [
+    {
+        id:1,
+        member_name:'QxQsatr',
+        work_num:123,
+        department_name:'Web奇安达',
+        total_day:12,
+        remove_day:10
+    },
+    {
+        id:2,
+        member_name:'东方酒店',
+        work_num:123,
+        department_name:'HpH奇安达',
+        total_day:12,
+        remove_day:10
+    },
+    {
+        id:3,
+        member_name:'大多数',
+        work_num:123,
+        department_name:'PHP奇安达',
+        total_day:12,
+        remove_day:10
+    }
+];
+const default_day_off = [
+    {
+        id:1,
+        member_name:'的房间打开',
+        department_name:'Web前端',
+        work_num:12,
+        remove_time:12
+    },
+    {
+        id:2,
+        member_name:'的打开',
+        department_name:'PHP开发',
+        work_num:14,
+        remove_time:12
+    },
+    {
+        id:3,
+        member_name:'房间打开',
+        department_name:'Ios开发',
+        work_num:13,
+        remove_time:12
+    }
+];
+const default_annual = [
+    {
+        id:1,
+        member_name:'qxq',
+        department_name:'web',
+        work_num:12,
+        remove_time:12,
+        all_time:12
+    }
+];
+const default_day_off_rule = {
+    type:1
+};
+function holiday_type(holiday_type=default_holiday_type,action) {
+    switch (action.type){
+        case 'add_type':
+            return [...holiday_type,{...action.params,...{id:new Date().getTime(),status:1}},];
+        case 'edit_type':
+            return holiday_type.map(type => {
+                if(type.id === action.params.id){
+                    return action.params
+                } else {
+                    return type
+                }
+            });
+        case 'del_type':
+            return holiday_type.filter(type => {
+                return type.id !== action.params.id
+            });
+        case 'change_status':
+            return holiday_type.map(type => {
+                if(type.id === action.params.id){
+                    return Object.assign({},type,{status:action.params.status})
+                } else {
+                    return type
+                }
+            });
+        default:
+            return holiday_type
+    }
+}
+function award(award=default_award,action) {
+    switch(action.type){
+        case 'selectAll_award':
+            return award.map((item) => {
+                return {...item,...action.params}
+            });
+        case 'selectOne_award':
+            return award.map(item => {
+                if(item.id === action.params.id){
+                    return action.params;
+                } else {
+                    return item
+                }
+            });
+        case 'del_award':
+            return award.filter(item => {
+                return item.id !== action.params.id
+            });
+        case 'del_award_batch':
+            return award.filter(item => {
+                return !item.checked
+            });
+        case 'add_award':
+            return [...award,{...action.params,...{id:new Date().getTime()}}]
+        case 'edit_award':
+            return award.map(item => {
+                if(item.id === action.params.id){
+                    return {...item,...action.params}
+                } else {
+                    return item
+                }
+            });
+        default:
+            return award
+    }
+}
+function annual(annual=default_annual,action) {
+    switch (action.type){
+        case 'del_ann':
+            return annual.filter(item => item.id !== action.params.id);
+        case 'add_ann':
+            return [...annual,{...action.params,...{id:new Date().getTime()}}];
+        case 'edit_ann':
+            return annual.map(item => {
+                if(item.id === action.params.id){
+                    return action.params;
+                } else {
+                    return item;
+                }
+            });
+        default:
+            return annual;
+    }
+}
+function day_off(day_off = default_day_off, action) {
+    switch (action.type){
+        case 'del_day_off':
+            return day_off.filter(item => {
+                return item.id !== action.params.id;
+            });
+        case 'del_day_off_batch':
+            return day_off.filter(item => {
+                return !item.checked
+            });
+        case 'selectAll_day_off':
+            return day_off.map((item) => {
+                return {...item,...action.params}
+            });
+        case 'add_day_off':
+            return [...day_off,{...action.params,...{id:new Date().getTime()}}]
+        case 'edit_day_off':
+            return day_off.map(item => {
+                if(item.id === action.params.id){
+                    return {...item,...action.params}
+                } else {
+                    return item
+                }
+            });
+        case 'selectOne_day_off':
+            return day_off.map(item => {
+                if(item.id === action.params.id){
+                    return action.params;
+                } else {
+                    return item
+                }
+            });
+        default:
+            return day_off
+    }
+}
+function day_off_rule(rule=default_day_off_rule, action) {
+    switch (action.type){
+        case "editDayOffRule":
+            return action.params;
+        default:
+            return rule
+    }
+}
+function annual_rules(rules=[],action) {
+    switch (action.type){
+        case 'edit_annual_rules':
+            return action.rules;
+        default:
+            return rules
+    }
+}
+function annual_type(annual_type=1, action) {
+    switch (action.type){
+        case 'edit_annual_type':
+            return action.state;
+        default:
+            return annual_type;
+    }
+}
+
+export default combineReducers({
+    holiday_type,
+    award,
+    day_off,
+    day_off_rule,
+    annual_rules,
+    annual_type,
+    annual
+})
\ No newline at end of file

From 92cbe47de733473fe222e20f0716fa61ac769463 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Tue, 15 Oct 2019 20:57:56 +1300
Subject: [PATCH 27/57] # 1 complicated search with unequal condition.

---
 src/global/initBaseData.js     | 41 +++++++++++++++++++++++++++++++---
 src/pages/member/index.css     |  9 ++++++++
 src/pages/member/index.js      | 34 +++++++++++++++++++++-------
 src/pages/member/listMember.js |  2 +-
 4 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/src/global/initBaseData.js b/src/global/initBaseData.js
index fdbee0e..8c0426e 100644
--- a/src/global/initBaseData.js
+++ b/src/global/initBaseData.js
@@ -15,18 +15,53 @@ export function updateStaff () {
 
 export function search (dataset) {
     const dispatch = store.dispatch;
-    alert('2');
      this.$http.post('/staff/list').then(res => {
          const resData = res.data || {};
+        //  var newlist = {};
+        //  resData.data.map(year =>(if(year.work_num * 1 === dataset.year * 1){newlist.push(year)});
          if(resData.code + '' === '0'){
+            // resData.data.map(element => {
+            //     if(element.work_num * 1 === dataset.year * 1)
+            //     {
+            //         alert(element.work_num);
+            //         resData.data.remove(element);
+            //     }
+            // });
              dispatch({
-                 type:'getStaff',
-                 data:resData.data || []
+                type:'getStaff',
+                //  data:resData.data || []
+                data:trim_nulls(resData.data.map(year =>((year.work_num * 1 >= dataset.from * 1 && year.work_num * 1 <= dataset.to * 1)
+                    
+                    ?  
+                    year : {})))|| []
              });
          }
      });
  
  }
+//  function addItems(resData,dataset)
+//  {
+//     const list = resData
+//     resData.map(element => {
+//         if(element.work_num * 1 === dataset.year * 1)
+//         {
+//             list
+//         }
+//     });
+//     return list;
+//  }
+
+function trim_nulls(data) {
+    var y;
+    for (var x in data) {
+        y = data[x];
+        if (y instanceof Object) y = trim_nulls(y);
+        if (y === "null" || y === null || y === "" || typeof y === "undefined" || (y instanceof Object && Object.keys(y).length == 0)) {
+            delete data[x];
+        }
+    }
+    return data;
+}
 
 export function updateDept() {
     const dispatch = store.dispatch;
diff --git a/src/pages/member/index.css b/src/pages/member/index.css
index 90f27c2..4728e7c 100644
--- a/src/pages/member/index.css
+++ b/src/pages/member/index.css
@@ -6,4 +6,13 @@
     cursor: pointer;
     font-size: 14px;
     color: #24c875;
+}
+.dataInput{
+    margin-left:2%;
+	width: 10%;
+	height: 45%;
+}
+
+.searchButton{
+    margin-left:2%;
 }
\ No newline at end of file
diff --git a/src/pages/member/index.js b/src/pages/member/index.js
index cf0c3f2..f227f5e 100644
--- a/src/pages/member/index.js
+++ b/src/pages/member/index.js
@@ -66,12 +66,10 @@ export default class extends Component {
     }
 
     searchresults(){
-        alert('1');
-        const dataset = [
-            {
-                year: 2007,
-            }
-        ];
+        var dataset = {
+            from: this.refs.from.value,
+            to: this.refs.to.value
+        };
         search.bind(this)(dataset);
     }
 
@@ -103,8 +101,28 @@ export default class extends Component {
                 <div className='m-members' >
                     {this.state.status === 'list'?<div className='m-list'>
                         <div className='g-header'>
-                            <input type='text' placeholder='2018'></input>
-                            <Button type="primary" onClick={() => this.searchresults()}>Search</Button>
+                            <font size="3" color="green" className ='dataInput'>From</font>
+                            <input type='text' placeholder='2018 ' ref='from' className ='dataInput'></input>
+                            <font size="3" color="green" className ='dataInput'>To</font>
+                            <input type='text' placeholder='2019 ' ref='to' className ='dataInput'></input>
+                            <Button type="primary" onClick={() => this.searchresults() } className ='searchButton' >Search</Button>
+                        </div>
+                        <div className='g-header'>
+                            <font size="3" color="blue" className ='dataInput'>IF</font>
+                            <select className ='dataInput'>
+                                <option value = "0">Article title</option>
+                                <option value = "1">Method</option>
+                                <option value = "2">Benefit</option>
+                                <option value = "3">Participarts</option>
+                                <option value = "4">Author</option>
+                            </select>
+                            <select className ='dataInput'>
+                                <option value = "0">Contains</option>
+                                <option value = "1">Not Contain</option>
+                                <option value = "2">begins with</option>
+                                <option value = "3">ends with</option>
+                                <option value = "4">is equal</option>
+                            </select>
                         </div>
                         <ListMember columns={this.columns}/>
                     </div>:null}
diff --git a/src/pages/member/listMember.js b/src/pages/member/listMember.js
index 2470417..60cbadd 100644
--- a/src/pages/member/listMember.js
+++ b/src/pages/member/listMember.js
@@ -11,7 +11,7 @@ class List extends Component{
 export default connect((state) => {
     return {
         tb_data:(function(staff){
-            return staff.map(data => ({...data,key:data.member_id}))
+            return staff.map(data => (data.work_num * 1 > 0 ? {...data,key:data.member_id}:{}))
         })(state.baseData.staff)
     }
 })(List);
\ No newline at end of file

From 4bf342c134a6fddac02eefdbc3eba156356e2aa2 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Tue, 15 Oct 2019 22:41:53 +1300
Subject: [PATCH 28/57] change index page

---
 src/pages/attendence/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/attendence/index.js b/src/pages/attendence/index.js
index fcf929f..888b2c7 100644
--- a/src/pages/attendence/index.js
+++ b/src/pages/attendence/index.js
@@ -4,7 +4,9 @@ import LeftNav from './components/leftNav.js'
 import Layout from '../../components/layout.js'
 class Index extends Component {
     componentDidMount(){
-        this.props.history.push('/attendence/staff')
+        //this.props.history.push('/attendence/staff')
+        this.props.history.push('/member')
+
     }
     render(){
         return (

From 99f6e0f48cecb805d6a6a9034831feed81816fa2 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Wed, 16 Oct 2019 11:55:26 +1300
Subject: [PATCH 29/57] change page title and test commit

---
 public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 7bee027..f4ad8f1 100644
--- a/public/index.html
+++ b/public/index.html
@@ -19,7 +19,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>SERLER</title>
   </head>
   <body>
     <noscript>

From 5ff6302317a699c9b68bf84ad06e6a76b2aa2b11 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Wed, 16 Oct 2019 12:09:57 +1300
Subject: [PATCH 30/57] change url

---
 src/components/content.js     | 2 +-
 src/components/menu.js        | 2 +-
 src/pages/attendence/index.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/content.js b/src/components/content.js
index b922ccf..9ef03b4 100644
--- a/src/components/content.js
+++ b/src/components/content.js
@@ -13,7 +13,7 @@ export default class  extends Component{
                 <Route path='/holiday' component={Holiday}/>
                 <Route path='/att' component={Att}/>
                 <Route path='/department' component={Department}/>
-                <Route path='/member' component={Member}/>
+                <Route path='/search' component={Member}/>
                 <Route component={Attendence}/>
             </Switch>
         </div>
diff --git a/src/components/menu.js b/src/components/menu.js
index a8adb8a..a768f69 100644
--- a/src/components/menu.js
+++ b/src/components/menu.js
@@ -7,7 +7,7 @@ class Menu extends Component {
             {/* <li className="nav"><Link to={`/attendence`} activeClassName='g-navActive' className='link'>Home</Link></li> */}
             {/* <li className="nav"><Link to={`/holiday`} activeClassName='g-navActive' className='link'>UserSetting</Link></li> */}
             {/* <li className="nav"><Link to={`/att`} activeClassName='g-navActive' className='link'>考勤分组</Link></li> */}
-            <li className="nav"><Link to={`/member`} activeClassName='g-navActive' className='link'>Search</Link></li>
+            <li className="nav"><Link to={`/search`} activeClassName='g-navActive' className='link'>Search</Link></li>
             <li className="nav"><Link to={`/department`} activeClassName='g-navActive' className='link'>ArticleSetting</Link></li>
         </ul>
     }
diff --git a/src/pages/attendence/index.js b/src/pages/attendence/index.js
index 888b2c7..a52c60d 100644
--- a/src/pages/attendence/index.js
+++ b/src/pages/attendence/index.js
@@ -5,7 +5,7 @@ import Layout from '../../components/layout.js'
 class Index extends Component {
     componentDidMount(){
         //this.props.history.push('/attendence/staff')
-        this.props.history.push('/member')
+        this.props.history.push('/search')
 
     }
     render(){

From 62b616024c5769da56c218805bb73b1f6a88da28 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Wed, 16 Oct 2019 12:47:20 +1300
Subject: [PATCH 31/57] # 1 Cascading DropDownList done.

---
 src/pages/member/index.css     |  5 +++
 src/pages/member/index.js      | 68 ++++++++++++++++++++++++++++------
 src/pages/member/listMember.js |  2 +-
 3 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/src/pages/member/index.css b/src/pages/member/index.css
index 4728e7c..d93e3f2 100644
--- a/src/pages/member/index.css
+++ b/src/pages/member/index.css
@@ -12,6 +12,11 @@
 	width: 10%;
 	height: 45%;
 }
+.selectInput{
+    margin-left:2%;
+	width: 15%;
+	height: 45%;
+}
 
 .searchButton{
     margin-left:2%;
diff --git a/src/pages/member/index.js b/src/pages/member/index.js
index f227f5e..65b5626 100644
--- a/src/pages/member/index.js
+++ b/src/pages/member/index.js
@@ -11,9 +11,11 @@ export default class extends Component {
         this.state = {
             status:'list',
             tb_data:[],
-            delModel:false
+            delModel:false,
+            selectlist:[]
         };
         this.changeState= this.changeState.bind(this);
+        this.handleClick = this.handleClick.bind(this);
         this.handle = this.handle.bind(this);
         this.del = this.del.bind(this);
         this.columns = [
@@ -68,8 +70,12 @@ export default class extends Component {
     searchresults(){
         var dataset = {
             from: this.refs.from.value,
-            to: this.refs.to.value
+            to: this.refs.to.value,
+            select1: this.refs.select1.value,
+            select2: this.refs.select2.value,
+            select3: this.refs.select3.value
         };
+        alert(dataset.select1);
         search.bind(this)(dataset);
     }
 
@@ -95,6 +101,16 @@ export default class extends Component {
         });
         update && this.updateList();
     }
+    handleClick(){
+        if(this.refs.select1.value * 1 === 0){
+            this.setState({selectlist:filterColumns1});
+            filterColumns = filterColumns1
+        }else{
+            this.setState({selectlist:filterColumns2});
+            filterColumns = filterColumns2
+        }
+    }
+    
     render(){
         return (
             <Layout type={1}>
@@ -108,21 +124,23 @@ export default class extends Component {
                             <Button type="primary" onClick={() => this.searchresults() } className ='searchButton' >Search</Button>
                         </div>
                         <div className='g-header'>
-                            <font size="3" color="blue" className ='dataInput'>IF</font>
-                            <select className ='dataInput'>
-                                <option value = "0">Article title</option>
-                                <option value = "1">Method</option>
-                                <option value = "2">Benefit</option>
-                                <option value = "3">Participarts</option>
-                                <option value = "4">Author</option>
+                            <font size="3" color="blue" className ='dataInput'>Field</font>
+                            <select className ='selectInput' ref = 'select1' onChange={this.handleClick}>
+                                <option value = "0">SE Method</option>
+                                <option value = "1">SE Methodology</option>
                             </select>
-                            <select className ='dataInput'>
+                            <font size="3" color="blue" className ='dataInput'>Operator</font>
+                            <select className ='selectInput'  ref = 'select2'>
                                 <option value = "0">Contains</option>
                                 <option value = "1">Not Contain</option>
                                 <option value = "2">begins with</option>
                                 <option value = "3">ends with</option>
                                 <option value = "4">is equal</option>
                             </select>
+                            <font size="3" color="blue" className ='dataInput' >Value</font>
+                                <select className={'selectInput'} ref = 'select3'>
+                                    {filterColumns.map(index => (<option value = {index.name} >{index.name}</option>))}
+                                </select>
                         </div>
                         <ListMember columns={this.columns}/>
                     </div>:null}
@@ -134,4 +152,32 @@ export default class extends Component {
             </Layout>
         )
     }
-}
\ No newline at end of file
+
+
+}
+var filterColumns = [
+    { name: "TDD"},
+    { name: "BDD"},
+    { name: "Pair Programming"},
+    { name: "planning poker,"},
+    { name: "daily standup meetings"},
+    { name: "story boards"},
+];
+
+
+const filterColumns1 = [
+    { name: "TDD"},
+    { name: "BDD"},
+    { name: "Pair Programming"},
+    { name: "Planning poker,"},
+    { name: "Daily standup meetings"},
+    { name: "story boards"},
+];
+const filterColumns2 = [
+    { name: "Scrum"},
+    { name: "Agile"},
+    { name: "Waterfall"},
+    { name: "XP"},
+    { name: "Crystal"},
+    { name: "Product Driven Development"},
+];
diff --git a/src/pages/member/listMember.js b/src/pages/member/listMember.js
index 60cbadd..2470417 100644
--- a/src/pages/member/listMember.js
+++ b/src/pages/member/listMember.js
@@ -11,7 +11,7 @@ class List extends Component{
 export default connect((state) => {
     return {
         tb_data:(function(staff){
-            return staff.map(data => (data.work_num * 1 > 0 ? {...data,key:data.member_id}:{}))
+            return staff.map(data => ({...data,key:data.member_id}))
         })(state.baseData.staff)
     }
 })(List);
\ No newline at end of file

From 80687914d6bcae0a843917710788318612354faf Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Wed, 16 Oct 2019 13:30:17 +1300
Subject: [PATCH 32/57] add article review

---
 src/components/content.js     | 2 +-
 src/components/menu.js        | 2 +-
 src/pages/department/index.js | 9 ++++++++-
 src/pages/department/list.js  | 2 +-
 src/pages/member/index.js     | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/content.js b/src/components/content.js
index 9ef03b4..026b91e 100644
--- a/src/components/content.js
+++ b/src/components/content.js
@@ -12,7 +12,7 @@ export default class  extends Component{
                 <Route path='/attendence' component={Attendence}/>
                 <Route path='/holiday' component={Holiday}/>
                 <Route path='/att' component={Att}/>
-                <Route path='/department' component={Department}/>
+                <Route path='/articlereview' component={Department}/>
                 <Route path='/search' component={Member}/>
                 <Route component={Attendence}/>
             </Switch>
diff --git a/src/components/menu.js b/src/components/menu.js
index a768f69..b998f27 100644
--- a/src/components/menu.js
+++ b/src/components/menu.js
@@ -8,7 +8,7 @@ class Menu extends Component {
             {/* <li className="nav"><Link to={`/holiday`} activeClassName='g-navActive' className='link'>UserSetting</Link></li> */}
             {/* <li className="nav"><Link to={`/att`} activeClassName='g-navActive' className='link'>考勤分组</Link></li> */}
             <li className="nav"><Link to={`/search`} activeClassName='g-navActive' className='link'>Search</Link></li>
-            <li className="nav"><Link to={`/department`} activeClassName='g-navActive' className='link'>ArticleSetting</Link></li>
+            <li className="nav"><Link to={`/articlereview`} activeClassName='g-navActive' className='link'>article review</Link></li>
         </ul>
     }
 }
diff --git a/src/pages/department/index.js b/src/pages/department/index.js
index eb75501..1605ad3 100644
--- a/src/pages/department/index.js
+++ b/src/pages/department/index.js
@@ -19,6 +19,13 @@ export default class  extends Component{
         });
     }
     render(){
-        return <Layout left={<DeptTree selected_id={this.state.dept_id} selectDept={this.selectDept}/>} type='2' right={<RightList tb_data={this.state.staff} dept_id={this.state.dept_id}/>} />
+        //return <Layout left={<DeptTree selected_id={this.state.dept_id} selectDept={this.selectDept}/>} type='2' right={<RightList tb_data={this.state.staff} dept_id={this.state.dept_id}/>} />
+    return (<Layout type={1}>
+                <div className='m-members' >
+                        <RightList columns={this.columns}/>
+
+                </div>
+            </Layout>)
+
     }
 }
\ No newline at end of file
diff --git a/src/pages/department/list.js b/src/pages/department/list.js
index fe6af80..937265f 100644
--- a/src/pages/department/list.js
+++ b/src/pages/department/list.js
@@ -153,7 +153,7 @@ export default connect((state,props) => {
             const curDept = depts.find(dept => {
                 return dept.department_id * 1 === props.dept_id * 1;
             });
-            return (curDept || {}).department_name || '全公司';
+            return (curDept || {}).department_name || 'article review';
         })(state.baseData.dept),
         dept_leader:(depts => {
             const curDept = depts.find(dept => {
diff --git a/src/pages/member/index.js b/src/pages/member/index.js
index 65b5626..423bab9 100644
--- a/src/pages/member/index.js
+++ b/src/pages/member/index.js
@@ -75,7 +75,7 @@ export default class extends Component {
             select2: this.refs.select2.value,
             select3: this.refs.select3.value
         };
-        alert(dataset.select1);
+        //alert(dataset.from);
         search.bind(this)(dataset);
     }
 

From 72040b5ec0ffb3befc5eb6698cc43c8ee9912312 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Wed, 16 Oct 2019 16:18:22 +1300
Subject: [PATCH 33/57] # 1 add logo.jpg search main page change.

---
 public/index.html    |   1 +
 public/logo.jpg      | Bin 0 -> 6694 bytes
 public/manifest.json |   6 +++---
 src/index.css        |  11 +++++++++++
 src/index.js         |   6 +++---
 5 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 public/logo.jpg

diff --git a/public/index.html b/public/index.html
index f4ad8f1..0a704d5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -25,6 +25,7 @@
     <noscript>
       You need to enable JavaScript to run this app.
     </noscript>
+    <div class="main-header"><img src="%PUBLIC_URL%/logo.jpg" style="width:200px; height:99px;" class="logo" ><h1 style="font-size:60PX;" >SERLER</h1></div>
     <div id="root"></div>
     <!--
       This HTML file is a template.
diff --git a/public/logo.jpg b/public/logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..febcab912c1abae76bf8f6b1dae88279b568e24b
GIT binary patch
literal 6694
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

literal 0
HcmV?d00001

diff --git a/public/manifest.json b/public/manifest.json
index be607e4..daf5ca3 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,9 +1,9 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
+  "short_name": "SERLER",
+  "name": "SERLER",
   "icons": [
     {
-      "src": "favicon.ico",
+      "src": "logo.jpg",
       "sizes": "192x192",
       "type": "image/png"
     }
diff --git a/src/index.css b/src/index.css
index 71f0246..2888d0e 100644
--- a/src/index.css
+++ b/src/index.css
@@ -68,3 +68,14 @@ input:focus{
     font-size: 16px;
     cursor: pointer;
 }
+
+.logo{
+    float: left;
+    width: 100%;
+    height: 100%;
+}
+
+.main-header{
+    height: 100px;
+    border-bottom: 1px solid #ebebeb;
+}
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index 38488e3..c134f3c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,14 +6,14 @@ import Router from './router/index.js'
 import registerServiceWorker from './registerServiceWorker';
 import {Provider} from 'react-redux';
 import store from './store/index.js';
-import {updateStaff,updateDept} from './global/initBaseData.js';
+import {search,updateDept} from './global/initBaseData.js';
 if (module.hot) {
   // 模块自己就接收更新
   module.hot.accept();
 }
 React.Component.prototype.$http = axios;
-// 取得部门数据和员工的数据
-updateStaff.bind(React.Component.prototype)();
+// updateStaff.bind(React.Component.prototype)();
+search.bind(React.Component.prototype)({});
 updateDept.bind(React.Component.prototype)();
 ReactDOM.render(<Provider store={store}>
     <Router />

From a815dad4616b37be724195bfe7dbdedbfdf4f23c Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Thu, 17 Oct 2019 00:12:23 +1300
Subject: [PATCH 34/57] # 1 search bug fix

---
 controller/staff.js            | 52 ++++++++++++-----------
 model/staff.js                 |  6 +--
 route/index.js                 |  4 +-
 schema/staff.js                | 23 +++++-----
 src/global/initBaseData.js     | 28 ++----------
 src/pages/member/editMenber.js | 78 ++++++++++++++++++++++++----------
 src/pages/member/index.js      | 49 +++++++++++----------
 7 files changed, 128 insertions(+), 112 deletions(-)

diff --git a/controller/staff.js b/controller/staff.js
index 94e20d5..604e7a3 100644
--- a/controller/staff.js
+++ b/controller/staff.js
@@ -1,16 +1,16 @@
-var StaffModel = require('./../model/staff.js');
+var articleModel = require('./../model/staff.js');
 // 获取职员列表
-exports.staffList = function (req, res) {
-    const dept_id = req.body.department_id;
-    let param = {};
-    if(dept_id){
-        param = {
-            department_id:dept_id
-        };
-    }
-  StaffModel
-    .find(param)
-    .populate('Department','department_name')
+exports.articleList = function (req, res) {
+    // const article_name = req.body.article_name;
+    // let param = {};
+    // if(article_name){
+    //     param = {
+    //         department_id:dept_id
+    //     };
+    // }
+    articleModel
+    .find()
+    // .populate('Department','department_name')
     .exec(function (err, staffs) {
       if(err){
         res.status(err.status).end();
@@ -20,22 +20,24 @@ exports.staffList = function (req, res) {
     });
 }
 // 添加职员
-exports.addStaff =  function (req, res) {
+exports.addArticle =  function (req, res) {
   const reqBody = req.body;
-  if(!reqBody.member_name){
-    res.status(200).send({code:124,msg:'缺少员工姓名'}).end();
+  if(!reqBody.article_name){
+    res.status(200).send({code:124,msg:'miss article_name'}).end();
   }
-  if(!reqBody.department_id){
-    res.status(200).send({code:125,msg:'缺少部门id'}).end();
+  if(!reqBody.author_name){
+    res.status(200).send({code:125,msg:'miss author_name'}).end();
   }
   const MS = new Date().getTime();
   const uid = (MS + '').slice(-3) * 1 + (Math.random() * (MS + '').slice(0,3) + '').replace('.','') * 1;
-      const staff = new StaffModel({
-          member_name:reqBody.member_name,
-          work_num:reqBody.work_num,
-          department_id:reqBody.department_id,
-          member_id:uid,
-          department_name:reqBody.department_name
+      const staff = new articleModel({
+          article_name:reqBody.article_name,
+          author_name:reqBody.author_name,
+          year:reqBody.year,
+          field_id:reqBody.field_id,
+          se_method:reqBody.se_method,
+          research_question:reqBody.research_question,
+          research_result:reqBody.research_result
       });
       staff.save(function (err) {
           if(!err){
@@ -53,7 +55,7 @@ exports.delStaff =  function (req, res) {
   if(!resBody.member_id){
     res.status(200).send({msg:'缺少员工id',code:134}).end();
   }
-  StaffModel.remove({
+  articleModel.remove({
     member_id:resBody.member_id
   },function (err) {
     if(err){
@@ -69,7 +71,7 @@ exports.editStaff = function (req, res) {
   if(!reqBody.member_id){
     res.status(200).send({code:123,msg:'缺少员工id'}).end();
   }
-  StaffModel.findOneAndUpdate({member_id:reqBody.member_id},{
+  articleModel.findOneAndUpdate({member_id:reqBody.member_id},{
     member_name:reqBody.member_name,
     department_id:reqBody.department_id,
     work_num:reqBody.work_num,
diff --git a/model/staff.js b/model/staff.js
index a914a76..3a4a1ac 100644
--- a/model/staff.js
+++ b/model/staff.js
@@ -1,4 +1,4 @@
 var mongoose = require('mongoose');
-var staffSchma = require('./../schema/staff.js');
-const staffModel = mongoose.model('Staff',staffSchma);
-module.exports =  staffModel;
\ No newline at end of file
+var articleSchema = require('./../schema/staff.js');
+const articleModel = mongoose.model('Article',articleSchema);
+module.exports =  articleModel;
\ No newline at end of file
diff --git a/route/index.js b/route/index.js
index deb76f1..7d2b2e6 100644
--- a/route/index.js
+++ b/route/index.js
@@ -4,8 +4,8 @@ module.exports = function (app) {
   app.get('/check_connect',function (req,res) {
       res.json({code:0,data:{connect_database:process.env.connect_database}});
   });
-  app.post('/staff/list',staff.staffList);
-  app.post('/staff/add',staff.addStaff);
+  app.post('/staff/list',staff.articleList);
+  app.post('/staff/add',staff.addArticle);
   app.post('/staff/del',staff.delStaff);
   app.post('/staff/edit',staff.editStaff)
 
diff --git a/schema/staff.js b/schema/staff.js
index 2c35e70..8f9569f 100644
--- a/schema/staff.js
+++ b/schema/staff.js
@@ -1,20 +1,19 @@
 var mongoose = require('mongoose');
 const Schema = mongoose.Schema;
-// 公司职员Schema
 const articleSchema = new Schema({
-  member_name:String,
-  member_id:{
-    type:Number
-  },
-  department_id:Number,
-  work_num:[String,Number],
-  department_name:String
-  // article_name:String,
-  // article_year:{
+  // member_name:String,
+  // member_id:{
   //   type:Number
   // },
-  // field_id:Number,
+  // department_id:Number,
   // work_num:[String,Number],
-  // author_name:String
+  // department_name:String
+  article_name:String,
+  author_name:String,
+  year:[String,Number],
+  field_id:Number,
+  se_method:String,
+  research_question:String,
+  research_result:String
 });
 module.exports =  articleSchema;
\ No newline at end of file
diff --git a/src/global/initBaseData.js b/src/global/initBaseData.js
index 8c0426e..a2edb1c 100644
--- a/src/global/initBaseData.js
+++ b/src/global/initBaseData.js
@@ -17,39 +17,17 @@ export function search (dataset) {
     const dispatch = store.dispatch;
      this.$http.post('/staff/list').then(res => {
          const resData = res.data || {};
-        //  var newlist = {};
-        //  resData.data.map(year =>(if(year.work_num * 1 === dataset.year * 1){newlist.push(year)});
          if(resData.code + '' === '0'){
-            // resData.data.map(element => {
-            //     if(element.work_num * 1 === dataset.year * 1)
-            //     {
-            //         alert(element.work_num);
-            //         resData.data.remove(element);
-            //     }
-            // });
-             dispatch({
+            dispatch({
                 type:'getStaff',
-                //  data:resData.data || []
-                data:trim_nulls(resData.data.map(year =>((year.work_num * 1 >= dataset.from * 1 && year.work_num * 1 <= dataset.to * 1)
-                    
+                data:trim_nulls(resData.data.map(year =>((year.year * 1 >= dataset.from * 1 && year.year * 1 <= dataset.to * 1)
                     ?  
                     year : {})))|| []
-             });
+            });
          }
      });
  
  }
-//  function addItems(resData,dataset)
-//  {
-//     const list = resData
-//     resData.map(element => {
-//         if(element.work_num * 1 === dataset.year * 1)
-//         {
-//             list
-//         }
-//     });
-//     return list;
-//  }
 
 function trim_nulls(data) {
     var y;
diff --git a/src/pages/member/editMenber.js b/src/pages/member/editMenber.js
index 7752436..d9f82aa 100644
--- a/src/pages/member/editMenber.js
+++ b/src/pages/member/editMenber.js
@@ -7,10 +7,13 @@ export default class  extends Component {
         this.state={
             optDept:false,
             member_id:props.meberMsg.member_id || undefined,
-            member_name:props.meberMsg.member_name || '',
-            department_id:props.meberMsg.department_id || '',
-            department_name:props.meberMsg.department_name || '',
-            work_num:props.meberMsg.work_num || ''
+            article_name:props.meberMsg.article_name || '',
+            author_name:props.meberMsg.author_name || '',
+            year:props.meberMsg.year || '',
+            field_id:props.meberMsg.field_id || '',
+            se_method:props.meberMsg.se_method || '',
+            research_question:props.meberMsg.research_question || '',
+            research_result:props.meberMsg.research_result || ''
         };
         this.onChangeTree = this.onChangeTree.bind(this);
         this.getOptDept = this.getOptDept.bind(this);
@@ -41,22 +44,26 @@ export default class  extends Component {
         });
     }
     verifyFrom(param){
-        if(!param.member_name){
-            message.warning('请输入员工姓名');
+        if(!param.article_name){
+            message.warning('input article_name');
             return false;
-        } else if(!param.department_name || !param.department_id){
-            message.warning('请选择员工部门');
+        } else if(!param.author_name || !param.author_name){
+            message.warning('input author_name');
             return false;
         } else {
             return true;
         }
     }
     submit(){
+        alert(this.state.article_name)
         const param = {
-            member_name:this.state.member_name.replace(/^\s+|\s+$/g,''),
-            department_id:this.state.department_id,
-            work_num:this.state.work_num ,
-            department_name:this.state.department_name
+            article_name:this.state.article_name.replace(/^\s+|\s+$/g,''),
+            author_name:this.state.author_name,
+            year:this.state.year ,
+            field_id:this.state.field_id ,
+            se_method:this.state.se_method ,
+            research_question:this.state.research_question ,
+            research_result:this.state.research_result
         };
         if(!this.verifyFrom(param)) return false;
         const type = this.state.member_id?'edit':'add';
@@ -64,14 +71,14 @@ export default class  extends Component {
             add:{
                 url:'/staff/add',
                 param:param,
-                success:'新增员工成功',
-                error:',员工新增失败'
+                success:'add success',
+                error:',failed'
             },
             edit:{
                 url:'/staff/edit',
                 param:{...param,member_id:this.state.member_id},
-                success:'编辑员工成功',
-                error:',员工编辑失败'
+                success:'success',
+                error:',failed'
             }
         }[type];
         this.$http.post(data.url,data.param).then(res => {
@@ -90,23 +97,48 @@ export default class  extends Component {
                 <table className='g-from'>
                     <tbody>
                         <tr>
-                            <td className='in-h'>姓名<span className='in-star'>*</span></td>
+                            <td className='in-h'>article_name<span className='in-star'>*</span></td>
                             <td>
-                                <input className='input' value={this.state.member_name} onChange={(event) => this.changeVal('member_name',event.target.value)}/>
+                                <input className='input' value={this.state.article_name} onChange={(event) => this.changeVal('article_name',event.target.value)}/>
                             </td>
                         </tr>
                         <tr>
-                            <td className='in-h'>部门<span className='in-star'>*</span></td>
+                            <td className='in-h'>author_name<span className='in-star'>*</span></td>
                             <td>
-                                <Button onClick={() => this.onChangeTree(true)}>部门</Button>
+                            <input className='input' value={this.state.author_name} onChange={(event) => this.changeVal('author_name',event.target.value)}/>
+                                {/* <Button onClick={() => this.onChangeTree(true)}>部门</Button>
                                 {this.state.department_name?<span className='result-p'>{this.state.department_name}</span>:null}
-                                {this.state.optDept?<OptDept maxNum={1} type='dept' visible={this.state.optDept} onOk={this.getOptDept} onChangeTree={this.onChangeTree} selectedData={this.curDept}/>:null}
+                                {this.state.optDept?<OptDept maxNum={1} type='dept' visible={this.state.optDept} onOk={this.getOptDept} onChangeTree={this.onChangeTree} selectedData={this.curDept}/>:null} */}
                             </td>
                         </tr>
                         <tr>
-                            <td className='in-h'>工号</td>
+                            <td className='in-h'>year</td>
                             <td>
-                                <input className='input' value={this.state.work_num} onChange={(event) => this.changeVal('work_num',event.target.value,'num')}/>
+                                <input className='input' value={this.state.year} onChange={(event) => this.changeVal('year',event.target.value,'num')}/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td className='in-h'>field_id</td>
+                            <td>
+                                <input className='input' value={this.state.field_id} onChange={(event) => this.changeVal('field_id',event.target.value,'num')}/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td className='in-h'>se_method<span className='in-star'>*</span></td>
+                            <td>
+                                <input className='input' value={this.state.se_method} onChange={(event) => this.changeVal('se_method',event.target.value)}/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td className='in-h'>research_question<span className='in-star'>*</span></td>
+                            <td>
+                                <input className='input' value={this.state.research_question} onChange={(event) => this.changeVal('research_question',event.target.value)}/>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td className='in-h'>research_result<span className='in-star'>*</span></td>
+                            <td>
+                                <input className='input' value={this.state.research_result} onChange={(event) => this.changeVal('research_result',event.target.value)}/>
                             </td>
                         </tr>
                         <tr>
diff --git a/src/pages/member/index.js b/src/pages/member/index.js
index 423bab9..11d2fda 100644
--- a/src/pages/member/index.js
+++ b/src/pages/member/index.js
@@ -20,36 +20,40 @@ export default class extends Component {
         this.del = this.del.bind(this);
         this.columns = [
             {
-                title:'Article',
-                key:'member_name',
-                dataIndex:'member_name',
-                width:200
+                title:'Title',
+                key:'article_name',
+                dataIndex:'article_name',
+                width:100
             },
             {
                 title:'Author',
-                key:'department_name',
-                dataIndex:'department_name',
-                width:400
+                key:'author_name',
+                dataIndex:'author_name',
+                width:100
             },
             {
                 title:'Year',
-                key:'work_num',
-                dataIndex:'work_num',
+                key:'year',
+                dataIndex:'year',
+                width:200
+            },
+            {
+                title:'Se method',
+                key:'se_method',
+                dataIndex:'se_method',
                 width:200
             },
             {
-                title:'Field',                
-                key:'department_name',
-                dataIndex:'department_name',
-                width:500
-                // render:(record) => {
-                //     return (
-                //         <div>
-                //             <span className="action" onClick={() => this.handle('edit',record)}>编辑</span>
-                //             <span className="action" style={{marginLeft:'10px'}} onClick={() => this.handle('del',record)}>删除</span>
-                //         </div>
-                //     )
-                // }
+                title:'research question',
+                key:'research_question',
+                dataIndex:'research_question',
+                width:200
+            },
+            {
+                title:'research result',
+                key:'research_result',
+                dataIndex:'research_result',
+                width:200
             }
         ]
     }
@@ -75,7 +79,7 @@ export default class extends Component {
             select2: this.refs.select2.value,
             select3: this.refs.select3.value
         };
-        //alert(dataset.from);
+        // alert(dataset.select1);
         search.bind(this)(dataset);
     }
 
@@ -122,6 +126,7 @@ export default class extends Component {
                             <font size="3" color="green" className ='dataInput'>To</font>
                             <input type='text' placeholder='2019 ' ref='to' className ='dataInput'></input>
                             <Button type="primary" onClick={() => this.searchresults() } className ='searchButton' >Search</Button>
+                            <Button type="primary" onClick={() => this.handle('add') } className ='searchButton' >ADD</Button>
                         </div>
                         <div className='g-header'>
                             <font size="3" color="blue" className ='dataInput'>Field</font>

From 8598fb6261616ff930ab4dc6c878eb82b13a60e0 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Thu, 17 Oct 2019 00:14:12 +1300
Subject: [PATCH 35/57] # 1

remove alert
---
 src/pages/member/editMenber.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/member/editMenber.js b/src/pages/member/editMenber.js
index d9f82aa..4390500 100644
--- a/src/pages/member/editMenber.js
+++ b/src/pages/member/editMenber.js
@@ -55,7 +55,6 @@ export default class  extends Component {
         }
     }
     submit(){
-        alert(this.state.article_name)
         const param = {
             article_name:this.state.article_name.replace(/^\s+|\s+$/g,''),
             author_name:this.state.author_name,

From 69f354fd4a5b23e002aafb932599ab684f2df181 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Thu, 17 Oct 2019 10:49:59 +1300
Subject: [PATCH 36/57] article review

---
 src/pages/department/index.js |  6 +++++
 src/pages/department/list.js  | 41 +++++++++++++++++++++++++----------
 2 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/pages/department/index.js b/src/pages/department/index.js
index 1605ad3..b68462c 100644
--- a/src/pages/department/index.js
+++ b/src/pages/department/index.js
@@ -2,6 +2,8 @@ import React,{Component} from 'react';
 import Layout from './../../components/layout.js';
 import DeptTree from './deptTree.js'
 import RightList from './list.js';
+
+
 import './index.css'
 export default class  extends Component{
     constructor(props){
@@ -12,7 +14,11 @@ export default class  extends Component{
             leader_member_name:''
         };
         this.selectDept = this.selectDept.bind(this);
+
     }
+
+
+     
     selectDept(dept_id){
         this.setState({
             dept_id:dept_id * 1
diff --git a/src/pages/department/list.js b/src/pages/department/list.js
index 937265f..c30d940 100644
--- a/src/pages/department/list.js
+++ b/src/pages/department/list.js
@@ -18,21 +18,40 @@ import {connect} from 'react-redux';
         this.onChange = this.onChange.bind(this);
         this.columns = [
             {
-                title:'姓名',
-                key:'member_name',
-                dataIndex:'member_name'
+                title:'Title',
+                key:'article_name',
+                dataIndex:'article_name',
+                width:100
             },
             {
-                title:'部门',
-                key:'department_name',
-                dataIndex:'department_name',
-                width:300
+                title:'Author',
+                key:'author_name',
+                dataIndex:'author_name',
+                width:100
             },
             {
-                title:'工号',
-                key:'work_num',
-                dataIndex:'work_num',
-                width:300
+                title:'Year',
+                key:'year',
+                dataIndex:'year',
+                width:200
+            },
+            {
+                title:'Se method',
+                key:'se_method',
+                dataIndex:'se_method',
+                width:200
+            },
+            {
+                title:'research question',
+                key:'research_question',
+                dataIndex:'research_question',
+                width:200
+            },
+            {
+                title:'research result',
+                key:'research_result',
+                dataIndex:'research_result',
+                width:200
             },
             {
                 title:'操作',

From ef17e72bae15e71779052741137c52f0531bf7ca Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Thu, 17 Oct 2019 11:26:05 +1300
Subject: [PATCH 37/57] add test environment

---
 package-lock.json | 545 ++++++++++++++++++++++++++++++++++++++++++++++
 package.json      |   4 +-
 2 files changed, 548 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 475ff12..81efff2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -138,6 +138,12 @@
         "string-width": "^2.0.0"
       }
     },
+    "ansi-colors": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
+      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+      "dev": true
+    },
     "ansi-escapes": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
@@ -383,6 +389,12 @@
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
+    "assertion-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "dev": true
+    },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -1520,6 +1532,12 @@
         }
       }
     },
+    "browser-stdout": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
+      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
+      "dev": true
+    },
     "browserify-aes": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
@@ -1782,6 +1800,20 @@
         "lazy-cache": "^1.0.3"
       }
     },
+    "chai": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
+      "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+      "dev": true,
+      "requires": {
+        "assertion-error": "^1.1.0",
+        "check-error": "^1.0.2",
+        "deep-eql": "^3.0.1",
+        "get-func-name": "^2.0.0",
+        "pathval": "^1.1.0",
+        "type-detect": "^4.0.5"
+      }
+    },
     "chalk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
@@ -1811,6 +1843,12 @@
       "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
       "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I="
     },
+    "check-error": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=",
+      "dev": true
+    },
     "chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -2882,6 +2920,15 @@
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
+    "deep-eql": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
+      "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
+      "dev": true,
+      "requires": {
+        "type-detect": "^4.0.0"
+      }
+    },
     "deep-equal": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.0.tgz",
@@ -4044,6 +4091,23 @@
         "locate-path": "^2.0.0"
       }
     },
+    "flat": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
+      "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==",
+      "dev": true,
+      "requires": {
+        "is-buffer": "~2.0.3"
+      },
+      "dependencies": {
+        "is-buffer": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
+          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
+          "dev": true
+        }
+      }
+    },
     "flat-cache": {
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
@@ -4635,6 +4699,12 @@
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
       "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="
     },
+    "get-func-name": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
+      "dev": true
+    },
     "get-stdin": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
@@ -4759,6 +4829,12 @@
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz",
       "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q=="
     },
+    "growl": {
+      "version": "1.10.5",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
+      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
+      "dev": true
+    },
     "growly": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
@@ -6505,6 +6581,28 @@
       "integrity": "sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=",
       "dev": true
     },
+    "log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.0.1"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        }
+      }
+    },
     "loglevel": {
       "version": "1.6.4",
       "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz",
@@ -6775,6 +6873,232 @@
         "minimist": "0.0.8"
       }
     },
+    "mocha": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.1.tgz",
+      "integrity": "sha512-VCcWkLHwk79NYQc8cxhkmI8IigTIhsCwZ6RTxQsqK6go4UvEhzJkYuHm8B2YtlSxcYq2fY+ucr4JBwoD6ci80A==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "3.2.3",
+        "browser-stdout": "1.3.1",
+        "debug": "3.2.6",
+        "diff": "3.5.0",
+        "escape-string-regexp": "1.0.5",
+        "find-up": "3.0.0",
+        "glob": "7.1.3",
+        "growl": "1.10.5",
+        "he": "1.2.0",
+        "js-yaml": "3.13.1",
+        "log-symbols": "2.2.0",
+        "minimatch": "3.0.4",
+        "mkdirp": "0.5.1",
+        "ms": "2.1.1",
+        "node-environment-flags": "1.0.5",
+        "object.assign": "4.1.0",
+        "strip-json-comments": "2.0.1",
+        "supports-color": "6.0.0",
+        "which": "1.3.1",
+        "wide-align": "1.1.3",
+        "yargs": "13.3.0",
+        "yargs-parser": "13.1.1",
+        "yargs-unparser": "1.6.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "dev": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
+        "glob": {
+          "version": "7.1.3",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "p-limit": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
+          "integrity": "sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "13.3.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
+          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
     "moment": {
       "version": "2.24.0",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
@@ -7009,6 +7333,16 @@
         "lower-case": "^1.1.1"
       }
     },
+    "node-environment-flags": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz",
+      "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==",
+      "dev": true,
+      "requires": {
+        "object.getownpropertydescriptors": "^2.0.3",
+        "semver": "^5.7.0"
+      }
+    },
     "node-fetch": {
       "version": "1.7.3",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
@@ -7208,6 +7542,28 @@
         }
       }
     },
+    "object.assign": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "function-bind": "^1.1.1",
+        "has-symbols": "^1.0.0",
+        "object-keys": "^1.0.11"
+      }
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.2",
+        "es-abstract": "^1.5.1"
+      }
+    },
     "object.omit": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
@@ -7510,6 +7866,12 @@
         "pinkie-promise": "^2.0.0"
       }
     },
+    "pathval": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
+      "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
+      "dev": true
+    },
     "pbkdf2": {
       "version": "3.0.17",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
@@ -11342,6 +11704,12 @@
         "prelude-ls": "~1.1.2"
       }
     },
+    "type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true
+    },
     "type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -12214,6 +12582,15 @@
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
       "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8="
     },
+    "wide-align": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "dev": true,
+      "requires": {
+        "string-width": "^1.0.2 || 2"
+      }
+    },
     "widest-line": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
@@ -12364,6 +12741,174 @@
       "requires": {
         "camelcase": "^3.0.0"
       }
+    },
+    "yargs-unparser": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
+      "integrity": "sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==",
+      "dev": true,
+      "requires": {
+        "flat": "^4.1.0",
+        "lodash": "^4.17.15",
+        "yargs": "^13.3.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "dev": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          }
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "require-main-filename": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "13.3.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
+          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+          "dev": true,
+          "requires": {
+            "cliui": "^5.0.0",
+            "find-up": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^3.0.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.1"
+          }
+        },
+        "yargs-parser": {
+          "version": "13.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index 2cf8412..960fe3d 100644
--- a/package.json
+++ b/package.json
@@ -44,11 +44,13 @@
   "scripts": {
     "start": "node scripts/start.js",
     "build": "node scripts/build.js",
-    "test": "node scripts/test.js --env=jsdom"
+    "test": "mocha test"
   },
   "devDependencies": {
     "antd": "^2.13.6",
     "axios": "^0.19.0",
+    "chai": "^4.2.0",
+    "mocha": "^6.2.0",
     "connect-history-api-fallback": "^1.5.0",
     "express": "^4.16.2",
     "http-proxy-middleware": "^0.20.0",

From c9e881bb253084cfb44c6753fa989bf5e8ea0444 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Thu, 17 Oct 2019 14:41:29 +1300
Subject: [PATCH 38/57] # 1 search done.

---
 controller/staff.js            | 54 +++++++++++++++++-----------
 model/article.js               |  4 +++
 schema/article.js              | 14 ++++++++
 src/components/content.js      |  8 +----
 src/components/layout.js       |  6 ++--
 src/components/menu.js         |  3 --
 src/global/initBaseData.js     | 48 ++++++++++++++++++++-----
 src/index.js                   |  4 +--
 src/pages/member/editMenber.js | 66 ++++++++++++++++++++++------------
 src/pages/member/index.js      | 17 ++++-----
 10 files changed, 148 insertions(+), 76 deletions(-)
 create mode 100644 model/article.js
 create mode 100644 schema/article.js

diff --git a/controller/staff.js b/controller/staff.js
index 604e7a3..29b060c 100644
--- a/controller/staff.js
+++ b/controller/staff.js
@@ -1,32 +1,42 @@
-var articleModel = require('./../model/staff.js');
+var articleModel = require('./../model/article.js');
 // 获取职员列表
 exports.articleList = function (req, res) {
-    // const article_name = req.body.article_name;
-    // let param = {};
-    // if(article_name){
-    //     param = {
-    //         department_id:dept_id
-    //     };
-    // }
-    articleModel
-    .find()
-    // .populate('Department','department_name')
-    .exec(function (err, staffs) {
-      if(err){
-        res.status(err.status).end();
-      } else {
-        res.json({code :0,data:staffs});
-      }
-    });
+  const yearto = req.body.yearto;
+  const yearfrom = req.body.yearfrom;
+    // var query = articleModel.find({});
+    if(yearto *1 === 0 && yearfrom* 1 === 0){
+      articleModel
+      .find({})
+      // .populate('Department','department_name')
+      .exec(function (err, staffs) {
+        if(err){
+          res.status(err.status).end();
+        } else {
+          res.json({code :0,data:staffs});
+        }
+      });
+    }else{
+      articleModel
+      .find({})
+      .where('year').gte(yearfrom).lte(yearto)
+      // .populate('Department','department_name')
+      .exec(function (err, staffs) {
+        if(err){
+          res.status(err.status).end();
+        } else {
+          res.json({code :0,data:staffs});
+        }
+      });
+    }
 }
-// 添加职员
+// add article
 exports.addArticle =  function (req, res) {
   const reqBody = req.body;
   if(!reqBody.article_name){
     res.status(200).send({code:124,msg:'miss article_name'}).end();
   }
-  if(!reqBody.author_name){
-    res.status(200).send({code:125,msg:'miss author_name'}).end();
+  if(!reqBody.se_methodology){
+    res.status(200).send({code:125,msg:'miss se_methodology'}).end();
   }
   const MS = new Date().getTime();
   const uid = (MS + '').slice(-3) * 1 + (Math.random() * (MS + '').slice(0,3) + '').replace('.','') * 1;
@@ -36,6 +46,8 @@ exports.addArticle =  function (req, res) {
           year:reqBody.year,
           field_id:reqBody.field_id,
           se_method:reqBody.se_method,
+          review:reqBody.review,
+          se_methodology:reqBody.se_methodology,
           research_question:reqBody.research_question,
           research_result:reqBody.research_result
       });
diff --git a/model/article.js b/model/article.js
new file mode 100644
index 0000000..f2769a2
--- /dev/null
+++ b/model/article.js
@@ -0,0 +1,4 @@
+var mongoose = require('mongoose');
+var articleSchema = require('./../schema/article.js');
+const articleModel = mongoose.model('Article',articleSchema);
+module.exports =  articleModel;
\ No newline at end of file
diff --git a/schema/article.js b/schema/article.js
new file mode 100644
index 0000000..531d406
--- /dev/null
+++ b/schema/article.js
@@ -0,0 +1,14 @@
+var mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+const articleSchema = new Schema({
+  article_name:String,
+  author_name:String,
+  year:[String,Number],
+  field_id:Number,
+  se_method:String,
+  se_methodology:String,
+  review:String,
+  research_question:String,
+  research_result:String
+});
+module.exports =  articleSchema;
\ No newline at end of file
diff --git a/src/components/content.js b/src/components/content.js
index 026b91e..b430d97 100644
--- a/src/components/content.js
+++ b/src/components/content.js
@@ -1,20 +1,14 @@
 import React, { Component } from 'react';
 import {Route,Switch} from 'react-router-dom'
-import Attendence from './../pages/attendence/index.js'
-import Holiday from './../pages/holiday/index.js'
-import Att from './../pages/att/index.js';
 import Department from './../pages/department/index.js';
 import Member from './../pages/member/index.js';
 export default class  extends Component{
     render(){
         return <div>
             <Switch>
-                <Route path='/attendence' component={Attendence}/>
-                <Route path='/holiday' component={Holiday}/>
-                <Route path='/att' component={Att}/>
                 <Route path='/articlereview' component={Department}/>
                 <Route path='/search' component={Member}/>
-                <Route component={Attendence}/>
+                <Route component={Member}/>
             </Switch>
         </div>
     }
diff --git a/src/components/layout.js b/src/components/layout.js
index cbda17f..0d1b05a 100644
--- a/src/components/layout.js
+++ b/src/components/layout.js
@@ -7,10 +7,10 @@ class Layout extends Component {
         if(this.props.type * 1 === 2){
             return <div className="g-layout g-clearfix" style={{height:height+'px'}}>
                 <div className="g-left" >
-                    {this.props.left ? this.props.left:'暂无内容'}
+                    {this.props.left ? this.props.left:'To be continue...'}
                 </div>
                 <div className="g-right">
-                    {this.props.right ? this.props.right :'暂无内容'}
+                    {this.props.right ? this.props.right :'To be continue...'}
                 </div>
             </div>
         } else if(this.props.type * 1 === 1){
@@ -20,7 +20,7 @@ class Layout extends Component {
             } else if(this.props.body){
                 content = this.props.body;
             } else {
-                content = '暂无内容'
+                content = 'To be continue...'
             }
             return <div className="g-layout" style={{height:height+'px'}}>
                 <div className="g-content">
diff --git a/src/components/menu.js b/src/components/menu.js
index b998f27..a840418 100644
--- a/src/components/menu.js
+++ b/src/components/menu.js
@@ -4,9 +4,6 @@ import './../css/menu.css'
 class Menu extends Component {
     render(){
         return <ul className="g-menu">
-            {/* <li className="nav"><Link to={`/attendence`} activeClassName='g-navActive' className='link'>Home</Link></li> */}
-            {/* <li className="nav"><Link to={`/holiday`} activeClassName='g-navActive' className='link'>UserSetting</Link></li> */}
-            {/* <li className="nav"><Link to={`/att`} activeClassName='g-navActive' className='link'>考勤分组</Link></li> */}
             <li className="nav"><Link to={`/search`} activeClassName='g-navActive' className='link'>Search</Link></li>
             <li className="nav"><Link to={`/articlereview`} activeClassName='g-navActive' className='link'>article review</Link></li>
         </ul>
diff --git a/src/global/initBaseData.js b/src/global/initBaseData.js
index a2edb1c..07bddd9 100644
--- a/src/global/initBaseData.js
+++ b/src/global/initBaseData.js
@@ -15,19 +15,49 @@ export function updateStaff () {
 
 export function search (dataset) {
     const dispatch = store.dispatch;
-     this.$http.post('/staff/list').then(res => {
-         const resData = res.data || {};
-         if(resData.code + '' === '0'){
+    const param = {
+        yearto : dataset.to * 1,
+        yearfrom : dataset.from * 1
+    };
+    const data = {
+        url:'/staff/list',
+        param:param,
+        success:'add success',
+        error:',failed'
+    };
+    this.$http.post(data.url,data.param).then(res => {
+        const resData = res.data || {};
+        if(resData.code + '' === '0'){
             dispatch({
                 type:'getStaff',
-                data:trim_nulls(resData.data.map(year =>((year.year * 1 >= dataset.from * 1 && year.year * 1 <= dataset.to * 1)
+                data:trim_nulls(resData.data.map(info =>(
+                    condition(info,dataset)
                     ?  
-                    year : {})))|| []
+                    info : {})))|| []
             });
-         }
-     });
- 
- }
+        }
+    });
+}
+
+function condition(info,dataset){
+    if(dataset.select1 * 1 === 0){
+        return true
+    }else if(dataset.select1 * 1 === 1){
+        if(dataset.select2* 1 === 0){
+            return (info.se_method.indexOf(dataset.select3) !== -1)
+        }else if(dataset.select2* 1 === 1){
+            return (info.se_method.indexOf(dataset.select3) === -1)
+        }else if(dataset.select2* 1 === 2){
+            return (info.se_method.indexOf(dataset.select3) === 0)
+        }else if(dataset.select2* 1 === 3){
+            return (info.se_method.indexOf(dataset.select3) !== -1)
+        }else{
+            return (info.se_method.indexOf(dataset.select3) !== -1)
+        }
+    }else{
+        return (info.se_methodology.indexOf(dataset.select3) !== -1)
+    }
+}
 
 function trim_nulls(data) {
     var y;
diff --git a/src/index.js b/src/index.js
index c134f3c..4f10501 100644
--- a/src/index.js
+++ b/src/index.js
@@ -6,13 +6,13 @@ import Router from './router/index.js'
 import registerServiceWorker from './registerServiceWorker';
 import {Provider} from 'react-redux';
 import store from './store/index.js';
-import {search,updateDept} from './global/initBaseData.js';
+import {search,updateDept,updateStaff} from './global/initBaseData.js';
 if (module.hot) {
   // 模块自己就接收更新
   module.hot.accept();
 }
 React.Component.prototype.$http = axios;
-// updateStaff.bind(React.Component.prototype)();
+updateStaff.bind(React.Component.prototype)();
 search.bind(React.Component.prototype)({});
 updateDept.bind(React.Component.prototype)();
 ReactDOM.render(<Provider store={store}>
diff --git a/src/pages/member/editMenber.js b/src/pages/member/editMenber.js
index 4390500..248c046 100644
--- a/src/pages/member/editMenber.js
+++ b/src/pages/member/editMenber.js
@@ -16,7 +16,7 @@ export default class  extends Component {
             research_result:props.meberMsg.research_result || ''
         };
         this.onChangeTree = this.onChangeTree.bind(this);
-        this.getOptDept = this.getOptDept.bind(this);
+        // this.getOptDept = this.getOptDept.bind(this);
         this.submit = this.submit.bind(this);
 	    this.curDept = [];
         if(props.meberMsg.department_id && props.meberMsg.department_name){
@@ -36,13 +36,13 @@ export default class  extends Component {
             optDept:flag
         });
     }
-    getOptDept(data = []){
-        this.curDept = data;
-        this.setState({
-            department_id:(data[0] || {}).department_id || '',
-            department_name:(data[0] || {}).department_name || ''
-        });
-    }
+    // getOptDept(data = []){
+    //     this.curDept = data;
+    //     this.setState({
+    //         department_id:(data[0] || {}).department_id || '',
+    //         department_name:(data[0] || {}).department_name || ''
+    //     });
+    // }
     verifyFrom(param){
         if(!param.article_name){
             message.warning('input article_name');
@@ -60,26 +60,34 @@ export default class  extends Component {
             author_name:this.state.author_name,
             year:this.state.year ,
             field_id:this.state.field_id ,
-            se_method:this.state.se_method ,
+            se_method:this.state.se_method,
+            review:this.state.review,
+            se_methodology:this.state.se_methodology,
             research_question:this.state.research_question ,
             research_result:this.state.research_result
         };
         if(!this.verifyFrom(param)) return false;
-        const type = this.state.member_id?'edit':'add';
+        // const type = this.state.member_id?'edit':'add';
+        // const data = {
+        //     add:{
+        //         url:'/staff/add',
+        //         param:param,
+        //         success:'add success',
+        //         error:',failed'
+        //     },
+        //     edit:{
+        //         url:'/staff/edit',
+        //         param:{...param,member_id:this.state.member_id},
+        //         success:'success',
+        //         error:',failed'
+        //     }
+        // }[type];
         const data = {
-            add:{
-                url:'/staff/add',
-                param:param,
-                success:'add success',
-                error:',failed'
-            },
-            edit:{
-                url:'/staff/edit',
-                param:{...param,member_id:this.state.member_id},
-                success:'success',
-                error:',failed'
-            }
-        }[type];
+            url:'/staff/add',
+            param:param,
+            success:'add success',
+            error:',failed'
+        };
         this.$http.post(data.url,data.param).then(res => {
             const resData = res.data || {};
             if(resData.code + '' === '0'){
@@ -122,12 +130,24 @@ export default class  extends Component {
                                 <input className='input' value={this.state.field_id} onChange={(event) => this.changeVal('field_id',event.target.value,'num')}/>
                             </td>
                         </tr>
+                        <tr>
+                            <td className='in-h'>review<span className='in-star'>*</span></td>
+                            <td>
+                                <input className='input' value={this.state.review} onChange={(event) => this.changeVal('review',event.target.value)}/>
+                            </td>
+                        </tr>
                         <tr>
                             <td className='in-h'>se_method<span className='in-star'>*</span></td>
                             <td>
                                 <input className='input' value={this.state.se_method} onChange={(event) => this.changeVal('se_method',event.target.value)}/>
                             </td>
                         </tr>
+                        <tr>
+                            <td className='in-h'>se_methodology<span className='in-star'>*</span></td>
+                            <td>
+                                <input className='input' value={this.state.se_methodology} onChange={(event) => this.changeVal('se_methodology',event.target.value)}/>
+                            </td>
+                        </tr>
                         <tr>
                             <td className='in-h'>research_question<span className='in-star'>*</span></td>
                             <td>
diff --git a/src/pages/member/index.js b/src/pages/member/index.js
index 11d2fda..dbc0746 100644
--- a/src/pages/member/index.js
+++ b/src/pages/member/index.js
@@ -79,7 +79,7 @@ export default class extends Component {
             select2: this.refs.select2.value,
             select3: this.refs.select3.value
         };
-        // alert(dataset.select1);
+        // alert(dataset.select3);
         search.bind(this)(dataset);
     }
 
@@ -106,10 +106,10 @@ export default class extends Component {
         update && this.updateList();
     }
     handleClick(){
-        if(this.refs.select1.value * 1 === 0){
+        if(this.refs.select1.value * 1 === 1){
             this.setState({selectlist:filterColumns1});
             filterColumns = filterColumns1
-        }else{
+        }else if(this.refs.select1.value * 1 === 2){
             this.setState({selectlist:filterColumns2});
             filterColumns = filterColumns2
         }
@@ -130,9 +130,10 @@ export default class extends Component {
                         </div>
                         <div className='g-header'>
                             <font size="3" color="blue" className ='dataInput'>Field</font>
-                            <select className ='selectInput' ref = 'select1' onChange={this.handleClick}>
-                                <option value = "0">SE Method</option>
-                                <option value = "1">SE Methodology</option>
+                            <select className ='selectInput' ref = 'select1' onChange={this.handleClick}>    
+                                <option value = "0">Select a flied</option>
+                                <option value = "1">SE Method</option>
+                                <option value = "2">SE Methodology</option>
                             </select>
                             <font size="3" color="blue" className ='dataInput'>Operator</font>
                             <select className ='selectInput'  ref = 'select2'>
@@ -164,7 +165,7 @@ var filterColumns = [
     { name: "TDD"},
     { name: "BDD"},
     { name: "Pair Programming"},
-    { name: "planning poker,"},
+    { name: "planning poker"},
     { name: "daily standup meetings"},
     { name: "story boards"},
 ];
@@ -174,7 +175,7 @@ const filterColumns1 = [
     { name: "TDD"},
     { name: "BDD"},
     { name: "Pair Programming"},
-    { name: "Planning poker,"},
+    { name: "Planning poker"},
     { name: "Daily standup meetings"},
     { name: "story boards"},
 ];

From 70b0d40c4fd75fd6176ef67a23f4ae9087333145 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Thu, 17 Oct 2019 14:54:04 +1300
Subject: [PATCH 39/57] add some test code

---
 db_global.js      | 16 +++++++++++++++
 helper.js         | 33 +++++++++++++++++++++++++++++++
 package-lock.json | 48 +++++++++++++++++++++++++++++++++++++++++++++
 package.json      |  2 ++
 test/tests.js     | 50 +++++++++++++++++++++++++++++++++++++++++++++++
 tests.js          | 26 ++++++++++++++++++++++++
 6 files changed, 175 insertions(+)
 create mode 100644 db_global.js
 create mode 100644 helper.js
 create mode 100644 test/tests.js
 create mode 100644 tests.js

diff --git a/db_global.js b/db_global.js
new file mode 100644
index 0000000..04d10c6
--- /dev/null
+++ b/db_global.js
@@ -0,0 +1,16 @@
+var helper = require('./helper');
+
+before(function(done){
+
+helper.connect(function(){done();});       
+});
+
+after(function(done) {
+
+helper.close(function(){done();});       
+});
+
+beforeEach(function(done){
+
+helper.initdb(function(){done();});       
+});
\ No newline at end of file
diff --git a/helper.js b/helper.js
new file mode 100644
index 0000000..3efdbd6
--- /dev/null
+++ b/helper.js
@@ -0,0 +1,33 @@
+var mongoose = require('mongoose');
+
+exports.DB = 'mongodb://heroku_bqszzqcw:d1fcgvmgq3astipgea67pquhm3@ds263927.mlab.com:63927/heroku_bqszzqcw';
+
+exports.connect = function(callback) {
+
+mongoose.connect(exports.DB, callback);       
+};
+
+exports.close = function(callback) {
+
+mongoose.connection.close(callback);       
+};
+
+exports.getConnection = function() {
+
+return mongoose.connection;       
+};
+
+exports.initdb = function(callback) {
+
+var conn = mongoose.connection;
+// insert users      
+conn.collection('users').insert([{       
+    email: 'nowind_lee@qq.com',       
+    name: 'Freewind',       
+    salt: '111',       
+    password: '123456'       
+}], function(err, docs) {       
+    // insert others       
+});  
+     
+};
diff --git a/package-lock.json b/package-lock.json
index 81efff2..f1e27e0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10917,6 +10917,54 @@
       "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww=="
     },
+    "should": {
+      "version": "13.2.3",
+      "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz",
+      "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
+      "requires": {
+        "should-equal": "^2.0.0",
+        "should-format": "^3.0.3",
+        "should-type": "^1.4.0",
+        "should-type-adaptors": "^1.0.1",
+        "should-util": "^1.0.0"
+      }
+    },
+    "should-equal": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
+      "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
+      "requires": {
+        "should-type": "^1.4.0"
+      }
+    },
+    "should-format": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
+      "integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
+      "requires": {
+        "should-type": "^1.3.0",
+        "should-type-adaptors": "^1.0.1"
+      }
+    },
+    "should-type": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
+      "integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM="
+    },
+    "should-type-adaptors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
+      "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
+      "requires": {
+        "should-type": "^1.3.0",
+        "should-util": "^1.0.0"
+      }
+    },
+    "should-util": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz",
+      "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g=="
+    },
     "signal-exit": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
diff --git a/package.json b/package.json
index 960fe3d..2d22f3a 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "react": "^15.6.1",
     "react-dev-utils": "^4.0.1",
     "react-dom": "^15.6.1",
+    "should": "^13.2.3",
     "style-loader": "0.18.2",
     "sw-precache-webpack-plugin": "0.11.4",
     "url-loader": "0.5.9",
@@ -53,6 +54,7 @@
     "mocha": "^6.2.0",
     "connect-history-api-fallback": "^1.5.0",
     "express": "^4.16.2",
+    "should": "^13.2.3",
     "http-proxy-middleware": "^0.20.0",
     "jquery": "^3.2.1",
     "mongoose": "^4.13.6",
diff --git a/test/tests.js b/test/tests.js
new file mode 100644
index 0000000..b33aad7
--- /dev/null
+++ b/test/tests.js
@@ -0,0 +1,50 @@
+//let {checkSex, getParameterByName} = require('../tests.js')
+let expect = require('chai').expect;
+require('should');
+var mongoose = require('mongoose');
+var helper = require('./../helper');
+var articleModel = require('./../model/staff.js');
+
+before(function(done){
+
+helper.connect(function(){done();});       
+});
+
+after(function(done) {
+
+helper.close(function(){done();});       
+});
+
+
+describe('add article', function(){
+
+
+it('article can be finded', function(done){      
+    // const article = new articleModel({       
+    //       article_name:'1',
+		  // author_name:'2',
+		  // year:[2000,2019],
+		  // field_id:1,
+		  // se_method:'TDD',
+		  // research_question:'3',
+		  // research_result:'4'  
+    // });       
+    // article.save();
+
+ 			articleModel.find({article_name:'RM 60 version'}).exec((err, datas) => {
+    //articleModel.find({article_name:'1'}, function(err, datas){      
+        	//datas.toArray(function(err,docs) {       
+            datas.should.have.lengthOf(1);       
+            var u = datas[0];       
+            u._id.should.not.be.null;       
+             u.article_name.should.equal('RM 60 version');       
+             //u.author_name.should.equal('2');       
+             //u.se_method.should.equal('TDD');       
+            // u.research_question.should.equal('3'); 
+            // u.research_result.should.equal('4');      
+            done();       
+        //});       
+    });       
+});       
+});
+
diff --git a/tests.js b/tests.js
new file mode 100644
index 0000000..9fe2263
--- /dev/null
+++ b/tests.js
@@ -0,0 +1,26 @@
+function checkSex (idcard) {
+  if (idcard === undefined || idcard === null) {
+    return '男'
+  }
+  if (parseInt(idcard.substr(16, 1)%2, 10) === 1) {
+    return '男'
+  } else {
+    return '女'
+  }
+}
+
+
+
+function getParameterByName(name, url) {
+   
+   var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
+       results = regex.exec(url);
+   if (!results) return null;
+   if (!results[2]) return '';
+   return decodeURIComponent(results[2].replace(/\+/g, " "));
+}
+
+module.exports = {
+  checkSex,
+  getParameterByName
+}

From 4c23e5a0184582f34a8e3ede85e2d26f61eea186 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Thu, 17 Oct 2019 15:23:56 +1300
Subject: [PATCH 40/57] change package.json

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 2d22f3a..19fd663 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "css-loader": "0.28.4",
     "dotenv": "4.0.0",
     "eslint": "4.4.1",
+    "mongoose": "^4.13.6",
     "eslint-config-react-app": "^2.0.0",
     "eslint-loader": "1.9.0",
     "eslint-plugin-flowtype": "2.35.0",

From b06e87827e3b9449aa94c4ddb431a623c34812a4 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Thu, 17 Oct 2019 15:32:09 +1300
Subject: [PATCH 41/57] change package.json

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 19fd663..6054d9d 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "webpack": "3.5.1",
     "webpack-dev-server": "2.7.1",
     "webpack-manifest-plugin": "1.2.1",
+    "webpack-hot-middleware": "^2.21.0"
     "whatwg-fetch": "2.0.3"
   },
   "scripts": {

From b4a9d405424f069eb440f7528f7cfe2dd507c2f5 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Thu, 17 Oct 2019 15:37:14 +1300
Subject: [PATCH 42/57] change package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6054d9d..f477f36 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "webpack": "3.5.1",
     "webpack-dev-server": "2.7.1",
     "webpack-manifest-plugin": "1.2.1",
-    "webpack-hot-middleware": "^2.21.0"
+    "webpack-hot-middleware": "^2.21.0",
     "whatwg-fetch": "2.0.3"
   },
   "scripts": {

From 5f521f5e67f764f2cfedf9aecd0991a41ad9489c Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Thu, 17 Oct 2019 15:56:15 +1300
Subject: [PATCH 43/57] bug fix

---
 public/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/index.html b/public/index.html
index 0a704d5..456734c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,8 +8,8 @@
       manifest.json provides metadata used when your web app is added to the
       homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <link rel="manifest" href="./manifest.json">
+    <link rel="shortcut icon" href="./favicon.ico">
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
@@ -25,7 +25,7 @@
     <noscript>
       You need to enable JavaScript to run this app.
     </noscript>
-    <div class="main-header"><img src="%PUBLIC_URL%/logo.jpg" style="width:200px; height:99px;" class="logo" ><h1 style="font-size:60PX;" >SERLER</h1></div>
+    <div class="main-header"><img src="./images/logo.jpg" style="width:200px; height:99px;" class="logo" ><h1 style="font-size:60PX;" >SERLER</h1></div>
     <div id="root"></div>
     <!--
       This HTML file is a template.

From 6fd71a2aa822b57379c14bedccdaa1c8249b1ff8 Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Thu, 17 Oct 2019 16:02:34 +1300
Subject: [PATCH 44/57] bug fix

---
 package.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package.json b/package.json
index f477f36..2d39b49 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,10 @@
     "webpack-dev-server": "2.7.1",
     "webpack-manifest-plugin": "1.2.1",
     "webpack-hot-middleware": "^2.21.0",
+    "antd": "^2.13.6",
+    "react-redux": "^5.0.6",
+    "react-router-dom": "^4.2.2",
+    "redux": "^3.7.2",
     "whatwg-fetch": "2.0.3"
   },
   "scripts": {

From 11cde544bf840312b544d2686c1905b65c11106b Mon Sep 17 00:00:00 2001
From: Jason <grr6525@autuni.ac.nz>
Date: Thu, 17 Oct 2019 16:07:58 +1300
Subject: [PATCH 45/57] bug fix

---
 package.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package.json b/package.json
index 2d39b49..43d3d43 100644
--- a/package.json
+++ b/package.json
@@ -46,6 +46,8 @@
     "react-redux": "^5.0.6",
     "react-router-dom": "^4.2.2",
     "redux": "^3.7.2",
+    "axios": "^0.19.0",
+    "jquery": "^3.2.1",
     "whatwg-fetch": "2.0.3"
   },
   "scripts": {

From f2ee18268a9c3670cb576a1489b9f609dbb10f9c Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Thu, 17 Oct 2019 16:31:30 +1300
Subject: [PATCH 46/57] # 1 delete useless files. change Chinese to English

---
 .travis.yml                                   |   4 -
 bin/www                                       |  90 ------
 hello.js                                      |   5 -
 routes/index.js                               |  71 -----
 routes/users.js                               |  10 -
 src/components/layout.css                     |   4 +
 src/pages/att/container/delGroup.js           |  26 --
 src/pages/att/container/groupdetail.js        |  77 -----
 src/pages/att/container/groupedit.js          | 224 ---------------
 src/pages/att/container/grouplist.js          |  17 --
 src/pages/att/css/att_group.css               |  26 --
 src/pages/att/group.js                        |  99 -------
 src/pages/att/index.js                        |  10 -
 src/pages/attendence/common.js                |  20 --
 src/pages/attendence/commonList.js            |  34 ---
 src/pages/attendence/components/Header.js     |  15 -
 src/pages/attendence/components/MemberList.js |  36 ---
 src/pages/attendence/components/leftNav.js    |  12 -
 src/pages/attendence/components/list.js       |  80 ------
 src/pages/attendence/components/listItem.js   |  82 ------
 src/pages/attendence/detail.css               |  42 ---
 src/pages/attendence/detail.js                | 111 --------
 src/pages/attendence/external.js              |  23 --
 src/pages/attendence/externalEdit.css         |   7 -
 src/pages/attendence/externalEdit.js          | 263 ------------------
 src/pages/attendence/externalList.js          |  40 ---
 src/pages/attendence/index.js                 |  17 --
 src/pages/attendence/list.css                 | 117 --------
 src/pages/attendence/main.js                  |  19 --
 src/pages/attendence/staff.js                 |  20 --
 src/pages/attendence/staffList.js             |  35 ---
 src/pages/comps/todo-item.js                  |  34 ---
 src/pages/comps/todo-list.js                  |  29 --
 src/pages/department/list.js                  |   4 +-
 src/pages/holiday/annual.js                   |  50 ----
 src/pages/holiday/annual_list.js              | 186 -------------
 src/pages/holiday/award.js                    | 188 -------------
 src/pages/holiday/components/Main.js          |  24 --
 src/pages/holiday/components/leftNav.js       |  13 -
 src/pages/holiday/container/annualList.js     |  18 --
 .../holiday/container/annualRule_edit.js      | 162 -----------
 .../holiday/container/annualRule_list.js      |  31 ---
 src/pages/holiday/container/awardList.js      |  34 ---
 src/pages/holiday/container/dayOffList.js     |  36 ---
 .../holiday/container/dayOffRule_edit.js      | 116 --------
 .../holiday/container/dayOffRule_show.js      |  39 ---
 src/pages/holiday/container/editModel.js      |  21 --
 src/pages/holiday/container/popTip.js         |  56 ----
 src/pages/holiday/container/typeList.js       |  46 ---
 src/pages/holiday/css/dayoffrule.css          |  12 -
 src/pages/holiday/css/list.css                |   3 -
 src/pages/holiday/day_off.js                  |  19 --
 src/pages/holiday/day_off_list.js             | 176 ------------
 src/pages/holiday/day_off_rule.js             |  25 --
 src/pages/holiday/index.js                    |  11 -
 src/pages/holiday/type.js                     | 166 -----------
 src/pages/member/editMenber.js                |   4 +-
 views/error.ejs                               |   3 -
 views/index.ejs                               |  16 --
 webpack.config.js                             |  35 ---
 60 files changed, 8 insertions(+), 3185 deletions(-)
 delete mode 100644 .travis.yml
 delete mode 100644 bin/www
 delete mode 100644 hello.js
 delete mode 100644 routes/index.js
 delete mode 100644 routes/users.js
 delete mode 100644 src/pages/att/container/delGroup.js
 delete mode 100644 src/pages/att/container/groupdetail.js
 delete mode 100644 src/pages/att/container/groupedit.js
 delete mode 100644 src/pages/att/container/grouplist.js
 delete mode 100644 src/pages/att/css/att_group.css
 delete mode 100644 src/pages/att/group.js
 delete mode 100644 src/pages/att/index.js
 delete mode 100644 src/pages/attendence/common.js
 delete mode 100644 src/pages/attendence/commonList.js
 delete mode 100644 src/pages/attendence/components/Header.js
 delete mode 100644 src/pages/attendence/components/MemberList.js
 delete mode 100644 src/pages/attendence/components/leftNav.js
 delete mode 100644 src/pages/attendence/components/list.js
 delete mode 100644 src/pages/attendence/components/listItem.js
 delete mode 100644 src/pages/attendence/detail.css
 delete mode 100644 src/pages/attendence/detail.js
 delete mode 100644 src/pages/attendence/external.js
 delete mode 100644 src/pages/attendence/externalEdit.css
 delete mode 100644 src/pages/attendence/externalEdit.js
 delete mode 100644 src/pages/attendence/externalList.js
 delete mode 100644 src/pages/attendence/index.js
 delete mode 100644 src/pages/attendence/list.css
 delete mode 100644 src/pages/attendence/main.js
 delete mode 100644 src/pages/attendence/staff.js
 delete mode 100644 src/pages/attendence/staffList.js
 delete mode 100644 src/pages/comps/todo-item.js
 delete mode 100644 src/pages/comps/todo-list.js
 delete mode 100644 src/pages/holiday/annual.js
 delete mode 100644 src/pages/holiday/annual_list.js
 delete mode 100644 src/pages/holiday/award.js
 delete mode 100644 src/pages/holiday/components/Main.js
 delete mode 100644 src/pages/holiday/components/leftNav.js
 delete mode 100644 src/pages/holiday/container/annualList.js
 delete mode 100644 src/pages/holiday/container/annualRule_edit.js
 delete mode 100644 src/pages/holiday/container/annualRule_list.js
 delete mode 100644 src/pages/holiday/container/awardList.js
 delete mode 100644 src/pages/holiday/container/dayOffList.js
 delete mode 100644 src/pages/holiday/container/dayOffRule_edit.js
 delete mode 100644 src/pages/holiday/container/dayOffRule_show.js
 delete mode 100644 src/pages/holiday/container/editModel.js
 delete mode 100644 src/pages/holiday/container/popTip.js
 delete mode 100644 src/pages/holiday/container/typeList.js
 delete mode 100644 src/pages/holiday/css/dayoffrule.css
 delete mode 100644 src/pages/holiday/css/list.css
 delete mode 100644 src/pages/holiday/day_off.js
 delete mode 100644 src/pages/holiday/day_off_list.js
 delete mode 100644 src/pages/holiday/day_off_rule.js
 delete mode 100644 src/pages/holiday/index.js
 delete mode 100644 src/pages/holiday/type.js
 delete mode 100644 views/error.ejs
 delete mode 100644 views/index.ejs
 delete mode 100644 webpack.config.js

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 213c5af..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: node_js
-node_js: "12"
-branches:
-  only: master
diff --git a/bin/www b/bin/www
deleted file mode 100644
index 6f0463d..0000000
--- a/bin/www
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Module dependencies.
- */
-
-var app = require('../app');
-var debug = require('debug')('demo:server');
-var http = require('http');
-
-/**
- * Get port from environment and store in Express.
- */
-
-var port = normalizePort(process.env.PORT || '3000');
-app.set('port', port);
-
-/**
- * Create HTTP server.
- */
-
-var server = http.createServer(app);
-
-/**
- * Listen on provided port, on all network interfaces.
- */
-
-server.listen(port);
-server.on('error', onError);
-server.on('listening', onListening);
-
-/**
- * Normalize a port into a number, string, or false.
- */
-
-function normalizePort(val) {
-  var port = parseInt(val, 10);
-
-  if (isNaN(port)) {
-    // named pipe
-    return val;
-  }
-
-  if (port >= 0) {
-    // port number
-    return port;
-  }
-
-  return false;
-}
-
-/**
- * Event listener for HTTP server "error" event.
- */
-
-function onError(error) {
-  if (error.syscall !== 'listen') {
-    throw error;
-  }
-
-  var bind = typeof port === 'string'
-    ? 'Pipe ' + port
-    : 'Port ' + port;
-
-  // handle specific listen errors with friendly messages
-  switch (error.code) {
-    case 'EACCES':
-      console.error(bind + ' requires elevated privileges');
-      process.exit(1);
-      break;
-    case 'EADDRINUSE':
-      console.error(bind + ' is already in use');
-      process.exit(1);
-      break;
-    default:
-      throw error;
-  }
-}
-
-/**
- * Event listener for HTTP server "listening" event.
- */
-
-function onListening() {
-  var addr = server.address();
-  var bind = typeof addr === 'string'
-    ? 'pipe ' + addr
-    : 'port ' + addr.port;
-  debug('Listening on ' + bind);
-}
diff --git a/hello.js b/hello.js
deleted file mode 100644
index 3f2b505..0000000
--- a/hello.js
+++ /dev/null
@@ -1,5 +0,0 @@
-function add(x, y) {
-    return x + y;
-  }
-  
-  module.exports = add;
\ No newline at end of file
diff --git a/routes/index.js b/routes/index.js
deleted file mode 100644
index 4e3a97a..0000000
--- a/routes/index.js
+++ /dev/null
@@ -1,71 +0,0 @@
-var express = require('express');
-var router = express.Router();
-var Todo = require('../src/models/todo')
-
-router.get('/', (req, res, next) => {
-	res.render('index', {
-		title: 'SERLER'
-	});
-});
-
-// 获取全部的todo
-router.get('/getAllItems', (req, res, next) => {
-	Todo.find({}).sort({'date': -1}).exec((err, todoList) => {
-		if (err) {
-			console.log(err);
-		}else {
-			res.json(todoList);
-		}
-	})
-});
-
-// 添加todo
-router.post('/addItem', (req, res, next) => {
-	let newItem = req.body;
-	Todo.create(newItem, (err) => {
-		if (err) {
-			console.log(err);
-		}else {
-			Todo.find({}, (err, todoList) => {
-				if (err) {
-					console.log(err);
-				}else {
-					res.json(todoList);
-				}
-			});
-		}
-	})
-})
-
-
-router.all('/SearchData', (req, res, next) => {
-
-	 let beginYear = req.query.beginYear;
-	 let endYear = req.query.endYear;
-	 Todo.find({content: beginYear}).sort({'date': -1}).exec((err, todoList) => {
-		if (err) {
-			console.log(err);
-		}else {
-			res.json(todoList);
-		}
-	})
-	// res.json(beginYear + endYear);
-	
-})
-
-
-
-// 删除todo
-router.post('/deleteItem', (req, res, next) => {
-	console.log(req.body);
-	let delete_date = req.body.date
-	Todo.remove({date: delete_date}, (err, result) => {
-		if (err) {
-			console.log(err)
-		}else {
-			res.json(result);
-		}
-	});
-});
-
-module.exports = router;
diff --git a/routes/users.js b/routes/users.js
deleted file mode 100644
index 48c1172..0000000
--- a/routes/users.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var express = require('express');
-var router = express.Router();
-
-router.get('/', (req, res, next) => {
-	res.render('index', {
-		title: 'SERLER'
-	});
-});
-
-module.exports = router;
\ No newline at end of file
diff --git a/src/components/layout.css b/src/components/layout.css
index a695d1b..08b01e8 100644
--- a/src/components/layout.css
+++ b/src/components/layout.css
@@ -17,4 +17,8 @@
 .g-layout .g-right{
     display: table-cell;
     width: 9999px;
+}
+
+.holiday_list{
+    padding: 20px;
 }
\ No newline at end of file
diff --git a/src/pages/att/container/delGroup.js b/src/pages/att/container/delGroup.js
deleted file mode 100644
index 59f2691..0000000
--- a/src/pages/att/container/delGroup.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Created by Gouuse on 2018/1/16 0016.
- */
-import React from 'react';
-import {connect} from 'react-redux';
-import {Modal} from 'antd';
-function DelGroup(props) {
-    return <Modal visible={true} wrapClassName='g-popup-sure' closable={false} onCancel={() => props.onCancel()} onOk={() => props.del(props.data)} title='删除考勤分组'>
-        <p className="title">您是否要删除该考勤分组？</p>
-        <p className="info">删除后该组成员将会根据规则自动进入其他分组
-            规则：员工>部门>默认分组</p>
-    </Modal>
-}
-export default connect(() => {
-    return {}
-},(dispatch,props) => {
-    return {
-        del(data){
-            dispatch({
-                type:'del_att_group',
-                data:data
-            });
-            props.onCancel();
-        }
-    }
-})(DelGroup);
\ No newline at end of file
diff --git a/src/pages/att/container/groupdetail.js b/src/pages/att/container/groupdetail.js
deleted file mode 100644
index ab81a71..0000000
--- a/src/pages/att/container/groupdetail.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Created by Gouuse on 2018/1/15 0015.
- */
-import React,{Component} from 'react';
-import {connect} from 'react-redux';
-class Detail extends Component {
-    getAttType(){
-        switch (this.props.att_type + ''){
-            case "1":
-                return <span>固定班制-每日相同班次</span>;
-            case "2":
-                return <span>固定班制-每日不同班次</span>;
-            case "3":
-                return <span>排班制</span>;
-            default:
-                return <span>未知</span>
-        }
-    }
-    getIsFlexible(){
-        if(!this.props.is_flexible){
-            return <span>不弹性</span>
-        } else {
-            return <p>上下班之前的弹性时长{this.props.ex_time}分钟，上下班之后的弹性时长{this.props.last_time}分钟</p>
-        }
-    }
-    getAttClass(){
-        const curClass = this.props.att_classes.find(item => item.id * 1 === this.props.att_class * 1 );
-        return (curClass || {}).type || '未知';
-    }
-    getMembers(){
-        if(this.props.members && this.props.members.length > 0) {
-            return this.props.members.map(member => member.member_name).join(',');
-        } else {
-            return '未加入其它分组的全体員工';
-        }
-
-    }
-    render(){
-        return <div className={"m-group-detail" + ' '+this.props.className}>
-            {this.props.showBread? <div className="g-header">
-                <span className="link bread" onClick={this.props.onChangeState}>考勤分组</span> > <span className="bread">考勤分组详情</span>
-            </div>:null}
-            <table className="g-from">
-                <tbody>
-                    <tr>
-                        <td className="in-h">分组名称</td>
-                        <td>{this.props.group_name}</td>
-                    </tr>
-                    <tr>
-                        <td className="in-h">考勤类型</td>
-                        <td>{this.getAttType()}</td>
-                    </tr>
-                    <tr>
-                        <td className="in-h">弹性</td>
-                        <td>{this.getIsFlexible()}</td>
-                    </tr>
-                    <tr>
-                        <td className="in-h">考勤班次</td>
-                        <td>{this.getAttClass()}</td>
-                    </tr>
-                    <tr>
-                        <td className="in-h">分组成员</td>
-                        <td>{this.getMembers()}</td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-    }
-}
-Detail.defaultProps = {
-    showBread:false
-}
-export default connect((state) => {
-    return {
-        att_classes:state.att.att_class
-    }
-})(Detail)
\ No newline at end of file
diff --git a/src/pages/att/container/groupedit.js b/src/pages/att/container/groupedit.js
deleted file mode 100644
index 32356a1..0000000
--- a/src/pages/att/container/groupedit.js
+++ /dev/null
@@ -1,224 +0,0 @@
-import React,{Component} from 'react'
-import {connect} from 'react-redux'
-import {Select} from 'antd';
-import { Steps,Button,message } from 'antd';
-import SelectPerson from './../../../components/g-selectData.js'
-import Detail from './groupdetail.js';
-const Step = Steps.Step;
-const Option = Select.Option;
-class Edit extends Component{
-    constructor(props){
-        super(props);
-        this.state = {
-            step:0,
-            selectPerson:false,
-            fromData:this.props.fromData || {
-                group_name:'',
-                members:[],
-                att_type:1,
-                is_flexible:0,
-                // 默认值为30分钟
-                ex_time:30,
-                last_time:30,
-                att_class:2
-            }
-        };
-        this.submit = this.submit.bind(this);
-    }
-    selectPerson(boolean){
-        this.setState({selectPerson:boolean});
-    }
-    changeFromData(filed,value){
-        if(filed === 'is_flexible') {
-            this.changeFromData('ex_time',30);
-            this.changeFromData('last_time',30);
-        }
-        this.setState((prevState) => {
-            const fromData = {...prevState.fromData,[filed]:value};
-            return {
-                fromData
-            }
-        });
-    }
-    delPerson(index){
-        const person = this.state.fromData.members;
-        person.splice(index,1);
-        this.changeFromData('members',person);
-    }
-
-    verifyFromData(step){
-        const needVerifyData = {
-            0:{
-                group_name:{
-                    is_required: true,
-                    msg:'请输入考勤分组名称'
-                },
-                members:{
-                    is_required: !this.state.fromData.is_default,
-                    msg:'请选择考勤分组成员'
-                }
-            },
-            1:{
-                ex_time:{
-                    is_required: !!this.state.fromData.is_flexible,
-                    msg:'请输入上/下班时间之前的弹性时间'
-                },
-                last_time:{
-                    is_required: !!this.state.fromData.is_flexible,
-                    msg:'请输入上/下班时间之后的弹性时间'
-                }
-            }
-        }[step];
-        const verifyKey = Object.keys(needVerifyData);
-        const len = verifyKey.length;
-        for(let i = 0;i < len ;i++){
-            const curKey = verifyKey[i];
-            const is_required = needVerifyData[curKey].is_required;
-            if(is_required && (this.state.fromData[curKey] + '').length <= 0){
-                message.warning(needVerifyData[curKey].msg);
-                return false;
-            }
-        }
-        return true;
-    }
-    changeStep(flag){
-        if(flag > 0 && !this.verifyFromData(this.state.step)) return;
-        this.setState(prevState=>{
-            return {
-               step:prevState.step+flag
-            }
-        })
-    }
-    submit(){
-        this.props.submit(this.state.fromData);
-        this.props.onChangeState();
-    }
-    createHeader(){
-       const text = this.props.fromData.id?'编辑考勤分组':'新增考勤分组';
-       return <div className="g-header">
-           <span className="bread link" onClick={this.props.onChangeState}>考勤分组</span> > <span className="bread">{text}</span>
-       </div>
-    }
-    render(){
-        return (
-            <div className="m-group-edit">
-                {this.createHeader()}
-                <div className="m-step">
-                    <Steps current={this.state.step}>
-                        <Step title="分组基本信息" />
-                        <Step title="设置规则" />
-                        <Step title="提交发布" />
-                    </Steps>
-                </div>
-                <div className="m-from">
-                    <table className="g-from">
-                        {this.state.step === 0 ? <tbody>
-                            <tr>
-                                <td className="in-h">考勤分组名称<span className="in-star">*</span></td>
-                                <td style={{height:'50px'}}>
-                                    <input type="text" className="input" value={this.state.fromData.group_name} onChange={(event) => this.changeFromData('group_name',event.target.value)}/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td className="in-h">考勤分组成员<span className="in-star">*</span></td>
-                                <td style={{height:'50px'}}>
-                                    <Button className="primary" onClick={() => {this.selectPerson(true)}}>选择人员</Button>
-                                    {this.state.fromData.members.map((p,index)=> {
-                                        return <span key={p.member_id} className="result-p" onClick={() => this.delPerson(index)}>{p.member_name}</span>
-                                    })}
-                                </td>
-                            </tr>
-                            <tr>
-                                <td className="in-h">考勤类型<span className="in-star">*</span></td>
-                                <td style={{height:'100px'}}>
-                                    <label>
-                                        <input type="radio" name="att_type" checked={this.state.fromData.att_type === 1} onChange={() => this.changeFromData('att_type',1)}/>固定班制-每日相同班次 （如每个工作日09:00-18:00,工作日相同班次）
-                                    </label>
-                                    <label>
-                                        <input type="radio" name="att_type" checked={this.state.fromData.att_type === 2} onChange={() => this.changeFromData('att_type',2)}/>固定班制-每日不同班次 （如周一09:00-18:00，周二08:00-19:00，工作日有不同班次，按周循环）
-                                    </label>
-                                    <label>
-                                        <input type="radio" name="att_type" checked={this.state.fromData.att_type === 3} onChange={() => this.changeFromData('att_type',3)}/>排版制（每天的考勤时间不固定，可以灵活的设置考勤时间）
-                                    </label>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td className="in-h"></td>
-                                <td>
-                                    <Button className="cancel" onClick={this.props.onChangeState}>取消</Button>
-                                    {this.state.step > 0?<Button className="submit" style={{margin:'0 10px'}} onClick={() => this.changeStep(-1)}>上一步</Button>:null}
-                                    <Button className="submit" style={{margin:'0 10px'}} onClick={() => this.changeStep(1)}>保存并进入下一步</Button>
-                                </td>
-                            </tr>
-                        </tbody>:null}
-                        {this.state.step === 1 ? <tbody>
-                           <tr>
-                                <td className="in-h">是否弹性</td>
-                                <td style={{height:'80px'}}>
-                                    <label>
-                                        <input type="radio" name="is_flexible" checked={this.state.fromData.is_flexible === 0} onChange={() => this.changeFromData('is_flexible',0)}/>无弹性(严格按照上下班时间考勤)
-                                    </label>
-                                    <label>
-                                        <input type="radio" name="is_flexible" checked={this.state.fromData.is_flexible === 1} onChange={() => this.changeFromData('is_flexible',1)}/>部分弹性(上下班时间前后弹性一段时间)
-                                    </label>
-                                    {this.state.fromData.is_flexible === 1?
-                                        <div>
-                                            上下班之前的弹性时长<input type='text' value={this.state.fromData.ex_time} onChange={(event) => this.changeFromData('ex_time',event.target.value)} className='input small'/>分钟，
-                                            上下班之后的弹性时长<input type='text' value={this.state.fromData.last_time} onChange={(event) => this.changeFromData('last_time',event.target.value)} className='input small'/>分钟
-                                        </div>
-                                    :null}
-                                </td>
-                            </tr>
-                            <tr style={{height:'50px'}}>
-                                <td className="in-h">考勤班次<span className="in-star">*</span></td>
-                                <td>
-                                    <Select style={{ width: 300 }} defaultValue={this.state.fromData.att_class + ''} placeholder='请选择考勤班次' dropdownClassName={'filterOpt'} className='g-filter-depts' onChange={(val) => this.changeFromData('att_class',val)}>
-                                        {this.props.att_class.map(cls => {
-                                            return <Option key={cls.id}>
-                                                <span className='name'>{cls.type}</span>
-                                            </Option>
-                                        })}
-                                    </Select>
-                                </td>
-                            </tr>
-                           <tr >
-                               <td className="in-h"></td>
-                               <td>
-                                   <Button className="cancel" onClick={this.props.onChangeState}>取消</Button>
-                                   {this.state.step > 0?<Button className="submit" style={{margin:'0 10px'}} onClick={() => this.changeStep(-1)}>上一步</Button>:null}
-                                   <Button className="submit" style={{margin:'0 10px'}} onClick={() => this.changeStep(1)}>保存并进入下一步</Button>
-                               </td>
-                           </tr>
-                        </tbody>:null}
-                        {this.state.step === 2 ? <tbody>
-                            <tr>
-                                <td>
-                                    <Detail {...this.state.fromData}/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                    <Button className="cancel" onClick={this.props.onChangeState}>取消</Button>
-                                    {this.state.step > 0?<Button className="submit" style={{margin:'0 10px'}} onClick={() => this.changeStep(-1)}>上一步</Button>:null}
-                                    <Button className="submit" style={{margin:'0 10px'}} onClick={this.submit}>提交</Button>
-                                </td>
-                            </tr>
-                        </tbody> : null}
-                    </table>
-                </div>
-                {this.state.selectPerson?<SelectPerson visible={this.state.selectPerson} type="staff" selectedData={this.state.fromData.members} onChangeTree={() => this.selectPerson(false)} onOk={(data) => this.changeFromData('members',data)}/>:null}
-            </div>
-        )
-    }
-}
-export default connect((state) => {
-    return {
-        att_class:state.att.att_class
-    }
-},(dispatch) => {
-    return {
-        submit(data){
-            dispatch({type:'edit_att_group',data:data})
-        }
-    }
-})(Edit)
\ No newline at end of file
diff --git a/src/pages/att/container/grouplist.js b/src/pages/att/container/grouplist.js
deleted file mode 100644
index 918bd9e..0000000
--- a/src/pages/att/container/grouplist.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import {connect} from 'react-redux';
-import GList from './../../../components/g-list.js';
-import {Button} from 'antd'
-function List(props) {
-    return <div>
-            <div className="g-header f-clearFix">
-                <Button type='primary' className='f-fr' onClick={props.onChangeState}>新增分组</Button>
-            </div>
-            <GList cols={props.cols} title={props.title} data={props.data} offset={55}/>
-        </div>
-}
-export default connect((state) => {
-    return {
-        data:state.att.att_group
-    }
-})(List)
diff --git a/src/pages/att/css/att_group.css b/src/pages/att/css/att_group.css
deleted file mode 100644
index b66b4e6..0000000
--- a/src/pages/att/css/att_group.css
+++ /dev/null
@@ -1,26 +0,0 @@
-.m-group-edit .m-step{
-    padding: 20px 30px;
-    border-bottom: 1px solid #ebebeb;
-}
-.m-group-edit .m-from{
-    margin-left: 100px;
-    margin-top: 30px;
-}
-.m-group-edit .m-from label{
-    display: block;
-    margin-bottom: 10px;
-    font-size: 14px;
-    color: #757575;
-}
-.m-group-edit .m-from input[type='radio']{
-    margin-right: 20px;
-}
-.m-group-edit .m-from td{
-    vertical-align: top
-}
-.m-group-edit .m-from .select1,.m-group-edit .m-from .select3,.m-group-edit .m-from .select5{
-    display: block;
-}
-.m-att_detail-page .g-from{
-    margin: 20px 0 0 40px;
-}
\ No newline at end of file
diff --git a/src/pages/att/group.js b/src/pages/att/group.js
deleted file mode 100644
index c67054f..0000000
--- a/src/pages/att/group.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import React ,{Component} from 'react';
-import Edit from './container/groupedit.js';
-import List from './container/grouplist.js';
-import Detail from './container/groupdetail.js';
-import DelGroup from './container/delGroup.js';
-import './css/att_group.css'
-class Group extends Component {
-    constructor(props){
-        super(props);
-        this.state = {
-            status:'list',
-            delGroup:false
-        };
-        this.fromData = '';
-        this.changeState = this.changeState.bind(this);
-        this.changeModelState = this.changeModelState.bind(this);
-        this.cols = [
-            {
-                title:'分组名称',
-                key:'group_name',
-                width:150
-            },
-            {
-                title:'考勤类型',
-                key:'att_type',
-                width:200,
-                render:(item) => {
-                    const text = {
-                        1:'固定班制-每日相同班次',
-                        2:'固定班制-每日不同班次',
-                        3:'排班制'
-                    }[item.att_type];
-                    return <div>{text}</div>
-                }
-            },
-            {
-                title:'弹性',
-                key:'is_flexible',
-                width:100,
-                render:(item) => {
-                    const text = {
-                        0:'不弹性',
-                        1:'弹性',
-                    }[item.is_flexible];
-                    return <div>{text}</div>
-                }
-            },
-            {
-                title:'分组成员',
-                key:'members',
-                render:(item) => {
-                    if(item.members.length <= 0){
-                        return <div>未加入其它分组的全体員工</div>
-                    } else {
-                        const member_names = item.members.map(member => member.member_name).join(',');
-                        return <div>{member_names}</div>
-                    }
-                }
-            },
-            {
-                type:'action',
-                width:200,
-                render:(item) => {
-                    return <div>
-                        <span className="action" onClick={() => this.changeState('edit',() => {this.getRowData(item)})}>编辑</span>
-                        {!item.is_default?<span className="action" onClick={() => this.changeModelState(true,() => {this.getRowData(item)})}>删除</span>:null}
-                        <span className="action" onClick={() => this.changeState('detail',() => {this.getRowData(item)})}>详情</span>
-                    </div>
-                }
-            }
-        ];
-    }
-    getRowData(data=''){
-        this.fromData = data;
-    }
-    changeState(status,callback){
-        callback && callback();
-        this.setState({
-            status
-        });
-    }
-    changeModelState(flag=false,callback){
-        callback && callback();
-        this.setState({
-            delGroup:flag
-        })
-    }
-    render(){
-        return (
-            <div className="m-att-group">
-                {this.state.status === 'edit'?<Edit onChangeState={() => this.changeState('list')} fromData={this.fromData}/>:null}
-                {this.state.status === 'list'?<List cols={this.cols} title='考勤分组' onChangeState={() => this.changeState('edit',() => {this.getRowData('')})}/>:null}
-                {this.state.status === 'detail' ?<Detail {...this.fromData} showBread={true} onChangeState={() => this.changeState('list')} className='m-att_detail-page'/>:null}
-                {this.state.delGroup?<DelGroup data={this.fromData} onCancel={this.changeModelState}/>:null}
-            </div>
-        )
-    }
-}
-export default Group;
\ No newline at end of file
diff --git a/src/pages/att/index.js b/src/pages/att/index.js
deleted file mode 100644
index d634375..0000000
--- a/src/pages/att/index.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import React ,{Component} from 'react';
-import {Route} from 'react-router-dom'
-import Group from './group.js';
-export default class Index extends Component{
-    render(){
-        return (
-            <Route component={Group}/>
-        )
-    }
-}
\ No newline at end of file
diff --git a/src/pages/attendence/common.js b/src/pages/attendence/common.js
deleted file mode 100644
index 4d97cd4..0000000
--- a/src/pages/attendence/common.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import React,{Component} from 'react'
-import {Route,Switch} from 'react-router-dom'
-import List from './commonList.js'
-import Detail from './detail.js'
-export default class extends Component {
-    componentDidMount(){
-        this.props.history.push('/attendence/common/list')
-    }
-    render(){
-        return (
-            <div>
-                <Switch>
-                    <Route path='/attendence/common/list' component={List}/>
-                    <Route path='/attendence/common/detail' render={props => <Detail {...props} type='common'/>}/>
-                    <Route component={List}/>
-                </Switch>
-            </div>
-        )
-    }
-}
\ No newline at end of file
diff --git a/src/pages/attendence/commonList.js b/src/pages/attendence/commonList.js
deleted file mode 100644
index 3f66fa5..0000000
--- a/src/pages/attendence/commonList.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React,{Component} from 'react';
-import Header from './components/Header.js'
-import MemberList from "./components/MemberList.js";
-class Main extends Component {
-    constructor(props){
-        super(props);
-        this.state = {
-            letter:'',
-            keyword:''
-        };
-        this.gotoDetail = this.gotoDetail.bind(this);
-    }
-    // 按字母进行筛选
-    selectLetter(letter){
-        this.setState({letter})
-    }
-    // 按关键字搜索
-    search(keyword){
-        this.setState({keyword});
-    }
-    gotoDetail(){
-        this.props.history.push('/attendence/common/detail');
-    }
-    render(){
-        return (
-            <div style={{...this.props.style}}>
-                <Header selectLetter={this.selectLetter.bind(this)} letter={this.state.letter} search={this.search.bind(this)}
-                        placeholder='请输入姓名'/>
-                <MemberList type='getCommon' filed1='attrendance' filed2='commons' url="/api/get/commonList" title="常用联系人" letter={this.state.letter} keyword={this.state.keyword} gotoDetail={this.gotoDetail}/>
-            </div>
-        )
-    }
-}
-export default Main;
\ No newline at end of file
diff --git a/src/pages/attendence/components/Header.js b/src/pages/attendence/components/Header.js
deleted file mode 100644
index ca02985..0000000
--- a/src/pages/attendence/components/Header.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import React,{Component} from 'react';
-import GSearch from '../../../components/g-search.js'
-import GFilterLetter from '../../../components/g-filter-letter.js'
-class Header extends Component{
-    render(){
-        return(
-            <div className="g-header">
-                <GSearch search={this.props.search} placeholder={this.props.placeholder}/>
-                <GFilterLetter style={{marginLeft:'20px'}} letter={this.props.letter} selectLetter={this.props.selectLetter}/>
-                {this.props.addContact ? this.props.addContact:null}
-            </div>
-        )
-    }
-}
-export default Header;
\ No newline at end of file
diff --git a/src/pages/attendence/components/MemberList.js b/src/pages/attendence/components/MemberList.js
deleted file mode 100644
index 4696870..0000000
--- a/src/pages/attendence/components/MemberList.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React ,{Component} from 'react';
-import {Icon} from 'antd';
-import List from './list.js';
-import '../list.css';
-class MemberList extends Component{
-    constructor(props){
-        super(props);
-        this.state = {
-            type:'cart',
-            showModal:false
-        };
-        this.header = this.header.bind(this);
-    }
-    header(){
-        return <div className="listHeader">
-            <span>{this.props.title}</span>
-            <div className="switch f-fr">
-                <Icon type="bars" onClick={this.switchType.bind(this,'list')} className={'icon ' + (this.state.type === 'list' ? 'active' :'')} style={{fontSize:'16px'}}/>
-                <Icon type="appstore" onClick={this.switchType.bind(this,'cart')} className={'icon ' + (this.state.type === 'cart' ? 'active' :'')} style={{fontSize:'16px'}}/>
-            </div>
-        </div>;
-    }
-    render(){
-        return <div>
-            <List filed1={this.props.filed1} filed2={this.props.filed2} letter={this.props.letter} keyword={this.props.keyword} type={this.state.type} header={this.header} delIcon={this.props.delIcon} gotoDetail={this.props.gotoDetail}/>
-        </div>
-    }
-    switchType(type){
-        this.setState({type})
-    }
-}
-MemberList.defaultProps = {
-    title:'gouuse',
-    delIcon:false
-};
-export default MemberList;
\ No newline at end of file
diff --git a/src/pages/attendence/components/leftNav.js b/src/pages/attendence/components/leftNav.js
deleted file mode 100644
index 851310c..0000000
--- a/src/pages/attendence/components/leftNav.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import React,{Component} from 'react'
-import {NavLink as Link} from 'react-router-dom'
-class LeftNav extends Component {
-    render(){
-        return <ul className="m-leftNav">
-            <li className="nav"><Link to={`/attendence/staff`} activeClassName='g-navActive' className='link'>公司职员</Link></li>
-            <li className="nav"><Link to={`/attendence/external`} activeClassName='g-navActive' className='link'>外部联系人</Link></li>
-            <li className="nav"><Link to={`/attendence/common`} activeClassName='g-navActive' className='link'>常用联系人</Link></li>
-        </ul>
-    }
-}
-export default LeftNav;
\ No newline at end of file
diff --git a/src/pages/attendence/components/list.js b/src/pages/attendence/components/list.js
deleted file mode 100644
index 3e5c6a6..0000000
--- a/src/pages/attendence/components/list.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import React,{Component} from 'react'
-import {Icon} from 'antd';
-import ListItem from './listItem.js';
-import fixHeight from '../../../global/fixHeight.js'
-import {connect} from 'react-redux'
-const height = fixHeight({offset:95});
-class List extends Component {
-    render(){
-        if(this.props.data.length > 0){
-            const items = this.props.data.map((item) => {
-                return <ListItem key={item.member_id} type={this.props.type} {...item} member={item} changeCur = {this.props.changeCur} delCommon={this.props.delCommon} setCommon={this.props.setCommon} addCommon={this.props.addCommon} delIcon={this.props.delIcon} del={this.props.delExter} gotoDetail={this.props.gotoDetail}/>
-            });
-            return <div className="content" style={{height:height}}>
-                {this.props.header && this.props.header()}
-                {/*列表*/}
-                <ul className="list f-clearFix">{items}</ul>
-            </div>
-        } else {
-            return <div className="g-empty">
-                <Icon type="frown-o" style={{color:'#b8e0c8',fontSize:'50px'}}/>
-                <p className="word">暂无数据</p>
-            </div>
-        }
-    }
-}
-function getData(state, ownProps) {
-    return state[ownProps.filed1][ownProps.filed2].filter((item) => {
-            let match = true;
-            if(ownProps.letter !== '' && item.letter !== ownProps.letter) match = false;
-            if(match && ownProps.keyword !== '' && item.member_name.indexOf(ownProps.keyword) < 0) match = false;
-            return match;
-        });
-}
-export default connect((state,ownProps) => {
-    return {
-        data:getData(state,ownProps)
-    }
-},(dispatch,ownProps) => {
-    return{
-        setCommon(flag,member_id){
-            dispatch({
-                type:'changeCommon',
-                flag,
-                member_id
-            })
-        },
-        addCommon(member){
-            dispatch({
-                type:'addCommon',
-                member
-            });
-            dispatch({
-                type:'exitExternal',
-                params:{...member,like:!member.like * 1}
-            })
-        },
-        delCommon(member){
-            dispatch({
-                type:'delCommon',
-                member,
-            });
-            dispatch({
-                type:'exitExternal',
-                params:{...member,like:!member.like * 1}
-            })
-        },
-        changeCur(member){
-            dispatch({
-                type:'changeCur',
-                param:member
-            })
-        },
-        delExter(member_id){
-            dispatch({
-                type:'delExternal',
-                member_id
-            })
-        }
-    }
-})(List)
\ No newline at end of file
diff --git a/src/pages/attendence/components/listItem.js b/src/pages/attendence/components/listItem.js
deleted file mode 100644
index d813c24..0000000
--- a/src/pages/attendence/components/listItem.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import React,{Component} from 'react'
-import HeaderImg from '../../../components/g-headerImg.js'
-import {Icon,Tooltip,Row, Col} from 'antd'
-class Heart extends Component{
-    setLike(){
-        const flag = this.props.like ? 0:1;
-        if(this.props.type !== 'getCommon')  this.props.setCommon(flag,this.props.id);
-        if(flag === 0){
-            this.props.delCommon(this.props.member);
-        } else {
-            this.props.addCommon(this.props.member);
-        }
-    }
-    render(){
-        return <Tooltip placement="bottom" title={this.props.like===1?'取消关注':'关注'}>
-            <Icon onClick={this.setLike.bind(this)} type={this.props.like===1?'heart':"heart-o"} className={'heart '+ (this.props.like ? 'like':'')} style={{ fontSize: 16 }} />
-        </Tooltip>
-    }
-}
-class Del extends Component{
-    constructor(props){
-        super(props);
-        this.handleDel = this.handleDel.bind(this);
-    }
-    handleDel(){
-        this.props.del(this.props.id);
-        this.props.delCommon({member_id:this.props.id});
-    }
-    render(){
-        return <Icon type='delete' className='del' onClick={this.handleDel}/>
-    }
-}
-class ListItem extends Component{
-    constructor(props){
-        super(props);
-        this.gotoDetail = this.gotoDetail.bind(this);
-    }
-    gotoDetail(){
-        this.props.changeCur(this.props.member);
-        this.props.gotoDetail();
-    }
-    render(){
-        let content;
-        if(this.props.type === 'cart'){
-            content = <div className="f-clearFix" style={{position:'relative'}}>
-                <HeaderImg className="f-fl headimg" {...this.props} onClick={this.gotoDetail}/>
-                <div className="f-fl" style={{marginLeft:'10px'}}>
-                    <p>
-                        <span className="name" onClick={this.gotoDetail}>{this.props.member_name}</span>
-                        <span className="tel">{this.props.phone}</span>
-                    </p>
-                    <p>
-                        {this.props.position && <span className="position">{this.props.position}</span>}
-                        {this.props.leader && <span className="leader">部门负责人</span>}
-                    </p>
-                </div>
-                <Heart type={this.props.type} like={this.props.like} member={this.props.member} addCommon={this.props.addCommon} delCommon={this.props.delCommon} id={this.props.member_id} setCommon={this.props.setCommon}/>
-                {this.props.delIcon ? <Del id={this.props.member_id} delCommon={this.props.delCommon} del={this.props.del}/>:null}
-            </div>
-        } else {
-            content = <Row className="f-clearFix listRow">
-                <Col span={8} className='col col-1' onClick={this.gotoDetail}>
-                    {this.props.member_name}
-                    {this.props.leader && <span className="leader">部门负责人</span>}
-                </Col>
-                <Col span={6} className='col'>{this.props.position}</Col>
-                <Col span={6} className='col'>{this.props.phone}</Col>
-                <Col span={4} className='col'>
-                    <Heart type={this.props.type} like={this.props.like} member={this.props.member} addCommon={this.props.addCommon} delCommon={this.props.delCommon} id={this.props.member_id} setCommon={this.props.setCommon}/>
-                    {this.props.delIcon ? <Del id={this.props.member_id} delCommon={this.props.delCommon} del={this.props.del}/>:null}
-                </Col>
-            </Row>
-        }
-        return (
-            <li className={this.props.type+"Item"}>{content}</li>
-        );
-    }
-}
-ListItem.defaultProps = {
-    type:'cart'
-};
-export default ListItem
\ No newline at end of file
diff --git a/src/pages/attendence/detail.css b/src/pages/attendence/detail.css
deleted file mode 100644
index d3a9557..0000000
--- a/src/pages/attendence/detail.css
+++ /dev/null
@@ -1,42 +0,0 @@
-.m-detail{
-    font-size: 14px;
-}
-.m-detail .img{
-    width: 120px;
-    height: 120px;
-    float: left;
-    font-size: 28px;
-}
-.m-detail .add{
-    padding: 30px;
-    padding-left: 100px;
-}
-.m-detail .base{
-    padding: 30px;
-    padding-left: 100px;
-    border-bottom: 1px solid #f2f5f9;
-}
-.m-detail .word{
-    float:left;
-    margin-top: 10px;
-    margin-left: 20px;
-}
-.m-detail .word .name{
-    display: block;
-    font-size: 16px;
-    margin-bottom: 20px;
-}
-.m-detail .word p{
-    margin-bottom: 10px;
-}
-.m-detail .title{
-    font-size: 14px;
-    color: #8899a9;
-    margin-right: 10px;
-}
-.m-detail .add p{
-    margin-bottom: 10px;
-}
-.m-detail .add .title{
-    margin-right: 40px;
-}
\ No newline at end of file
diff --git a/src/pages/attendence/detail.js b/src/pages/attendence/detail.js
deleted file mode 100644
index 6258deb..0000000
--- a/src/pages/attendence/detail.js
+++ /dev/null
@@ -1,111 +0,0 @@
-import React,{Component} from 'react'
-import GBreadcrumb from './../../components/g-breadcrumb.js'
-import GHeaderImg from './../../components/g-headerImg.js'
-import {Button} from 'antd'
-import {connect} from 'react-redux'
-import './detail.css';
-class Detail extends Component {
-    constructor(props){
-        super(props);
-        this.breadcrumbs = {
-            'common':[
-                {
-                    link:'/common/list',
-                    label:'常用联系人'
-                },
-                {
-                    label:'常用联系人详情'
-                }
-            ],
-            'external':[
-                {
-                    link:'/external/list',
-                    label:'外部联系人'
-                },
-                {
-                    label:'外部联系人详情'
-                }
-            ],
-            'staff':[
-                {
-                    link:'/staff/list',
-                    label:'公司职员'
-                },
-                {
-                    label:'公司职员详情'
-                }
-            ]
-        };
-        this.state = {
-            btn_loading:false
-        };
-        this.del = this.del.bind(this);
-        this.edit = this.edit.bind(this);
-    }
-    del(){
-        this.props.delExter(this.props.data.member_id);
-        this.props.delCommon(this.props.data);
-        this.props.history.push('/attendence/external/list');
-    }
-    edit(){
-        this.props.history.push('/attendence/external/edit');
-    }
-    render(){
-        const {data} = this.props;
-        return (
-            <div className='m-detail'>
-                <GBreadcrumb breadcrumbs={this.breadcrumbs[this.props.type]}/>
-                {this.props.type !== 'external'?null : (
-                    <div className='g-top-col'>
-                        <Button type='default' style={{marginRight:'20px'}} loading={this.state.btn_loading} onClick={this.del}>删除</Button>
-                        <Button type='primary' loading={this.state.btn_loading} onClick={this.edit}>编辑</Button>
-                    </div>
-                )}
-                <div className='m-content'>
-                    <div className='base f-clearFix'>
-                        <GHeaderImg {...data} className='img'/>
-                        <div className='word'>
-                            <span className='name'>{data.member_name}</span>
-                            <p>
-                                <span className='title'>部门:</span>
-                                {data.dpart_name}
-                            </p>
-                            <p>
-                                <span className='title'>职位:</span>
-                                {data.position}
-                            </p>
-                        </div>
-                    </div>
-                    <div className='add'>
-                        <p>
-                            <span className='title'>电话:</span>{data.phone}
-                        </p>
-                        <p>
-                            <span className='title'>邮箱:</span>{data.email}
-                        </p>
-                    </div>
-                </div>
-            </div>
-        )
-    }
-}
-export default connect((state) => {
-    return {
-        data:state.attrendance.curMember
-    }
-},(dispatch) => {
-    return {
-        delExter(member_id) {
-            dispatch({
-                type: 'delExternal',
-                member_id
-            })
-        },
-        delCommon(member){
-            dispatch({
-                type:'delCommon',
-                member
-            })
-        },
-    }
-})(Detail)
\ No newline at end of file
diff --git a/src/pages/attendence/external.js b/src/pages/attendence/external.js
deleted file mode 100644
index fd6a563..0000000
--- a/src/pages/attendence/external.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import React,{Component} from 'react'
-import {Route,Switch} from 'react-router-dom'
-import List from './externalList.js'
-import Edit from './externalEdit.js'
-import Detail from './detail.js'
-export default class extends Component {
-     componentDidMount(){
-        this.props.history.push('/attendence/external/list')
-    }
-    render(){
-        return (
-            <div>
-                <Switch>
-                    <Route path='/attendence/external/list' component={List}/>
-                    <Route path='/attendence/external/edit' render={props => <Edit {...props} type='edit'/>}/>
-                    <Route path='/attendence/external/add' render={props => <Edit {...props} type='add'/>}/>
-                    <Route path='/attendence/external/detail' render={props => <Detail {...props} type='external'/>}/>
-                    <Route component={List}/>
-                </Switch>
-            </div>
-        )
-    }
-}
\ No newline at end of file
diff --git a/src/pages/attendence/externalEdit.css b/src/pages/attendence/externalEdit.css
deleted file mode 100644
index 7fe4e2c..0000000
--- a/src/pages/attendence/externalEdit.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.m-external-edit .m-content{
-    margin-top: 20px;
-    margin-left: 40px;
-}
-.m-external-edit .m-content .btns{
-    margin-top: 20px;
-}
\ No newline at end of file
diff --git a/src/pages/attendence/externalEdit.js b/src/pages/attendence/externalEdit.js
deleted file mode 100644
index 685deef..0000000
--- a/src/pages/attendence/externalEdit.js
+++ /dev/null
@@ -1,263 +0,0 @@
-import React ,{Component} from 'react';
-import GBreadcrumb from './../../components/g-breadcrumb.js'
-import {connect} from 'react-redux'
-import {message,Button} from 'antd';
-import './externalEdit.css'
-class Phone extends Component{
-    constructor(props){
-        super(props);
-        this.addPhone = this.addPhone.bind(this);
-        this.changePhone = this.changePhone.bind(this);
-        this.delPhone = this.delPhone.bind(this);
-    }
-    addPhone(){
-        const phone = this.props.phone.concat();
-        phone.push('');
-        this.props.changePhone(phone);
-    }
-    delPhone(index){
-         const phone = this.props.phone.concat();
-        phone.splice(index,1);
-        this.props.changePhone(phone);
-    }
-    changePhone(event,index){
-        const target = event.target;
-        let value = target.value;
-        value = value.replace(/[^\d]/g,'');
-        value = value.replace(/^[^1]/,'');
-        if(value.length > 11) value = value.slice(0,11);
-        const phone = this.props.phone.concat();
-        phone.splice(index,1,value);
-        this.props.changePhone(phone);
-    }
-    render(){
-        const phone = this.props.phone.map((phone,index) => {
-            if(index === 0){
-                return <tr key={index}>
-                    <td className='in-h'>手机号<span className='in-star'>*</span></td>
-                    <td>
-                        <input value={phone}  className='input' data-filed='phone' onChange={(event) => {this.changePhone(event,index)}}/>
-                        <button type='button' className='submit' onClick={this.addPhone}>增加</button>
-                    </td>
-                </tr>
-            } else {
-                return <tr key={index}>
-                    <td className='in-h'>{`手机号${index+1}`}</td>
-                    <td>
-                        <input value={phone} className='input' data-filed='phone' onChange={(event) => {this.changePhone(event,index)}}/>
-                        <button type='button' className='cancel' onClick={() => {this.delPhone(index)}}>删除</button>
-                    </td>
-                </tr>
-            }
-        });
-        return <table><tbody>{phone}</tbody></table>
-    }
-}
-class Edit extends Component {
-    constructor(props){
-        super(props);
-        const curLabel = {
-            'add':'添加外部联系人',
-            'edit':'编辑外部联系人'
-        };
-        this.breadcrumb = [
-            {
-                link:'/attendence/external/list',
-                label:'外部联系人'
-            },
-            {
-                label:curLabel[this.props.type]
-            }
-        ];
-        this.changeValue = this.changeValue.bind(this);
-        this.changePhone = this.changePhone.bind(this);
-        this.cancel = this.cancel.bind(this);
-        this.gotoList = this.gotoList.bind(this);
-        this.saveGoto = this.saveGoto.bind(this);
-        this.saveNew = this.saveNew.bind(this);
-        this.isModify = false;
-        this.state = {
-            member_name:'',
-            phone:[''],
-            dept:'',
-            position:''
-        }
-    }
-    componentDidMount(){
-        if(this.props.type === 'edit'){
-            this.setState({
-                ...this.props.data
-            })
-        }
-    }
-    changeValue(event){
-        const target = event.target;
-        const filed = target.dataset.filed;
-        this.setState({
-            [filed]:target.value
-        });
-    }
-    changePhone(phone){
-        this.setState({
-            phone:phone
-        })
-    }
-    cancel(){
-        if(this.isModify){
-            this.setState({
-                showModal:true
-            })
-        } else {
-            this.gotoList();
-        }
-    }
-    static checkFrom(data){
-        const keys = Object.keys(data);
-        for(const key of keys){
-            const item = data[key];
-            if(item.required && item.value.length < 1){
-                message.warning('请输入'+item.label);
-                return false;
-            }
-            if(!item.exp.test(item.value)){
-                message.warning(item.label + '格式不正确');
-                return false;
-            }
-        }
-        return true;
-    }
-    static clearTrim(value){
-        if(value === undefined) return;
-        if(Array.isArray(value)){
-            value = value.filter(item =>{
-                item = Edit.clearTrim(item);
-                return item.length > 0;
-            });
-            if(value.length > 0){
-                value = (value.join().replace(/\s/g,'')).split(',')
-            }
-            return value;
-        } else {
-            value = value.replace(/\s/g,'');
-        }
-        return value;
-    }
-    save(callback){
-        const msg = {
-            member_name: {
-                label:'姓名',
-                value:Edit.clearTrim(this.state.member_name),
-                exp:/.+/,
-                required:true
-            },
-            phone: {
-                label:'手机号',
-                value:Edit.clearTrim(this.state.phone),
-                exp:/^1[34578]\d{9}$/,
-                required:true
-            },
-            dept: {
-                label:'部门',
-                value:Edit.clearTrim(this.state.dept),
-                exp:/.*/,
-                required:false
-            },
-            position: {
-                label:'职位',
-                value:Edit.clearTrim(this.state.position),
-                exp:/.*/,
-                required:false
-            }
-        };
-        if (!Edit.checkFrom(msg)) return;
-        if(this.props.type === 'add'){
-            this.props.addExternal(this.state);
-        } else {
-            this.props.exitExternal(this.state);
-        }
-       callback && callback();
-    }
-    saveNew(){
-        this.save(() => {
-            this.setState({
-                member_name:'',
-                phone:[''],
-                dept:'',
-                position:''
-            })
-        });
-    }
-    saveGoto(){
-        this.save(this.gotoList);
-    }
-    gotoList(){
-        this.props.history.push('/attendence/external/list');
-    }
-    render(){
-        return (
-            <div className='m-external-edit'>
-                <GBreadcrumb breadcrumbs={this.breadcrumb}/>
-                <div className='m-content'>
-                    <table className='g-from'>
-                        <tbody>
-                            <tr>
-                                <td className='in-h'>姓名<span className='in-star'>*</span></td>
-                                <td>
-                                    <input className='input' value={this.state.member_name} data-filed='member_name' onChange={this.changeValue}/>
-                                </td>
-                            </tr>
-                            <tr>
-
-                                <td colSpan={2}>
-                                    <Phone phone={this.state.phone} changePhone={this.changePhone}/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td className='in-h'>部门</td>
-                                <td>
-                                    <input className='input' value={this.state.dept} data-filed='dept' onChange={this.changeValue}/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td className='in-h'>职位</td>
-                                <td>
-                                    <input className='input' value={this.state.position} data-filed='position' onChange={this.changeValue}/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td className='in-h'></td>
-                                <td>
-                                    <div className='btns'>
-                                        <Button type="primary" className='cancel' style={{marginRight:'20px'}} loading={this.state.btn_loading} onClick={this.cancel}>取消</Button>
-                                        <Button type="primary" className='submit' style={{marginRight:'20px'}} loading={this.state.btn_loading} onClick={this.saveGoto}>保存</Button>
-                                        {this.props.type === 'add'?<Button type="primary" className='submit' loading={this.state.btn_loading} onClick={this.saveNew}>保存并新增</Button>:null}
-                                    </div>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        )
-    }
-}
-export default connect((state) => {
-    return {
-        data:state.attrendance.curMember
-    }
-},(dispatch) => {
-   return {
-       addExternal(data){
-           dispatch({
-            type:'addExternal',
-            params:data
-           })
-       },
-       exitExternal(data){
-           dispatch({
-               type:'exitExternal',
-               params:data
-           })
-       }
-   }
-})(Edit);
\ No newline at end of file
diff --git a/src/pages/attendence/externalList.js b/src/pages/attendence/externalList.js
deleted file mode 100644
index 751622c..0000000
--- a/src/pages/attendence/externalList.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import React,{Component} from 'react';
-import Header from './components/Header.js'
-import MemberList from "./components/MemberList.js";
-import { Button } from 'antd';
-class Main extends Component {
-    constructor(props){
-        super(props);
-        this.state = {
-            letter:'',
-            keyword:''
-        };
-        this.gotoDetail = this.gotoDetail.bind(this);
-    }
-    // 按字母进行筛选
-    selectLetter(letter){
-        this.setState({letter})
-    }
-    // 按关键字搜索
-    search(keyword){
-        this.setState({keyword});
-    }
-    addContact() {
-        const {history} = this.props;
-        history.push('/attendence/external/add')
-    }
-     gotoDetail(){
-        this.props.history.push('/attendence/external/detail');
-    }
-    render(){
-        return (
-            <div style={{...this.props.style}}>
-                <Header selectLetter={this.selectLetter.bind(this)} letter={this.state.letter} search={this.search.bind(this)}
-                        placeholder='请输入姓名'
-                        addContact={<Button style={{float:'right'}} onClick={this.addContact.bind(this)}>添加联系人</Button>}/>
-                <MemberList type='getExternal' filed1='attrendance' filed2='externals' url="/api/get/externalList" title="外部联系人" letter={this.state.letter} keyword={this.state.keyword} delIcon={true} gotoDetail={this.gotoDetail}/>
-            </div>
-        )
-    }
-}
-export default Main;
\ No newline at end of file
diff --git a/src/pages/attendence/index.js b/src/pages/attendence/index.js
deleted file mode 100644
index a52c60d..0000000
--- a/src/pages/attendence/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import React,{Component} from 'react';
-import Main from './main.js'
-import LeftNav from './components/leftNav.js'
-import Layout from '../../components/layout.js'
-class Index extends Component {
-    componentDidMount(){
-        //this.props.history.push('/attendence/staff')
-        this.props.history.push('/search')
-
-    }
-    render(){
-        return (
-            <Layout type={2} left={<LeftNav {...this.props}/>} right={<Main {...this.props}/>}></Layout>
-        )
-    }
-}
-export default Index;
\ No newline at end of file
diff --git a/src/pages/attendence/list.css b/src/pages/attendence/list.css
deleted file mode 100644
index 561a2f3..0000000
--- a/src/pages/attendence/list.css
+++ /dev/null
@@ -1,117 +0,0 @@
-.content{
-    margin: 20px 20px 0;
-    border-radius: 4px;
-    border: 1px solid #b7c8d0;
-    overflow: auto;
-}
-.listHeader{
-    height: 50px;
-    line-height: 50px;
-    background: #f2f5f9;
-    border-radius: 4px 4px 0 0;
-    padding: 0 0 0 20px;
-    border-bottom: 1px solid #e9eef1;
-}
-.listHeader .switch{
-    height: 100%;
-}
-.listHeader .icon{
-    vertical-align: top;
-    width: 50px;
-    text-align: center;
-    height: 100%;
-    line-height: 50px;
-    cursor: pointer;
-    border-left: 1px solid #b7c8d0;
-    color: #8899a9;
-}
-.listHeader .icon.active{
-    background: #ffffff;
-    color: #25c870;
-}
-.list{
-    padding-bottom: 10px;
-}
-.list .cartItem{
-    float: left;
-    width: 280px;
-    margin: 10px 0 0 10px;
-    padding: 10px;
-    font-size: 14px;
-    border-radius: 4px;
-    border: 1px solid #dee6ea;
-    -webkit-box-shadow: 1px 1px 5px #dee6ea;
-    box-shadow: 1px 1px 5px #dee6ea;
-}
-.cartItem .headimg{
-    cursor: pointer;
-}
-.list .cartItem .name{
-    cursor: pointer;
-}
-.list .cartItem .name:hover{
-    color: #24c875;
-}
-.list .cartItem .tel{
-    margin-left: 10px;
-}
-.cartItem .leader{
-    padding: 1px;
-    color: #ffffff;
-    font-size: 12px;
-    background: #25c870;
-}
-.heart.like{
-    color: #25c870;
-}
-.heart,.del{
-    position: absolute;
-    right: 0;
-    color: #8899a9;
-    cursor: pointer;
-    height: 16px;
-    top:0;
-    bottom: 0;
-    margin: auto;
-}
-.del{
-    color: #8899a9;
-    right: 30px;
-    font-size: 16px;
-
-}
-.listRow {
-    height: 48px;
-    padding-left: 20px;
-    line-height: 48px;
-    border-bottom: 1px solid #b7c8d0;
-}
-.listRow:hover{
-    background: rgba(36, 238, 145, 0.1);
-}
-.listRow .heart{
-    right: 80px;
-}
-.listRow .col{
-    height: 100%;
-}
-.listRow .col.col-1{
-    color: #24c875;
-    cursor: pointer;
-}
-.listRow .col .leader{
-    background: #24c875;
-    color: #ffffff;
-    font-size: 12px;
-    margin-left: 5px;
-    padding: 1px 2px;
-}
-.m-empty{
-    padding-top: 200px;
-    text-align: center;
-}
-.m-empty .word{
-    font-size: 14px;
-    margin-top: 20px;
-    color: #b8e0c8;
-}
diff --git a/src/pages/attendence/main.js b/src/pages/attendence/main.js
deleted file mode 100644
index af3152c..0000000
--- a/src/pages/attendence/main.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React,{Component} from 'react'
-import {Route,Switch} from 'react-router-dom'
-import Staff from './staff.js'
-import Common from './common.js'
-import External from './external.js'
-export default class extends Component{
-    render(){
-        return (
-            <div>
-                <Switch>
-                    <Route path='/attendence/staff' component={Staff}/>
-                    <Route path='/attendence/external' component={External}/>
-                    <Route path='/attendence/common' component={Common}/>
-                    <Route component={Staff}/>
-                </Switch>
-            </div>
-        )
-    }
-}
\ No newline at end of file
diff --git a/src/pages/attendence/staff.js b/src/pages/attendence/staff.js
deleted file mode 100644
index 68892e2..0000000
--- a/src/pages/attendence/staff.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import React,{Component} from 'react'
-import {Route,Switch} from 'react-router-dom'
-import List from './staffList.js'
-import Detail from './detail.js'
-export default class  extends Component {
-    componentDidMount(){
-        this.props.history.push('/attendence/staff/list')
-    }
-    render(){
-        return (
-            <div>
-                <Switch>
-                    <Route path='/attendence/staff/list' component={List}/>
-                    <Route path='/attendence/staff/detail' render={(props) => <Detail {...props} type='staff'/>}/>
-                    <Route component={List}/>
-                </Switch>
-            </div>
-        )
-    }
-}
\ No newline at end of file
diff --git a/src/pages/attendence/staffList.js b/src/pages/attendence/staffList.js
deleted file mode 100644
index b3d3d55..0000000
--- a/src/pages/attendence/staffList.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import React,{Component} from 'react';
-import Header from './components/Header.js'
-import MemberList from "./components/MemberList.js";
-class Main extends Component {
-    constructor(props){
-        super(props);
-        this.state = {
-            letter:'',
-            keyword:''
-        };
-        this.gotoDetail = this.gotoDetail.bind(this);
-    }
-    // 按字母进行筛选
-    selectLetter(letter){
-        this.setState({letter})
-    }
-    // 按关键字搜索
-    search(keyword){
-        this.setState({keyword});
-    }
-    gotoDetail(){
-        this.props.history.push('/attendence/staff/detail');
-    }
-    render(){
-        return (
-            <div style={{...this.props.style}}>
-                <Header selectLetter={this.selectLetter.bind(this)} letter={this.state.letter} search={this.search.bind(this)}
-                        placeholder='请输入姓名'/>
-                <MemberList filed1='attrendance' filed2='staffs' type='getStaffs' url="/api/get/staffList" title="公司职员" letter={this.state.letter} keyword={this.state.keyword} gotoDetail={this.gotoDetail}/>
-            </div>
-        )
-    }
-
-}
-export default Main;
\ No newline at end of file
diff --git a/src/pages/comps/todo-item.js b/src/pages/comps/todo-item.js
deleted file mode 100644
index d77a394..0000000
--- a/src/pages/comps/todo-item.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-
-class TodoItem extends React.Component {
-
-	constructor(props) {
-		super(props);
-		this.state = {
-			showDel: false  // 控制删除 icon 的显示隐藏
-		}
-	}
-	
-	handleDelete () {
-		// 获取父组件传递过来的 date 
-		const date = this.props.date;
-		// 执行父组件的 delete 方法
-		this.props.onDeleteItem(date);
-	}
-
-	render() {
-		return (
-			<div className="todoItem">
-				<p>
-					<span className="itemCont">{ this.props.content }</span>
-					<span className="itemTime">{ this.props.date }</span>
-					<button className="delBtn" onClick={this.handleDelete.bind(this)}>
-						<img className="delIcon" src="/images/delete.png" />
-					</button>
-				</p>					
-			</div>
-		)
-	}
-}
-
-export default TodoItem;
\ No newline at end of file
diff --git a/src/pages/comps/todo-list.js b/src/pages/comps/todo-list.js
deleted file mode 100644
index 05c542f..0000000
--- a/src/pages/comps/todo-list.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import TodoItem from './todo-item';
-
-class TodoList extends React.Component {
-
-  	render() {
-        // 获取从父组件传递过来的 todolist
-  		const todoList = this.props.todoList; 
-        // 循环生成每一条 todoItem，并将 delete 方法传递给子组件 
-  		const todoItems = todoList.map((item,index) => {
-  			return (
-                <TodoItem
-  					key={index} 
-  					content={item.content} 
-  					date={item.date} 
-  					onDeleteItem={this.props.onDeleteItem} 
-                />
-    		)
-        });
-
-    	return (
-    		<div>
-    			{ todoItems }		
-    		</div>
-    	)
-  	}
-}
-
-export default TodoList;
\ No newline at end of file
diff --git a/src/pages/department/list.js b/src/pages/department/list.js
index c30d940..f7ccdba 100644
--- a/src/pages/department/list.js
+++ b/src/pages/department/list.js
@@ -54,13 +54,13 @@ import {connect} from 'react-redux';
                 width:200
             },
             {
-                title:'操作',
+                title:'Operation',
                 key:'action',
                 width:150,
                 render:(record) => {
                     return (
                         <div>
-                            <span className='action' onClick={() => this.handle(record)}>修改部门</span>
+                            <span className='action' onClick={() => this.handle(record)}>Update</span>
                         </div>
                     )
                 }
diff --git a/src/pages/holiday/annual.js b/src/pages/holiday/annual.js
deleted file mode 100644
index 35d7950..0000000
--- a/src/pages/holiday/annual.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import React,{Component} from 'react'
-import { Tabs } from 'antd';
-import List from './annual_list'
-import RuleEdit from './container/annualRule_edit.js'
-import RuleList from './container/annualRule_list.js'
-const TabPane = Tabs.TabPane;
-export default class extends Component {
-    constructor(props){
-        super(props);
-        this.state={
-            type:'show'
-        };
-        this.cols = [
-            {
-                title:'类型',
-                key:'type_text'
-            },
-            {
-                title:'大于等于年数',
-                key:'gt'
-            },
-            {
-                title:'小于年数',
-                key:'lt'
-            },
-            {
-                title:'年假天数',
-                key:'annual'
-            }
-        ];
-        this.changeState = this.changeState.bind(this);
-    }
-    changeState(state){
-        this.setState({
-            type:state
-        })
-    }
-    render(){
-        return <div className='m-holiday_annual'>
-            <Tabs defaultActiveKey="1" type="card">
-                <TabPane tab="年假时间管理" key="1">
-                    <List />
-                </TabPane>
-                <TabPane tab="年假规则" key="2">
-                    {this.state.type ==='show'?<RuleList changeState={this.changeState} cols={this.cols}/>:<RuleEdit changeState={this.changeState}/>}
-                </TabPane>
-            </Tabs>
-        </div>
-    }
-}
\ No newline at end of file
diff --git a/src/pages/holiday/annual_list.js b/src/pages/holiday/annual_list.js
deleted file mode 100644
index fc1450d..0000000
--- a/src/pages/holiday/annual_list.js
+++ /dev/null
@@ -1,186 +0,0 @@
-import React,{Component} from 'react';
-import {Button} from 'antd'
-import GSearch from "../../components/g-search.js";
-import List from './container/annualList.js';
-import EditModel from './container/editModel.js';
-import DelAnn from './container/popTip.js';
-import {message} from "antd/lib/index";
-export default class extends Component{
-    constructor(props){
-        super(props);
-        this.state = {
-            keyword:'',
-            editPop:false,
-            editData:'',
-            delPop:false
-        };
-        this.search = this.search.bind(this);
-        this.editAnn = this.editAnn.bind(this);
-        this.verifyFrom = this.verifyFrom.bind(this);
-        this.onClose = this.onClose.bind(this);
-        this.cols = [
-            {
-                title:'姓名',
-                key:'member_name'
-            },
-            {
-                title:'部门',
-                key:'department_name',
-                width:200,
-            },
-            {
-                title:'工号',
-                key:'work_num',
-                width:100,
-            },
-            {
-                title:'年假总额(小时)',
-                key:'all_time',
-                width:150,
-            },
-            {
-                title:'剩余年假(小时)',
-                key:'remove_time',
-                width:150,
-            },
-            {
-                title:'操作',
-                type:'action',
-                width:150,
-                render:(item) => {
-                    return <div>
-                        <span className="action" onClick={() => this.editAnn('编辑年假','edit_ann',item)}>编辑</span>
-                        <span className="action" onClick={() => this.delHandle(item)}>删除</span>
-                    </div>
-                }
-            }
-        ];
-        this.editType = '';
-        this.editModelTitle = '';
-    }
-    search(value){
-        this.setState({
-            keyword:value
-        })
-    }
-    onClose(){
-        this.setState({
-            editPop:false,
-            delPop:false
-        });
-    }
-    delHandle(data){
-        this.setState({
-            delPop:true
-        });
-        this.delData = data;
-    }
-    editAnn(title,type,data={member_name:'',department_name:'',remove_time:'',all_time:'',work_num:''}){
-        this.editModelTitle = title;
-        this.editType = type;
-        this.setState({
-            editPop:true,
-            editData:data
-        })
-    }
-    trim(value){
-        return (value + '').replace(/\s/g,'');
-    }
-    verifyFrom(){
-        if(this.trim(this.state.editData.member_name).length <= 0){
-            message.warning('请输入姓名');
-            return false;
-        } else if(this.trim(this.state.editData.department_name).length <= 0){
-            message.warning('请输入部门');
-            return false;
-        } else if(this.trim(this.state.editData.all_time).length <= 0){
-            message.warning('请输入年假总额');
-            return false;
-        } else if(this.trim(this.state.editData.remove_time).length <= 0){
-            message.warning('请输入剩余年假时间');
-            return false;
-        } else if(this.trim(this.state.editData.remove_time) * 1  > this.trim(this.state.editData.all_time) * 1){
-            message.warning('剩余年假时间不能大于年假总额');
-            return false;
-        }
-        else {
-            return true;
-        }
-    }
-    handleFromChange(filed,value,type='text',decimal=0){
-        if(type==='num' && decimal===0){
-            value = value.replace(/[^\d]/g,'')
-        }
-        if(type === 'num' && decimal > 0){
-            value = value.replace(/^\./,'');
-            value = value.replace(/[^\d\.]/g,'');
-            const valueArr = value.split('.');
-            if(valueArr[1] != undefined){
-                value = valueArr[0] +'.'+  valueArr[1].slice(0,decimal);
-            } else {
-                value = valueArr[0]
-            }
-
-        }
-        this.setState(function (prevS) {
-            return {
-                editData:{...prevS.editData,...{[filed]:value}}
-            }
-        });
-    }
-    // 表单
-    renderFrom(){
-        return <table className="g-from">
-            <tbody>
-            <tr>
-                <td className="in-h">
-                    姓名<span className="in-star">*</span></td>
-                <td>
-                    {this.editType === 'add_ann'?<input type="text" value={this.state.editData.member_name} onChange={(event) => this.handleFromChange('member_name',event.target.value)} className="input"/>:this.state.editData.member_name}
-                </td>
-            </tr>
-            <tr>
-                <td className="in-h">
-                    部门<span className="in-star">*</span>
-                </td>
-                <td>
-                    {this.editType === 'add_ann'?<input type="text" value={this.state.editData.department_name} onChange={(event) => this.handleFromChange('department_name',event.target.value)} className="input"/> :this.state.editData.department_name}
-                </td>
-            </tr>
-            <tr>
-                <td className="in-h">工号</td>
-                <td>
-                    {this.editType === 'add_ann'?<input type="text" value={this.state.editData.work_num} onChange={(event) => this.handleFromChange('work_num',event.target.value,'num')} className="input"/>:this.state.editData.work_num}
-                </td>
-            </tr>
-            <tr>
-                <td className="in-h">
-                    年假总额<span className="in-star">*</span></td>
-                <td>
-                    <input type="text" value={this.state.editData.all_time} onChange={(event) => this.handleFromChange('all_time',event.target.value,'num',1)} className="input"/>(小时)
-                </td>
-            </tr>
-            <tr>
-                <td className="in-h">
-                    剩余年假时间<span className="in-star">*</span></td>
-                <td>
-                    <input type="text" value={this.state.editData.remove_time} onChange={(event) => this.handleFromChange('remove_time',event.target.value,'num',1)} className="input"/>(小时)
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    }
-    render(){
-        return (
-            <div>
-                <div className="g-header">
-                    <GSearch placeholder='姓名/工号' search={this.search}/>
-                    <Button type='primary' className='f-fr' onClick={() => this.editAnn('新增年假','add_ann')}>新增年假</Button>
-                </div>
-                <List cols={this.cols} title='年假时间' keyword={this.state.keyword}/>
-                {this.state.editPop ?<EditModel render={() => this.renderFrom()} verifyFrom={this.verifyFrom} onClose={this.onClose} title={this.editModelTitle} type={this.editType} data={this.state.editData}/>:null}
-                {this.state.delPop?<DelAnn type='del_ann' title='删除年假' onClose={this.onClose} dispatch='del_ann' data={this.delData}/>:null}
-            </div>
-        )
-    }
-}
\ No newline at end of file
diff --git a/src/pages/holiday/award.js b/src/pages/holiday/award.js
deleted file mode 100644
index 709588d..0000000
--- a/src/pages/holiday/award.js
+++ /dev/null
@@ -1,188 +0,0 @@
-import React,{Component} from 'react'
-import GSearch from './../../components/g-search.js'
-import {Button,message} from 'antd'
-import List from './container/awardList.js'
-import PopTip from './container/popTip.js'
-import EditModel from './container/editModel.js'
-export default class extends Component {
-    constructor(props){
-        super(props);
-        this.state = {
-            keyword:'',
-            showPopTip:false,
-            showEditModel:false,
-            editModelData:''
-        };
-        this.search = this.search.bind(this);
-        this.onClose = this.onClose.bind(this);
-        this.delAward = this.delAward.bind(this);
-        this.verifyFrom = this.verifyFrom.bind(this);
-        this.popTipTitle = '';
-        this.popTipType='';
-        this.popTipDispatch = '';
-        this.editModelType='';
-        this.editModelTitle='';
-        this.cols = [
-            {
-                type:'selection',
-                width:60
-            },
-            {
-                title:'姓名',
-                key:'member_name'
-            },
-            {
-                title:'工号',
-                key:'work_num',
-                width:100
-            },
-            {
-                title:'部门',
-                key:'department_name',
-                width:150
-            },
-            {
-                title:'总天数(天)',
-                key:'total_day',
-                width:150
-            },
-            {
-                title:'剩余时长(天)',
-                key:'remove_day',
-                width:150
-            },
-            {
-                type:'action',
-                title:'操作',
-                width:150,
-                render:(item) =>{
-                    return <div>
-                        <span className='action' onClick={() => this.editAward('编辑奖励假','edit_award',item)}>编辑</span>
-                        <span onClick={() => this.delAward(item)} className='action'>删除</span>
-                    </div>
-                }
-            }
-        ]
-    }
-    search(value){
-        this.setState({
-            keyword:value
-        })
-    }
-    onClose(){
-        this.setState({
-            showPopTip:false,
-            showEditModel:false
-        });
-    }
-    renderFrom(){
-        return <table className="g-from">
-            <tbody>
-            <tr>
-                <td className="in-h">
-                    姓名<span className="in-star">*</span></td>
-                <td>
-                    {this.editModelType === 'add_award'?<input type="text" value={this.state.editModelData.member_name} onChange={(event) => this.handleFromChange('member_name',event.target.value)} className="input"/>:this.state.editModelData.member_name}
-                </td>
-            </tr>
-            <tr>
-                <td className="in-h">
-                    部门<span className="in-star">*</span>
-                </td>
-                <td>
-                    {this.editModelType === 'add_award'?<input type="text" value={this.state.editModelData.department_name} onChange={(event) => this.handleFromChange('department_name',event.target.value)} className="input"/>:this.state.editModelData.department_name}
-                </td>
-            </tr>
-            <tr>
-                <td className="in-h">工号</td>
-                <td>
-                    {this.editModelType === 'add_award'?<input type="text" value={this.state.editModelData.work_num} onChange={(event) => this.handleFromChange('work_num',event.target.value)} className="input"/>:this.state.editModelData.work_num}
-                </td>
-            </tr>
-            <tr>
-                <td className="in-h">
-                    年假总额<span className="in-star">*</span>
-                </td>
-                <td>
-                    <input type="text" value={this.state.editModelData.total_day} onChange={(event) => this.handleFromChange('total_day',event.target.value,'num')} className="input"/>(天)
-                </td>
-            </tr>
-            <tr>
-                <td className="in-h">
-                    剩余年假<span className="in-star">*</span></td>
-                <td>
-                    <input type="text" value={this.state.editModelData.remove_day} onChange={(event) => this.handleFromChange('remove_day',event.target.value,'num')} className="input"/>(天)
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    }
-    verifyFrom(){
-        if(this.trim(this.state.editModelData.member_name).length <= 0){
-            message.warning('请输入姓名');
-            return false;
-        } else if (this.trim(this.state.editModelData.department_name).length <= 0){
-            message.warning('请输入部门');
-            return false;
-        } else if(this.trim(this.state.editModelData.total_day).length <= 0){
-            message.warning('请输入年假总额');
-            return false;
-        } else if(this.trim(this.state.editModelData.remove_day).length <= 0){
-             message.warning('请输入剩余年假');
-            return false;
-        } else if(this.state.editModelData.remove_day > this.state.editModelData.total_day){
-            message.warning('年假总额小于剩余年假');
-            return false
-        }
-        else {
-            return true
-        }
-    }
-     trim(value){
-        return (value+'').replace(/\s/g,'')
-    }
-    handleFromChange(filed,value,type='text'){
-         if(type === 'num'){
-             value = value.replace(/[^\d]/g,'')
-         }
-        this.setState(function (prevS) {
-            return {
-                editModelData:{...prevS.editModelData,...{[filed]:value}}
-            }
-        });
-    }
-    editAward(title,type,data={member_name:'',department_name:'',total_day:0,remove_day:0,work_num:''}){
-        this.editModelTitle = title;
-        this.editModelType = type;
-        this.setState({
-            editModelData:data,
-            showEditModel:true
-        })
-    }
-    delAward(item={},batch = false){
-        if(batch){
-            this.popTipTitle = '批量删除调休';
-            this.popTipType='delAwardBatch';
-            this.popTipDispatch = 'del_award_batch';
-        } else {
-            this.popTipTitle = '删除调休';
-            this.popTipType='delAward';
-            this.popTipDispatch = 'del_award';
-            this.popTipData = item
-        }
-        this.setState({
-           showPopTip:true
-        })
-    }
-    render(){
-        return <div className='m-holiday_award'>
-            <div className='g-header'>
-                <GSearch placeholder='姓名/工号' search={this.search}/>
-                <Button type='primary' className='f-fr' onClick={() => this.editAward('新增奖励假','add_award')}>新增奖励假</Button>
-            </div>
-            <List keyword={this.state.keyword} title='奖励假时间' cols={this.cols} delAward={this.delAward}/>
-            {this.state.showPopTip ? <PopTip onClose={this.onClose} data={this.popTipData} title={this.popTipTitle} type={this.popTipType} dispatch={this.popTipDispatch}/>:null}
-            {this.state.showEditModel ? <EditModel onClose={this.onClose} verifyFrom={this.verifyFrom} data={this.state.editModelData} title={this.editModelTitle} type={this.editModelType} render={() => this.renderFrom()}/> :null}
-        </div>
-    }
-}
\ No newline at end of file
diff --git a/src/pages/holiday/components/Main.js b/src/pages/holiday/components/Main.js
deleted file mode 100644
index 3058a98..0000000
--- a/src/pages/holiday/components/Main.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import React, { Component } from 'react';
-import {Switch,Route} from 'react-router-dom'
-import Type from './../type.js'
-import Day_off from './../day_off.js'
-import Award from './../award.js'
-import Annual from './../annual.js'
-export default class  extends Component{
-    constructor(props){
-        super(props);
-        const {history} = props;
-        history.push('/holiday/type');
-    }
-    render(){
-        return <div>
-            <Switch>
-                <Route path='/holiday/type' component={Type}/>
-                <Route path='/holiday/day_off' component={Day_off}/>
-                <Route path='/holiday/award' component={Award}/>
-                <Route path='/holiday/annual' component={Annual}/>
-                <Route component={Type}/>
-            </Switch>
-        </div>
-    }
-}
\ No newline at end of file
diff --git a/src/pages/holiday/components/leftNav.js b/src/pages/holiday/components/leftNav.js
deleted file mode 100644
index d5cc1e9..0000000
--- a/src/pages/holiday/components/leftNav.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import React,{Component} from 'react'
-import {NavLink as Link} from 'react-router-dom'
-class LeftNav extends Component {
-    render(){
-        return <ul className="m-leftNav">
-            <li className="nav"><Link to={`/holiday/type`} activeClassName='g-navActive' className='link'>假期类型</Link></li>
-            <li className="nav"><Link to={`/holiday/day_off`} activeClassName='g-navActive' className='link'>调休</Link></li>
-            <li className="nav"><Link to={`/holiday/award`} activeClassName='g-navActive' className='link'>奖励假</Link></li>
-            <li className="nav"><Link to={`/holiday/annual`} activeClassName='g-navActive' className='link'>年假</Link></li>
-        </ul>
-    }
-}
-export default LeftNav;
\ No newline at end of file
diff --git a/src/pages/holiday/container/annualList.js b/src/pages/holiday/container/annualList.js
deleted file mode 100644
index 15d8530..0000000
--- a/src/pages/holiday/container/annualList.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React,{Component} from 'react';
-import {connect} from 'react-redux'
-import List from '../../../components/g-list.js';
-class AnnualList extends Component {
-    render(){
-        return <List data={this.props.data} cols={this.props.cols} title={this.props.title} offset={123}/>
-    }
-}
-export default connect((state,props) => {
-    return {
-        data:(function (annal, keyword) {
-            return annal.filter(item => {
-                if(!keyword) return true;
-                else return item.member_name.indexOf(keyword) >= 0 || (item.work_num + '').indexOf(keyword) >= 0;
-            })
-        })(state.holiday.annual,props.keyword)
-    }
-})(AnnualList);
\ No newline at end of file
diff --git a/src/pages/holiday/container/annualRule_edit.js b/src/pages/holiday/container/annualRule_edit.js
deleted file mode 100644
index 44f6148..0000000
--- a/src/pages/holiday/container/annualRule_edit.js
+++ /dev/null
@@ -1,162 +0,0 @@
-import React,{Component} from 'react';
-import {connect} from 'react-redux'
-import {Icon,message} from 'antd'
-class Edit extends Component{
-    constructor(props){
-        super(props);
-        this.state = {
-            type:props.ruleType,
-            rules:props.rules
-        };
-        this.submit = this.submit.bind(this);
-    }
-    changeType(type){
-        this.setState({
-            type:type
-        })
-    }
-    addRule(type){
-        this.setState(function (prevS) {
-            prevS.rules.push({
-                id:new Date(),
-                type,
-                gt:'',
-                lt:'',
-                annual:''
-            });
-            return {
-                rules:prevS.rules
-            }
-        })
-    }
-    delRule(index){
-        this.setState(function (prevS) {
-            if(prevS.rules.length === 1){
-                message.warning('至少要有一条累加规则');
-                return;
-            }
-            prevS.rules.splice(index,1);
-            return {
-                rules:prevS.rules
-            }
-        })
-    }
-    submit(){
-        if(this.verifyRule()) this.props.submit(this.state.type,this.state.rules);
-    }
-    verifyRule(){
-        const len = this.state.rules.length;
-        let flag = true;
-        for(let index = 0;index<len;++index){
-            const rule = this.state.rules[index];
-            if(!(rule.gt.length <= 0 && rule.lt.length <= 0 && rule.annual.length <= 0)){
-                if(rule.gt.length <= 0){
-                    message.warning('请输入第'+(index+1)+'条累计规则的起始时间');
-                    flag = false;
-                    break;
-                }
-                if(rule.lt.length <= 0){
-                    message.warning('请输入第'+(index+1)+'条累计规则的截至时间');
-                    flag = false;
-                    break;
-                }
-                if(rule.annual.length <= 0){
-                    message.warning('请输入第'+(index+1)+'条累计规则的年假时间');
-                    flag = false;
-                    break;
-                }
-                if(rule.annual * 1 === 0){
-                    message.warning('请输入第'+(index+1)+'条累计规则的年假时间为0');
-                    flag = false;
-                    break;
-                }
-                if(rule.gt > rule.lt){
-                    message.warning('请输入第'+(index+1)+'条累计规则的起始时间大于截至时间');
-                    flag = false;
-                    break;
-                }
-            }
-        }
-        return flag;
-
-    }
-    editRule(index,filed,value,type = 'text'){
-        if(type === 'num'){
-            value = value.replace(/[^\d]/g,'')
-        }
-        this.setState(function (prevS) {
-            prevS.rules[index][filed] = (value+'').trim();
-            return {
-                rules:prevS.rules
-            }
-        })
-    }
-    render(){
-        return <div style={{marginLeft:'100px'}}>
-            <table className="g-from">
-                <tbody>
-                    <tr height={30}>
-                        <td className="in-h">年假规则<span className="in-star">*</span></td>
-                        <td>
-                            <label><input type="radio" name='type' checked={this.state.type === 1} onChange={() => this.changeType(1)}/>手动维护</label>
-                            <label><input type="radio" name='type' checked={this.state.type === 2} onChange={() => this.changeType(2)}/>手动维护+自动累加</label>
-                        </td>
-                    </tr>
-                    {this.state.type === 2?<tr>
-                        <td className="in-h" style={{verticalAlign:'text-top'}}>累加规则<span className="in-star">*</span></td>
-                        <td>
-                            <table>
-                                <tbody>
-                                    <tr style={{height:'40px'}}>
-                                        <td>
-                                            <button className="submit" onClick={() => this.addRule(1)} style={{marginRight:'10px'}}>新增司龄</button>
-                                            <button className="submit" onClick={() => this.addRule(2)}>新增公龄</button>
-                                        </td>
-                                    </tr>
-                                    {this.state.rules.map((rule,index) => {
-                                        return <tr key={index}>
-                                            <td>
-                                                <input type="text" className="input small" value={rule.gt} onChange={(event) => this.editRule(index,'gt',event.target.value,'num')}/>年 小于等于
-                                                {rule.type === 1?'司龄':'工龄'}小于
-                                                <input type="text" className="input small" value={rule.lt} onChange={(event) => this.editRule(index,'lt',event.target.value,'num')}/>年
-                                                <span style={{marginLeft:'20px'}}>年假<input type="text" className="input small" value={rule.annual} onChange={(event) => this.editRule(index,'annual',event.target.value,'num')}/>天</span>
-                                                <Icon style={{marginLeft:'20px'}} onClick={() => this.delRule(index)} type="delete"/>
-                                            </td>
-                                        </tr>
-                                    })}
-                                </tbody>
-                            </table>
-                        </td>
-                    </tr>:null}
-                    <tr>
-                        <td className="in-h"></td>
-                        <td>
-                            <button className="cancel" onClick={() => this.props.changeState('show')}>取消</button>
-                            <button className="submit" onClick={this.submit} style={{marginLeft:'10px'}}>提交</button>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-    }
-}
-export default connect((state) => {
-    return {
-        ruleType:state.holiday.annual_type,
-        rules:state.holiday.annual_type === 1?[{type:1,gt:'',lt:'',annual:'',id:new Date()}]:state.holiday.annual_rules
-    }
-},(dispatch,ownProps) => {
-    return {
-        submit(type,rules){
-            dispatch({
-                type:'edit_annual_type',
-                state:type
-            });
-            dispatch({
-                type:'edit_annual_rules',
-                rules
-            });
-            ownProps.changeState('show');
-        }
-    }
-})(Edit)
\ No newline at end of file
diff --git a/src/pages/holiday/container/annualRule_list.js b/src/pages/holiday/container/annualRule_list.js
deleted file mode 100644
index 380fb47..0000000
--- a/src/pages/holiday/container/annualRule_list.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from 'react'
-import {connect} from 'react-redux'
-import {Button} from 'antd'
-import List from '../../../components/g-list.js'
-function ListRule(props) {
-    return (
-        <div>
-            <div className="g-header">
-                <Button type='primary' onClick={() => props.changeState('edit')}>修改规则</Button>
-            </div>
-            <div style={{padding:'20px 20px 0 20px'}}>{props.ruleType === 1?'手动维护':'手动维护+司龄（自动累加）+工龄（自动累加)'}</div>
-            {props.ruleType === 2?<List data={props.data} cols={props.cols} offset={162}/>:null}
-        </div>
-    )
-}
-const getRules = (rules) => {
-    return rules.map(rule => {
-        const type_text = {
-            1:'司龄',
-            2:'工龄'
-        };
-        rule.type_text = type_text[rule.type];
-        return rule
-    })
-};
-export default connect((state) => {
-    return {
-        data:getRules(state.holiday.annual_rules),
-        ruleType:state.holiday.annual_type
-    }
-})(ListRule)
\ No newline at end of file
diff --git a/src/pages/holiday/container/awardList.js b/src/pages/holiday/container/awardList.js
deleted file mode 100644
index 1e99c66..0000000
--- a/src/pages/holiday/container/awardList.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react'
-import List from '../../../components/g-list.js'
-import {connect} from 'react-redux'
-function AwardList(props) {
-    return <List offset={55} delHandle={props.delAward} cols={props.cols} data={props.data} title={props.title} onSelectAll={props.onSelectAll} onSelectOne={props.onSelectOne}/>
-}
-function filterData(data,keyword) {
-    return data.filter(item => {
-        if(!keyword) return true;
-        return item.member_name.indexOf(keyword) >= 0 || (item.work_num + '').indexOf(keyword) >= 0;
-    });
-}
-export default connect((state,ownsProps) => {
-    return {
-        data:filterData(state.holiday.award,ownsProps.keyword)
-    }
-},(dispatch) => {
-    return {
-        onSelectAll(flag){
-            dispatch({
-                type:'selectAll_award',
-                params:{
-                    checked:flag
-                }
-            });
-        },
-        onSelectOne(params){
-            dispatch({
-                type:'selectOne_award',
-                params
-            })
-        }
-    }
-})(AwardList)
\ No newline at end of file
diff --git a/src/pages/holiday/container/dayOffList.js b/src/pages/holiday/container/dayOffList.js
deleted file mode 100644
index 9335be8..0000000
--- a/src/pages/holiday/container/dayOffList.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react'
-import List from '../../../components/g-list.js'
-import {connect} from 'react-redux'
-function dayOffList(props) {
-    return <List offset={123} delHandle={props.delHandle} data={props.data} cols={props.cols} title={props.title} onSelectAll={props.onSelectAll} onSelectOne={props.onSelectOne}/>
-}
-function getData(day_off,keyword) {
-    if(!keyword) return day_off;
-    else{
-        return day_off.filter(item => {
-            return item.member_name.indexOf(keyword) >= 0 || (item.work_num + '').indexOf(keyword) >= 0;
-        })
-    }
-}
-export default connect((state,ownProps) => {
-    return {
-        data:getData(state.holiday.day_off,ownProps.keyword)
-    }
-},(dispatch) => {
-    return {
-        onSelectAll(flag){
-            dispatch({
-                type:'selectAll_day_off',
-                params:{
-                    checked:flag
-                }
-            })
-        },
-        onSelectOne(params){
-            dispatch({
-                type:'selectOne_day_off',
-                params:params
-            })
-        }
-    }
-})(dayOffList)
\ No newline at end of file
diff --git a/src/pages/holiday/container/dayOffRule_edit.js b/src/pages/holiday/container/dayOffRule_edit.js
deleted file mode 100644
index 9cd5b8d..0000000
--- a/src/pages/holiday/container/dayOffRule_edit.js
+++ /dev/null
@@ -1,116 +0,0 @@
-import React,{Component} from 'react';
-import {connect} from 'react-redux';
-import {message} from 'antd'
-class DayOffRule extends Component{
-    constructor(props){
-        super(props);
-        this.state = {
-            editData:props.rule
-        };
-        this.submit = this.submit.bind(this);
-    }
-    changeField(field,value,type='text'){
-        if(type==='num') value = value.replace(/[^\d]/g,'');
-        this.setState((prevS) => {
-            return {
-                editData:{...prevS.editData,...{[field]:value}}
-            }
-        })
-    }
-    submit(){
-        if(this.verifyFrom()) this.props.submit(this.state.editData);
-    }
-    verifyFrom(){
-        if(this.trim(this.state.editData.weekday).length <= 0){
-            message.warning('请输入工作日加班兑换规则');
-            return false
-        } else if(this.trim(this.state.editData.weekend).length <= 0){
-            message.warning('请输入休息日加班兑换规则');
-            return false
-        } else if(this.trim(this.state.editData.holiday).length <= 0){
-            message.warning('请输入节假日加班兑换规则');
-            return false
-        } else if(this.trim(this.state.editData.convery).length <= 0){
-            message.warning('请输入日时长折算规则');
-            return false
-        }
-        else {
-            return true;
-        }
-    }
-    trim(value){
-        return (value + '').replace(/\s/g,'')
-    }
-    render(){
-        return <table className="g-from dayOffRuleShow" style={{marginLeft:'50px'}}>
-            <tbody>
-            <tr>
-                <td className="in-h">
-                    调休规则<span className="in-star">*</span>
-                </td>
-                <td height='50'>
-                    <label><input type="radio" checked={this.state.editData.type+ '' === '1'} onChange={() => this.changeField('type',1)}/>手动维护</label>
-                    <label><input type="radio" checked={this.state.editData.type+ '' === '2'} onChange={() => this.changeField('type',2)}/>手动维护+加班兑换</label>
-                </td>
-            </tr>
-            {this.state.editData.type+ '' !== '1'?
-                <tr>
-                    <td className="in-h" style={{verticalAlign: 'top'}}>
-                        加班兑换规则<span className="in-star">*</span>
-                    </td>
-                    <td height='80' style={{verticalAlign: 'top'}}>
-                        <div className="item">工作日加班1小时换<input type="text" className="small input" value={this.state.editData.weekday} onChange={(event) => this.changeField('weekday',event.target.value,'num')}/>小时调休</div>
-                        <div className="item">休息日加班1小时换<input type="text" className="small input" value={this.state.editData.weekend} onChange={(event) => this.changeField('weekend',event.target.value,'num')}/>小时调休</div>
-                        <div className="item">法定节假日加班1小时换<input type="text" className="small input" value={this.state.editData.holiday} onChange={(event) => this.changeField('holiday',event.target.value,'num')}/>小时调休</div>
-                    </td>
-                </tr>
-            :null}
-            {this.state.editData.type+ '' !== '1'?
-                <tr>
-                    <td className="in-h">
-                        日时长折算规则<span className="in-star">*</span>
-                    </td>
-                    <td>
-                        <input type="text" className="small input" value={this.state.editData.convery} onChange={(event) => this.changeField('convery',event.target.value,'num')}/>小时=1天
-                    </td>
-                </tr>
-            :null
-            }
-            <tr>
-                <td></td>
-                <td height='50'>
-                    <button className="cancel" onClick={() => this.props.changeState(false)}>取消</button>
-                    <button className="submit" onClick={() => this.submit()} style={{marginLeft:'10px'}}>提交</button>
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    }
-}
-function getRule(rule) {
-    if(rule.type + '' === '1'){
-        return {
-            type:1,
-            weekday:1,
-            weekend:1,
-            holiday:1,
-            convery:8
-        }
-    }
-    return rule;
-}
-export default connect(state => {
-    return {
-        rule:getRule(state.holiday.day_off_rule)
-    }
-},((dispatch,ownProps) => {
-    return {
-        submit(params){
-            dispatch({
-                type:'editDayOffRule',
-                params
-            });
-            ownProps.changeState(false)
-        }
-    }
-}))(DayOffRule)
diff --git a/src/pages/holiday/container/dayOffRule_show.js b/src/pages/holiday/container/dayOffRule_show.js
deleted file mode 100644
index 0641c6f..0000000
--- a/src/pages/holiday/container/dayOffRule_show.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-import {connect} from 'react-redux'
-import {Button} from 'antd'
-function DayOffRule(props) {
-    return <div className="dayOffRuleShow">
-        <div className="g-header">
-            <Button type="primary" onClick={() => props.changeState(true)}>修改</Button>
-        </div>
-        <div className="main">
-            <div className="item f-clearFix">
-                <span className="info f-fl">调休规则</span>
-                <div className="desc">
-                    {props.rule.type + '' === '1'?'手动维护':'手动维护+加班兑换 '}
-                </div>
-            </div>
-        {props.rule.type + '' !== '1' ?
-            <div className="item f-clearFix">
-                <span className="info f-fl">加班兑换规则</span>
-                <div className="desc f-fl">
-                    <p>工作日加班{props.rule.weekday}小时换1小时调休</p>
-                    <p>休息日加班{props.rule.weekend}小时换1小时调休</p>
-                    <p>法定节假日加班{props.rule.holiday}小时换1小时调休</p>
-                </div>
-            </div>
-        :null}
-    {props.rule.type + '' !== '1' ?
-            <div className="item f-clearFix">
-                <span className="info f-fl">日时长折算规则</span>
-                <div className="desc">{props.rule.convery}小时=1天</div>
-            </div>
-        :null}
-        </div>
-    </div>
-}
-export default connect(state => {
-    return {
-        rule:state.holiday.day_off_rule
-    }
-})(DayOffRule)
diff --git a/src/pages/holiday/container/editModel.js b/src/pages/holiday/container/editModel.js
deleted file mode 100644
index ec31c08..0000000
--- a/src/pages/holiday/container/editModel.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react'
-import {Modal} from 'antd'
-import {connect} from 'react-redux'
-function EditModel(props) {
-    return <Modal onOk={props.onOk} onCancel={props.onClose} visible={true} title={props.title} closable={false}>
-        {props.render()}
-    </Modal>
-}
-export default connect(() => {return{}},(dispatch,ownProps) => {
-    return {
-        onOk(){
-            if(ownProps.verifyFrom()){
-                dispatch({
-                    type:ownProps.type,
-                    params:ownProps.data
-                });
-                ownProps.onClose();
-            }
-        }
-    }
-})(EditModel)
\ No newline at end of file
diff --git a/src/pages/holiday/container/popTip.js b/src/pages/holiday/container/popTip.js
deleted file mode 100644
index 797f084..0000000
--- a/src/pages/holiday/container/popTip.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import React from 'react'
-import {Modal} from 'antd'
-import {connect} from 'react-redux'
-function Dialog(props) {
-    const popTips = {
-        stopType:{
-            title:'您是否要停用该假期类型?',
-            info:'停用后员工请假不能选择该类型假期'
-        },
-        startType:{
-            title:'您是否要启用该假期类型?',
-            info:'启用后员工请假可选择该类型假期'
-        },
-        delType:{
-            title:'您是否要删除该假期类型?',
-            info:'删除后员工请假不能选择该类型假期'
-        },
-        delAward:{
-            title:'您是否要删除该员工的调休?',
-            info:'删除后该员工的调休时间全部清零，将不能请调休'
-        },
-        delAwardBatch:{
-            title:'您是否要删除这些员工的调休?',
-            info:'删除后这些员工的调休时间全部清零，将不能请调休'
-        },
-        del_day_off_batch:{
-            title:'您是否要删除选中员工的调休?',
-            info:'删除后员工的调休时间全部清零,将不能请调休'
-        },
-        del_day_off:{
-            title:'您是否要删除该员工的调休?',
-            info:'删除后该员工的调休时间全部清零,将不能请调休'
-        },
-        del_ann:{
-            title:'您是否要删除该员工的年假?',
-            info:'删除后该员工的年假时间全部清零,将不能请年假'
-        }
-    };
-    return <Modal visible={true} wrapClassName='g-popup-sure' closable={false} title={props.title} onCancel={props.onClose} onOk={props.onOk}>
-        <div>
-            <p className='title'>{popTips[props.type].title}</p>
-            <p className='info'>{popTips[props.type].info}</p>
-        </div>
-    </Modal>
-}
-export default connect(()=> {return {}},(dispatch,ownProps) => {
-    return {
-        onOk(){
-            dispatch({
-                type:ownProps.dispatch,
-                params:ownProps.data
-            });
-            ownProps.onClose();
-        }
-    }
-})(Dialog)
\ No newline at end of file
diff --git a/src/pages/holiday/container/typeList.js b/src/pages/holiday/container/typeList.js
deleted file mode 100644
index 30a37a5..0000000
--- a/src/pages/holiday/container/typeList.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react'
-import {connect} from 'react-redux'
-import List from '../../../components/g-list.js'
-function TypeList(props) {
-    return <List offset={55} cols={props.cols} title={props.title} data={props.list}/>
-}
-function getTypeList(state) {
-    return state.holiday.holiday_type.map(type => {
-        let text = {
-            status_text:{
-                0:'停用',
-                1:'启用'
-            },
-            attachment_text:{
-                0:'否',
-                1:'是'
-            },
-            period_text:{
-                1:'每年',
-                2:'每月',
-                3:'永久'
-            },
-            max_time_text(value){
-                if(value === 0){
-                    return '不限'
-                }
-                return {
-                    [value]:value
-                }[value]
-            }
-        };
-        return Object.assign({},type,{
-            status_text:text.status_text[type.status],
-            attachment_text:text.attachment_text[type.attachment],
-            period_text:text.period_text[type.period],
-            max_time_text:text.max_time_text(type.max_time)
-        })
-    })
-}
-export default connect(
-    state=>{
-        return {
-            list:getTypeList(state)
-        }
-    }
-)(TypeList);
\ No newline at end of file
diff --git a/src/pages/holiday/css/dayoffrule.css b/src/pages/holiday/css/dayoffrule.css
deleted file mode 100644
index 9a50705..0000000
--- a/src/pages/holiday/css/dayoffrule.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.dayOffRuleShow .main{
-    padding: 20px 0 20px 20px;
-}
-.dayOffRuleShow .item{
-    margin-bottom: 10px;
-}
-.dayOffRuleShow .info{
-    display: inline-block;
-    width: 120px;
-    text-align: right;
-    margin-right: 40px;
-}
\ No newline at end of file
diff --git a/src/pages/holiday/css/list.css b/src/pages/holiday/css/list.css
deleted file mode 100644
index be0d6c1..0000000
--- a/src/pages/holiday/css/list.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.holiday_list{
-    padding: 20px;
-}
\ No newline at end of file
diff --git a/src/pages/holiday/day_off.js b/src/pages/holiday/day_off.js
deleted file mode 100644
index 1d0d155..0000000
--- a/src/pages/holiday/day_off.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React,{Component} from 'react'
-import { Tabs } from 'antd';
-import List from './day_off_list.js'
-import Rule from './day_off_rule.js'
-const TabPane = Tabs.TabPane;
-export default class extends Component {
-    render(){
-        return <div className='m-holiday_dayOff'>
-                <Tabs defaultActiveKey="list" type="card">
-                    <TabPane tab="调休时间管理" key="list">
-                        <List/>
-                    </TabPane>
-                    <TabPane tab="调休规则" key="rule">
-                        <Rule/>
-                    </TabPane>
-                </Tabs>
-        </div>
-    }
-}
\ No newline at end of file
diff --git a/src/pages/holiday/day_off_list.js b/src/pages/holiday/day_off_list.js
deleted file mode 100644
index 9a1b070..0000000
--- a/src/pages/holiday/day_off_list.js
+++ /dev/null
@@ -1,176 +0,0 @@
-import React,{Component} from 'react'
-import GSearch from './../../components/g-search.js'
-import {Button,message} from 'antd'
-import List from './container/dayOffList.js'
-import PopTip from './container/popTip.js'
-import EditModel from './container/editModel.js'
-export default class  extends Component{
-    constructor(props){
-        super(props);
-        this.state={
-            keyword:'',
-            showPopTip:false,
-            showEditModel:false,
-            editModelData:''
-        };
-        this.popTipTitle='';
-        this.popTipData='';
-        this.popTipDispatch='';
-        this.popTipType='';
-        this.editModelTitle = '';
-        this.editModelType = '';
-        this.search = this.search.bind(this);
-        this.onClose = this.onClose.bind(this);
-        this.delHandle = this.delHandle.bind(this);
-        this.verifyFrom = this.verifyFrom.bind(this);
-        this.cols = [
-            {
-                type:'selection',
-                width:60
-            },
-            {
-                title:'姓名',
-                key:'member_name'
-            },
-            {
-                title:'部门',
-                key:'department_name',
-                width:200,
-            },
-            {
-                title:'可调休时间(小时)',
-                key:'remove_time',
-                width:200
-            },
-            {
-                type:'action',
-                width:200,
-                render:(item) => {
-                    return <div>
-                        <span className="action" onClick={() => this.editDayOff('编辑调休','edit_day_off',item)}>编辑</span>
-                        <span className="action" onClick={() => this.delHandle(item)}>删除</span>
-                    </div>
-                }
-            }
-        ]
-    }
-    search(keyword){
-        this.setState({
-            keyword
-        })
-    }
-    delHandle(item={},batch=false){
-        if(!batch){
-            this.popTipTitle = '删除调休';
-            this.popTipData = item;
-            this.popTipType = 'del_day_off';
-            this.popTipDispatch = 'del_day_off'
-        } else {
-            this.popTipTitle = '批量删除调休';
-            this.popTipData = item;
-            this.popTipType = 'del_day_off_batch';
-            this.popTipDispatch = 'del_day_off_batch'
-        }
-        this.setState({
-            showPopTip:true
-        })
-    }
-    onClose(){
-        this.setState({
-            showPopTip:false,
-            showEditModel:false
-        })
-    }
-    renderFrom(){
-        return <table className="g-from">
-            <tbody>
-            <tr>
-                <td className="in-h">
-                    姓名<span className="in-star">*</span></td>
-                <td>
-                    {this.editModelType === 'add_day_off'?<input type="text" value={this.state.editModelData.member_name} onChange={(event) => this.handleFromChange('member_name',event.target.value)} className="input"/>:this.state.editModelData.member_name}
-                </td>
-            </tr>
-            <tr>
-                <td className="in-h">
-                    部门<span className="in-star">*</span>
-                </td>
-                <td>
-                    {this.editModelType === 'add_day_off'?<input type="text" value={this.state.editModelData.department_name} onChange={(event) => this.handleFromChange('department_name',event.target.value)} className="input"/> :this.state.editModelData.department_name}
-                </td>
-            </tr>
-            <tr>
-                <td className="in-h">工号</td>
-                <td>
-                    {this.editModelType === 'add_day_off'?<input type="text" value={this.state.editModelData.work_num} onChange={(event) => this.handleFromChange('work_num',event.target.value,'num')} className="input"/>:this.state.editModelData.work_num}
-                </td>
-            </tr>
-            <tr>
-                <td className="in-h">
-                    剩余调休时间<span className="in-star">*</span></td>
-                <td>
-                    <input type="text" value={this.state.editModelData.remove_time} onChange={(event) => this.handleFromChange('remove_time',event.target.value,'num',1)} className="input"/>(小时)
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    }
-    verifyFrom(){
-        if(this.trim(this.state.editModelData.member_name).length <= 0){
-            message.warning('请输入姓名');
-            return false;
-        } else if(this.trim(this.state.editModelData.department_name).length <= 0){
-            message.warning('请输入部门');
-            return false;
-        } else if(this.trim(this.state.editModelData.remove_time).length <= 0){
-            message.warning('请输入剩余调休时间');
-            return false;
-        }
-        else {
-            return true;
-        }
-    }
-    trim(value){
-        return (value + '').replace(/\s/g,'');
-    }
-    handleFromChange(filed,value,type='text',decimal=0){
-        if(type==='num' && decimal===0){
-            value = value.replace(/[^\d]/g,'')
-        }
-        if(type === 'num' && decimal > 0){
-            value = value.replace(/^\./,'');
-            value = value.replace(/[^\d\.]/g,'');
-            const valueArr = value.split('.');
-            if(valueArr[1] != undefined){
-                value = valueArr[0] +'.'+  valueArr[1].slice(0,decimal);
-            } else {
-                value = valueArr[0]
-            }
-
-        }
-        this.setState(function (prevS) {
-            return {
-                editModelData:{...prevS.editModelData,...{[filed]:value}}
-            }
-        });
-    }
-    editDayOff(title,type,data={member_name:'',department_name:'',remove_time:0,work_num:''}){
-        this.editModelTitle = title;
-        this.editModelType = type;
-        this.setState({
-            editModelData:data,
-            showEditModel:true
-        })
-    }
-    render(){
-        return <div>
-            <div className="g-header">
-                <GSearch placeholder="姓名工号" search={this.search}/>
-                <Button type='primary' className='f-fr' onClick={() => this.editDayOff('新增调休','add_day_off')}>新增调休</Button>
-            </div>
-            <List keyword={this.state.keyword} cols={this.cols} title="调休时间" delHandle={this.delHandle}/>
-            {this.state.showPopTip?<PopTip onClose={this.onClose} title={this.popTipTitle} data={this.popTipData} dispatch={this.popTipDispatch} type={this.popTipType}/>:null}
-            {this.state.showEditModel ? <EditModel onClose={this.onClose} verifyFrom={this.verifyFrom} title={this.editModelTitle} type={this.editModelType} data={this.state.editModelData} render={() => this.renderFrom()}/>:null}
-        </div>
-    }
-}
\ No newline at end of file
diff --git a/src/pages/holiday/day_off_rule.js b/src/pages/holiday/day_off_rule.js
deleted file mode 100644
index c489b74..0000000
--- a/src/pages/holiday/day_off_rule.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import React,{Component} from 'react';
-import ShowRule from './container/dayOffRule_show.js';
-import EditRule from './container/dayOffRule_edit.js'
-import './css/dayoffrule.css'
-export default class extends Component {
-    constructor(props){
-        super(props);
-        this.state={
-            edit:false
-        };
-        this.changeState = this.changeState.bind(this);
-    }
-    changeState(boolean){
-        this.setState({
-            edit:boolean
-        })
-    }
-    render(){
-        if(this.state.edit){
-            return <EditRule changeState={this.changeState}/>
-        } else {
-            return <ShowRule changeState={this.changeState}/>
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/pages/holiday/index.js b/src/pages/holiday/index.js
deleted file mode 100644
index 5b5fd3c..0000000
--- a/src/pages/holiday/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React, { Component } from 'react';
-import Layout from './../../components/layout.js'
-import Main from './components/Main.js'
-import LeftNav from './components/leftNav.js'
-export default class  extends Component{
-    render(){
-        return (
-            <Layout type={2} left={<LeftNav {...this.props}/>} right={<Main {...this.props}/>}/>
-        )
-    }
-}
\ No newline at end of file
diff --git a/src/pages/holiday/type.js b/src/pages/holiday/type.js
deleted file mode 100644
index fa3284d..0000000
--- a/src/pages/holiday/type.js
+++ /dev/null
@@ -1,166 +0,0 @@
-import React,{Component} from 'react'
-import {Button,message} from 'antd'
-import List from './container/typeList.js'
-import PopTip from './container/popTip.js'
-import EditModel from './container/editModel.js';
-export default class extends Component {
-    constructor(props){
-        super(props);
-        this.cols = [
-            {
-                title:'假期类型',
-                key:'type'
-            },
-            {
-                title:'状态',
-                key:'status',
-                width:100
-            },
-            {
-                title:'假期上限(天)',
-                key:'max_time',
-                width:150
-            },
-            {
-                title:'周期',
-                key:'period',
-                width:150
-            },
-            {
-                title:'附件证明',
-                key:'attachment',
-                width:100
-            },
-            {
-                type:'action',
-                width:200,
-                title:'操作',
-                render:(item) => {
-                    return <div className='action'>
-                        <span className='action' onClick={() => this.editHandel('edit_type','编辑类型',item)}>编辑</span>
-                        {item.status === 1?<span className='action' onClick={() => this.actionHandle('停用假期类型','stopType','change_status',{...item,...{status:0}})}>停用</span>:<span className='action' onClick={() => this.actionHandle('启用假期类型','startType','change_status',{...item,...{status:1}})}>启用</span>}
-                        {item.default === 1?null:<span className='action' onClick={() => this.actionHandle('删除假期类型','delType','del_type',item)}>删除</span>}
-                    </div>
-                }
-            }
-        ];
-        this.closePopTip = this.closePopTip.bind(this);
-        this.actionHandle = this.actionHandle.bind(this);
-        this.renderFrom = this.renderFrom.bind(this);
-        this.verifyFrom = this.verifyFrom.bind(this);
-        this.changeTree = this.changeTree.bind(this);
-        this.popTipTitle = '';
-        this.popTipType = '';
-        this.popTipDispatch = '';
-        this.popTipData = '';
-        this.editModelTitle = '';
-        this.editModelType = '';
-        this.state = {
-            showPopTip:false,
-            showEditModel:false,
-            editData:'',
-            visible:true
-        };
-    }
-    closePopTip(){
-        this.setState({
-            showEditModel:false,
-            showPopTip:false
-        })
-    }
-    changeTree(boolean){
-        this.setState({
-            visible:boolean
-        });
-    }
-    renderFrom(){
-        return <table className='g-from'>
-            <tbody>
-             <tr className='item'>
-                <td className='in-h'>
-                    类型<span className='in-star'>*</span>
-                </td>
-                 <td>
-                     <input className='input' type='text' onChange={(event) =>this.formValueChange('type',event.target.value) } value={this.state.editData.type}/>
-                 </td>
-            </tr>
-            <tr className='item'>
-                <td className='in-h'>
-                    假期上限 <span className='in-star'>*</span>
-                </td>
-                 <td>
-                     <input type='text' className='input' onChange={(event) =>this.formValueChange('max_time',event.target.value,'num') } value={this.state.editData.max_time}/>
-                 </td>
-            </tr>
-            <tr className='item' height='40'>
-                <td className='in-h'>
-                    周期<span className='in-star'>*</span>
-                </td>
-                 <td>
-                     <label htmlFor="mouth">每月<input type='radio' onChange={(event) =>this.formValueChange('period',2) } classID='mouth' checked={this.state.editData.period === 2} name='period' value={2}/></label>
-                     <label htmlFor="year">每年<input type='radio' onChange={(event) =>this.formValueChange('period',1) } classID='year' checked={this.state.editData.period === 1} name='period' value={1}/></label>
-                     <label htmlFor="forever">永久<input type='radio' onChange={(event) =>this.formValueChange('period',3) } classID='forever' checked={this.state.editData.period === 3} name='period' value={3}/></label>
-                 </td>
-            </tr>
-            <tr className='item' height='40'>
-                <td className='in-h'>
-                    附件证明 <span className='in-star'>*</span>
-                </td>
-                 <td>
-                     <label htmlFor="yes">是<input type='radio' onChange={() =>this.formValueChange('attachment',1) } classID='yes' checked={this.state.editData.attachment === 1} name='attachment' value={1}/></label>
-                     <label htmlFor="no">否<input type='radio' onChange={() =>this.formValueChange('attachment',0) } classID='no' checked={this.state.editData.attachment === 0} name='attachment' value={0}/></label>
-                 </td>
-            </tr>
-            </tbody>
-        </table>
-    }
-    verifyFrom(){
-        if(this.state.editData.type.replace(/\s/g,'').length <= 0){
-            message.warning('请输入假期类型');
-            return false
-        } else if ((this.state.editData.max_time + '').replace(/\s/g,'').length <= 0) {
-             message.warning('请输入假期上限');
-            return false
-        } else {
-            return true;
-        }
-    }
-    actionHandle(title,type,dispatch,data){
-      this.popTipTitle = title;
-      this.popTipType = type;
-      this.popTipData = data;
-      this.popTipDispatch = dispatch;
-      this.setState({
-          showPopTip:true
-      });
-    }
-    formValueChange(filed,value,type='text'){
-        if(type === 'num'){
-            value = value.replace(/[^\d]/g,'')
-        }
-        this.setState((prevS) => {
-            Object.assign(prevS.editData,{[filed]:value});
-            return {
-                editData:prevS.editData
-            }
-        })
-    }
-    editHandel(type,title,data={max_time:0,period:1,attachment:0,type:''}){
-        this.editModelTitle = title;
-        this.editModelType = type;
-        this.setState({
-            showEditModel:true,
-            editData:data
-        });
-    }
-    render(){
-        return <div className='m-holiday_type'>
-            <div className="g-header">
-                <Button onClick={() => this.editHandel('add_type','新增类型')}>新增类型</Button>
-            </div>
-            <List cols={this.cols} title='假期类型'/>
-            {this.state.showPopTip ? <PopTip onClose={this.closePopTip} data={this.popTipData} title={this.popTipTitle} type={this.popTipType} dispatch={this.popTipDispatch}/>:null}
-            {this.state.showEditModel ? <EditModel onClose={this.closePopTip} render={() => this.renderFrom()} verifyFrom={this.verifyFrom} data={this.state.editData} title={this.editModelTitle} type={this.editModelType}/>:null}
-        </div>
-    }
-}
\ No newline at end of file
diff --git a/src/pages/member/editMenber.js b/src/pages/member/editMenber.js
index 248c046..d52bd33 100644
--- a/src/pages/member/editMenber.js
+++ b/src/pages/member/editMenber.js
@@ -163,8 +163,8 @@ export default class  extends Component {
                         <tr>
                             <td className='in-h'></td>
                             <td>
-                                <button type='button' className='submit' style={{marginRight:'10px'}} onClick={this.submit}>确定</button>
-                                <button type='button' className='cancel' onClick={() => this.props.changeState('list')}>取消</button>
+                                <button type='button' className='submit' style={{marginRight:'10px'}} onClick={this.submit}>Confirm</button>
+                                <button type='button' className='cancel' onClick={() => this.props.changeState('list')}>Cancel</button>
                             </td>
                         </tr>
                     </tbody>
diff --git a/views/error.ejs b/views/error.ejs
deleted file mode 100644
index 7cf94ed..0000000
--- a/views/error.ejs
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1><%= message %></h1>
-<h2><%= error.status %></h2>
-<pre><%= error.stack %></pre>
diff --git a/views/index.ejs b/views/index.ejs
deleted file mode 100644
index e095ecb..0000000
--- a/views/index.ejs
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title><%= title %></title>
-	<link rel='stylesheet' href='/css/style.css' />
-</head>
-<body>
-	<span><img src="/images/logo.png" class="logo"><div class="maintitle"><h1 font-size>SERLER</h1></div></span>
-	
-	<div id="app">
-		
-	</div>
-
-	<script src="/js/bundle.js"></script>
-</body>
-</html>
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index 7d3f0dc..0000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var path = require("path");
-
-module.exports={
-    // 项目入口
-	entry:  "./src/pages/app.js",
-    // 打包文件输出路径
-	output: {
-		path: path.join(__dirname,"./public/js"),
-		filename: "bundle.js",
-	},
-	module: {
-        loaders: [{
-        	test: /\.js$/, 
-        	loader: "babel-loader",
-        	query: {
-        		presets: ['react','es2015']
-        	}
-        },{
-        	test: /\.jsx$/,
-        	loader: 'babel-loader', 
-        	query: {
-        		presets: ['react', 'es2015']
-        	}
-        },{
-        	test: /\.css$/, 
-        	loader: "style!css"
-        },{
-        	test: /\.(jpg|png|otf)$/, 
-        	loader: "url?limit=8192"
-        },{
-        	test: /\.scss$/,
-        	loader: "style!css!sass"
-        }]
-    }
-};
\ No newline at end of file

From 5e7cad0460a70609eaa631f8afa7fa44333f3464 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Thu, 17 Oct 2019 17:13:08 +1300
Subject: [PATCH 47/57] # 1 delete store files from reducer.

---
 src/store/index.js                     |   6 -
 src/store/reducer/att/index.js         |  61 ------
 src/store/reducer/attrendance/index.js | 113 -----------
 src/store/reducer/holiday/index.js     | 253 -------------------------
 4 files changed, 433 deletions(-)
 delete mode 100644 src/store/reducer/att/index.js
 delete mode 100644 src/store/reducer/attrendance/index.js
 delete mode 100644 src/store/reducer/holiday/index.js

diff --git a/src/store/index.js b/src/store/index.js
index 626a632..e26a93a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,11 +1,5 @@
 import {combineReducers,createStore} from 'redux';
-import attrendance from './reducer/attrendance/index.js';
-import holiday from './reducer/holiday/index.js';
 import baseData from './reducer/baseData/index.js';
-import att from './reducer/att/index.js';
 export default createStore(combineReducers({
-    attrendance,
-    holiday,
     baseData,
-    att
 }));
\ No newline at end of file
diff --git a/src/store/reducer/att/index.js b/src/store/reducer/att/index.js
deleted file mode 100644
index 6651523..0000000
--- a/src/store/reducer/att/index.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Created by Gouuse on 2018/1/15 0015.
- */
-import {combineReducers} from 'redux'
-const default_group = [
-    {
-        id:1,
-        group_name:'默认分组',
-        is_default:1,
-        att_type:1,
-        is_flexible:0,
-        ex_time:0,
-        last_time:0,
-        att_class:2,
-        members:[]
-    }
-];
-const default_class=[
-    {
-       id:2,
-       type:'考勤默认班次9:00-18:00'
-    },
-    {
-        id:1,
-        type:'休息'
-    }
-];
-function att_group(group=default_group,action) {
-    switch (action.type){
-        case 'edit_att_group':
-            if(!action.data.is_flexible){
-                action.data.ex_time = 0;
-                action.data.last_time = 0;
-            }
-            if(!action.data.id) {
-                return [...group,{...action.data,id:new Date().getTime()}];
-            } else {
-                return group.map(item => {
-                    if(item.id * 1 === action.data.id * 1){
-                        return action.data;
-                    } else {
-                        return item;
-                    }
-                })
-            }
-        case 'del_att_group':
-            return group.filter(item => item.id !== action.data.id);
-        default:
-            return group
-    }
-}
-function att_class(classes = default_class, action) {
-    switch (action.type){
-        default:
-            return classes;
-    }
-}
-export default combineReducers({
-    att_group,
-    att_class
-})
\ No newline at end of file
diff --git a/src/store/reducer/attrendance/index.js b/src/store/reducer/attrendance/index.js
deleted file mode 100644
index db824ae..0000000
--- a/src/store/reducer/attrendance/index.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import {combineReducers} from 'redux'
-const defaultStaffs =  [
-                {
-        member_id:1,
-        member_name:'QxQstar',
-        phone:12345678,
-        leader:false,
-        letter:'Q',
-        position:'研究员',
-        like:1,
-        dpart_name:'web'
-    },
-                {
-                    member_id:2,
-                    member_name:'ZQxQsta2r',
-                    phone:123456738,
-                    leader:false,
-                    letter:'Z',
-                    like:0,
-                    position:'研究员',
-                    dpart_name:'web'
-                },
-                {
-                    member_id:3,
-                    member_name:'DQxQstar3',
-                    letter:'D',
-                    phone:12345878,
-                    leader:true,
-                    like:1,
-                    dpart_name:'web'
-                },
-                {
-                    member_id:4,
-                    member_name:'Huih',
-                    letter:'H',
-                    phone:12345866,
-                    leader:true,
-                    like:0,
-                    dpart_name:'web'
-                }
-            ];
-const defaultCommon = [];
-const defaultExter = [
-                {
-                    member_id:8,
-                    member_name:'梨花8',
-                    like:0,
-                    phone:['1234567']
-                }
-            ];
-function staffs(staffs=defaultStaffs, action) {
-    switch (action.type){
-        case 'changeCommon':
-            return staffs.map(staff =>{
-                if(staff.member_id === action.member_id){
-                  staff.like = action.flag
-                }
-                return staff;
-            });
-        default:
-            return staffs
-    }
-}
-function commons(commons=defaultCommon, action) {
-    switch (action.type){
-        case 'delCommon':
-            return commons.filter(common => {
-                return common.member_id !== action.member.member_id;
-            });
-        case 'addCommon':
-            return [...commons,Object.assign({},action.member,{like:1})];
-        default:
-            return commons
-    }
-}
-function externals(externals=defaultExter,action) {
-    switch (action.type){
-        case 'addExternal':
-            externals.push({...action.params,...{member_id:new Date().getTime()}});
-            return externals;
-        case 'exitExternal':
-            return externals.map(external => {
-                if(external.member_id === action.params.member_id){
-                    external = {...external,...action.params};
-                }
-                return external;
-            });
-        case 'delExternal':
-            return externals.filter(externals => externals.member_id !== action.member_id);
-        default :
-            return externals
-    }
-}
-function curMember(curMember, action) {
-    switch (action.type){
-        case 'changeCur':
-            return {...curMember,...action.param};
-        default:
-            return [
-                {
-                    member_id:1,
-                    member_name:'梨花',
-                    phone:[1234567]
-                }
-            ]
-    }
-}
-export default combineReducers({
-    staffs,
-    commons,
-    externals,
-    curMember
-})
\ No newline at end of file
diff --git a/src/store/reducer/holiday/index.js b/src/store/reducer/holiday/index.js
deleted file mode 100644
index f344a1f..0000000
--- a/src/store/reducer/holiday/index.js
+++ /dev/null
@@ -1,253 +0,0 @@
-import {combineReducers} from 'redux'
-const default_holiday_type = [
-    {
-        id:1,
-        type:'年假',
-        status:1,
-        max_time:0,
-        period:1,
-        default:1,
-        attachment:0,
-    },
-    {
-        id:2,
-        type:'调休',
-        status:1,
-        max_time:0,
-        period:1,
-        default:1,
-        attachment:0,
-    },
-    {
-        id:3,
-        type:'奖励假',
-        status:1,
-        max_time:0,
-        period:1,
-        default:1,
-        attachment:0,
-    },
-    {
-        id:4,
-        type:'test',
-        status:1,
-        max_time:0,
-        period:1,
-        default:0,
-        attachment:0,
-    },
-];
-const default_award = [
-    {
-        id:1,
-        member_name:'QxQsatr',
-        work_num:123,
-        department_name:'Web奇安达',
-        total_day:12,
-        remove_day:10
-    },
-    {
-        id:2,
-        member_name:'东方酒店',
-        work_num:123,
-        department_name:'HpH奇安达',
-        total_day:12,
-        remove_day:10
-    },
-    {
-        id:3,
-        member_name:'大多数',
-        work_num:123,
-        department_name:'PHP奇安达',
-        total_day:12,
-        remove_day:10
-    }
-];
-const default_day_off = [
-    {
-        id:1,
-        member_name:'的房间打开',
-        department_name:'Web前端',
-        work_num:12,
-        remove_time:12
-    },
-    {
-        id:2,
-        member_name:'的打开',
-        department_name:'PHP开发',
-        work_num:14,
-        remove_time:12
-    },
-    {
-        id:3,
-        member_name:'房间打开',
-        department_name:'Ios开发',
-        work_num:13,
-        remove_time:12
-    }
-];
-const default_annual = [
-    {
-        id:1,
-        member_name:'qxq',
-        department_name:'web',
-        work_num:12,
-        remove_time:12,
-        all_time:12
-    }
-];
-const default_day_off_rule = {
-    type:1
-};
-function holiday_type(holiday_type=default_holiday_type,action) {
-    switch (action.type){
-        case 'add_type':
-            return [...holiday_type,{...action.params,...{id:new Date().getTime(),status:1}},];
-        case 'edit_type':
-            return holiday_type.map(type => {
-                if(type.id === action.params.id){
-                    return action.params
-                } else {
-                    return type
-                }
-            });
-        case 'del_type':
-            return holiday_type.filter(type => {
-                return type.id !== action.params.id
-            });
-        case 'change_status':
-            return holiday_type.map(type => {
-                if(type.id === action.params.id){
-                    return Object.assign({},type,{status:action.params.status})
-                } else {
-                    return type
-                }
-            });
-        default:
-            return holiday_type
-    }
-}
-function award(award=default_award,action) {
-    switch(action.type){
-        case 'selectAll_award':
-            return award.map((item) => {
-                return {...item,...action.params}
-            });
-        case 'selectOne_award':
-            return award.map(item => {
-                if(item.id === action.params.id){
-                    return action.params;
-                } else {
-                    return item
-                }
-            });
-        case 'del_award':
-            return award.filter(item => {
-                return item.id !== action.params.id
-            });
-        case 'del_award_batch':
-            return award.filter(item => {
-                return !item.checked
-            });
-        case 'add_award':
-            return [...award,{...action.params,...{id:new Date().getTime()}}]
-        case 'edit_award':
-            return award.map(item => {
-                if(item.id === action.params.id){
-                    return {...item,...action.params}
-                } else {
-                    return item
-                }
-            });
-        default:
-            return award
-    }
-}
-function annual(annual=default_annual,action) {
-    switch (action.type){
-        case 'del_ann':
-            return annual.filter(item => item.id !== action.params.id);
-        case 'add_ann':
-            return [...annual,{...action.params,...{id:new Date().getTime()}}];
-        case 'edit_ann':
-            return annual.map(item => {
-                if(item.id === action.params.id){
-                    return action.params;
-                } else {
-                    return item;
-                }
-            });
-        default:
-            return annual;
-    }
-}
-function day_off(day_off = default_day_off, action) {
-    switch (action.type){
-        case 'del_day_off':
-            return day_off.filter(item => {
-                return item.id !== action.params.id;
-            });
-        case 'del_day_off_batch':
-            return day_off.filter(item => {
-                return !item.checked
-            });
-        case 'selectAll_day_off':
-            return day_off.map((item) => {
-                return {...item,...action.params}
-            });
-        case 'add_day_off':
-            return [...day_off,{...action.params,...{id:new Date().getTime()}}]
-        case 'edit_day_off':
-            return day_off.map(item => {
-                if(item.id === action.params.id){
-                    return {...item,...action.params}
-                } else {
-                    return item
-                }
-            });
-        case 'selectOne_day_off':
-            return day_off.map(item => {
-                if(item.id === action.params.id){
-                    return action.params;
-                } else {
-                    return item
-                }
-            });
-        default:
-            return day_off
-    }
-}
-function day_off_rule(rule=default_day_off_rule, action) {
-    switch (action.type){
-        case "editDayOffRule":
-            return action.params;
-        default:
-            return rule
-    }
-}
-function annual_rules(rules=[],action) {
-    switch (action.type){
-        case 'edit_annual_rules':
-            return action.rules;
-        default:
-            return rules
-    }
-}
-function annual_type(annual_type=1, action) {
-    switch (action.type){
-        case 'edit_annual_type':
-            return action.state;
-        default:
-            return annual_type;
-    }
-}
-
-export default combineReducers({
-    holiday_type,
-    award,
-    day_off,
-    day_off_rule,
-    annual_rules,
-    annual_type,
-    annual
-})
\ No newline at end of file

From 7da9972469d9a24b5c5830ef56fce2a7c80046b8 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Thu, 17 Oct 2019 17:27:18 +1300
Subject: [PATCH 48/57] # 1 fix refresh search cannt connect bug.

---
 src/App.js          | 3 +++
 src/router/index.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/App.js b/src/App.js
index 80d1661..da02c88 100644
--- a/src/App.js
+++ b/src/App.js
@@ -14,6 +14,9 @@ export default class  extends Component {
                 if(!(resData.data.connect_database * 1)){
                     this.props.history.push('/warn')
                 }
+                else{
+                    this.props.history.push('/search')
+                }
             }
         });
     }
diff --git a/src/router/index.js b/src/router/index.js
index ff47659..c04faa2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,5 +1,5 @@
 import React,{Component} from 'react'
-import {BrowserRouter as Router,Route} from 'react-router-dom'
+import {HashRouter as Router,Route} from 'react-router-dom'
 import App from './../App.js';
 export default class  extends Component {
     render() {

From 9d6d04f3920df9b04b2505a75474319ad2c3b13f Mon Sep 17 00:00:00 2001
From: Chong Wang <crq2021@auiuni.ac.nz>
Date: Thu, 17 Oct 2019 17:59:58 +1300
Subject: [PATCH 49/57] unittest for database opertations

---
 test/tests.js | 132 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 82 insertions(+), 50 deletions(-)
 mode change 100644 => 100755 test/tests.js

diff --git a/test/tests.js b/test/tests.js
old mode 100644
new mode 100755
index b33aad7..3dc78fa
--- a/test/tests.js
+++ b/test/tests.js
@@ -1,50 +1,82 @@
-//let {checkSex, getParameterByName} = require('../tests.js')
-let expect = require('chai').expect;
-require('should');
-var mongoose = require('mongoose');
-var helper = require('./../helper');
-var articleModel = require('./../model/staff.js');
-
-before(function(done){
-
-helper.connect(function(){done();});       
-});
-
-after(function(done) {
-
-helper.close(function(){done();});       
-});
-
-
-describe('add article', function(){
-
-
-it('article can be finded', function(done){      
-    // const article = new articleModel({       
-    //       article_name:'1',
-		  // author_name:'2',
-		  // year:[2000,2019],
-		  // field_id:1,
-		  // se_method:'TDD',
-		  // research_question:'3',
-		  // research_result:'4'  
-    // });       
-    // article.save();
-
- 			articleModel.find({article_name:'RM 60 version'}).exec((err, datas) => {
-    //articleModel.find({article_name:'1'}, function(err, datas){      
-        	//datas.toArray(function(err,docs) {       
-            datas.should.have.lengthOf(1);       
-            var u = datas[0];       
-            u._id.should.not.be.null;       
-             u.article_name.should.equal('RM 60 version');       
-             //u.author_name.should.equal('2');       
-             //u.se_method.should.equal('TDD');       
-            // u.research_question.should.equal('3'); 
-            // u.research_result.should.equal('4');      
-            done();       
-        //});       
-    });       
-});       
-});
-
+//let {checkSex, getParameterByName} = require('../tests.js')
+let expect = require('chai').expect;
+require('should');
+var mongoose = require('mongoose');
+var helper = require('./../helper');
+var articleModel = require('./../model/staff.js');
+
+before(function(done){
+
+helper.connect(function(){done();});       
+});
+
+after(function(done) {
+
+helper.close(function(){done();});       
+});
+
+
+describe('about articles', function(){
+
+
+it('article can be finded', function(done){      
+  
+ 			articleModel.find({article_name:'RM 60 version'}).exec((err, datas) => {
+            datas.should.have.lengthOf(1);       
+            var u = datas[0];       
+            u._id.should.not.be.null;       
+             u.article_name.should.equal('RM 60 version');        
+            done();       
+    });       
+});
+
+it('article can be saved', function(done){
+
+			const article = new articleModel({       
+		        article_name:'test1',
+				author_name:'2',
+				year:[2000,2019],
+				field_id:1,
+				se_method:'TDD',
+				research_question:'3',
+				research_result:'4'  
+			});       
+			article.save(function (results) {
+	          results.should.equal('')
+	        }); 
+            done();              
+});
+
+
+it('article can be updated', function(done){
+
+	articleModel.findOneAndUpdate({article_name:'test1'},{
+			article_name:'testnew1',
+			author_name:'2',
+			year:[2000,2019],
+			field_id:1,
+			se_method:'TDD',
+			research_question:'3',
+			research_result:'4' 
+		},{new:false},function (err, result) {
+			 err.should.equal('');
+		})
+        done();              
+});
+
+
+it('article can be delete', function(done){
+
+	articleModel.remove({
+    	article_name:'testnew1',
+		},function (err) {
+		err.should.equal('');
+
+	});
+    done();              
+});
+
+
+
+});
+

From e37b235469d6fbda9e155dee680a07636617e230 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Thu, 17 Oct 2019 18:20:23 +1300
Subject: [PATCH 50/57] # 1

quick search done
---
 src/pages/member/editMenber.js |  7 +---
 src/pages/member/index.js      | 67 ++++++++++++++++++++++++++++++----
 2 files changed, 61 insertions(+), 13 deletions(-)

diff --git a/src/pages/member/editMenber.js b/src/pages/member/editMenber.js
index d52bd33..4ba5669 100644
--- a/src/pages/member/editMenber.js
+++ b/src/pages/member/editMenber.js
@@ -1,6 +1,5 @@
 import React ,{Component} from 'react';
 import {Button,message} from 'antd';
-import OptDept from './../../components/g-selectData.js';
 export default class  extends Component {
     constructor(props){
         super(props);
@@ -18,10 +17,6 @@ export default class  extends Component {
         this.onChangeTree = this.onChangeTree.bind(this);
         // this.getOptDept = this.getOptDept.bind(this);
         this.submit = this.submit.bind(this);
-	    this.curDept = [];
-        if(props.meberMsg.department_id && props.meberMsg.department_name){
-           this.curDept = [{department_id:props.meberMsg.department_id,department_name:props.meberMsg.department_name}];
-        }
     }
     changeVal(filed,val,type='text'){
         if(type === 'num'){
@@ -113,7 +108,7 @@ export default class  extends Component {
                             <td className='in-h'>author_name<span className='in-star'>*</span></td>
                             <td>
                             <input className='input' value={this.state.author_name} onChange={(event) => this.changeVal('author_name',event.target.value)}/>
-                                {/* <Button onClick={() => this.onChangeTree(true)}>部门</Button>
+                                {/* <Button onClick={() => this.onChangeTree(true)}>dpt</Button>
                                 {this.state.department_name?<span className='result-p'>{this.state.department_name}</span>:null}
                                 {this.state.optDept?<OptDept maxNum={1} type='dept' visible={this.state.optDept} onOk={this.getOptDept} onChangeTree={this.onChangeTree} selectedData={this.curDept}/>:null} */}
                             </td>
diff --git a/src/pages/member/index.js b/src/pages/member/index.js
index dbc0746..fb06824 100644
--- a/src/pages/member/index.js
+++ b/src/pages/member/index.js
@@ -12,12 +12,15 @@ export default class extends Component {
             status:'list',
             tb_data:[],
             delModel:false,
+            from:2018,
+            to:2019,
             selectlist:[]
         };
         this.changeState= this.changeState.bind(this);
         this.handleClick = this.handleClick.bind(this);
         this.handle = this.handle.bind(this);
         this.del = this.del.bind(this);
+        this.quickSearch = this.quickSearch.bind(this);
         this.columns = [
             {
                 title:'Title',
@@ -72,9 +75,23 @@ export default class extends Component {
     }
 
     searchresults(){
+        if(this.state.from)
+        {
+            this.setState({
+                from:0,
+                to:0
+            });
+        }
+        if(this.state.to)
+        {
+            this.setState({
+                from:0,
+                to:0
+            });
+        }
         var dataset = {
-            from: this.refs.from.value,
-            to: this.refs.to.value,
+            from: this.state.from,
+            to: this.state.to,
             select1: this.refs.select1.value,
             select2: this.refs.select2.value,
             select3: this.refs.select3.value
@@ -83,6 +100,27 @@ export default class extends Component {
         search.bind(this)(dataset);
     }
 
+    quickSearch(){
+        if(this.refs.selectYears.value * 1 === 0)
+        {
+            this.setState({
+                from:2018,
+                to:2019
+            });
+        }else if(this.refs.selectYears.value * 1 === 1)
+        {
+            this.setState({
+                from:2014,
+                to:2019
+            });
+        }else{
+            this.setState({
+                from:2009,
+                to:2019
+            });
+        }
+    }
+
     del(){
         this.$http.post('/staff/del',{
             member_id:this.rowData.member_id
@@ -115,6 +153,15 @@ export default class extends Component {
         }
     }
     
+    changeVal(filed,val,type='text'){
+        if(type === 'num'){
+            val = val.replace(/[^\d]/g,'');
+        }
+        this.setState({
+            [filed]:val
+        });
+    }
+    
     render(){
         return (
             <Layout type={1}>
@@ -122,9 +169,15 @@ export default class extends Component {
                     {this.state.status === 'list'?<div className='m-list'>
                         <div className='g-header'>
                             <font size="3" color="green" className ='dataInput'>From</font>
-                            <input type='text' placeholder='2018 ' ref='from' className ='dataInput'></input>
+                            <input className='dataInput' value={this.state.from} onChange={(event) => this.changeVal('from',event.target.value,'num')}/>
                             <font size="3" color="green" className ='dataInput'>To</font>
-                            <input type='text' placeholder='2019 ' ref='to' className ='dataInput'></input>
+                            <input className='dataInput' value={this.state.to} onChange={(event) => this.changeVal('to',event.target.value,'num')}/>
+                            <font size="3" color="blue" className ='dataInput'>OR</font>
+                            <select className ='selectInput' ref = 'selectYears' onChange={this.quickSearch}>    
+                                <option value = "0">Last year</option>
+                                <option value = "1">Last five years</option>
+                                <option value = "2">Last ten years</option>
+                            </select>
                             <Button type="primary" onClick={() => this.searchresults() } className ='searchButton' >Search</Button>
                             <Button type="primary" onClick={() => this.handle('add') } className ='searchButton' >ADD</Button>
                         </div>
@@ -144,9 +197,9 @@ export default class extends Component {
                                 <option value = "4">is equal</option>
                             </select>
                             <font size="3" color="blue" className ='dataInput' >Value</font>
-                                <select className={'selectInput'} ref = 'select3'>
-                                    {filterColumns.map(index => (<option value = {index.name} >{index.name}</option>))}
-                                </select>
+                            <select className={'selectInput'} ref = 'select3'>
+                                {filterColumns.map(index => (<option value = {index.name} >{index.name}</option>))}
+                            </select>
                         </div>
                         <ListMember columns={this.columns}/>
                     </div>:null}

From 5c4d00c75fe3c490f3cc83b8a3c58e9733daacc6 Mon Sep 17 00:00:00 2001
From: SanderLiang <54172456+SanderLiang@users.noreply.github.com>
Date: Thu, 17 Oct 2019 19:58:06 +1300
Subject: [PATCH 51/57] Delete index.js

---
 routes/index.js | 100 ------------------------------------------------
 1 file changed, 100 deletions(-)
 delete mode 100644 routes/index.js

diff --git a/routes/index.js b/routes/index.js
deleted file mode 100644
index 9041259..0000000
--- a/routes/index.js
+++ /dev/null
@@ -1,100 +0,0 @@
-var express = require('express');
-var router = express.Router();
-var Todo = require('../src/models/todo')
-
-router.get('/', (req, res, next) => {
-	res.render('index', {
-		title: 'SERLER'
-	});
-});
-
-// 获取全部的todo
-router.get('/getAllItems', (req, res, next) => {
-	Todo.find({}).sort({'date': -1}).exec((err, todoList) => {
-		if (err) {
-			console.log(err);
-		}else {
-			res.json(todoList);
-		}
-	})
-});
-
-// 添加todo
-router.post('/addItem', (req, res, next) => {
-	let newItem = req.body;
-	Todo.create(newItem, (err) => {
-		if (err) {
-			console.log(err);
-		}else {
-			Todo.find({}, (err, todoList) => {
-				if (err) {
-					console.log(err);
-				}else {
-					res.json(todoList);
-				}
-			});
-		}
-	})
-})
-
-
-router.all('/SearchData', (req, res, next) => {
-
-	 let beginYear = req.query.beginYear;
-	 let endYear = req.query.endYear;
-	 Todo.find({title : {$regex : beginYear}}).sort({'date': -1}).exec((err, todoList) => {
-		if (err) {
-			console.log(err);
-		}else {
-			res.json(todoList);
-		}
-	})	
-})
-
-
-router.get('/addFakeData', (req, res, next) => {
-
-const newItem={
-
-		title : 'Pinning Down Variables, and Taking an Agile Approach.',
-		methods : 'ADD',
-		source : 'http://eds.b.ebscohost.com.ezproxy.aut.ac.nz/eds/pdfviewer/pdfviewer?vid=12&sid=9b5bb43f-5e08-4432-a1b6-a607f840d694%40sessionmgr103',
-		PublicationType : 'Academic Journals',
-	    author  : 'Torres, Edwin',
-	    addTime : '2019',
-	    publishTime : '2019'
-
-		};
-
-
-	Todo.create(newItem, (err) => {
-		if (err) {
-			console.log(err);
-		}else {
-			Todo.find({}, (err, todoList) => {
-				if (err) {
-					console.log(err);
-				}else {
-					res.json(todoList);
-				}
-			});
-		}
-	})
-})
-
-
-
-// 删除todo
-router.post('/deleteItem', (req, res, next) => {
-	console.log(req.body);
-	let delete_date = req.body.date
-	Todo.remove({date: delete_date}, (err, result) => {
-		if (err) {
-			console.log(err)
-		}else {
-			res.json(result);
-		}
-	});
-});
-
-module.exports = router;

From 55b1c0a2e4a8f21efd6a58e44e550c8bd0bdd092 Mon Sep 17 00:00:00 2001
From: SanderLiang <54172456+SanderLiang@users.noreply.github.com>
Date: Thu, 17 Oct 2019 19:58:23 +1300
Subject: [PATCH 52/57] Delete users.js

---
 routes/users.js | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 routes/users.js

diff --git a/routes/users.js b/routes/users.js
deleted file mode 100644
index 48c1172..0000000
--- a/routes/users.js
+++ /dev/null
@@ -1,10 +0,0 @@
-var express = require('express');
-var router = express.Router();
-
-router.get('/', (req, res, next) => {
-	res.render('index', {
-		title: 'SERLER'
-	});
-});
-
-module.exports = router;
\ No newline at end of file

From 6cc6ebbc45d4e0f1541c78e9ad322ae9a580fd71 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Sun, 20 Oct 2019 15:39:20 +1300
Subject: [PATCH 53/57] # 3 rename

---
 controller/{staff.js => article.js}           |  2 +-
 model/staff.js                                |  4 --
 route/index.js                                |  2 +-
 src/components/content.js                     |  6 +--
 src/components/g-list.js                      |  1 -
 .../editMenber.js => Search/addArticle.js}    |  0
 src/pages/{member => Search}/index.css        |  0
 src/pages/{member => Search}/index.js         |  8 +--
 .../listMember.js => Search/listArticle.js}   |  0
 src/store/reducer/baseData/index.js           | 49 -------------------
 test/tests.js                                 |  2 +-
 11 files changed, 10 insertions(+), 64 deletions(-)
 rename controller/{staff.js => article.js} (98%)
 delete mode 100644 model/staff.js
 rename src/pages/{member/editMenber.js => Search/addArticle.js} (100%)
 rename src/pages/{member => Search}/index.css (100%)
 rename src/pages/{member => Search}/index.js (98%)
 rename src/pages/{member/listMember.js => Search/listArticle.js} (100%)

diff --git a/controller/staff.js b/controller/article.js
similarity index 98%
rename from controller/staff.js
rename to controller/article.js
index 29b060c..bd4ed24 100644
--- a/controller/staff.js
+++ b/controller/article.js
@@ -1,4 +1,4 @@
-var articleModel = require('./../model/article.js');
+var articleModel = require('../model/article.js');
 // 获取职员列表
 exports.articleList = function (req, res) {
   const yearto = req.body.yearto;
diff --git a/model/staff.js b/model/staff.js
deleted file mode 100644
index 3a4a1ac..0000000
--- a/model/staff.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var mongoose = require('mongoose');
-var articleSchema = require('./../schema/staff.js');
-const articleModel = mongoose.model('Article',articleSchema);
-module.exports =  articleModel;
\ No newline at end of file
diff --git a/route/index.js b/route/index.js
index 7d2b2e6..e3f8123 100644
--- a/route/index.js
+++ b/route/index.js
@@ -1,5 +1,5 @@
 var dept = require('./../controller/dept.js');
-var staff = require('./../controller/staff.js');
+var staff = require('./../controller/article.js');
 module.exports = function (app) {
   app.get('/check_connect',function (req,res) {
       res.json({code:0,data:{connect_database:process.env.connect_database}});
diff --git a/src/components/content.js b/src/components/content.js
index b430d97..3904ef5 100644
--- a/src/components/content.js
+++ b/src/components/content.js
@@ -1,14 +1,14 @@
 import React, { Component } from 'react';
 import {Route,Switch} from 'react-router-dom'
 import Department from './../pages/department/index.js';
-import Member from './../pages/member/index.js';
+import Search from './../pages/Search/index.js';
 export default class  extends Component{
     render(){
         return <div>
             <Switch>
                 <Route path='/articlereview' component={Department}/>
-                <Route path='/search' component={Member}/>
-                <Route component={Member}/>
+                <Route path='/search' component={Search}/>
+                <Route component={Search}/>
             </Switch>
         </div>
     }
diff --git a/src/components/g-list.js b/src/components/g-list.js
index 0b97deb..9814396 100644
--- a/src/components/g-list.js
+++ b/src/components/g-list.js
@@ -1,6 +1,5 @@
 import React,{Component} from 'react'
 import { Checkbox ,Button,Icon} from 'antd';
-import '../pages/holiday/css/list.css'
 import fixHeight from './../global/fixHeight.js'
 export default class  extends Component {
     constructor(props){
diff --git a/src/pages/member/editMenber.js b/src/pages/Search/addArticle.js
similarity index 100%
rename from src/pages/member/editMenber.js
rename to src/pages/Search/addArticle.js
diff --git a/src/pages/member/index.css b/src/pages/Search/index.css
similarity index 100%
rename from src/pages/member/index.css
rename to src/pages/Search/index.css
diff --git a/src/pages/member/index.js b/src/pages/Search/index.js
similarity index 98%
rename from src/pages/member/index.js
rename to src/pages/Search/index.js
index fb06824..b271b78 100644
--- a/src/pages/member/index.js
+++ b/src/pages/Search/index.js
@@ -1,10 +1,10 @@
 import React ,{Component} from 'react';
 import {Button,message,Modal} from 'antd'
-import EditMember from './editMenber.js'
+import EditMember from './addArticle.js'
 import Layout from './../../components/layout.js';
 import {updateStaff, search} from './../../global/initBaseData.js';
 import './index.css';
-import ListMember from './listMember.js';
+import ListMember from './listArticle.js';
 export default class extends Component {
     constructor(props){
         super(props);
@@ -75,14 +75,14 @@ export default class extends Component {
     }
 
     searchresults(){
-        if(this.state.from)
+        if(!this.state.from)
         {
             this.setState({
                 from:0,
                 to:0
             });
         }
-        if(this.state.to)
+        if(!this.state.to)
         {
             this.setState({
                 from:0,
diff --git a/src/pages/member/listMember.js b/src/pages/Search/listArticle.js
similarity index 100%
rename from src/pages/member/listMember.js
rename to src/pages/Search/listArticle.js
diff --git a/src/store/reducer/baseData/index.js b/src/store/reducer/baseData/index.js
index e41d41d..898e371 100644
--- a/src/store/reducer/baseData/index.js
+++ b/src/store/reducer/baseData/index.js
@@ -1,57 +1,8 @@
 import {combineReducers} from 'redux';
 
 const defaultDept = [
-    {
-        dept_id:0,
-        dept_pid:-1,
-        dept_name:'QxQstar'
-    },
-    {
-        dept_id:1,
-        dept_pid:0,
-        dept_name:'研发部'
-    },
-    {
-        dept_id:2,
-        dept_pid:0,
-        dept_name:'产品部'
-    },
-    {
-        dept_id:3,
-        dept_pid:2,
-        dept_name:'销售部'
-    },
-    {
-        dept_id:4,
-        dept_pid:0,
-        dept_name:'web前端'
-    }
 ];
 const defaultStaff = [
-    {
-        member_id:1,
-        letter:'Q',
-        member_name:"秦煜祺",
-        dept_id:1,
-    },
-    {
-        member_id:2,
-        letter:'Z',
-        member_name:"张玉洁",
-        dept_id:1,
-    },
-    {
-        member_id:3,
-        letter:'D',
-        member_name:"董宇环",
-        dept_id:2,
-    },
-    {
-        member_id:4,
-        letter:'D',
-        member_name:"杜江",
-        dept_id:3,
-    }
 ];
 function dept(dept = defaultDept, action) {
     switch (action.type){
diff --git a/test/tests.js b/test/tests.js
index 3dc78fa..75575da 100755
--- a/test/tests.js
+++ b/test/tests.js
@@ -3,7 +3,7 @@ let expect = require('chai').expect;
 require('should');
 var mongoose = require('mongoose');
 var helper = require('./../helper');
-var articleModel = require('./../model/staff.js');
+var articleModel = require('./../model/article.js');
 
 before(function(done){
 

From e068c6b580f89a55d2bb495c9975953e868fe41f Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Sun, 20 Oct 2019 16:47:22 +1300
Subject: [PATCH 54/57] # 3 change code sort.

---
 controller/article.js          |   7 +-
 route/index.js                 |   8 +-
 src/global/initBaseData.js     |   6 +-
 src/index.js                   |   3 +-
 src/pages/Search/addArticle.js |  17 +---
 src/pages/Search/index.js      |   6 +-
 src/pages/app.js               |  10 ---
 src/pages/department/list.js   |   2 +-
 src/pages/index.js             | 139 ---------------------------------
 9 files changed, 17 insertions(+), 181 deletions(-)
 delete mode 100644 src/pages/app.js
 delete mode 100644 src/pages/index.js

diff --git a/controller/article.js b/controller/article.js
index bd4ed24..900eba0 100644
--- a/controller/article.js
+++ b/controller/article.js
@@ -3,6 +3,9 @@ var articleModel = require('../model/article.js');
 exports.articleList = function (req, res) {
   const yearto = req.body.yearto;
   const yearfrom = req.body.yearfrom;
+    var prama = {
+      year:{$gte:2018,$lte:2019}
+    };
     // var query = articleModel.find({});
     if(yearto *1 === 0 && yearfrom* 1 === 0){
       articleModel
@@ -17,8 +20,8 @@ exports.articleList = function (req, res) {
       });
     }else{
       articleModel
-      .find({})
-      .where('year').gte(yearfrom).lte(yearto)
+      .find(prama)
+      // .where('year').gte(yearfrom).lte(yearto)
       // .populate('Department','department_name')
       .exec(function (err, staffs) {
         if(err){
diff --git a/route/index.js b/route/index.js
index e3f8123..51920b2 100644
--- a/route/index.js
+++ b/route/index.js
@@ -4,10 +4,10 @@ module.exports = function (app) {
   app.get('/check_connect',function (req,res) {
       res.json({code:0,data:{connect_database:process.env.connect_database}});
   });
-  app.post('/staff/list',staff.articleList);
-  app.post('/staff/add',staff.addArticle);
-  app.post('/staff/del',staff.delStaff);
-  app.post('/staff/edit',staff.editStaff)
+  app.post('/search/list',staff.articleList);
+  app.post('/search/add',staff.addArticle);
+  app.post('/search/del',staff.delStaff);
+  app.post('/search/edit',staff.editStaff)
 
   app.post('/dept/list',dept.deptList);
   app.post('/dept/add',dept.addDept);
diff --git a/src/global/initBaseData.js b/src/global/initBaseData.js
index 07bddd9..0ca1964 100644
--- a/src/global/initBaseData.js
+++ b/src/global/initBaseData.js
@@ -1,7 +1,7 @@
 import store from './../store/index.js';
 export function updateStaff () {
    const dispatch = store.dispatch;
-    this.$http.post('/staff/list').then(res => {
+    this.$http.post('/search/list').then(res => {
         const resData = res.data || {};
         if(resData.code + '' === '0'){
             dispatch({
@@ -20,9 +20,9 @@ export function search (dataset) {
         yearfrom : dataset.from * 1
     };
     const data = {
-        url:'/staff/list',
+        url:'/search/list',
         param:param,
-        success:'add success',
+        success:'success',
         error:',failed'
     };
     this.$http.post(data.url,data.param).then(res => {
diff --git a/src/index.js b/src/index.js
index 4f10501..3aa23b0 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,11 +8,10 @@ import {Provider} from 'react-redux';
 import store from './store/index.js';
 import {search,updateDept,updateStaff} from './global/initBaseData.js';
 if (module.hot) {
-  // 模块自己就接收更新
   module.hot.accept();
 }
 React.Component.prototype.$http = axios;
-updateStaff.bind(React.Component.prototype)();
+// updateStaff.bind(React.Component.prototype)();
 search.bind(React.Component.prototype)({});
 updateDept.bind(React.Component.prototype)();
 ReactDOM.render(<Provider store={store}>
diff --git a/src/pages/Search/addArticle.js b/src/pages/Search/addArticle.js
index 4ba5669..877b160 100644
--- a/src/pages/Search/addArticle.js
+++ b/src/pages/Search/addArticle.js
@@ -62,23 +62,8 @@ export default class  extends Component {
             research_result:this.state.research_result
         };
         if(!this.verifyFrom(param)) return false;
-        // const type = this.state.member_id?'edit':'add';
-        // const data = {
-        //     add:{
-        //         url:'/staff/add',
-        //         param:param,
-        //         success:'add success',
-        //         error:',failed'
-        //     },
-        //     edit:{
-        //         url:'/staff/edit',
-        //         param:{...param,member_id:this.state.member_id},
-        //         success:'success',
-        //         error:',failed'
-        //     }
-        // }[type];
         const data = {
-            url:'/staff/add',
+            url:'/search/add',
             param:param,
             success:'add success',
             error:',failed'
diff --git a/src/pages/Search/index.js b/src/pages/Search/index.js
index b271b78..5e38c7e 100644
--- a/src/pages/Search/index.js
+++ b/src/pages/Search/index.js
@@ -78,14 +78,12 @@ export default class extends Component {
         if(!this.state.from)
         {
             this.setState({
-                from:0,
-                to:0
+                from:0
             });
         }
         if(!this.state.to)
         {
             this.setState({
-                from:0,
                 to:0
             });
         }
@@ -122,7 +120,7 @@ export default class extends Component {
     }
 
     del(){
-        this.$http.post('/staff/del',{
+        this.$http.post('/search/del',{
             member_id:this.rowData.member_id
         }).then(res => {
             const resData = res.data || {};
diff --git a/src/pages/app.js b/src/pages/app.js
deleted file mode 100644
index 04ecf9c..0000000
--- a/src/pages/app.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react'
-import ReactDOM from 'react-dom'
-import Todo from './index.js'
-
-ReactDOM.render(
-	<Todo />,
-	document.getElementById("app")
-);
-
-
diff --git a/src/pages/department/list.js b/src/pages/department/list.js
index f7ccdba..5030475 100644
--- a/src/pages/department/list.js
+++ b/src/pages/department/list.js
@@ -80,7 +80,7 @@ import {connect} from 'react-redux';
         })
     }
     action(){
-        this.$http.post('/staff/edit',{
+        this.$http.post('/search/edit',{
             ...this.member,
             ...this.optDept
         }).then(res => {
diff --git a/src/pages/index.js b/src/pages/index.js
deleted file mode 100644
index 827f3f9..0000000
--- a/src/pages/index.js
+++ /dev/null
@@ -1,139 +0,0 @@
-import React, { Component, PropTypes } from 'react'
-import ReactDOM from 'react-dom'
-import $ from 'jquery'
-import TodoList from './comps/todo-list'
-
-class Todo extends React.Component {
-
-	constructor(props) {
-		super(props);
-		this.state = {
-			todoList: [],
-			showTooltip: false  // 控制 tooltip 的显示隐藏
-		}
-	}
-	
-	componentDidMount () {
-		// 获取所有的 todolist
-		this._getTodoList();
-  	}
-	
-	// 获取 todolist
-	_getTodoList () {
-		const that = this;
-  		$.ajax({
-  			url: '/getAllItems',
-  			type: 'get',
-  			dataType: 'json',
-  			success: data => {
-  				console.log(data);
-				// const todoList = that.todoSort(data)
-				that.setState({ 
-					todoList: data
-				});
-  			},
-  			error: err => {
-				console.log(err);
-			}
-  		});
-	}
-	
-	// 添加 todo
-	_onNewItem (newItem) {
-		const that = this;
-		$.ajax({
-			url: '/addItem',
-			type: 'post',
-			dataType: 'json',
-			data: newItem,
-			success: data => {
-				console.log(data);
-				const todoList = that.todoSort(data);
-				that.setState({ 
-					todoList 
-				});
-			},
-			error: err => {
-				console.log(err);
-			}
-		})
-	}
-
-
-	// 删除 todo
-	_onDeleteItem (date) {
-		const that = this;
-		const postData = { 
-			date: date 
-		};
-		$.ajax({
-			url: '/deleteItem',
-			type: 'post',
-			dataType: 'json',
-			data: postData,
-			success: data => {
-				console.log(data);
-				this._getTodoList();
-			},
-			error: err => {
-				console.log(err);
-			}
-		})
-	}
-	
-	// 对 todolist 进行逆向排序（使新录入的项目显示在列表上面） 
-	todoSort (todoList) {
-		todoList.reverse();
-		return todoList;
-	}
-
-	// 提交表单操作
-	handleSubmit(event){
-
-		event.preventDefault();
-		// 表单输入为空验证
-		if(this.refs.content.value == "") {
-			this.refs.content.focus();
-			this.setState({
-				showTooltip: true
-			});
-			return ;
-		}
-
-		let month = new Date().getMonth() + 1;
-		let date = new Date().getDate();
-		let hours = new Date().getHours();
-		let minutes = new Date().getMinutes();
-		let seconds = new Date().getSeconds();
-
-		if (hours < 10) { hours += '0'; }
-		if (minutes < 10) { minutes += '0'; }
-		if (seconds < 10) { seconds += '0'; }
-
-		// 生成参数
-		const newItem={
-			content: this.refs.content.value,
-			date: month + "/" + date + " " + hours + ":" + minutes + ":" + seconds
-		};
-
-		console.log(newItem);
-		// 添加 todo
-		this._onNewItem(newItem)
-		// 重置表单
-		this.refs.todoForm.reset();
-		// 隐藏提示信息
-		this.setState({
-			showTooltip: false,
-		});
-	}
-
-  	render() {
-	  	return (
-	  		<div className="container">
-
-	  		</div>
-  		)
-  	}
-}
-
-export default Todo;

From db03976494aac9d9c8921136b08fb7ec7ed12d41 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Sun, 20 Oct 2019 17:30:38 +1300
Subject: [PATCH 55/57] # 3 fix sort function.

---
 controller/article.js      | 34 ++++++++++++++++++++++++++++++++++
 src/global/initBaseData.js |  3 ++-
 src/pages/Search/index.js  | 20 +++++++++++++++++++-
 3 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/controller/article.js b/controller/article.js
index 900eba0..96befe1 100644
--- a/controller/article.js
+++ b/controller/article.js
@@ -3,13 +3,46 @@ var articleModel = require('../model/article.js');
 exports.articleList = function (req, res) {
   const yearto = req.body.yearto;
   const yearfrom = req.body.yearfrom;
+  const sortfiled = req.body.sort
     var prama = {
       year:{$gte:2018,$lte:2019}
     };
+    let sort = {};
+    if(sortfiled === 'article_name')
+    {
+      sort = {
+        article_name :'1'
+      }
+    }else if(sortfiled === 'Author'){
+      sort = {
+        author_name :'1'
+      }
+
+    }else if(sortfiled === 'year'){
+      sort = {
+        year :'1'
+      }
+
+    }else if(sortfiled === 'se_method'){
+      sort = {
+        se_method :'1'
+      }
+
+    }else if(sortfiled === 'se_methodology'){
+      sort = {
+        se_methodology :'1'
+      }
+    }else
+    {
+      sort = {
+        article_name :'1'
+      }
+    }
     // var query = articleModel.find({});
     if(yearto *1 === 0 && yearfrom* 1 === 0){
       articleModel
       .find({})
+      .sort(sort)
       // .populate('Department','department_name')
       .exec(function (err, staffs) {
         if(err){
@@ -21,6 +54,7 @@ exports.articleList = function (req, res) {
     }else{
       articleModel
       .find(prama)
+      .sort(sort)
       // .where('year').gte(yearfrom).lte(yearto)
       // .populate('Department','department_name')
       .exec(function (err, staffs) {
diff --git a/src/global/initBaseData.js b/src/global/initBaseData.js
index 0ca1964..2fe0601 100644
--- a/src/global/initBaseData.js
+++ b/src/global/initBaseData.js
@@ -17,7 +17,8 @@ export function search (dataset) {
     const dispatch = store.dispatch;
     const param = {
         yearto : dataset.to * 1,
-        yearfrom : dataset.from * 1
+        yearfrom : dataset.from * 1,
+        sort : dataset.sort
     };
     const data = {
         url:'/search/list',
diff --git a/src/pages/Search/index.js b/src/pages/Search/index.js
index 5e38c7e..091b7b4 100644
--- a/src/pages/Search/index.js
+++ b/src/pages/Search/index.js
@@ -92,7 +92,8 @@ export default class extends Component {
             to: this.state.to,
             select1: this.refs.select1.value,
             select2: this.refs.select2.value,
-            select3: this.refs.select3.value
+            select3: this.refs.select3.value,
+            sort : this.refs.selectSort.value
         };
         // alert(dataset.select3);
         search.bind(this)(dataset);
@@ -111,6 +112,12 @@ export default class extends Component {
                 from:2014,
                 to:2019
             });
+        }else if(this.refs.selectYears.value * 1 === 3)
+        {
+            this.setState({
+                from:0,
+                to:2019
+            });
         }else{
             this.setState({
                 from:2009,
@@ -175,6 +182,7 @@ export default class extends Component {
                                 <option value = "0">Last year</option>
                                 <option value = "1">Last five years</option>
                                 <option value = "2">Last ten years</option>
+                                <option value = "3">All years</option>
                             </select>
                             <Button type="primary" onClick={() => this.searchresults() } className ='searchButton' >Search</Button>
                             <Button type="primary" onClick={() => this.handle('add') } className ='searchButton' >ADD</Button>
@@ -199,6 +207,16 @@ export default class extends Component {
                                 {filterColumns.map(index => (<option value = {index.name} >{index.name}</option>))}
                             </select>
                         </div>
+                        <div className='g-header'>
+                            <font size="3" color="Red" className ='dataInput'>Sort by</font>
+                            <select className ='selectInput' ref = 'selectSort' onChange={this.handleClick}>    
+                                <option value = "Title">Title</option>
+                                <option value = "Author">Author</option>
+                                <option value = "Year">Year</option>
+                                <option value = "SE Method">SE Method</option>
+                                <option value = "SE Methodology">SE Methodology</option>
+                            </select>
+                        </div>
                         <ListMember columns={this.columns}/>
                     </div>:null}
                     {this.state.status ==='edit'?<EditMember meberMsg={this.rowData} changeState={this.changeState}/>:null}

From 6c4881a24036da7b302221b247fcfbc731dbf9d5 Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Sun, 20 Oct 2019 23:20:40 +1300
Subject: [PATCH 56/57] # 3 update review function

---
 src/pages/department/deptTree.js | 219 -------------------------------
 src/pages/department/index.js    |   1 -
 src/pages/department/list.js     |  24 ++--
 3 files changed, 12 insertions(+), 232 deletions(-)
 delete mode 100644 src/pages/department/deptTree.js

diff --git a/src/pages/department/deptTree.js b/src/pages/department/deptTree.js
deleted file mode 100644
index 34d4fd8..0000000
--- a/src/pages/department/deptTree.js
+++ /dev/null
@@ -1,219 +0,0 @@
-import React,{Component} from 'react';
-import {Icon,Dropdown,Menu,Modal,message} from 'antd';
-import {updateDept} from '../../global/initBaseData.js';
-import {connect} from 'react-redux';
-// 递归遍历出部门的树状结构
-class Dept extends Component {
-    constructor(props){
-        super(props);
-        this.state = {
-            showHandle:false,
-            changeSpread:false
-        };
-        this.action = this.action.bind(this);
-        this.changeCaretState = this.changeCaretState.bind(this);
-    }
-    getMenu(dept_id,dept_name){
-       return (
-           <Menu onClick={({key}) => this.action(key,dept_id,dept_name)}>
-               <Menu.Item key="0" >
-                   addNewField
-               </Menu.Item>
-               {dept_id > 0?<Menu.Item key="1">
-                    editField
-               </Menu.Item>:null}
-               {!this.checkChildren(dept_id)?<Menu.Item key="2">
-                   delField
-               </Menu.Item>:null}
-           </Menu>
-       )
-    }
-    // 检查部门是否有子部门
-    checkChildren(dept_id){
-        return this.props.depts.find((dept) => dept.department_pid * 1 === dept_id * 1);
-    }
-    // 修改部门是否展开的状态
-    changeCaretState(dept){
-        this.props.depts.some(cur => {
-            if(cur.department_id * 1=== dept.department_id * 1){
-                cur.spread = !cur.spread;
-                return true
-            }
-        });
-        this.setState(function (prevState) {
-            return {
-                changeSpread:!prevState.changeSpread
-            }
-        })
-    }
-    action(key,dept_id,dept_name){
-        if(key * 1 === 0){
-            this.props.changeDept(dept_id,'add')
-        } else if(key * 1 === 1){
-            this.props.changeDept(dept_id,'edit',dept_name)
-        } else {
-            this.props.changeDept(dept_id,'del');
-        }
-    }
-    render(){
-        const props = this.props;
-        return (
-            <div data-changeSpread={this.state.changeSpread}>
-                {
-                    props.depts.map(dept => {
-                        if(dept.department_pid * 1 === props.pid * 1){
-                            return <div key={dept.department_id} style={{paddingLeft:8*props.level + 'px'}}>
-                                <span className='dept_name' onClick={(event) => {event.stopPropagation();props.selectDept(dept.department_id)}}>
-                                    { this.checkChildren(dept.department_id) ? <Icon style={{color:dept.department_id === props.selected_id?'#25c870':''}} className ='arrow' type={dept.spread?'caret-down':'caret-right'} onClick={() => this.changeCaretState(dept)}/> :null}
-                                    <span style={{color:dept.department_id === props.selected_id?'#25c870':''}}>{dept.department_name}</span>
-                                    <Dropdown overlay={this.getMenu(dept.department_id,dept.department_name)} trigger={['click']} >
-                                        <Icon type="edit" className='ellipsis' style={{color:dept.department_id === props.selected_id?'#25c870':''}}/>
-                                    </Dropdown>
-                                </span>
-                                {dept.spread?<Dept selected_id={props.selected_id} pid={dept.department_id} selectDept={props.selectDept } changeDept={props.changeDept} depts={props.depts} level={props.level + 1}/>:null}
-                            </div>
-                        }
-                    })
-                }
-            </div>
-        )
-    }
-}
-
-
-
-class Tree extends Component{
-    constructor(props){
-        super(props);
-        this.modelType = '';
-        this.param = '';
-        this.state = {
-            depts:[],
-            addDeptModel:false,
-            dept_name:''
-        };
-        this.changeDept = this.changeDept.bind(this);
-        this.okAction = this.okAction.bind(this);
-        this.closeModel = this.closeModel.bind(this);
-    }
-    // 修改部门
-    changeDept(dept_id,type,dept_name=''){
-        this.modelType = type;
-        this.param = {
-            add:{
-                url:'/dept/add',
-                params:{
-                    department_pid:dept_id
-                },
-                info:{
-                    error:'部门添加失败',
-                    success:'部门添加成功'
-                },
-                title:'新增子部门'
-            },
-            edit:{
-                'url':'/dept/edit',
-                params:{
-                    department_id:dept_id,
-                },
-                info:{
-                    error:'部门编辑失败',
-                    success:'部门编辑成功'
-                },
-                title:'编辑部门'
-            },
-            del:{
-                'url':'/dept/del',
-                params:{
-                    department_id:dept_id
-                },
-                info:{
-                    error:'部门删除失败',
-                    success:'部门删除成功'
-                },
-                title:'删除部门'
-            }
-        }[type];
-        this.setState({
-            addDeptModel:true,
-            dept_name:dept_name,
-        })
-    }
-    changeDeptName(event){
-        const value = event.target.value;
-        this.setState({
-            dept_name:value
-        })
-    }
-    closeModel(){
-        this.setState({
-            addDeptModel:false
-        })
-    }
-    updateList(){
-        updateDept.bind(this)();
-    }
-    verifyFrom(dept_name){
-        if(!dept_name){
-            message.warning('请输入部门名称');
-            return false;
-        } else {
-            return true;
-        }
-    }
-    // 确认操作
-    okAction(){
-        if(this.modelType !== 'del' && !this.verifyFrom(this.state.dept_name.replace(/^\s+|\s+$/g,''))) return false;
-        this.$http.post(this.param.url,{
-            ...this.param.params,
-            department_name:this.state.dept_name.replace(/^\s+|\s+$/g,''),
-        }).then((res) => {
-            const resData = res.data || {};
-            if(resData.code + '' ==='0'){
-                message.success(this.param.info.success);
-                this.updateList();
-                this.closeModel();
-            }else {
-                message.error(this.param.info.error);
-            }
-        });
-    }
-    render(){
-        return (
-            <div className='m-deptTree'>
-                <div className="name">All </div>
-                <Dept pid={-1} selected_id={this.props.selected_id} selectDept={this.props.selectDept } depts={this.props.depts} changeDept={this.changeDept} level={1}/>
-                {this.state.addDeptModel?<Modal wrapClassName='g-popup-sure' closable={false} title={this.param.title} onOk={this.okAction} onCancel={this.closeModel} width={400} visible={true}>
-                    {this.modelType !== 'del'
-                        ?<table className='g-from'>
-                            <tbody>
-                                <tr>
-                                    <td className='in-h'>部门名称<span className="in-star">*</span></td>
-                                    <td><input value={this.state.dept_name} className='input'  onChange={(event) => {this.changeDeptName(event)}}/></td>
-                                </tr>
-                            </tbody>
-
-                        </table>
-                        :<p className="title">部门中的职员也会被删除，确定删除该部门？</p>
-                    }
-                </Modal>:null}
-            </div>
-        )
-    }
-}
-export default connect((state) => {
-    return {
-        depts:(function (depts) {
-            const formatDepts = [
-                {
-                    department_name:'Articles',
-                    department_pid:-1,
-                    department_id:0,
-                    spread:true
-                },
-                ...depts
-            ];
-            return formatDepts.map(dept => ({...dept,key:dept.department_id}));
-        })(state.baseData.dept)
-    }
-})(Tree);
\ No newline at end of file
diff --git a/src/pages/department/index.js b/src/pages/department/index.js
index b68462c..0936ba9 100644
--- a/src/pages/department/index.js
+++ b/src/pages/department/index.js
@@ -1,6 +1,5 @@
 import React,{Component} from 'react';
 import Layout from './../../components/layout.js';
-import DeptTree from './deptTree.js'
 import RightList from './list.js';
 
 
diff --git a/src/pages/department/list.js b/src/pages/department/list.js
index 5030475..8a6c4b0 100644
--- a/src/pages/department/list.js
+++ b/src/pages/department/list.js
@@ -86,13 +86,13 @@ import {connect} from 'react-redux';
         }).then(res => {
             const resData = res.data || {};
             if(resData.code + '' === '0'){
-                message.success('修改员工部门成功');
+                message.success('success');
                 this.setState({
                     changeDept:false
                 });
                 updateStaff.bind(this)();
             } else {
-                message.error('修改员工部门失败');
+                message.error('error');
             }
         });
     }
@@ -102,7 +102,7 @@ import {connect} from 'react-redux';
     // 修改部门负责人
     onOk(leader){
         if(this.props.dept_id * 1 && leader.length <= 0) {
-            message.warning('请选择部门负责人');
+            message.warning('');
             return false;
         }
         this.$http.post('/dept/edit',{
@@ -112,37 +112,37 @@ import {connect} from 'react-redux';
         }).then(res => {
             const resData = res.data || {};
             if(resData.code + '' === '0'){
-                message.success('修改部门负责人成功');
+                message.success('success');
                 updateDept.bind(this)();
             } else {
-                message.error('修改部门负责人失败');
+                message.error('error');
             }
         })
     }
     render(){
         return <div className='m-dept-member'>
             {this.props.dept_id * 1?<div className='g-header'>
-                <span>部门负责人:</span>
+                <span>Review:</span>
                 {this.props.dept_leader.member_name}
                 {this.offset}
-                <Button className="primary opt-leader" onClick={() => {this.onChangeTree(true)}}>{!this.props.dept_leader?'选择部门负责人':'修改部门负责人'}</Button>
+                <Button className="primary opt-leader" onClick={() => {this.onChangeTree(true)}}>{!this.props.dept_leader?'Review':'Review'}</Button>
                 {this.state.visible?<SelectLeader type='staff' selectedData={this.props.dept_leader.member_id?[this.props.dept_leader]:[]} maxNum={1} visible={this.state.visible} onChangeTree={this.onChangeTree} onOk={this.onOk}/>:null}
             </div>:null}
             <Table cols={this.columns} offset={this.props.offset} data={this.props.tb_data} title={this.props.dept_name}/>
             {this.state.changeDept?
-                <Modal onOk={this.action} onCancel={() => {this.setState({changeDept:false})}} width={470} visible={true} title={'修改部门'} closable={true}>
+                <Modal onOk={this.action} onCancel={() => {this.setState({changeDept:false})}} width={470} visible={true} title={'Review'} closable={true}>
                     <table className='g-from'>
                         <tbody>
                             <tr>
-                                <td className='in-h' width="100">姓名</td>
-                                <td>{this.member.member_name}</td>
+                                <td className='in-h' width="100">Title</td>
+                                <td>{this.member.title}</td>
                             </tr>
                             <tr>
-                                <td className='in-h'>部门</td>
+                                <td className='in-h'>Year</td>
                                 <td>{this.member.department_name}</td>
                             </tr>
                             <tr>
-                                <td className='in-h'>新部门</td>
+                                <td className='in-h'>Status</td>
                                 <td>
                                     <FilterDept onChange={this.onChange}/>
                                 </td>

From 1288f9d3093af59d0a6bd66588586e3235d9f98c Mon Sep 17 00:00:00 2001
From: Sander <sendongliang@gmail.com>
Date: Mon, 21 Oct 2019 22:13:04 +1300
Subject: [PATCH 57/57] # feature 3 search bugs fix 1. year 2019 not contain
 done. 2. all year search done. 3.Sort title done.

---
 controller/article.js      | 18 +++++++++---------
 src/global/initBaseData.js | 12 +++++++++++-
 src/pages/Search/index.js  | 22 +++++++++++-----------
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/controller/article.js b/controller/article.js
index 96befe1..4d65a71 100644
--- a/controller/article.js
+++ b/controller/article.js
@@ -4,11 +4,11 @@ exports.articleList = function (req, res) {
   const yearto = req.body.yearto;
   const yearfrom = req.body.yearfrom;
   const sortfiled = req.body.sort
-    var prama = {
-      year:{$gte:2018,$lte:2019}
-    };
+    // var prama = {
+    //   year:{$gte:2018,$lte:2019}
+    // };
     let sort = {};
-    if(sortfiled === 'article_name')
+    if(sortfiled === 'Title')
     {
       sort = {
         article_name :'1'
@@ -18,17 +18,17 @@ exports.articleList = function (req, res) {
         author_name :'1'
       }
 
-    }else if(sortfiled === 'year'){
+    }else if(sortfiled === 'Year'){
       sort = {
         year :'1'
       }
 
-    }else if(sortfiled === 'se_method'){
+    }else if(sortfiled === 'Se_method'){
       sort = {
         se_method :'1'
       }
 
-    }else if(sortfiled === 'se_methodology'){
+    }else if(sortfiled === 'Se_methodology'){
       sort = {
         se_methodology :'1'
       }
@@ -53,9 +53,9 @@ exports.articleList = function (req, res) {
       });
     }else{
       articleModel
-      .find(prama)
+      .find()
       .sort(sort)
-      // .where('year').gte(yearfrom).lte(yearto)
+      .where('year').gte(yearfrom).lte(yearto)
       // .populate('Department','department_name')
       .exec(function (err, staffs) {
         if(err){
diff --git a/src/global/initBaseData.js b/src/global/initBaseData.js
index 2fe0601..712b028 100644
--- a/src/global/initBaseData.js
+++ b/src/global/initBaseData.js
@@ -56,7 +56,17 @@ function condition(info,dataset){
             return (info.se_method.indexOf(dataset.select3) !== -1)
         }
     }else{
-        return (info.se_methodology.indexOf(dataset.select3) !== -1)
+        if(dataset.select2* 1 === 0){
+            return (info.se_methodology.indexOf(dataset.select3) !== -1)
+        }else if(dataset.select2* 1 === 1){
+            return (info.se_methodology.indexOf(dataset.select3) === -1)
+        }else if(dataset.select2* 1 === 2){
+            return (info.se_methodology.indexOf(dataset.select3) === 0)
+        }else if(dataset.select2* 1 === 3){
+            return (info.se_methodology.indexOf(dataset.select3) !== -1)
+        }else{
+            return (info.se_methodology.indexOf(dataset.select3) !== -1)
+        }
     }
 }
 
diff --git a/src/pages/Search/index.js b/src/pages/Search/index.js
index 091b7b4..4e89a21 100644
--- a/src/pages/Search/index.js
+++ b/src/pages/Search/index.js
@@ -132,13 +132,13 @@ export default class extends Component {
         }).then(res => {
             const resData = res.data || {};
             if(resData.code + '' === '0'){
-                message.success('员工删除成功');
+                message.success('del success');
                 this.setState({
                     delModel:false
                 });
                 this.updateList();
             } else {
-                message.error('员工删除失败');
+                message.error('del error');
             }
         })
     }
@@ -198,9 +198,9 @@ export default class extends Component {
                             <select className ='selectInput'  ref = 'select2'>
                                 <option value = "0">Contains</option>
                                 <option value = "1">Not Contain</option>
-                                <option value = "2">begins with</option>
-                                <option value = "3">ends with</option>
-                                <option value = "4">is equal</option>
+                                <option value = "2">Begins with</option>
+                                <option value = "3">Ends with</option>
+                                <option value = "4">Is equal</option>
                             </select>
                             <font size="3" color="blue" className ='dataInput' >Value</font>
                             <select className={'selectInput'} ref = 'select3'>
@@ -220,8 +220,8 @@ export default class extends Component {
                         <ListMember columns={this.columns}/>
                     </div>:null}
                     {this.state.status ==='edit'?<EditMember meberMsg={this.rowData} changeState={this.changeState}/>:null}
-                    {this.state.delModel?<Modal wrapClassName='g-popup-sure' closable={false} title='删除员工' onOk={this.del} onCancel={() => this.setState({delModel:false})} visible={true}>
-                        <p className="info">确定删除该员工，删除之后数据将无法恢复？</p>
+                    {this.state.delModel?<Modal wrapClassName='g-popup-sure' closable={false} title='delete article' onOk={this.del} onCancel={() => this.setState({delModel:false})} visible={true}>
+                        <p className="info">delete article？</p>
                     </Modal>:null}
                 </div>
             </Layout>
@@ -234,9 +234,9 @@ var filterColumns = [
     { name: "TDD"},
     { name: "BDD"},
     { name: "Pair Programming"},
-    { name: "planning poker"},
-    { name: "daily standup meetings"},
-    { name: "story boards"},
+    { name: "Planning poker"},
+    { name: "Daily standup meetings"},
+    { name: "Story boards"},
 ];
 
 
@@ -246,7 +246,7 @@ const filterColumns1 = [
     { name: "Pair Programming"},
     { name: "Planning poker"},
     { name: "Daily standup meetings"},
-    { name: "story boards"},
+    { name: "Story boards"},
 ];
 const filterColumns2 = [
     { name: "Scrum"},