From 7762ca40d7371cdf95c13881579e9150d0e11d04 Mon Sep 17 00:00:00 2001
From: hunterlong <info@socialeck.com>
Date: Wed, 19 Feb 2020 21:28:39 -0800
Subject: [PATCH] updates

---
 core/checker.go                               |    1 -
 core/notifier/events.go                       |    4 +-
 frontend/config/webpack.config.dev.js         |    6 +-
 frontend/package.json                         |   11 +-
 frontend/public/base.gohtml                   |    9 +
 frontend/src/API.js                           |  226 +++
 frontend/src/App.vue                          |    2 +-
 frontend/src/components/API.js                |  226 ---
 frontend/src/components/Dashboard/Cache.vue   |   56 +
 .../components/Dashboard/DashboardIndex.vue   |   35 +-
 .../Dashboard/DashboardMessages.vue           |    2 +-
 .../Dashboard/DashboardServices.vue           |  162 +--
 .../components/Dashboard/DashboardUsers.vue   |    2 +-
 .../src/components/Dashboard/EditService.vue  |   12 +-
 .../src/components/Dashboard/ThemeEditor.vue  |    3 +-
 frontend/src/components/Dashboard/TopNav.vue  |    2 +-
 .../src/components/Service/ServiceBlock.vue   |   44 +-
 .../src/components/Service/ServiceChart.vue   |  186 +--
 .../components/Service/ServiceFailures.vue    |    2 +-
 .../src/components/Service/ServiceHeatmap.vue |   84 ++
 .../{Dashboard => Service}/ServiceInfo.vue    |   27 +-
 .../ServiceSparkLine.vue                      |    0
 .../components/Service/ServiceTopStats.vue    |   32 +
 frontend/src/components/Time.js               |   14 -
 frontend/src/forms/Checkin.vue                |   61 +-
 frontend/src/forms/CoreSettings.vue           |   84 +-
 frontend/src/forms/Group.vue                  |  110 +-
 frontend/src/forms/Integration.vue            |   75 +-
 frontend/src/forms/Login.vue                  |   60 +-
 frontend/src/forms/Message.vue                |   12 +-
 frontend/src/forms/Notifier.vue               |  118 +-
 frontend/src/forms/Service.vue                |   38 +-
 frontend/src/forms/Setup.vue                  |    4 +-
 frontend/src/forms/ToggleSwitch.vue           |   62 +-
 frontend/src/forms/User.vue                   |    2 +-
 frontend/src/main.js                          |    1 -
 frontend/src/mixin.js                         |   74 +-
 frontend/src/pages/Dashboard.vue              |    2 +-
 frontend/src/pages/Index.vue                  |   58 +-
 frontend/src/pages/Login.vue                  |    2 +-
 frontend/src/pages/Logs.vue                   |   84 +-
 frontend/src/pages/Service.vue                |  313 ++--
 frontend/src/pages/Settings.vue               |   95 +-
 frontend/src/routes.js                        |    2 +-
 frontend/src/store.js                         |    6 +-
 frontend/test/API.spec.js                     |   16 +
 frontend/test/Store.spec.js                   |   24 +
 frontend/test/forms/Login.spec.js             |   32 +
 frontend/test/pages/Index.spec.js             |   17 +
 frontend/test/setup.js                        |    5 +
 frontend/yarn.lock                            | 1295 ++++++++++++++++-
 handlers/api.go                               |    1 -
 handlers/function.go                          |    3 +
 notifiers/discord.go                          |    3 -
 notifiers/email.go                            |    3 -
 notifiers/line_notify.go                      |    3 -
 notifiers/mobile.go                           |    3 -
 notifiers/telegram.go                         |    3 -
 notifiers/twilio.go                           |    3 -
 types/core.go                                 |    1 -
 types/service.go                              |   10 +-
 61 files changed, 2608 insertions(+), 1225 deletions(-)
 create mode 100644 frontend/src/API.js
 delete mode 100644 frontend/src/components/API.js
 create mode 100644 frontend/src/components/Dashboard/Cache.vue
 create mode 100644 frontend/src/components/Service/ServiceHeatmap.vue
 rename frontend/src/components/{Dashboard => Service}/ServiceInfo.vue (82%)
 rename frontend/src/components/{Dashboard => Service}/ServiceSparkLine.vue (100%)
 create mode 100644 frontend/src/components/Service/ServiceTopStats.vue
 delete mode 100644 frontend/src/components/Time.js
 create mode 100644 frontend/test/API.spec.js
 create mode 100644 frontend/test/Store.spec.js
 create mode 100644 frontend/test/forms/Login.spec.js
 create mode 100644 frontend/test/pages/Index.spec.js
 create mode 100644 frontend/test/setup.js

diff --git a/core/checker.go b/core/checker.go
index fd27554c..604be8b7 100644
--- a/core/checker.go
+++ b/core/checker.go
@@ -280,7 +280,6 @@ func recordFailure(s *Service, issue string) {
 	s.CreateFailure(fail)
 	s.Online = false
 	s.SuccessNotified = false
-	s.UpdateNotify = CoreApp.UpdateNotify.Bool
 	s.DownText = s.DowntimeText()
 	notifier.OnFailure(s.Service, fail)
 }
diff --git a/core/notifier/events.go b/core/notifier/events.go
index 445ccbb2..4e70c573 100644
--- a/core/notifier/events.go
+++ b/core/notifier/events.go
@@ -40,7 +40,7 @@ func OnFailure(s *types.Service, f *types.Failure) {
 	}
 
 	// check if User wants to receive every Status Change
-	if s.UpdateNotify {
+	if s.UpdateNotify.Bool {
 		// send only if User hasn't been already notified about the Downtime
 		if !s.UserNotified {
 			s.UserNotified = true
@@ -69,7 +69,7 @@ func OnSuccess(s *types.Service) {
 	}
 
 	// check if User wants to receive every Status Change
-	if s.UpdateNotify && s.UserNotified {
+	if s.UpdateNotify.Bool && s.UserNotified {
 		s.UserNotified = false
 	}
 
diff --git a/frontend/config/webpack.config.dev.js b/frontend/config/webpack.config.dev.js
index 27277e6d..532cbf45 100644
--- a/frontend/config/webpack.config.dev.js
+++ b/frontend/config/webpack.config.dev.js
@@ -10,12 +10,14 @@ const environment          = require('./dev.env');
 
 const webpackConfig = merge(commonConfig, {
   mode: 'development',
-  devtool: 'cheap-module-eval-source-map',
+  devtool: 'inline-cheap-module-source-map',
   output: {
     path: helpers.root('dist'),
     publicPath: '/',
     filename: 'js/[name].bundle.js',
-    chunkFilename: 'js/[name].chunk.js'
+    chunkFilename: 'js/[name].chunk.js',
+    devtoolModuleFilenameTemplate: '[absolute-resource-path]',
+    devtoolFallbackModuleFilenameTemplate: '[absolute-resource-path]?[hash]'
   },
   optimization: {
     runtimeChunk: 'single',
diff --git a/frontend/package.json b/frontend/package.json
index b144ddc7..be8e7af4 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -6,7 +6,8 @@
     "serve": "vue-cli-service serve",
     "build": "rm -rf dist && cross-env NODE_ENV=production webpack --mode production",
     "dev": "cross-env NODE_ENV=development webpack-dev-server --host 0.0.0.0 --port 8888 --progress",
-    "lint": "vue-cli-service lint"
+    "lint": "vue-cli-service lint",
+    "test": "cross-env NODE_ENV=development mochapack --webpack-config webpack.config.js --require test/setup.js test/**/*.spec.js"
   },
   "dependencies": {
     "@fortawesome/fontawesome-free-solid": "^5.1.0-3",
@@ -18,7 +19,7 @@
     "axios": "^0.19.1",
     "codemirror-colorpicker": "^1.9.66",
     "core-js": "^3.4.4",
-    "moment": "^2.24.0",
+    "date-fns": "^2.9.0",
     "querystring": "^0.2.0",
     "vue": "^2.6.10",
     "vue-apexcharts": "^1.5.2",
@@ -40,6 +41,7 @@
     "@babel/preset-env": "~7.8.3",
     "@vue/babel-preset-app": "^4.1.2",
     "@vue/cli-plugin-babel": "^4.1.0",
+    "@vue/test-utils": "^1.0.0-beta.31",
     "babel-eslint": "~10.0",
     "babel-loader": "~8.0",
     "compression-webpack-plugin": "~2.0",
@@ -55,10 +57,15 @@
     "eslint-plugin-promise": "~3.5",
     "eslint-plugin-standard": "~3.0",
     "eslint-plugin-vue": "~5.1",
+    "expect": "^25.1.0",
     "file-loader": "^5.0.2",
     "friendly-errors-webpack-plugin": "~1.7",
     "html-webpack-plugin": "^4.0.0-beta.11",
+    "jsdom": "^16.2.0",
+    "jsdom-global": "^3.0.2",
     "mini-css-extract-plugin": "~0.5",
+    "mocha": "^7.0.1",
+    "mochapack": "^1.1.13",
     "node-sass": "^4.13.1",
     "optimize-css-assets-webpack-plugin": "~5.0",
     "sass-loader": "^8.0.2",
diff --git a/frontend/public/base.gohtml b/frontend/public/base.gohtml
index 27d408ca..b3bd1848 100644
--- a/frontend/public/base.gohtml
+++ b/frontend/public/base.gohtml
@@ -10,11 +10,20 @@
     <base href="{{BasePath}}">
     {{if USE_CDN}}
     <link rel="shortcut icon" type="image/x-icon" href="https://assets.statping.com/favicon.ico">
+    <link rel="stylesheet" href="https://assets.statping.com/css/bootstrap.min.css">
+    <link rel="stylesheet" href="https://assets.statping.com/css/base.css">
+    <link rel="stylesheet" href="https://assets.statping.com/font/all.css">
     {{else}}
     <link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
+    {{if USING_ASSETS}}
+    <link rel="stylesheet" href="css/bootstrap.min.css">
+    <link rel="stylesheet" href="css/base.css">
+    <link rel="stylesheet" href="font/all.css">
+    {{else}}
     <% _.each(htmlWebpackPlugin.tags.headTags, function(headTag) { %>
     <%= headTag %> <% }) %>
     {{end}}
+    {{end}}
 </head>
 <body>
 <noscript>
diff --git a/frontend/src/API.js b/frontend/src/API.js
new file mode 100644
index 00000000..2a50ca13
--- /dev/null
+++ b/frontend/src/API.js
@@ -0,0 +1,226 @@
+import axios from 'axios'
+
+const qs = require('querystring')
+const tokenKey = "statping_user";
+
+class Api {
+  constructor() {
+
+  }
+
+  async core() {
+    return axios.get('/api').then(response => (response.data))
+  }
+
+  async core_save(obj) {
+    return axios.post('/api/core', obj).then(response => (response.data))
+  }
+
+  async setup_save(data) {
+    return axios.post('/api/setup', qs.stringify(data)).then(response => (response.data))
+  }
+
+  async services() {
+    return axios.get('/api/services').then(response => (response.data))
+  }
+
+  async service(id) {
+    return axios.get('/api/services/' + id).then(response => (response.data))
+  }
+
+  async service_create(data) {
+    return axios.post('/api/services', data).then(response => (response.data))
+  }
+
+  async service_update(data) {
+    return axios.post('/api/services/' + data.id, data).then(response => (response.data))
+  }
+
+  async service_hits(id, start, end, group) {
+    return axios.get('/api/services/' + id + '/data?start=' + start + '&end=' + end + '&group=' + group).then(response => (response.data))
+  }
+
+  async service_heatmap(id, start, end, group) {
+    return axios.get('/api/services/' + id + '/heatmap').then(response => (response.data))
+  }
+
+  async service_failures(id, start, end, limit = 999, offset = 0) {
+    return axios.get('/api/services/' + id + '/failures?start=' + start + '&end=' + end + '&limit=' + limit).then(response => (response.data))
+  }
+
+  async service_delete(id) {
+    return axios.delete('/api/services/' + id).then(response => (response.data))
+  }
+
+  async services_reorder(data) {
+    return axios.post('/api/reorder/services', data).then(response => (response.data))
+  }
+
+  async groups() {
+    return axios.get('/api/groups').then(response => (response.data))
+  }
+
+  async groups_reorder(data) {
+    return axios.post('/api/reorder/groups', data).then(response => (response.data))
+  }
+
+  async group_delete(id) {
+    return axios.delete('/api/groups/' + id).then(response => (response.data))
+  }
+
+  async group_create(data) {
+    return axios.post('/api/groups', data).then(response => (response.data))
+  }
+
+  async group_update(data) {
+    return axios.post('/api/groups/' + data.id, data).then(response => (response.data))
+  }
+
+  async users() {
+    return axios.get('/api/users').then(response => (response.data))
+  }
+
+  async user_create(data) {
+    return axios.post('/api/users', data).then(response => (response.data))
+  }
+
+  async user_update(data) {
+    return axios.post('/api/users/' + data.id, data).then(response => (response.data))
+  }
+
+  async user_delete(id) {
+    return axios.delete('/api/users/' + id).then(response => (response.data))
+  }
+
+  async messages() {
+    return axios.get('/api/messages').then(response => (response.data))
+  }
+
+  async message_create(data) {
+    return axios.post('/api/messages', data).then(response => (response.data))
+  }
+
+  async message_update(data) {
+    return axios.post('/api/messages/' + data.id, data).then(response => (response.data))
+  }
+
+  async message_delete(id) {
+    return axios.delete('/api/messages/' + id).then(response => (response.data))
+  }
+
+  async group(id) {
+    return axios.get('/api/groups/' + id).then(response => (response.data))
+  }
+
+  async notifiers() {
+    return axios.get('/api/notifiers').then(response => (response.data))
+  }
+
+  async notifier_save(data) {
+    return axios.post('/api/notifier/' + data.method, data).then(response => (response.data))
+  }
+
+  async notifier_test(data) {
+    return axios.post('/api/notifier/' + data.method + '/test', data).then(response => (response.data))
+  }
+
+  async integrations() {
+    return axios.get('/api/integrations').then(response => (response.data))
+  }
+
+  async integration(name) {
+    return axios.get('/api/integrations/' + name).then(response => (response.data))
+  }
+
+  async integration_save(data) {
+    return axios.post('/api/integrations/' + data.name, data).then(response => (response.data))
+  }
+
+  async renewApiKeys() {
+    return axios.get('/api/renew').then(response => (response.data))
+  }
+
+  async cache() {
+    return axios.get('/api/cache').then(response => (response.data))
+  }
+
+  async clearCache() {
+    return axios.get('/api/clear_cache').then(response => (response.data))
+  }
+
+  async logs() {
+    return axios.get('/api/logs').then(response => (response.data))
+  }
+
+  async logs_last() {
+    return axios.get('/api/logs/last').then(response => (response.data))
+  }
+
+  async theme() {
+    return axios.get('/api/theme').then(response => (response.data))
+  }
+
+  async theme_generate(create = true) {
+    if (create) {
+      return axios.get('/api/theme/create').then(response => (response.data))
+    } else {
+      return axios.delete('/api/theme').then(response => (response.data))
+    }
+  }
+
+  async theme_save(data) {
+    return axios.post('/api/theme', data).then(response => (response.data))
+  }
+
+  async login(username, password) {
+    const f = {username: username, password: password}
+    return axios.post('/api/login', qs.stringify(f))
+        .then(response => (response.data))
+  }
+
+  async logout() {
+    await axios.get('/api/logout').then(response => (response.data))
+    return localStorage.removeItem(tokenKey)
+  }
+
+  saveToken(username, token) {
+    const user = {username: username, token: token}
+    localStorage.setItem(tokenKey, JSON.stringify(user));
+    return user
+  }
+
+  async scss_base() {
+    return await axios({
+      url: '/scss/base.scss',
+      method: 'GET',
+      responseType: 'blob'
+    }).then((response) => {
+      const reader = new window.FileReader();
+      return reader.readAsText(response.data)
+    })
+  }
+
+  token() {
+    const tk = localStorage.getItem(tokenKey)
+    if (!tk) {
+      return {};
+    }
+    return JSON.parse(tk);
+  }
+
+  authToken() {
+    let user = JSON.parse(localStorage.getItem(tokenKey));
+    if (user && user.token) {
+      return {'Authorization': 'Bearer ' + user.token};
+    } else {
+      return {};
+    }
+  }
+
+  async allActions(...all) {
+    await axios.all([all])
+  }
+
+}
+const api = new Api()
+export default api
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 9182ab93..53093d21 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-  import Api from './components/API';
+  import Api from './API';
   import Footer from "./components/Index/Footer";
 
   export default {
diff --git a/frontend/src/components/API.js b/frontend/src/components/API.js
deleted file mode 100644
index 9aa71825..00000000
--- a/frontend/src/components/API.js
+++ /dev/null
@@ -1,226 +0,0 @@
-import axios from 'axios'
-
-const qs = require('querystring')
-const tokenKey = "statping_user";
-
-class Api {
-  constructor() {
-
-  }
-
-  async core () {
-    return axios.get('/api').then(response => (response.data))
-  }
-
-  async core_save (obj) {
-    return axios.post('/api/core', obj).then(response => (response.data))
-  }
-
-  async setup_save (data) {
-    return axios.post('/api/setup', qs.stringify(data)).then(response => (response.data))
-  }
-
-  async services () {
-    return axios.get('/api/services').then(response => (response.data))
-  }
-
-  async service (id) {
-    return axios.get('/api/services/'+id).then(response => (response.data))
-  }
-
-  async service_create (data) {
-    return axios.post('/api/services', data).then(response => (response.data))
-  }
-
-  async service_update (data) {
-    return axios.post('/api/services/'+data.id, data).then(response => (response.data))
-  }
-
-  async service_hits (id, start, end, group) {
-    return axios.get('/api/services/'+id+'/data?start=' + start + '&end=' + end + '&group=' + group).then(response => (response.data))
-  }
-
-    async service_heatmap (id, start, end, group) {
-        return axios.get('/api/services/'+id+'/heatmap?start=' + start + '&end=' + end + '&group=' + group).then(response => (response.data))
-    }
-
-  async service_failures (id, start, end, limit=999, offset=0) {
-    return axios.get('/api/services/'+id+'/failures?start=' + start + '&end=' + end + '&limit=' + limit).then(response => (response.data))
-  }
-
-  async service_delete (id) {
-    return axios.delete('/api/services/'+id).then(response => (response.data))
-  }
-
-  async services_reorder (data) {
-    return axios.post('/api/reorder/services', data).then(response => (response.data))
-  }
-
-  async groups () {
-    return axios.get('/api/groups').then(response => (response.data))
-  }
-
-    async groups_reorder (data) {
-        return axios.post('/api/reorder/groups', data).then(response => (response.data))
-    }
-
-  async group_delete (id) {
-    return axios.delete('/api/groups/'+id).then(response => (response.data))
-  }
-
-  async group_create (data) {
-    return axios.post('/api/groups', data).then(response => (response.data))
-  }
-
-  async group_update (data) {
-    return axios.post('/api/groups/'+data.id, data).then(response => (response.data))
-  }
-
-  async users () {
-    return axios.get('/api/users').then(response => (response.data))
-  }
-
-  async user_create (data) {
-    return axios.post('/api/users', data).then(response => (response.data))
-  }
-
-  async user_update (data) {
-    return axios.post('/api/users/'+data.id, data).then(response => (response.data))
-  }
-
-  async user_delete (id) {
-    return axios.delete('/api/users/'+id).then(response => (response.data))
-  }
-
-  async messages () {
-    return axios.get('/api/messages').then(response => (response.data))
-  }
-
-  async message_create (data) {
-    return axios.post('/api/messages', data).then(response => (response.data))
-  }
-
-  async message_update (data) {
-    return axios.post('/api/messages/'+data.id, data).then(response => (response.data))
-  }
-
-  async message_delete (id) {
-    return axios.delete('/api/messages/'+id).then(response => (response.data))
-  }
-
-  async group (id) {
-    return axios.get('/api/groups/'+id).then(response => (response.data))
-  }
-
-  async notifiers () {
-    return axios.get('/api/notifiers').then(response => (response.data))
-  }
-
-  async notifier_save (data) {
-    return axios.post('/api/notifier/'+data.method, data).then(response => (response.data))
-  }
-
-  async notifier_test (data) {
-    return axios.post('/api/notifier/'+data.method+'/test', data).then(response => (response.data))
-  }
-
-    async integrations () {
-        return axios.get('/api/integrations').then(response => (response.data))
-    }
-
-    async integration (name) {
-        return axios.get('/api/integrations/'+name).then(response => (response.data))
-    }
-
-    async integration_save (data) {
-        return axios.post('/api/integrations/'+data.name, data).then(response => (response.data))
-    }
-
-    async renewApiKeys () {
-        return axios.get('/api/renew').then(response => (response.data))
-    }
-
-    async cache () {
-        return axios.get('/api/cache').then(response => (response.data))
-    }
-
-    async clearCache () {
-        return axios.get('/api/clear_cache').then(response => (response.data))
-    }
-
-    async logs () {
-        return axios.get('/api/logs').then(response => (response.data))
-    }
-
-    async logs_last () {
-        return axios.get('/api/logs/last').then(response => (response.data))
-    }
-
-    async theme () {
-        return axios.get('/api/theme').then(response => (response.data))
-    }
-
-    async theme_generate (create=true) {
-      if (create) {
-          return axios.get('/api/theme/create').then(response => (response.data))
-      } else {
-          return axios.delete('/api/theme').then(response => (response.data))
-      }
-    }
-
-    async theme_save (data) {
-        return axios.post('/api/theme', data).then(response => (response.data))
-    }
-
-  async login (username, password) {
-    const f = {username: username, password: password}
-    return axios.post('/api/login', qs.stringify(f))
-      .then(response => (response.data))
-  }
-
-  async logout () {
-    await axios.get('/api/logout').then(response => (response.data))
-    return localStorage.removeItem(tokenKey)
-  }
-
-  saveToken (username, token) {
-    const user = {username: username, token: token}
-    localStorage.setItem(tokenKey, JSON.stringify(user));
-    return user
-  }
-
-  async scss_base () {
-    return await axios({
-      url: '/scss/base.scss',
-      method: 'GET',
-      responseType: 'blob'
-    }).then((response) => {
-      const reader = new window.FileReader();
-      return reader.readAsText(response.data)
-    })
-  }
-
-  token () {
-      const tk = localStorage.getItem(tokenKey)
-      if (!tk) {
-          return {};
-      }
-    return JSON.parse(tk);
-  }
-
-  authToken () {
-    let user = JSON.parse(localStorage.getItem(tokenKey));
-    if (user && user.token) {
-      return { 'Authorization': 'Bearer ' + user.token };
-    } else {
-      return {};
-    }
-  }
-
-  async allActions (...all) {
-    await axios.all([all])
-  }
-
-}
-const api = new Api()
-export default api
diff --git a/frontend/src/components/Dashboard/Cache.vue b/frontend/src/components/Dashboard/Cache.vue
new file mode 100644
index 00000000..0bbd1b37
--- /dev/null
+++ b/frontend/src/components/Dashboard/Cache.vue
@@ -0,0 +1,56 @@
+<template>
+    <div>
+      <h3>Cache</h3>
+        <div v-if="!cache && cache.length !== 0" class="alert alert-danger">
+            There are no cached files
+        </div>
+        <table class="table">
+            <thead>
+            <tr>
+                <th scope="col">URL</th>
+                <th scope="col">Size</th>
+                <th scope="col">Expiration</th>
+            </tr>
+            </thead>
+            <tbody>
+
+            <tr v-for="(cache, index) in cache">
+                <td>{{cache.url}}</td>
+                <td>{{cache.size}}</td>
+                <td>{{expireTime(cache.expiration)}}</td>
+            </tr>
+
+            </tbody>
+        </table>
+        <button @click.prevent="clearCache" class="btn btn-danger btn-block">Clear Cache</button>
+    </div>
+</template>
+
+<script>
+import Api from "../../API";
+
+export default {
+      name: 'Cache',
+      data() {
+          return {
+              cache: [],
+          }
+      },
+      async mounted() {
+          this.cache = await Api.cache()
+      },
+      methods: {
+          expireTime(ex) {
+              return this.toLocal(ex)
+          },
+          async clearCache() {
+              await Api.clearCache()
+              this.cache = []
+          }
+      }
+  }
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+</style>
diff --git a/frontend/src/components/Dashboard/DashboardIndex.vue b/frontend/src/components/Dashboard/DashboardIndex.vue
index 4a2a550b..eab6d3df 100644
--- a/frontend/src/components/Dashboard/DashboardIndex.vue
+++ b/frontend/src/components/Dashboard/DashboardIndex.vue
@@ -23,33 +23,24 @@
 </template>
 
 <script>
-  import ServiceInfo from "./ServiceInfo";
+  import ServiceInfo from "../Service/ServiceInfo";
 
   export default {
-  name: 'DashboardIndex',
-  components: {
-    ServiceInfo
-  },
-    data () {
-      return {
+      name: 'DashboardIndex',
+      components: {
+          ServiceInfo
+      },
+      methods: {
+          failuresLast24Hours() {
+              let total = 0;
+              this.$store.getters.services.map((s) => {
+                  total += s.failures_24_hours
+              })
+              return total
+          },
 
       }
-    },
-      computed: {
-
-      },
-      async created() {
-
-      },
-    methods: {
-        failuresLast24Hours() {
-            let total = 0;
-            this.$store.getters.services.map((s) => { total += s.failures_24_hours })
-            return total
-        },
-
   }
-}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/frontend/src/components/Dashboard/DashboardMessages.vue b/frontend/src/components/Dashboard/DashboardMessages.vue
index 3a4639a8..bd5841fe 100644
--- a/frontend/src/components/Dashboard/DashboardMessages.vue
+++ b/frontend/src/components/Dashboard/DashboardMessages.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-  import Api from "../API"
+  import Api from "../../API"
   import FormMessage from "../../forms/Message";
 
   export default {
diff --git a/frontend/src/components/Dashboard/DashboardServices.vue b/frontend/src/components/Dashboard/DashboardServices.vue
index 7a50d30a..4e1ca18f 100644
--- a/frontend/src/components/Dashboard/DashboardServices.vue
+++ b/frontend/src/components/Dashboard/DashboardServices.vue
@@ -99,97 +99,97 @@
 
 <script>
   import FormGroup from "../../forms/Group";
-  import Api from "../../components/API";
+  import Api from "../../API";
   import ToggleSwitch from "../../forms/ToggleSwitch";
   import draggable from 'vuedraggable'
 
   export default {
-  name: 'DashboardServices',
-  components: {
-    ToggleSwitch,
-    FormGroup,
-    draggable
-  },
-  data () {
-    return {
-      edit: false,
-      group: {}
-    }
-  },
-  computed: {
-    servicesList: {
-      get() {
-        return this.$store.state.servicesInOrder
+      name: 'DashboardServices',
+      components: {
+          ToggleSwitch,
+          FormGroup,
+          draggable
       },
-      async set(value) {
-        let data = [];
-        value.forEach((s, k) => {
-          data.push({service: s.id, order: k+1})
-        });
-        await Api.services_reorder(data)
-          const services = await Api.services()
-          this.$store.commit('setServices', services)
-      }
-    },
-    groupsList: {
-      get() {
-        return this.$store.state.groupsInOrder
+      data() {
+          return {
+              edit: false,
+              group: {}
+          }
       },
-      async set(value) {
-        let data = [];
-        value.forEach((s, k) => {
-          data.push({group: s.id, order: k+1})
-        });
-          await Api.groups_reorder(data)
-          const groups = await Api.groups()
-          this.$store.commit('setGroups', groups)
-      }
-    }
-  },
-  beforeMount() {
+      computed: {
+          servicesList: {
+              get() {
+                  return this.$store.state.servicesInOrder
+              },
+              async set(value) {
+                  let data = [];
+                  value.forEach((s, k) => {
+                      data.push({service: s.id, order: k + 1})
+                  });
+                  await Api.services_reorder(data)
+                  const services = await Api.services()
+                  this.$store.commit('setServices', services)
+              }
+          },
+          groupsList: {
+              get() {
+                  return this.$store.state.groupsInOrder
+              },
+              async set(value) {
+                  let data = [];
+                  value.forEach((s, k) => {
+                      data.push({group: s.id, order: k + 1})
+                  });
+                  await Api.groups_reorder(data)
+                  const groups = await Api.groups()
+                  this.$store.commit('setGroups', groups)
+              }
+          }
+      },
+      beforeMount() {
 
-  },
-  methods: {
-    editChange(v) {
-      this.group = {}
-      this.edit = v
-    },
-    editGroup(g, mode) {
-      this.group = g
-      this.edit = !mode
-    },
-    reordered_services() {
+      },
+      methods: {
+          editChange(v) {
+              this.group = {}
+              this.edit = v
+          },
+          editGroup(g, mode) {
+              this.group = g
+              this.edit = !mode
+          },
+          reordered_services() {
 
-    },
-    saveUpdatedOrder: function (e) {
-      window.console.log("saving...");
-      window.console.log(this.myViews.array()); // this.myViews.array is not a function
-    },
-    serviceGroup(s) {
-      let group = this.$store.getters.groupById(s.group_id)
-      if (group) {
-        return group.name
+          },
+          saveUpdatedOrder: function (e) {
+              window.console.log("saving...");
+              window.console.log(this.myViews.array()); // this.myViews.array is not a function
+          },
+          serviceGroup(s) {
+              let group = this.$store.getters.groupById(s.group_id)
+              if (group) {
+                  return group.name
+              }
+              return ""
+          },
+          async deleteGroup(g) {
+              let c = confirm(`Are you sure you want to delete '${g.name}'?`)
+              if (c) {
+                  await Api.group_delete(g.id)
+                  const groups = await Api.groups()
+                  this.$store.commit('setGroups', groups)
+              }
+          },
+          async deleteService(s) {
+              let c = confirm(`Are you sure you want to delete '${s.name}'?`)
+              if (c) {
+                  await Api.service_delete(s.id)
+                  const services = await Api.services()
+                  this.$store.commit('setServices', services)
+              }
+          }
       }
-      return ""
-    },
-    async deleteGroup(g) {
-      let c = confirm(`Are you sure you want to delete '${g.name}'?`)
-      if (c) {
-        await Api.group_delete(g.id)
-        const groups = await Api.groups()
-        this.$store.commit('setGroups', groups)
-      }
-    },
-    async deleteService(s) {
-      let c = confirm(`Are you sure you want to delete '${s.name}'?`)
-      if (c) {
-        await Api.service_delete(s.id)
-        const services = await Api.services()
-        this.$store.commit('setServices', services)
-      }
-    }
   }
-}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/frontend/src/components/Dashboard/DashboardUsers.vue b/frontend/src/components/Dashboard/DashboardUsers.vue
index c97de449..5e46ae4d 100644
--- a/frontend/src/components/Dashboard/DashboardUsers.vue
+++ b/frontend/src/components/Dashboard/DashboardUsers.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-  import Api from "../API"
+  import Api from "../../API"
   import FormUser from "../../forms/User";
 
   export default {
diff --git a/frontend/src/components/Dashboard/EditService.vue b/frontend/src/components/Dashboard/EditService.vue
index 991bf1e5..e215fee0 100644
--- a/frontend/src/components/Dashboard/EditService.vue
+++ b/frontend/src/components/Dashboard/EditService.vue
@@ -1,16 +1,16 @@
 <template>
     <div class="col-12">
-    <div class="card">
-    <div class="card-body">
-        <FormService :in_service="service"/>
-    </div>
-    </div>
+        <div class="card">
+            <div class="card-body">
+                <FormService :in_service="service"/>
+            </div>
+        </div>
     </div>
 </template>
 
 <script>
   import FormGroup from "../../forms/Group";
-  import Api from "../../components/API";
+  import Api from "../../API";
   import ToggleSwitch from "../../forms/ToggleSwitch";
   import draggable from 'vuedraggable'
   import FormService from "../../forms/Service";
diff --git a/frontend/src/components/Dashboard/ThemeEditor.vue b/frontend/src/components/Dashboard/ThemeEditor.vue
index 6cd21088..405e7cc6 100644
--- a/frontend/src/components/Dashboard/ThemeEditor.vue
+++ b/frontend/src/components/Dashboard/ThemeEditor.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-  import Api from "../API";
+  import Api from "../../API";
 
   // require component
   import { codemirror } from 'vue-codemirror'
@@ -136,7 +136,6 @@
                   this.error = null
               }
               this.pending = false
-              window.console.log(resp)
               await this.fetchTheme()
           },
           changeTab (v) {
diff --git a/frontend/src/components/Dashboard/TopNav.vue b/frontend/src/components/Dashboard/TopNav.vue
index a5a5500d..4df6a352 100644
--- a/frontend/src/components/Dashboard/TopNav.vue
+++ b/frontend/src/components/Dashboard/TopNav.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-  import Api from "../API"
+  import Api from "../../API"
 
   export default {
   name: 'TopNav',
diff --git a/frontend/src/components/Service/ServiceBlock.vue b/frontend/src/components/Service/ServiceBlock.vue
index 8d026321..43d337ba 100644
--- a/frontend/src/components/Service/ServiceBlock.vue
+++ b/frontend/src/components/Service/ServiceBlock.vue
@@ -8,20 +8,7 @@
                         <span class="badge float-right" :class="{'bg-success': service.online, 'bg-danger': !service.online}">{{service.online ? "ONLINE" : "OFFLINE"}}</span>
                     </h4>
 
-                    <div class="row stats_area mt-5">
-                        <div class="col-4">
-                            <span class="lg_number">{{service.avg_response}}ms</span>
-                            Average Response
-                        </div>
-                        <div class="col-4">
-                            <span class="lg_number">{{service.online_24_hours}}%</span>
-                            Uptime last 24 Hours
-                        </div>
-                        <div class="col-4">
-                            <span class="lg_number">{{service.online_7_days}}%</span>
-                            Uptime last 7 Days
-                        </div>
-                    </div>
+                    <ServiceTopStats :service="service"/>
 
                 </div>
             </div>
@@ -48,29 +35,26 @@
 
 <script>
 import ServiceChart from "./ServiceChart";
+import ServiceTopStats from "@/components/Service/ServiceTopStats";
 
 export default {
-  name: 'ServiceBlock',
-  components: {ServiceChart},
-  props: {
-    service: {
-      type: Object,
-      required: true
+    name: 'ServiceBlock',
+    components: {ServiceTopStats, ServiceChart},
+    props: {
+        service: {
+            type: Object,
+            required: true
+        },
     },
-  },
-      methods: {
+    methods: {
         smallText(s) {
             if (s.online) {
-                return `Online, last checked ${this.ago(s.last_success)}`
+                return `Online, last checked ${this.ago(this.parseTime(s.last_success))}`
             } else {
-                return `Offline, last error: ${s.last_failure.issue} ${this.ago(s.last_failure.created_at)}`
+                return `Offline, last error: ${s.last_failure.issue} ${this.ago(this.parseTime(s.last_failure.created_at))}`
             }
-          },
-          ago(t1) {
-            const tm = this.parseTime(t1)
-            return this.duration(this.$moment().utc(), tm)
-          }
-      }
+        }
+    }
 }
 </script>
 
diff --git a/frontend/src/components/Service/ServiceChart.vue b/frontend/src/components/Service/ServiceChart.vue
index 6dc73388..ec483d31 100644
--- a/frontend/src/components/Service/ServiceChart.vue
+++ b/frontend/src/components/Service/ServiceChart.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-  import Api from "../../components/API"
+  import Api from "../../API"
 
   const axisOptions = {
     labels: {
@@ -30,108 +30,108 @@
   };
 
   export default {
-  name: 'ServiceChart',
-  props: {
-    service: {
-      type: Object,
-      required: true
-    }
-  },
-  async created() {
-    await this.chartHits()
-  },
-  data () {
-    return {
-      ready: false,
-      data: [],
-      chartOptions: {
-        chart: {
-          height: 210,
-          width: "100%",
-          type: "area",
-          animations: {
-            enabled: true,
-            initialAnimation: {
-              enabled: true
-            }
-          },
-          selection: {
-            enabled: false
-          },
-          zoom: {
-            enabled: false
-          },
-          toolbar: {
-            show: false
-          },
-        },
-        grid: {
-          show: false,
-          padding: {
-            top: 0,
-            right: 0,
-            bottom: 0,
-            left: -10,
+      name: 'ServiceChart',
+      props: {
+          service: {
+              type: Object,
+              required: true
           }
-        },
-        xaxis: {
-          type: "datetime",
-          ...axisOptions
-        },
-        yaxis: {
-          ...axisOptions
-        },
-          tooltip: {
-            enabled: false,
-            marker: {
-              show: false,
-            },
-            x: {
-              show: false,
-            }
-          },
-          legend: {
-            show: false,
-          },
-          dataLabels: {
-            enabled: false
-          },
-          floating: true,
-          axisTicks: {
-            show: false
-          },
-          axisBorder: {
-            show: false
-          },
-          fill: {
-            colors: [this.service.online ? "#48d338" : "#dd3545"],
-            opacity: 1,
-            type: 'solid'
-          },
-          stroke: {
-            show: false,
-            curve: 'smooth',
-            lineCap: 'butt',
-            colors: [this.service.online ? "#3aa82d" : "#dd3545"],
+      },
+      async created() {
+          await this.chartHits()
+      },
+      data() {
+          return {
+              ready: false,
+              data: [],
+              chartOptions: {
+                  chart: {
+                      height: 210,
+                      width: "100%",
+                      type: "area",
+                      animations: {
+                          enabled: true,
+                          initialAnimation: {
+                              enabled: true
+                          }
+                      },
+                      selection: {
+                          enabled: false
+                      },
+                      zoom: {
+                          enabled: false
+                      },
+                      toolbar: {
+                          show: false
+                      },
+                  },
+                  grid: {
+                      show: false,
+                      padding: {
+                          top: 0,
+                          right: 0,
+                          bottom: 0,
+                          left: -10,
+                      }
+                  },
+                  xaxis: {
+                      type: "datetime",
+                      ...axisOptions
+                  },
+                  yaxis: {
+                      ...axisOptions
+                  },
+                  tooltip: {
+                      enabled: false,
+                      marker: {
+                          show: false,
+                      },
+                      x: {
+                          show: false,
+                      }
+                  },
+                  legend: {
+                      show: false,
+                  },
+                  dataLabels: {
+                      enabled: false
+                  },
+                  floating: true,
+                  axisTicks: {
+                      show: false
+                  },
+                  axisBorder: {
+                      show: false
+                  },
+                  fill: {
+                      colors: [this.service.online ? "#48d338" : "#dd3545"],
+                      opacity: 1,
+                      type: 'solid'
+                  },
+                  stroke: {
+                      show: false,
+                      curve: 'smooth',
+                      lineCap: 'butt',
+                      colors: [this.service.online ? "#3aa82d" : "#dd3545"],
+                  }
+              },
+              series: [{
+                  data: []
+              }]
           }
-        },
-      series: [{
-        data: []
-      }]
-    }
-  },
+      },
       methods: {
           async chartHits() {
-              const start = this.ago((3600 * 24) * 7)
-              this.data = await Api.service_hits(this.service.id, start, this.now(), "hour")
+              const start = this.nowSubtract((3600 * 24) * 7)
+              this.data = await Api.service_hits(this.service.id, this.toUnix(start), this.toUnix(new Date()), "hour")
               this.series = [{
                   name: this.service.name,
                   ...this.data
               }]
               this.ready = true
           }
-      },
-}
+      }
+  }
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/frontend/src/components/Service/ServiceFailures.vue b/frontend/src/components/Service/ServiceFailures.vue
index a786933b..437fd2d3 100644
--- a/frontend/src/components/Service/ServiceFailures.vue
+++ b/frontend/src/components/Service/ServiceFailures.vue
@@ -33,7 +33,7 @@
 
 <script>
 import ServiceChart from "./ServiceChart";
-import Api from "../API";
+import Api from "../../API";
 
 export default {
   name: 'ServiceFailures',
diff --git a/frontend/src/components/Service/ServiceHeatmap.vue b/frontend/src/components/Service/ServiceHeatmap.vue
new file mode 100644
index 00000000..d2bd779a
--- /dev/null
+++ b/frontend/src/components/Service/ServiceHeatmap.vue
@@ -0,0 +1,84 @@
+<template>
+    <apexchart v-if="ready" width="100%" height="300" type="heatmap" :options="chartOptions" :series="series"></apexchart>
+</template>
+
+<script>
+  import Api from "../../API"
+
+  export default {
+      name: 'ServiceHeatmap',
+      props: {
+          service: {
+              type: Object,
+              required: true
+          }
+      },
+      async created() {
+          await this.chartHeatmap()
+      },
+      data() {
+          return {
+              ready: false,
+              data: [],
+              chartOptions: {
+                  chart: {
+                      height: "100%",
+                      width: "100%",
+                      type: 'heatmap',
+                      toolbar: {
+                          show: false
+                      }
+                  },
+                  dataLabels: {
+                      enabled: false,
+                  },
+                  enableShades: true,
+                  shadeIntensity: 0.5,
+                  colors: ["#d53a3b"],
+                  series: [{data: [{}]}],
+                  yaxis: {
+                      labels: {
+                          formatter: (value) => {
+                              return value
+                          },
+                      },
+                  },
+                  tooltip: {
+                      enabled: true,
+                      x: {
+                          show: false,
+                      },
+                      y: {
+                          formatter: function(val, opts) { return val+" Failures" },
+                          title: {
+                              formatter: (seriesName) => seriesName,
+                          },
+                      },
+                  }
+              },
+              series: [{
+                  data: []
+              }]
+          }
+      },
+      methods: {
+          async chartHeatmap() {
+              const start = this.nowSubtract((3600 * 24) * 7)
+              const data = await Api.service_heatmap(this.service.id, this.toUnix(start), this.toUnix(new Date()), "hour")
+
+              let dataArr = []
+              data.forEach(function(d) {
+                  let date = new Date(d.date);
+                  dataArr.push({name: date.toLocaleString('en-us', { month: 'long' }), data: d.data});
+              });
+
+              this.series = dataArr
+              this.ready = true
+          }
+      }
+  }
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+</style>
diff --git a/frontend/src/components/Dashboard/ServiceInfo.vue b/frontend/src/components/Service/ServiceInfo.vue
similarity index 82%
rename from frontend/src/components/Dashboard/ServiceInfo.vue
rename to frontend/src/components/Service/ServiceInfo.vue
index ee5dd85f..1fc30157 100644
--- a/frontend/src/components/Dashboard/ServiceInfo.vue
+++ b/frontend/src/components/Service/ServiceInfo.vue
@@ -16,15 +16,16 @@
             </div>
         </div>
         <span v-for="(failure, index) in failures" v-bind:key="index" class="alert alert-light">
-            Failed {{duration(current(), failure.created_at)}}<br>
+            Failed {{ago(parseTime(failure.created_at))}}<br>
             {{failure.issue}}
         </span>
+
     </div>
 </template>
 
 <script>
   import ServiceSparkLine from "./ServiceSparkLine";
-  import Api from "../API";
+  import Api from "../../API";
 
   export default {
       name: 'ServiceInfo',
@@ -37,7 +38,7 @@
               required: true
           }
       },
-      data () {
+      data() {
           return {
               set1: [],
               set2: [],
@@ -47,7 +48,7 @@
               failures: null
           }
       },
-      async mounted () {
+      async mounted() {
           this.set1 = await this.getHits(24 * 2, "hour")
           this.set1_name = this.calc(this.set1)
           this.set2 = await this.getHits(24 * 7, "hour")
@@ -55,19 +56,19 @@
           this.loaded = true
       },
       methods: {
-          async getHits (hours, group) {
-              const start = this.ago(3600 * hours)
+          async getHits(hours, group) {
+              const start = this.nowSubtract(3600 * hours)
               if (!this.service.online) {
-                  this.failures = await Api.service_failures(this.service.id, this.now()-360, this.now(), 5)
-                  return [ { name: "None", data: [] } ]
+                  this.failures = await Api.service_failures(this.service.id, this.toUnix(start), this.toUnix(this.now()), 5)
+                  return [{name: "None", data: []}]
               }
-              const data = await Api.service_hits(this.service.id, start, this.now(), group)
+              const data = await Api.service_hits(this.service.id, this.toUnix(start), this.toUnix(this.now()), group)
               if (!data) {
-                  return [ { name: "None", data: [] } ]
+                  return [{name: "None", data: []}]
               }
-              return [ { name: "Latency", data: data.data } ]
+              return [{name: "Latency", data: data.data}]
           },
-          calc (s) {
+          calc(s) {
               let data = s[0].data
               if (data.length > 1) {
                   let total = 0
@@ -75,7 +76,7 @@
                       total += f.y
                   });
                   total = total / data.length
-                  return total.toFixed(0) + "ms Average"
+                  return total.toFixed(0) + "ms"
               } else {
                   return "Offline"
               }
diff --git a/frontend/src/components/Dashboard/ServiceSparkLine.vue b/frontend/src/components/Service/ServiceSparkLine.vue
similarity index 100%
rename from frontend/src/components/Dashboard/ServiceSparkLine.vue
rename to frontend/src/components/Service/ServiceSparkLine.vue
diff --git a/frontend/src/components/Service/ServiceTopStats.vue b/frontend/src/components/Service/ServiceTopStats.vue
new file mode 100644
index 00000000..c7c045ce
--- /dev/null
+++ b/frontend/src/components/Service/ServiceTopStats.vue
@@ -0,0 +1,32 @@
+<template>
+    <div class="row stats_area mt-5 mb-4">
+        <div class="col-4">
+            <span class="lg_number">{{service.avg_response}}ms</span>
+            Average Response
+        </div>
+        <div class="col-4">
+            <span class="lg_number">{{service.online_24_hours}}%</span>
+            Uptime last 24 Hours
+        </div>
+        <div class="col-4">
+            <span class="lg_number">{{service.online_7_days}}%</span>
+            Uptime last 7 Days
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'ServiceTopStats',
+        props: {
+            service: {
+                type: Object,
+                required: true
+            },
+        }
+    }
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+</style>
diff --git a/frontend/src/components/Time.js b/frontend/src/components/Time.js
deleted file mode 100644
index cafed2b2..00000000
--- a/frontend/src/components/Time.js
+++ /dev/null
@@ -1,14 +0,0 @@
-class Time {
-    now () {
-        return new Date();
-    }
-    utc () {
-        return new Date().getUTCDate();
-    }
-    utcToLocal (utc) {
-        let u = new Date().setUTCDate(utc)
-        return u.toLocaleString()
-    }
-}
-const time = new Time()
-export default time
diff --git a/frontend/src/forms/Checkin.vue b/frontend/src/forms/Checkin.vue
index c776a176..88e8f588 100644
--- a/frontend/src/forms/Checkin.vue
+++ b/frontend/src/forms/Checkin.vue
@@ -1,5 +1,5 @@
 <template>
-    <form @submit="saveCheckin">
+    <form @submit.prevent="saveCheckin">
         <div class="form-group row">
             <div class="col-md-3">
                 <label for="checkin_interval" class="col-form-label">Checkin Name</label>
@@ -14,46 +14,45 @@
                 <input v-model="checkin.grace" type="number" name="grace" class="form-control" id="grace_period" placeholder="10">
             </div>
             <div class="col-3">
-                <button @click="saveCheckin" type="submit" id="submit" class="btn btn-success d-block" style="margin-top: 14px;">Save Checkin</button>
+                <button @click.prevent="saveCheckin" type="submit" id="submit" class="btn btn-success d-block" style="margin-top: 14px;">Save Checkin</button>
             </div>
         </div>
     </form>
 </template>
 
 <script>
-  import Api from "../components/API";
+  import Api from "../API";
 
   export default {
-  name: 'Checkin',
-  props: {
-    service: {
-      type: Object,
-      required: true
-    }
-  },
-  data () {
-    return {
-      checkin: {
-        name: "",
-        interval: 60,
-        grace: 60,
-        service: this.service.id
-      }
-    }
-  },
-  mounted() {
+      name: 'Checkin',
+      props: {
+          service: {
+              type: Object,
+              required: true
+          }
+      },
+      data() {
+          return {
+              checkin: {
+                  name: "",
+                  interval: 60,
+                  grace: 60,
+                  service: this.service.id
+              }
+          }
+      },
+      mounted() {
 
-  },
-  methods: {
-    async saveCheckin(e) {
-      e.preventDefault();
-      const data = {name: this.group.name, public: this.group.public}
-      await Api.group_create(data)
-      const groups = await Api.groups()
-      this.$store.commit('setGroups', groups)
-    },
+      },
+      methods: {
+          async saveCheckin() {
+              const data = {name: this.group.name, public: this.group.public}
+              await Api.group_create(data)
+              const groups = await Api.groups()
+              this.$store.commit('setGroups', groups)
+          },
+      }
   }
-}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/frontend/src/forms/CoreSettings.vue b/frontend/src/forms/CoreSettings.vue
index 1c2865df..eef738b0 100644
--- a/frontend/src/forms/CoreSettings.vue
+++ b/frontend/src/forms/CoreSettings.vue
@@ -1,5 +1,5 @@
 <template>
-    <form @submit="saveSettings">
+    <form @submit.prevent="saveSettings">
         <div class="form-group">
             <label>Project Name</label>
             <input v-model="core.name" type="text" class="form-control" placeholder="Great Uptime">
@@ -68,20 +68,9 @@
             </select>
         </div>
 
-        <div class="form-group">
-            <div class="col-12">
-                <label class="d-none d-sm-block">Send Updates only</label>
-                <span class="switch">
-                    <input v-model="core.update_notify" @change="core.update_notify = !!core.update_notify" type="checkbox" class="switch" id="switch-update_notify" v-bind:checked="core.update_notify">
-                    <label for="switch-update_notify" class="mt-2 mt-sm-0"></label>
-                    <small class="form-text text-muted">Enabling this will send only notifications when the status of a services changes.</small>
-                </span>
-            </div>
-        </div>
+        <button @click.prevent="saveSettings" type="submit" class="btn btn-primary btn-block">Save Settings</button>
 
-        <button @click="saveSettings" type="submit" class="btn btn-primary btn-block">Save Settings</button>
-
-        <div class="form-group row mt-3">
+        <div class="form-group row mt-5">
             <label class="col-sm-3 col-form-label">API Key</label>
             <div class="col-sm-9">
                 <input v-model="core.api_key" @focus="$event.target.select()" type="text" class="form-control select-input" readonly>
@@ -102,43 +91,44 @@
 </template>
 
 <script>
-  import Api from '../components/API'
+  import Api from '../API'
 
   export default {
-  name: 'CoreSettings',
-    data () {
-        return {
-            core: this.$store.getters.core,
-        }
-    },
-    async mounted () {
+      name: 'CoreSettings',
+      data() {
+          return {
+              core: this.$store.getters.core,
+          }
+      },
+      async mounted() {
 
-    },
-    methods: {
-        async saveSettings (e) {
-          e.preventDefault()
-          const c = this.core
-          const coreForm = {name: c.name, description: c.description, domain: c.domain,
-            timezone: c.timezone, using_cdn: c.using_cdn, footer: c.footer, update_notify: c.update_notify}
-          await Api.core_save(coreForm)
-          const core = await Api.core()
-          this.$store.commit('setCore', core)
-          this.core = core
-        },
-        async renewApiKeys () {
-            let r = confirm("Are you sure you want to reset the API keys?");
-            if (r === true) {
-                await Api.renewApiKeys()
-                const core = await Api.core()
-                this.$store.commit('setCore', core)
-                this.core = core
-            }
-        },
-      selectAll() {
-        this.$refs.input.select();
+      },
+      methods: {
+          async saveSettings() {
+              const c = this.core
+              const coreForm = {
+                  name: c.name, description: c.description, domain: c.domain,
+                  timezone: c.timezone, using_cdn: c.using_cdn, footer: c.footer, update_notify: c.update_notify
+              }
+              await Api.core_save(coreForm)
+              const core = await Api.core()
+              this.$store.commit('setCore', core)
+              this.core = core
+          },
+          async renewApiKeys() {
+              let r = confirm("Are you sure you want to reset the API keys?");
+              if (r === true) {
+                  await Api.renewApiKeys()
+                  const core = await Api.core()
+                  this.$store.commit('setCore', core)
+                  this.core = core
+              }
+          },
+          selectAll() {
+              this.$refs.input.select();
+          }
       }
-    }
-}
+  }
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/frontend/src/forms/Group.vue b/frontend/src/forms/Group.vue
index 7cf527ac..641297b5 100644
--- a/frontend/src/forms/Group.vue
+++ b/frontend/src/forms/Group.vue
@@ -38,65 +38,65 @@
 </template>
 
 <script>
-  import Api from "../components/API";
+  import Api from "../API";
 
   export default {
-  name: 'FormGroup',
-  props: {
-    in_group: {
-      type: Object
-    },
-    edit: {
-      type: Function
-    }
-  },
-  data () {
-    return {
-        loading: false,
-      group: {
-        name: "",
-        public: true
+      name: 'FormGroup',
+      props: {
+          in_group: {
+              type: Object
+          },
+          edit: {
+              type: Function
+          }
+      },
+      data() {
+          return {
+              loading: false,
+              group: {
+                  name: "",
+                  public: true
+              }
+          }
+      },
+      watch: {
+          in_group() {
+              this.group = this.in_group
+          }
+      },
+      methods: {
+          removeEdit() {
+              this.group = {}
+              this.edit(false)
+          },
+          async saveGroup(e) {
+              e.preventDefault();
+              this.loading = true
+              if (this.in_group) {
+                  await this.updateGroup()
+              } else {
+                  await this.createGroup()
+              }
+              this.loading = false
+          },
+          async createGroup() {
+              const g = this.group
+              const data = {name: g.name, public: g.public}
+              await Api.group_create(data)
+              const groups = await Api.groups()
+              this.$store.commit('setGroups', groups)
+              this.group = {}
+          },
+          async updateGroup() {
+              const g = this.group
+              const data = {id: g.id, name: g.name, public: g.public}
+              await Api.group_update(data)
+              const groups = await Api.groups()
+              this.$store.commit('setGroups', groups)
+              this.edit(false)
+          }
       }
-    }
-  },
-  watch: {
-    in_group() {
-      this.group = this.in_group
-    }
-  },
-  methods: {
-    removeEdit() {
-      this.group = {}
-      this.edit(false)
-    },
-    async saveGroup(e) {
-      e.preventDefault();
-      this.loading = true
-      if (this.in_group) {
-        await this.updateGroup()
-      } else {
-        await this.createGroup()
-      }
-        this.loading = false
-    },
-    async createGroup() {
-      const g = this.group
-      const data = {name: g.name, public: g.public}
-      await Api.group_create(data)
-      const groups = await Api.groups()
-      this.$store.commit('setGroups', groups)
-      this.group = {}
-    },
-    async updateGroup() {
-      const g = this.group
-      const data = {id: g.id, name: g.name, public: g.public}
-      await Api.group_update(data)
-      const groups = await Api.groups()
-      this.$store.commit('setGroups', groups)
-      this.edit(false)
-    }
   }
-}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/frontend/src/forms/Integration.vue b/frontend/src/forms/Integration.vue
index a9059891..d53e6566 100644
--- a/frontend/src/forms/Integration.vue
+++ b/frontend/src/forms/Integration.vue
@@ -59,45 +59,50 @@
 </template>
 
 <script>
-  import Api from "../components/API";
+  import Api from "../API";
 
   export default {
-  name: 'FormIntegration',
-  props: {
-    integration: {
-      type: Object
-    }
-  },
-  data () {
-    return {
-        out: {},
-        services: []
-    }
-  },
-  watch: {
-
-  },
-  methods: {
-      async addService(s) {
-        const data = {name: s.name, type: s.type, domain: s.domain, port: s.port, check_interval: s.check_interval, timeout: s.timeout}
-          const out = await Api.service_create(data)
-          const services = await Api.services()
-          this.$store.commit('setServices', services)
-          s.added = true
+      name: 'FormIntegration',
+      props: {
+          integration: {
+              type: Object
+          }
       },
-    async updateIntegration() {
-        const i = this.integration
-        const data = {name: i.name, enabled: i.enabled, fields: i.fields}
-        this.out = data
-        const out = await Api.integration_save(data)
-        if (out != null) {
-            this.services = out
-        }
-      const integrations = await Api.integrations()
-      this.$store.commit('setIntegrations', integrations)
-    }
+      data() {
+          return {
+              out: {},
+              services: []
+          }
+      },
+      watch: {},
+      methods: {
+          async addService(s) {
+              const data = {
+                  name: s.name,
+                  type: s.type,
+                  domain: s.domain,
+                  port: s.port,
+                  check_interval: s.check_interval,
+                  timeout: s.timeout
+              }
+              const out = await Api.service_create(data)
+              const services = await Api.services()
+              this.$store.commit('setServices', services)
+              s.added = true
+          },
+          async updateIntegration() {
+              const i = this.integration
+              const data = {name: i.name, enabled: i.enabled, fields: i.fields}
+              this.out = data
+              const out = await Api.integration_save(data)
+              if (out != null) {
+                  this.services = out
+              }
+              const integrations = await Api.integrations()
+              this.$store.commit('setIntegrations', integrations)
+          }
+      }
   }
-}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/frontend/src/forms/Login.vue b/frontend/src/forms/Login.vue
index f92d2869..02750b31 100644
--- a/frontend/src/forms/Login.vue
+++ b/frontend/src/forms/Login.vue
@@ -26,43 +26,43 @@
 </template>
 
 <script>
-  import Api from "../components/API";
+  import Api from "../API";
 
   export default {
-  name: 'FormLogin',
-  data () {
-    return {
-        username: "",
-        password: "",
-        auth: {},
-        loading: false,
-        error: false,
-        disabled: true
-    }
-  },
-  methods: {
-      checkForm() {
-          if (!this.username || !this.password) {
-              this.disabled = true
-          } else {
-              this.disabled = false
+      name: 'FormLogin',
+      data() {
+          return {
+              username: "",
+              password: "",
+              auth: {},
+              loading: false,
+              error: false,
+              disabled: true
           }
       },
-      async login () {
-          this.loading = true
-          this.error = false
-          const auth = await Api.login(this.username, this.password)
-          if (auth.error) {
-              this.error = true
-          } else if (auth.token) {
-              this.auth = Api.saveToken(this.username, auth.token)
-              await this.$store.dispatch('loadAdmin')
-              this.$router.push('/dashboard')
+      methods: {
+          checkForm() {
+              if (!this.username || !this.password) {
+                  this.disabled = true
+              } else {
+                  this.disabled = false
+              }
+          },
+          async login() {
+              this.loading = true
+              this.error = false
+              const auth = await Api.login(this.username, this.password)
+              if (auth.error) {
+                  this.error = true
+              } else if (auth.token) {
+                  this.auth = Api.saveToken(this.username, auth.token)
+                  await this.$store.dispatch('loadAdmin')
+                  this.$router.push('/dashboard')
+              }
+              this.loading = false
           }
-          this.loading = false
       }
   }
-}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/frontend/src/forms/Message.vue b/frontend/src/forms/Message.vue
index e20127a1..41234a68 100644
--- a/frontend/src/forms/Message.vue
+++ b/frontend/src/forms/Message.vue
@@ -24,10 +24,10 @@
         <div class="form-group row">
             <label class="col-sm-4 col-form-label">Message Date Range</label>
             <div class="col-sm-4">
-                <flatPickr v-model="message.start_on" :config="config" type="text" name="start_on" class="form-control form-control-plaintext" id="start_on" value="0001-01-01T00:00:00Z" required />
+                <flatPickr v-model="message.start_on" @on-change="startChange" :config="config" type="text" name="start_on" class="form-control form-control-plaintext" id="start_on" value="0001-01-01T00:00:00Z" required />
             </div>
             <div class="col-sm-4">
-                <flatPickr v-model="message.end_on" :config="config" type="text" name="end_on" class="form-control form-control-plaintext" id="end_on" value="0001-01-01T00:00:00Z" required />
+                <flatPickr v-model="message.end_on" @on-change="endChange" :config="config" type="text" name="end_on" class="form-control form-control-plaintext" id="end_on" value="0001-01-01T00:00:00Z" required />
             </div>
         </div>
 
@@ -90,7 +90,7 @@
 </template>
 
 <script>
-  import Api from "../components/API";
+  import Api from "../API";
   import flatPickr from 'vue-flatpickr-component';
   import 'flatpickr/dist/flatpickr.css';
 
@@ -135,6 +135,12 @@
     }
   },
   methods: {
+      startChange(e) {
+        window.console.log(e)
+      },
+      endChange(e) {
+          window.console.log(e)
+      },
     removeEdit() {
       this.message = {}
       this.edit(false)
diff --git a/frontend/src/forms/Notifier.vue b/frontend/src/forms/Notifier.vue
index 56ba7acc..f5935bdc 100644
--- a/frontend/src/forms/Notifier.vue
+++ b/frontend/src/forms/Notifier.vue
@@ -1,5 +1,5 @@
 <template>
-    <form @submit="saveNotifier">
+    <form @submit.prevent="saveNotifier">
 
         <div v-if="error" class="alert alert-danger col-12" role="alert">{{error}}</div>
 
@@ -38,13 +38,13 @@
             </div>
 
             <div class="col-12 col-sm-4 mb-2 mb-sm-0 mt-2 mt-sm-0">
-                <button @click="saveNotifier" type="submit" class="btn btn-block text-capitalize" :class="{'btn-primary': !saved, 'btn-success': saved}">
+                <button @click.prevent="saveNotifier" type="submit" class="btn btn-block text-capitalize" :class="{'btn-primary': !saved, 'btn-success': saved}">
                     <i class="fa fa-check-circle"></i> {{loading ? "Loading..." : saved ? "Saved" : "Save"}}
                 </button>
             </div>
 
             <div class="col-12 col-sm-12 mt-3">
-                <button @click="testNotifier" class="btn btn-secondary btn-block text-capitalize col-12 float-right"><i class="fa fa-vial"></i>
+                <button @click.prevent="testNotifier" class="btn btn-secondary btn-block text-capitalize col-12 float-right"><i class="fa fa-vial"></i>
                     {{loading ? "Loading..." : "Test Notifier"}}</button>
             </div>
 
@@ -57,67 +57,65 @@
 </template>
 
 <script>
-import Api from "../components/API";
+import Api from "../API";
 
 export default {
-  name: 'Notifier',
-  props: {
-    notifier: {
-      type: Object,
-      required: true
-    }
-  },
-  data () {
-    return {
-        loading: false,
-        error: null,
-      saved: false,
-        ok: false,
-    }
-  },
-  mounted() {
+    name: 'Notifier',
+    props: {
+        notifier: {
+            type: Object,
+            required: true
+        }
+    },
+    data() {
+        return {
+            loading: false,
+            error: null,
+            saved: false,
+            ok: false,
+        }
+    },
+    mounted() {
 
-  },
-  methods: {
-    async saveNotifier(e) {
-      e.preventDefault();
-      this.loading = true
-      let form = {}
-      this.notifier.form.forEach((f) => {
-        form[f.field] = this.notifier[f.field]
-      });
-      form.enabled = this.notifier.enabled
-      form.limits = parseInt(this.notifier.limits)
-      form.method = this.notifier.method
-      await Api.notifier_save(form)
-      const notifiers = await Api.notifiers()
-      this.$store.commit('setNotifiers', notifiers)
-      this.saved = true
-        this.loading = false
-      setTimeout(() => {
-        this.saved = false
-      }, 2000)
     },
-    async testNotifier(e) {
-      e.preventDefault();
-        this.ok = false
-        this.loading = true
-      let form = {}
-      this.notifier.form.forEach((f) => {
-        form[f.field] = this.notifier[f.field]
-      });
-      form.enabled = this.notifier.enabled
-      form.limits = parseInt(this.notifier.limits)
-      form.method = this.notifier.method
-      const tested = await Api.notifier_test(form)
-      if (tested === 'ok') {
-        this.ok = true
-      } else {
-        this.error = tested
-      }
-        this.loading = false
-    },
-  }
+    methods: {
+        async saveNotifier() {
+            this.loading = true
+            let form = {}
+            this.notifier.form.forEach((f) => {
+                form[f.field] = this.notifier[f.field]
+            });
+            form.enabled = this.notifier.enabled
+            form.limits = parseInt(this.notifier.limits)
+            form.method = this.notifier.method
+            await Api.notifier_save(form)
+            const notifiers = await Api.notifiers()
+            await this.$store.commit('setNotifiers', notifiers)
+            this.saved = true
+            this.loading = false
+            setTimeout(() => {
+                this.saved = false
+            }, 2000)
+        },
+        async testNotifier() {
+            this.ok = false
+            this.loading = true
+            let form = {}
+            this.notifier.form.forEach((f) => {
+                form[f.field] = this.notifier[f.field]
+            });
+            form.enabled = this.notifier.enabled
+            form.limits = parseInt(this.notifier.limits)
+            form.method = this.notifier.method
+            const tested = await Api.notifier_test(form)
+            if (tested === 'ok') {
+                this.ok = true
+            } else {
+                this.error = tested
+            }
+            this.loading = false
+        },
+    }
 }
 </script>
 
diff --git a/frontend/src/forms/Service.vue b/frontend/src/forms/Service.vue
index d45fb7ca..2b77b70e 100644
--- a/frontend/src/forms/Service.vue
+++ b/frontend/src/forms/Service.vue
@@ -1,5 +1,5 @@
 <template>
-    <form @submit="saveService">
+    <form @submit.prevent="saveService">
         <h4 class="mb-5 text-muted">Basic Information</h4>
         <div class="form-group row">
             <label class="col-sm-4 col-form-label">Service Name</label>
@@ -12,10 +12,10 @@
             <label for="service_type" class="col-sm-4 col-form-label">Service Type</label>
             <div class="col-sm-8">
                 <select v-model="service.type" class="form-control" id="service_type" >
-                    <option value="http" >HTTP Service</option>
-                    <option value="tcp" >TCP Service</option>
-                    <option value="udp" >UDP Service</option>
-                    <option value="icmp" >ICMP Ping</option>
+                    <option value="http">HTTP Service</option>
+                    <option value="tcp">TCP Service</option>
+                    <option value="udp">UDP Service</option>
+                    <option value="icmp">ICMP Ping</option>
                 </select>
                 <small class="form-text text-muted">Use HTTP if you are checking a website or use TCP if you are checking a server</small>
             </div>
@@ -111,15 +111,8 @@
                 <small class="form-text text-muted">Use text for the service URL rather than the service number.</small>
             </div>
         </div>
-        <div class="form-group row">
-            <label for="order" class="col-sm-4 col-form-label">List Order</label>
-            <div class="col-sm-8">
-                <input v-model="service.order" type="number" name="order" class="form-control" min="0" id="order">
-                <small class="form-text text-muted">You can also drag and drop services to reorder on the Services tab.</small>
-            </div>
-        </div>
         <div v-if="service.type.match(/^(http)$/)" class="form-group row">
-            <label for="order" class="col-sm-4 col-form-label">Verify SSL</label>
+            <label class="col-sm-4 col-form-label">Verify SSL</label>
             <div class="col-8 mt-1">
             <span @click="service.verify_ssl = !!service.verify_ssl" class="switch float-left">
                 <input v-model="service.verify_ssl" type="checkbox" name="verify_ssl-option" class="switch" id="switch-verify-ssl" v-bind:checked="service.verify_ssl">
@@ -128,7 +121,7 @@
             </div>
         </div>
         <div class="form-group row">
-            <label for="order" class="col-sm-4 col-form-label">Notifications</label>
+            <label class="col-sm-4 col-form-label">Notifications</label>
             <div class="col-8 mt-1">
             <span @click="service.allow_notifications = !!service.allow_notifications" class="switch float-left">
                 <input v-model="service.allow_notifications" type="checkbox" name="allow_notifications-option" class="switch" id="switch-notifications" v-bind:checked="service.allow_notifications">
@@ -136,8 +129,17 @@
             </span>
             </div>
         </div>
+        <div v-if="service.allow_notifications" class="form-group row">
+            <label class="col-sm-4 col-form-label">Notify All Changes</label>
+            <div class="col-8 mt-1">
+            <span @click="service.notify_all_changes = !!service.notify_all_changes" class="switch float-left">
+                <input v-model="service.notify_all_changes" type="checkbox" name="notify_all-option" class="switch" id="notify_all" v-bind:checked="service.notify_all_changes">
+                <label for="notify_all">Continuously notify when service is failing.</label>
+            </span>
+            </div>
+        </div>
         <div class="form-group row">
-            <label for="order" class="col-sm-4 col-form-label">Visible</label>
+            <label class="col-sm-4 col-form-label">Visible</label>
             <div class="col-8 mt-1">
             <span @click="service.public = !!service.public" class="switch float-left">
                 <input v-model="service.public" type="checkbox" name="public-option" class="switch" id="switch-public" v-bind:checked="service.public">
@@ -157,7 +159,7 @@
 </template>
 
 <script>
-  import Api from "../components/API";
+  import Api from "../API";
 
   export default {
   name: 'FormService',
@@ -181,6 +183,7 @@
         order: 1,
         verify_ssl: true,
         allow_notifications: true,
+        notify_all_changes: true,
         public: true,
       },
       groups: [],
@@ -203,8 +206,7 @@
     }
   },
   methods: {
-    async saveService(e) {
-      e.preventDefault()
+    async saveService() {
       let s = this.service
       delete s.failures
       delete s.created_at
diff --git a/frontend/src/forms/Setup.vue b/frontend/src/forms/Setup.vue
index efbed611..c1302241 100644
--- a/frontend/src/forms/Setup.vue
+++ b/frontend/src/forms/Setup.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="container col-md-7 col-sm-12 mt-2 sm-container">
         <div class="col-12 col-md-8 offset-md-2 mb-4">
-            <img class="col-12 mt-5 mt-md-0" src="/public/banner.png">
+            <img class="col-12 mt-5 mt-md-0" src="/banner.png">
         </div>
 
         <div class="col-12">
@@ -96,7 +96,7 @@
 </template>
 
 <script>
-  import Api from "../components/API";
+  import Api from "../API";
   import Index from "../pages/Index";
 
   export default {
diff --git a/frontend/src/forms/ToggleSwitch.vue b/frontend/src/forms/ToggleSwitch.vue
index 8d6fdabd..d1aaf456 100644
--- a/frontend/src/forms/ToggleSwitch.vue
+++ b/frontend/src/forms/ToggleSwitch.vue
@@ -5,39 +5,39 @@
 <script>
 
   export default {
-  name: 'ToggleSwitch',
-  props: {
-    service: {
-      type: Object,
-      required: true
-    }
-  },
-  data () {
-    return {
-        icon: "toggle-on",
-      running: true
-    }
-  },
-  mounted() {
-    if (this.service.online) {
-      this.running = true
-      this.icon = "toggle-on"
-    } else {
-      this.running = false
-      this.icon = "toggle-off"
-    }
-  },
-  methods: {
-    toggleChecking() {
-      if (this.running) {
-        this.icon = "toggle-off"
-      } else {
-        this.icon = "toggle-on"
+      name: 'ToggleSwitch',
+      props: {
+          service: {
+              type: Object,
+              required: true
+          }
+      },
+      data() {
+          return {
+              icon: "toggle-on",
+              running: true
+          }
+      },
+      mounted() {
+          if (this.service.online) {
+              this.running = true
+              this.icon = "toggle-on"
+          } else {
+              this.running = false
+              this.icon = "toggle-off"
+          }
+      },
+      methods: {
+          toggleChecking() {
+              if (this.running) {
+                  this.icon = "toggle-off"
+              } else {
+                  this.icon = "toggle-on"
+              }
+              this.running = !this.running
+          },
       }
-      this.running = !this.running
-    },
   }
-}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/frontend/src/forms/User.vue b/frontend/src/forms/User.vue
index bf45168e..59f7ffdf 100644
--- a/frontend/src/forms/User.vue
+++ b/frontend/src/forms/User.vue
@@ -55,7 +55,7 @@
 </template>
 
 <script>
-  import Api from "../components/API";
+  import Api from "../API";
 
   export default {
   name: 'FormUser',
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 1234b325..ea0b4645 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -12,7 +12,6 @@ import "./icons"
 Vue.component('apexchart', VueApexCharts)
 
 Vue.use(VueRouter);
-Vue.use(require('vue-moment'));
 
 Vue.config.productionTip = false
 new Vue({
diff --git a/frontend/src/mixin.js b/frontend/src/mixin.js
index 514cbb8b..27301f09 100644
--- a/frontend/src/mixin.js
+++ b/frontend/src/mixin.js
@@ -1,45 +1,51 @@
 import Vue from "vue";
+const { zonedTimeToUtc, utcToZonedTime, subSeconds, parse, parseISO, getUnixTime, fromUnixTime, format, differenceInSeconds, formatDistanceToNow, formatDistance } = require('date-fns')
 
 export default Vue.mixin({
   methods: {
     now() {
-      return Math.round(new Date().getTime() / 1000)
+      return new Date()
     },
-      current() {
-        return new Date()
-      },
-    ago(seconds) {
-      return this.now() - seconds
+    current() {
+      return parse(new Date())
+    },
+    utc(val) {
+      return fromUnixTime(this.toUnix(val) + val.getTimezoneOffset() * 60 * 1000)
+    },
+    ago(t1) {
+      return formatDistanceToNow(t1)
+    },
+    nowSubtract(seconds) {
+      return subSeconds(new Date(), seconds)
     },
     duration(t1, t2) {
-      const val = (this.toUnix(t1) - this.toUnix(t2))
-      if (val <= 59) {
-        return this.$moment.duration(val, 'seconds').get('seconds') + " seconds ago"
-      }
-      return this.$moment.duration(val, 'seconds').humanize();
+      return formatDistance(t1, t2)
     },
-      niceDate(val) {
-        return this.parseTime(val).format('LLLL')
-      },
-      parseTime(val) {
-          return this.$moment(val, this.$moment.ISO_8601, true)
-      },
-    toLocal(val, suf='at') {
-      return this.parseTime(val).local().format(`dddd, MMM Do \\${suf} h:mma`)
+    niceDate(val) {
+      return this.parseTime(val).format('LLLL')
+    },
+    parseTime(val) {
+      return parseISO(val)
+    },
+    toLocal(val, suf = 'at') {
+      const t = this.parseTime(val)
+      return format(t, `EEEE, MMM do h:mma`)
+    },
+    toUnix(val) {
+      return getUnixTime(val)
     },
-      toUnix(val) {
-         return this.$moment(val).utc().unix().valueOf()
-      },
     fromUnix(val) {
-      return this.$moment.unix(val).utc()
+      return fromUnixTime(val)
+    },
+    isBetween(t1, t2) {
+      return differenceInSeconds(parseISO(t1), parseISO(t2)) > 0
+    },
+    hour() {
+      return 3600
+    },
+    day() {
+      return 3600 * 24
     },
-      isBetween(t1, t2) {
-          const now = this.$moment(t1).utc().valueOf()
-          const sub = this.$moment(t2).utc().valueOf()
-          return (now - sub) > 0
-      },
-    hour(){ return 3600 },
-    day() { return 3600 * 24 },
     serviceLink(service) {
       if (!service) {
         return ""
@@ -53,10 +59,10 @@ export default Vue.mixin({
     isInt(n) {
       return n % 1 === 0;
     },
-      loggedIn() {
-          const core = this.$store.getters.core
-          return core.logged_in === true
-      },
+    loggedIn() {
+      const core = this.$store.getters.core
+      return core.logged_in === true
+    },
     iconName(name) {
       switch (name) {
         case "fas fa-terminal":
diff --git a/frontend/src/pages/Dashboard.vue b/frontend/src/pages/Dashboard.vue
index d1026633..7044bf8a 100644
--- a/frontend/src/pages/Dashboard.vue
+++ b/frontend/src/pages/Dashboard.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script>
-    import Api from "../components/API"
+    import Api from "../API"
   import TopNav from "../components/Dashboard/TopNav";
 
   export default {
diff --git a/frontend/src/pages/Index.vue b/frontend/src/pages/Index.vue
index 7546bcba..9bc5f13a 100644
--- a/frontend/src/pages/Index.vue
+++ b/frontend/src/pages/Index.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import Api from '../components/API';
+import Api from '../API';
 import Group from '../components/Index/Group';
 import Header from '../components/Index/Header';
 import MessageBlock from '../components/Index/MessageBlock';
@@ -30,36 +30,36 @@ import ServiceBlock from '../components/Service/ServiceBlock';
 
 
 export default {
-  name: 'Index',
-  components: {
-      ServiceBlock,
-      MessageBlock,
-      Group,
-      Header
-  },
-  data () {
-    return {
-        logged_in: false
-    }
-  },
-  async created() {
-      this.logged_in = this.loggedIn()
-  },
-  async mounted() {
+    name: 'Index',
+    components: {
+        ServiceBlock,
+        MessageBlock,
+        Group,
+        Header
+    },
+    data() {
+        return {
+            logged_in: false
+        }
+    },
+    async created() {
+        this.logged_in = this.loggedIn()
+    },
+    async mounted() {
 
-  },
-  methods: {
-      inRange(message) {
-          const start = this.isBetween(new Date(), message.start_on)
-          const end = this.isBetween(message.end_on, new Date())
-          return start && end
-      },
-    clickService(s) {
-      this.$nextTick(() => {
-        this.$refs.s.scrollTop = 0;
-      });
+    },
+    methods: {
+        inRange(message) {
+            const start = this.isBetween(new Date(), message.start_on)
+            const end = this.isBetween(message.end_on, new Date())
+            return start && end
+        },
+        clickService(s) {
+            this.$nextTick(() => {
+                this.$refs.s.scrollTop = 0;
+            });
+        }
     }
-  }
 }
 </script>
 
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 431d7553..aefe5917 100644
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-  import Api from "../components/API";
+  import Api from "../API";
   import FormLogin from '../forms/Login';
 
   export default {
diff --git a/frontend/src/pages/Logs.vue b/frontend/src/pages/Logs.vue
index 4c3c6b14..21d8b6b2 100644
--- a/frontend/src/pages/Logs.vue
+++ b/frontend/src/pages/Logs.vue
@@ -3,61 +3,55 @@
         <p v-if="logs.length === 0" class="text-monospace sm">
             Loading Logs...
         </p>
-        <p v-for="(log, index) in logs.reverse()" class="text-monospace sm">{{log}}</p>
+        <p v-for="(log, index) in logs" class="text-monospace sm">{{log}}</p>
     </div>
 </template>
 
 <script>
-    import Api from "../components/API";
+import Api from "../API";
 
 export default {
-  name: 'Logs',
-  components: {
-
-  },
-  data () {
-    return {
-        logs: [],
-        last: "",
-        t: null
-    }
-  },
-  created() {
-      if (!this.t) {
-          this.t = setInterval(() => {
-              this.lastLog()
-          }, 650)
-      }
-  },
-  async mounted() {
-      await this.getLogs()
-  },
+    name: 'Logs',
+    components: {},
+    data() {
+        return {
+            logs: [],
+            last: "",
+            t: null
+        }
+    },
+    async created() {
+        await this.getLogs()
+        if (!this.t) {
+            this.t = setInterval(async () => {
+                await this.lastLog()
+            }, 650)
+        }
+    },
     beforeDestroy() {
         clearInterval(this.t)
     },
     methods: {
-      cleanLog(l) {
-          const splitLog = l.split(": ")
-          const last = splitLog.slice(1);
-          return last.join(": ")
-      },
-    async getLogs() {
-        const logs = await Api.logs()
-        this.logs = logs.reverse()
-        this.last = this.cleanLog(this.logs[this.logs.length-1])
-    },
-      async lastLog() {
-          const log = await Api.logs_last()
-          const cleanLast = this.cleanLog(log)
-
-          if (this.last !== cleanLast) {
-              this.last = cleanLast
-              this.logs.reverse().push(log)
-          }
-
-      }
-
-  }
+        cleanLog(l) {
+            const splitLog = l.split(": ")
+            const last = splitLog.slice(1);
+            return last.join(": ")
+        },
+        async getLogs() {
+            const logs = await Api.logs()
+            const l = logs.reverse()
+            this.last = this.cleanLog(l[l.length - 1])
+            this.logs = l
+        },
+        async lastLog() {
+            const log = await Api.logs_last()
+            const cleanLast = this.cleanLog(log)
+            if (this.last !== cleanLast) {
+                this.last = cleanLast
+                this.logs.reverse().push(log)
+            }
+        }
+    }
 }
 </script>
 
diff --git a/frontend/src/pages/Service.vue b/frontend/src/pages/Service.vue
index adb00cd9..c35284c1 100644
--- a/frontend/src/pages/Service.vue
+++ b/frontend/src/pages/Service.vue
@@ -7,50 +7,37 @@
                 {{service.online ? "ONLINE" : "OFFLINE"}}
             </span>
 
-            <h4 class="mt-2"><router-link to="/">{{$store.getters.core.name}}</router-link> - {{service.name}}
+            <h4 class="mt-2">
+                <router-link to="/">{{$store.getters.core.name}}</router-link> - {{service.name}}
                 <span class="badge float-right d-none d-md-block" :class="{'bg-success': service.online, 'bg-danger': !service.online}">
                     {{service.online ? "ONLINE" : "OFFLINE"}}
                 </span>
             </h4>
 
-            <div class="row stats_area mt-5 mb-5">
-                <div class="col-4">
-                    <span class="lg_number">{{service.online_24_hours}}%</span>
-                    Online last 24 Hours
-                </div>
-                <div class="col-4">
-                    <span class="lg_number">31ms</span>
-                    Average Response
-                </div>
-                <div class="col-4">
-                    <span class="lg_number">85.70%</span>
-                    Total Uptime
-                </div>
-            </div>
+            <ServiceTopStats :service="service"/>
 
             <div v-for="(message, index) in messages" v-if="messageInRange(message)">
                 <MessageBlock :message="message"/>
             </div>
 
+            <div class="row mt-5 mb-4">
+                <span class="col-6 font-2">
+                    <flatPickr v-model="start_time" type="text" name="start_time" class="form-control form-control-plaintext" id="start_time" value="0001-01-01T00:00:00Z" required />
+                </span>
+                <span class="col-6 font-2">
+                    <flatPickr v-model="end_time" type="text" name="end_time" class="form-control form-control-plaintext" id="end_time" value="0001-01-01T00:00:00Z" required />
+                </span>
+            </div>
+
             <div v-if="series" class="service-chart-container">
                 <apexchart width="100%" height="420" type="area" :options="chartOptions" :series="series"></apexchart>
             </div>
 
-            <div v-if="series" class="service-chart-heatmap">
-                <apexchart width="100%" height="215" type="heatmap" :options="chartOptions" :series="series"></apexchart>
+            <div class="service-chart-heatmap mt-3 mb-4">
+                <ServiceHeatmap :service="service"/>
             </div>
 
-            <form id="service_date_form" class="col-12 mt-2 mb-3">
-                <input type="text" class="d-none" name="start" id="service_start" data-input>
-                <span data-toggle title="toggle" id="start_date" class="text-muted small float-left pointer mt-2">Thu, 09 Jan 2020 to Thu, 16 Jan 2020</span>
-                <button type="submit" class="btn btn-light btn-sm mt-2">Set Timeframe</button>
-                <input type="text" class="d-none" name="end" id="service_end" data-input>
-
-                <div id="start_container"></div>
-                <div id="end_container"></div>
-            </form>
-
-            <nav class="nav nav-pills flex-column flex-sm-row mt-3" id="service_tabs">
+            <nav v-if="service.failures" class="nav nav-pills flex-column flex-sm-row mt-3" id="service_tabs">
                 <a @click="tab='failures'" class="flex-sm-fill text-sm-center nav-link active">Failures</a>
                 <a @click="tab='incidents'" class="flex-sm-fill text-sm-center nav-link">Incidents</a>
                 <a @click="tab='checkins'" v-if="$store.getters.token" class="flex-sm-fill text-sm-center nav-link">Checkins</a>
@@ -58,7 +45,7 @@
             </nav>
 
 
-            <div class="tab-content">
+            <div v-if="service.failures" class="tab-content">
                 <div class="tab-pane fade active show">
                     <ServiceFailures :service="service"/>
                 </div>
@@ -98,10 +85,14 @@
 </template>
 
 <script>
-  import Api from "../components/API"
+  import Api from "../API"
   import MessageBlock from '../components/Index/MessageBlock';
   import ServiceFailures from '../components/Service/ServiceFailures';
   import Checkin from "../forms/Checkin";
+  import ServiceHeatmap from "@/components/Service/ServiceHeatmap";
+  import ServiceTopStats from "@/components/Service/ServiceTopStats";
+  import flatPickr from 'vue-flatpickr-component';
+  import 'flatpickr/dist/flatpickr.css';
 
   const axisOptions = {
     labels: {
@@ -128,143 +119,145 @@
   };
 
 export default {
-  name: 'Service',
-  components: {
-      ServiceFailures,
-      MessageBlock,
-    Checkin
-  },
-  data () {
-    return {
-      id: null,
-      tab: "failures",
-      service: {},
-      authenticated: false,
-      ready: false,
-      data: null,
-        messages: [],
-      failures: [],
-      chartOptions: {
-        chart: {
-          height: 500,
-          width: "100%",
-          type: "area",
-          animations: {
-            enabled: true,
-            initialAnimation: {
-              enabled: true
-            }
-          },
-          selection: {
-            enabled: false
-          },
-          zoom: {
-            enabled: false
-          },
-          toolbar: {
-            show: false
-          },
-        },
-        grid: {
-          show: true,
-          padding: {
-            top: 0,
-            right: 0,
-            bottom: 0,
-            left: 0,
-          }
-        },
-        xaxis: {
-          type: "datetime",
-          ...axisOptions
-        },
-        yaxis: {
-          ...axisOptions
-        },
-        tooltip: {
-          enabled: false,
-          marker: {
-            show: false,
-          },
-          x: {
-            show: false,
-          }
-        },
-        legend: {
-          show: false,
-        },
-        dataLabels: {
-          enabled: false
-        },
-        floating: true,
-        axisTicks: {
-          show: false
-        },
-        axisBorder: {
-          show: false
-        },
-        fill: {
-          colors: ["#48d338"],
-          opacity: 1,
-          type: 'solid'
-        },
-        stroke: {
-          show: true,
-          curve: 'smooth',
-          lineCap: 'butt',
-          colors: ["#3aa82d"],
+    name: 'Service',
+    components: {
+        ServiceTopStats,
+        ServiceHeatmap,
+        ServiceFailures,
+        MessageBlock,
+        Checkin,
+        flatPickr
+    },
+    data() {
+        return {
+            id: null,
+            tab: "failures",
+            service: {},
+            authenticated: false,
+            ready: false,
+            data: null,
+            messages: [],
+            failures: [],
+            start_time: "",
+            end_time: "",
+            chartOptions: {
+                chart: {
+                    height: 500,
+                    width: "100%",
+                    type: "area",
+                    animations: {
+                        enabled: true,
+                        initialAnimation: {
+                            enabled: true
+                        }
+                    },
+                    selection: {
+                        enabled: false
+                    },
+                    zoom: {
+                        enabled: false
+                    },
+                    toolbar: {
+                        show: false
+                    },
+                },
+                grid: {
+                    show: true,
+                    padding: {
+                        top: 0,
+                        right: 0,
+                        bottom: 0,
+                        left: 0,
+                    }
+                },
+                xaxis: {
+                    type: "datetime",
+                    ...axisOptions
+                },
+                yaxis: {
+                    ...axisOptions
+                },
+                tooltip: {
+                    enabled: false,
+                    marker: {
+                        show: false,
+                    },
+                    x: {
+                        show: false,
+                    }
+                },
+                legend: {
+                    show: false,
+                },
+                dataLabels: {
+                    enabled: false
+                },
+                floating: true,
+                axisTicks: {
+                    show: false
+                },
+                axisBorder: {
+                    show: false
+                },
+                fill: {
+                    colors: ["#48d338"],
+                    opacity: 1,
+                    type: 'solid'
+                },
+                stroke: {
+                    show: true,
+                    curve: 'smooth',
+                    lineCap: 'butt',
+                    colors: ["#3aa82d"],
+                }
+            },
+            series: [{
+                data: []
+            }],
+            heatmap_data: [],
+            config: {
+                enableTime: true
+            },
         }
-      },
-      series: [{
-        data: []
-      }],
-        heatmap_data: []
-    }
-  },
+    },
     async mounted() {
-      const id = this.$attrs.id
+        const id = this.$attrs.id
         this.id = id
-      let service;
-      if (this.isInt(id)) {
-        service = this.$store.getters.serviceById(id)
-      } else {
-        service = this.$store.getters.serviceByPermalink(id)
-      }
+        let service;
+        if (this.isInt(id)) {
+            service = this.$store.getters.serviceById(id)
+        } else {
+            service = this.$store.getters.serviceByPermalink(id)
+        }
         this.service = service
         this.getService(service)
         this.messages = this.$store.getters.serviceMessages(service.id)
     },
-  methods: {
-      messageInRange(message) {
-          const start = this.isBetween(new Date(), message.start_on)
-          const end = this.isBetween(message.end_on, new Date())
-          return start && end
-      },
-    async getService(s) {
-        await this.chartHits()
-        await this.heatmapData()
-        await this.serviceFailures()
-    },
-    async serviceFailures() {
-      this.failures = await Api.service_failures(this.service.id, this.now() - 3600, this.now(), 15)
-    },
-    async chartHits() {
-      this.data = await Api.service_hits(this.service.id, 0, 99999999999, "hour")
-      this.series = [{
-        name: this.service.name,
-        ...this.data
-      }]
-      this.ready = true
-    },
-      async heatmapData() {
-          this.data = await Api.service_heatmap(this.service.id, 0, 99999999999, "hour")
-          this.series = [{
-              name: this.service.name,
-              ...this.data
-          }]
-          this.ready = true
-      }
-  }
+    methods: {
+        messageInRange(message) {
+            const start = this.isBetween(new Date(), message.start_on)
+            const end = this.isBetween(message.end_on, new Date())
+            return start && end
+        },
+        async getService(s) {
+            await this.chartHits()
+            await this.serviceFailures()
+        },
+        async serviceFailures() {
+            this.failures = await Api.service_failures(this.service.id, this.now() - 3600, this.now(), 15)
+        },
+        async chartHits() {
+            const start = this.nowSubtract((3600 * 24) * 7)
+            this.start_time = start
+            this.end_time = new Date()
+            this.data = await Api.service_hits(this.service.id, this.toUnix(start), this.toUnix(new Date()), "hour")
+            this.series = [{
+                name: this.service.name,
+                ...this.data
+            }]
+            this.ready = true
+        }
+    }
 }
 </script>
 
diff --git a/frontend/src/pages/Settings.vue b/frontend/src/pages/Settings.vue
index 8c97aa94..6772ac20 100644
--- a/frontend/src/pages/Settings.vue
+++ b/frontend/src/pages/Settings.vue
@@ -42,7 +42,7 @@
                                 <div class="row align-content-center">
                                     <img class="rounded text-center" width="300" height="300" :src="qrcode">
                                 </div>
-                                <a class="btn btn-sm btn-primary" href=statping://setup?domain&#61;https://demo.statping.com&amp;api&#61;6b05b48f4b3a1460f3864c31b26cab6a27dbaff9>Open in Statping App</a>
+                                <a class="btn btn-sm btn-primary" :href="qrurl">Open in Statping App</a>
                                 <a href="settings/export" class="btn btn-sm btn-secondary">Export Settings</a>
                             </div>
                         </div>
@@ -53,32 +53,11 @@
                     </div>
 
                     <div class="tab-pane fade" v-bind:class="{active: liClass('v-pills-style-tab'), show: liClass('v-pills-style-tab')}" id="v-pills-style" role="tabpanel" aria-labelledby="v-pills-style-tab">
-
                         <ThemeEditor :core="core"/>
-
                     </div>
 
                     <div class="tab-pane fade" v-bind:class="{active: liClass('v-pills-cache-tab'), show: liClass('v-pills-cache-tab')}" id="v-pills-cache" role="tabpanel" aria-labelledby="v-pills-cache-tab">
-                        <h3>Cache</h3>
-                        <table class="table">
-                            <thead>
-                            <tr>
-                                <th scope="col">URL</th>
-                                <th scope="col">Size</th>
-                                <th scope="col">Expiration</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-
-                            <tr v-for="(cache, index) in cache">
-                                <td>{{cache.url}}</td>
-                                <td>{{cache.size}}</td>
-                                <td>{{expireTime(cache.expiration)}}</td>
-                            </tr>
-
-                            </tbody>
-                        </table>
-                        <a @click.prevent="clearCache" href="#" class="btn btn-danger btn-block">Clear Cache</a>
+                        <Cache/>
                     </div>
 
                     <div v-for="(notifier, index) in $store.getters.notifiers" v-bind:key="`${notifier.title}_${index}`" class="tab-pane fade" v-bind:class="{active: liClass(`v-pills-${notifier.method.toLowerCase()}-tab`), show: liClass(`v-pills-${notifier.method.toLowerCase()}-tab`)}" v-bind:id="`v-pills-${notifier.method.toLowerCase()}-tab`" role="tabpanel" v-bind:aria-labelledby="`v-pills-${notifier.method.toLowerCase()}-tab`">
@@ -97,54 +76,50 @@
 </template>
 
 <script>
-  import Api from '../components/API';
+  import Api from '../API';
   import CoreSettings from '../forms/CoreSettings';
   import FormIntegration from '../forms/Integration';
   import Notifier from "../forms/Notifier";
   import ThemeEditor from "../components/Dashboard/ThemeEditor";
+  import Cache from "@/components/Dashboard/Cache";
 
   export default {
-  name: 'Settings',
-  components: {
-    ThemeEditor,
-      FormIntegration,
-    Notifier,
-    CoreSettings
-  },
-  data () {
-    return {
-      tab: "v-pills-home-tab",
-      qrcode: "",
-      core: this.$store.getters.core,
-    cache: [],
-    }
-  },
-      async mounted () {
+      name: 'Settings',
+      components: {
+          Cache,
+          ThemeEditor,
+          FormIntegration,
+          Notifier,
+          CoreSettings
+      },
+      data() {
+          return {
+              tab: "v-pills-home-tab",
+              qrcode: "",
+              qrurl: "",
+              core: this.$store.getters.core
+          }
+      },
+      async mounted() {
           this.cache = await Api.cache()
       },
       async created() {
-    const qrurl = `statping://setup?domain=${core.domain}&api=${core.api_secret}`
-    this.qrcode = "https://chart.googleapis.com/chart?chs=500x500&cht=qr&chl=" + encodeURI(qrurl)
-  },
-  beforeMount() {
+          const c = this.$store.getters.core
+          this.qrurl = `statping://setup?domain=${c.domain}&api=${c.api_secret}`
+          this.qrcode = "https://chart.googleapis.com/chart?chs=500x500&cht=qr&chl=" + encodeURI(this.qrurl)
+      },
+      beforeMount() {
 
-  },
-  methods: {
-    changeTab (e) {
-      this.tab = e.target.id
-    },
-    liClass (id) {
-      return this.tab === id
-    },
-    expireTime(ex) {
-      return this.toLocal(ex)
-    },
-      async clearCache () {
-          await Api.clearCache()
-          this.cache = await Api.cache()
-     }
+      },
+      methods: {
+          changeTab(e) {
+              this.tab = e.target.id
+          },
+          liClass(id) {
+              return this.tab === id
+          }
+      }
   }
-}
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
diff --git a/frontend/src/routes.js b/frontend/src/routes.js
index 9d25d789..dacca2b4 100644
--- a/frontend/src/routes.js
+++ b/frontend/src/routes.js
@@ -13,7 +13,7 @@ import Service from "./pages/Service";
 import VueRouter from "vue-router";
 import Setup from "./forms/Setup";
 
-import Api from "./components/API";
+import Api from "./API";
 
 const routes = [
   {
diff --git a/frontend/src/store.js b/frontend/src/store.js
index ba6ce774..57805f15 100644
--- a/frontend/src/store.js
+++ b/frontend/src/store.js
@@ -1,6 +1,6 @@
 import Vuex from 'vuex'
 import Vue from 'vue'
-import Api from "./components/API"
+import Api from "./API"
 
 Vue.use(Vuex)
 
@@ -105,7 +105,7 @@ export default new Vuex.Store({
         }
     },
     actions: {
-        async loadRequired (context) {
+        async loadRequired(context) {
             const core = await Api.core()
             context.commit("setCore", core);
             const groups = await Api.groups()
@@ -125,7 +125,7 @@ export default new Vuex.Store({
             // }
             window.console.log('finished loading required data')
         },
-        async loadAdmin (context) {
+        async loadAdmin(context) {
             const core = await Api.core()
             context.commit("setCore", core);
             const groups = await Api.groups()
diff --git a/frontend/test/API.spec.js b/frontend/test/API.spec.js
new file mode 100644
index 00000000..2bbc4bbb
--- /dev/null
+++ b/frontend/test/API.spec.js
@@ -0,0 +1,16 @@
+import API from "@/API"
+import { shallowMount, mount } from '@vue/test-utils'
+
+describe('API Tests', async () => {
+
+   await it('should get core info', async () => {
+
+       const wrapper = mount(API)
+
+        const core = await wrapper.core()
+        expect(core).toBe(9)
+
+
+    })
+
+});
\ No newline at end of file
diff --git a/frontend/test/Store.spec.js b/frontend/test/Store.spec.js
new file mode 100644
index 00000000..2df8ba0f
--- /dev/null
+++ b/frontend/test/Store.spec.js
@@ -0,0 +1,24 @@
+// import Vuex from 'vuex'
+// import Api from '../src/components/API'
+// import thisStore from '../src/store'
+//
+// import { createLocalVue } from '@vue/test-utils'
+
+// const localVue = createLocalVue()
+// localVue.use(Vuex)
+//
+// describe('MyName test', async () => {
+//     const services = [
+//         { id: 1, title: 'Apple', order_id: 3 },
+//         { id: 2, title: 'Orange', order_id: 2},
+//         { id: 3, title: 'Carrot', order_id: 1}
+//     ]
+//
+//     const store = new Vuex.Store(thisStore)
+//
+//     await store.dispatch('loadRequired')
+//
+//     console.log(store.getters.services)
+//
+//     expect(store.getters.services).toEqual(services.slice(0, 20))
+// })
\ No newline at end of file
diff --git a/frontend/test/forms/Login.spec.js b/frontend/test/forms/Login.spec.js
new file mode 100644
index 00000000..6bd5a9f7
--- /dev/null
+++ b/frontend/test/forms/Login.spec.js
@@ -0,0 +1,32 @@
+import { shallowMount, mount } from '@vue/test-utils'
+
+import FormLogin from "../../src/forms/Login.vue"
+
+const wrapper = shallowMount(FormLogin)
+
+describe('Login Form', () => {
+
+    it('has a created hook', () => {
+        expect(typeof FormLogin.methods.checkForm).toBe('function')
+    })
+
+    it('should login', async () => {
+
+        expect(wrapper.vm.$data.loading).toBe(false)
+
+        expect(wrapper.vm.$data.username).toBe('')
+        expect(wrapper.vm.$data.password).toBe('')
+
+        wrapper.setData({ username: 'admin' })
+        wrapper.setData({ password: 'admin' })
+
+        wrapper.find('button').trigger('click')
+
+        await wrapper.vm.$nextTick()
+
+        expect(wrapper.vm.$data.loading).toBe(true)
+        done()
+
+    })
+
+});
\ No newline at end of file
diff --git a/frontend/test/pages/Index.spec.js b/frontend/test/pages/Index.spec.js
new file mode 100644
index 00000000..8f0e1f07
--- /dev/null
+++ b/frontend/test/pages/Index.spec.js
@@ -0,0 +1,17 @@
+// import { mount } from '@vue/test-utils';
+// import Index from '../../src/pages/Index';
+//
+// const wrapper = mount(Index);
+
+// describe('MyName test', () => {
+//     it('Displays my name when I write it', () => {
+//
+//         expect(wrapper.vm.$data.logged_in).toBe('My name');
+//
+//         const input = wrapper.find('input');
+//         input.element.value = 'Stefan';
+//         input.trigger('input');
+//
+//         expect(wrapper.vm.$data.name).toBe('Stefan');
+//     })
+// });
\ No newline at end of file
diff --git a/frontend/test/setup.js b/frontend/test/setup.js
new file mode 100644
index 00000000..374cdab4
--- /dev/null
+++ b/frontend/test/setup.js
@@ -0,0 +1,5 @@
+require('jsdom-global')()
+
+global.expect = require('expect')
+
+
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 9922eda1..b07aa202 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -18,7 +18,7 @@
     invariant "^2.2.4"
     semver "^5.5.0"
 
-"@babel/core@^7.8.4":
+"@babel/core@^7.1.0", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz#d496799e5c12195b3602d0fddd77294e3e38e80e"
   integrity sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==
@@ -273,7 +273,7 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.8.3", "@babel/parser@^7.8.4":
+"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.7.5", "@babel/parser@^7.8.3", "@babel/parser@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz#d1dbe64691d60358a974295fa53da074dd2ce8e8"
   integrity sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==
@@ -802,7 +802,7 @@
   dependencies:
     regenerator-runtime "^0.13.2"
 
-"@babel/template@^7.2.2", "@babel/template@^7.8.3":
+"@babel/template@^7.2.2", "@babel/template@^7.7.4", "@babel/template@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz#e02ad04fe262a657809327f578056ca15fd4d1b8"
   integrity sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==
@@ -811,7 +811,7 @@
     "@babel/parser" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.2.2", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4":
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.2.2", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz#f0845822365f9d5b0e312ed3959d3f827f869e3c"
   integrity sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==
@@ -835,6 +835,14 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
+"@cnakazawa/watch@^1.0.3":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz#f864ae85004d0fcab6f50be9141c4da368d1656a"
+  integrity sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==
+  dependencies:
+    exec-sh "^0.3.2"
+    minimist "^1.2.0"
+
 "@fortawesome/fontawesome-common-types@^0.1.2-1":
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.7.tgz#4336c4b06d0b5608ff1215464b66fcf9f4795284"
@@ -910,6 +918,153 @@
   dependencies:
     "@hapi/hoek" "^8.3.0"
 
+"@istanbuljs/load-nyc-config@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b"
+  integrity sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==
+  dependencies:
+    camelcase "^5.3.1"
+    find-up "^4.1.0"
+    js-yaml "^3.13.1"
+    resolve-from "^5.0.0"
+
+"@istanbuljs/schema@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
+  integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
+
+"@jest/console@^25.1.0":
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-25.1.0.tgz#1fc765d44a1e11aec5029c08e798246bd37075ab"
+  integrity sha512-3P1DpqAMK/L07ag/Y9/Jup5iDEG9P4pRAuZiMQnU0JB3UOvCyYCjCoxr7sIA80SeyUCUKrr24fKAxVpmBgQonA==
+  dependencies:
+    "@jest/source-map" "^25.1.0"
+    chalk "^3.0.0"
+    jest-util "^25.1.0"
+    slash "^3.0.0"
+
+"@jest/source-map@^25.1.0":
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-25.1.0.tgz#b012e6c469ccdbc379413f5c1b1ffb7ba7034fb0"
+  integrity sha512-ohf2iKT0xnLWcIUhL6U6QN+CwFWf9XnrM2a6ybL9NXxJjgYijjLSitkYHIdzkd8wFliH73qj/+epIpTiWjRtAA==
+  dependencies:
+    callsites "^3.0.0"
+    graceful-fs "^4.2.3"
+    source-map "^0.6.0"
+
+"@jest/test-result@^25.1.0":
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-25.1.0.tgz#847af2972c1df9822a8200457e64be4ff62821f7"
+  integrity sha512-FZzSo36h++U93vNWZ0KgvlNuZ9pnDnztvaM7P/UcTx87aPDotG18bXifkf1Ji44B7k/eIatmMzkBapnAzjkJkg==
+  dependencies:
+    "@jest/console" "^25.1.0"
+    "@jest/transform" "^25.1.0"
+    "@jest/types" "^25.1.0"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    collect-v8-coverage "^1.0.0"
+
+"@jest/transform@^25.1.0":
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-25.1.0.tgz#221f354f512b4628d88ce776d5b9e601028ea9da"
+  integrity sha512-4ktrQ2TPREVeM+KxB4zskAT84SnmG1vaz4S+51aTefyqn3zocZUnliLLm5Fsl85I3p/kFPN4CRp1RElIfXGegQ==
+  dependencies:
+    "@babel/core" "^7.1.0"
+    "@jest/types" "^25.1.0"
+    babel-plugin-istanbul "^6.0.0"
+    chalk "^3.0.0"
+    convert-source-map "^1.4.0"
+    fast-json-stable-stringify "^2.0.0"
+    graceful-fs "^4.2.3"
+    jest-haste-map "^25.1.0"
+    jest-regex-util "^25.1.0"
+    jest-util "^25.1.0"
+    micromatch "^4.0.2"
+    pirates "^4.0.1"
+    realpath-native "^1.1.0"
+    slash "^3.0.0"
+    source-map "^0.6.1"
+    write-file-atomic "^3.0.0"
+
+"@jest/types@^25.1.0":
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.1.0.tgz#b26831916f0d7c381e11dbb5e103a72aed1b4395"
+  integrity sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==
+  dependencies:
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^1.1.1"
+    "@types/yargs" "^15.0.0"
+    chalk "^3.0.0"
+
+"@nodelib/fs.scandir@2.1.3":
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
+  integrity sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.3"
+    run-parallel "^1.1.9"
+
+"@nodelib/fs.stat@2.0.3", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz#34dc5f4cabbc720f4e60f75a747e7ecd6c175bd3"
+  integrity sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==
+
+"@nodelib/fs.walk@^1.2.3":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz#011b9202a70a6366e436ca5c065844528ab04976"
+  integrity sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==
+  dependencies:
+    "@nodelib/fs.scandir" "2.1.3"
+    fastq "^1.6.0"
+
+"@types/color-name@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
+  integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==
+
+"@types/events@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
+"@types/glob@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+  integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
+  dependencies:
+    "@types/events" "*"
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
+  integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
+
+"@types/istanbul-lib-report@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
+  integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+
+"@types/istanbul-reports@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
+  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
+  dependencies:
+    "@types/istanbul-lib-coverage" "*"
+    "@types/istanbul-lib-report" "*"
+
+"@types/minimatch@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
+
+"@types/node@*":
+  version "13.7.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.2.tgz#50375b95b5845a34efda2ffb3a087c7becbc46c6"
+  integrity sha512-uvilvAQbdJvnSBFcKJ2td4016urcGvsiR+N4dHGU87ml8O2Vl6l+ErOi9w0kXSPiwJ1AYlIW+0pDXDWWMOiWbw==
+
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
@@ -920,6 +1075,23 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8"
   integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==
 
+"@types/stack-utils@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
+  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+
+"@types/yargs-parser@*":
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
+  integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
+
+"@types/yargs@^15.0.0":
+  version "15.0.3"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.3.tgz#41453a0bc7ab393e995d1f5451455638edbd2baf"
+  integrity sha512-XCMQRK6kfpNBixHLyHUsGmXrpEmFFxzMrcnSXFMziHd8CoNJo8l16FkHyQq4x+xbM7E2XL83/O78OD8u+iZTdQ==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 "@vue/babel-helper-vue-jsx-merge-props@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz#048fe579958da408fb7a8b2a3ec050b50a661040"
@@ -1051,6 +1223,15 @@
     source-map "~0.6.1"
     vue-template-es2015-compiler "^1.9.0"
 
+"@vue/test-utils@^1.0.0-beta.31":
+  version "1.0.0-beta.31"
+  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.0-beta.31.tgz#580d6e45f07452e497d69807d80986e713949b73"
+  integrity sha512-IlhSx5hyEVnbvDZ3P98R1jNmy88QAd/y66Upn4EcvxSD5D4hwOutl3dIdfmSTSXs4b9DIMDnEVjX7t00cvOnvg==
+  dependencies:
+    dom-event-types "^1.0.0"
+    lodash "^4.17.15"
+    pretty "^2.0.0"
+
 "@webassemblyjs/ast@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
@@ -1207,6 +1388,11 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
+abab@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz#623e2075e02eb2d3f2475e49f99c91846467907a"
+  integrity sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==
+
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -1225,21 +1411,34 @@ acorn-dynamic-import@^4.0.0:
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
+acorn-globals@^4.3.4:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
+  integrity sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==
+  dependencies:
+    acorn "^6.0.1"
+    acorn-walk "^6.0.1"
+
 acorn-jsx@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
   integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
 
-acorn-walk@^6.1.1:
+acorn-walk@^6.0.1, acorn-walk@^6.1.1:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
   integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
 
-acorn@^6.0.2, acorn@^6.0.5, acorn@^6.0.7, acorn@^6.2.1:
+acorn@^6.0.1, acorn@^6.0.2, acorn@^6.0.5, acorn@^6.0.7, acorn@^6.2.1:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
   integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
 
+acorn@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
+  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
+
 ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
@@ -1270,6 +1469,11 @@ amdefine@>=0.0.4:
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
   integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
+ansi-colors@3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813"
+  integrity sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==
+
 ansi-colors@^3.0.0:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
@@ -1317,6 +1521,14 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
+  integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
+  dependencies:
+    "@types/color-name" "^1.1.1"
+    color-convert "^2.0.1"
+
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1325,6 +1537,14 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
+anymatch@^3.0.3, anymatch@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
+  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 apexcharts@^3.15.0:
   version "3.15.6"
   resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.15.6.tgz#1716f8badd447b06796dbcd95b5e405ec676a3bf"
@@ -1394,6 +1614,11 @@ array-union@^1.0.1:
   dependencies:
     array-uniq "^1.0.1"
 
+array-union@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
+
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
@@ -1521,6 +1746,25 @@ babel-plugin-dynamic-import-node@^2.3.0:
   dependencies:
     object.assign "^4.1.0"
 
+babel-plugin-istanbul@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765"
+  integrity sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.0.0"
+    "@istanbuljs/load-nyc-config" "^1.0.0"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-instrument "^4.0.0"
+    test-exclude "^6.0.0"
+
+babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
@@ -1576,6 +1820,11 @@ binary-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
   integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
 
+binary-extensions@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
+  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
+
 bindings@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
@@ -1657,11 +1906,28 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+braces@^3.0.1, braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
+browser-process-hrtime@^0.1.2:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
+  integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
+
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
+
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
@@ -1730,6 +1996,13 @@ browserslist@^4.0.0, browserslist@^4.8.3, browserslist@^4.8.5:
     electron-to-chromium "^1.3.349"
     node-releases "^1.1.49"
 
+bser@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
+  dependencies:
+    node-int64 "^0.4.0"
+
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -1916,7 +2189,7 @@ camelcase@^4.1.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-camelcase@^5.0.0, camelcase@^5.2.0:
+camelcase@^5.0.0, camelcase@^5.2.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -1936,6 +2209,13 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001027:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001028.tgz#f2241242ac70e0fa9cda55c2776d32a0867971c2"
   integrity sha512-Vnrq+XMSHpT7E+LWoIYhs3Sne8h9lx9YJV3acH3THNCwU/9zV93/ta4xVfzTtnqd3rvnuVpVjE3DFqf56tr3aQ==
 
+capture-exit@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+  integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
+  dependencies:
+    rsvp "^4.8.4"
+
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
@@ -1961,6 +2241,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
@@ -1971,6 +2259,21 @@ check-types@^8.0.3:
   resolved "https://registry.yarnpkg.com/check-types/-/check-types-8.0.3.tgz#3356cca19c889544f2d7a95ed49ce508a0ecf552"
   integrity sha512-YpeKZngUmG65rLudJ4taU7VLkOCTMhNl/u4ctNC56LQS/zJTyNH0Lrtwm1tfTsbLlwvlfsA2d1c8vCf/Kh2KwQ==
 
+chokidar@3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
+  integrity sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==
+  dependencies:
+    anymatch "~3.1.1"
+    braces "~3.0.2"
+    glob-parent "~5.1.0"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.2.0"
+  optionalDependencies:
+    fsevents "~2.1.1"
+
 chokidar@^2.0.0, chokidar@^2.0.2:
   version "2.1.8"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
@@ -2002,6 +2305,11 @@ chrome-trace-event@^1.0.0, chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
+ci-info@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -2062,6 +2370,15 @@ cliui@^4.0.0:
     strip-ansi "^4.0.0"
     wrap-ansi "^2.0.0"
 
+cliui@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+  integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
+  dependencies:
+    string-width "^3.1.0"
+    strip-ansi "^5.2.0"
+    wrap-ansi "^5.1.0"
+
 clone-deep@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
@@ -2105,6 +2422,11 @@ codemirror@^5.41.0:
   resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.51.0.tgz#7746caaf5223e68f5c55ea11e2f3cc82a9a3929e"
   integrity sha512-vyuYYRv3eXL0SCuZA4spRFlKNzQAewHcipRQCOKgRy7VNAvZxTKzbItdbCl4S5AgPZ5g3WkHp+ibWQwv9TLG7Q==
 
+collect-v8-coverage@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.0.tgz#150ee634ac3650b71d9c985eb7f608942334feb1"
+  integrity sha512-VKIhJgvk8E1W28m5avZ2Gv2Ruv5YiF56ug2oclvaG9md69BuZImMG2sk9g7QNKLUbtYAKQjXjYxbYZVUlMMKmQ==
+
 collection-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
@@ -2120,12 +2442,19 @@ color-convert@^1.9.0, color-convert@^1.9.1:
   dependencies:
     color-name "1.1.3"
 
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@^1.0.0:
+color-name@^1.0.0, color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@@ -2153,7 +2482,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.18.0, commander@^2.20.0:
+commander@^2.18.0, commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2225,6 +2554,23 @@ concat-stream@^1.5.0:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+condense-newlines@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f"
+  integrity sha1-PemFVTE5R10yUCyDsC9gaE0kxV8=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-whitespace "^0.3.0"
+    kind-of "^3.0.2"
+
+config-chain@^1.1.12:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+  integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
 connect-history-api-fallback@^1.3.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
@@ -2269,7 +2615,7 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.1.0, convert-source-map@^1.7.0:
+convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -2311,7 +2657,7 @@ core-js-compat@^3.6.2, core-js-compat@^3.6.4:
     browserslist "^4.8.3"
     semver "7.0.0"
 
-core-js@^2.5.7:
+core-js@^2.4.0, core-js@^2.5.7:
   version "2.6.11"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
@@ -2568,6 +2914,23 @@ csso@^4.0.2:
   dependencies:
     css-tree "1.0.0-alpha.37"
 
+cssom@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
+  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
+
+cssom@~0.3.6:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
+
+cssstyle@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.2.0.tgz#e4c44debccd6b7911ed617a4395e5754bba59992"
+  integrity sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==
+  dependencies:
+    cssom "~0.3.6"
+
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -2587,6 +2950,20 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-urls@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
+  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
+  dependencies:
+    abab "^2.0.3"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.0.0"
+
+date-fns@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.9.0.tgz#d0b175a5c37ed5f17b97e2272bbc1fa5aec677d2"
+  integrity sha512-khbFLu/MlzLjEzy9Gh8oY1hNt/Dvxw3J6Rbc28cVoYWQaC1S3YI4xwkF9ZWcjDLscbZlY9hISMr66RFzZagLsA==
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
@@ -2599,6 +2976,13 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
+debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
+  dependencies:
+    ms "^2.1.1"
+
 debug@=3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -2606,13 +2990,6 @@ debug@=3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
-  integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
-  dependencies:
-    ms "^2.1.1"
-
 debug@^4.0.1, debug@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
@@ -2632,6 +3009,11 @@ decamelize@^2.0.0:
   dependencies:
     xregexp "4.0.0"
 
+decimal.js@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.0.tgz#39466113a9e036111d02f82489b5fd6b0b5ed231"
+  integrity sha512-vDPw+rDgn3bZe1+F/pyEwb1oMG2XTlRVgAa6B4KccTEpYgF8w6eQllVbQcfIJnZyvzFtFpxnpGtx8dd7DJp/Rw==
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -2753,6 +3135,16 @@ diff-match-patch@^1.0.0:
   resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1"
   integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg==
 
+diff-sequences@^25.1.0:
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.1.0.tgz#fd29a46f1c913fd66c22645dc75bffbe43051f32"
+  integrity sha512-nFIfVk5B/NStCsJ+zaPO4vYuLjlzQ6uFvPxzYyHlejNZ/UGa7G/n7peOXVrVNvRuyfstt+mZQYGpjxg9Z6N8Kw==
+
+diff@3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
+
 diffie-hellman@^5.0.0:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
@@ -2762,6 +3154,13 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+dir-glob@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+  dependencies:
+    path-type "^4.0.0"
+
 dns-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
@@ -2804,6 +3203,11 @@ dom-converter@^0.2:
   dependencies:
     utila "~0.4"
 
+dom-event-types@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/dom-event-types/-/dom-event-types-1.0.0.tgz#5830a0a29e1bf837fe50a70cd80a597232813cae"
+  integrity sha512-2G2Vwi2zXTHBGqXHsJ4+ak/iP0N8Ar+G8a7LiD2oup5o4sQWytwqqrZu/O6hIMV0KMID2PL69OhpshLO0n7UJQ==
+
 dom-serializer@0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
@@ -2827,6 +3231,13 @@ domelementtype@^2.0.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
   integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
 
+domexception@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
+  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
+  dependencies:
+    webidl-conversions "^5.0.0"
+
 domhandler@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
@@ -2885,6 +3296,16 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
+editorconfig@^0.15.3:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
+  integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
+  dependencies:
+    commander "^2.19.0"
+    lru-cache "^4.1.5"
+    semver "^5.6.0"
+    sigmund "^1.0.1"
+
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -3006,11 +3427,23 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
+escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escodegen@^1.13.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457"
+  integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==
+  dependencies:
+    esprima "^4.0.1"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    optionator "^0.8.1"
+  optionalDependencies:
+    source-map "~0.6.1"
+
 eslint-config-standard@~10.2:
   version "10.2.1"
   resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-10.2.1.tgz#c061e4d066f379dc17cd562c64e819b4dd454591"
@@ -3185,7 +3618,7 @@ espree@^5.0.1:
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
-esprima@^4.0.0:
+esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -3204,7 +3637,7 @@ esrecurse@^4.1.0:
   dependencies:
     estraverse "^4.1.0"
 
-estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -3249,6 +3682,11 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
     md5.js "^1.3.4"
     safe-buffer "^5.1.1"
 
+exec-sh@^0.3.2:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz#3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"
+  integrity sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==
+
 execa@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.10.0.tgz#ff456a8f53f90f8eccc71a96d11bdfc7f082cb50"
@@ -3295,6 +3733,18 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
+expect@^25.1.0:
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-25.1.0.tgz#7e8d7b06a53f7d66ec927278db3304254ee683ee"
+  integrity sha512-wqHzuoapQkhc3OKPlrpetsfueuEiMf3iWh0R8+duCu9PIjXoP7HgD5aeypwTnXUAjC8aMsiVDaWwlbJ1RlQ38g==
+  dependencies:
+    "@jest/types" "^25.1.0"
+    ansi-styles "^4.0.0"
+    jest-get-type "^25.1.0"
+    jest-matcher-utils "^25.1.0"
+    jest-message-util "^25.1.0"
+    jest-regex-util "^25.1.0"
+
 express@^4.16.2, express@^4.16.3:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
@@ -3389,6 +3839,17 @@ fast-deep-equal@^3.1.1:
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
   integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==
 
+fast-glob@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.1.1.tgz#87ee30e9e9f3eb40d6f254a7997655da753d7c82"
+  integrity sha512-nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.0"
+    merge2 "^1.3.0"
+    micromatch "^4.0.2"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
@@ -3399,6 +3860,13 @@ fast-levenshtein@~2.0.6:
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fastq@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2"
+  integrity sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==
+  dependencies:
+    reusify "^1.0.0"
+
 faye-websocket@^0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
@@ -3413,6 +3881,13 @@ faye-websocket@~0.11.1:
   dependencies:
     websocket-driver ">=0.5.1"
 
+fb-watchman@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
+  dependencies:
+    bser "2.1.1"
+
 figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
@@ -3460,6 +3935,13 @@ fill-range@^4.0.0:
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
 
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
 finalhandler@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
@@ -3509,6 +3991,13 @@ find-cache-dir@^3.0.0:
     make-dir "^3.0.0"
     pkg-dir "^4.1.0"
 
+find-up@3.0.0, find-up@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+  dependencies:
+    locate-path "^3.0.0"
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -3524,14 +4013,7 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-find-up@^4.0.0:
+find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
@@ -3558,6 +4040,13 @@ flat-cache@^2.0.1:
     rimraf "2.6.3"
     write "1.0.3"
 
+flat@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-4.1.0.tgz#090bec8b05e39cba309747f1d588f04dbaf98db2"
+  integrity sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==
+  dependencies:
+    is-buffer "~2.0.3"
+
 flatpickr@^4.6.1:
   version "4.6.3"
   resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.3.tgz#15a8b76b6e34e3a072861250503a5995b9d3bc60"
@@ -3666,6 +4155,11 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
+fsevents@^2.1.2, fsevents@~2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805"
+  integrity sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==
+
 fstream@^1.0.0, fstream@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
@@ -3717,6 +4211,11 @@ get-caller-file@^1.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
@@ -3746,6 +4245,13 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+glob-parent@5.1.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
+  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -3754,6 +4260,18 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob@7.1.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  dependencies:
+    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@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
@@ -3791,6 +4309,20 @@ globals@^11.1.0, globals@^11.7.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+globby@^10.0.1:
+  version "10.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
+  integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==
+  dependencies:
+    "@types/glob" "^7.1.1"
+    array-union "^2.1.0"
+    dir-glob "^3.0.1"
+    fast-glob "^3.0.3"
+    glob "^7.1.3"
+    ignore "^5.1.1"
+    merge2 "^1.2.3"
+    slash "^3.0.0"
+
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -3811,11 +4343,16 @@ globule@^1.0.0:
     lodash "~4.17.12"
     minimatch "~3.0.2"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
+growl@1.10.5:
+  version "1.10.5"
+  resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
+  integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==
+
 gzip-size@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-5.1.1.tgz#cb9bee692f87c0612b232840a873904e4c135274"
@@ -3854,6 +4391,11 @@ has-flag@^3.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
 has-symbols@^1.0.0, has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
@@ -3923,7 +4465,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
-he@^1.1.0, he@^1.2.0:
+he@1.2.0, he@^1.1.0, he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -3984,6 +4526,13 @@ html-comment-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
   integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
 
+html-encoding-sniffer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.0.tgz#70b3b69bb5999f35d0d4495d79079f35630e71ae"
+  integrity sha512-Y9prnPKkM7FXxQevZ5UH8Z6aVTY0ede1tHquck5UxGmKWDshxXh95gSa2xXYjS8AsGO5iOvrCI5+GttRKnLdNA==
+  dependencies:
+    whatwg-encoding "^1.0.5"
+
 html-entities@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
@@ -4145,6 +4694,11 @@ ignore@^4.0.6:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
+ignore@^5.1.1:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
+  integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
+
 import-fresh@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
@@ -4251,7 +4805,7 @@ internal-ip@^3.0.1:
     default-gateway "^2.6.0"
     ipaddr.js "^1.5.2"
 
-interpret@^1.1.0:
+interpret@^1.1.0, interpret@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
   integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
@@ -4334,16 +4888,35 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
+is-buffer@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
+  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
+
 is-callable@^1.1.4, is-callable@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab"
   integrity sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==
 
+is-ci@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
+  dependencies:
+    ci-info "^2.0.0"
+
 is-color-stop@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
@@ -4439,7 +5012,7 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
   integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
@@ -4453,6 +5026,11 @@ is-number@^3.0.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 is-obj@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
@@ -4484,6 +5062,11 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   dependencies:
     isobject "^3.0.1"
 
+is-potential-custom-element-name@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
+  integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
+
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
@@ -4520,7 +5103,7 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.1"
 
-is-typedarray@~1.0.0:
+is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
@@ -4530,6 +5113,11 @@ is-utf8@^0.2.0:
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
   integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
+is-whitespace@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/is-whitespace/-/is-whitespace-0.3.0.tgz#1639ecb1be036aec69a54cbb401cfbed7114ab7f"
+  integrity sha1-Fjnssb4DauxppUy7QBz77XEUq38=
+
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -4567,11 +5155,125 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
+istanbul-lib-coverage@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
+  integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
+
+istanbul-lib-instrument@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz#61f13ac2c96cfefb076fe7131156cc05907874e6"
+  integrity sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==
+  dependencies:
+    "@babel/core" "^7.7.5"
+    "@babel/parser" "^7.7.5"
+    "@babel/template" "^7.7.4"
+    "@babel/traverse" "^7.7.4"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
+
+jest-diff@^25.1.0:
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.1.0.tgz#58b827e63edea1bc80c1de952b80cec9ac50e1ad"
+  integrity sha512-nepXgajT+h017APJTreSieh4zCqnSHEJ1iT8HDlewu630lSJ4Kjjr9KNzm+kzGwwcpsDE6Snx1GJGzzsefaEHw==
+  dependencies:
+    chalk "^3.0.0"
+    diff-sequences "^25.1.0"
+    jest-get-type "^25.1.0"
+    pretty-format "^25.1.0"
+
+jest-get-type@^25.1.0:
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.1.0.tgz#1cfe5fc34f148dc3a8a3b7275f6b9ce9e2e8a876"
+  integrity sha512-yWkBnT+5tMr8ANB6V+OjmrIJufHtCAqI5ic2H40v+tRqxDmE0PGnIiTyvRWFOMtmVHYpwRqyazDbTnhpjsGvLw==
+
+jest-haste-map@^25.1.0:
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-25.1.0.tgz#ae12163d284f19906260aa51fd405b5b2e5a4ad3"
+  integrity sha512-/2oYINIdnQZAqyWSn1GTku571aAfs8NxzSErGek65Iu5o8JYb+113bZysRMcC/pjE5v9w0Yz+ldbj9NxrFyPyw==
+  dependencies:
+    "@jest/types" "^25.1.0"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.3"
+    jest-serializer "^25.1.0"
+    jest-util "^25.1.0"
+    jest-worker "^25.1.0"
+    micromatch "^4.0.2"
+    sane "^4.0.3"
+    walker "^1.0.7"
+  optionalDependencies:
+    fsevents "^2.1.2"
+
+jest-matcher-utils@^25.1.0:
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.1.0.tgz#fa5996c45c7193a3c24e73066fc14acdee020220"
+  integrity sha512-KGOAFcSFbclXIFE7bS4C53iYobKI20ZWleAdAFun4W1Wz1Kkej8Ng6RRbhL8leaEvIOjGXhGf/a1JjO8bkxIWQ==
+  dependencies:
+    chalk "^3.0.0"
+    jest-diff "^25.1.0"
+    jest-get-type "^25.1.0"
+    pretty-format "^25.1.0"
+
+jest-message-util@^25.1.0:
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.1.0.tgz#702a9a5cb05c144b9aa73f06e17faa219389845e"
+  integrity sha512-Nr/Iwar2COfN22aCqX0kCVbXgn8IBm9nWf4xwGr5Olv/KZh0CZ32RKgZWMVDXGdOahicM10/fgjdimGNX/ttCQ==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    "@jest/test-result" "^25.1.0"
+    "@jest/types" "^25.1.0"
+    "@types/stack-utils" "^1.0.1"
+    chalk "^3.0.0"
+    micromatch "^4.0.2"
+    slash "^3.0.0"
+    stack-utils "^1.0.1"
+
+jest-regex-util@^25.1.0:
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.1.0.tgz#efaf75914267741838e01de24da07b2192d16d87"
+  integrity sha512-9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w==
+
+jest-serializer@^25.1.0:
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-25.1.0.tgz#73096ba90e07d19dec4a0c1dd89c355e2f129e5d"
+  integrity sha512-20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA==
+
+jest-util@^25.1.0:
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-25.1.0.tgz#7bc56f7b2abd534910e9fa252692f50624c897d9"
+  integrity sha512-7did6pLQ++87Qsj26Fs/TIwZMUFBXQ+4XXSodRNy3luch2DnRXsSnmpVtxxQ0Yd6WTipGpbhh2IFP1mq6/fQGw==
+  dependencies:
+    "@jest/types" "^25.1.0"
+    chalk "^3.0.0"
+    is-ci "^2.0.0"
+    mkdirp "^0.5.1"
+
+jest-worker@^25.1.0:
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz#75d038bad6fdf58eba0d2ec1835856c497e3907a"
+  integrity sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==
+  dependencies:
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
+
 js-base64@^2.1.8:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz#313b6274dda718f714d00b3330bbae6e38e90209"
   integrity sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==
 
+js-beautify@^1.6.12:
+  version "1.10.3"
+  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.10.3.tgz#c73fa10cf69d3dfa52d8ed624f23c64c0a6a94c1"
+  integrity sha512-wfk/IAWobz1TfApSdivH5PJ0miIHgDoYb1ugSqHcODPmaYu46rYe5FVuIEkhjg8IQiv6rDNPyhsqbsohI/C2vQ==
+  dependencies:
+    config-chain "^1.1.12"
+    editorconfig "^0.15.3"
+    glob "^7.1.3"
+    mkdirp "~0.5.1"
+    nopt "~4.0.1"
+
 js-message@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/js-message/-/js-message-1.0.5.tgz#2300d24b1af08e89dd095bc1a4c9c9cfcb892d15"
@@ -4589,7 +5291,7 @@ js-queue@2.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.13.0, js-yaml@^3.13.1:
+js-yaml@3.13.1, js-yaml@^3.13.0, js-yaml@^3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -4602,6 +5304,43 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
+jsdom-global@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/jsdom-global/-/jsdom-global-3.0.2.tgz#6bd299c13b0c4626b2da2c0393cd4385d606acb9"
+  integrity sha1-a9KZwTsMRiay2iwDk81DhdYGrLk=
+
+jsdom@^16.2.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.0.tgz#fc171c305635046c100708b1c7ea7820ba015164"
+  integrity sha512-6VaW3UWyKbm9DFVIAgTfhuwnvqiqlRYNg5Rk6dINTVoZT0eKz+N86vQZr+nqt1ny1lSB1TWZJWSEWQAfu8oTpA==
+  dependencies:
+    abab "^2.0.3"
+    acorn "^7.1.0"
+    acorn-globals "^4.3.4"
+    cssom "^0.4.4"
+    cssstyle "^2.2.0"
+    data-urls "^2.0.0"
+    decimal.js "^10.2.0"
+    domexception "^2.0.1"
+    escodegen "^1.13.0"
+    html-encoding-sniffer "^2.0.0"
+    is-potential-custom-element-name "^1.0.0"
+    nwsapi "^2.2.0"
+    parse5 "5.1.1"
+    request "^2.88.0"
+    request-promise-native "^1.0.8"
+    saxes "^4.0.2"
+    symbol-tree "^3.2.4"
+    tough-cookie "^3.0.1"
+    w3c-hr-time "^1.0.1"
+    w3c-xmlserializer "^2.0.0"
+    webidl-conversions "^5.0.0"
+    whatwg-encoding "^1.0.5"
+    whatwg-mimetype "^2.3.0"
+    whatwg-url "^8.0.0"
+    ws "^7.2.1"
+    xml-name-validator "^3.0.0"
+
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -4826,6 +5565,11 @@ lodash.memoize@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
+lodash.sortby@^4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+  integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
+
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -4836,7 +5580,7 @@ lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.1
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-log-symbols@^2.2.0:
+log-symbols@2.2.0, log-symbols@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
   integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
@@ -4868,7 +5612,7 @@ lower-case@^1.1.1:
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
   integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
-lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2:
+lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2, lru-cache@^4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -4905,6 +5649,13 @@ make-dir@^3.0.0:
   dependencies:
     semver "^6.0.0"
 
+makeerror@1.0.x:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+  integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
+  dependencies:
+    tmpl "1.0.x"
+
 mamacro@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
@@ -5006,6 +5757,16 @@ merge-source-map@^1.1.0:
   dependencies:
     source-map "^0.6.1"
 
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+merge2@^1.2.3, merge2@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
+  integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
+
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -5030,6 +5791,14 @@ micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, mic
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
+micromatch@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+  dependencies:
+    braces "^3.0.1"
+    picomatch "^2.0.5"
+
 miller-rabin@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -5089,7 +5858,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -5101,7 +5870,7 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.3, minimist@^1.2.0:
+minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
@@ -5153,7 +5922,60 @@ mkdirp@0.5.1, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkd
   dependencies:
     minimist "0.0.8"
 
-moment@^2.19.2, moment@^2.24.0:
+mocha@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.0.1.tgz#276186d35a4852f6249808c6dd4a1376cbf6c6ce"
+  integrity sha512-9eWmWTdHLXh72rGrdZjNbG3aa1/3NRPpul1z0D979QpEnFdCG0Q5tv834N+94QEN2cysfV72YocQ3fn87s70fg==
+  dependencies:
+    ansi-colors "3.2.3"
+    browser-stdout "1.3.1"
+    chokidar "3.3.0"
+    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.6"
+    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"
+
+mochapack@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/mochapack/-/mochapack-1.1.13.tgz#7803cd2d0a5a635da30011cd61ec531dee89699c"
+  integrity sha512-SQQn/0hsX5E3+tFxjmAm9ruEqLRYpnINssmul69PxnRdqxnNjs4UQvOQz1zTsoE7RfJl6FAprVjvMznZFIzytQ==
+  dependencies:
+    babel-runtime "^6.26.0"
+    chalk "^2.4.2"
+    chokidar "^2.0.0"
+    glob-parent "5.1.0"
+    globby "^10.0.1"
+    interpret "^1.2.0"
+    is-glob "^4.0.1"
+    loader-utils "^1.2.3"
+    lodash "^4.17.15"
+    memory-fs "^0.4.1"
+    minimatch "^3.0.4"
+    nodent-runtime "^3.2.1"
+    normalize-path "^3.0.0"
+    progress "^2.0.3"
+    source-map-support "^0.5.13"
+    toposort "^2.0.2"
+    yargs "14.0.0"
+
+moment@^2.19.2:
   version "2.24.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
   integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
@@ -5252,6 +6074,14 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
+node-environment-flags@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/node-environment-flags/-/node-environment-flags-1.0.6.tgz#a30ac13621f6f7d674260a54dede048c3982c088"
+  integrity sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==
+  dependencies:
+    object.getownpropertydescriptors "^2.0.3"
+    semver "^5.7.0"
+
 node-forge@0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
@@ -5275,6 +6105,11 @@ node-gyp@^3.8.0:
     tar "^2.0.0"
     which "1"
 
+node-int64@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
+
 node-ipc@^9.1.1:
   version "9.1.1"
   resolved "https://registry.yarnpkg.com/node-ipc/-/node-ipc-9.1.1.tgz#4e245ed6938e65100e595ebc5dc34b16e8dd5d69"
@@ -5313,6 +6148,11 @@ node-libs-browser@^2.0.0, node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
+node-modules-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
+  integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
+
 node-releases@^1.1.49:
   version "1.1.49"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz#67ba5a3fac2319262675ef864ed56798bb33b93e"
@@ -5343,6 +6183,11 @@ node-sass@^4.13.1:
     stdout-stream "^1.4.0"
     "true-case-path" "^1.0.2"
 
+nodent-runtime@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/nodent-runtime/-/nodent-runtime-3.2.1.tgz#9e2755d85e39f764288f0d4752ebcfe3e541e00e"
+  integrity sha512-7Ws63oC+215smeKJQCxzrK21VFVlCFBkwl0MOObt0HOpVQXs3u483sAmtkF33nNqZ5rSOQjB76fgyPBmAUrtCA==
+
 "nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -5350,6 +6195,14 @@ node-sass@^4.13.1:
   dependencies:
     abbrev "1"
 
+nopt@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -5367,7 +6220,7 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
-normalize-path@^3.0.0:
+normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
@@ -5406,6 +6259,11 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
+nwsapi@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
+  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -5452,7 +6310,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0:
+object.assign@4.1.0, object.assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
   integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
@@ -5545,7 +6403,7 @@ optimize-css-assets-webpack-plugin@~5.0:
     cssnano "^4.1.10"
     last-call-webpack-plugin "^3.0.0"
 
-optionator@^0.8.2:
+optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@@ -5607,7 +6465,7 @@ os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@0:
+osenv@0, osenv@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -5750,6 +6608,11 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
+parse5@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
+  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
+
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -5828,6 +6691,11 @@ path-type@^2.0.0:
   dependencies:
     pify "^2.0.0"
 
+path-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
+
 pbkdf2@^3.0.3:
   version "3.0.17"
   resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
@@ -5844,6 +6712,11 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+picomatch@^2.0.4, picomatch@^2.0.5:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
+  integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
+
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -5871,6 +6744,13 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
+pirates@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
+  integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
+  dependencies:
+    node-modules-regexp "^1.0.0"
+
 pkg-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
@@ -6256,6 +7136,25 @@ pretty-error@^2.1.1:
     renderkid "^2.0.1"
     utila "~0.4"
 
+pretty-format@^25.1.0:
+  version "25.1.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.1.0.tgz#ed869bdaec1356fc5ae45de045e2c8ec7b07b0c8"
+  integrity sha512-46zLRSGLd02Rp+Lhad9zzuNZ+swunitn8zIpfD2B4OPCRLXbM87RJT2aBLBWYOznNUML/2l/ReMyWNC80PJBUQ==
+  dependencies:
+    "@jest/types" "^25.1.0"
+    ansi-regex "^5.0.0"
+    ansi-styles "^4.0.0"
+    react-is "^16.12.0"
+
+pretty@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pretty/-/pretty-2.0.0.tgz#adbc7960b7bbfe289a557dc5f737619a220d06a5"
+  integrity sha1-rbx5YLe7/iiaVX3F9zdhmiINBqU=
+  dependencies:
+    condense-newlines "^0.2.1"
+    extend-shallow "^2.0.1"
+    js-beautify "^1.6.12"
+
 private@^0.1.6:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -6271,7 +7170,7 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-progress@^2.0.0:
+progress@^2.0.0, progress@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -6281,6 +7180,11 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
+
 proxy-addr@~2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
@@ -6416,6 +7320,11 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+react-is@^16.12.0:
+  version "16.12.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
+  integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -6491,6 +7400,20 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
+readdirp@~3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz#c30c33352b12c96dfb4b895421a49fd5a9593839"
+  integrity sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==
+  dependencies:
+    picomatch "^2.0.4"
+
+realpath-native@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
+  integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
+  dependencies:
+    util.promisify "^1.0.0"
+
 redent@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
@@ -6511,6 +7434,11 @@ regenerate@^1.4.0:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
   integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
+regenerator-runtime@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
+
 regenerator-runtime@^0.12.0:
   version "0.12.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
@@ -6663,6 +7591,11 @@ require-main-filename@^1.0.1:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
   integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
@@ -6693,6 +7626,11 @@ resolve-from@^4.0.0:
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
 resolve-url@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
@@ -6718,6 +7656,11 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
+reusify@^1.0.0:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+
 rgb-regex@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
@@ -6750,6 +7693,11 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
+rsvp@^4.8.4:
+  version "4.8.5"
+  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
+
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
@@ -6757,6 +7705,11 @@ run-async@^2.2.0:
   dependencies:
     is-promise "^2.1.0"
 
+run-parallel@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
+  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
@@ -6793,6 +7746,21 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+sane@^4.0.3:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+  integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
+  dependencies:
+    "@cnakazawa/watch" "^1.0.3"
+    anymatch "^2.0.0"
+    capture-exit "^2.0.0"
+    exec-sh "^0.3.2"
+    execa "^1.0.0"
+    fb-watchman "^2.0.0"
+    micromatch "^3.1.4"
+    minimist "^1.1.1"
+    walker "~1.0.5"
+
 sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
@@ -6819,6 +7787,13 @@ sax@~1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
+saxes@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-4.0.2.tgz#76f8e762efc96ec4af5f885d8151c50426103165"
+  integrity sha512-EZOTeQ4bgkOaGCDaTKux+LaRNcLNbdbvMH7R3/yjEEULPEmqvkFbFub6DJhJTub2iGMT93CfpZ5LTdKZmAbVeQ==
+  dependencies:
+    xmlchars "^2.2.0"
+
 schema-utils@^0.4.5:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
@@ -6864,7 +7839,7 @@ selfsigned@^1.9.1:
   dependencies:
     node-forge "0.9.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -6998,6 +7973,11 @@ shell-quote@^1.6.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
+sigmund@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+  integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -7010,6 +7990,11 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
+slash@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -7090,7 +8075,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@~0.5.12:
+source-map-support@^0.5.13, source-map-support@~0.5.12:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
   integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
@@ -7215,6 +8200,11 @@ stable@^0.1.8:
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
+stack-utils@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
+  integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
+
 stackframe@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.1.1.tgz#ffef0a3318b1b60c3b58564989aca5660729ec71"
@@ -7294,7 +8284,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^3.0.0:
+string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
   integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
@@ -7347,7 +8337,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -7385,7 +8375,7 @@ strip-indent@^1.0.1:
   dependencies:
     get-stdin "^4.0.1"
 
-strip-json-comments@^2.0.1:
+strip-json-comments@2.0.1, strip-json-comments@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
@@ -7399,6 +8389,13 @@ stylehacks@^4.0.0:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
+supports-color@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.0.0.tgz#76cfe742cf1f41bb9b1c29ad03068c05b4c0e40a"
+  integrity sha512-on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg==
+  dependencies:
+    has-flag "^3.0.0"
+
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -7418,6 +8415,13 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^7.0.0, supports-color@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
+  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
+  dependencies:
+    has-flag "^4.0.0"
+
 svg-tags@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
@@ -7490,6 +8494,11 @@ svgo@^1.0.0:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
+symbol-tree@^3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
+
 table@^5.2.3:
   version "5.4.6"
   resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
@@ -7538,6 +8547,15 @@ terser@^4.1.2, terser@^4.3.9:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
+test-exclude@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
+  dependencies:
+    "@istanbuljs/schema" "^0.1.2"
+    glob "^7.1.4"
+    minimatch "^3.0.4"
+
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
@@ -7589,6 +8607,11 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmpl@1.0.x:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+  integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
+
 to-arraybuffer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
@@ -7614,6 +8637,13 @@ to-regex-range@^2.1.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
 
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
@@ -7629,6 +8659,11 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+toposort@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
+  integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA=
+
 tough-cookie@^2.3.3, tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
@@ -7637,6 +8672,22 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
+tough-cookie@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
+  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
+  dependencies:
+    ip-regex "^2.1.0"
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
+tr46@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.0.tgz#a85da3f8511231357b347caa686abb3dfb150634"
+  integrity sha512-LrErSqfhdUw73AC/eXV2fEmNkvgSYxfm5lvxnLvuVgoVDknvD28Pa5FeDGc8RuVouDxUD3GnHHFv7xnBp7As5w==
+  dependencies:
+    punycode "^2.1.1"
+
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -7696,6 +8747,13 @@ type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typedarray-to-buffer@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
+  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
+  dependencies:
+    is-typedarray "^1.0.0"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -7854,7 +8912,7 @@ util.promisify@1.0.0:
     define-properties "^1.1.2"
     object.getownpropertydescriptors "^2.0.3"
 
-util.promisify@~1.0.0:
+util.promisify@^1.0.0, util.promisify@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
   integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==
@@ -8028,6 +9086,27 @@ vuex@^3.1.2:
   resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.1.2.tgz#a2863f4005aa73f2587e55c3fadf3f01f69c7d4d"
   integrity sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ==
 
+w3c-hr-time@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
+  dependencies:
+    browser-process-hrtime "^0.1.2"
+
+w3c-xmlserializer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
+  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
+  dependencies:
+    xml-name-validator "^3.0.0"
+
+walker@^1.0.7, walker@~1.0.5:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+  integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
+  dependencies:
+    makeerror "1.0.x"
+
 watchpack@^1.5.0, watchpack@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
@@ -8051,6 +9130,11 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+webidl-conversions@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
+  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
+
 webpack-bundle-analyzer@~3.3:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz#3da733a900f515914e729fcebcd4c40dde71fc6f"
@@ -8239,6 +9323,27 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
   integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
+whatwg-encoding@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+  dependencies:
+    iconv-lite "0.4.24"
+
+whatwg-mimetype@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+
+whatwg-url@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.0.0.tgz#37f256cb746398e19b107bd6ef820b4ae2d15871"
+  integrity sha512-41ou2Dugpij8/LPO5Pq64K5q++MnRCBpEHvQr26/mArEKTkCV5aoXIqyhuYtE0pkqScXwhf2JP57rkRTYM29lQ==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^2.0.0"
+    webidl-conversions "^5.0.0"
+
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
@@ -8249,14 +9354,14 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.2.14, which@^1.2.9:
+which@1, which@1.3.1, which@^1.2.14, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
+wide-align@1.1.3, wide-align@^1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
   integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
@@ -8283,11 +9388,30 @@ wrap-ansi@^2.0.0:
     string-width "^1.0.1"
     strip-ansi "^3.0.1"
 
+wrap-ansi@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+  integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
+  dependencies:
+    ansi-styles "^3.2.0"
+    string-width "^3.0.0"
+    strip-ansi "^5.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
+write-file-atomic@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.1.tgz#558328352e673b5bb192cf86500d60b230667d4b"
+  integrity sha512-JPStrIyyVJ6oCSz/691fAjFtefZ6q+fP6tm+OS4Qw6o+TGQxNp1ziY2PgS+X/m0V8OWhZiO/m4xSj+Pr4RrZvw==
+  dependencies:
+    imurmurhash "^0.1.4"
+    is-typedarray "^1.0.0"
+    signal-exit "^3.0.2"
+    typedarray-to-buffer "^3.1.5"
+
 write@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
@@ -8302,6 +9426,21 @@ ws@^6.0.0:
   dependencies:
     async-limiter "~1.0.0"
 
+ws@^7.2.1:
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.1.tgz#03ed52423cd744084b2cf42ed197c8b65a936b8e"
+  integrity sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==
+
+xml-name-validator@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
+
+xmlchars@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
+
 xregexp@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
@@ -8332,6 +9471,14 @@ yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
+yargs-parser@13.1.1, yargs-parser@^13.1.1:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
+  integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
@@ -8354,6 +9501,15 @@ yargs-parser@^5.0.0:
   dependencies:
     camelcase "^3.0.0"
 
+yargs-unparser@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.0.tgz#ef25c2c769ff6bd09e4b0f9d7c605fb27846ea9f"
+  integrity sha512-W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw==
+  dependencies:
+    flat "^4.1.0"
+    lodash "^4.17.15"
+    yargs "^13.3.0"
+
 yargs@12.0.2:
   version "12.0.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
@@ -8372,6 +9528,39 @@ yargs@12.0.2:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^10.1.0"
 
+yargs@13.3.0, yargs@^13.3.0:
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
+  integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==
+  dependencies:
+    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@14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.0.0.tgz#ba4cacc802b3c0b3e36a9e791723763d57a85066"
+  integrity sha512-ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow==
+  dependencies:
+    cliui "^5.0.0"
+    decamelize "^1.2.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@^12.0.4:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
diff --git a/handlers/api.go b/handlers/api.go
index fa877b8b..0608fbaf 100644
--- a/handlers/api.go
+++ b/handlers/api.go
@@ -89,7 +89,6 @@ func apiCoreHandler(w http.ResponseWriter, r *http.Request) {
 	if c.Timezone != app.Timezone {
 		app.Timezone = c.Timezone
 	}
-	app.UpdateNotify = c.UpdateNotify
 	app.UseCdn = types.NewNullBool(c.UseCdn.Bool)
 	core.CoreApp, err = core.UpdateCore(app)
 	returnJson(core.CoreApp, w, r)
diff --git a/handlers/function.go b/handlers/function.go
index a6020dfc..2b12dcbd 100644
--- a/handlers/function.go
+++ b/handlers/function.go
@@ -25,6 +25,9 @@ var handlerFuncs = func(w http.ResponseWriter, r *http.Request) template.FuncMap
 		"USE_CDN": func() bool {
 			return core.CoreApp.UseCdn.Bool
 		},
+		"USING_ASSETS": func() bool {
+			return core.CoreApp.UsingAssets()
+		},
 		"BasePath": func() string {
 			return basePath
 		},
diff --git a/notifiers/discord.go b/notifiers/discord.go
index d6a37d0a..f7e7e01b 100644
--- a/notifiers/discord.go
+++ b/notifiers/discord.go
@@ -70,9 +70,6 @@ func (u *discord) OnSuccess(s *types.Service) {
 	if !s.Online || !s.SuccessNotified {
 		u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id))
 		var msg interface{}
-		if s.UpdateNotify {
-			s.UpdateNotify = false
-		}
 		msg = s.DownText
 
 		u.AddQueue(fmt.Sprintf("service_%v", s.Id), msg)
diff --git a/notifiers/email.go b/notifiers/email.go
index b151e150..75452483 100644
--- a/notifiers/email.go
+++ b/notifiers/email.go
@@ -193,9 +193,6 @@ func (u *email) OnFailure(s *types.Service, f *types.Failure) {
 func (u *email) OnSuccess(s *types.Service) {
 	if !s.Online || !s.SuccessNotified {
 		var msg string
-		if s.UpdateNotify {
-			s.UpdateNotify = false
-		}
 		msg = s.DownText
 
 		u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id))
diff --git a/notifiers/line_notify.go b/notifiers/line_notify.go
index f77e2722..61d5f8c2 100644
--- a/notifiers/line_notify.go
+++ b/notifiers/line_notify.go
@@ -72,9 +72,6 @@ func (u *lineNotifier) OnFailure(s *types.Service, f *types.Failure) {
 func (u *lineNotifier) OnSuccess(s *types.Service) {
 	if !s.Online || !s.SuccessNotified {
 		var msg string
-		if s.UpdateNotify {
-			s.UpdateNotify = false
-		}
 		msg = s.DownText
 
 		u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id))
diff --git a/notifiers/mobile.go b/notifiers/mobile.go
index 4d193bb4..fc1d5d9e 100644
--- a/notifiers/mobile.go
+++ b/notifiers/mobile.go
@@ -99,9 +99,6 @@ func (u *mobilePush) OnSuccess(s *types.Service) {
 	data := dataJson(s, nil)
 	if !s.Online || !s.SuccessNotified {
 		var msgStr string
-		if s.UpdateNotify {
-			s.UpdateNotify = false
-		}
 		msgStr = s.DownText
 
 		u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id))
diff --git a/notifiers/telegram.go b/notifiers/telegram.go
index d92f8e56..c8bc5f5e 100644
--- a/notifiers/telegram.go
+++ b/notifiers/telegram.go
@@ -92,9 +92,6 @@ func (u *telegram) OnSuccess(s *types.Service) {
 	if !s.Online || !s.SuccessNotified {
 		u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id))
 		var msg interface{}
-		if s.UpdateNotify {
-			s.UpdateNotify = false
-		}
 		msg = s.DownText
 
 		u.AddQueue(fmt.Sprintf("service_%v", s.Id), msg)
diff --git a/notifiers/twilio.go b/notifiers/twilio.go
index 5dfba07c..6c6efc62 100644
--- a/notifiers/twilio.go
+++ b/notifiers/twilio.go
@@ -102,9 +102,6 @@ func (u *twilio) OnSuccess(s *types.Service) {
 	if !s.Online || !s.SuccessNotified {
 		u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id))
 		var msg string
-		if s.UpdateNotify {
-			s.UpdateNotify = false
-		}
 		msg = s.DownText
 
 		u.AddQueue(fmt.Sprintf("service_%v", s.Id), msg)
diff --git a/types/core.go b/types/core.go
index 73743303..c4f6b89b 100644
--- a/types/core.go
+++ b/types/core.go
@@ -41,7 +41,6 @@ type Core struct {
 	Setup         bool               `gorm:"-" json:"setup"`
 	MigrationId   int64              `gorm:"column:migration_id" json:"migration_id,omitempty"`
 	UseCdn        NullBool           `gorm:"column:use_cdn;default:false" json:"using_cdn,omitempty"`
-	UpdateNotify  NullBool           `gorm:"column:update_notify;default:true" json:"update_notify,omitempty"`
 	Timezone      float32            `gorm:"column:timezone;default:-8.0" json:"timezone,omitempty"`
 	LoggedIn      bool               `gorm:"-" json:"logged_in"`
 	CreatedAt     time.Time          `gorm:"column:created_at" json:"created_at"`
diff --git a/types/service.go b/types/service.go
index 9cf0dd45..55f2b7cc 100644
--- a/types/service.go
+++ b/types/service.go
@@ -33,7 +33,6 @@ type Service struct {
 	Port                int                `gorm:"not null;column:port" json:"port" scope:"user,admin"`
 	Timeout             int                `gorm:"default:30;column:timeout" json:"timeout" scope:"user,admin"`
 	Order               int                `gorm:"default:0;column:order_id" json:"order_id"`
-	AllowNotifications  NullBool           `gorm:"default:true;column:allow_notifications" json:"allow_notifications" scope:"user,admin"`
 	VerifySSL           NullBool           `gorm:"default:false;column:verify_ssl" json:"verify_ssl" scope:"user,admin"`
 	Public              NullBool           `gorm:"default:true;column:public" json:"public"`
 	GroupId             int                `gorm:"default:0;column:group_id" json:"group_id"`
@@ -53,10 +52,11 @@ type Service struct {
 	Checkpoint          time.Time          `gorm:"-" json:"-"`
 	SleepDuration       time.Duration      `gorm:"-" json:"-"`
 	LastResponse        string             `gorm:"-" json:"-"`
-	UserNotified        bool               `gorm:"-" json:"-"` // True if the User was already notified about a Downtime
-	UpdateNotify        bool               `gorm:"-" json:"-"` // This Variable is a simple copy of `core.CoreApp.UpdateNotify.Bool`
-	DownText            string             `gorm:"-" json:"-"` // Contains the current generated Downtime Text
-	SuccessNotified     bool               `gorm:"-" json:"-"` // Is 'true' if the user has already be informed that the Services now again available
+	AllowNotifications  NullBool           `gorm:"default:true;column:allow_notifications" json:"allow_notifications" scope:"user,admin"`
+	UserNotified        bool               `gorm:"-" json:"-"`                                                                          // True if the User was already notified about a Downtime
+	UpdateNotify        NullBool           `gorm:"default:true;column:notify_all_changes" json:"notify_all_changes" scope:"user,admin"` // This Variable is a simple copy of `core.CoreApp.UpdateNotify.Bool`
+	DownText            string             `gorm:"-" json:"-"`                                                                          // Contains the current generated Downtime Text
+	SuccessNotified     bool               `gorm:"-" json:"-"`                                                                          // Is 'true' if the user has already be informed that the Services now again available
 	LastStatusCode      int                `gorm:"-" json:"status_code"`
 	LastOnline          time.Time          `gorm:"-" json:"last_success"`
 	Failures            []FailureInterface `gorm:"-" json:"failures,omitempty" scope:"user,admin"`