From 4af0d77584515c24ec258951c29c68ecc84efc65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Sun, 17 May 2020 20:22:03 +0200
Subject: [PATCH 01/12] vorstand can create, edit and delete jobkinds

---
 src/components/vorstand/JobKindManager.vue    | 119 ++++++++++++++++++
 .../vorstand/ManagementNavigation.vue         |   8 ++
 src/plugins/routes.js                         |   6 +-
 src/router/index.js                           |   5 +
 src/store/index.js                            |   4 +-
 src/store/modules/jobkindManager.js           | 118 +++++++++++++++++
 6 files changed, 258 insertions(+), 2 deletions(-)
 create mode 100644 src/components/vorstand/JobKindManager.vue
 create mode 100644 src/store/modules/jobkindManager.js

diff --git a/src/components/vorstand/JobKindManager.vue b/src/components/vorstand/JobKindManager.vue
new file mode 100644
index 0000000..036674f
--- /dev/null
+++ b/src/components/vorstand/JobKindManager.vue
@@ -0,0 +1,119 @@
+<template>
+  <div>
+    <v-card tile :loading="jobkindsLoading">
+      <v-card-title>
+        Dienstarten
+        <v-spacer />
+        <v-btn fab small color="primary" @click="add()">
+          <v-icon>
+            {{ plusIcon }}
+          </v-icon>
+        </v-btn>
+      </v-card-title>
+      <v-card-text>
+        <v-card tile v-for="jobkind in jobkinds" :key="jobkind.id">
+          <v-card-text class="black--text">
+            <v-row class="ml-3 mr-3">
+              {{ jobkind.name }}
+              <v-spacer />
+              <v-btn icon @click="editJobKind(jobkind)">
+                <v-icon>
+                  {{ editIcon }}
+                </v-icon>
+              </v-btn>
+              <v-btn icon @click="deleteJobKind(jobkind)">
+                <v-icon>
+                  {{ deleteIcon }}
+                </v-icon>
+              </v-btn>
+            </v-row>
+          </v-card-text>
+        </v-card>
+      </v-card-text>
+    </v-card>
+    <v-dialog v-model="dialog">
+      <v-card>
+        <v-card-title>
+          {{ title }}
+        </v-card-title>
+        <v-card-text>
+          <v-text-field outlined label="Name" v-model="editedItem.name" />
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer />
+          <v-btn text color="primary" @click="close()">Abbrechen</v-btn>
+          <v-btn text color="primary" @click="save()">Speichern</v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters, mapActions } from 'vuex'
+import { mdiPencil, mdiDelete, mdiPlus } from '@mdi/js'
+export default {
+  name: 'JobKindManager',
+  data() {
+    return {
+      editIcon: mdiPencil,
+      deleteIcon: mdiDelete,
+      plusIcon: mdiPlus,
+      dialog: false,
+      editedItem: {
+        id: -1,
+        name: null
+      },
+      defaultItem: {
+        id: -1,
+        name: null
+      }
+    }
+  },
+  methods: {
+    ...mapActions({
+      getAllJobKinds: 'jkm/getAllJobKinds',
+      addingJobKind: 'jkm/addJobKind',
+      updateJobKind: 'jkm/updateJobKind',
+      deletingJobKind: 'jkm/deleteJobKind'
+    }),
+    add() {
+      this.dialog = true
+    },
+    editJobKind(jobkind) {
+      this.dialog = true
+      this.editedItem = Object.assign({}, jobkind)
+    },
+    deleteJobKind(jobkind) {
+      confirm("Willst du diese Dienstart wirklich löschen") && this.deletingJobKind(jobkind)
+      this.close()
+    },
+    close() {
+      setTimeout(() => {
+        this.editedItem = Object.assign({}, this.defaultItem)
+        this.dialog = false
+      }, 200)
+    },
+    save() {
+      this.editedItem.id === -1 ? this.addingJobKind(this.editedItem) : this.updateJobKind(this.editedItem)
+      this.close()
+    }
+  },
+  computed: {
+    ...mapGetters({
+      jobkinds: 'jkm/jobkinds',
+      jobkindsLoading: 'jkm/jobkindsLoading'
+    }),
+    title() {
+      return this.editedItem.id === -1
+        ? 'Neue Dienstart erstellen'
+        : 'Dienstart bearbeiten'
+    }
+  },
+  created() {
+    this.getAllJobKinds()
+  }
+}
+</script>
+
+<style scoped></style>
diff --git a/src/components/vorstand/ManagementNavigation.vue b/src/components/vorstand/ManagementNavigation.vue
index f2ec3ac..46ffe61 100644
--- a/src/components/vorstand/ManagementNavigation.vue
+++ b/src/components/vorstand/ManagementNavigation.vue
@@ -24,6 +24,14 @@
         Arbeitsgruppen
       </v-list-item-title>
     </v-list-item>
+    <v-list-item link to="/main/management/jobkindmanagement">
+      <v-list-item-icon>
+        <v-icon>???</v-icon>
+      </v-list-item-icon>
+      <v-list-item-title>
+        Dienstarten
+      </v-list-item-title>
+    </v-list-item>
   </v-list>
 </template>
 
diff --git a/src/plugins/routes.js b/src/plugins/routes.js
index 118a35e..66b4282 100644
--- a/src/plugins/routes.js
+++ b/src/plugins/routes.js
@@ -33,7 +33,11 @@ const url = {
       getUser: main + 'sm/getUser',
       getUsers: main + 'sm/getUsers',
       lockDay: main + 'sm/lockDay',
-      searchUser: main + 'sm/searchWithExtern'
+      searchUser: main + 'sm/searchWithExtern',
+      jobkind: main + 'sm/JobKind',
+      getAllJobKindsbKinds: main + 'sm/getAllJobKinds',
+      getJobKind: main + 'sm/getJobKind',
+      deleteJobKind: main + 'sm/deleteJobKind'
     },
     um: {
       setStatus: main + 'um/setStatus',
diff --git a/src/router/index.js b/src/router/index.js
index fecd282..c7a8f16 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,6 +24,7 @@ import GastroNavigation from '@/components/gastro/GastroNavigation'
 import PriceListView from '@/views/contents/PriceListView'
 import UserManager from '@/components/vorstand/UserManager'
 import WorkgroupManagement from "@/components/vorstand/WorkgroupManagement";
+import JobKindManager from "@/components/vorstand/JobKindManager";
 
 Vue.use(VueRouter)
 
@@ -63,6 +64,10 @@ const routes = [
           {
             path: 'workgroupmanagement',
             component: WorkgroupManagement
+          },
+          {
+            path: 'jobkindmanagement',
+            component: JobKindManager
           }
         ]
       },
diff --git a/src/store/index.js b/src/store/index.js
index 5fc6616..eb63086 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -10,6 +10,7 @@ import requestJobs from '@/store/modules/jobRequests'
 import priceList from '@/store/modules/pricelist'
 import usermanager from '@/store/modules/userManager'
 import wm from '@/store/modules/workgroupManagement'
+import jkm from '@/store/modules/jobkindManager'
 
 Vue.use(Vuex)
 
@@ -24,6 +25,7 @@ export default new Vuex.Store({
     requestJobs,
     priceList,
     usermanager,
-    wm
+    wm,
+    jkm
   }
 })
diff --git a/src/store/modules/jobkindManager.js b/src/store/modules/jobkindManager.js
new file mode 100644
index 0000000..09b36a9
--- /dev/null
+++ b/src/store/modules/jobkindManager.js
@@ -0,0 +1,118 @@
+import url from '@/plugins/routes'
+import axios from 'axios'
+
+const state = {
+  jobkinds: [],
+  jobkindLoading: false
+}
+
+const mutations = {
+  setJobkinds: (state, jobkinds) => {
+    state.jobkinds = jobkinds
+  },
+  updateJobKind: (state, jobkind) => {
+    console.log(jobkind)
+    const exists = state.jobkinds.find(a => {
+      return a.id === jobkind.id
+    })
+    console.log(exists)
+    if (exists) {
+      exists.name = jobkind.name
+    } else {
+      state.jobkinds.push(jobkind)
+    }
+  },
+  deleteJobKind: (state, jobkind) => {
+    const exists = state.jobkinds.indexOf(
+      state.jobkinds.find(a => {
+        return a.id === jobkind.id
+      })
+    )
+    state.jobkinds.splice(exists, 1)
+  },
+  setJobkindsLoading: (state, value) => {
+    state.jobkindLoading = value
+  }
+}
+
+const actions = {
+  async getAllJobKinds({ commit, rootState, dispatch }) {
+    try {
+      commit('setJobkindsLoading', true)
+      const response = await axios.get(url.vorstand.sm.getAllJobKindsbKinds, {
+        headers: { Token: rootState.login.user.accessToken }
+      })
+      commit('setJobkinds', response.data)
+      commit('setJobkindsLoading', false)
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
+  async addJobKind({ commit, rootState, dispatch }, data) {
+    try {
+      commit('setJobkindsLoading', true)
+      const response = await axios.put(
+        url.vorstand.sm.jobkind,
+        { ...data },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('updateJobKind', response.data)
+      commit('setJobkindsLoading', false)
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
+  async updateJobKind({ commit, rootState, dispatch }, data) {
+    try {
+      commit('setJobkindsLoading', true)
+      const response = await axios.post(
+        url.vorstand.sm.jobkind,
+        { ...data },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('updateJobKind', response.data)
+      commit('setJobkindsLoading', false)
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
+  async deleteJobKind({ commit, rootState, dispatch }, data) {
+    try {
+      commit('setJobkindsLoading', true)
+      await axios.post(
+        url.vorstand.sm.deleteJobKind,
+        { ...data },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('deleteJobKind', data)
+      commit('setJobkindsLoading', false)
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  }
+}
+
+const getters = {
+  jobkinds: state => {
+    return state.jobkinds
+  },
+  jobkindsLoading: state => {
+    return state.jobkindLoading
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+  getters
+}

From 9bd854209e74a96e36cb855267f73880b7d9adb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Sun, 17 May 2020 21:19:19 +0200
Subject: [PATCH 02/12] vorstand can change group for jobkind

---
 src/components/vorstand/JobKindManager.vue | 130 ++++++++++++++-------
 src/components/vorstand/UserManager.vue    |  61 ++++++----
 src/store/modules/jobkindManager.js        |   1 +
 3 files changed, 130 insertions(+), 62 deletions(-)

diff --git a/src/components/vorstand/JobKindManager.vue b/src/components/vorstand/JobKindManager.vue
index 036674f..ca4a63d 100644
--- a/src/components/vorstand/JobKindManager.vue
+++ b/src/components/vorstand/JobKindManager.vue
@@ -1,43 +1,62 @@
 <template>
   <div>
-    <v-card tile :loading="jobkindsLoading">
-      <v-card-title>
-        Dienstarten
-        <v-spacer />
-        <v-btn fab small color="primary" @click="add()">
-          <v-icon>
-            {{ plusIcon }}
-          </v-icon>
-        </v-btn>
-      </v-card-title>
-      <v-card-text>
-        <v-card tile v-for="jobkind in jobkinds" :key="jobkind.id">
-          <v-card-text class="black--text">
-            <v-row class="ml-3 mr-3">
-              {{ jobkind.name }}
-              <v-spacer />
-              <v-btn icon @click="editJobKind(jobkind)">
-                <v-icon>
-                  {{ editIcon }}
-                </v-icon>
-              </v-btn>
-              <v-btn icon @click="deleteJobKind(jobkind)">
-                <v-icon>
-                  {{ deleteIcon }}
-                </v-icon>
-              </v-btn>
-            </v-row>
-          </v-card-text>
-        </v-card>
-      </v-card-text>
-    </v-card>
+    <v-data-table
+      :items="jobkinds"
+      :headers="header"
+      :loading="jobkindsLoading || workgroupsLoading"
+      :search="search"
+    >
+      <template v-slot:top>
+        <v-toolbar flat color="white">
+          <v-toolbar-title>
+            Dienstarten
+          </v-toolbar-title>
+          <v-spacer />
+          <v-text-field
+            v-model="search"
+            label="Suche Dienstart"
+            single-line
+            hide-details
+          >
+            <template v-slot:append>
+              <v-icon>{{ searchIcon }}</v-icon>
+            </template>
+          </v-text-field>
+          <v-btn fab small color="primary" @click="add()">
+            <v-icon>{{ plusIcon }}</v-icon>
+          </v-btn>
+        </v-toolbar>
+      </template>
+      <template v-slot:item.workgroup="{ item }">
+        {{ item.workgroup === null ? 'Alle' : item.workgroup.name }}
+      </template>
+      <template v-slot:item.actions="{item}">
+        <v-icon x-small @click="editJobKind(item)">{{editIcon}}</v-icon>
+        <v-icon x-small @click="deleteJobKind(item)">{{deleteIcon}}</v-icon>
+      </template>
+    </v-data-table>
     <v-dialog v-model="dialog">
       <v-card>
         <v-card-title>
           {{ title }}
         </v-card-title>
         <v-card-text>
-          <v-text-field outlined label="Name" v-model="editedItem.name" />
+          <v-row>
+            <v-col>
+              <v-text-field outlined label="Name" v-model="editedItem.name" />
+            </v-col>
+            <v-col>
+              <v-autocomplete
+                outlined
+                return-object
+                label="Arbeitsgruppe"
+                v-model="editedItem.workgroup"
+                item-text="name"
+                item-value="id"
+                :items="[...workgroups, { id: -1, name: 'Alle' }]"
+              />
+            </v-col>
+          </v-row>
         </v-card-text>
         <v-card-actions>
           <v-spacer />
@@ -51,22 +70,42 @@
 
 <script>
 import { mapGetters, mapActions } from 'vuex'
-import { mdiPencil, mdiDelete, mdiPlus } from '@mdi/js'
+import { mdiPencil, mdiDelete, mdiPlus, mdiMagnify } from '@mdi/js'
 export default {
   name: 'JobKindManager',
   data() {
     return {
+      search: null,
       editIcon: mdiPencil,
       deleteIcon: mdiDelete,
       plusIcon: mdiPlus,
+      searchIcon: mdiMagnify,
       dialog: false,
+      header: [
+        { text: 'Name', value: 'name' },
+        { text: 'Zugewiesene Arbeitsgruppe', value: 'workgroup' },
+        {
+          text: 'Aktionen',
+          value: 'actions',
+          filterable: false,
+          sortable: false
+        }
+      ],
       editedItem: {
         id: -1,
-        name: null
+        name: null,
+        workgroup: {
+          id: -1,
+          name: null
+        }
       },
       defaultItem: {
         id: -1,
-        name: null
+        name: null,
+        workgroup: {
+          id: -1,
+          name: null
+        }
       }
     }
   },
@@ -75,7 +114,8 @@ export default {
       getAllJobKinds: 'jkm/getAllJobKinds',
       addingJobKind: 'jkm/addJobKind',
       updateJobKind: 'jkm/updateJobKind',
-      deletingJobKind: 'jkm/deleteJobKind'
+      deletingJobKind: 'jkm/deleteJobKind',
+      getAllWorkgroups: 'wm/getAllWorkgroups'
     }),
     add() {
       this.dialog = true
@@ -83,9 +123,13 @@ export default {
     editJobKind(jobkind) {
       this.dialog = true
       this.editedItem = Object.assign({}, jobkind)
+      if (this.editedItem.workgroup === null) {
+        this.editedItem.workgroup = Object.assign({}, this.defaultItem.workgroup)
+      }
     },
     deleteJobKind(jobkind) {
-      confirm("Willst du diese Dienstart wirklich löschen") && this.deletingJobKind(jobkind)
+      confirm('Willst du diese Dienstart wirklich löschen') &&
+        this.deletingJobKind(jobkind)
       this.close()
     },
     close() {
@@ -95,14 +139,20 @@ export default {
       }, 200)
     },
     save() {
-      this.editedItem.id === -1 ? this.addingJobKind(this.editedItem) : this.updateJobKind(this.editedItem)
+      if (this.editedItem.workgroup.id === -1)
+        this.editedItem.workgroup = null
+      this.editedItem.id === -1
+        ? this.addingJobKind(this.editedItem)
+        : this.updateJobKind(this.editedItem)
       this.close()
     }
   },
   computed: {
     ...mapGetters({
       jobkinds: 'jkm/jobkinds',
-      jobkindsLoading: 'jkm/jobkindsLoading'
+      jobkindsLoading: 'jkm/jobkindsLoading',
+      workgroups: 'wm/workgroups',
+      workgroupsLoading: 'wm/workgroupLoading'
     }),
     title() {
       return this.editedItem.id === -1
@@ -112,6 +162,8 @@ export default {
   },
   created() {
     this.getAllJobKinds()
+    this.getAllWorkgroups()
+    console.log(this.jobkinds)
   }
 }
 </script>
diff --git a/src/components/vorstand/UserManager.vue b/src/components/vorstand/UserManager.vue
index 976c371..5704f4b 100644
--- a/src/components/vorstand/UserManager.vue
+++ b/src/components/vorstand/UserManager.vue
@@ -45,15 +45,16 @@
             <v-row>
               <v-col>
                 <v-autocomplete
-                        chips
-                        multiple
+                  chips
+                  multiple
                   v-model="editedItem.workgroups"
                   label="AG's"
                   outlined
                   :items="workgroups"
                   item-value="id"
                   item-text="name"
-                  return-object></v-autocomplete>
+                  return-object
+                ></v-autocomplete>
               </v-col>
             </v-row>
           </v-container>
@@ -65,7 +66,12 @@
         </v-card-actions>
       </v-card>
     </v-dialog>
-    <v-data-table :headers="header" :items="users" :search="search" :loading="usersLoading || statusLoading">
+    <v-data-table
+      :headers="header"
+      :items="users"
+      :search="search"
+      :loading="usersLoading || statusLoading"
+    >
       <template v-slot:top>
         <v-toolbar flat color="white">
           <v-toolbar-title>Mitgliederliste</v-toolbar-title>
@@ -82,12 +88,12 @@
           </v-text-field>
         </v-toolbar>
       </template>
-      <template v-slot:item.workgroups="{item}">
-          <div>
-            <v-chip v-for="group in item.workgroups" :key="group.id" x-small>
-              {{group.name}}
-            </v-chip>
-          </div>
+      <template v-slot:item.workgroups="{ item }">
+        <div>
+          <v-chip v-for="group in item.workgroups" :key="group.id" x-small>
+            {{ group.name }}
+          </v-chip>
+        </div>
       </template>
       <template v-slot:item.statusgroup="{ item }">
         {{ computeStatus(item.statusgroup) }}
@@ -138,7 +144,7 @@
 </template>
 
 <script>
-import { mdiPencil, mdiMagnify, } from '@mdi/js'
+import { mdiPencil, mdiMagnify } from '@mdi/js'
 import { mapActions, mapGetters } from 'vuex'
 export default {
   name: 'UserManager',
@@ -153,7 +159,7 @@ export default {
       header: [
         { text: 'Nachname', value: 'lastname' },
         { text: 'Vorname(n)', value: 'firstname' },
-        { text: 'AG\'s', value: 'workgroups'},
+        { text: "AG's", value: 'workgroups' },
         { text: 'Status', value: 'statusgroup' },
         { text: 'Stimmrecht', value: 'voting' },
         {
@@ -196,9 +202,8 @@ export default {
 
   mounted() {
     this.$nextTick(function() {
-        window.addEventListener('resize', this.getWindowWidth);
+      window.addEventListener('resize', this.getWindowWidth)
       this.getWindowWidth()
-
     })
   },
 
@@ -211,9 +216,9 @@ export default {
       updateWorkgroups: 'usermanager/updateWorkgroups',
       getAllWorkgroups: 'wm/getAllWorkgroups'
     }),
-     getWindowWidth() {
-        this.isFulllineText = document.documentElement.clientWidth <= 750;
-      },
+    getWindowWidth() {
+      this.isFulllineText = document.documentElement.clientWidth <= 750
+    },
     close() {
       this.editUser = false
       setTimeout(() => {
@@ -226,8 +231,12 @@ export default {
         {},
         this.status.find(a => a.id == item.statusgroup)
       )
-      this.editedItem.voting = Object.assign({},
-      item.voting ? {value: true, text: 'ja'} : {value: false, text: 'nein'})
+      this.editedItem.voting = Object.assign(
+        {},
+        item.voting
+          ? { value: true, text: 'ja' }
+          : { value: false, text: 'nein' }
+      )
       this.clickItem(this.editedItem.statusgroup)
       this.editUser = true
     },
@@ -255,8 +264,14 @@ export default {
       }
     },
     save() {
-      this.updateStatusUser({username: this.editedItem.username, status: this.editedItem.statusgroup})
-      this.updateVoting({username: this.editedItem.username, voting: this.editedItem.voting.value})
+      this.updateStatusUser({
+        username: this.editedItem.username,
+        status: this.editedItem.statusgroup
+      })
+      this.updateVoting({
+        username: this.editedItem.username,
+        voting: this.editedItem.voting.value
+      })
       this.updateWorkgroups(this.editedItem)
       this.close()
     }
@@ -282,7 +297,7 @@ export default {
       }).length
     },
 
-    allActiveUsers(){
+    allActiveUsers() {
       return this.users.filter(a => {
         return a.statusgroup === 1
       }).length
@@ -297,7 +312,7 @@ export default {
 </script>
 
 <style scoped>
-.fulllineText{
+.fulllineText {
   flex-basis: unset;
 }
 </style>
diff --git a/src/store/modules/jobkindManager.js b/src/store/modules/jobkindManager.js
index 09b36a9..8ef7a91 100644
--- a/src/store/modules/jobkindManager.js
+++ b/src/store/modules/jobkindManager.js
@@ -18,6 +18,7 @@ const mutations = {
     console.log(exists)
     if (exists) {
       exists.name = jobkind.name
+      exists.workgroup = jobkind.workgroup
     } else {
       state.jobkinds.push(jobkind)
     }

From bc2289173fac196e82e193497c5a345e72acd478 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Fri, 22 May 2020 21:12:59 +0200
Subject: [PATCH 03/12] vorstand can set job_kinds for day with max persons

workers willsort to job_kinds
---
 src/components/vorstand/ServiceManagement.vue |   7 +-
 .../ServiceManagementComponents/Day.vue       | 480 +++++++++++++++---
 src/plugins/routes.js                         |   6 +-
 src/store/modules/serviceManagement.js        | 162 ++++--
 4 files changed, 526 insertions(+), 129 deletions(-)

diff --git a/src/components/vorstand/ServiceManagement.vue b/src/components/vorstand/ServiceManagement.vue
index 6a43295..e4fdddb 100644
--- a/src/components/vorstand/ServiceManagement.vue
+++ b/src/components/vorstand/ServiceManagement.vue
@@ -86,9 +86,10 @@ export default {
         if (this.date.getDate() < intDate)
           this.date = new Date(this.date.getFullYear(), this.date.getMonth(), 0)
     }
-
+    this.getAllJobKinds()
     this.createMonth(this.date)
     this.getAllUsers()
+    this.getDBUsers()
     this.getUsers({
       from_date: {
         year: this.startDate.getFullYear(),
@@ -107,7 +108,9 @@ export default {
       createMonth: 'sm/createMonth',
       getAllUsers: 'sm/getAllUsers',
       getUsers: 'sm/getUsers',
-      lockDay: 'sm/lockDay'
+      lockDay: 'sm/lockDay',
+      getDBUsers: 'usermanager/getUsers',
+      getAllJobKinds: 'jkm/getAllJobKinds',
     }),
     changeMonth(value) {
       if (value === -1) {
diff --git a/src/components/vorstand/ServiceManagementComponents/Day.vue b/src/components/vorstand/ServiceManagementComponents/Day.vue
index c34581e..270f0e8 100644
--- a/src/components/vorstand/ServiceManagementComponents/Day.vue
+++ b/src/components/vorstand/ServiceManagementComponents/Day.vue
@@ -2,9 +2,13 @@
   <div v-if="day">
     <v-card :color="color(day)" max-width="250px" min-width="250px">
       <v-card-title v-if="day.date" class="subtitle-1 font-weight-bold">
-        {{ day.name }} den {{ day.date.getDate() }}.{{
-        day.date.getMonth() + 1
-        }}.{{ day.date.getFullYear() }}
+        {{ day.name }} {{ day.date.getDate() }}.{{ day.date.getMonth() + 1 }}.{{
+          day.date.getFullYear()
+        }}
+        <v-spacer />
+        <v-btn icon small @click="dialog = true">
+          <v-icon>{{ menuIcon }}</v-icon>
+        </v-btn>
       </v-card-title>
       <v-card-text>
         <v-expand-transition>
@@ -12,59 +16,196 @@
             <v-progress-circular indeterminate color="grey" />
           </v-row>
         </v-expand-transition>
-        <v-expand-transition>
-          <div v-show="!day.loading">
-            <v-autocomplete
-              chips
-              return-object
-              multiple
-              v-model="day.worker"
-              :items="allUsers"
-              item-text="fullName"
-              label="Dienste"
-              filled
-              color="green"
-              @input="searchInput = null"
-              :search-input.sync="searchInput"
-              @blur="focused = false"
-              @focus="focused = true"
-            >
-              <template v-slot:prepend-inner>
-                <v-icon>{{ account_add }}</v-icon>
-              </template>
-              <template v-slot:selection="data">
-                <v-chip
-                  v-bind="data.attrs"
-                  :input-value="data.selected"
-                  close
-                  @click="data.select"
-                  @click:close="remove(data.item)"
-                >{{ data.item.firstname }} {{ data.item.lastname }}</v-chip>
-              </template>
-              <template v-slot:item="data">
-                <v-list-item-content>
-                  <v-list-item-title>
-                    {{ data.item.firstname }}
-                    {{ data.item.lastname }}
-                  </v-list-item-title>
-                </v-list-item-content>
-              </template>
-            </v-autocomplete>
+
+        <div v-for="(jobkinddateitem, index) in day.jobkinddate" :key="index">
+          <div
+            v-if="
+              jobkinddateitem.job_kind
+                ? jobkinddateitem.job_kind.id !== 0
+                : false
+            "
+          >
+            <v-expand-transition>
+              <div v-show="!day.loading">
+                <v-autocomplete
+                  chips
+                  return-object
+                  multiple
+                  :counter="jobkinddateitem.maxpersons"
+                  v-model="jobkinddateitem.worker"
+                  :items="filterUser(jobkinddateitem.job_kind)"
+                  :item-text="item => item.firstname + ' ' + item.lastname"
+                  :label="jobkinddateitem.job_kind.name"
+                  filled
+                  color="green"
+                  @blur="focused = false"
+                  @focus="focused = true"
+                  :key="update"
+                  @change="forceRenderer(jobkinddateitem)"
+                >
+                  <template v-slot:prepend-inner>
+                    <v-icon>{{ account_add }}</v-icon>
+                  </template>
+                  <template v-slot:selection="data">
+                    <v-chip
+                      v-bind="data.attrs"
+                      :input-value="data.selected"
+                      close
+                      @click="data.select"
+                      @click:close="remove(jobkinddateitem, data.item)"
+                      >{{ data.item.firstname }} {{ data.item.lastname }}
+                    </v-chip>
+                  </template>
+                </v-autocomplete>
+              </div>
+            </v-expand-transition>
           </div>
-        </v-expand-transition>
+        </div>
       </v-card-text>
       <v-card-actions v-if="!day.loading">
-        <v-chip class="text-uppercase" :color="lockedColor">{{ lockedText }}</v-chip>
+        <v-chip class="text-uppercase" :color="lockedColor">{{
+          lockedText
+        }}</v-chip>
         <v-spacer />
         <v-btn text @click="lock">{{ lockedTextBtn }}</v-btn>
       </v-card-actions>
     </v-card>
+    <v-dialog v-model="dialog">
+      <v-card>
+        <v-card-title>
+          Bearbeite Tag
+        </v-card-title>
+        <v-card-text>
+          <div>
+            <v-row v-if="!isBarDienstIn">
+              <v-col cols="8">
+                <v-text-field readonly outlined value="Bardienst" />
+              </v-col>
+              <v-col cols="2">
+                <v-text-field
+                  outlined
+                  label="Maximale Personen"
+                  type="number"
+                  v-model="maxpersons"
+                  @change="createBarJobKindDate(maxpersons)"
+                />
+              </v-col>
+              <v-col cols="2"> </v-col>
+            </v-row>
+            <v-row
+              v-for="(jobkinddateitem, index) in day.jobkinddate"
+              :key="index"
+            >
+              <v-col cols="8">
+                <v-text-field
+                  v-if="!jobkinddateitem.new"
+                  readonly
+                  outlined
+                  :value="jobkinddateitem.job_kind.name"
+                />
+                <v-autocomplete
+                  v-else
+                  outlined
+                  :items="filterJobKinds(jobkinddateitem, index)"
+                  :rules="rules"
+                  item-text="name"
+                  item-value="id"
+                  v-model="jobkinddateitem.job_kind"
+                  return-object
+                ></v-autocomplete>
+              </v-col>
+              <v-col cols="2">
+                <v-text-field
+                  outlined
+                  label="Maximale Personen"
+                  type="number"
+                  v-model="jobkinddateitem.maxpersons"
+                />
+              </v-col>
+              <v-col cols="2">
+                <div v-if="jobkinddateitem.job_kind !== null">
+                  <div v-if="jobkinddateitem.job_kind.id !== 1">
+                    <v-btn
+                      v-if="jobkinddateitem.id === 0"
+                      fab
+                      x-small
+                      color="green"
+                      @click="undoDelteJobKindDate(index)"
+                    >
+                      <v-icon>{{ plusIcon }}</v-icon>
+                    </v-btn>
+                    <v-btn
+                      v-else
+                      fab
+                      x-small
+                      color="red"
+                      @click="deleteJobKindDate(index)"
+                    >
+                      <v-icon>{{ minusIcon }}</v-icon>
+                    </v-btn>
+                  </div>
+                </div>
+                <div v-else>
+                  <v-btn
+                    v-if="jobkinddateitem.id === 0"
+                    fab
+                    x-small
+                    color="green"
+                    @click="undoDelteJobKindDate(index)"
+                  >
+                    <v-icon>{{ plusIcon }}</v-icon>
+                  </v-btn>
+                  <v-btn
+                    v-else
+                    fab
+                    x-small
+                    color="red"
+                    @click="deleteJobKindDate(index)"
+                  >
+                    <v-icon>{{ minusIcon }}</v-icon>
+                  </v-btn>
+                </div>
+              </v-col>
+              <v-row v-if="jobkinddateitem.id === 0">
+                <v-col>
+                  <v-alert dense type="info"
+                    >{{ jobkinddateitem.job_kind.name }} wird beim Speichern
+                    gelöscht.</v-alert
+                  >
+                </v-col>
+              </v-row>
+            </v-row>
+          </div>
+          <v-row>
+            <v-spacer />
+            <v-btn
+              fab
+              small
+              color="green darken-1"
+              @click="addJobKindDate()"
+              :disabled="disableAddBtn"
+            >
+              <v-icon>{{ plusIcon }}</v-icon>
+            </v-btn>
+          </v-row>
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer />
+          <v-btn text color="primary" @click="dialog = false">
+            Abbrechen
+          </v-btn>
+          <v-btn text color="primary" @click="saveJobKind()">
+            Speichern
+          </v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-dialog>
   </div>
 </template>
 
 <script>
 import { mapGetters, mapActions } from 'vuex'
-import { mdiAccountPlus } from '@mdi/js'
+import { mdiAccountPlus, mdiDotsVertical, mdiPlus, mdiMinus } from '@mdi/js'
 export default {
   name: 'Day',
   props: {
@@ -73,19 +214,37 @@ export default {
   data() {
     return {
       account_add: mdiAccountPlus,
+      menuIcon: mdiDotsVertical,
+      plusIcon: mdiPlus,
+      minusIcon: mdiMinus,
       searchInput: null,
-      focused: false
+      focused: false,
+      dialog: false,
+      update: 0,
+      maxpersons: 2,
+      rules: [
+        data => {
+          if (data === null) return false
+          var list = this.day.jobkinddate.filter(a => {
+            if (a.job_kind === null) return false
+            else {
+              return a.job_kind.id === data.id
+            }
+          })
+          return list.length > 1 ? data.name + 'ist schon vorhanden' : false
+        }
+      ],
+      workerRules: [
+        (data, test) => {
+          console.log(data, test)
+          return false
+        }
+      ],
+      backup: null
     }
   },
   created() {
     this.setLoading(this.day.date)
-    //this.getUser({
-    //  date: this.day.date.getTime() / 1000,
-    //  startdatetime: this.day.date,
-    //  year: this.day.date.getFullYear(),
-    //  month: this.day.date.getMonth() + 1,
-    //  day: this.day.date.getDate()
-    //})
   },
   methods: {
     ...mapActions({
@@ -94,34 +253,69 @@ export default {
       deleteUser: 'sm/deleteUser',
       setLoading: 'sm/setDayLoading',
       setNotLoading: 'sm/setDayNotLoading',
-      lockDay: 'sm/lockDay'
+      lockDay: 'sm/lockDay',
+      updateJobKindDate: 'sm/updateJobKindDate'
     }),
+    forceRenderer(jobkind) {
+      console.log(jobkind)
+      this.update += 1
+      console.log('before', jobkind.worker, jobkind.backupWorker)
+      if (jobkind.backupWorker !== jobkind.worker && this.focused) {
+        let addedUser = null
+        for (let user in jobkind.worker) {
+          if (!jobkind.backupWorker.includes(jobkind.worker[user])) {
+            addedUser = jobkind.worker[user]
+            this.addUser({
+              date: this.day.date.getTime() / 1000,
+              user: addedUser,
+              year: this.day.date.getFullYear(),
+              month: this.day.date.getMonth() + 1,
+              day: this.day.date.getDate(),
+              job_kind: jobkind.job_kind
+            })
+          }
+        }
+        let deletedUser = null
+        for (let user in jobkind.backupWorker) {
+          if (!jobkind.worker.includes(jobkind.backupWorker[user])) {
+            deletedUser = jobkind.backupWorker[user]
+            this.deleteUser({
+              startdatetime: this.day.date,
+              date: this.day.date.getTime() / 1000,
+              user: deletedUser,
+              year: this.day.date.getFullYear(),
+              month: this.day.date.getMonth() + 1,
+              day: this.day.date.getDate()
+            })
+          }
+        }
+      }
+      jobkind.backupWorker = [...jobkind.worker]
+    },
     // eslint-disable-next-line no-unused-vars
-    remove(deletedUser) {
-      const obj = this.day.worker.find(a => {
+    remove(jobkind, deletedUser) {
+      jobkind.worker.indexOf()
+      const obj = jobkind.worker.find(a => {
         return a.username === deletedUser.username
       })
-      const index = this.day.worker.indexOf(obj)
-      if (index >= 0) this.day.worker.splice(index, 1)
-      this.deleteUser({
-        startdatetime: this.day.date,
-        date: this.day.date.getTime() / 1000,
-        user: deletedUser,
-        year: this.day.date.getFullYear(),
-        month: this.day.date.getMonth() + 1,
-        day: this.day.date.getDate()
-      })
+      const index = jobkind.worker.indexOf(obj)
+      if (index >= 0) jobkind.worker.splice(index, 1)
+      this.forceRenderer(jobkind)
     },
-    color: day => {
+    color(day) {
       if (day) {
         if (day.date.getDay() === 0 || day.date.getDay() === 1) {
           return 'grey lighten-4'
         } else {
-          if (day.worker.length < 2) {
-            return 'yellow'
-          } else {
-            return 'light-green'
+          var retVal = 'yellow'
+          retVal = 'light-green'
+          for (var jobkind in day.jobkinddate) {
+            if (day.jobkinddate[jobkind].worker.length >= day.jobkinddate[jobkind].maxpersons)
+              retVal = 'light-green'
+            else
+              return 'yellow'
           }
+          return retVal
         }
       } else {
         return 'grey lighten-4'
@@ -134,16 +328,122 @@ export default {
         day: this.day.date.getDate(),
         locked: !this.day.locked
       })
+    },
+    createBarJobKindDate(maxpersons) {
+      this.day.jobkinddate.push({
+        id: -1,
+        job_kind: Object.assign(
+          {},
+          this.jobkinds.find(a => {
+            return a.id === 1
+          })
+        ),
+        maxpersons: maxpersons,
+        daydate: {
+          year: this.day.date.getFullYear(),
+          month: this.day.date.getMonth() + 1,
+          day: this.day.date.getDate()
+        },
+        worker: [],
+        backupWorker: []
+      })
+    },
+    addJobKindDate() {
+      this.day.jobkinddate.push({
+        id: -1,
+        job_kind: null,
+        maxpersons: 2,
+        new: true,
+        daydate: {
+          year: this.day.date.getFullYear(),
+          month: this.day.date.getMonth() + 1,
+          day: this.day.date.getDate()
+        },
+        worker: [],
+        backupWorker: []
+      })
+    },
+    mop(jobkind) {
+      console.log(jobkind.worker)
+    },
+    deleteJobKindDate(index) {
+      if (this.day.jobkinddate[index].id === -1) {
+        this.day.jobkinddate.splice(index, 1)
+      } else {
+        this.day.jobkinddate[index].backupid = this.day.jobkinddate[index].id
+        this.day.jobkinddate[index].id = 0
+      }
+    },
+    undoDelteJobKindDate(index) {
+      this.day.jobkinddate[index].id = this.day.jobkinddate[index].backupid
+    },
+    saveJobKind() {
+      this.updateJobKindDate({
+        data: this.day.jobkinddate,
+        date: this.day.date
+      })
+      this.dialog = false
+    },
+    filterWorker() {},
+    filterUser(jobkind) {
+      var filtered = this.dbUsers.filter(user => {
+        var test = this.day.jobkinddate.find(item => {
+          if (item.job_kind === null) {
+            return false
+          }
+          if (item.job_kind.id === jobkind.id) {
+            return false
+          }
+          return item.worker.find(work => {
+            return work.id === user.id
+          })
+        })
+        if (test) {
+          return false
+        }
+        if (jobkind.workgroup === null) {
+          return true
+        }
+        return user.workgroups.find(workgroup => {
+          if (jobkind.workgroup && workgroup) {
+            return jobkind.workgroup.id === workgroup.id
+          } else return true
+        })
+      })
+      return filtered
+    },
+    // eslint-disable-next-line no-unused-vars
+    filterJobKinds(jobkinddateitem, index) {
+      var retVal = this.jobkinds.filter(jobkind => {
+        return jobkind.id !== 1
+      })
+      retVal = retVal.filter(jobkind => {
+        return !this.day.jobkinddate.find(item => {
+          if (item.job_kind === jobkinddateitem.job_kind) {
+            return false
+          } else {
+            if (item.job_kind !== null && jobkind !== null)
+              if (item.job_kind.id === jobkind.id) return true
+          }
+          return false
+        })
+      })
+      return retVal
     }
   },
   computed: {
     ...mapGetters({
       allUsers: 'sm/allUsers',
-      disabled: 'sm/disabled'
+      dbUsers: 'usermanager/users',
+      disabled: 'sm/disabled',
+      jobkinds: 'jkm/jobkinds'
     }),
     worker() {
       return this.day.worker
     },
+    tada() {
+      return this.day.jobkinddate
+    },
     lockedColor() {
       return this.day.locked ? 'red' : 'green'
     },
@@ -152,6 +452,27 @@ export default {
     },
     lockedTextBtn() {
       return this.day.locked ? 'freigeben' : 'sperren'
+    },
+    isBarDienstIn() {
+      for (var jobkinddate in this.day.jobkinddate) {
+        if (!(this.day.jobkinddate[jobkinddate].job_kind === null))
+          if (this.day.jobkinddate[jobkinddate].job_kind.id === 1) return true
+      }
+      return false
+    },
+    existJobKinds() {
+      var retVal = [...this.jobkinds]
+      retVal.splice(
+        retVal.findIndex(a => {
+          return a.id === 1
+        }),
+        1
+      )
+      return retVal
+    },
+    disableAddBtn() {
+      var barset = this.isBarDienstIn ? 0 : 1
+      return this.day.jobkinddate.length === this.jobkinds.length - barset
     }
   },
   watch: {
@@ -185,16 +506,15 @@ export default {
           }
         }
       }
+    },
+    dialog(newValue) {
+      if (newValue) {
+        this.backup = [...this.day.jobkinddate]
+      } else {
+        this.day.jobkinddate = [...this.backup]
+        this.backup = []
+      }
     }
-    //day() {
-    //  this.getUser({
-    //    date: this.day.date.getTime() / 1000,
-    //    startdatetime: this.day.date,
-    //    year: this.day.date.getFullYear(),
-    //    month: this.day.date.getMonth() + 1,
-    //    day: this.day.date.getDate()
-    //  })
-    //}
   }
 }
 </script>
diff --git a/src/plugins/routes.js b/src/plugins/routes.js
index 66b4282..faee231 100644
--- a/src/plugins/routes.js
+++ b/src/plugins/routes.js
@@ -31,13 +31,15 @@ const url = {
       addUser: main + 'sm/addUser',
       deleteUser: main + 'sm/deleteUser',
       getUser: main + 'sm/getUser',
-      getUsers: main + 'sm/getUsers',
+      getUsers: main + 'user/jobs',
       lockDay: main + 'sm/lockDay',
       searchUser: main + 'sm/searchWithExtern',
       jobkind: main + 'sm/JobKind',
       getAllJobKindsbKinds: main + 'sm/getAllJobKinds',
       getJobKind: main + 'sm/getJobKind',
-      deleteJobKind: main + 'sm/deleteJobKind'
+      deleteJobKind: main + 'sm/deleteJobKind',
+      updateJobKindDates: main + 'jk/JobKindDate',
+      getJobKindDates: main + 'jk/JobKindDate'
     },
     um: {
       setStatus: main + 'um/setStatus',
diff --git a/src/store/modules/serviceManagement.js b/src/store/modules/serviceManagement.js
index a195db8..7158aec 100644
--- a/src/store/modules/serviceManagement.js
+++ b/src/store/modules/serviceManagement.js
@@ -48,7 +48,8 @@ const mutations = {
             name: 'Montag',
             worker: [],
             loading: false,
-            locked: false
+            locked: false,
+            jobkinddate: []
           }
           break
         case 2:
@@ -58,7 +59,8 @@ const mutations = {
             name: 'Dienstag',
             worker: [],
             loading: false,
-            locked: false
+            locked: false,
+            jobkinddate: []
           }
           break
         case 3:
@@ -73,7 +75,8 @@ const mutations = {
               name: 'Mittwoch',
               worker: [],
               loading: false,
-              locked: false
+              locked: false,
+              jobkinddate: []
             }
           }
           break
@@ -84,7 +87,8 @@ const mutations = {
             name: 'Donnerstag',
             worker: [],
             loading: false,
-            locked: false
+            locked: false,
+            jobkinddate: []
           }
           break
         case 5:
@@ -94,7 +98,8 @@ const mutations = {
             name: 'Freitag',
             worker: [],
             loading: false,
-            locked: false
+            locked: false,
+            jobkinddate: []
           }
           break
         case 6:
@@ -104,7 +109,8 @@ const mutations = {
             name: 'Samstag',
             worker: [],
             loading: false,
-            locked: false
+            locked: false,
+            jobkinddate: []
           }
           break
         case 0:
@@ -114,7 +120,8 @@ const mutations = {
             name: 'Sontag',
             worker: [],
             loading: false,
-            locked: false
+            locked: false,
+            jobkinddate: []
           }
           break
       }
@@ -155,32 +162,72 @@ const mutations = {
       week.endDate = week.days.monday.date
     }
   },
-  updateMonth: (state, data) => {
-    const date = new Date(data.start.year, data.start.month - 1, data.start.day)
-    const user = data.user
-    for (let week = 0; week < state.month.length; week++) {
-      for (let day in state.month[week].days) {
-        if (state.month[week].days[day].date - date === 0) {
-          if (user) {
-            let worker = state.month[week].days[day].worker.find(a => {
-              return a.username === user.username
-            })
-            if (!worker && data.com === 'add') {
-              state.month[week].days[day].worker.push({
-                firstname: user.firstname,
-                lastname: user.lastname,
-                username: user.username,
-                fullName: user.firstname + ' ' + user.lastname
-              })
-            }
-          }
-          if (data.day) {
-            state.month[week].days[day].locked = data.day.locked
-          }
-        }
+  // eslint-disable-next-line no-unused-vars
+  updateMonthWorker: (state, { workers, date, getters }) => {
+    var day = getters.getDay(date)
+    for (var worker in workers) {
+      var jobkind = day.jobkinddate.find(jobkind => {
+        return (
+          jobkind.job_kind.id ===
+          (workers[worker].job_kind ? workers[worker].job_kind.id : 1)
+        )
+      })
+      if (jobkind) {
+        jobkind.worker.push(workers[worker].user)
+        jobkind.backupWorker.push(workers[worker].user)
       }
     }
   },
+  updateMonthLocked: (state, { locked, date, getters }) => {
+    var day = getters.getDay(date)
+    day.locked = !!locked
+  },
+  updateMonthJobkind: (state, { data, date, getters }) => {
+    let day = getters.getDay(date)
+    var backup = []
+
+    for (let jobkind in day.jobkinddate) {
+      if (day.jobkinddate[jobkind].worker !== undefined) {
+        backup.push({
+          id: day.jobkinddate[jobkind].job_kind.id,
+          worker: day.jobkinddate[jobkind].worker,
+          backupWorker: day.jobkinddate[jobkind].backupWorker
+        })
+      } else {
+        backup.push({
+          id: day.jobkinddate[jobkind].job_kind.id,
+          worker: [],
+          backupWorker: []
+        })
+      }
+    }
+    day.jobkinddate = [...data]
+    var test = day.jobkinddate.find(jobkind => {
+      return jobkind.job_kind.id === 1
+    })
+    if (!test) {
+      day.jobkinddate.push({
+        id: -1,
+        job_kind: { id: 1, name: 'Bardienst' },
+        maxpersons: 2,
+        daydate: {
+          year: date.getFullYear(),
+          month: date.getMonth() + 1,
+          day: date.getDate()
+        },
+        worker: [],
+        backupWorker: []
+      })
+    }
+    for (var jobkind in day.jobkinddate) {
+      var worker = backup.find(item => {
+        return item.id === day.jobkinddate[jobkind].job_kind.id
+      })
+      day.jobkinddate[jobkind].worker = worker ? worker.worker : []
+      day.jobkinddate[jobkind].backupWorker = worker ? worker.backupWorker : []
+    }
+
+  },
   setAllDayLoading: state => {
     for (let week = 0; week < state.month.length; week++) {
       for (let day in state.month[week].days) {
@@ -221,6 +268,7 @@ const actions = {
   // eslint-disable-next-line no-unused-vars
   async addUser({ commit, rootState, dispatch }, data) {
     try {
+      // eslint-disable-next-line no-unused-vars
       const response = await axios.post(
         url.vorstand.sm.addUser,
         { ...data },
@@ -228,7 +276,7 @@ const actions = {
           headers: { Token: rootState.login.user.accessToken }
         }
       )
-      commit('updateMonth', { ...response.data[0], com: 'add' })
+      //commit('updateMonth', { ...response.data[0], com: 'add' })
       dispatch('getLifeTime', null, { root: true })
     } catch (e) {
       if (e.response)
@@ -244,24 +292,29 @@ const actions = {
         { ...data },
         { headers: { Token: rootState.login.user.accessToken } }
       )
-      for (let day in response.data) {
-        for (let item = 0; item < response.data[day].worker.length; item++) {
-          commit('updateMonth', {
-            ...response.data[day].worker[item],
-            com: 'add',
-            day: response.data[day].day
-          })
-        }
-        commit('updateMonth', {
-          start: response.data[day].day.date,
-          day: response.data[day].day
-        })
+      console.log(response.data)
+      for (var day in response.data) {
         var date = new Date(
           response.data[day].day.date.year,
           response.data[day].day.date.month - 1,
           response.data[day].day.date.day
         )
-        commit('setDayNotLoading', { date: date, getters })
+        commit('updateMonthJobkind', {
+          data: [...response.data[day].jobkinddate],
+          date,
+          getters
+        })
+        commit('updateMonthWorker', {
+          workers: [...response.data[day].worker],
+          date,
+          getters
+        })
+        commit('updateMonthLocked', {
+          locked: response.data[day].day.locked,
+          date,
+          getters
+        })
+        commit('setDayNotLoading', { date, getters })
       }
     } catch (e) {
       if (e.response)
@@ -303,7 +356,7 @@ const actions = {
         { ...data },
         { headers: { Token: rootState.login.user.accessToken } }
       )
-      commit('updateMonth', { ...data, com: 'delete' })
+      //commit('updateMonth', { ...data, com: 'delete' })
       dispatch('getLifeTime', null, { root: true })
     } catch (e) {
       if (e.response)
@@ -324,6 +377,25 @@ const actions = {
         if (e.response.status === 401) dispatch('logout', null, { root: true })
     }
   },
+  async updateJobKindDate(
+    { commit, rootState, dispatch, getters },
+    { data, date }
+  ) {
+    try {
+      commit('setDayLoading', { date, getters })
+      const response = await axios.post(
+        url.vorstand.sm.updateJobKindDates,
+        [...data],
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('updateMonthJobkind', { data: response.data, date, getters })
+      commit('setDayNotLoading', { date, getters })
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
   setDayLoading({ commit, getters }, date) {
     commit('setDayLoading', { date, getters })
   },

From 0a6994e107204f9d5cd3782709727e0883760743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Fri, 22 May 2020 21:38:15 +0200
Subject: [PATCH 04/12] fix with extern user

---
 src/components/vorstand/ServiceManagement.vue |  2 +-
 src/store/modules/userManager.js              | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/components/vorstand/ServiceManagement.vue b/src/components/vorstand/ServiceManagement.vue
index e4fdddb..f49de24 100644
--- a/src/components/vorstand/ServiceManagement.vue
+++ b/src/components/vorstand/ServiceManagement.vue
@@ -109,7 +109,7 @@ export default {
       getAllUsers: 'sm/getAllUsers',
       getUsers: 'sm/getUsers',
       lockDay: 'sm/lockDay',
-      getDBUsers: 'usermanager/getUsers',
+      getDBUsers: 'usermanager/getUsersWithExtern',
       getAllJobKinds: 'jkm/getAllJobKinds',
     }),
     changeMonth(value) {
diff --git a/src/store/modules/userManager.js b/src/store/modules/userManager.js
index c63ec42..76a60a5 100644
--- a/src/store/modules/userManager.js
+++ b/src/store/modules/userManager.js
@@ -79,6 +79,23 @@ const actions = {
       const response = await axios.get(url.getUsers, {
         headers: { Token: rootState.login.user.accessToken }
       })
+      console.log(response.data)
+      commit('setUsers', response.data)
+      commit('setUsersLoading', false)
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      commit('setUsersLoading', false)
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
+  async getUsersWithExtern({ commit, rootState, dispatch }) {
+    try {
+      commit('setUsersLoading', true)
+      const response = await axios.get(url.getUsers + '?extern=1', {
+        headers: { Token: rootState.login.user.accessToken }
+      })
+      console.log(response.data)
       commit('setUsers', response.data)
       commit('setUsersLoading', false)
       dispatch('getLifeTime', null, { root: true })

From b4f5735947132639f81bb86e4c0f48e85b103407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Sun, 24 May 2020 22:11:41 +0200
Subject: [PATCH 05/12] =?UTF-8?q?user=20k=C3=B6nnen=20sich=20in=20verschie?=
 =?UTF-8?q?dene=20dienstarten=20eintragen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/user/Jobs.vue                  |   7 +-
 src/components/user/Jobs/Day.vue              | 182 ++++++++++++------
 .../ServiceManagementComponents/Day.vue       |   1 -
 src/plugins/routes.js                         |   4 +-
 src/store/modules/jobs.js                     | 175 ++++++++++++-----
 src/store/modules/serviceManagement.js        |  26 ---
 6 files changed, 251 insertions(+), 144 deletions(-)

diff --git a/src/components/user/Jobs.vue b/src/components/user/Jobs.vue
index 02fd66b..64ad1e5 100644
--- a/src/components/user/Jobs.vue
+++ b/src/components/user/Jobs.vue
@@ -70,6 +70,7 @@ export default {
     }
   },
   created() {
+    this.getActiveUser()
     for (let intDate = 1; intDate < 7; intDate++) {
       if (
         new Date(
@@ -81,6 +82,7 @@ export default {
         if (this.date.getDate() < intDate)
           this.date = new Date(this.date.getFullYear(), this.date.getMonth(), 0)
     }
+    this.getAllJobKinds()
     this.createMonth(this.date)
     this.getAllUsers()
     this.getUsers({
@@ -103,10 +105,13 @@ export default {
   },
   methods: {
     ...mapActions({
+      getActiveUser: 'user/getUser',
       getTransactJobs: 'requestJobs/getTransactJobs',
       createMonth: 'jobs/createMonth',
       getAllUsers: 'jobs/getAllUsers',
-      getUsers: 'jobs/getUsers'
+      getUsers: 'jobs/getUsers',
+      getDBUsers: 'usermanager/getUsersWithExtern',
+      getAllJobKinds: 'jkm/getAllJobKinds',
     }),
     changeMonth(value) {
       if (value === -1) {
diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue
index bbdacac..bed17f9 100644
--- a/src/components/user/Jobs/Day.vue
+++ b/src/components/user/Jobs/Day.vue
@@ -3,7 +3,7 @@
     <v-card :color="color(day)" max-width="250px" min-width="250px">
       <v-card-title v-if="day.date" class="subtitle-1 font-weight-bold">
         {{ day.name }} den {{ day.date.getDate() }}.{{
-        day.date.getMonth() + 1
+          day.date.getMonth() + 1
         }}.{{ day.date.getFullYear() }}
       </v-card-title>
       <v-card-text>
@@ -14,25 +14,36 @@
         </v-expand-transition>
         <v-expand-transition>
           <div v-show="!day.loading">
-            <div v-for="worker in day.worker" :key="day.worker.indexOf(worker)">
-              <v-chip
-                style="margin: 3px;"
-                :close="
-                  (user(worker) && !day.locked) || (canDelete && user(worker))
-                "
-                @click:close="
-                  deleteJob({
-                    year: day.date.getFullYear(),
-                    month: day.date.getMonth() + 1,
-                    day: day.date.getDate()
-                  })
-                "
-              >{{ worker.firstname }} {{ worker.lastname }}</v-chip>
+            <div
+              v-for="(jobkinddateitem, index) in day.jobkinddate"
+              :key="index"
+            >
+              <div class="title black--text text-sm-center">
+                {{ jobkinddateitem.job_kind.name }}
+              </div>
+              <v-combobox
+                multiple
+                filled
+                disabled
+                readonly
+                :counter="jobkinddateitem.maxpersons"
+                v-model="jobkinddateitem.worker"
+                :item-text="item => item.firstname + ' ' + item.lastname"
+                item-value="username"
+                chips
+                append-icon=""
+              >
+                <template v-slot:selection="data">
+                  <v-chip
+                    >{{ data.item.firstname }} {{ data.item.lastname }}</v-chip
+                  >
+                </template>
+              </v-combobox>
             </div>
           </div>
         </v-expand-transition>
       </v-card-text>
-      <div v-if="userInWorker && day.locked">
+      <div v-if="userInWorker() && day.locked">
         <v-card-actions class="text--secondary">
           <v-autocomplete
             return-object
@@ -50,7 +61,10 @@
             </template>
             <template v-slot:item="data">
               <v-list-item-content>
-                <v-list-item-title>{{ data.item.firstname }} {{ data.item.lastname }}</v-list-item-title>
+                <v-list-item-title
+                  >{{ data.item.firstname }}
+                  {{ data.item.lastname }}</v-list-item-title
+                >
               </v-list-item-content>
             </template>
           </v-autocomplete>
@@ -59,35 +73,43 @@
           <v-btn text block @click="send">senden</v-btn>
         </v-card-actions>
       </div>
-      <v-card-actions class="text--secondary">
-        <div v-if="!userInWorker">
-          <div v-if="day.locked">
-            Du kannst dich nicht zum Bardienst eintragen, da der Tag gesperrt
-            ist.
-          </div>
-          <div v-else-if="day.worker.length >= 2">
-            Du kannst dich nicht Bardienst eintragen, da mehr als 2 Personen
-            schon eingetragen sind.
-          </div>
-          <div v-else>Hier kannst du dich zum Bardienst eintragen.</div>
+      <v-card-actions
+        class="text--secondary"
+        v-if="!day.loading"
+        v-show="filterAddJob.length > 0 && !userInWorker()"
+      >
+        <div>
+          <div>Hier kannst du dich zum Bardienst eintragen.</div>
+          <v-spacer />
+          <v-menu
+            v-model="menu"
+            open-on-hover
+            close-on-click
+            close-on-content-click
+            offset-y
+          >
+            <template v-slot:activator="{ on }">
+              <v-btn
+                text
+                v-on="on"
+                v-show="filterAddJob.length > 0 && !userInWorker()"
+              >
+                Eintragen
+              </v-btn>
+            </template>
+            <v-list>
+              <v-list-item
+                v-for="(jobkinddateitem, index) in filterAddJob"
+                :key="index"
+                @click="addingJob(jobkinddateitem)"
+              >
+                <v-list-item-title>
+                  {{ jobkinddateitem.job_kind.name }}
+                </v-list-item-title>
+              </v-list-item>
+            </v-list>
+          </v-menu>
         </div>
-        <v-spacer />
-        <v-btn
-          text
-          v-if="
-            !day.locked &&
-              !day.loading &&
-              day.worker.length < 2 &&
-              !userInWorker
-          "
-          @click="
-            addJob({
-              year: day.date.getFullYear(),
-              month: day.date.getMonth() + 1,
-              day: day.date.getDate()
-            })
-          "
-        >Eintragen</v-btn>
       </v-card-actions>
     </v-card>
   </div>
@@ -105,7 +127,9 @@ export default {
     return {
       account_add: mdiAccountPlus,
       searchInput: null,
-      requestUser: null
+      requestUser: null,
+      menu: false,
+      update: 0
     }
   },
   created() {
@@ -134,11 +158,17 @@ export default {
         if (day.date.getDay() === 0 || day.date.getDay() === 1) {
           return 'grey lighten-4'
         } else {
-          if (day.worker.length < 2) {
-            return 'yellow'
-          } else {
-            return 'light-green'
+          var retVal = 'yellow'
+          retVal = 'light-green'
+          for (var jobkind in day.jobkinddate) {
+            if (
+              day.jobkinddate[jobkind].worker.length >=
+              day.jobkinddate[jobkind].maxpersons
+            )
+              retVal = 'light-green'
+            else return 'yellow'
           }
+          return retVal
         }
       } else {
         return 'grey lighten-4'
@@ -146,20 +176,37 @@ export default {
     },
     user(worker) {
       return worker.username === this.activeUser.username
+    },
+    addingJob(jobkinddateitem) {
+      this.addJob({
+        year: this.day.date.getFullYear(),
+        month: this.day.date.getMonth() + 1,
+        day: this.day.date.getDate(),
+        job_kind: jobkinddateitem.job_kind
+      })
+      this.menu = false
+      setTimeout(() => {
+        this.update += 1
+      }, 200)
+      console.log('after adding Job', this.day.jobkinddate)
+    },
+    userInWorker() {
+      var jobkinddate = this.day.jobkinddate.find(item => {
+        return item.worker.find(workeritem => {
+          return workeritem.id === this.activeUser.id
+        })
+      })
+      console.log('userin', !!jobkinddate, !jobkinddate)
+      return !!jobkinddate
     }
   },
   computed: {
     ...mapGetters({
       disabled: 'jobs/disabled',
-      activeUser: 'user',
+      activeUser: 'user/user',
       allUsers: 'jobs/allUsers',
       transactJobs: 'requestJobs/transactJobs'
     }),
-    userInWorker() {
-      return this.day.worker.find(a => {
-        return a.username === this.activeUser.username
-      })
-    },
     specifiedUsers() {
       var users = [...this.allUsers]
       for (var i in this.day.worker) {
@@ -179,11 +226,24 @@ export default {
         return a.accepted && a.answerd
       })
       return test
-    }
-  },
-  watch: {
-    worker() {
-      return this.day.worker
+    },
+    filterAddJob() {
+      var retVal = this.day.jobkinddate.filter(item => {
+        if (item.maxpersons <= item.worker.length) {
+          return false
+        }
+        if (!item.job_kind.workgroup) {
+          return true
+        } else {
+          if (this.activeUser.workgroups) {
+            return this.activeUser.workgroups.find(workgroup => {
+              return workgroup.id === item.job_kind.workgroup.id
+            })
+          }
+        }
+      })
+      console.log('filterAddJob', retVal, retVal.length > 0, this.user.workgroups)
+      return retVal
     }
   }
 }
diff --git a/src/components/vorstand/ServiceManagementComponents/Day.vue b/src/components/vorstand/ServiceManagementComponents/Day.vue
index 270f0e8..2fdefdb 100644
--- a/src/components/vorstand/ServiceManagementComponents/Day.vue
+++ b/src/components/vorstand/ServiceManagementComponents/Day.vue
@@ -249,7 +249,6 @@ export default {
   methods: {
     ...mapActions({
       addUser: 'sm/addUser',
-      getUser: 'sm/getUser',
       deleteUser: 'sm/deleteUser',
       setLoading: 'sm/setDayLoading',
       setNotLoading: 'sm/setDayNotLoading',
diff --git a/src/plugins/routes.js b/src/plugins/routes.js
index faee231..a746b8a 100644
--- a/src/plugins/routes.js
+++ b/src/plugins/routes.js
@@ -1,6 +1,6 @@
 //const main = 'https://192.168.5.128:5000/'
-const main = 'http://localhost:5000/'
-//const main = 'http://192.168.5.118:5000/'
+//const main = 'http://localhost:5000/'
+const main = 'http://192.168.5.118:5000/'
 //const main = 'https://groeger-clan.duckdns.org:5000/'
 
 const url = {
diff --git a/src/store/modules/jobs.js b/src/store/modules/jobs.js
index 2fd0ca2..07c93cc 100644
--- a/src/store/modules/jobs.js
+++ b/src/store/modules/jobs.js
@@ -52,7 +52,8 @@ const mutations = {
             name: 'Montag',
             worker: [],
             loading: false,
-            locked: false
+            locked: false,
+            jobkinddate: []
           }
           break
         case 2:
@@ -62,7 +63,8 @@ const mutations = {
             name: 'Dienstag',
             worker: [],
             loading: false,
-            locked: false
+            locked: false,
+            jobkinddate: []
           }
           break
         case 3:
@@ -77,7 +79,8 @@ const mutations = {
               name: 'Mittwoch',
               worker: [],
               loading: false,
-              locked: false
+              locked: false,
+              jobkinddate: []
             }
           }
           break
@@ -88,7 +91,8 @@ const mutations = {
             name: 'Donnerstag',
             worker: [],
             loading: false,
-            locked: false
+            locked: false,
+            jobkinddate: []
           }
           break
         case 5:
@@ -98,7 +102,8 @@ const mutations = {
             name: 'Freitag',
             worker: [],
             loading: false,
-            locked: false
+            locked: false,
+            jobkinddate: []
           }
           break
         case 6:
@@ -108,7 +113,8 @@ const mutations = {
             name: 'Samstag',
             worker: [],
             loading: false,
-            locked: false
+            locked: false,
+            jobkinddate: []
           }
           break
         case 0:
@@ -118,7 +124,8 @@ const mutations = {
             name: 'Sontag',
             worker: [],
             loading: false,
-            locked: false
+            locked: false,
+            jobkinddate: []
           }
           break
       }
@@ -155,6 +162,80 @@ const mutations = {
       }
     }
   },
+  // eslint-disable-next-line no-unused-vars
+  updateMonthWorker: (state, { workers, date, getters }) => {
+    var day = getters.getDay(date)
+    day.jobkinddate.forEach(item => {
+      var filtered = workers.filter(worker => {
+        return item.job_kind.id === (worker.job_kind ? worker.job_kind.id : 1)
+      })
+      var filteredWorkers = []
+      filtered.forEach(item => {
+        filteredWorkers.push(item.user)
+      })
+      filteredWorkers.forEach(worker => {
+        if (!item.worker.find(a => {return a.id === worker.id})) {
+          item.worker.push(worker)
+        }
+      })
+      item.worker.forEach(worker => {
+        if (!filteredWorkers.find(a => {return a.id === worker.id})) {
+          item.worker.splice(item.worker.indexOf(worker), 1)
+        }
+      })
+    })
+    console.log(day)
+  },
+  updateMonthLocked: (state, { locked, date, getters }) => {
+    var day = getters.getDay(date)
+    day.locked = !!locked
+  },
+  updateMonthJobkind: (state, { data, date, getters }) => {
+    let day = getters.getDay(date)
+    var backup = []
+
+    for (let jobkind in day.jobkinddate) {
+      if (day.jobkinddate[jobkind].worker !== undefined) {
+        backup.push({
+          id: day.jobkinddate[jobkind].job_kind.id,
+          worker: day.jobkinddate[jobkind].worker,
+          backupWorker: day.jobkinddate[jobkind].backupWorker
+        })
+      } else {
+        backup.push({
+          id: day.jobkinddate[jobkind].job_kind.id,
+          worker: [],
+          backupWorker: []
+        })
+      }
+    }
+    day.jobkinddate = [...data]
+    var test = day.jobkinddate.find(jobkind => {
+      return jobkind.job_kind.id === 1
+    })
+    if (!test) {
+      day.jobkinddate.push({
+        id: -1,
+        job_kind: { id: 1, name: 'Bardienst' },
+        maxpersons: 2,
+        daydate: {
+          year: date.getFullYear(),
+          month: date.getMonth() + 1,
+          day: date.getDate()
+        },
+        worker: [],
+        backupWorker: []
+      })
+    }
+    for (var jobkind in day.jobkinddate) {
+      var worker = backup.find(item => {
+        return item.id === day.jobkinddate[jobkind].job_kind.id
+      })
+      day.jobkinddate[jobkind].worker = worker ? worker.worker : []
+      day.jobkinddate[jobkind].backupWorker = worker ? worker.backupWorker : []
+    }
+
+  },
   setAllDayLoading: state => {
     for (let week = 0; week < state.month.length; week++) {
       for (let day in state.month[week].days) {
@@ -239,62 +320,44 @@ const actions = {
     commit('setAllDayLoading')
     try {
       const response = await axios.post(
-        url.user.jobs,
-        { ...data },
-        { headers: { Token: rootState.login.user.accessToken } }
+          url.vorstand.sm.getUsers,
+          { ...data },
+          { headers: { Token: rootState.login.user.accessToken } }
       )
-      for (let day in response.data) {
-        for (let item = 0; item < response.data[day].worker.length; item++) {
-          commit('updateMonth', {
-            ...response.data[day].worker[item],
-            com: 'add',
-            day: response.data[day].day
-          })
-        }
-        commit('updateMonth', {
-          start: response.data[day].day.date,
-          day: response.data[day].day
-        })
+      console.log(response.data)
+      for (var day in response.data) {
         var date = new Date(
-          response.data[day].day.date.year,
-          response.data[day].day.date.month - 1,
-          response.data[day].day.date.day
+            response.data[day].day.date.year,
+            response.data[day].day.date.month - 1,
+            response.data[day].day.date.day
         )
-        commit('setDayNotLoading', { date: date, getters })
-      }
-    } catch (e) {
-      if (e.response)
-        if (e.response.status === 401) dispatch('logout', null, { root: true })
-    }
-  },
-  async getUser({ commit, rootState, dispatch, getters }, data) {
-    commit('setDayLoading', { date: data.startdatetime, getters })
-    try {
-      const response = await axios.post(
-        url.user.job,
-        { ...data },
-        { headers: { Token: rootState.login.user.accessToken } }
-      )
-      for (let item = 0; item < response.data.worker.length; item++) {
-        commit('updateMonth', {
-          ...response.data.worker[item],
-          com: 'add',
-          day: response.data.day
+        commit('updateMonthJobkind', {
+          data: [...response.data[day].jobkinddate],
+          date,
+          getters
         })
+        commit('updateMonthWorker', {
+          workers: [...response.data[day].worker],
+          date,
+          getters
+        })
+        commit('updateMonthLocked', {
+          locked: response.data[day].day.locked,
+          date,
+          getters
+        })
+        commit('setDayNotLoading', { date, getters })
       }
-      commit('updateMonth', {
-        start: response.data.day.date,
-        day: response.data.day
-      })
-      commit('setDayNotLoading', { date: data.startdatetime, getters })
-      dispatch('getLifeTime', null, { root: true })
     } catch (e) {
       if (e.response)
         if (e.response.status === 401) dispatch('logout', null, { root: true })
     }
   },
-  async addJob({ commit, rootState, dispatch }, data) {
+  async addJob({ commit, rootState, dispatch, getters }, data) {
+    var date = new Date(data.year, data.month - 1, data.day)
+    commit('setDayLoading', {date, getters})
     try {
+
       const response = await axios.post(
         url.user.addJob,
         { ...data },
@@ -302,7 +365,13 @@ const actions = {
           headers: { Token: rootState.login.user.accessToken }
         }
       )
-      commit('updateMonth', { ...response.data[0], com: 'add' })
+      console.log(response.data)
+      commit('updateMonthWorker', {
+        workers: [...response.data],
+        date: new Date(data.year, data.month - 1, data.day),
+        getters
+      })
+      commit('setDayNotLoading', {date, getters})
       dispatch('getLifeTime', null, { root: true })
     } catch (e) {
       if (e.response)
diff --git a/src/store/modules/serviceManagement.js b/src/store/modules/serviceManagement.js
index 7158aec..8ff9436 100644
--- a/src/store/modules/serviceManagement.js
+++ b/src/store/modules/serviceManagement.js
@@ -321,32 +321,6 @@ const actions = {
         if (e.response.status === 401) dispatch('logout', null, { root: true })
     }
   },
-  async getUser({ commit, rootState, dispatch, getters }, data) {
-    commit('setDayLoading', { date: data.startdatetime, getters })
-    try {
-      const response = await axios.post(
-        url.vorstand.sm.getUser,
-        { ...data },
-        { headers: { Token: rootState.login.user.accessToken } }
-      )
-      for (let item = 0; item < response.data.worker.length; item++) {
-        commit('updateMonth', {
-          ...response.data.worker[item],
-          com: 'add',
-          day: response.data.day
-        })
-      }
-      commit('updateMonth', {
-        start: response.data.day.date,
-        day: response.data.day
-      })
-      commit('setDayNotLoading', { date: data.startdatetime, getters })
-      dispatch('getLifeTime', null, { root: true })
-    } catch (e) {
-      if (e.response)
-        if (e.response.status === 401) dispatch('logout', null, { root: true })
-    }
-  },
   // eslint-disable-next-line no-unused-vars
   async deleteUser({ commit, rootState, dispatch }, data) {
     try {

From 6dd5f75d2e4e180743a745cbcfe75a028486bc30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Sun, 24 May 2020 23:24:58 +0200
Subject: [PATCH 06/12] =?UTF-8?q?fixed,=20dass=20wenn=20die=20dienst=C3=BC?=
 =?UTF-8?q?bersicht=20neu=20geladen=20wird,=20man=20bei=20dem=20gleichen?=
 =?UTF-8?q?=20Monat=20bleibt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/user/Jobs.vue                  | 45 +++++++---
 src/components/user/Jobs/Day.vue              | 86 +++++++++++--------
 src/components/user/UserNavigation.vue        |  2 +-
 .../vorstand/ManagementNavigation.vue         |  3 +-
 src/components/vorstand/ServiceManagement.vue | 38 +++++---
 src/plugins/routes.js                         |  4 +-
 src/router/index.js                           |  5 +-
 7 files changed, 111 insertions(+), 72 deletions(-)

diff --git a/src/components/user/Jobs.vue b/src/components/user/Jobs.vue
index 64ad1e5..21d465b 100644
--- a/src/components/user/Jobs.vue
+++ b/src/components/user/Jobs.vue
@@ -4,7 +4,7 @@
       <v-toolbar-title>Dienstübersicht</v-toolbar-title>
       <v-spacer />
       <v-toolbar-items>
-        <v-btn text icon @click="changeMonth(-1)">
+        <v-btn text icon :to="{name: 'userJobs', params: {year: date.getFullYear(), month: date.getMonth()}}">
           <v-icon>{{ keyboard_arrow_left }}</v-icon>
         </v-btn>
         <v-list-item>
@@ -13,7 +13,7 @@
             {{ date.getFullYear() }}
           </v-list-item-title>
         </v-list-item>
-        <v-btn text icon @click="changeMonth(1)">
+        <v-btn text icon :to="{name: 'userJobs', params: {year: date.getFullYear(), month: date.getMonth() +2}}">
           <v-icon>{{ keyboard_arrow_right }}</v-icon>
         </v-btn>
       </v-toolbar-items>
@@ -52,7 +52,7 @@ export default {
     return {
       keyboard_arrow_left: mdiChevronLeft,
       keyboard_arrow_right: mdiChevronRight,
-      date: new Date(),
+      date: new Date(this.$route.params.year, this.$route.params.month -1, 1),
       monthArray: [
         'Januar',
         'Februar',
@@ -71,17 +71,6 @@ export default {
   },
   created() {
     this.getActiveUser()
-    for (let intDate = 1; intDate < 7; intDate++) {
-      if (
-        new Date(
-          this.date.getFullYear(),
-          this.date.getMonth(),
-          intDate
-        ).getDay() === 3
-      )
-        if (this.date.getDate() < intDate)
-          this.date = new Date(this.date.getFullYear(), this.date.getMonth(), 0)
-    }
     this.getAllJobKinds()
     this.createMonth(this.date)
     this.getAllUsers()
@@ -140,6 +129,34 @@ export default {
       startDate: 'jobs/getStartDate',
       endDate: 'jobs/getEndDate'
     })
+  },
+  watch: {
+    $route() {
+      this.getActiveUser()
+      console.log(this.$route.params)
+      console.log(this.date)
+      this.date = new Date(this.$route.params.year, this.$route.params.month - 1, 1)
+      this.getAllJobKinds()
+      this.createMonth(this.date)
+      this.getAllUsers()
+      this.getUsers({
+        from_date: {
+          year: this.startDate.getFullYear(),
+          month: this.startDate.getMonth() + 1,
+          day: this.startDate.getDate()
+        },
+        to_date: {
+          year: this.endDate.getFullYear(),
+          month: this.endDate.getMonth() + 1,
+          day: this.endDate.getDate()
+        }
+      })
+      this.getTransactJobs({
+        year: this.date.getFullYear(),
+        month: this.date.getMonth() + 1,
+        day: 1
+      })
+    }
   }
 }
 </script>
diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue
index bed17f9..05a8bd3 100644
--- a/src/components/user/Jobs/Day.vue
+++ b/src/components/user/Jobs/Day.vue
@@ -73,42 +73,47 @@
           <v-btn text block @click="send">senden</v-btn>
         </v-card-actions>
       </div>
-      <v-card-actions
-        class="text--secondary"
-        v-if="!day.loading"
-        v-show="filterAddJob.length > 0 && !userInWorker()"
-      >
-        <div>
+      <v-card-actions class="text--secondary" v-if="!day.loading">
+        <div v-show="filterAddJob.length > 0 && !userInWorker()">
           <div>Hier kannst du dich zum Bardienst eintragen.</div>
           <v-spacer />
-          <v-menu
-            v-model="menu"
-            open-on-hover
-            close-on-click
-            close-on-content-click
-            offset-y
-          >
-            <template v-slot:activator="{ on }">
-              <v-btn
-                text
-                v-on="on"
-                v-show="filterAddJob.length > 0 && !userInWorker()"
-              >
-                Eintragen
-              </v-btn>
-            </template>
-            <v-list>
-              <v-list-item
-                v-for="(jobkinddateitem, index) in filterAddJob"
-                :key="index"
-                @click="addingJob(jobkinddateitem)"
-              >
-                <v-list-item-title>
-                  {{ jobkinddateitem.job_kind.name }}
-                </v-list-item-title>
-              </v-list-item>
-            </v-list>
-          </v-menu>
+          <div class="text-right">
+            <v-menu
+                    v-model="menu"
+                    open-on-hover
+                    close-on-click
+                    close-on-content-click
+                    offset-y
+            >
+              <template v-slot:activator="{ on }">
+                <v-spacer/>
+                <v-btn
+                        text
+                        v-on="on"
+                        v-show="filterAddJob.length > 0 && !userInWorker()"
+                >
+                  Eintragen
+                </v-btn>
+              </template>
+              <v-list>
+                <v-list-item
+                        v-for="(jobkinddateitem, index) in filterAddJob"
+                        :key="index"
+                        @click="addingJob(jobkinddateitem)"
+                >
+                  <v-list-item-title>
+                    {{ jobkinddateitem.job_kind.name }}
+                  </v-list-item-title>
+                </v-list-item>
+              </v-list>
+            </v-menu>
+          </div>
+        </div>
+
+        <v-spacer/>
+        <div v-show="userInWorker()">
+          <v-btn v-show="jobkindWithSpace.length !== 0" text>Einladen</v-btn>
+          <v-btn v-show="day.locked" text>Abgeben</v-btn>
         </div>
       </v-card-actions>
     </v-card>
@@ -188,7 +193,6 @@ export default {
       setTimeout(() => {
         this.update += 1
       }, 200)
-      console.log('after adding Job', this.day.jobkinddate)
     },
     userInWorker() {
       var jobkinddate = this.day.jobkinddate.find(item => {
@@ -196,7 +200,6 @@ export default {
           return workeritem.id === this.activeUser.id
         })
       })
-      console.log('userin', !!jobkinddate, !jobkinddate)
       return !!jobkinddate
     }
   },
@@ -227,6 +230,16 @@ export default {
       })
       return test
     },
+    jobkindWithSpace() {
+      var retVal = this.day.jobkinddate.filter(item => {
+        if (item.maxpersons <= item.worker.length)
+          return false
+        else
+          return true
+      })
+      return retVal
+    }
+    ,
     filterAddJob() {
       var retVal = this.day.jobkinddate.filter(item => {
         if (item.maxpersons <= item.worker.length) {
@@ -242,7 +255,6 @@ export default {
           }
         }
       })
-      console.log('filterAddJob', retVal, retVal.length > 0, this.user.workgroups)
       return retVal
     }
   }
diff --git a/src/components/user/UserNavigation.vue b/src/components/user/UserNavigation.vue
index a9aa1b0..2ea94ca 100644
--- a/src/components/user/UserNavigation.vue
+++ b/src/components/user/UserNavigation.vue
@@ -14,7 +14,7 @@
       </v-list-item-icon>
       <v-list-item-title>Finanzübersicht</v-list-item-title>
     </v-list-item>
-    <v-list-item link to="/main/user/jobs">
+    <v-list-item link :to="{name: 'userJobs', params: {year: new Date().getFullYear(), month: new Date().getMonth() + 1}}">
       <v-list-item-icon>
         <v-icon>
           {{ briefcase }}
diff --git a/src/components/vorstand/ManagementNavigation.vue b/src/components/vorstand/ManagementNavigation.vue
index 46ffe61..026e900 100644
--- a/src/components/vorstand/ManagementNavigation.vue
+++ b/src/components/vorstand/ManagementNavigation.vue
@@ -1,7 +1,6 @@
 <template>
   <v-list>
-    <v-list-item link to="/main/management/servicemanagement">
-      <v-list-item-icon>
+    <v-list-item link :to="{name: 'serviceManagement', params: {year: new Date().getFullYear(), month: new Date().getMonth() + 1}}">      <v-list-item-icon>
         <v-icon>{{ work }}</v-icon>
       </v-list-item-icon>
       <v-list-item-title>
diff --git a/src/components/vorstand/ServiceManagement.vue b/src/components/vorstand/ServiceManagement.vue
index f49de24..cd28cf6 100644
--- a/src/components/vorstand/ServiceManagement.vue
+++ b/src/components/vorstand/ServiceManagement.vue
@@ -4,7 +4,7 @@
       <v-toolbar-title>Dienstverwaltung</v-toolbar-title>
       <v-spacer />
       <v-toolbar-items>
-        <v-btn text icon @click="changeMonth(-1)">
+        <v-btn text icon :to="{name: 'serviceManagement', params: {year: date.getFullYear(), month: date.getMonth()}}">
           <v-icon>{{ keyboard_arrow_left }}</v-icon>
         </v-btn>
         <v-list-item>
@@ -13,7 +13,7 @@
             {{ date.getFullYear() }}
           </v-list-item-title>
         </v-list-item>
-        <v-btn text icon @click="changeMonth(1)">
+        <v-btn text icon :to="{name: 'serviceManagement', params: {year: date.getFullYear(), month: date.getMonth() + 2}}">
           <v-icon>{{ keyboard_arrow_right }}</v-icon>
         </v-btn>
       </v-toolbar-items>
@@ -57,7 +57,7 @@ export default {
       keyboard_arrow_left: mdiChevronLeft,
       keyboard_arrow_right: mdiChevronRight,
       id: 0,
-      date: new Date(),
+      date: new Date(this.$route.params.year, this.$route.params.month -1, 1),
       monthArray: [
         'Januar',
         'Februar',
@@ -75,17 +75,6 @@ export default {
     }
   },
   created() {
-    for (let intDate = 1; intDate < 7; intDate++) {
-      if (
-        new Date(
-          this.date.getFullYear(),
-          this.date.getMonth(),
-          intDate
-        ).getDay() === 3
-      )
-        if (this.date.getDate() < intDate)
-          this.date = new Date(this.date.getFullYear(), this.date.getMonth(), 0)
-    }
     this.getAllJobKinds()
     this.createMonth(this.date)
     this.getAllUsers()
@@ -152,6 +141,27 @@ export default {
       startDate: 'sm/getStartDate',
       endDate: 'sm/getEndDate'
     })
+  },
+  watch: {
+    $route() {
+      this.date = new Date(this.$route.params.year, this.$route.params.month - 1, 1)
+      this.getAllJobKinds()
+      this.createMonth(this.date)
+      this.getAllUsers()
+      this.getDBUsers()
+      this.getUsers({
+        from_date: {
+          year: this.startDate.getFullYear(),
+          month: this.startDate.getMonth() + 1,
+          day: this.startDate.getDate()
+        },
+        to_date: {
+          year: this.endDate.getFullYear(),
+          month: this.endDate.getMonth() + 1,
+          day: this.endDate.getDate()
+        }
+      })
+    }
   }
 }
 </script>
diff --git a/src/plugins/routes.js b/src/plugins/routes.js
index a746b8a..f78b094 100644
--- a/src/plugins/routes.js
+++ b/src/plugins/routes.js
@@ -1,7 +1,7 @@
 //const main = 'https://192.168.5.128:5000/'
 //const main = 'http://localhost:5000/'
-const main = 'http://192.168.5.118:5000/'
-//const main = 'https://groeger-clan.duckdns.org:5000/'
+//const main = 'http://192.168.5.118:5000/'
+const main = 'https://groeger-clan.duckdns.org:5000/'
 
 const url = {
   login: main + 'login',
diff --git a/src/router/index.js b/src/router/index.js
index c7a8f16..8f12010 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -54,7 +54,8 @@ const routes = [
         components: { nav: ManagementNavigation, default: BarView },
         children: [
           {
-            path: 'servicemanagement',
+            name: 'serviceManagement',
+            path: 'servicemanagement/:year/:month',
             component: ServiceManagement
           },
           {
@@ -92,7 +93,7 @@ const routes = [
             component: Config
           },
           {
-            path: 'jobs',
+            path: 'jobs/:year/:month',
             name: 'userJobs',
             component: Jobs
           },

From 057304c5be68b159c56a11429c5b1a8481eb26e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Wed, 27 May 2020 12:09:54 +0200
Subject: [PATCH 07/12] =?UTF-8?q?user=20k=C3=B6nnen=20andere=20einladen,?=
 =?UTF-8?q?=20es=20gibt=20eine=20=C3=BCbersicht=20der=20einladungen=20mit?=
 =?UTF-8?q?=20notification,=20user=20kann=20sich=20in=20dienst=C3=BCbersic?=
 =?UTF-8?q?ht=20ausloggen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TitleBar.vue                   |   2 +-
 src/components/baruser/BarNavigation.vue      |   2 +-
 .../finanzer/FinanzerNavigation.vue           |   2 +-
 src/components/gastro/GastroNavigation.vue    |   2 +-
 src/components/user/JobRequests.vue           | 250 -------------
 .../user/JobRequests/JobInvites.vue           | 118 ++++++
 .../user/JobRequests/JobTransfer.vue          |  17 +
 src/components/user/Jobs.vue                  |  58 +--
 src/components/user/Jobs/Day.vue              | 309 +++++++++-------
 src/components/user/JobsRequest.vue           |  50 +++
 src/components/user/UserNavigation.vue        |  48 ++-
 .../vorstand/ManagementNavigation.vue         |   6 +-
 src/plugins/routes.js                         |  13 +-
 src/router/index.js                           |  20 +-
 src/store/index.js                            |   6 +-
 src/store/modules/jobInvites.js               | 344 ++++++++++++++++++
 src/store/modules/jobRequests.js              | 161 --------
 src/store/modules/jobs.js                     |  29 +-
 src/store/modules/serviceManagement.js        |   2 -
 src/views/MainView.vue                        |  10 +-
 20 files changed, 838 insertions(+), 611 deletions(-)
 delete mode 100644 src/components/user/JobRequests.vue
 create mode 100644 src/components/user/JobRequests/JobInvites.vue
 create mode 100644 src/components/user/JobRequests/JobTransfer.vue
 create mode 100644 src/components/user/JobsRequest.vue
 create mode 100644 src/store/modules/jobInvites.js
 delete mode 100644 src/store/modules/jobRequests.js

diff --git a/src/components/TitleBar.vue b/src/components/TitleBar.vue
index d480505..457a321 100644
--- a/src/components/TitleBar.vue
+++ b/src/components/TitleBar.vue
@@ -17,7 +17,7 @@
     <v-btn icon v-if="isUser" disabled>
       <v-icon>{{person}}</v-icon>
     </v-btn>
-    <v-btn icon to="/pricelist">
+    <v-btn icon :to="{name: 'priceListNoLogin'}">
       <v-icon>{{list}}</v-icon>
     </v-btn>
   </v-app-bar>
diff --git a/src/components/baruser/BarNavigation.vue b/src/components/baruser/BarNavigation.vue
index 380a618..ef58718 100644
--- a/src/components/baruser/BarNavigation.vue
+++ b/src/components/baruser/BarNavigation.vue
@@ -1,6 +1,6 @@
 <template>
   <v-list>
-    <v-list-item link to="/main/bar/geruecht">
+    <v-list-item link :to="{name: 'geruecht'}">
       <v-list-item-icon>
         <v-icon>{{ glass_mug_variant }}</v-icon>
       </v-list-item-icon>
diff --git a/src/components/finanzer/FinanzerNavigation.vue b/src/components/finanzer/FinanzerNavigation.vue
index 81696ac..1add063 100644
--- a/src/components/finanzer/FinanzerNavigation.vue
+++ b/src/components/finanzer/FinanzerNavigation.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <v-list>
-      <v-list-item class="title" link to="/main/finanzer/overview">
+      <v-list-item class="title" link :to="{name: 'overview'}">
         <v-list-item-icon>
           <v-icon>{{home}}</v-icon>
         </v-list-item-icon>
diff --git a/src/components/gastro/GastroNavigation.vue b/src/components/gastro/GastroNavigation.vue
index 6de79f8..36ccbfb 100644
--- a/src/components/gastro/GastroNavigation.vue
+++ b/src/components/gastro/GastroNavigation.vue
@@ -1,6 +1,6 @@
 <template>
     <v-list>
-        <v-list-item class="title" link to="/main/gastro/pricelist">
+        <v-list-item class="title" link :to="{name: 'gastroPricelist'}">
             <v-list-item-icon>
                 <v-icon>{{list}}</v-icon>
             </v-list-item-icon>
diff --git a/src/components/user/JobRequests.vue b/src/components/user/JobRequests.vue
deleted file mode 100644
index 1260bb8..0000000
--- a/src/components/user/JobRequests.vue
+++ /dev/null
@@ -1,250 +0,0 @@
-<template>
-  <div>
-    <v-toolbar>
-      <v-toolbar-title>
-        Dienstanfragen
-      </v-toolbar-title>
-    </v-toolbar>
-    <v-card tile flat>
-      <v-card-title>
-        Gesendete Anfragen
-      </v-card-title>
-      <v-progress-circular indeterminate v-if="transactJobsLoading" />
-      <div v-for="job in transactJobs" :key="transactJobs.indexOf(job)">
-        <v-expand-transition>
-          <v-card tile style="margin-top: 3px">
-            <v-card-text>
-              <v-row>
-                <v-col>
-                  <v-combobox
-                          outlined
-                          label="An"
-                          :value="job.to_user.firstname + ' ' + job.to_user.lastname"
-                          readonly
-                          append-icon
-                  >
-                    <template v-slot:selection="data">
-                      <v-chip>
-                        {{ data.item }}
-                      </v-chip>
-                    </template>
-                  </v-combobox>
-                </v-col>
-                <v-col>
-                  <v-combobox
-                          outlined
-                          label="Datum"
-                          :value="
-                    job.date.getDate() +
-                      '.' +
-                      (job.date.getMonth() + 1) +
-                      '.' +
-                      job.date.getFullYear()
-                  "
-                          readonly
-                          append-icon
-                  >
-                    <template v-slot:selection="data">
-                      <v-chip>
-                        {{ data.item }}
-                      </v-chip>
-                    </template>
-                  </v-combobox>
-                </v-col>
-                <v-col>
-                  <v-combobox
-                          outlined
-                          label="Status"
-                          :value="acceptedStatus(job)"
-                          readonly
-                          append-icon
-                  >
-                    <template v-slot:selection="data">
-                      <v-chip :color="statusColor(job)">
-                        {{ data.item }}
-                      </v-chip>
-                    </template>
-                  </v-combobox>
-                </v-col>
-              </v-row>
-            </v-card-text>
-            <v-card-actions v-if="!job.answerd">
-              <v-spacer/>
-              <v-btn
-                      @click="
-                deleteTransactJob({
-                  username: job.to_user.username,
-                  year: job.date.getFullYear(),
-                  month: job.date.getMonth() + 1,
-                  day: job.date.getDate()
-                })
-              "
-              >Stornieren
-              </v-btn
-              >
-            </v-card-actions>
-          </v-card>
-        </v-expand-transition>
-      </div>
-    </v-card>
-    <v-divider />
-    <v-card tile flat>
-      <v-card-title>
-        Eingehende Anfragen
-      </v-card-title>
-      <v-progress-circular indeterminate v-if="requestJobsLoading" />
-      <div v-for="job in requestJobs" :key="requestJobs.indexOf(job)">
-        <v-card tile style="margin-top: 3px">
-          <v-card-text>
-            <v-row>
-              <v-col>
-                <v-combobox
-                  outlined
-                  label="Von"
-                  :value="
-                    job.from_user.firstname + ' ' + job.from_user.lastname
-                  "
-                  readonly
-                  append-icon
-                >
-                  <template v-slot:selection="data">
-                    <v-chip>
-                      {{ data.item }}
-                    </v-chip>
-                  </template>
-                </v-combobox>
-              </v-col>
-              <v-col>
-                <v-combobox
-                  outlined
-                  label="Datum"
-                  :value="
-                    job.date.getDate() +
-                      '.' +
-                      (job.date.getMonth() + 1) +
-                      '.' +
-                      job.date.getFullYear()
-                  "
-                  readonly
-                  append-icon
-                >
-                  <template v-slot:selection="data">
-                    <v-chip>
-                      {{ data.item }}
-                    </v-chip>
-                  </template>
-                </v-combobox>
-              </v-col>
-              <v-col>
-                <v-combobox
-                  outlined
-                  label="Status"
-                  :value="acceptedStatus(job)"
-                  readonly
-                  append-icon
-                >
-                  <template v-slot:selection="data">
-                    <v-chip :color="statusColor(job)">
-                      {{ data.item }}
-                    </v-chip>
-                  </template>
-                </v-combobox>
-              </v-col>
-            </v-row>
-          </v-card-text>
-          <v-expand-transition>
-            <v-card-actions v-if="!job.answerd">
-              <v-spacer />
-              <v-btn
-                color="red"
-                @click="
-                  answerJob({
-                    username: job.from_user.username,
-                    year: job.date.getFullYear(),
-                    month: job.date.getMonth() + 1,
-                    day: job.date.getDate(),
-                    answer: false
-                  })
-                "
-                >Ablehnen
-              </v-btn>
-              <v-btn
-                color="green"
-                @click="
-                  answerJob({
-                    username: job.from_user.username,
-                    year: job.date.getFullYear(),
-                    month: job.date.getMonth() + 1,
-                    day: job.date.getDate(),
-                    answer: true
-                  })
-                "
-                >Annehmen
-              </v-btn>
-            </v-card-actions>
-          </v-expand-transition>
-        </v-card>
-      </div>
-    </v-card>
-  </div>
-</template>
-
-<script>
-import { mapGetters, mapActions } from 'vuex'
-export default {
-  name: 'JobRequests',
-  methods: {
-    ...mapActions({
-      getTransactJobs: 'requestJobs/getTransactJobs',
-      getRequestJobs: 'requestJobs/getRequestJobs',
-      answerJob: 'requestJobs/answerTransactJob',
-      deleteTransactJob: 'requestJobs/deleteTransactJob'
-    })
-  },
-  computed: {
-    ...mapGetters({
-      transactJobs: 'requestJobs/transactJobs',
-      transactJobsLoading: 'requestJobs/transactJobsLoading',
-      requestJobs: 'requestJobs/requestJobs',
-      requestJobsLoading: 'requestJobs/requestJobsLoading'
-    }),
-    acceptedStatus() {
-      return job => {
-        if (!job.answerd) {
-          return 'gesendet'
-        }
-        if (job.answerd && job.accepted) {
-          return 'angenommen'
-        }
-        return 'abgelehnt'
-      }
-    },
-    statusColor() {
-      return job => {
-        if (!job.answerd) {
-          return
-        }
-        if (job.answerd && job.accepted) {
-          return 'green'
-        }
-        return 'red'
-      }
-    }
-  },
-  created() {
-    var now = new Date()
-    this.getTransactJobs({
-      year: now.getFullYear(),
-      month: now.getMonth() + 1,
-      day: now.getDate()
-    })
-    this.getRequestJobs({
-      year: now.getFullYear(),
-      month: now.getMonth() + 1,
-      day: now.getDate()
-    })
-  }
-}
-</script>
-
-<style scoped></style>
diff --git a/src/components/user/JobRequests/JobInvites.vue b/src/components/user/JobRequests/JobInvites.vue
new file mode 100644
index 0000000..37fdf28
--- /dev/null
+++ b/src/components/user/JobRequests/JobInvites.vue
@@ -0,0 +1,118 @@
+<template>
+  <div>
+    <v-row align="center" justify="center" v-if="jobInvitesLoading">
+      <v-progress-circular indeterminate color="grey" />
+    </v-row>
+    <v-expansion-panels>
+      <v-expansion-panel
+        v-for="jobInvite in jobInvitesToMe"
+        :key="jobInvite.id"
+        @click="seenJobIvnite(jobInvite)"
+      >
+        <v-expansion-panel-header>
+          <div>
+            {{ jobInvite.on_date.getDate() }}.{{
+              jobInvite.on_date.getMonth() + 1
+            }}.{{ jobInvite.on_date.getFullYear() }} von
+            {{ jobInvite.from_user.firstname }}
+            {{ jobInvite.from_user.lastname }}
+          </div>
+          <v-row
+            style="margin-right: 5px"
+            v-show="userInWorker(jobInvite)"
+          >
+            <v-spacer />
+            <v-icon color="green">
+              {{ check }}
+            </v-icon>
+          </v-row>
+        </v-expansion-panel-header>
+        <v-expansion-panel-content>
+          <v-row>
+            <v-spacer />
+            <v-btn text @click="updatingJobInvite(jobInvite)">
+              <v-icon>
+                {{ jobInvite.watched ? seen : notSeen }}
+              </v-icon>
+            </v-btn>
+          </v-row>
+          <Day
+            v-bind:day="jobInvite.day"
+            :long="true"
+            @addingJob="addingJob(jobInvite, $event)"
+          />
+        </v-expansion-panel-content>
+      </v-expansion-panel>
+    </v-expansion-panels>
+  </div>
+</template>
+
+<script>
+import { mapActions, mapGetters } from 'vuex'
+import { mdiEyeOff, mdiEyeCheck, mdiCheck } from '@mdi/js'
+import Day from '@/components/user/Jobs/Day'
+export default {
+  name: 'JobInvites',
+  components: { Day },
+  data() {
+    return {
+      notSeen: mdiEyeOff,
+      seen: mdiEyeCheck,
+      check: mdiCheck,
+      showNotSeen: false,
+      showSeen: false,
+      update: 0
+    }
+  },
+  methods: {
+    ...mapActions({
+      getJobInvites: 'jobInvites/getJobInvites',
+      addJob: 'jobInvites/addJob',
+      updateJobInviteToMe: 'jobInvites/updateJobInviteToMe'
+    }),
+    forceRender() {
+      setTimeout(() => {
+        this.update += 0
+      }, 500)
+    },
+    updatingJobInvite(jobInvite) {
+      jobInvite.watched = !jobInvite.watched
+      this.updateJobInviteToMe(jobInvite)
+    },
+    seenJobIvnite(jobInvite) {
+      if (!jobInvite.watched) {
+        jobInvite.watched = true
+        this.updateJobInviteToMe(jobInvite)
+      }
+    },
+    addingJob(jobInvite, event) {
+      this.seenJobIvnite(jobInvite)
+      this.addJob(event)
+      this.forceRender()
+    },
+    userInWorker(jobinvite) {
+      var jobkinddate = jobinvite.day.jobkinddate.find(item => {
+        return item.worker.find(workeritem => {
+          return workeritem.id === this.activeUser.id
+        })
+      })
+      return !!jobkinddate
+    }
+  },
+  computed: {
+    ...mapGetters({
+      jobInvitesFromMe: 'jobInvites/jobInvitesFromMe',
+      jobInvitesToMe: 'jobInvites/jobInvitesToMe',
+      jobInvitesLoading: 'jobInvites/jobInvitesLoading',
+      activeUser: 'user/user'
+    })
+  },
+  created() {
+    setTimeout(() => {
+      this.getJobInvites(new Date())
+    }, 200)
+  }
+}
+</script>
+
+<style scoped></style>
diff --git a/src/components/user/JobRequests/JobTransfer.vue b/src/components/user/JobRequests/JobTransfer.vue
new file mode 100644
index 0000000..6601804
--- /dev/null
+++ b/src/components/user/JobRequests/JobTransfer.vue
@@ -0,0 +1,17 @@
+<template>
+    <div>
+        <h1>
+            Transfer
+        </h1>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "JobTransfer"
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/user/Jobs.vue b/src/components/user/Jobs.vue
index 21d465b..2d7a91d 100644
--- a/src/components/user/Jobs.vue
+++ b/src/components/user/Jobs.vue
@@ -4,7 +4,14 @@
       <v-toolbar-title>Dienstübersicht</v-toolbar-title>
       <v-spacer />
       <v-toolbar-items>
-        <v-btn text icon :to="{name: 'userJobs', params: {year: date.getFullYear(), month: date.getMonth()}}">
+        <v-btn
+          text
+          icon
+          :to="{
+            name: 'userJobs',
+            params: { year: date.getFullYear(), month: date.getMonth() }
+          }"
+        >
           <v-icon>{{ keyboard_arrow_left }}</v-icon>
         </v-btn>
         <v-list-item>
@@ -13,7 +20,14 @@
             {{ date.getFullYear() }}
           </v-list-item-title>
         </v-list-item>
-        <v-btn text icon :to="{name: 'userJobs', params: {year: date.getFullYear(), month: date.getMonth() +2}}">
+        <v-btn
+          text
+          icon
+          :to="{
+            name: 'userJobs',
+            params: { year: date.getFullYear(), month: date.getMonth() + 2 }
+          }"
+        >
           <v-icon>{{ keyboard_arrow_right }}</v-icon>
         </v-btn>
       </v-toolbar-items>
@@ -22,17 +36,17 @@
     <v-card v-for="week in month" :key="month.indexOf(week)" flat tile>
       <v-card-title class="subtitle-1 font-weight-bold">
         Woche vom {{ week.startDate.getDate() }}.{{
-        week.startDate.getMonth() + 1
+          week.startDate.getMonth() + 1
         }}.{{ week.startDate.getFullYear() }} bis
         {{ week.endDate.getDate() }}.{{ week.endDate.getMonth() + 1 }}.{{
-        week.endDate.getFullYear()
+          week.endDate.getFullYear()
         }}
       </v-card-title>
       <v-card-text>
         <v-row justify="start" align="start">
           <div v-for="day in week.days" :key="day.id">
             <v-col>
-              <Day v-bind:day="day" />
+              <Day :day="day" :long="false" @addingJob="addJob" @sendInvites="setJobInvites" @deletingJob="deleteJob"/>
             </v-col>
           </div>
         </v-row>
@@ -52,7 +66,7 @@ export default {
     return {
       keyboard_arrow_left: mdiChevronLeft,
       keyboard_arrow_right: mdiChevronRight,
-      date: new Date(this.$route.params.year, this.$route.params.month -1, 1),
+      date: new Date(this.$route.params.year, this.$route.params.month - 1, 1),
       monthArray: [
         'Januar',
         'Februar',
@@ -71,9 +85,10 @@ export default {
   },
   created() {
     this.getActiveUser()
+    this.getJobInvites()
     this.getAllJobKinds()
     this.createMonth(this.date)
-    this.getAllUsers()
+    this.getDBUsers()
     this.getUsers({
       from_date: {
         year: this.startDate.getFullYear(),
@@ -86,21 +101,18 @@ export default {
         day: this.endDate.getDate()
       }
     })
-    this.getTransactJobs({
-      year: this.date.getFullYear(),
-      month: this.date.getMonth() + 1,
-      day: 1
-    })
   },
   methods: {
     ...mapActions({
       getActiveUser: 'user/getUser',
-      getTransactJobs: 'requestJobs/getTransactJobs',
       createMonth: 'jobs/createMonth',
-      getAllUsers: 'jobs/getAllUsers',
       getUsers: 'jobs/getUsers',
-      getDBUsers: 'usermanager/getUsersWithExtern',
+      getDBUsers: 'usermanager/getUsers',
       getAllJobKinds: 'jkm/getAllJobKinds',
+      addJob: 'jobs/addJob',
+      deleteJob: 'jobs/deleteJob',
+      setJobInvites: 'jobInvites/setJobInvites',
+      getJobInvites: 'jobInvites/getJobInvites'
     }),
     changeMonth(value) {
       if (value === -1) {
@@ -133,12 +145,15 @@ export default {
   watch: {
     $route() {
       this.getActiveUser()
-      console.log(this.$route.params)
-      console.log(this.date)
-      this.date = new Date(this.$route.params.year, this.$route.params.month - 1, 1)
+      this.getJobInvites()
+      this.date = new Date(
+        this.$route.params.year,
+        this.$route.params.month - 1,
+        1
+      )
       this.getAllJobKinds()
       this.createMonth(this.date)
-      this.getAllUsers()
+      this.getDBUsers()
       this.getUsers({
         from_date: {
           year: this.startDate.getFullYear(),
@@ -151,11 +166,6 @@ export default {
           day: this.endDate.getDate()
         }
       })
-      this.getTransactJobs({
-        year: this.date.getFullYear(),
-        month: this.date.getMonth() + 1,
-        day: 1
-      })
     }
   }
 }
diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue
index 05a8bd3..dca06d3 100644
--- a/src/components/user/Jobs/Day.vue
+++ b/src/components/user/Jobs/Day.vue
@@ -1,19 +1,23 @@
 <template>
   <div v-if="day">
-    <v-card :color="color(day)" max-width="250px" min-width="250px">
+    <v-card
+      :color="color(day)"
+      :max-width="long ? '' : '250px'"
+      :min-width="long ? '' : '250px'"
+    >
       <v-card-title v-if="day.date" class="subtitle-1 font-weight-bold">
-        {{ day.name }} den {{ day.date.getDate() }}.{{
-          day.date.getMonth() + 1
-        }}.{{ day.date.getFullYear() }}
+        {{ name }} den {{ day.date.getDate() }}.{{ day.date.getMonth() + 1 }}.{{
+          day.date.getFullYear()
+        }}
       </v-card-title>
       <v-card-text>
         <v-expand-transition>
-          <v-row align="center" justify="center" v-if="day.loading">
+          <v-row align="center" justify="center" v-if="dayLoading">
             <v-progress-circular indeterminate color="grey" />
           </v-row>
         </v-expand-transition>
         <v-expand-transition>
-          <div v-show="!day.loading">
+          <div v-show="!dayLoading">
             <div
               v-for="(jobkinddateitem, index) in day.jobkinddate"
               :key="index"
@@ -43,90 +47,112 @@
           </div>
         </v-expand-transition>
       </v-card-text>
-      <div v-if="userInWorker() && day.locked">
-        <v-card-actions class="text--secondary">
-          <v-autocomplete
-            return-object
-            v-model="requestUser"
-            :items="specifiedUsers"
-            item-text="fullName"
-            label="Dienstanfrage"
-            filled
-            color="green"
-            @input="searchInput = null"
-            :search-input.sync="searchInput"
-          >
-            <template v-slot:prepend-inner>
-              <v-icon>{{ account_add }}</v-icon>
-            </template>
-            <template v-slot:item="data">
-              <v-list-item-content>
-                <v-list-item-title
-                  >{{ data.item.firstname }}
-                  {{ data.item.lastname }}</v-list-item-title
-                >
-              </v-list-item-content>
-            </template>
-          </v-autocomplete>
-        </v-card-actions>
-        <v-card-actions>
-          <v-btn text block @click="send">senden</v-btn>
-        </v-card-actions>
-      </div>
-      <v-card-actions class="text--secondary" v-if="!day.loading">
-        <div v-show="filterAddJob.length > 0 && !userInWorker()">
-          <div>Hier kannst du dich zum Bardienst eintragen.</div>
-          <v-spacer />
-          <div class="text-right">
-            <v-menu
-                    v-model="menu"
-                    open-on-hover
-                    close-on-click
-                    close-on-content-click
-                    offset-y
+      <v-card-actions class="text--secondary" v-if="!dayLoading">
+        <v-spacer />
+        <v-menu
+          v-model="menu"
+          open-on-hover
+          close-on-click
+          close-on-content-click
+          offset-y
+        >
+          <template v-slot:activator="{ on }">
+            <v-btn
+              text
+              v-on="on"
+              v-show="filterAddJob.length > 0 && !userInWorker() && !day.locked"
             >
-              <template v-slot:activator="{ on }">
-                <v-spacer/>
-                <v-btn
-                        text
-                        v-on="on"
-                        v-show="filterAddJob.length > 0 && !userInWorker()"
-                >
-                  Eintragen
-                </v-btn>
-              </template>
-              <v-list>
-                <v-list-item
-                        v-for="(jobkinddateitem, index) in filterAddJob"
-                        :key="index"
-                        @click="addingJob(jobkinddateitem)"
-                >
-                  <v-list-item-title>
-                    {{ jobkinddateitem.job_kind.name }}
-                  </v-list-item-title>
-                </v-list-item>
-              </v-list>
-            </v-menu>
-          </div>
-        </div>
+              Eintragen
+            </v-btn>
+          </template>
+          <v-list>
+            <v-list-item
+              v-for="(jobkinddateitem, index) in filterAddJob"
+              :key="index"
+              @click="addingJob(jobkinddateitem)"
+            >
+              <v-list-item-title>
+                {{ jobkinddateitem.job_kind.name }}
+              </v-list-item-title>
+            </v-list-item>
+          </v-list>
+        </v-menu>
+        <v-menu v-model="menu_invite" :close-on-content-click="false">
+          <template v-slot:activator="{ on }">
+            <v-btn
+              v-show="
+                jobkindWithSpace.length !== 0 && !day.locked && userInWorker()
+              "
+              text
+              v-on="on"
+              >Einladen</v-btn
+            >
+          </template>
+          <v-card>
+            <v-card-title>
+              Einladungen
+            </v-card-title>
+            <v-card-text>
+              <v-tooltip
+                bottom
+                v-for="(invite, index) in getInvites(day.date)"
+                :key="index"
+              >
+                <template v-slot:activator="{ on }">
+                  <v-chip
+                    v-on="on"
+                    close
+                    style="margin: 5px"
+                    @click:close="deleteInvite(invite)"
+                  >
+                    {{ invite.to_user.firstname }} {{ invite.to_user.lastname }}
+                  </v-chip>
+                </template>
+                <span>Klicken um Einladung zu widerrufen.</span>
+              </v-tooltip>
+              <v-divider style="margin-bottom: 5px" />
+              <v-autocomplete
+                v-model="job_invites"
+                label="Einladungen senden an"
+                return-object
+                multiple
+                filled
+                :item-text="item => item.firstname + ' ' + item.lastname"
+                item-value="id"
+                chips
+                deletable-chips
+                :items="filteredDBUsers"
+              ></v-autocomplete>
+            </v-card-text>
+            <v-card-actions>
+              <v-spacer />
+              <v-btn
+                text
+                :disabled="job_invites.length === 0"
+                @click="sendInvites()"
+              >
+                {{ job_invites.length >= 1 ? 'Einladungen' : 'Einladung' }}
+                senden
+              </v-btn>
+            </v-card-actions>
+          </v-card>
+        </v-menu>
+        <v-btn v-show="!day.locked && userInWorker()" text @click="deletingJob()">Austragen</v-btn>
 
-        <v-spacer/>
-        <div v-show="userInWorker()">
-          <v-btn v-show="jobkindWithSpace.length !== 0" text>Einladen</v-btn>
-          <v-btn v-show="day.locked" text>Abgeben</v-btn>
-        </div>
+        <v-btn v-show="day.locked && userInWorker()" text>Abgeben</v-btn>
       </v-card-actions>
     </v-card>
   </div>
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex'
+import { mapGetters, mapActions } from 'vuex'
 import { mdiAccountPlus } from '@mdi/js'
 export default {
   name: 'Day',
   props: {
-    day: Object
+    day: Object,
+    long: Boolean
   },
   data() {
     return {
@@ -134,29 +160,33 @@ export default {
       searchInput: null,
       requestUser: null,
       menu: false,
-      update: 0
+      menu_invite: false,
+      update: 0,
+      job_invites: []
     }
   },
-  created() {
-    this.setLoading(this.day.date)
-  },
   methods: {
     ...mapActions({
-      setLoading: 'jobs/setDayLoading',
-      setNotLoading: 'jobs/setDayNotLoading',
-      addJob: 'jobs/addJob',
-      deleteJob: 'jobs/deleteJob',
-      transactJob: 'jobs/transactJob'
+      deleteInvite: 'jobInvites/deleteJobInviteFromMe'
     }),
-    send() {
-      this.transactJob({
-        user: this.requestUser.username,
-        year: this.day.date.getFullYear(),
-        month: this.day.date.getMonth() + 1,
-        day: this.day.date.getDate()
+    sendInvites() {
+      var sendData = []
+      this.job_invites.forEach(item => {
+        sendData.push({
+          from_user: this.activeUser,
+          to_user: item,
+          date: {
+            year: this.day.date.getFullYear(),
+            month: this.day.date.getMonth() + 1,
+            day: this.day.date.getDate()
+          }
+        })
       })
-      this.requestUser = null
-      this.searchInput = null
+      this.$emit('sendInvites', sendData)
+      setTimeout(() => {
+        this.job_invites = []
+      }, 200)
+      this.menu_invite = false
     },
     color: day => {
       if (day) {
@@ -183,7 +213,7 @@ export default {
       return worker.username === this.activeUser.username
     },
     addingJob(jobkinddateitem) {
-      this.addJob({
+      this.$emit('addingJob', {
         year: this.day.date.getFullYear(),
         month: this.day.date.getMonth() + 1,
         day: this.day.date.getDate(),
@@ -194,6 +224,16 @@ export default {
         this.update += 1
       }, 200)
     },
+    deletingJob() {
+      this.$emit('deletingJob', {
+        year: this.day.date.getFullYear(),
+        month: this.day.date.getMonth() + 1,
+        day: this.day.date.getDate()
+      })
+      setTimeout(() => {
+        this.update += 1
+      })
+    },
     userInWorker() {
       var jobkinddate = this.day.jobkinddate.find(item => {
         return item.worker.find(workeritem => {
@@ -201,45 +241,31 @@ export default {
         })
       })
       return !!jobkinddate
+    },
+    deletingInvite(jobInvite) {
+      let sendData = { ...jobInvite }
+      sendData.on_date = {
+        year: sendData.on_date.getFullYear(),
+        month: sendData.on_date.getMonth() + 1,
+        day: sendData.on_date.getDate()
+      }
+      this.deleteInvite(sendData)
     }
   },
   computed: {
     ...mapGetters({
-      disabled: 'jobs/disabled',
       activeUser: 'user/user',
-      allUsers: 'jobs/allUsers',
-      transactJobs: 'requestJobs/transactJobs'
+      allUsers: 'usermanager/users',
+      getDay: 'jobInvites/getDayFromMe',
+      getInvites: 'jobInvites/getDayWorkerFromMe'
     }),
-    specifiedUsers() {
-      var users = [...this.allUsers]
-      for (var i in this.day.worker) {
-        var worker = users.find(a => {
-          return a.username === this.day.worker[i].username
-        })
-        var index = users.indexOf(worker)
-        if (worker) users.splice(index, 1)
-      }
-      return users
-    },
-    canDelete() {
-      var transactJob = this.transactJobs.filter(a => {
-        return a.date - this.day.date === 0
-      })
-      var test = transactJob.find(a => {
-        return a.accepted && a.answerd
-      })
-      return test
-    },
     jobkindWithSpace() {
       var retVal = this.day.jobkinddate.filter(item => {
-        if (item.maxpersons <= item.worker.length)
-          return false
-        else
-          return true
+        if (item.maxpersons <= item.worker.length) return false
+        else return true
       })
       return retVal
-    }
-    ,
+    },
     filterAddJob() {
       var retVal = this.day.jobkinddate.filter(item => {
         if (item.maxpersons <= item.worker.length) {
@@ -256,6 +282,39 @@ export default {
         }
       })
       return retVal
+    },
+    filteredDBUsers() {
+      var retVal = this.allUsers.filter(user => {
+        var test = this.day.jobkinddate.find(item => {
+          return item.worker.find(workeritem => {
+            return workeritem.id === user.id
+          })
+        })
+        return !test
+      })
+      retVal = retVal.filter(user => {
+        let getedDay = this.getDay(this.day.date)
+        let test = getedDay
+          ? getedDay.find(day => {
+              return day.to_user.id === user.id
+            })
+          : false
+        return !test
+      })
+      return retVal
+    },
+    name() {
+      const name = this.day.date.getDay()
+      if (name === 0) return 'Sonntag'
+      else if (name === 1) return 'Montag'
+      else if (name === 2) return 'Dienstag'
+      else if (name === 3) return 'Mittwoche'
+      else if (name == 4) return 'Donnerstag'
+      else if (name === 5) return 'Freitag'
+      else return 'Samstag'
+    },
+    dayLoading() {
+      return this.day.loading
     }
   }
 }
diff --git a/src/components/user/JobsRequest.vue b/src/components/user/JobsRequest.vue
new file mode 100644
index 0000000..1d20c53
--- /dev/null
+++ b/src/components/user/JobsRequest.vue
@@ -0,0 +1,50 @@
+<template>
+  <div>
+    <v-bottom-navigation v-model="bottom_nav">
+      <v-btn :to="{ name: 'jobRequests', params: { kind: 'jobInvites' } }">
+          <v-badge color="red" :content="news" :value="news !== 0">Diensteinladungen</v-badge>
+      </v-btn>
+      <v-btn :to="{ name: 'jobRequests', params: { kind: 'jobTransfer' } }"
+        >Dienstübertragung</v-btn
+      >
+    </v-bottom-navigation>
+    <JobInvites v-if="kind === 'jobInvites'"></JobInvites>
+    <JobTransfer v-if="kind === 'jobTransfer'"></JobTransfer>
+  </div>
+</template>
+
+<script>
+import JobInvites from '@/components/user/JobRequests/JobInvites'
+import JobTransfer from '@/components/user/JobRequests/JobTransfer'
+import { mapActions, mapGetters } from 'vuex'
+export default {
+  name: 'JobsRequest',
+  components: { JobTransfer, JobInvites },
+  data() {
+    return {
+      bottom_nav: true,
+      kind: this.$route.params.kind
+    }
+  },
+  methods: {
+    ...mapActions({
+      getUser: 'user/getUser'
+    })
+  },
+  computed: {
+    ...mapGetters({
+      news: 'jobInvites/news'
+    })
+  },
+  created() {
+    this.getUser()
+  },
+  watch: {
+    $route() {
+      this.kind = this.$route.params.kind
+    }
+  }
+}
+</script>
+
+<style scoped></style>
diff --git a/src/components/user/UserNavigation.vue b/src/components/user/UserNavigation.vue
index 2ea94ca..7c76bd8 100644
--- a/src/components/user/UserNavigation.vue
+++ b/src/components/user/UserNavigation.vue
@@ -8,13 +8,22 @@
         Home
       </v-list-item-title>
     </v-list-item>
-    <v-list-item link to="/main/user/overview">
+    <v-list-item link :to="{ name: 'userOverview' }">
       <v-list-item-icon>
         <v-icon>{{ bank }}</v-icon>
       </v-list-item-icon>
       <v-list-item-title>Finanzübersicht</v-list-item-title>
     </v-list-item>
-    <v-list-item link :to="{name: 'userJobs', params: {year: new Date().getFullYear(), month: new Date().getMonth() + 1}}">
+    <v-list-item
+      link
+      :to="{
+        name: 'userJobs',
+        params: {
+          year: new Date().getFullYear(),
+          month: new Date().getMonth() + 1
+        }
+      }"
+    >
       <v-list-item-icon>
         <v-icon>
           {{ briefcase }}
@@ -22,15 +31,20 @@
       </v-list-item-icon>
       <v-list-item-title>Dienstübersicht</v-list-item-title>
     </v-list-item>
-    <v-list-item link to="/main/user/jobRequests">
+    <v-list-item
+      link
+      :to="{ name: 'jobRequests', params: { kind: 'jobInvites' } }"
+    >
       <v-list-item-icon>
-        <v-icon>
-          {{ switchAccount }}
-        </v-icon>
+        <v-badge overlap color="red" :content="news" :value="news !== 0">
+          <v-icon>
+            {{ switchAccount }}
+          </v-icon>
+        </v-badge>
       </v-list-item-icon>
       <v-list-item-title>Dienstanfragen</v-list-item-title>
     </v-list-item>
-    <v-list-item link to="/main/user/config">
+    <v-list-item link :to="{ name: 'userConfig' }">
       <v-list-item-icon>
         <v-icon>{{ account_card_details }}</v-icon>
       </v-list-item-icon>
@@ -47,6 +61,8 @@ import {
   mdiBriefcase,
   mdiAccountSwitch
 } from '@mdi/js'
+
+import { mapGetters, mapActions } from 'vuex'
 export default {
   name: 'UserNavigation',
   data() {
@@ -57,6 +73,24 @@ export default {
       briefcase: mdiBriefcase,
       switchAccount: mdiAccountSwitch
     }
+  },
+  methods: {
+    ...mapActions({
+      getJobInvites: 'jobInvites/getJobInvites',
+      getUser: 'user/getUser'
+    })
+  },
+  computed: {
+    ...mapGetters({
+      news: 'jobInvites/news'
+    })
+  },
+  created() {
+    this.getUser()
+    setTimeout(() => {
+      this.getJobInvites()
+    }, 500)
+
   }
 }
 </script>
diff --git a/src/components/vorstand/ManagementNavigation.vue b/src/components/vorstand/ManagementNavigation.vue
index 026e900..890ff3b 100644
--- a/src/components/vorstand/ManagementNavigation.vue
+++ b/src/components/vorstand/ManagementNavigation.vue
@@ -7,7 +7,7 @@
         Dienstverwaltung
       </v-list-item-title>
     </v-list-item>
-    <v-list-item link to="/main/management/usermanager">
+    <v-list-item link :to="{name: 'userManager'}">
       <v-list-item-icon>
         <v-icon>{{list}}</v-icon>
       </v-list-item-icon>
@@ -15,7 +15,7 @@
         Benutzerliste
       </v-list-item-title>
     </v-list-item>
-    <v-list-item link to="/main/management/workgroupmanagement">
+    <v-list-item link :to="{name: 'workgroupManagement'}">
       <v-list-item-icon>
         <v-icon>{{group}}</v-icon>
       </v-list-item-icon>
@@ -23,7 +23,7 @@
         Arbeitsgruppen
       </v-list-item-title>
     </v-list-item>
-    <v-list-item link to="/main/management/jobkindmanagement">
+    <v-list-item link :to="{name: 'jobkindManagement'}">
       <v-list-item-icon>
         <v-icon>???</v-icon>
       </v-list-item-icon>
diff --git a/src/plugins/routes.js b/src/plugins/routes.js
index f78b094..8269202 100644
--- a/src/plugins/routes.js
+++ b/src/plugins/routes.js
@@ -1,7 +1,7 @@
 //const main = 'https://192.168.5.128:5000/'
-//const main = 'http://localhost:5000/'
+const main = 'http://localhost:5000/'
 //const main = 'http://192.168.5.118:5000/'
-const main = 'https://groeger-clan.duckdns.org:5000/'
+//const main = 'https://groeger-clan.duckdns.org:5000/'
 
 const url = {
   login: main + 'login',
@@ -61,12 +61,11 @@ const url = {
     job: main + 'user/job',
     jobs: main + 'user/jobs',
     addJob: main + 'user/addJob',
+    getJobOnDates: main + 'user/jobsOnDates',
     deleteJob: main + 'user/deleteJob',
-    transactJob: main + 'user/transactJob',
-    answerTransactJob: main + 'user/answerTransactJob',
-    jobRequests: main + 'user/jobRequests',
-    getTransactJobs: main + 'user/getTransactJobs',
-    deleteTransactJobs: main + 'user/deleteTransactJob',
+    getJobInvites: main + 'user/getJobInvites',
+    setJobInvites: main + 'user/JobInvites',
+    deletJobInvite: main + 'user/deleteJobInvite',
     storno: main + 'user/storno',
     getAllStatus: main + 'getAllStatus',
     getStatus: main + 'getStatus',
diff --git a/src/router/index.js b/src/router/index.js
index 8f12010..aee9bd6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -17,7 +17,6 @@ import User from '../components/finanzer/User'
 import ServiceManagement from '../components/vorstand/ServiceManagement'
 import Config from '@/components/user/Config'
 import Jobs from '@/components/user/Jobs'
-import JobRequests from '@/components/user/JobRequests'
 import PriceList from '@/components/pricelist/PriceList'
 import ManagementNavigation from '@/components/vorstand/ManagementNavigation'
 import GastroNavigation from '@/components/gastro/GastroNavigation'
@@ -25,26 +24,29 @@ import PriceListView from '@/views/contents/PriceListView'
 import UserManager from '@/components/vorstand/UserManager'
 import WorkgroupManagement from "@/components/vorstand/WorkgroupManagement";
 import JobKindManager from "@/components/vorstand/JobKindManager";
+import JobsRequest from "@/components/user/JobsRequest";
 
 Vue.use(VueRouter)
 
+const rootPath = ''
+
 const routes = [
   {
-    path: '/cookies',
+    path: rootPath + '/cookies',
     name: 'cookies'
   },
   {
-    path: '/pricelist',
+    path: rootPath + '/pricelist',
     name: 'priceListNoLogin',
     component: PriceListView
   },
   {
-    path: '/login',
+    path: rootPath + '/login',
     name: 'login',
     component: Login
   },
   {
-    path: '/main',
+    path: rootPath + '/main',
     name: 'main',
     component: MainView,
     children: [
@@ -60,14 +62,17 @@ const routes = [
           },
           {
             path: 'usermanager',
+            name: 'userManager',
             component: UserManager
           },
           {
             path: 'workgroupmanagement',
+            name: 'workgroupManagement',
             component: WorkgroupManagement
           },
           {
             path: 'jobkindmanagement',
+            name: 'jobkindManagement',
             component: JobKindManager
           }
         ]
@@ -98,9 +103,9 @@ const routes = [
             component: Jobs
           },
           {
-            path: 'jobRequests',
+            path: 'jobRequests/:kind',
             name: 'jobRequests',
-            component: JobRequests
+            component: JobsRequest
           }
         ]
       },
@@ -123,6 +128,7 @@ const routes = [
         children: [
           {
             path: 'overview',
+            name: 'overview',
             component: Overview
           },
           {
diff --git a/src/store/index.js b/src/store/index.js
index eb63086..e212536 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -6,11 +6,11 @@ import barUsers from '@/store/modules/barUsers'
 import user from '@/store/modules/user'
 import sm from '@/store/modules/serviceManagement'
 import jobs from '@/store/modules/jobs'
-import requestJobs from '@/store/modules/jobRequests'
 import priceList from '@/store/modules/pricelist'
 import usermanager from '@/store/modules/userManager'
 import wm from '@/store/modules/workgroupManagement'
 import jkm from '@/store/modules/jobkindManager'
+import jobInvites from "@/store/modules/jobInvites";
 
 Vue.use(Vuex)
 
@@ -22,10 +22,10 @@ export default new Vuex.Store({
     user,
     sm,
     jobs,
-    requestJobs,
     priceList,
     usermanager,
     wm,
-    jkm
+    jkm,
+    jobInvites
   }
 })
diff --git a/src/store/modules/jobInvites.js b/src/store/modules/jobInvites.js
new file mode 100644
index 0000000..c614f00
--- /dev/null
+++ b/src/store/modules/jobInvites.js
@@ -0,0 +1,344 @@
+import axios from 'axios'
+import url from '@/plugins/routes'
+
+const state = {
+  jobInvitesFromMe: [],
+  jobInvitesToMe: [],
+  jobInvitesLoading: false
+}
+
+const mutations = {
+  setJobInvitesFromMe: (state, jobInvites) => {
+    state.jobInvitesFromMe = jobInvites
+    state.jobInvitesFromMe.forEach(item => {
+      item.on_date = new Date(
+        item.on_date.year,
+        item.on_date.month - 1,
+        item.on_date.day
+      )
+      item.day = {
+        date: new Date(),
+        worker: [],
+        loading: false,
+        locked: false,
+        jobkinddate: []
+      }
+    })
+  },
+  setJobInvitesToMe: (state, jobInvites) => {
+    state.jobInvitesToMe = jobInvites
+    state.jobInvitesToMe.forEach(item => {
+      item.on_date = new Date(
+        item.on_date.year,
+        item.on_date.month - 1,
+        item.on_date.day
+      )
+      item.day = {
+        date: new Date(),
+        worker: [],
+        loading: false,
+        locked: false,
+        jobkinddate: []
+      }
+    })
+  },
+  setJobInvitesLoading: (state, value) => {
+    state.jobInvitesLoading = value
+  },
+  updateJobInviteToMe: (state, jobInvite) => {
+    state.jobInvitesToMe.forEach(item => {
+      if (item.id === jobInvite.id) {
+        item.watched = jobInvite.watched
+      }
+    })
+  },
+  updateMonthWorker: (state, { workers, date, getters, from_me }) => {
+    let mop
+    if (from_me) {
+      mop = getters.getDayFromMe(date)
+    } else {
+      mop = getters.getDayToMe(date)
+    }
+    mop.forEach(a => {
+      let day = a.day
+      day.jobkinddate.forEach(item => {
+        var filtered = workers.filter(worker => {
+          return item.job_kind.id === (worker.job_kind ? worker.job_kind.id : 1)
+        })
+        var filteredWorkers = []
+        filtered.forEach(item => {
+          filteredWorkers.push(item.user)
+        })
+        filteredWorkers.forEach(worker => {
+          if (
+              !item.worker.find(a => {
+                return a.id === worker.id
+              })
+          ) {
+            item.worker.push(worker)
+          }
+        })
+        item.worker.forEach(worker => {
+          if (
+              !filteredWorkers.find(a => {
+                return a.id === worker.id
+              })
+          ) {
+            item.worker.splice(item.worker.indexOf(worker), 1)
+          }
+        })
+      })})
+  },
+  updateMonthLocked: (state, { locked, date, getters, from_me }) => {
+    let mop
+    if (from_me) {
+      mop = getters.getDayFromMe(date)
+    } else {
+      mop = getters.getDayToMe(date)
+    }
+    mop.forEach(a => {
+      let day = a.day
+      day.locked = !!locked
+    })
+  },
+  updateMonthJobkind: (state, { data, date, getters, from_me }) => {
+    let mop
+    if (from_me) {
+      mop = getters.getDayFromMe(date)
+    } else {
+      mop = getters.getDayToMe(date)
+    }
+    mop.forEach(a => {
+      let day = a.day
+      day.date = date
+      var backup = []
+
+      for (let jobkind in day.jobkinddate) {
+        if (day.jobkinddate[jobkind].worker !== undefined) {
+          backup.push({
+            id: day.jobkinddate[jobkind].job_kind.id,
+            worker: day.jobkinddate[jobkind].worker,
+            backupWorker: day.jobkinddate[jobkind].backupWorker
+          })
+        } else {
+          backup.push({
+            id: day.jobkinddate[jobkind].job_kind.id,
+            worker: [],
+            backupWorker: []
+          })
+        }
+      }
+      day.jobkinddate = [...data]
+      var test = day.jobkinddate.find(jobkind => {
+        return jobkind.job_kind.id === 1
+      })
+      if (!test) {
+        day.jobkinddate.push({
+          id: -1,
+          job_kind: { id: 1, name: 'Bardienst' },
+          maxpersons: 2,
+          daydate: {
+            year: date.getFullYear(),
+            month: date.getMonth() + 1,
+            day: date.getDate()
+          },
+          worker: [],
+          backupWorker: []
+        })
+      }
+      for (var jobkind in day.jobkinddate) {
+        var worker = backup.find(item => {
+          return item.id === day.jobkinddate[jobkind].job_kind.id
+        })
+        day.jobkinddate[jobkind].worker = worker ? worker.worker : []
+        day.jobkinddate[jobkind].backupWorker = worker ? worker.backupWorker : []
+      }
+    })
+
+  },
+  setDayLoading: (state, { getters, date, value }) => {
+    let day = getters.getDayToMe(date)
+    day.forEach(a => {
+      a.day.loading = value
+    })
+  },
+  deleteJobInviteFromMe: (state, jobinvite) => {
+    var item = state.jobInvitesFromMe.find(item => {
+      return item.id === jobinvite.id
+    })
+    state.jobInvitesFromMe.splice(item, 1)
+  }
+}
+
+const actions = {
+  async getJobInvites({ commit, dispatch, rootState, getters }) {
+    try {
+      const date = new Date()
+      const from_me = await axios.post(
+        url.user.getJobInvites,
+        {
+          from_user: rootState.user.user,
+          date: {
+            year: date.getFullYear(),
+            month: date.getMonth() + 1,
+            day: date.getDate()
+          }
+        },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      const workers_from_me = await axios.post(
+          url.user.getJobOnDates,
+          from_me.data,
+          { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('setJobInvitesFromMe', from_me.data)
+      workers_from_me.data.forEach(item => {
+        var date = new Date(
+            item.day.date.year,
+            item.day.date.month - 1,
+            item.day.date.day
+        )
+        commit('updateMonthJobkind', { data: item.jobkinddate, date, getters, from_me: true })
+        commit('updateMonthWorker', { workers: item.worker, date, getters, from_me: true })
+        commit('updateMonthLocked', { locked: item.day.locked, date, getters, from_me: true })
+      })
+      const to_me = await axios.post(
+        url.user.getJobInvites,
+        {
+          to_user: rootState.user.user,
+          date: {
+            year: date.getFullYear(),
+            month: date.getMonth() + 1,
+            day: date.getDate()
+          }
+        },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      const workers_to_me = await axios.post(
+        url.user.getJobOnDates,
+        to_me.data,
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('setJobInvitesToMe', to_me.data)
+      workers_to_me.data.forEach(item => {
+        var date = new Date(
+          item.day.date.year,
+          item.day.date.month - 1,
+          item.day.date.day
+        )
+        commit('updateMonthJobkind', { data: item.jobkinddate, date, getters, from_me: false })
+        commit('updateMonthWorker', { workers: item.worker, date, getters, from_me: false })
+        commit('updateMonthLocked', { locked: item.day.locked, date, getters, from_me: false })
+      })
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
+  async setJobInvites({ commit, dispatch, rootState }, data) {
+    try {
+      commit('setJobInvitesLoading', true)
+      const response = await axios.put(url.user.setJobInvites, data, {
+        headers: { Token: rootState.login.user.accessToken }
+      })
+      commit('setJobInvitesFromMe', response.data)
+      commit('setJobInvitesLoading', false)
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
+  async addJob({ commit, rootState, dispatch, getters }, data) {
+    var date = new Date(data.year, data.month - 1, data.day)
+    commit('setDayLoading', { date, getters, value: true })
+    try {
+      const response = await axios.post(
+        url.user.addJob,
+        { ...data },
+        {
+          headers: { Token: rootState.login.user.accessToken }
+        }
+      )
+      commit('updateMonthWorker', {
+        workers: [...response.data],
+        date: new Date(data.year, data.month - 1, data.day),
+        getters, from_me: false
+      })
+      commit('setDayLoading', { date, getters, value: false })
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
+  async updateJobInviteToMe({ commit, rootState, dispatch }, data) {
+    try {
+      const response = await axios.post(url.user.setJobInvites, data, {
+        headers: { Token: rootState.login.user.accessToken }
+      })
+      commit('updateJobInviteToMe', response.data)
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
+  async deleteJobInviteFromMe({ commit, rootState, dispatch}, data) {
+    try {
+     await axios.post(url.user.deletJobInvite, data, {headers: {Token: rootState.login.user.accessToken}})
+      commit('deleteJobInviteFromMe', data)
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  }
+}
+
+const getters = {
+  jobInvitesFromMe: state => {
+    return state.jobInvitesFromMe
+  },
+  jobInvitesToMe: state => {
+    return state.jobInvitesToMe
+  },
+  jobInvitesLoading: state => {
+    return state.jobInvitesLoading
+  },
+  getDayToMe: state => {
+    return date => {
+      return state.jobInvitesToMe.filter(item => {
+        return item.on_date - date === 0
+      })
+    }
+  },
+  getDayFromMe: state => {
+    return date => {
+      return state.jobInvitesFromMe.filter(item => {
+        return item.on_date - date === 0
+      })
+    }
+  },
+  getDayWorkerFromMe: state => {
+    return date => {
+      return state.jobInvitesFromMe.filter(jobInvite => {
+        return jobInvite.on_date - date === 0
+      })
+    }
+  },
+  news: state => {
+    var test = state.jobInvitesToMe.filter(item => {
+      return !item.watched
+    })
+    return test.length
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+  getters
+}
diff --git a/src/store/modules/jobRequests.js b/src/store/modules/jobRequests.js
deleted file mode 100644
index bf93872..0000000
--- a/src/store/modules/jobRequests.js
+++ /dev/null
@@ -1,161 +0,0 @@
-import axios from 'axios'
-import url from '@/plugins/routes'
-
-const state = {
-  transactJobs: [],
-  transactJobsLoading: false,
-  requestJobs: [],
-  requestJobsLoading: false
-}
-
-const mutations = {
-  setTransactJobs: (state, data) => {
-    var list = []
-    for (var i in data) {
-      list.push({
-        date: new Date(
-          data[i].date.year,
-          data[i].date.month - 1,
-          data[i].date.day
-        ),
-        from_user: data[i].from_user,
-        to_user: data[i].to_user,
-        accepted: data[i].accepted,
-        answerd: data[i].answerd
-      })
-    }
-    state.transactJobs = list
-  },
-  setRequestJobs: (state, data) => {
-    var list = []
-    for (var i in data) {
-      list.push({
-        date: new Date(
-          data[i].date.year,
-          data[i].date.month - 1,
-          data[i].date.day
-        ),
-        from_user: data[i].from_user,
-        to_user: data[i].to_user,
-        accepted: data[i].accepted,
-        answerd: data[i].answerd
-      })
-    }
-    state.requestJobs = list
-  },
-  setTransactJobsLoading: (state, value) => {
-    state.transactJobsLoading = value
-  },
-  setRequestJobsLoading: (state, value) => {
-    state.requestJobsLoading = value
-  },
-  updateRequestJob: (state, data) => {
-    const date = new Date(data.date.year, data.date.month - 1, data.date.day)
-    for (var i in state.requestJobs) {
-      if (
-        state.requestJobs[i].date - date === 0 &&
-        state.requestJobs[i].from_user.username === data.from_user.username
-      ) {
-        state.requestJobs[i].accepted = data.accepted
-        state.requestJobs[i].answerd = data.answerd
-        break
-      }
-    }
-  },
-  deleteTransactJobactJob: (state, data) => {
-    const date = new Date(data.year, data.month - 1, data.day)
-    var job = state.transactJobs.find(a => {
-      return a.date - date === 0 && a.to_user.username === data.username
-    })
-    var index = state.transactJobs.indexOf(job)
-    if (job) state.transactJobs.splice(index, 1)
-  }
-}
-
-const actions = {
-  async getTransactJobs({ commit, rootState, dispatch }, data) {
-    commit('setTransactJobsLoading', true)
-    try {
-      const response = await axios.post(
-        url.user.getTransactJobs,
-        { ...data },
-        { headers: { Token: rootState.login.user.accessToken } }
-      )
-      commit('setTransactJobs', response.data)
-      dispatch('getLifeTime', null, { root: true })
-    } catch (e) {
-      if (e.response)
-        if (e.response.data === 401) dispatch('logout', null, { root: true })
-      commit('setTransactJobsLoading', false)
-    }
-    commit('setTransactJobsLoading', false)
-  },
-  async getRequestJobs({ commit, rootState, dispatch }, data) {
-    commit('setRequestJobsLoading', true)
-    try {
-      const response = await axios.post(
-        url.user.jobRequests,
-        { ...data },
-        { headers: { Token: rootState.login.user.accessToken } }
-      )
-      commit('setRequestJobs', response.data)
-      dispatch('getLifeTime', null, { root: true })
-    } catch (e) {
-      if (e.response)
-        if (e.response.data === 401) dispatch('logout', null, { root: true })
-      commit('setRequestJobsLoading', false)
-    }
-    commit('setRequestJobsLoading', false)
-  },
-  async answerTransactJob({ commit, rootState, dispatch }, data) {
-    try {
-      const response = await axios.post(
-        url.user.answerTransactJob,
-        { ...data },
-        { headers: { Token: rootState.login.user.accessToken } }
-      )
-      commit('updateRequestJob', response.data)
-      dispatch('getLifeTime', null, { root: true })
-    } catch (e) {
-      if (e.response)
-        if (e.response.data === 401) dispatch('logout', null, { root: true })
-    }
-  },
-  async deleteTransactJob({ commit, rootState, dispatch }, data) {
-    try {
-      await axios.post(
-        url.user.deleteTransactJobs,
-        { ...data },
-        { headers: { Token: rootState.login.user.accessToken } }
-      )
-      commit('deleteTransactJobactJob', data)
-      dispatch('getLifeTime', null, { root: true })
-    } catch (e) {
-      if (e.response)
-        if (e.response.data === 401) dispatch('logout', null, { root: true })
-    }
-  }
-}
-
-const getters = {
-  transactJobs: state => {
-    return state.transactJobs
-  },
-  transactJobsLoading: state => {
-    return state.transactJobsLoading
-  },
-  requestJobs: state => {
-    return state.requestJobs
-  },
-  requestJobsLoading: state => {
-    return state.requestJobsLoading
-  }
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions,
-  getters
-}
diff --git a/src/store/modules/jobs.js b/src/store/modules/jobs.js
index 07c93cc..72ab412 100644
--- a/src/store/modules/jobs.js
+++ b/src/store/modules/jobs.js
@@ -184,7 +184,6 @@ const mutations = {
         }
       })
     })
-    console.log(day)
   },
   updateMonthLocked: (state, { locked, date, getters }) => {
     var day = getters.getDay(date)
@@ -234,7 +233,6 @@ const mutations = {
       day.jobkinddate[jobkind].worker = worker ? worker.worker : []
       day.jobkinddate[jobkind].backupWorker = worker ? worker.backupWorker : []
     }
-
   },
   setAllDayLoading: state => {
     for (let week = 0; week < state.month.length; week++) {
@@ -324,7 +322,6 @@ const actions = {
           { ...data },
           { headers: { Token: rootState.login.user.accessToken } }
       )
-      console.log(response.data)
       for (var day in response.data) {
         var date = new Date(
             response.data[day].day.date.year,
@@ -365,7 +362,6 @@ const actions = {
           headers: { Token: rootState.login.user.accessToken }
         }
       )
-      console.log(response.data)
       commit('updateMonthWorker', {
         workers: [...response.data],
         date: new Date(data.year, data.month - 1, data.day),
@@ -379,20 +375,27 @@ const actions = {
     }
   },
   // eslint-disable-next-line no-unused-vars
-  async deleteJob({ commit, rootState, dispatch }, data) {
+  async deleteJob({ commit, rootState, dispatch, getters }, data) {
+    var date = new Date(data.year, data.month - 1, data.day)
+    commit('setDayLoading', {date, getters})
     try {
-      await axios.post(
-        url.user.deleteJob,
-        { ...data },
-        { headers: { Token: rootState.login.user.accessToken } }
+      const response = await axios.post(
+          url.user.deleteJob,
+          { ...data },
+          {
+            headers: { Token: rootState.login.user.accessToken }
+          }
       )
-      commit('updateMonth', {
-        start: { ...data },
-        user: rootState.login.user,
-        com: 'delete'
+      console.log(response.data)
+      commit('updateMonthWorker', {
+        workers: [...response.data],
+        date: new Date(data.year, data.month - 1, data.day),
+        getters
       })
+      commit('setDayNotLoading', {date, getters})
       dispatch('getLifeTime', null, { root: true })
     } catch (e) {
+      console.log(e)
       if (e.response)
         if (e.response.status === 401) dispatch('logout', null, { root: true })
     }
diff --git a/src/store/modules/serviceManagement.js b/src/store/modules/serviceManagement.js
index 8ff9436..a66798f 100644
--- a/src/store/modules/serviceManagement.js
+++ b/src/store/modules/serviceManagement.js
@@ -127,7 +127,6 @@ const mutations = {
       }
     }
     state.month = month
-    console.log(month)
   },
   setStartEndDate: week => {
     if (week.days.monday) {
@@ -292,7 +291,6 @@ const actions = {
         { ...data },
         { headers: { Token: rootState.login.user.accessToken } }
       )
-      console.log(response.data)
       for (var day in response.data) {
         var date = new Date(
           response.data[day].day.date.year,
diff --git a/src/views/MainView.vue b/src/views/MainView.vue
index aeb4aae..afb60f5 100644
--- a/src/views/MainView.vue
+++ b/src/views/MainView.vue
@@ -18,13 +18,13 @@
             {{user.firstname}} {{user.lastname}}
           </v-list-item-title>
         </v-list-item>
-        <v-list-item :disabled="lockedBar" v-if="isUser" class="title" link to="/main/user/add">
+        <v-list-item :disabled="lockedBar" v-if="isUser" class="title" link :to="{name: 'add'}">
           <v-list-item-icon>
             <v-icon>{{person}}</v-icon>
           </v-list-item-icon>
           <v-list-item-title>{{user.firstname}} {{user.lastname}}</v-list-item-title>
         </v-list-item>
-        <v-list-item v-if="isBar" class="title" link to="/main/bar/geruecht">
+        <v-list-item v-if="isBar" class="title" link :to="{name: 'geruecht'}">
           <v-list-item-icon>
             <v-icon>{{glass_cocktail}}</v-icon>
           </v-list-item-icon>
@@ -32,7 +32,7 @@
             Bar
           </v-list-item-title>
         </v-list-item>
-        <v-list-item :disabled="lockedBar" v-if="isManagement" class="title" link to="/main/management/servicemanagement">
+        <v-list-item :disabled="lockedBar" v-if="isManagement" class="title" link :to="{name: 'serviceManagement', params: {year: new Date().getFullYear(), month: new Date().getMonth() + 1}}">
           <v-list-item-icon>
             <v-icon>{{king}}</v-icon>
           </v-list-item-icon>
@@ -40,7 +40,7 @@
             Vorstand
           </v-list-item-title>
         </v-list-item>
-        <v-list-item :disabled="lockedBar" v-if="isGastro" class="title" link to="/main/gastro/pricelist">
+        <v-list-item :disabled="lockedBar" v-if="isGastro" class="title" link :to="{name: 'gastroPricelist'}">
           <v-list-item-icon>
             <v-icon>{{gastro}}</v-icon>
           </v-list-item-icon>
@@ -48,7 +48,7 @@
             Gastro
           </v-list-item-title>
         </v-list-item>
-        <v-list-item :disabled="lockedBar" v-if="isFinanzer" class="title" link to="/main/finanzer/overview">
+        <v-list-item :disabled="lockedBar" v-if="isFinanzer" class="title" link :to="{name: 'overview'}">
           <v-list-item-icon>
             <v-icon>{{attach_money}}</v-icon>
           </v-list-item-icon>

From 758f03aa40d065f72e46cdcee31fc03d5d4eeda6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Thu, 28 May 2020 19:43:57 +0200
Subject: [PATCH 08/12] =?UTF-8?q?user=20k=C3=B6nnen=20sich=20nun=20auch=20?=
 =?UTF-8?q?in=20den=20jobinvites=20ein=20und=20austragen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

update, also dass sich die buttons ändern in jobinvites, funktioniert noch nicht richtig.
maximale größe des days wurde auf 20em gesetzt, wenn man sich nicht in den jobinvites befindet.
---
 package-lock.json                             | 4738 +++++++++--------
 package.json                                  |   36 +-
 .../user/JobRequests/JobInvites.vue           |   17 +-
 src/components/user/Jobs.vue                  |    2 +-
 src/components/user/Jobs/Day.vue              |   13 +-
 .../ServiceManagementComponents/Day.vue       |    2 +-
 src/store/modules/jobInvites.js               |   27 +
 7 files changed, 2614 insertions(+), 2221 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ff23f0f..e8b918a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,265 +13,310 @@
         "@babel/highlight": "^7.0.0"
       }
     },
-    "@babel/core": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.7.tgz",
-      "integrity": "sha512-jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ==",
+    "@babel/compat-data": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.6.tgz",
+      "integrity": "sha512-5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.7.7",
-        "@babel/helpers": "^7.7.4",
-        "@babel/parser": "^7.7.7",
-        "@babel/template": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4",
+        "browserslist": "^4.11.1",
+        "invariant": "^2.2.4",
+        "semver": "^5.5.0"
+      }
+    },
+    "@babel/core": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
+      "integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.9.6",
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helpers": "^7.9.6",
+        "@babel/parser": "^7.9.6",
+        "@babel/template": "^7.8.6",
+        "@babel/traverse": "^7.9.6",
+        "@babel/types": "^7.9.6",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
-        "json5": "^2.1.0",
+        "gensync": "^1.0.0-beta.1",
+        "json5": "^2.1.2",
         "lodash": "^4.17.13",
         "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.9.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        }
       }
     },
     "@babel/generator": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz",
-      "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
+      "integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4",
+        "@babel/types": "^7.9.6",
         "jsesc": "^2.5.1",
         "lodash": "^4.17.13",
         "source-map": "^0.5.0"
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.4.tgz",
-      "integrity": "sha512-2BQmQgECKzYKFPpiycoF9tlb5HA4lrVyAmLLVK177EcQAqjVLciUb2/R+n1boQ9y5ENV3uz2ZqiNw7QMBBw1Og==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz",
+      "integrity": "sha512-6o+mJrZBxOoEX77Ezv9zwW7WV8DdluouRKNY/IR5u/YTMuKHgugHOzYWlYvYLpLA9nPsQCAAASpCIbjI9Mv+Uw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.4.tgz",
-      "integrity": "sha512-Biq/d/WtvfftWZ9Uf39hbPBYDUo986m5Bb4zhkeYDGUllF43D+nUe5M6Vuo6/8JDK/0YX/uBdeoQpyaNhNugZQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz",
+      "integrity": "sha512-5eFOm2SyFPK4Rh3XMMRDjN7lBH0orh3ss0g3rTYZnBQ+r6YPj7lgDyCvPphynHvUrobJmeMignBr6Acw9mAPlw==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.7.4",
-        "@babel/types": "^7.7.4"
+        "@babel/helper-explode-assignable-expression": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
-    "@babel/helper-call-delegate": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.4.tgz",
-      "integrity": "sha512-8JH9/B7J7tCYJ2PpWVpw9JhPuEVHztagNVuQAFBVFYluRMlpG7F1CgKEgGeL6KFqcsIa92ZYVj6DSc0XwmN1ZA==",
+    "@babel/helper-compilation-targets": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz",
+      "integrity": "sha512-x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4"
+        "@babel/compat-data": "^7.9.6",
+        "browserslist": "^4.11.1",
+        "invariant": "^2.2.4",
+        "levenary": "^1.1.1",
+        "semver": "^5.5.0"
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz",
-      "integrity": "sha512-l+OnKACG4uiDHQ/aJT8dwpR+LhCJALxL0mJ6nzjB25e5IPwqV1VOsY7ah6UB1DG+VOXAIMtuC54rFJGiHkxjgA==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz",
+      "integrity": "sha512-6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.7.4",
-        "@babel/helper-member-expression-to-functions": "^7.7.4",
-        "@babel/helper-optimise-call-expression": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.7.4",
-        "@babel/helper-split-export-declaration": "^7.7.4"
+        "@babel/helper-function-name": "^7.9.5",
+        "@babel/helper-member-expression-to-functions": "^7.8.3",
+        "@babel/helper-optimise-call-expression": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-replace-supers": "^7.9.6",
+        "@babel/helper-split-export-declaration": "^7.8.3"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.4.tgz",
-      "integrity": "sha512-Mt+jBKaxL0zfOIWrfQpnfYCN7/rS6GKx6CCCfuoqVVd+17R8zNDlzVYmIi9qyb2wOk002NsmSTDymkIygDUH7A==",
+      "version": "7.8.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz",
+      "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==",
       "dev": true,
       "requires": {
-        "@babel/helper-regex": "^7.4.4",
-        "regexpu-core": "^4.6.0"
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-regex": "^7.8.3",
+        "regexpu-core": "^4.7.0"
       }
     },
     "@babel/helper-define-map": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.4.tgz",
-      "integrity": "sha512-v5LorqOa0nVQUvAUTUF3KPastvUt/HzByXNamKQ6RdJRTV7j8rLL+WB5C/MzzWAwOomxDhYFb1wLLxHqox86lg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz",
+      "integrity": "sha512-PoeBYtxoZGtct3md6xZOCWPcKuMuk3IHhgxsRRNtnNShebf4C8YonTSblsK4tvDbm+eJAw2HAPOfCr+Q/YRG/g==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.7.4",
-        "@babel/types": "^7.7.4",
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/types": "^7.8.3",
         "lodash": "^4.17.13"
       }
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.4.tgz",
-      "integrity": "sha512-2/SicuFrNSXsZNBxe5UGdLr+HZg+raWBLE9vC98bdYOKX/U6PY0mdGlYUJdtTDPSU0Lw0PNbKKDpwYHJLn2jLg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz",
+      "integrity": "sha512-N+8eW86/Kj147bO9G2uclsg5pwfs/fqqY5rwgIL7eTBklgXjcOJ3btzS5iM6AitJcftnY7pm2lGsrJVYLGjzIw==",
       "dev": true,
       "requires": {
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4"
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz",
-      "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==",
+      "version": "7.9.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
+      "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.7.4",
-        "@babel/template": "^7.7.4",
-        "@babel/types": "^7.7.4"
+        "@babel/helper-get-function-arity": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/types": "^7.9.5"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz",
-      "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
+      "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.4.tgz",
-      "integrity": "sha512-wQC4xyvc1Jo/FnLirL6CEgPgPCa8M74tOdjWpRhQYapz5JC7u3NYU1zCVoVAGCE3EaIP9T1A3iW0WLJ+reZlpQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz",
+      "integrity": "sha512-ky1JLOjcDUtSc+xkt0xhYff7Z6ILTAHKmZLHPxAhOP0Nd77O+3nCsd6uSVYur6nJnCI029CrNbYlc0LoPfAPQg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.4.tgz",
-      "integrity": "sha512-9KcA1X2E3OjXl/ykfMMInBK+uVdfIVakVe7W7Lg3wfXUNyS3Q1HWLFRwZIjhqiCGbslummPDnmb7vIekS0C1vw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
+      "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.4.tgz",
-      "integrity": "sha512-dGcrX6K9l8258WFjyDLJwuVKxR4XZfU0/vTUgOQYWEnRD8mgr+p4d6fCUMq/ys0h4CCt/S5JhbvtyErjWouAUQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
+      "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.7.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.5.tgz",
-      "integrity": "sha512-A7pSxyJf1gN5qXVcidwLWydjftUN878VkalhXX5iQDuGyiGK3sOrrKKHF4/A4fwHtnsotv/NipwAeLzY4KQPvw==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz",
+      "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.7.4",
-        "@babel/helper-simple-access": "^7.7.4",
-        "@babel/helper-split-export-declaration": "^7.7.4",
-        "@babel/template": "^7.7.4",
-        "@babel/types": "^7.7.4",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-replace-supers": "^7.8.6",
+        "@babel/helper-simple-access": "^7.8.3",
+        "@babel/helper-split-export-declaration": "^7.8.3",
+        "@babel/template": "^7.8.6",
+        "@babel/types": "^7.9.0",
         "lodash": "^4.17.13"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.4.tgz",
-      "integrity": "sha512-VB7gWZ2fDkSuqW6b1AKXkJWO5NyNI3bFL/kK79/30moK57blr6NbH8xcl2XcKCwOmJosftWunZqfO84IGq3ZZg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
+      "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4"
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
-      "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
+      "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
       "dev": true
     },
     "@babel/helper-regex": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz",
-      "integrity": "sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.8.3.tgz",
+      "integrity": "sha512-BWt0QtYv/cg/NecOAZMdcn/waj/5P26DR4mVLXfFtDokSR6fyuG0Pj+e2FqtSME+MqED1khnSMulkmGl8qWiUQ==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.13"
       }
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.4.tgz",
-      "integrity": "sha512-Sk4xmtVdM9sA/jCI80f+KS+Md+ZHIpjuqmYPk1M7F/upHou5e4ReYmExAiu6PVe65BhJPZA2CY9x9k4BqE5klw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz",
+      "integrity": "sha512-kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.7.4",
-        "@babel/helper-wrap-function": "^7.7.4",
-        "@babel/template": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4"
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-wrap-function": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.4.tgz",
-      "integrity": "sha512-pP0tfgg9hsZWo5ZboYGuBn/bbYT/hdLPVSS4NMmiRJdwWhP0IznPwN9AE1JwyGsjSPLC364I0Qh5p+EPkGPNpg==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz",
+      "integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.7.4",
-        "@babel/helper-optimise-call-expression": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4"
+        "@babel/helper-member-expression-to-functions": "^7.8.3",
+        "@babel/helper-optimise-call-expression": "^7.8.3",
+        "@babel/traverse": "^7.9.6",
+        "@babel/types": "^7.9.6"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.4.tgz",
-      "integrity": "sha512-zK7THeEXfan7UlWsG2A6CI/L9jVnI5+xxKZOdej39Y0YtDYKx9raHk5F2EtK9K8DHRTihYwg20ADt9S36GR78A==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz",
+      "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.7.4",
-        "@babel/types": "^7.7.4"
+        "@babel/template": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz",
-      "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
+      "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.4"
+        "@babel/types": "^7.8.3"
       }
     },
+    "@babel/helper-validator-identifier": {
+      "version": "7.9.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
+      "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+      "dev": true
+    },
     "@babel/helper-wrap-function": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.4.tgz",
-      "integrity": "sha512-VsfzZt6wmsocOaVU0OokwrIytHND55yvyT4BPB9AIIgwr8+x7617hetdJTsuGwygN5RC6mxA9EJztTjuwm2ofg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz",
+      "integrity": "sha512-LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.7.4",
-        "@babel/template": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4"
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helpers": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.4.tgz",
-      "integrity": "sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz",
+      "integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4"
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.9.6",
+        "@babel/types": "^7.9.6"
       }
     },
     "@babel/highlight": {
@@ -286,586 +331,710 @@
       }
     },
     "@babel/parser": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz",
-      "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz",
+      "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==",
       "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.4.tgz",
-      "integrity": "sha512-1ypyZvGRXriY/QP668+s8sFr2mqinhkRDMPSQLNghCQE+GAkFtp+wkHVvg2+Hdki8gwP+NFzJBJ/N1BfzCCDEw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz",
+      "integrity": "sha512-NZ9zLv848JsV3hs8ryEh7Uaz/0KsmPLqv0+PdkDJL1cJy0K4kOCFa8zc1E3mp+RHPQcpdfb/6GovEsW4VDrOMw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-remap-async-to-generator": "^7.7.4",
-        "@babel/plugin-syntax-async-generators": "^7.7.4"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-remap-async-to-generator": "^7.8.3",
+        "@babel/plugin-syntax-async-generators": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.4.tgz",
-      "integrity": "sha512-EcuXeV4Hv1X3+Q1TsuOmyyxeTRiSqurGJ26+I/FW1WbymmRRapVORm6x1Zl3iDIHyRxEs+VXWp6qnlcfcJSbbw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz",
+      "integrity": "sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-create-class-features-plugin": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-decorators": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.7.4.tgz",
-      "integrity": "sha512-GftcVDcLCwVdzKmwOBDjATd548+IE+mBo7ttgatqNDR7VG7GqIuZPtRWlMLHbhTXhcnFZiGER8iIYl1n/imtsg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz",
+      "integrity": "sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-decorators": "^7.7.4"
+        "@babel/helper-create-class-features-plugin": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-decorators": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz",
-      "integrity": "sha512-StH+nGAdO6qDB1l8sZ5UBV8AC3F2VW2I8Vfld73TMKyptMU9DY5YsJAS8U81+vEtxcH3Y/La0wG0btDrhpnhjQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-NyaBbyLFXFLT9FP+zk0kYlUlA8XtCUbehs67F0nnEg7KICgMc2mNkIeu9TYhKzyXMkrapZFwAhXLdnt4IYHy1w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.7.4"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.7.4.tgz",
-      "integrity": "sha512-wQvt3akcBTfLU/wYoqm/ws7YOAQKu8EVJEvHip/mzkNtjaclQoCCIqKXFP5/eyfnfbQCDV3OLRIK3mIVyXuZlw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz",
+      "integrity": "sha512-KGhQNZ3TVCQG/MjRbAUwuH+14y9q0tpxs1nWWs3pbSleRdDro9SAMMDyye8HhY1gqZ7/NqIc8SKhya0wRDgP1Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-json-strings": "^7.7.4"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-numeric-separator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz",
+      "integrity": "sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.7.tgz",
-      "integrity": "sha512-3qp9I8lelgzNedI3hrhkvhaEYree6+WHnyA/q4Dza9z7iEIs1eyhWyJnetk3jJ69RT0AT4G0UhEGwyGFJ7GUuQ==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz",
+      "integrity": "sha512-Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.7.4"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-transform-parameters": "^7.9.5"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.7.4.tgz",
-      "integrity": "sha512-DyM7U2bnsQerCQ+sejcTNZh8KQEUuC3ufzdnVnSiUv/qoGJp2Z3hanKL18KDhsBT5Wj6a7CMT5mdyCNJsEaA9w==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-0gkX7J7E+AtAw9fcwlVQj8peP61qhdg/89D5swOkjYbkboA2CVckn3kiyum1DE0wskGb7KJJxBdyEBApDLLVdw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.7.4"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+      }
+    },
+    "@babel/plugin-proposal-optional-chaining": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz",
+      "integrity": "sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.7.tgz",
-      "integrity": "sha512-80PbkKyORBUVm1fbTLrHpYdJxMThzM1UqFGh0ALEhO9TYbG86Ah9zQYAB/84axz2vcxefDLdZwWwZNlYARlu9w==",
+      "version": "7.8.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz",
+      "integrity": "sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.8.8",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-syntax-async-generators": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.7.4.tgz",
-      "integrity": "sha512-Li4+EjSpBgxcsmeEF8IFcfV/+yJGxHXDirDkEoyFjumuwbmfCVHUt0HuowD/iGM7OhIRyXJH9YXxqiH6N815+g==",
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-decorators": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.7.4.tgz",
-      "integrity": "sha512-0oNLWNH4k5ZbBVfAwiTU53rKFWIeTh6ZlaWOXWJc4ywxs0tjz5fc3uZ6jKAnZSxN98eXVgg7bJIuzjX+3SXY+A==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz",
+      "integrity": "sha512-8Hg4dNNT9/LcA1zQlfwuKR8BUc/if7Q7NkTam9sGTcJphLwpf2g4S42uhspQrIrR+dpzE0dtTqBVFoHl8GtnnQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-syntax-dynamic-import": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz",
-      "integrity": "sha512-jHQW0vbRGvwQNgyVxwDh4yuXu4bH1f5/EICJLAhl1SblLs2CDhrsmCk+v5XLdE9wxtAFRyxx+P//Iw+a5L/tTg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-json-strings": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.7.4.tgz",
-      "integrity": "sha512-QpGupahTQW1mHRXddMG5srgpHWqRLwJnJZKXTigB9RPFCCGbDGCgBeM/iC82ICXp414WeYx/tD54w7M2qRqTMg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-jsx": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.7.4.tgz",
-      "integrity": "sha512-wuy6fiMe9y7HeZBWXYCGt2RGxZOj0BImZ9EyXJVnVGBKO/Br592rbR3rtIQn0eQhAk9vqaKP5n8tVqEFBQMfLg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz",
+      "integrity": "sha512-WxdW9xyLgBdefoo0Ynn3MRSkhe5tFVxxKNVdnZSh318WrG2e2jH+E9wd/++JsqcLJZPfz87njQJ8j2Upjm0M0A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
+    "@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz",
+      "integrity": "sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz",
-      "integrity": "sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-optional-catch-binding": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.7.4.tgz",
-      "integrity": "sha512-4ZSuzWgFxqHRE31Glu+fEr/MirNZOMYmD/0BhBWyLyOOQz/gTAl7QmWm2hX1QxEIXsr2vkdlwxIzTyiYRC4xcQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
+      }
+    },
+    "@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@babel/plugin-syntax-top-level-await": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.4.tgz",
-      "integrity": "sha512-wdsOw0MvkL1UIgiQ/IFr3ETcfv1xb8RMM0H9wbiDyLaJFyiDg5oZvDLCXosIXmFeIlweML5iOBXAkqddkYNizg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz",
+      "integrity": "sha512-kwj1j9lL/6Wd0hROD3b/OZZ7MSrZLqqn9RAZ5+cYYsflQ9HZBIKCUkr3+uL1MEJ1NePiUbf98jjiMQSv0NMR9g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz",
-      "integrity": "sha512-zUXy3e8jBNPiffmqkHRNDdZM2r8DWhCB7HhcoyZjiK1TxYEluLHAvQuYnTT+ARqRpabWqy/NHkO6e3MsYB5YfA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz",
+      "integrity": "sha512-0MRF+KC8EqH4dbuITCWwPSzsyO3HIWWlm30v8BbbpOrS1B++isGxPnnuq/IZvOX5J2D/p7DQalQm+/2PnlKGxg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.4.tgz",
-      "integrity": "sha512-zpUTZphp5nHokuy8yLlyafxCJ0rSlFoSHypTUWgpdwoDXWQcseaect7cJ8Ppk6nunOM6+5rPMkod4OYKPR5MUg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz",
+      "integrity": "sha512-imt9tFLD9ogt56Dd5CI/6XgpukMwd/fLGSrix2httihVe7LOGVPhyhMh1BU5kDM7iHD08i8uUtmV2sWaBFlHVQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-remap-async-to-generator": "^7.7.4"
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-remap-async-to-generator": "^7.8.3"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.7.4.tgz",
-      "integrity": "sha512-kqtQzwtKcpPclHYjLK//3lH8OFsCDuDJBaFhVwf8kqdnF6MN4l618UDlcA7TfRs3FayrHj+svYnSX8MC9zmUyQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz",
+      "integrity": "sha512-vo4F2OewqjbB1+yaJ7k2EJFHlTP3jR634Z9Cj9itpqNjuLXvhlVxgnjsHsdRgASR8xYDrx6onw4vW5H6We0Jmg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.7.4.tgz",
-      "integrity": "sha512-2VBe9u0G+fDt9B5OV5DQH4KBf5DoiNkwFKOz0TCvBWvdAN2rOykCTkrL+jTLxfCAm76l9Qo5OqL7HBOx2dWggg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz",
+      "integrity": "sha512-pGnYfm7RNRgYRi7bids5bHluENHqJhrV4bCZRwc5GamaWIIs07N4rZECcmJL6ZClwjDz1GbdMZFtPs27hTB06w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.8.3",
         "lodash": "^4.17.13"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.4.tgz",
-      "integrity": "sha512-sK1mjWat7K+buWRuImEzjNf68qrKcrddtpQo3swi9j7dUcG6y6R6+Di039QN2bD1dykeswlagupEmpOatFHHUg==",
+      "version": "7.9.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.5.tgz",
+      "integrity": "sha512-x2kZoIuLC//O5iA7PEvecB105o7TLzZo8ofBVhP79N+DO3jaX+KYfww9TQcfBEZD0nikNyYcGB1IKtRq36rdmg==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.7.4",
-        "@babel/helper-define-map": "^7.7.4",
-        "@babel/helper-function-name": "^7.7.4",
-        "@babel/helper-optimise-call-expression": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.7.4",
-        "@babel/helper-split-export-declaration": "^7.7.4",
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-define-map": "^7.8.3",
+        "@babel/helper-function-name": "^7.9.5",
+        "@babel/helper-optimise-call-expression": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-replace-supers": "^7.8.6",
+        "@babel/helper-split-export-declaration": "^7.8.3",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.7.4.tgz",
-      "integrity": "sha512-bSNsOsZnlpLLyQew35rl4Fma3yKWqK3ImWMSC/Nc+6nGjC9s5NFWAer1YQ899/6s9HxO2zQC1WoFNfkOqRkqRQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz",
+      "integrity": "sha512-O5hiIpSyOGdrQZRQ2ccwtTVkgUDBBiCuK//4RJ6UfePllUTCENOzKxfh6ulckXKc0DixTFLCfb2HVkNA7aDpzA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.7.4.tgz",
-      "integrity": "sha512-4jFMXI1Cu2aXbcXXl8Lr6YubCn6Oc7k9lLsu8v61TZh+1jny2BWmdtvY9zSUlLdGUvcy9DMAWyZEOqjsbeg/wA==",
+      "version": "7.9.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.9.5.tgz",
+      "integrity": "sha512-j3OEsGel8nHL/iusv/mRd5fYZ3DrOxWC82x0ogmdN/vHfAP4MYw+AFKYanzWlktNwikKvlzUV//afBW5FTp17Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.7.tgz",
-      "integrity": "sha512-b4in+YlTeE/QmTgrllnb3bHA0HntYvjz8O3Mcbx75UBPJA2xhb5A8nle498VhxSXJHQefjtQxpnLPehDJ4TRlg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz",
+      "integrity": "sha512-kLs1j9Nn4MQoBYdRXH6AeaXMbEJFaFu/v1nQkvib6QzTj8MZI5OQzqmD83/2jEM1z0DLilra5aWO5YpyC0ALIw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.7.4.tgz",
-      "integrity": "sha512-g1y4/G6xGWMD85Tlft5XedGaZBCIVN+/P0bs6eabmcPP9egFleMAo65OOjlhcz1njpwagyY3t0nsQC9oTFegJA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz",
+      "integrity": "sha512-s8dHiBUbcbSgipS4SMFuWGqCvyge5V2ZeAWzR6INTVC3Ltjig/Vw1G2Gztv0vU/hRG9X8IvKvYdoksnUfgXOEQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.7.4.tgz",
-      "integrity": "sha512-MCqiLfCKm6KEA1dglf6Uqq1ElDIZwFuzz1WH5mTf8k2uQSxEJMbOIEh7IZv7uichr7PMfi5YVSrr1vz+ipp7AQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz",
+      "integrity": "sha512-zwIpuIymb3ACcInbksHaNcR12S++0MDLKkiqXHl3AzpgdKlFNhog+z/K0+TGW+b0w5pgTq4H6IwV/WhxbGYSjQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.7.4.tgz",
-      "integrity": "sha512-zZ1fD1B8keYtEcKF+M1TROfeHTKnijcVQm0yO/Yu1f7qoDoxEIc/+GX6Go430Bg84eM/xwPFp0+h4EbZg7epAA==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz",
+      "integrity": "sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.4.tgz",
-      "integrity": "sha512-E/x09TvjHNhsULs2IusN+aJNRV5zKwxu1cpirZyRPw+FyyIKEHPXTsadj48bVpc1R5Qq1B5ZkzumuFLytnbT6g==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz",
+      "integrity": "sha512-rO/OnDS78Eifbjn5Py9v8y0aR+aSYhDhqAwVfsTl0ERuMZyr05L1aFSCJnbv2mmsLkit/4ReeQ9N2BgLnOcPCQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.7.4.tgz",
-      "integrity": "sha512-X2MSV7LfJFm4aZfxd0yLVFrEXAgPqYoDG53Br/tCKiKYfX0MjVjQeWPIhPHHsCqzwQANq+FLN786fF5rgLS+gw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz",
+      "integrity": "sha512-3Tqf8JJ/qB7TeldGl+TT55+uQei9JfYaregDcEAyBZ7akutriFrt6C/wLYIer6OYhleVQvH/ntEhjE/xMmy10A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.7.4.tgz",
-      "integrity": "sha512-9VMwMO7i69LHTesL0RdGy93JU6a+qOPuvB4F4d0kR0zyVjJRVJRaoaGjhtki6SzQUu8yen/vxPKN6CWnCUw6bA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz",
+      "integrity": "sha512-3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.7.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.7.5.tgz",
-      "integrity": "sha512-CT57FG4A2ZUNU1v+HdvDSDrjNWBrtCmSH6YbbgN3Lrf0Di/q/lWRxZrE72p3+HCCz9UjfZOEBdphgC0nzOS6DQ==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz",
+      "integrity": "sha512-zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.7.5",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.7.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.5.tgz",
-      "integrity": "sha512-9Cq4zTFExwFhQI6MT1aFxgqhIsMWQWDVwOgLzl7PTWJHsNaqFvklAU+Oz6AQLAS0dJKTwZSOCo20INwktxpi3Q==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz",
+      "integrity": "sha512-7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.7.5",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-simple-access": "^7.7.4",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-simple-access": "^7.8.3",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.4.tgz",
-      "integrity": "sha512-y2c96hmcsUi6LrMqvmNDPBBiGCiQu0aYqpHatVVu6kD4mFEXKjyNxd/drc18XXAf9dv7UXjrZwBVmTTGaGP8iw==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz",
+      "integrity": "sha512-NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "babel-plugin-dynamic-import-node": "^2.3.0"
+        "@babel/helper-hoist-variables": "^7.8.3",
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.4.tgz",
-      "integrity": "sha512-u2B8TIi0qZI4j8q4C51ktfO7E3cQ0qnaXFI1/OXITordD40tt17g/sXqgNNCcMTcBFKrUPcGDx+TBJuZxLx7tw==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz",
+      "integrity": "sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.4.tgz",
-      "integrity": "sha512-jBUkiqLKvUWpv9GLSuHUFYdmHg0ujC1JEYoZUfeOOfNydZXp1sXObgyPatpcwjWgsdBGsagWW0cdJpX/DO2jMw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz",
+      "integrity": "sha512-f+tF/8UVPU86TrCb06JoPWIdDpTNSGGcAtaD9mLP0aYGA0OS0j7j7DHJR0GTFrUZPUU6loZhbsVZgTh0N+Qdnw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.7.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.8.3"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.7.4.tgz",
-      "integrity": "sha512-CnPRiNtOG1vRodnsyGX37bHQleHE14B9dnnlgSeEs3ek3fHN1A1SScglTCg1sfbe7sRQ2BUcpgpTpWSfMKz3gg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz",
+      "integrity": "sha512-QuSGysibQpyxexRyui2vca+Cmbljo8bcRckgzYV4kRIsHpVeyeC3JDO63pY+xFZ6bWOBn7pfKZTqV4o/ix9sFw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.7.4.tgz",
-      "integrity": "sha512-ho+dAEhC2aRnff2JCA0SAK7V2R62zJd/7dmtoe7MHcso4C2mS+vZjn1Pb1pCVZvJs1mgsvv5+7sT+m3Bysb6eg==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz",
+      "integrity": "sha512-57FXk+gItG/GejofIyLIgBKTas4+pEU47IXKDBWFTxdPd7F80H8zybyAY7UoblVfBhBGs2EKM+bJUu2+iUYPDQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.7.4"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-replace-supers": "^7.8.3"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.7.tgz",
-      "integrity": "sha512-OhGSrf9ZBrr1fw84oFXj5hgi8Nmg+E2w5L7NhnG0lPvpDtqd7dbyilM2/vR8CKbJ907RyxPh2kj6sBCSSfI9Ew==",
+      "version": "7.9.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.5.tgz",
+      "integrity": "sha512-0+1FhHnMfj6lIIhVvS4KGQJeuhe1GI//h5uptK4PvLt+BGBxsoUJbd3/IW002yk//6sZPlFgsG1hY6OHLcy6kA==",
       "dev": true,
       "requires": {
-        "@babel/helper-call-delegate": "^7.7.4",
-        "@babel/helper-get-function-arity": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-get-function-arity": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.7.4.tgz",
-      "integrity": "sha512-MatJhlC4iHsIskWYyawl53KuHrt+kALSADLQQ/HkhTjX954fkxIEh4q5slL4oRAnsm/eDoZ4q0CIZpcqBuxhJQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz",
+      "integrity": "sha512-uGiiXAZMqEoQhRWMK17VospMZh5sXWg+dlh2soffpkAl96KAm+WZuJfa6lcELotSRmooLqg0MWdH6UUq85nmmg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.7.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.5.tgz",
-      "integrity": "sha512-/8I8tPvX2FkuEyWbjRCt4qTAgZK0DVy8QRguhA524UH48RfGJy94On2ri+dCuwOpcerPRl9O4ebQkRcVzIaGBw==",
+      "version": "7.8.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz",
+      "integrity": "sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.14.0"
+        "regenerator-transform": "^0.14.2"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.7.4.tgz",
-      "integrity": "sha512-OrPiUB5s5XvkCO1lS7D8ZtHcswIC57j62acAnJZKqGGnHP+TIc/ljQSrgdX/QyOTdEK5COAhuc820Hi1q2UgLQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz",
+      "integrity": "sha512-mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.7.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.7.6.tgz",
-      "integrity": "sha512-tajQY+YmXR7JjTwRvwL4HePqoL3DYxpYXIHKVvrOIvJmeHe2y1w4tz5qz9ObUDC9m76rCzIMPyn4eERuwA4a4A==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz",
+      "integrity": "sha512-qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
         "resolve": "^1.8.1",
         "semver": "^5.5.1"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.7.4.tgz",
-      "integrity": "sha512-q+suddWRfIcnyG5YiDP58sT65AJDZSUhXQDZE3r04AuqD6d/XLaQPPXSBzP2zGerkgBivqtQm9XKGLuHqBID6Q==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz",
+      "integrity": "sha512-I9DI6Odg0JJwxCHzbzW08ggMdCezoWcuQRz3ptdudgwaHxTjxw5HgdFJmZIkIMlRymL6YiZcped4TTCB0JcC8w==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.7.4.tgz",
-      "integrity": "sha512-8OSs0FLe5/80cndziPlg4R0K6HcWSM0zyNhHhLsmw/Nc5MaA49cAsnoJ/t/YZf8qkG7fD+UjTRaApVDB526d7Q==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz",
+      "integrity": "sha512-CkuTU9mbmAoFOI1tklFWYYbzX5qCIZVXPVy0jpXgGwkplCndQAa58s2jr66fTeQnA64bDox0HL4U56CFYoyC7g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.7.4.tgz",
-      "integrity": "sha512-Ls2NASyL6qtVe1H1hXts9yuEeONV2TJZmplLONkMPUG158CtmnrzW5Q5teibM5UVOFjG0D3IC5mzXR6pPpUY7A==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz",
+      "integrity": "sha512-9Spq0vGCD5Bb4Z/ZXXSK5wbbLFMG085qd2vhL1JYu1WcQ5bXqZBAYRzU1d+p79GcHs2szYv5pVQCX13QgldaWw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-regex": "^7.8.3"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.7.4.tgz",
-      "integrity": "sha512-sA+KxLwF3QwGj5abMHkHgshp9+rRz+oY9uoRil4CyLtgEuE/88dpkeWgNk5qKVsJE9iSfly3nvHapdRiIS2wnQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz",
+      "integrity": "sha512-820QBtykIQOLFT8NZOcTRJ1UNuztIELe4p9DCgvj4NK+PwluSJ49we7s9FB1HIGNIYT7wFUJ0ar2QpCDj0escQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.7.4.tgz",
-      "integrity": "sha512-KQPUQ/7mqe2m0B8VecdyaW5XcQYaePyl9R7IsKd+irzj6jvbhoGnRE+M0aNkyAzI07VfUQ9266L5xMARitV3wg==",
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz",
+      "integrity": "sha512-2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz",
-      "integrity": "sha512-N77UUIV+WCvE+5yHw+oks3m18/umd7y392Zv7mYTpFqHtkpcc+QUz+gLJNTWVlWROIWeLqY0f3OjZxV5TcXnRw==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz",
+      "integrity": "sha512-+ufgJjYdmWfSQ+6NS9VGUR2ns8cjJjYbrbi11mZBTaWm+Fui/ncTLFF28Ei1okavY+xkojGr1eJxNsWYeA5aZw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
     "@babel/preset-env": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.7.tgz",
-      "integrity": "sha512-pCu0hrSSDVI7kCVUOdcMNQEbOPJ52E+LrQ14sN8uL2ALfSqePZQlKrOy+tM4uhEdYlCHi4imr8Zz2cZe9oSdIg==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz",
+      "integrity": "sha512-0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/plugin-proposal-async-generator-functions": "^7.7.4",
-        "@babel/plugin-proposal-dynamic-import": "^7.7.4",
-        "@babel/plugin-proposal-json-strings": "^7.7.4",
-        "@babel/plugin-proposal-object-rest-spread": "^7.7.7",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.7.4",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.7.7",
-        "@babel/plugin-syntax-async-generators": "^7.7.4",
-        "@babel/plugin-syntax-dynamic-import": "^7.7.4",
-        "@babel/plugin-syntax-json-strings": "^7.7.4",
-        "@babel/plugin-syntax-object-rest-spread": "^7.7.4",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.7.4",
-        "@babel/plugin-syntax-top-level-await": "^7.7.4",
-        "@babel/plugin-transform-arrow-functions": "^7.7.4",
-        "@babel/plugin-transform-async-to-generator": "^7.7.4",
-        "@babel/plugin-transform-block-scoped-functions": "^7.7.4",
-        "@babel/plugin-transform-block-scoping": "^7.7.4",
-        "@babel/plugin-transform-classes": "^7.7.4",
-        "@babel/plugin-transform-computed-properties": "^7.7.4",
-        "@babel/plugin-transform-destructuring": "^7.7.4",
-        "@babel/plugin-transform-dotall-regex": "^7.7.7",
-        "@babel/plugin-transform-duplicate-keys": "^7.7.4",
-        "@babel/plugin-transform-exponentiation-operator": "^7.7.4",
-        "@babel/plugin-transform-for-of": "^7.7.4",
-        "@babel/plugin-transform-function-name": "^7.7.4",
-        "@babel/plugin-transform-literals": "^7.7.4",
-        "@babel/plugin-transform-member-expression-literals": "^7.7.4",
-        "@babel/plugin-transform-modules-amd": "^7.7.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.7.5",
-        "@babel/plugin-transform-modules-systemjs": "^7.7.4",
-        "@babel/plugin-transform-modules-umd": "^7.7.4",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.7.4",
-        "@babel/plugin-transform-new-target": "^7.7.4",
-        "@babel/plugin-transform-object-super": "^7.7.4",
-        "@babel/plugin-transform-parameters": "^7.7.7",
-        "@babel/plugin-transform-property-literals": "^7.7.4",
-        "@babel/plugin-transform-regenerator": "^7.7.5",
-        "@babel/plugin-transform-reserved-words": "^7.7.4",
-        "@babel/plugin-transform-shorthand-properties": "^7.7.4",
-        "@babel/plugin-transform-spread": "^7.7.4",
-        "@babel/plugin-transform-sticky-regex": "^7.7.4",
-        "@babel/plugin-transform-template-literals": "^7.7.4",
-        "@babel/plugin-transform-typeof-symbol": "^7.7.4",
-        "@babel/plugin-transform-unicode-regex": "^7.7.4",
-        "@babel/types": "^7.7.4",
-        "browserslist": "^4.6.0",
-        "core-js-compat": "^3.6.0",
+        "@babel/compat-data": "^7.9.6",
+        "@babel/helper-compilation-targets": "^7.9.6",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-proposal-async-generator-functions": "^7.8.3",
+        "@babel/plugin-proposal-dynamic-import": "^7.8.3",
+        "@babel/plugin-proposal-json-strings": "^7.8.3",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
+        "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
+        "@babel/plugin-syntax-async-generators": "^7.8.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.0",
+        "@babel/plugin-syntax-json-strings": "^7.8.0",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.0",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.0",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3",
+        "@babel/plugin-transform-arrow-functions": "^7.8.3",
+        "@babel/plugin-transform-async-to-generator": "^7.8.3",
+        "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
+        "@babel/plugin-transform-block-scoping": "^7.8.3",
+        "@babel/plugin-transform-classes": "^7.9.5",
+        "@babel/plugin-transform-computed-properties": "^7.8.3",
+        "@babel/plugin-transform-destructuring": "^7.9.5",
+        "@babel/plugin-transform-dotall-regex": "^7.8.3",
+        "@babel/plugin-transform-duplicate-keys": "^7.8.3",
+        "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
+        "@babel/plugin-transform-for-of": "^7.9.0",
+        "@babel/plugin-transform-function-name": "^7.8.3",
+        "@babel/plugin-transform-literals": "^7.8.3",
+        "@babel/plugin-transform-member-expression-literals": "^7.8.3",
+        "@babel/plugin-transform-modules-amd": "^7.9.6",
+        "@babel/plugin-transform-modules-commonjs": "^7.9.6",
+        "@babel/plugin-transform-modules-systemjs": "^7.9.6",
+        "@babel/plugin-transform-modules-umd": "^7.9.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
+        "@babel/plugin-transform-new-target": "^7.8.3",
+        "@babel/plugin-transform-object-super": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.9.5",
+        "@babel/plugin-transform-property-literals": "^7.8.3",
+        "@babel/plugin-transform-regenerator": "^7.8.7",
+        "@babel/plugin-transform-reserved-words": "^7.8.3",
+        "@babel/plugin-transform-shorthand-properties": "^7.8.3",
+        "@babel/plugin-transform-spread": "^7.8.3",
+        "@babel/plugin-transform-sticky-regex": "^7.8.3",
+        "@babel/plugin-transform-template-literals": "^7.8.3",
+        "@babel/plugin-transform-typeof-symbol": "^7.8.4",
+        "@babel/plugin-transform-unicode-regex": "^7.8.3",
+        "@babel/preset-modules": "^0.1.3",
+        "@babel/types": "^7.9.6",
+        "browserslist": "^4.11.1",
+        "core-js-compat": "^3.6.2",
         "invariant": "^2.2.2",
-        "js-levenshtein": "^1.1.3",
+        "levenary": "^1.1.1",
         "semver": "^5.5.0"
       }
     },
-    "@babel/runtime": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.7.tgz",
-      "integrity": "sha512-uCnC2JEVAu8AKB5do1WRIsvrdJ0flYx/A/9f/6chdacnEZ7LmavjdsDXr5ksYBegxtuTPR5Va9/+13QF/kFkCA==",
+    "@babel/preset-modules": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
+      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
       "dev": true,
       "requires": {
-        "regenerator-runtime": "^0.13.2"
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      }
+    },
+    "@babel/runtime": {
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
+      "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
+      "dev": true,
+      "requires": {
+        "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/template": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-      "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
+      "version": "7.8.6",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
+      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.4",
-        "@babel/types": "^7.7.4"
+        "@babel/code-frame": "^7.8.3",
+        "@babel/parser": "^7.8.6",
+        "@babel/types": "^7.8.6"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.9.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        }
       }
     },
     "@babel/traverse": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz",
-      "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz",
+      "integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.7.4",
-        "@babel/helper-function-name": "^7.7.4",
-        "@babel/helper-split-export-declaration": "^7.7.4",
-        "@babel/parser": "^7.7.4",
-        "@babel/types": "^7.7.4",
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.9.6",
+        "@babel/helper-function-name": "^7.9.5",
+        "@babel/helper-split-export-declaration": "^7.8.3",
+        "@babel/parser": "^7.9.6",
+        "@babel/types": "^7.9.6",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
         "lodash": "^4.17.13"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.8.3",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
+          "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.8.3"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.9.0",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+          "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.9.0",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        }
       }
     },
     "@babel/types": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz",
-      "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
+      "integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2",
+        "@babel/helper-validator-identifier": "^7.9.5",
         "lodash": "^4.17.13",
         "to-fast-properties": "^2.0.0"
       }
@@ -921,14 +1090,14 @@
       }
     },
     "@mdi/font": {
-      "version": "4.8.95",
-      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-4.8.95.tgz",
-      "integrity": "sha512-mfEjd6kkuheZ15CBU7g/q+De9+dah/SEgVH0uZsgCJTSYa+CkXIen35aNyHoixgcEfPV4Or0NLJvyYM5CXUnbQ=="
+      "version": "4.9.95",
+      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-4.9.95.tgz",
+      "integrity": "sha512-m2sbAs+SMwRnWpkMriBxEulwuhmqRyh6X+hdOZlqSxYZUM2C2TaDnQ4gcilzdoAgru2XYnWViZ/xPuSDGgRXVw=="
     },
     "@mdi/js": {
-      "version": "4.8.95",
-      "resolved": "https://registry.npmjs.org/@mdi/js/-/js-4.8.95.tgz",
-      "integrity": "sha512-mKhC18fKPtSNJxpHa6tHmntnLjSUSrzOIuT4QnhlXt27MkOP5n+sQtK6Ii/R0K4fdpgLZGi+vR5o6PsDDb/iIg=="
+      "version": "4.9.95",
+      "resolved": "https://registry.npmjs.org/@mdi/js/-/js-4.9.95.tgz",
+      "integrity": "sha512-6zKTCqZUCuDWJThdRcjdFTqp2BXfYwXI1UlYa68A1/kmCcy1ijpbpRbrJcUdZ+9WojencCh1DOGFqhj/x8I/eQ=="
     },
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
@@ -999,6 +1168,12 @@
         }
       }
     },
+    "@soda/get-current-script": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@soda/get-current-script/-/get-current-script-1.0.0.tgz",
+      "integrity": "sha512-9GvTek+7cVw7r+L7TNGOG1astZJWXz2h5q4BqMXl28KN+24iSCm1xo+RhZOZvwdT3bzNe9hD7riJc/lBoO7mgg==",
+      "dev": true
+    },
     "@types/color-name": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
@@ -1029,9 +1204,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "12.12.21",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.21.tgz",
-      "integrity": "sha512-8sRGhbpU+ck1n0PGAUgVrWrWdjSW2aqNeyC15W88GRsMpSwzv6RJGlLhE7s2RhVSOdyDmxbqlWSeThq4/7xqlA==",
+      "version": "14.0.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.5.tgz",
+      "integrity": "sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==",
       "dev": true
     },
     "@types/normalize-package-data": {
@@ -1041,9 +1216,9 @@
       "dev": true
     },
     "@types/q": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
-      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
+      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
       "dev": true
     },
     "@vue/babel-helper-vue-jsx-merge-props": {
@@ -1067,24 +1242,25 @@
       }
     },
     "@vue/babel-preset-app": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.1.1.tgz",
-      "integrity": "sha512-nmt+7q0/e1CmoSWmrP3tgAXDbKdLfWh7O7VeMYk0i1bMHBYqjACmk13AxRwlby+fet/9JOicl0ubZq/bEs81Hg==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.3.1.tgz",
+      "integrity": "sha512-iNkySkbRWXGUA+Cvzj+/gEP0Y0uVAwwzfn21S7hkggSeIg9LJyZ+QzdxgKO0wgi01yTdb2mYWgeLQAfHZ65aew==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.7.4",
-        "@babel/helper-module-imports": "^7.7.4",
-        "@babel/plugin-proposal-class-properties": "^7.7.4",
-        "@babel/plugin-proposal-decorators": "^7.7.4",
-        "@babel/plugin-syntax-dynamic-import": "^7.7.4",
-        "@babel/plugin-syntax-jsx": "^7.7.4",
-        "@babel/plugin-transform-runtime": "^7.7.4",
-        "@babel/preset-env": "^7.7.4",
-        "@babel/runtime": "^7.7.4",
+        "@babel/core": "^7.9.0",
+        "@babel/helper-compilation-targets": "^7.8.7",
+        "@babel/helper-module-imports": "^7.8.3",
+        "@babel/plugin-proposal-class-properties": "^7.8.3",
+        "@babel/plugin-proposal-decorators": "^7.8.3",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-jsx": "^7.8.3",
+        "@babel/plugin-transform-runtime": "^7.9.0",
+        "@babel/preset-env": "^7.9.0",
+        "@babel/runtime": "^7.9.2",
         "@vue/babel-preset-jsx": "^1.1.2",
-        "babel-plugin-dynamic-import-node": "^2.2.0",
-        "core-js": "^3.4.3",
-        "core-js-compat": "^3.4.3"
+        "babel-plugin-dynamic-import-node": "^2.3.0",
+        "core-js": "^3.6.4",
+        "core-js-compat": "^3.6.4"
       }
     },
     "@vue/babel-preset-jsx": {
@@ -1145,84 +1321,244 @@
       }
     },
     "@vue/cli-overlay": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.1.1.tgz",
-      "integrity": "sha512-y5fBtw/aXUem3B/xVb37xB71gq2hNAZsbhW0t4DIGuNConS+Tps41MKWb7dbxq4TLyH7MWX3aJbDzuUGanBMqQ==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.3.1.tgz",
+      "integrity": "sha512-UA399aWHhre2VHrQFQSJhFLrFMqOYQ8ly+Ni6T+cpCjOwssjiaqaqrG5YiZBAqDwQvjrtYori4lU66qrY5DVhA==",
       "dev": true
     },
     "@vue/cli-plugin-babel": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-4.1.1.tgz",
-      "integrity": "sha512-1TyuKEFFlEQwXvVohhUTJEa85o29Z4F62p1nzR+EIMOudo9tHaO1WWPqShZ2Trehrl7cpIjul9dhRUuyhwKiaQ==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-4.3.1.tgz",
+      "integrity": "sha512-tBqu0v1l4LfWX8xuJmofpp+8xQzKddFNxdLmeVDOX/omDBQX0qaVDeMUtRxxSTazI06SKr605SnUQoa35qwbvw==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.7.4",
-        "@vue/babel-preset-app": "^4.1.1",
-        "@vue/cli-shared-utils": "^4.1.1",
-        "babel-loader": "^8.0.6",
+        "@babel/core": "^7.9.0",
+        "@vue/babel-preset-app": "^4.3.1",
+        "@vue/cli-shared-utils": "^4.3.1",
+        "babel-loader": "^8.1.0",
         "cache-loader": "^4.1.0",
         "thread-loader": "^2.1.3",
         "webpack": "^4.0.0"
       }
     },
     "@vue/cli-plugin-eslint": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.1.1.tgz",
-      "integrity": "sha512-7bb5idaWcXREaxVYmQ9NK31gy26Qms6cQ9ENovXQurFpsSd29+Fmqc/EkAhHhWn82gModvypIoJyOhKt21jxKg==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.3.1.tgz",
+      "integrity": "sha512-5UEP93b8C/JQs9Rnuldsu8jMz0XO4wNXG0lL/GdChYBEheKCyXJXzan7qzEbIuvUwG3I+qlUkGsiyNokIgXejg==",
       "dev": true,
       "requires": {
-        "@vue/cli-shared-utils": "^4.1.1",
-        "eslint-loader": "^2.1.2",
+        "@vue/cli-shared-utils": "^4.3.1",
+        "eslint-loader": "^2.2.1",
         "globby": "^9.2.0",
+        "inquirer": "^7.1.0",
         "webpack": "^4.0.0",
         "yorkie": "^2.0.0"
+      },
+      "dependencies": {
+        "ansi-escapes": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
+          "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.11.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "cli-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+          "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+          "dev": true,
+          "requires": {
+            "restore-cursor": "^3.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "figures": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+          "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+          "dev": true,
+          "requires": {
+            "escape-string-regexp": "^1.0.5"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "inquirer": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
+          "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^3.0.0",
+            "cli-cursor": "^3.1.0",
+            "cli-width": "^2.0.0",
+            "external-editor": "^3.0.3",
+            "figures": "^3.0.0",
+            "lodash": "^4.17.15",
+            "mute-stream": "0.0.8",
+            "run-async": "^2.4.0",
+            "rxjs": "^6.5.3",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0",
+            "through": "^2.3.6"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+          "dev": true
+        },
+        "mimic-fn": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+          "dev": true
+        },
+        "mute-stream": {
+          "version": "0.0.8",
+          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+          "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+          "dev": true
+        },
+        "onetime": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
+          "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+          "dev": true,
+          "requires": {
+            "mimic-fn": "^2.1.0"
+          }
+        },
+        "restore-cursor": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+          "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+          "dev": true,
+          "requires": {
+            "onetime": "^5.1.0",
+            "signal-exit": "^3.0.2"
+          }
+        },
+        "run-async": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+          "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+          "dev": true
+        },
+        "string-width": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "type-fest": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
+          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+          "dev": true
+        }
       }
     },
     "@vue/cli-plugin-router": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.1.1.tgz",
-      "integrity": "sha512-n2L2LPLnNcCeeVwJUrbRexi/coBnexIZorRTihinIkUzv3J+Qiw0KPsGjg1RF6UrieFlRhqcY3a5GloC+L0SBQ==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.3.1.tgz",
+      "integrity": "sha512-m0ntr5R6q62oNMODgoyHAVAd/sDtsH15GdBrScZsPNeyHxmzmNBDlsNM38yYGGY064zDRRWif15d1yaTREybrA==",
       "dev": true,
       "requires": {
-        "@vue/cli-shared-utils": "^4.1.1"
+        "@vue/cli-shared-utils": "^4.3.1"
       }
     },
     "@vue/cli-plugin-vuex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.1.1.tgz",
-      "integrity": "sha512-AkK+FCrghjcyxUgfJyxpSuyJ0w9FSlwQEZv7+aRhs9j+YguROdjKA8DDTp8Ve1yboALeNMRv8eXApQEVC3xFQA==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.3.1.tgz",
+      "integrity": "sha512-mukwOlhZGBJhkqO2b3wHFFHjK5aP00b1WUHdrOfLR7M18euhaTyb4kA5nwZwEOmU3EzZx6kHzSFCRy/XaMkLug==",
       "dev": true
     },
     "@vue/cli-service": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.1.1.tgz",
-      "integrity": "sha512-woEIXXc22DXKrSO+FAFnrzhnysJcAB1UTF2t0NIPrxnngm0O2YSO0idmy01a2H/q3auMCVNQdzggQ4JWUeV7Gg==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.3.1.tgz",
+      "integrity": "sha512-CsNGfHe+9oKZdRwJmweQ0KsMYM27ssg1eNQqRKL/t+IgDLO3Tu86uaOOCLn4ZAaU5oxxpq4aSFvz+A0YxQRSWw==",
       "dev": true,
       "requires": {
         "@intervolga/optimize-cssnano-plugin": "^1.0.5",
         "@soda/friendly-errors-webpack-plugin": "^1.7.1",
-        "@vue/cli-overlay": "^4.1.1",
-        "@vue/cli-plugin-router": "^4.1.1",
-        "@vue/cli-plugin-vuex": "^4.1.1",
-        "@vue/cli-shared-utils": "^4.1.1",
+        "@soda/get-current-script": "^1.0.0",
+        "@vue/cli-overlay": "^4.3.1",
+        "@vue/cli-plugin-router": "^4.3.1",
+        "@vue/cli-plugin-vuex": "^4.3.1",
+        "@vue/cli-shared-utils": "^4.3.1",
         "@vue/component-compiler-utils": "^3.0.2",
         "@vue/preload-webpack-plugin": "^1.1.0",
         "@vue/web-component-wrapper": "^1.2.0",
-        "acorn": "^6.1.1",
-        "acorn-walk": "^6.1.1",
+        "acorn": "^7.1.0",
+        "acorn-walk": "^7.1.1",
         "address": "^1.1.2",
-        "autoprefixer": "^9.7.2",
-        "browserslist": "^4.7.3",
+        "autoprefixer": "^9.7.5",
+        "browserslist": "^4.11.1",
         "cache-loader": "^4.1.0",
-        "case-sensitive-paths-webpack-plugin": "^2.2.0",
-        "chalk": "^2.4.2",
+        "case-sensitive-paths-webpack-plugin": "^2.3.0",
         "cli-highlight": "^2.1.4",
-        "clipboardy": "^2.0.0",
-        "cliui": "^5.0.0",
-        "copy-webpack-plugin": "^5.0.5",
-        "css-loader": "^3.1.0",
+        "clipboardy": "^2.3.0",
+        "cliui": "^6.0.0",
+        "copy-webpack-plugin": "^5.1.1",
+        "css-loader": "^3.4.2",
         "cssnano": "^4.1.10",
-        "current-script-polyfill": "^1.0.0",
         "debug": "^4.1.1",
         "default-gateway": "^5.0.5",
         "dotenv": "^8.2.0",
@@ -1230,35 +1566,36 @@
         "file-loader": "^4.2.0",
         "fs-extra": "^7.0.1",
         "globby": "^9.2.0",
-        "hash-sum": "^1.0.2",
+        "hash-sum": "^2.0.0",
         "html-webpack-plugin": "^3.2.0",
         "launch-editor-middleware": "^2.2.1",
         "lodash.defaultsdeep": "^4.6.1",
         "lodash.mapvalues": "^4.6.0",
         "lodash.transform": "^4.6.0",
-        "mini-css-extract-plugin": "^0.8.0",
-        "minimist": "^1.2.0",
-        "ora": "^3.4.0",
+        "mini-css-extract-plugin": "^0.9.0",
+        "minimist": "^1.2.5",
+        "pnp-webpack-plugin": "^1.6.4",
         "portfinder": "^1.0.25",
         "postcss-loader": "^3.0.0",
-        "read-pkg": "^5.1.1",
-        "semver": "^6.1.0",
-        "slash": "^3.0.0",
-        "source-map-url": "^0.4.0",
-        "ssri": "^6.0.1",
-        "string.prototype.padend": "^3.0.0",
-        "terser-webpack-plugin": "^2.2.1",
+        "ssri": "^7.1.0",
+        "terser-webpack-plugin": "^2.3.5",
         "thread-loader": "^2.1.3",
         "url-loader": "^2.2.0",
-        "vue-loader": "^15.7.2",
-        "vue-style-loader": "^4.1.0",
+        "vue-loader": "^15.9.1",
+        "vue-style-loader": "^4.1.2",
         "webpack": "^4.0.0",
-        "webpack-bundle-analyzer": "^3.6.0",
-        "webpack-chain": "^6.0.0",
-        "webpack-dev-server": "^3.9.0",
+        "webpack-bundle-analyzer": "^3.6.1",
+        "webpack-chain": "^6.4.0",
+        "webpack-dev-server": "^3.10.3",
         "webpack-merge": "^4.2.2"
       },
       "dependencies": {
+        "acorn": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
+          "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==",
+          "dev": true
+        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
@@ -1283,28 +1620,16 @@
             "rimraf": "^2.7.1",
             "ssri": "^7.0.0",
             "unique-filename": "^1.1.1"
-          },
-          "dependencies": {
-            "ssri": {
-              "version": "7.1.0",
-              "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz",
-              "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==",
-              "dev": true,
-              "requires": {
-                "figgy-pudding": "^3.5.1",
-                "minipass": "^3.1.1"
-              }
-            }
           }
         },
         "find-cache-dir": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.2.0.tgz",
-          "integrity": "sha512-1JKclkYYsf1q9WIJKLZa9S9muC+08RIjzAlLrK4QcYLJMS6mk9yombQ9qf+zJ7H9LS800k0s44L4sDq9VYzqyg==",
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
           "dev": true,
           "requires": {
             "commondir": "^1.0.1",
-            "make-dir": "^3.0.0",
+            "make-dir": "^3.0.2",
             "pkg-dir": "^4.1.0"
           }
         },
@@ -1328,14 +1653,23 @@
           }
         },
         "make-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz",
-          "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
           "dev": true,
           "requires": {
             "semver": "^6.0.0"
           }
         },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
         "p-locate": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
@@ -1345,6 +1679,12 @@
             "p-limit": "^2.2.0"
           }
         },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
         "path-exists": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -1366,10 +1706,10 @@
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         },
-        "slash": {
+        "serialize-javascript": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz",
+          "integrity": "sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw==",
           "dev": true
         },
         "source-map": {
@@ -1378,42 +1718,53 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         },
+        "ssri": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/ssri/-/ssri-7.1.0.tgz",
+          "integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==",
+          "dev": true,
+          "requires": {
+            "figgy-pudding": "^3.5.1",
+            "minipass": "^3.1.1"
+          }
+        },
         "terser-webpack-plugin": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.1.tgz",
-          "integrity": "sha512-dNxivOXmDgZqrGxOttBH6B4xaxT4zNC+Xd+2K8jwGDMK5q2CZI+KZMA1AAnSRT+BTRvuzKsDx+fpxzPAmAMVcA==",
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.6.tgz",
+          "integrity": "sha512-I8IDsQwZrqjdmOicNeE8L/MhwatAap3mUrtcAKJuilsemUNcX+Hier/eAzwStVqhlCxq0aG3ni9bK/0BESXkTg==",
           "dev": true,
           "requires": {
             "cacache": "^13.0.1",
-            "find-cache-dir": "^3.2.0",
-            "jest-worker": "^24.9.0",
-            "schema-utils": "^2.6.1",
-            "serialize-javascript": "^2.1.2",
+            "find-cache-dir": "^3.3.1",
+            "jest-worker": "^25.4.0",
+            "p-limit": "^2.3.0",
+            "schema-utils": "^2.6.6",
+            "serialize-javascript": "^3.0.0",
             "source-map": "^0.6.1",
-            "terser": "^4.4.3",
+            "terser": "^4.6.12",
             "webpack-sources": "^1.4.3"
           }
         }
       }
     },
     "@vue/cli-shared-utils": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.1.1.tgz",
-      "integrity": "sha512-nsxNW8Sy9y2yx/r9DqgZoYg/DoygvASIQl0XXG+imQUDWEXKmD6UZA6y5ANfStCljzZ/wd7WgWP+txmjy6exOw==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.3.1.tgz",
+      "integrity": "sha512-lcfRalou7Z9jZgIh9PeTIpwDK7RIjr9OxfLGwbdR8czUZYUeUa67zVEMJD0OPYh/CCoREtzNbVfLPb/IYYxWEA==",
       "dev": true,
       "requires": {
         "@hapi/joi": "^15.0.1",
-        "chalk": "^2.4.1",
+        "chalk": "^2.4.2",
         "execa": "^1.0.0",
         "launch-editor": "^2.2.1",
         "lru-cache": "^5.1.1",
         "node-ipc": "^9.1.1",
         "open": "^6.3.0",
         "ora": "^3.4.0",
-        "request": "^2.87.0",
+        "read-pkg": "^5.1.1",
+        "request": "^2.88.2",
         "request-promise-native": "^1.0.8",
         "semver": "^6.1.0",
-        "string.prototype.padstart": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
       "dependencies": {
@@ -1426,9 +1777,9 @@
       }
     },
     "@vue/component-compiler-utils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.1.0.tgz",
-      "integrity": "sha512-OJ7swvl8LtKtX5aYP8jHhO6fQBIRIGkU6rvWzK+CGJiNOnvg16nzcBkd9qMZzW8trI2AsqAKx263nv7kb5rhZw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.1.2.tgz",
+      "integrity": "sha512-QLq9z8m79mCinpaEeSURhnNCN6djxpHw0lpP/bodMlt5kALfONpryMthvnrQOlTcIKoF+VoPi+lPHUYeDFPXug==",
       "dev": true,
       "requires": {
         "consolidate": "^0.15.1",
@@ -1436,12 +1787,18 @@
         "lru-cache": "^4.1.2",
         "merge-source-map": "^1.1.0",
         "postcss": "^7.0.14",
-        "postcss-selector-parser": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
         "prettier": "^1.18.2",
         "source-map": "~0.6.1",
         "vue-template-es2015-compiler": "^1.9.0"
       },
       "dependencies": {
+        "hash-sum": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+          "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
+          "dev": true
+        },
         "lru-cache": {
           "version": "4.1.5",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -1488,178 +1845,177 @@
       "dev": true
     },
     "@webassemblyjs/ast": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
+      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5"
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
+      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
+      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
+      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
       "dev": true
     },
     "@webassemblyjs/helper-code-frame": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
+      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@webassemblyjs/wast-printer": "1.9.0"
       }
     },
     "@webassemblyjs/helper-fsm": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
+      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
       "dev": true
     },
     "@webassemblyjs/helper-module-context": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
+      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "^0.0.3"
+        "@webassemblyjs/ast": "1.9.0"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
+      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
+      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
+      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
+      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
       "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
+      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
+      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/helper-wasm-section": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-opt": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/helper-wasm-section": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-opt": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "@webassemblyjs/wast-printer": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
+      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
+      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
+      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
       }
     },
     "@webassemblyjs/wast-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
+      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-code-frame": "1.8.5",
-        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-code-frame": "1.9.0",
+        "@webassemblyjs/helper-fsm": "1.9.0",
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
+      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -1686,9 +2042,9 @@
       }
     },
     "acorn": {
-      "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
-      "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+      "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
       "dev": true
     },
     "acorn-jsx": {
@@ -1698,9 +2054,9 @@
       "dev": true
     },
     "acorn-walk": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
-      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.1.1.tgz",
+      "integrity": "sha512-wdlPY2tm/9XBr7QkKlq0WQVgiuGTX6YWPyRyBviSoScBuLfTVQhvwg6wJ369GJ/1nPfTLMfnrFIfjqVg6d+jQQ==",
       "dev": true
     },
     "address": {
@@ -1789,24 +2145,13 @@
       "dev": true
     },
     "anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+      "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
       "dev": true,
       "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-          "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-          "dev": true,
-          "requires": {
-            "remove-trailing-separator": "^1.0.1"
-          }
-        }
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
       }
     },
     "aproba": {
@@ -1816,9 +2161,9 @@
       "dev": true
     },
     "arch": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz",
-      "integrity": "sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.1.2.tgz",
+      "integrity": "sha512-NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ==",
       "dev": true
     },
     "argparse": {
@@ -1893,6 +2238,14 @@
         "bn.js": "^4.0.0",
         "inherits": "^2.0.1",
         "minimalistic-assert": "^1.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "assert": {
@@ -1974,26 +2327,18 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "9.7.3",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.3.tgz",
-      "integrity": "sha512-8T5Y1C5Iyj6PgkPSFd0ODvK9DIleuPKUPYniNxybS47g2k2wFgLZ46lGQHlBuGKIAEV8fbCDfKCCRS1tvOgc3Q==",
+      "version": "9.8.0",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
+      "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.8.0",
-        "caniuse-lite": "^1.0.30001012",
+        "browserslist": "^4.12.0",
+        "caniuse-lite": "^1.0.30001061",
         "chalk": "^2.4.2",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
-        "postcss": "^7.0.23",
-        "postcss-value-parser": "^4.0.2"
-      },
-      "dependencies": {
-        "postcss-value-parser": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
-          "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
-          "dev": true
-        }
+        "postcss": "^7.0.30",
+        "postcss-value-parser": "^4.1.0"
       }
     },
     "aws-sign2": {
@@ -2003,19 +2348,18 @@
       "dev": true
     },
     "aws4": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz",
-      "integrity": "sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
+      "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA==",
       "dev": true
     },
     "axios": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
-      "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz",
+      "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==",
       "dev": true,
       "requires": {
-        "follow-redirects": "1.5.10",
-        "is-buffer": "^2.0.2"
+        "follow-redirects": "1.5.10"
       },
       "dependencies": {
         "debug": {
@@ -2036,12 +2380,6 @@
             "debug": "=3.1.0"
           }
         },
-        "is-buffer": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
-          "dev": true
-        },
         "ms": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -2051,35 +2389,47 @@
       }
     },
     "babel-eslint": {
-      "version": "10.0.3",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.3.tgz",
-      "integrity": "sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz",
+      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.0.0",
-        "@babel/traverse": "^7.0.0",
-        "@babel/types": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0",
         "eslint-visitor-keys": "^1.0.0",
         "resolve": "^1.12.0"
       }
     },
     "babel-loader": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
-      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
+      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
       "dev": true,
       "requires": {
-        "find-cache-dir": "^2.0.0",
-        "loader-utils": "^1.0.2",
-        "mkdirp": "^0.5.1",
-        "pify": "^4.0.1"
+        "find-cache-dir": "^2.1.0",
+        "loader-utils": "^1.4.0",
+        "mkdirp": "^0.5.3",
+        "pify": "^4.0.1",
+        "schema-utils": "^2.6.5"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        }
       }
     },
     "babel-plugin-dynamic-import-node": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
-      "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
       "dev": true,
       "requires": {
         "object.assign": "^4.1.0"
@@ -2186,9 +2536,9 @@
       "dev": true
     },
     "binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
+      "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
       "dev": true
     },
     "bindings": {
@@ -2208,9 +2558,9 @@
       "dev": true
     },
     "bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
+      "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==",
       "dev": true
     },
     "body-parser": {
@@ -2372,21 +2722,50 @@
       "requires": {
         "bn.js": "^4.1.0",
         "randombytes": "^2.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.0.tgz",
+      "integrity": "sha512-hEZC1KEeYuoHRqhGhTy6gWrpJA3ZDjFWv0DE61643ZnOXAKJb3u7yWcrU0mMc9SwAqK1n7myPGndkp0dFG7NFA==",
       "dev": true,
       "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.2",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
       }
     },
     "browserify-zlib": {
@@ -2399,14 +2778,15 @@
       }
     },
     "browserslist": {
-      "version": "4.8.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.2.tgz",
-      "integrity": "sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
+      "integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001015",
-        "electron-to-chromium": "^1.3.322",
-        "node-releases": "^1.1.42"
+        "caniuse-lite": "^1.0.30001043",
+        "electron-to-chromium": "^1.3.413",
+        "node-releases": "^1.1.53",
+        "pkg-up": "^2.0.0"
       }
     },
     "buffer": {
@@ -2457,9 +2837,9 @@
       "dev": true
     },
     "cacache": {
-      "version": "12.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
-      "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
       "dev": true,
       "requires": {
         "bluebird": "^3.5.5",
@@ -2511,13 +2891,13 @@
       },
       "dependencies": {
         "find-cache-dir": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.2.0.tgz",
-          "integrity": "sha512-1JKclkYYsf1q9WIJKLZa9S9muC+08RIjzAlLrK4QcYLJMS6mk9yombQ9qf+zJ7H9LS800k0s44L4sDq9VYzqyg==",
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
+          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
           "dev": true,
           "requires": {
             "commondir": "^1.0.1",
-            "make-dir": "^3.0.0",
+            "make-dir": "^3.0.2",
             "pkg-dir": "^4.1.0"
           }
         },
@@ -2541,14 +2921,23 @@
           }
         },
         "make-dir": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz",
-          "integrity": "sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==",
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
           "dev": true,
           "requires": {
             "semver": "^6.0.0"
           }
         },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
         "p-locate": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
@@ -2558,6 +2947,12 @@
             "p-limit": "^2.2.0"
           }
         },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
         "path-exists": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -2640,15 +3035,15 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001016",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001016.tgz",
-      "integrity": "sha512-yYQ2QfotceRiH4U+h1Us86WJXtVHDmy3nEKIdYPsZCYnOV5/tMgGbmoIlrMzmh2VXlproqYtVaKeGDBkMZifFA==",
+      "version": "1.0.30001066",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz",
+      "integrity": "sha512-Gfj/WAastBtfxLws0RCh2sDbTK/8rJuSeZMecrSkNGYxPcv7EzblmDGfWQCFEQcSqYE2BRgQiJh8HOD07N5hIw==",
       "dev": true
     },
     "case-sensitive-paths-webpack-plugin": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz",
-      "integrity": "sha512-u5ElzokS8A1pm9vM3/iDgTcI3xqHxuCao94Oz8etI3cf0Tio0p8izkDYbTIn09uP3yUUr6+veaE6IkjnTYS46g==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz",
+      "integrity": "sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ==",
       "dev": true
     },
     "caseless": {
@@ -2681,29 +3076,60 @@
       "dev": true
     },
     "chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
+      "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
       "dev": true,
       "requires": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "fsevents": "^1.2.7",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "fsevents": "~2.1.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.4.0"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
       }
     },
     "chownr": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
-      "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
       "dev": true
     },
     "chrome-trace-event": {
@@ -2755,9 +3181,9 @@
       }
     },
     "clean-css": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
-      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
+      "integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
       "dev": true,
       "requires": {
         "source-map": "~0.6.0"
@@ -2801,9 +3227,9 @@
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.0.tgz",
-          "integrity": "sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==",
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
           "dev": true,
           "requires": {
             "@types/color-name": "^1.1.1",
@@ -2853,9 +3279,9 @@
       }
     },
     "cli-spinners": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.2.0.tgz",
-      "integrity": "sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.3.0.tgz",
+      "integrity": "sha512-Xs2Hf2nzrvJMFKimOR7YR0QwZ8fc0u98kdtwN1eNAZzNQgH3vK2pXzff6GJtKh7S5hoJ87ECiAiZFS2fb5Ii2w==",
       "dev": true
     },
     "cli-width": {
@@ -2865,61 +3291,53 @@
       "dev": true
     },
     "clipboardy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.1.0.tgz",
-      "integrity": "sha512-2pzOUxWcLlXWtn+Jd6js3o12TysNOOVes/aQfg+MT/35vrxWzedHlLwyoJpXjsFKWm95BTNEcMGD9+a7mKzZkQ==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.3.0.tgz",
+      "integrity": "sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ==",
       "dev": true,
       "requires": {
         "arch": "^2.1.1",
-        "execa": "^1.0.0"
+        "execa": "^1.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "dependencies": {
+        "is-wsl": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+          "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+          "dev": true,
+          "requires": {
+            "is-docker": "^2.0.0"
+          }
+        }
       }
     },
     "cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
       "dev": true,
       "requires": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
       },
       "dependencies": {
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
         },
         "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.0"
           }
         }
       }
@@ -2952,12 +3370,6 @@
         "q": "^1.1.2"
       }
     },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
-    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -3031,12 +3443,12 @@
       "dev": true
     },
     "compressible": {
-      "version": "2.0.17",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
-      "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
       "requires": {
-        "mime-db": ">= 1.40.0 < 2"
+        "mime-db": ">= 1.43.0 < 2"
       }
     },
     "compression": {
@@ -3198,6 +3610,27 @@
         "webpack-log": "^2.0.0"
       },
       "dependencies": {
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
         "globby": {
           "version": "7.1.1",
           "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
@@ -3218,6 +3651,21 @@
           "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
           "dev": true
         },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
         "pify": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
@@ -3244,17 +3692,17 @@
       }
     },
     "core-js": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.0.tgz",
-      "integrity": "sha512-AHPTNKzyB+YwgDWoSOCaid9PUSEF6781vsfiK8qUz62zRR448/XgK2NtCbpiUGizbep8Lrpt0Du19PpGGZvw3Q=="
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+      "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
     },
     "core-js-compat": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.0.tgz",
-      "integrity": "sha512-Z3eCNjGgoYluH89Jt4wVkfYsc/VdLrA2/woX5lm0isO/pCT+P+Y+o65bOuEnjDJLthdwTBxbCVzptTXtc18fJg==",
+      "version": "3.6.5",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
+      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.8.2",
+        "browserslist": "^4.8.5",
         "semver": "7.0.0"
       },
       "dependencies": {
@@ -3282,6 +3730,18 @@
         "is-directory": "^0.3.1",
         "js-yaml": "^3.13.1",
         "parse-json": "^4.0.0"
+      },
+      "dependencies": {
+        "parse-json": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+          "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+          "dev": true,
+          "requires": {
+            "error-ex": "^1.3.1",
+            "json-parse-better-errors": "^1.0.1"
+          }
+        }
       }
     },
     "create-ecdh": {
@@ -3292,6 +3752,14 @@
       "requires": {
         "bn.js": "^4.1.0",
         "elliptic": "^6.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "create-hash": {
@@ -3370,9 +3838,9 @@
       }
     },
     "css-loader": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.4.0.tgz",
-      "integrity": "sha512-JornYo4RAXl1Mzt0lOSVPmArzAMV3rGY2VuwtaDc732WTWjdwTaeS19nCGWMcSCf305Q396lhhDAJEWWM0SgPQ==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.5.3.tgz",
+      "integrity": "sha512-UEr9NH5Lmi7+dguAm+/JSPovNjYbm2k3TK58EiwQHzOHH5Jfq1Y+XoP2bQO6TMn7PptMd0opxxedAWcaSTRKHw==",
       "dev": true,
       "requires": {
         "camelcase": "^5.3.1",
@@ -3380,25 +3848,20 @@
         "icss-utils": "^4.1.1",
         "loader-utils": "^1.2.3",
         "normalize-path": "^3.0.0",
-        "postcss": "^7.0.23",
+        "postcss": "^7.0.27",
         "postcss-modules-extract-imports": "^2.0.0",
         "postcss-modules-local-by-default": "^3.0.2",
-        "postcss-modules-scope": "^2.1.1",
+        "postcss-modules-scope": "^2.2.0",
         "postcss-modules-values": "^3.0.0",
-        "postcss-value-parser": "^4.0.2",
-        "schema-utils": "^2.6.0"
+        "postcss-value-parser": "^4.0.3",
+        "schema-utils": "^2.6.6",
+        "semver": "^6.3.0"
       },
       "dependencies": {
-        "cssesc": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-          "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-          "dev": true
-        },
-        "postcss-value-parser": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
-          "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
+        "semver": {
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         }
       }
@@ -3439,12 +3902,6 @@
         }
       }
     },
-    "css-unit-converter": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz",
-      "integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=",
-      "dev": true
-    },
     "css-what": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz",
@@ -3452,9 +3909,9 @@
       "dev": true
     },
     "cssesc": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
-      "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true
     },
     "cssnano": {
@@ -3535,20 +3992,38 @@
       "dev": true
     },
     "csso": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.2.tgz",
-      "integrity": "sha512-kS7/oeNVXkHWxby5tHVxlhjizRCSv8QdU7hB2FpdAibDU8FjTAolhNjKNTiLzXtUrKT6HwClE81yXwEk1309wg==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
+      "integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
       "dev": true,
       "requires": {
-        "css-tree": "1.0.0-alpha.37"
+        "css-tree": "1.0.0-alpha.39"
+      },
+      "dependencies": {
+        "css-tree": {
+          "version": "1.0.0-alpha.39",
+          "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
+          "integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+          "dev": true,
+          "requires": {
+            "mdn-data": "2.0.6",
+            "source-map": "^0.6.1"
+          }
+        },
+        "mdn-data": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
+          "integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
       }
     },
-    "current-script-polyfill": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/current-script-polyfill/-/current-script-polyfill-1.0.0.tgz",
-      "integrity": "sha1-8xz35PPiGLBybnOMqSoC00iO9hU=",
-      "dev": true
-    },
     "cyclist": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
@@ -3627,9 +4102,9 @@
       },
       "dependencies": {
         "cross-spawn": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz",
-          "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==",
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
           "dev": true,
           "requires": {
             "path-key": "^3.1.0",
@@ -3677,9 +4152,9 @@
           "dev": true
         },
         "npm-run-path": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.0.tgz",
-          "integrity": "sha512-8eyAOAH+bYXFPSnNnKr3J+yoybe8O87Is5rtAQ8qRczJz1ajcsjg8l2oZqP+Ppx15Ii3S1vUTjQN2h4YO2tWWQ==",
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+          "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
           "dev": true,
           "requires": {
             "path-key": "^3.0.0"
@@ -3878,6 +4353,14 @@
         "bn.js": "^4.1.0",
         "miller-rabin": "^4.0.0",
         "randombytes": "^2.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "dir-glob": {
@@ -3982,12 +4465,12 @@
       }
     },
     "dot-prop": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz",
+      "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==",
       "dev": true,
       "requires": {
-        "is-obj": "^1.0.0"
+        "is-obj": "^2.0.0"
       }
     },
     "dotenv": {
@@ -4049,9 +4532,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.322",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz",
-      "integrity": "sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==",
+      "version": "1.3.452",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.452.tgz",
+      "integrity": "sha512-IdbjgCEqDvcU/1kUQa6C49I2NZOY3SBmU9Eus7mdFdJJBqn0Lg1Epfi/T4nqVcxTNBEGhcjwMhY1EysMBsXZrw==",
       "dev": true
     },
     "elliptic": {
@@ -4067,6 +4550,14 @@
         "inherits": "^2.0.1",
         "minimalistic-assert": "^1.0.0",
         "minimalistic-crypto-utils": "^1.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "emoji-regex": {
@@ -4076,9 +4567,9 @@
       "dev": true
     },
     "emojis-list": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "dev": true
     },
     "encodeurl": {
@@ -4120,9 +4611,9 @@
       }
     },
     "entities": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
-      "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.2.tgz",
+      "integrity": "sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==",
       "dev": true
     },
     "errno": {
@@ -4144,31 +4635,31 @@
       }
     },
     "error-stack-parser": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.4.tgz",
-      "integrity": "sha512-fZ0KkoxSjLFmhW5lHbUT3tLwy3nX1qEzMYo8koY1vrsAco53CMT1djnBSeC/wUjTEZRhZl9iRw7PaMaxfJ4wzQ==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz",
+      "integrity": "sha512-d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ==",
       "dev": true,
       "requires": {
-        "stackframe": "^1.1.0"
+        "stackframe": "^1.1.1"
       }
     },
     "es-abstract": {
-      "version": "1.17.0-next.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0-next.1.tgz",
-      "integrity": "sha512-7MmGr03N7Rnuid6+wyhD9sHNE2n4tFSwExnU2lQl3lIo2ShXWGePY80zYaoMOmILWv57H0amMjZGHNzzGG70Rw==",
+      "version": "1.17.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+      "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
       "dev": true,
       "requires": {
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
         "has-symbols": "^1.0.1",
-        "is-callable": "^1.1.4",
-        "is-regex": "^1.0.4",
+        "is-callable": "^1.1.5",
+        "is-regex": "^1.0.5",
         "object-inspect": "^1.7.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.0",
-        "string.prototype.trimleft": "^2.1.0",
-        "string.prototype.trimright": "^2.1.0"
+        "string.prototype.trimleft": "^2.1.1",
+        "string.prototype.trimright": "^2.1.1"
       }
     },
     "es-to-primitive": {
@@ -4294,9 +4785,9 @@
       }
     },
     "eslint-plugin-prettier": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz",
-      "integrity": "sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.3.tgz",
+      "integrity": "sha512-+HG5jmu/dN3ZV3T6eCD7a4BlAySdN7mLIbJYo0z1cFQuI+r2DiTJEFeF68ots93PsnrMxbzIZ2S/ieX+mkrBeQ==",
       "dev": true,
       "requires": {
         "prettier-linter-helpers": "^1.0.0"
@@ -4396,15 +4887,15 @@
       "dev": true
     },
     "eventemitter3": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
-      "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
+      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
       "dev": true
     },
     "events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz",
+      "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==",
       "dev": true
     },
     "eventsource": {
@@ -4685,6 +5176,29 @@
         "is-glob": "^4.0.0",
         "merge2": "^1.2.3",
         "micromatch": "^3.1.10"
+      },
+      "dependencies": {
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        }
       }
     },
     "fast-json-stable-stringify": {
@@ -4709,9 +5223,9 @@
       }
     },
     "figgy-pudding": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
       "dev": true
     },
     "figures": {
@@ -4822,12 +5336,12 @@
       }
     },
     "find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
       "dev": true,
       "requires": {
-        "locate-path": "^3.0.0"
+        "locate-path": "^2.0.0"
       }
     },
     "flat-cache": {
@@ -4869,9 +5383,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
-      "integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.11.0.tgz",
+      "integrity": "sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA==",
       "dev": true,
       "requires": {
         "debug": "^3.0.0"
@@ -4954,9 +5468,9 @@
       }
     },
     "fs-minipass": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.0.0.tgz",
-      "integrity": "sha512-40Qz+LFXmd9tzYVnnBmZvFfvAADfUA14TXPK1s7IfElJTIZ97rA8w4Kin7Wt5JBrC3ShnnFJO/5vPjPEeJIq9A==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
       "dev": true,
       "requires": {
         "minipass": "^3.0.0"
@@ -4981,562 +5495,11 @@
       "dev": true
     },
     "fsevents": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
-      "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
+      "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
       "dev": true,
-      "optional": true,
-      "requires": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1",
-        "node-pre-gyp": "*"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "chownr": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "debug": {
-          "version": "3.2.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "deep-extend": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "fs-minipass": {
-          "version": "1.2.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.6.0"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
-        "ignore-walk": {
-          "version": "3.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimatch": "^3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minipass": {
-          "version": "2.9.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
-        },
-        "minizlib": {
-          "version": "1.3.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.9.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "needle": {
-          "version": "2.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "^3.2.6",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.14.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.1",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.2.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4.4.2"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "npm-normalize-package-bin": "^1.0.1"
-          }
-        },
-        "npm-normalize-package-bin": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "npm-packlist": {
-          "version": "1.4.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.13",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.8.6",
-            "minizlib": "^1.2.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.3"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "wide-align": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "^1.0.2 || 2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        }
-      }
+      "optional": true
     },
     "function-bind": {
       "version": "1.1.1",
@@ -5550,6 +5513,12 @@
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
       "dev": true
     },
+    "gensync": {
+      "version": "1.0.0-beta.1",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
+      "integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+      "dev": true
+    },
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -5601,24 +5570,12 @@
       }
     },
     "glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+      "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
       "dev": true,
       "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      },
-      "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
+        "is-glob": "^4.0.1"
       }
     },
     "glob-to-regexp": {
@@ -5650,9 +5607,9 @@
       }
     },
     "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
       "dev": true
     },
     "gzip-size": {
@@ -5666,31 +5623,11 @@
       }
     },
     "handle-thing": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
-      "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
       "dev": true
     },
-    "handlebars": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz",
-      "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==",
-      "dev": true,
-      "requires": {
-        "neo-async": "^2.6.0",
-        "optimist": "^0.6.1",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
-      }
-    },
     "har-schema": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
@@ -5778,19 +5715,39 @@
       }
     },
     "hash-base": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
       "dev": true,
       "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
       }
     },
     "hash-sum": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
-      "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz",
+      "integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==",
       "dev": true
     },
     "hash.js": {
@@ -5816,13 +5773,10 @@
       "dev": true
     },
     "highlight.js": {
-      "version": "9.17.1",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.17.1.tgz",
-      "integrity": "sha512-TA2/doAur5Ol8+iM3Ov7qy3jYcr/QiJ2eDTdRF4dfbjG7AaaB99J5G+zSl11ljbl6cIcahgPY6SKb3sC3EJ0fw==",
-      "dev": true,
-      "requires": {
-        "handlebars": "^4.5.3"
-      }
+      "version": "9.18.1",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.18.1.tgz",
+      "integrity": "sha512-OrVKYz70LHsnCgmbXctv/bfuvntIKDz177h0Co37DQ5jamGZLVmoCVMtjMtNZY3X9DrCcKfklHPNeA0uPZhSJg==",
+      "dev": true
     },
     "hmac-drbg": {
       "version": "1.0.1",
@@ -5842,9 +5796,9 @@
       "dev": true
     },
     "hosted-git-info": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
-      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+      "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
       "dev": true
     },
     "hpack.js": {
@@ -5878,9 +5832,9 @@
       "dev": true
     },
     "html-entities": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
-      "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
+      "integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
       "dev": true
     },
     "html-minifier": {
@@ -5903,30 +5857,6 @@
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
           "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
           "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "uglify-js": {
-          "version": "3.4.10",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
-          "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
-          "dev": true,
-          "requires": {
-            "commander": "~2.19.0",
-            "source-map": "~0.6.1"
-          },
-          "dependencies": {
-            "commander": {
-              "version": "2.19.0",
-              "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-              "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-              "dev": true
-            }
-          }
         }
       }
     },
@@ -5957,6 +5887,12 @@
           "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
           "dev": true
         },
+        "emojis-list": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+          "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+          "dev": true
+        },
         "json5": {
           "version": "0.5.1",
           "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
@@ -5974,6 +5910,16 @@
             "json5": "^0.5.0",
             "object-assign": "^4.0.1"
           }
+        },
+        "util.promisify": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+          "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.2",
+            "object.getownpropertydescriptors": "^2.0.3"
+          }
         }
       }
     },
@@ -5998,9 +5944,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
-          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.3",
@@ -6037,16 +5983,10 @@
         }
       }
     },
-    "http-parser-js": {
-      "version": "0.4.10",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
-      "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
-      "dev": true
-    },
     "http-proxy": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
-      "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
       "dev": true,
       "requires": {
         "eventemitter3": "^4.0.0",
@@ -6272,12 +6212,6 @@
         "loose-envify": "^1.0.0"
       }
     },
-    "invert-kv": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-      "dev": true
-    },
     "ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -6291,9 +6225,9 @@
       "dev": true
     },
     "ipaddr.js": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
-      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "dev": true
     },
     "is-absolute-url": {
@@ -6335,12 +6269,12 @@
       "dev": true
     },
     "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
       "requires": {
-        "binary-extensions": "^1.0.0"
+        "binary-extensions": "^2.0.0"
       }
     },
     "is-buffer": {
@@ -6429,6 +6363,12 @@
       "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
       "dev": true
     },
+    "is-docker": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.0.0.tgz",
+      "integrity": "sha512-pJEdRugimx4fBMra5z2/5iRdZ63OhYV0vr0Dwm5+xtW4D1FvRkB8hamMIhnWfyJeDdyr/aa7BDyNbtG38VxgoQ==",
+      "dev": true
+    },
     "is-extendable": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -6477,9 +6417,9 @@
       }
     },
     "is-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
-      "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
       "dev": true
     },
     "is-path-cwd": {
@@ -6615,32 +6555,32 @@
       "dev": true
     },
     "jest-worker": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
-      "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz",
+      "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
       "dev": true,
       "requires": {
         "merge-stream": "^2.0.0",
-        "supports-color": "^6.1.0"
+        "supports-color": "^7.0.0"
       },
       "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
         "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "^4.0.0"
           }
         }
       }
     },
-    "js-levenshtein": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
-      "dev": true
-    },
     "js-message": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.5.tgz",
@@ -6721,12 +6661,12 @@
       "dev": true
     },
     "json5": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
-      "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "^1.2.5"
       }
     },
     "jsonfile": {
@@ -6757,9 +6697,9 @@
       "dev": true
     },
     "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true
     },
     "launch-editor": {
@@ -6781,13 +6721,19 @@
         "launch-editor": "^2.2.1"
       }
     },
-    "lcid": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+    "leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true
+    },
+    "levenary": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
+      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
       "dev": true,
       "requires": {
-        "invert-kv": "^2.0.0"
+        "leven": "^3.1.0"
       }
     },
     "levn": {
@@ -6807,13 +6753,13 @@
       "dev": true
     },
     "loader-fs-cache": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.2.tgz",
-      "integrity": "sha512-70IzT/0/L+M20jUlEqZhZyArTU6VKLRTYRDAYN26g4jfzpJqjipLL3/hgYpySqI9PwsVRHHFja0LfEmsx9X2Cw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.3.tgz",
+      "integrity": "sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==",
       "dev": true,
       "requires": {
         "find-cache-dir": "^0.1.1",
-        "mkdirp": "0.5.1"
+        "mkdirp": "^0.5.1"
       },
       "dependencies": {
         "find-cache-dir": {
@@ -6864,13 +6810,13 @@
       "dev": true
     },
     "loader-utils": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
-      "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
+      "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
       "dev": true,
       "requires": {
         "big.js": "^5.2.2",
-        "emojis-list": "^2.0.0",
+        "emojis-list": "^3.0.0",
         "json5": "^1.0.1"
       },
       "dependencies": {
@@ -6886,12 +6832,12 @@
       }
     },
     "locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
       "requires": {
-        "p-locate": "^3.0.0",
+        "p-locate": "^2.0.0",
         "path-exists": "^3.0.0"
       }
     },
@@ -6947,9 +6893,9 @@
       }
     },
     "loglevel": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.6.tgz",
-      "integrity": "sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==",
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz",
+      "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==",
       "dev": true
     },
     "loose-envify": {
@@ -6986,21 +6932,6 @@
         "semver": "^5.6.0"
       }
     },
-    "mamacro": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
-      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
-      "dev": true
-    },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dev": true,
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -7045,25 +6976,6 @@
       "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
       "dev": true
     },
-    "mem": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-      "dev": true,
-      "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^2.0.0",
-        "p-is-promise": "^2.0.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-          "dev": true
-        }
-      }
-    },
     "memory-fs": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -7144,27 +7056,35 @@
       "requires": {
         "bn.js": "^4.0.0",
         "brorand": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "mime": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz",
+      "integrity": "sha512-3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w==",
       "dev": true
     },
     "mime-db": {
-      "version": "1.42.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz",
-      "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==",
+      "version": "1.44.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==",
       "dev": true
     },
     "mime-types": {
-      "version": "2.1.25",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz",
-      "integrity": "sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==",
+      "version": "2.1.27",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
       "dev": true,
       "requires": {
-        "mime-db": "1.42.0"
+        "mime-db": "1.44.0"
       }
     },
     "mimic-fn": {
@@ -7174,9 +7094,9 @@
       "dev": true
     },
     "mini-css-extract-plugin": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.2.tgz",
-      "integrity": "sha512-a3Y4of27Wz+mqK3qrcd3VhYz6cU0iW5x3Sgvqzbj+XmlrSizmvu8QQMl5oMYJjgHOC4iyt+w7l4umP+dQeW3bw==",
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz",
+      "integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.1.0",
@@ -7232,15 +7152,15 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "minipass": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
-      "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+      "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
       "dev": true,
       "requires": {
         "yallist": "^4.0.0"
@@ -7273,9 +7193,9 @@
       }
     },
     "minipass-pipeline": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz",
-      "integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz",
+      "integrity": "sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==",
       "dev": true,
       "requires": {
         "minipass": "^3.0.0"
@@ -7321,20 +7241,12 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
       "dev": true,
       "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
+        "minimist": "^1.2.5"
       }
     },
     "move-concurrently": {
@@ -7391,9 +7303,9 @@
       }
     },
     "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+      "version": "2.14.1",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
+      "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==",
       "dev": true,
       "optional": true
     },
@@ -7506,21 +7418,10 @@
       }
     },
     "node-releases": {
-      "version": "1.1.43",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.43.tgz",
-      "integrity": "sha512-Rmfnj52WNhvr83MvuAWHEqXVoZXCcDQssSOffU4n4XOL9sPrP61mSZ88g25NqmABDvH7PiAlFCzoSCSdzA293w==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
+      "version": "1.1.56",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.56.tgz",
+      "integrity": "sha512-EVo605FhWLygH8a64TjgpjyHYOihkxECwX1bHHr8tETJKWEiWS2YJjPbvsX2jFjnjTNEgBCmk9mLjKG1Mf11cw==",
+      "dev": true
     },
     "normalize-package-data": {
       "version": "2.5.0",
@@ -7576,12 +7477,6 @@
       "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
       "dev": true
     },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
     "oauth-sign": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
@@ -7638,10 +7533,14 @@
       "dev": true
     },
     "object-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz",
-      "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==",
-      "dev": true
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
+      "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
     },
     "object-keys": {
       "version": "1.1.1",
@@ -7764,24 +7663,6 @@
         "is-wsl": "^1.1.0"
       }
     },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "dev": true,
-      "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-          "dev": true
-        }
-      }
-    },
     "optionator": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
@@ -7836,57 +7717,34 @@
       "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
       "dev": true
     },
-    "os-locale": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-      "dev": true,
-      "requires": {
-        "execa": "^1.0.0",
-        "lcid": "^2.0.0",
-        "mem": "^4.0.0"
-      }
-    },
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
       "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
       "dev": true
     },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-      "dev": true
-    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
       "dev": true
     },
-    "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
-      "dev": true
-    },
     "p-limit": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-      "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
       "dev": true,
       "requires": {
-        "p-try": "^2.0.0"
+        "p-try": "^1.0.0"
       }
     },
     "p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
       "dev": true,
       "requires": {
-        "p-limit": "^2.0.0"
+        "p-limit": "^1.1.0"
       }
     },
     "p-map": {
@@ -7908,15 +7766,15 @@
       }
     },
     "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
       "dev": true
     },
     "pako": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
-      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
       "dev": true
     },
     "parallel-transform": {
@@ -7971,13 +7829,15 @@
       }
     },
     "parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
+      "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
       "dev": true,
       "requires": {
+        "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "json-parse-better-errors": "^1.0.1",
+        "lines-and-columns": "^1.1.6"
       }
     },
     "parse5": {
@@ -8091,6 +7951,12 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
       "dev": true
     },
+    "picomatch": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "dev": true
+    },
     "pify": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
@@ -8119,12 +7985,75 @@
       "dev": true,
       "requires": {
         "find-up": "^3.0.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        }
+      }
+    },
+    "pkg-up": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
+      "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+      "dev": true,
+      "requires": {
+        "find-up": "^2.1.0"
+      }
+    },
+    "pnp-webpack-plugin": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
+      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
+      "dev": true,
+      "requires": {
+        "ts-pnp": "^1.1.6"
       }
     },
     "portfinder": {
-      "version": "1.0.25",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
-      "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==",
+      "version": "1.0.26",
+      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz",
+      "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==",
       "dev": true,
       "requires": {
         "async": "^2.6.2",
@@ -8150,9 +8079,9 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.25",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.25.tgz",
-      "integrity": "sha512-NXXVvWq9icrm/TgQC0O6YVFi4StfJz46M1iNd/h6B26Nvh/HKI+q4YZtFN/EjcInZliEscO/WL10BXnc1E5nwg==",
+      "version": "7.0.31",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.31.tgz",
+      "integrity": "sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
@@ -8178,15 +8107,14 @@
       }
     },
     "postcss-calc": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.1.tgz",
-      "integrity": "sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz",
+      "integrity": "sha512-rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ==",
       "dev": true,
       "requires": {
-        "css-unit-converter": "^1.1.1",
-        "postcss": "^7.0.5",
-        "postcss-selector-parser": "^5.0.0-rc.4",
-        "postcss-value-parser": "^3.3.1"
+        "postcss": "^7.0.27",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.0.2"
       }
     },
     "postcss-colormin": {
@@ -8200,6 +8128,14 @@
         "has": "^1.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-convert-values": {
@@ -8210,6 +8146,14 @@
       "requires": {
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-discard-comments": {
@@ -8293,6 +8237,14 @@
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0",
         "stylehacks": "^4.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-merge-rules": {
@@ -8310,12 +8262,12 @@
       },
       "dependencies": {
         "postcss-selector-parser": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
-          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
           "dev": true,
           "requires": {
-            "dot-prop": "^4.1.1",
+            "dot-prop": "^5.2.0",
             "indexes-of": "^1.0.1",
             "uniq": "^1.0.1"
           }
@@ -8330,6 +8282,14 @@
       "requires": {
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-minify-gradients": {
@@ -8342,6 +8302,14 @@
         "is-color-stop": "^1.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-minify-params": {
@@ -8356,6 +8324,14 @@
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0",
         "uniqs": "^2.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-minify-selectors": {
@@ -8371,12 +8347,12 @@
       },
       "dependencies": {
         "postcss-selector-parser": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
-          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
           "dev": true,
           "requires": {
-            "dot-prop": "^4.1.1",
+            "dot-prop": "^5.2.0",
             "indexes-of": "^1.0.1",
             "uniq": "^1.0.1"
           }
@@ -8402,60 +8378,16 @@
         "postcss": "^7.0.16",
         "postcss-selector-parser": "^6.0.2",
         "postcss-value-parser": "^4.0.0"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-          "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-          "dev": true
-        },
-        "postcss-selector-parser": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
-          "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
-          "dev": true,
-          "requires": {
-            "cssesc": "^3.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        },
-        "postcss-value-parser": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
-          "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
-          "dev": true
-        }
       }
     },
     "postcss-modules-scope": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz",
-      "integrity": "sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz",
+      "integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
       "dev": true,
       "requires": {
         "postcss": "^7.0.6",
         "postcss-selector-parser": "^6.0.0"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-          "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-          "dev": true
-        },
-        "postcss-selector-parser": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
-          "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
-          "dev": true,
-          "requires": {
-            "cssesc": "^3.0.0",
-            "indexes-of": "^1.0.1",
-            "uniq": "^1.0.1"
-          }
-        }
       }
     },
     "postcss-modules-values": {
@@ -8486,6 +8418,14 @@
         "cssnano-util-get-match": "^4.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-positions": {
@@ -8498,6 +8438,14 @@
         "has": "^1.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-repeat-style": {
@@ -8510,6 +8458,14 @@
         "cssnano-util-get-match": "^4.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-string": {
@@ -8521,6 +8477,14 @@
         "has": "^1.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-timing-functions": {
@@ -8532,6 +8496,14 @@
         "cssnano-util-get-match": "^4.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-unicode": {
@@ -8543,6 +8515,14 @@
         "browserslist": "^4.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-url": {
@@ -8555,6 +8535,14 @@
         "normalize-url": "^3.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-normalize-whitespace": {
@@ -8565,6 +8553,14 @@
       "requires": {
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-ordered-values": {
@@ -8576,6 +8572,14 @@
         "cssnano-util-get-arguments": "^4.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-reduce-initial": {
@@ -8600,15 +8604,23 @@
         "has": "^1.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-selector-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
-      "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
+      "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
       "dev": true,
       "requires": {
-        "cssesc": "^2.0.0",
+        "cssesc": "^3.0.0",
         "indexes-of": "^1.0.1",
         "uniq": "^1.0.1"
       }
@@ -8623,6 +8635,14 @@
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0",
         "svgo": "^1.0.0"
+      },
+      "dependencies": {
+        "postcss-value-parser": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+          "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+          "dev": true
+        }
       }
     },
     "postcss-unique-selectors": {
@@ -8637,9 +8657,9 @@
       }
     },
     "postcss-value-parser": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
-      "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
       "dev": true
     },
     "prelude-ls": {
@@ -8710,13 +8730,13 @@
       "dev": true
     },
     "proxy-addr": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
-      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
       "dev": true,
       "requires": {
         "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.0"
+        "ipaddr.js": "1.9.1"
       }
     },
     "prr": {
@@ -8732,9 +8752,9 @@
       "dev": true
     },
     "psl": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.6.0.tgz",
-      "integrity": "sha512-SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
     "public-encrypt": {
@@ -8749,6 +8769,14 @@
         "parse-asn1": "^5.0.0",
         "randombytes": "^2.0.1",
         "safe-buffer": "^5.1.2"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.11.9",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
+          "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+          "dev": true
+        }
       }
     },
     "pump": {
@@ -8877,26 +8905,12 @@
         "normalize-package-data": "^2.5.0",
         "parse-json": "^5.0.0",
         "type-fest": "^0.6.0"
-      },
-      "dependencies": {
-        "parse-json": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz",
-          "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "error-ex": "^1.3.1",
-            "json-parse-better-errors": "^1.0.1",
-            "lines-and-columns": "^1.1.6"
-          }
-        }
       }
     },
     "readable-stream": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
       "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
@@ -8909,14 +8923,12 @@
       }
     },
     "readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
+      "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
+        "picomatch": "^2.2.1"
       }
     },
     "rechoir": {
@@ -8935,27 +8947,28 @@
       "dev": true
     },
     "regenerate-unicode-properties": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
-      "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
+      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0"
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==",
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
       "dev": true
     },
     "regenerator-transform": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz",
-      "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==",
+      "version": "0.14.4",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz",
+      "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==",
       "dev": true,
       "requires": {
-        "private": "^0.1.6"
+        "@babel/runtime": "^7.8.4",
+        "private": "^0.1.8"
       }
     },
     "regex-not": {
@@ -8985,29 +8998,29 @@
       "dev": true
     },
     "regexpu-core": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
-      "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
+      "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.1.0",
-        "regjsgen": "^0.5.0",
-        "regjsparser": "^0.6.0",
+        "regenerate-unicode-properties": "^8.2.0",
+        "regjsgen": "^0.5.1",
+        "regjsparser": "^0.6.4",
         "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.1.0"
+        "unicode-match-property-value-ecmascript": "^1.2.0"
       }
     },
     "regjsgen": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz",
-      "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
+      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
       "dev": true
     },
     "regjsparser": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.1.tgz",
-      "integrity": "sha512-7LutE94sz/NKSYegK+/4E77+8DipxF+Qn2Tmu362AcmsF2NYq/wx3+ObvU90TKEhjf7hQoFXo23ajjrXP7eUgg==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
+      "integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
       "dev": true,
       "requires": {
         "jsesc": "~0.5.0"
@@ -9104,9 +9117,9 @@
       "dev": true
     },
     "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
       "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
@@ -9116,7 +9129,7 @@
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
         "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
+        "har-validator": "~5.1.3",
         "http-signature": "~1.2.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
@@ -9126,7 +9139,7 @@
         "performance-now": "^2.1.0",
         "qs": "~6.5.2",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
+        "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
       }
@@ -9170,9 +9183,9 @@
       "dev": true
     },
     "resolve": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz",
-      "integrity": "sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
       "dev": true,
       "requires": {
         "path-parse": "^1.0.6"
@@ -9301,24 +9314,24 @@
       "dev": true
     },
     "sass": {
-      "version": "1.23.7",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.23.7.tgz",
-      "integrity": "sha512-cYgc0fanwIpi0rXisGxl+/wadVQ/HX3RhpdRcjLdj2o2ye/sxUTpAxIhbmJy3PLQgRFbf6Pn8Jsrta2vdXcoOQ==",
+      "version": "1.26.5",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.5.tgz",
+      "integrity": "sha512-FG2swzaZUiX53YzZSjSakzvGtlds0lcbF+URuU9mxOv7WBh7NhXEVDa4kPKN4hN6fC2TkOTOKqiqp6d53N9X5Q==",
       "dev": true,
       "requires": {
         "chokidar": ">=2.0.0 <4.0.0"
       }
     },
     "sass-loader": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.0.tgz",
-      "integrity": "sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
+      "integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
       "dev": true,
       "requires": {
         "clone-deep": "^4.0.1",
         "loader-utils": "^1.2.3",
         "neo-async": "^2.6.1",
-        "schema-utils": "^2.1.0",
+        "schema-utils": "^2.6.1",
         "semver": "^6.3.0"
       },
       "dependencies": {
@@ -9337,13 +9350,33 @@
       "dev": true
     },
     "schema-utils": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.1.tgz",
-      "integrity": "sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg==",
+      "version": "2.6.6",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz",
+      "integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==",
       "dev": true,
       "requires": {
-        "ajv": "^6.10.2",
+        "ajv": "^6.12.0",
         "ajv-keywords": "^3.4.1"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
+          "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "fast-deep-equal": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
+          "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
+          "dev": true
+        }
       }
     },
     "select-hose": {
@@ -9575,9 +9608,9 @@
       "dev": true
     },
     "shelljs": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz",
-      "integrity": "sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==",
+      "version": "0.8.4",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
+      "integrity": "sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==",
       "dev": true,
       "requires": {
         "glob": "^7.0.0",
@@ -9748,13 +9781,14 @@
       }
     },
     "sockjs": {
-      "version": "0.3.19",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
-      "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+      "version": "0.3.20",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz",
+      "integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
       "dev": true,
       "requires": {
         "faye-websocket": "^0.10.0",
-        "uuid": "^3.0.1"
+        "uuid": "^3.4.0",
+        "websocket-driver": "0.6.5"
       }
     },
     "sockjs-client": {
@@ -9813,12 +9847,12 @@
       "dev": true
     },
     "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
       "dev": true,
       "requires": {
-        "atob": "^2.1.1",
+        "atob": "^2.1.2",
         "decode-uri-component": "^0.2.0",
         "resolve-url": "^0.2.1",
         "source-map-url": "^0.4.0",
@@ -9826,9 +9860,9 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-      "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
@@ -9850,9 +9884,9 @@
       "dev": true
     },
     "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
       "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
@@ -9860,15 +9894,15 @@
       }
     },
     "spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
       "dev": true
     },
     "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "dev": true,
       "requires": {
         "spdx-exceptions": "^2.1.0",
@@ -9882,9 +9916,9 @@
       "dev": true
     },
     "spdy": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
-      "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
       "dev": true,
       "requires": {
         "debug": "^4.1.0",
@@ -9909,9 +9943,9 @@
       },
       "dependencies": {
         "readable-stream": {
-          "version": "3.4.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
-          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.3",
@@ -9969,9 +10003,9 @@
       "dev": true
     },
     "stackframe": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.1.0.tgz",
-      "integrity": "sha512-Vx6W1Yvy+AM1R/ckVwcHQHV147pTPBKWCRLrXMuPrFVfvBUc3os7PR1QLIWCMhPpRg5eX9ojzbQIMLGBwyLjqg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.1.1.tgz",
+      "integrity": "sha512-0PlYhdKh6AfFxRyK/v+6/k+/mMfyiEBbTM5L94D0ZytQnJ166wuwoTYLHFWGbs2dpA8Rgq763KGWmN1EQEYHRQ==",
       "dev": true
     },
     "static-extend": {
@@ -10079,44 +10113,46 @@
         }
       }
     },
-    "string.prototype.padend": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz",
-      "integrity": "sha512-3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==",
+    "string.prototype.trimend": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
+      "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      }
-    },
-    "string.prototype.padstart": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.padstart/-/string.prototype.padstart-3.1.0.tgz",
-      "integrity": "sha512-envqZvUp2JItI+OeQ5UAh1ihbAV5G/2bixTojvlIa090GGqF+NQRxbWb2nv9fTGrZABv6+pE6jXoAZhhS2k4Hw==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
+        "es-abstract": "^1.17.5"
       }
     },
     "string.prototype.trimleft": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
-      "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz",
+      "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.17.5",
+        "string.prototype.trimstart": "^1.0.0"
       }
     },
     "string.prototype.trimright": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
-      "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz",
+      "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
+        "es-abstract": "^1.17.5",
+        "string.prototype.trimend": "^1.0.0"
+      }
+    },
+    "string.prototype.trimstart": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
+      "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
       }
     },
     "string_decoder": {
@@ -10181,12 +10217,12 @@
       },
       "dependencies": {
         "postcss-selector-parser": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
-          "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
+          "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
           "dev": true,
           "requires": {
-            "dot-prop": "^4.1.1",
+            "dot-prop": "^5.2.0",
             "indexes-of": "^1.0.1",
             "uniq": "^1.0.1"
           }
@@ -10276,9 +10312,9 @@
       "dev": true
     },
     "terser": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.4.3.tgz",
-      "integrity": "sha512-0ikKraVtRDKGzHrzkCv5rUNDzqlhmhowOBqC0XqUHFpW+vJ45+20/IFBcebwKfiS2Z9fJin6Eo+F1zLZsxi8RA==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.7.0.tgz",
+      "integrity": "sha512-Lfb0RiZcjRDXCC3OSHJpEkxJ9Qeqs6mp2v4jf2MHfy8vGERmVDuvjXdd/EnP5Deme5F2yBRBymKmKHCBg2echw==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -10478,21 +10514,13 @@
       "dev": true
     },
     "tough-cookie": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
       "dev": true,
       "requires": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
       }
     },
     "tryer": {
@@ -10501,6 +10529,12 @@
       "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
       "dev": true
     },
+    "ts-pnp": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
+      "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
+      "dev": true
+    },
     "tslib": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
@@ -10560,22 +10594,26 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.2.tgz",
-      "integrity": "sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA==",
+      "version": "3.4.10",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
+      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
       "dev": true,
-      "optional": true,
       "requires": {
-        "commander": "~2.20.3",
+        "commander": "~2.19.0",
         "source-map": "~0.6.1"
       },
       "dependencies": {
+        "commander": {
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
+          "dev": true
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -10596,15 +10634,15 @@
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
+      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
       "dev": true
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
-      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
       "dev": true
     },
     "union-value": {
@@ -10803,13 +10841,15 @@
       "dev": true
     },
     "util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
       "dev": true,
       "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
       }
     },
     "utila": {
@@ -10825,9 +10865,9 @@
       "dev": true
     },
     "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
       "dev": true
     },
     "validate-npm-package-license": {
@@ -10847,9 +10887,9 @@
       "dev": true
     },
     "vendors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz",
-      "integrity": "sha512-fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
+      "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==",
       "dev": true
     },
     "verror": {
@@ -10875,19 +10915,19 @@
       "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
     },
     "vue-cli-plugin-vuetify": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.0.2.tgz",
-      "integrity": "sha512-OJ1YUSfDlQibj111QMGv4a44atmtWdrkynk4voiEuivUqLcZGCJyF/A8ae0VojpMU2jlvZydz0nXjmZmcg+Nqw==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/vue-cli-plugin-vuetify/-/vue-cli-plugin-vuetify-2.0.5.tgz",
+      "integrity": "sha512-jtxcidjLT5f1H9QLYKLFjo/ZG42ud4pI9bK3WNO5DXyhiMDMTwSZ7b3NcJVRH7tKYbv5/ty0VPdDGlf4w22AMA==",
       "dev": true,
       "requires": {
-        "semver": "^6.0.0",
+        "semver": "^7.1.2",
         "shelljs": "^0.8.3"
       },
       "dependencies": {
         "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
           "dev": true
         }
       }
@@ -10926,9 +10966,9 @@
       "dev": true
     },
     "vue-loader": {
-      "version": "15.8.3",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.8.3.tgz",
-      "integrity": "sha512-yFksTFbhp+lxlm92DrKdpVIWMpranXnTEuGSc0oW+Gk43M9LWaAmBTnfj5+FCdve715mTHvo78IdaXf5TbiTJg==",
+      "version": "15.9.2",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.2.tgz",
+      "integrity": "sha512-oXBubaY//CYEISBlHX+c2YPJbmOH68xXPXjFv4MAgPqQvUsnjrBAjCJi8HXZ/r/yfn0tPL5VZj1Zcp8mJPI8VA==",
       "dev": true,
       "requires": {
         "@vue/component-compiler-utils": "^3.1.0",
@@ -10936,12 +10976,20 @@
         "loader-utils": "^1.1.0",
         "vue-hot-reload-api": "^2.3.0",
         "vue-style-loader": "^4.1.0"
+      },
+      "dependencies": {
+        "hash-sum": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+          "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
+          "dev": true
+        }
       }
     },
     "vue-router": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.3.tgz",
-      "integrity": "sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.2.0.tgz",
+      "integrity": "sha512-khkrcUIzMcI1rDcNtqkvLwfRFzB97GmJEsPAQdj7t/VvpGhmXLOkUfhc+Ah8CvpSXGXwuWuQO+x8Sy/xDhXZIA=="
     },
     "vue-style-loader": {
       "version": "4.1.2",
@@ -10951,6 +10999,14 @@
       "requires": {
         "hash-sum": "^1.0.2",
         "loader-utils": "^1.0.2"
+      },
+      "dependencies": {
+        "hash-sum": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+          "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=",
+          "dev": true
+        }
       }
     },
     "vue-template-compiler": {
@@ -10970,33 +11026,154 @@
       "dev": true
     },
     "vuetify": {
-      "version": "2.1.15",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.1.15.tgz",
-      "integrity": "sha512-M35NJvlzkbCpFfsK08xraNvCpiNCIbYUXI/hkzjWHQV1MFIZnjrDTVtYoiudCyJ52zlrhWezAr4pzFOCLAr6RA=="
+      "version": "2.2.29",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.2.29.tgz",
+      "integrity": "sha512-UI1i8kEdV+s7tNQe2yJJMPlvxGTE8cZfUAXEGV2yO4owHmeybn6p5YzFpJqimoKkfX6ok+zV29+6yIKfkyUDAA=="
     },
     "vuetify-loader": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.4.3.tgz",
-      "integrity": "sha512-fS0wRil682Ebsj2as+eruBoMPKaQYDhu/fDAndnTItzSY4RK4LOEIsssVL4vD6QY8dvUgoGL84SUQ6vGr777CA==",
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/vuetify-loader/-/vuetify-loader-1.4.4.tgz",
+      "integrity": "sha512-ryEtVZ/t+zvTM9UscEX5mWsbTOH5HGWITxlysYkkXtcgzgV21t7rRLHBhReH8oMBYddAij4AOosimhcfKnxFHQ==",
       "dev": true,
       "requires": {
+        "file-loader": "^4.0.0",
         "loader-utils": "^1.2.0"
       }
     },
     "vuex": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.2.tgz",
-      "integrity": "sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ=="
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.4.0.tgz",
+      "integrity": "sha512-ajtqwEW/QhnrBZQsZxCLHThZZaa+Db45c92Asf46ZDXu6uHXgbfVuBaJ4gzD2r4UX0oMJHstFwd2r2HM4l8umg=="
     },
     "watchpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz",
+      "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
+        "chokidar": "^3.4.0",
         "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+        "neo-async": "^2.5.0",
+        "watchpack-chokidar2": "^2.0.0"
+      }
+    },
+    "watchpack-chokidar2": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
+      "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chokidar": "^2.1.8"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
+          },
+          "dependencies": {
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "remove-trailing-separator": "^1.0.1"
+              }
+            }
+          }
+        },
+        "binary-extensions": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+          "dev": true,
+          "optional": true
+        },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "fsevents": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
+        "is-binary-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "binary-extensions": "^1.0.0"
+          }
+        },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        }
       }
     },
     "wbuf": {
@@ -11018,16 +11195,16 @@
       }
     },
     "webpack": {
-      "version": "4.41.4",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.4.tgz",
-      "integrity": "sha512-Lc+2uB6NjpCWsHI3trkoISOI64h9QYIXenbEWj3bn3oyjfB1lEBXjWAfAyY2sM0rZn41oD5V91OLwKRwS6Wp8Q==",
+      "version": "4.43.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz",
+      "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/wasm-edit": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "acorn": "^6.2.1",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/wasm-edit": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "acorn": "^6.4.1",
         "ajv": "^6.10.2",
         "ajv-keywords": "^3.4.1",
         "chrome-trace-event": "^1.0.2",
@@ -11038,16 +11215,31 @@
         "loader-utils": "^1.2.3",
         "memory-fs": "^0.4.1",
         "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.1",
+        "mkdirp": "^0.5.3",
         "neo-async": "^2.6.1",
         "node-libs-browser": "^2.2.1",
         "schema-utils": "^1.0.0",
         "tapable": "^1.1.3",
         "terser-webpack-plugin": "^1.4.3",
-        "watchpack": "^1.6.0",
+        "watchpack": "^1.6.1",
         "webpack-sources": "^1.4.1"
       },
       "dependencies": {
+        "acorn": {
+          "version": "6.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        },
         "schema-utils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -11062,13 +11254,13 @@
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.6.0.tgz",
-      "integrity": "sha512-orUfvVYEfBMDXgEKAKVvab5iQ2wXneIEorGNsyuOyVYpjYrI7CUOhhXNDd3huMwQ3vNNWWlGP+hzflMFYNzi2g==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.8.0.tgz",
+      "integrity": "sha512-PODQhAYVEourCcOuU+NiYI7WdR8QyELZGgPvB1y2tjbUpbmcQOt5Q7jEK+ttd5se0KSBKD9SXHCEozS++Wllmw==",
       "dev": true,
       "requires": {
-        "acorn": "^6.0.7",
-        "acorn-walk": "^6.1.1",
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1",
         "bfj": "^6.1.1",
         "chalk": "^2.4.1",
         "commander": "^2.18.0",
@@ -11080,12 +11272,20 @@
         "mkdirp": "^0.5.1",
         "opener": "^1.5.1",
         "ws": "^6.0.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz",
+          "integrity": "sha512-apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ==",
+          "dev": true
+        }
       }
     },
     "webpack-chain": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.2.0.tgz",
-      "integrity": "sha512-Kt/TCt6p4sL8YJ49m6/mMkU1gkGJUMu/6yevWbWnaHYTdKc7U6hNAm0d9RSdLIN28CGonmYD5FkABqE1UuNTTw==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.4.0.tgz",
+      "integrity": "sha512-f97PYqxU+9/u0IUqp/ekAHRhBD1IQwhBv3wlJo2nvyELpr2vNnUqO3XQEk+qneg0uWGP54iciotszpjfnEExFA==",
       "dev": true,
       "requires": {
         "deepmerge": "^1.5.2",
@@ -11106,9 +11306,9 @@
       }
     },
     "webpack-dev-server": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.1.tgz",
-      "integrity": "sha512-AGG4+XrrXn4rbZUueyNrQgO4KGnol+0wm3MPdqGLmmA+NofZl3blZQKxZ9BND6RDNuvAK9OMYClhjOSnxpWRoA==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz",
+      "integrity": "sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg==",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
@@ -11119,31 +11319,31 @@
         "debug": "^4.1.1",
         "del": "^4.1.1",
         "express": "^4.17.1",
-        "html-entities": "^1.2.1",
+        "html-entities": "^1.3.1",
         "http-proxy-middleware": "0.19.1",
         "import-local": "^2.0.0",
         "internal-ip": "^4.3.0",
         "ip": "^1.1.5",
         "is-absolute-url": "^3.0.3",
         "killable": "^1.0.1",
-        "loglevel": "^1.6.6",
+        "loglevel": "^1.6.8",
         "opn": "^5.5.0",
         "p-retry": "^3.0.1",
-        "portfinder": "^1.0.25",
+        "portfinder": "^1.0.26",
         "schema-utils": "^1.0.0",
         "selfsigned": "^1.10.7",
         "semver": "^6.3.0",
         "serve-index": "^1.9.1",
-        "sockjs": "0.3.19",
+        "sockjs": "0.3.20",
         "sockjs-client": "1.4.0",
-        "spdy": "^4.0.1",
+        "spdy": "^4.0.2",
         "strip-ansi": "^3.0.1",
         "supports-color": "^6.1.0",
         "url": "^0.11.0",
         "webpack-dev-middleware": "^3.7.2",
         "webpack-log": "^2.0.0",
         "ws": "^6.2.1",
-        "yargs": "12.0.5"
+        "yargs": "^13.3.2"
       },
       "dependencies": {
         "ansi-regex": {
@@ -11152,61 +11352,188 @@
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+        "anymatch": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+          "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
           "dev": true,
           "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
+            "micromatch": "^3.1.4",
+            "normalize-path": "^2.1.1"
           },
           "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+            "normalize-path": {
+              "version": "2.1.1",
+              "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+              "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "remove-trailing-separator": "^1.0.1"
               }
             }
           }
         },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+        "binary-extensions": {
+          "version": "1.13.1",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+          "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
           "dev": true
         },
+        "chokidar": {
+          "version": "2.1.8",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+          "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+          "dev": true,
+          "requires": {
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
+          }
+        },
+        "cliui": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+          "dev": true,
+          "requires": {
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
+        "emoji-regex": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+          "dev": true
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "fsevents": {
+          "version": "1.2.13",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+          "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "bindings": "^1.5.0",
+            "nan": "^2.12.1"
+          }
+        },
+        "glob-parent": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+          "dev": true,
+          "requires": {
+            "is-glob": "^3.1.0",
+            "path-dirname": "^1.0.0"
+          },
+          "dependencies": {
+            "is-glob": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+              "dev": true,
+              "requires": {
+                "is-extglob": "^2.1.0"
+              }
+            }
+          }
+        },
         "is-absolute-url": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
           "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
           "dev": true
         },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+        "is-binary-path": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+          "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
           "dev": true,
           "requires": {
-            "number-is-nan": "^1.0.0"
+            "binary-extensions": "^1.0.0"
           }
         },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
           "dev": true
         },
+        "readdirp": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+          "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.11",
+            "micromatch": "^3.1.10",
+            "readable-stream": "^2.0.2"
+          }
+        },
         "schema-utils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -11224,6 +11551,34 @@
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          },
+          "dependencies": {
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^4.1.0"
+              }
+            }
+          }
+        },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -11243,52 +11598,55 @@
           }
         },
         "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
           },
           "dependencies": {
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+            "ansi-regex": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+              "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+              "dev": true
+            },
+            "strip-ansi": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+              "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
               "dev": true,
               "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
+                "ansi-regex": "^4.1.0"
               }
             }
           }
         },
         "yargs": {
-          "version": "12.0.5",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.2.0",
+            "cliui": "^5.0.0",
             "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
+            "get-caller-file": "^2.0.1",
             "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
+            "require-main-filename": "^2.0.0",
             "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
+            "string-width": "^3.0.0",
             "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^11.1.1"
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.2"
           }
         },
         "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "version": "13.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+          "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -11335,13 +11693,11 @@
       }
     },
     "websocket-driver": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
-      "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz",
+      "integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
       "dev": true,
       "requires": {
-        "http-parser-js": ">=0.4.0 <0.4.11",
-        "safe-buffer": ">=5.1.0",
         "websocket-extensions": ">=0.1.1"
       }
     },
@@ -11372,12 +11728,6 @@
       "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
       "dev": true
     },
-    "wordwrap": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-      "dev": true
-    },
     "worker-farm": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
@@ -11399,9 +11749,9 @@
       },
       "dependencies": {
         "ansi-styles": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.0.tgz",
-          "integrity": "sha512-7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg==",
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
           "dev": true,
           "requires": {
             "@types/color-name": "^1.1.1",
@@ -11485,9 +11835,9 @@
       "dev": true
     },
     "yargs": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.0.2.tgz",
-      "integrity": "sha512-GH/X/hYt+x5hOat4LMnCqMd8r5Cv78heOMIJn1hr7QPPBqfeC6p89Y78+WB9yGDvfpCvgasfmWLzNzEioOUD9Q==",
+      "version": "15.3.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+      "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
       "dev": true,
       "requires": {
         "cliui": "^6.0.0",
@@ -11500,20 +11850,9 @@
         "string-width": "^4.2.0",
         "which-module": "^2.0.0",
         "y18n": "^4.0.0",
-        "yargs-parser": "^16.1.0"
+        "yargs-parser": "^18.1.1"
       },
       "dependencies": {
-        "cliui": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^6.2.0"
-          }
-        },
         "find-up": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -11539,6 +11878,15 @@
             "p-locate": "^4.1.0"
           }
         },
+        "p-limit": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+          "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
         "p-locate": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
@@ -11548,6 +11896,12 @@
             "p-limit": "^2.2.0"
           }
         },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
         "path-exists": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -11568,9 +11922,9 @@
       }
     },
     "yargs-parser": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz",
-      "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==",
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
       "dev": true,
       "requires": {
         "camelcase": "^5.0.0",
diff --git a/package.json b/package.json
index b520207..7240f50 100644
--- a/package.json
+++ b/package.json
@@ -8,33 +8,33 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@mdi/font": "^4.8.95",
-    "@mdi/js": "^4.8.95",
-    "core-js": "^3.4.3",
+    "@mdi/font": "^4.9.95",
+    "@mdi/js": "^4.9.95",
+    "core-js": "^3.6.5",
     "vue": "^2.6.10",
-    "vue-router": "^3.1.3",
-    "vuetify": "^2.1.0",
-    "vuex": "^3.1.2"
+    "vue-router": "^3.2.0",
+    "vuetify": "^2.2.29",
+    "vuex": "^3.4.0"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.1.0",
-    "@vue/cli-plugin-eslint": "^4.1.0",
-    "@vue/cli-plugin-router": "^4.1.1",
-    "@vue/cli-plugin-vuex": "^4.1.1",
-    "@vue/cli-service": "^4.1.0",
+    "@vue/cli-plugin-babel": "^4.3.1",
+    "@vue/cli-plugin-eslint": "^4.3.1",
+    "@vue/cli-plugin-router": "^4.3.1",
+    "@vue/cli-plugin-vuex": "^4.3.1",
+    "@vue/cli-service": "^4.3.1",
     "@vue/eslint-config-prettier": "^6.0.0",
-    "axios": "^0.19.0",
-    "babel-eslint": "^10.0.3",
+    "axios": "^0.19.2",
+    "babel-eslint": "^10.1.0",
     "eslint": "^5.16.0",
-    "eslint-plugin-prettier": "^3.1.2",
+    "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-vue": "^5.0.0",
     "material-design-icons-iconfont": "^5.0.1",
     "prettier": "^1.19.1",
-    "sass": "^1.19.0",
-    "sass-loader": "^8.0.0",
-    "vue-cli-plugin-vuetify": "^2.0.2",
+    "sass": "^1.26.5",
+    "sass-loader": "^8.0.2",
+    "vue-cli-plugin-vuetify": "^2.0.5",
     "vue-template-compiler": "^2.6.10",
-    "vuetify-loader": "^1.3.0"
+    "vuetify-loader": "^1.4.4"
   },
   "eslintConfig": {
     "root": true,
diff --git a/src/components/user/JobRequests/JobInvites.vue b/src/components/user/JobRequests/JobInvites.vue
index 37fdf28..2072d80 100644
--- a/src/components/user/JobRequests/JobInvites.vue
+++ b/src/components/user/JobRequests/JobInvites.vue
@@ -7,7 +7,7 @@
       <v-expansion-panel
         v-for="jobInvite in jobInvitesToMe"
         :key="jobInvite.id"
-        @click="seenJobIvnite(jobInvite)"
+        @click.once="seenJobIvnite(jobInvite)"
       >
         <v-expansion-panel-header>
           <div>
@@ -27,7 +27,7 @@
             </v-icon>
           </v-row>
         </v-expansion-panel-header>
-        <v-expansion-panel-content>
+        <v-expansion-panel-content :eager="true">
           <v-row>
             <v-spacer />
             <v-btn text @click="updatingJobInvite(jobInvite)">
@@ -37,9 +37,11 @@
             </v-btn>
           </v-row>
           <Day
-            v-bind:day="jobInvite.day"
+            :day="jobInvite.day"
             :long="true"
+            :loading="jobInvite.day.loading"
             @addingJob="addingJob(jobInvite, $event)"
+            @deletingJob="deletingJob(jobInvite, $event)"
           />
         </v-expansion-panel-content>
       </v-expansion-panel>
@@ -68,7 +70,8 @@ export default {
     ...mapActions({
       getJobInvites: 'jobInvites/getJobInvites',
       addJob: 'jobInvites/addJob',
-      updateJobInviteToMe: 'jobInvites/updateJobInviteToMe'
+      updateJobInviteToMe: 'jobInvites/updateJobInviteToMe',
+      deleteJob: 'jobInvites/deleteJob',
     }),
     forceRender() {
       setTimeout(() => {
@@ -90,6 +93,12 @@ export default {
       this.addJob(event)
       this.forceRender()
     },
+    deletingJob(jobInvite, event) {
+      this.seenJobIvnite(jobInvite)
+      this.deleteJob(event)
+      this.forceRender()
+
+    },
     userInWorker(jobinvite) {
       var jobkinddate = jobinvite.day.jobkinddate.find(item => {
         return item.worker.find(workeritem => {
diff --git a/src/components/user/Jobs.vue b/src/components/user/Jobs.vue
index 2d7a91d..8f5b9fa 100644
--- a/src/components/user/Jobs.vue
+++ b/src/components/user/Jobs.vue
@@ -45,7 +45,7 @@
       <v-card-text>
         <v-row justify="start" align="start">
           <div v-for="day in week.days" :key="day.id">
-            <v-col>
+            <v-col cols="12">
               <Day :day="day" :long="false" @addingJob="addJob" @sendInvites="setJobInvites" @deletingJob="deleteJob"/>
             </v-col>
           </div>
diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue
index dca06d3..43713a2 100644
--- a/src/components/user/Jobs/Day.vue
+++ b/src/components/user/Jobs/Day.vue
@@ -2,8 +2,7 @@
   <div v-if="day">
     <v-card
       :color="color(day)"
-      :max-width="long ? '' : '250px'"
-      :min-width="long ? '' : '250px'"
+      :max-width="long ? '' : '20em'"
     >
       <v-card-title v-if="day.date" class="subtitle-1 font-weight-bold">
         {{ name }} den {{ day.date.getDate() }}.{{ day.date.getMonth() + 1 }}.{{
@@ -47,7 +46,7 @@
           </div>
         </v-expand-transition>
       </v-card-text>
-      <v-card-actions class="text--secondary" v-if="!dayLoading">
+      <v-card-actions class="text--secondary" v-if="!dayLoading" :key="update">
         <v-spacer />
         <v-menu
           v-model="menu"
@@ -152,7 +151,8 @@ export default {
   name: 'Day',
   props: {
     day: Object,
-    long: Boolean
+    long: Boolean,
+    loading: Boolean
   },
   data() {
     return {
@@ -165,6 +165,9 @@ export default {
       job_invites: []
     }
   },
+  created() {
+    //setInterval(() => {console.log(this.day.loading)},100)
+  },
   methods: {
     ...mapActions({
       deleteInvite: 'jobInvites/deleteJobInviteFromMe'
@@ -314,7 +317,7 @@ export default {
       else return 'Samstag'
     },
     dayLoading() {
-      return this.day.loading
+      return this.loading
     }
   }
 }
diff --git a/src/components/vorstand/ServiceManagementComponents/Day.vue b/src/components/vorstand/ServiceManagementComponents/Day.vue
index 2fdefdb..202367f 100644
--- a/src/components/vorstand/ServiceManagementComponents/Day.vue
+++ b/src/components/vorstand/ServiceManagementComponents/Day.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="day">
-    <v-card :color="color(day)" max-width="250px" min-width="250px">
+    <v-card :color="color(day)" max-width="20em">
       <v-card-title v-if="day.date" class="subtitle-1 font-weight-bold">
         {{ day.name }} {{ day.date.getDate() }}.{{ day.date.getMonth() + 1 }}.{{
           day.date.getFullYear()
diff --git a/src/store/modules/jobInvites.js b/src/store/modules/jobInvites.js
index c614f00..65607cf 100644
--- a/src/store/modules/jobInvites.js
+++ b/src/store/modules/jobInvites.js
@@ -160,7 +160,9 @@ const mutations = {
     let day = getters.getDayToMe(date)
     day.forEach(a => {
       a.day.loading = value
+      console.log('day', value ? 'loading' : 'not loading', day, a.day.loading)
     })
+
   },
   deleteJobInviteFromMe: (state, jobinvite) => {
     var item = state.jobInvitesFromMe.find(item => {
@@ -273,6 +275,31 @@ const actions = {
         if (e.response.status === 401) dispatch('logout', null, { root: true })
     }
   },
+  async deleteJob({ commit, rootState, dispatch, getters }, data) {
+    var date = new Date(data.year, data.month - 1, data.day)
+    commit('setDayLoading', {date, getters, value: true})
+    try {
+      const response = await axios.post(
+          url.user.deleteJob,
+          { ...data },
+          {
+            headers: { Token: rootState.login.user.accessToken }
+          }
+      )
+      console.log(response.data)
+      commit('updateMonthWorker', {
+        workers: [...response.data],
+        date: new Date(data.year, data.month - 1, data.day),
+        getters
+      })
+      commit('setDayLoading', {date, getters, value: false})
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      console.log(e)
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
   async updateJobInviteToMe({ commit, rootState, dispatch }, data) {
     try {
       const response = await axios.post(url.user.setJobInvites, data, {

From 33028050fc5c9358de38bd95b828273a9d3d0bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Tue, 2 Jun 2020 23:23:38 +0200
Subject: [PATCH 09/12] =?UTF-8?q?user=20kann=20eine=20dienst=C3=BCbertragu?=
 =?UTF-8?q?ng=20annehmen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bugfixes, sodass bei Einladungen oder dienstübertragungen der tag neu geladen wird. Ladezeichen hinzugefügt.
---
 .../user/JobRequests/JobInvites.vue           |  26 +-
 .../user/JobRequests/JobTransfer.vue          | 128 +++++-
 src/components/user/JobsRequest.vue           |  13 +-
 src/components/user/UserNavigation.vue        |  21 +-
 .../ServiceManagementComponents/Day.vue       |  60 ++-
 src/plugins/routes.js                         |   3 +
 src/store/index.js                            |   4 +-
 src/store/modules/jobInvites.js               |  10 +
 src/store/modules/jobRequests.js              | 371 ++++++++++++++++++
 src/store/modules/serviceManagement.js        |  30 +-
 10 files changed, 613 insertions(+), 53 deletions(-)
 create mode 100644 src/store/modules/jobRequests.js

diff --git a/src/components/user/JobRequests/JobInvites.vue b/src/components/user/JobRequests/JobInvites.vue
index 2072d80..46a6e80 100644
--- a/src/components/user/JobRequests/JobInvites.vue
+++ b/src/components/user/JobRequests/JobInvites.vue
@@ -18,23 +18,27 @@
             {{ jobInvite.from_user.lastname }}
           </div>
           <v-row
+                  class="text-right"
             style="margin-right: 5px"
             v-show="userInWorker(jobInvite)"
           >
-            <v-spacer />
-            <v-icon color="green">
-              {{ check }}
-            </v-icon>
+            <v-col>
+              <v-icon color="green">
+                {{ check }}
+              </v-icon>
+              <v-progress-circular indeterminate v-if="jobInvitesLoading"></v-progress-circular>
+            </v-col>
           </v-row>
         </v-expansion-panel-header>
         <v-expansion-panel-content :eager="true">
-          <v-row>
-            <v-spacer />
-            <v-btn text @click="updatingJobInvite(jobInvite)">
-              <v-icon>
-                {{ jobInvite.watched ? seen : notSeen }}
-              </v-icon>
-            </v-btn>
+          <v-row class="text-right">
+            <v-col>
+              <v-btn icon @click="updatingJobInvite(jobInvite)">
+                <v-icon>
+                  {{ jobInvite.watched ? seen : notSeen }}
+                </v-icon>
+              </v-btn>
+            </v-col>
           </v-row>
           <Day
             :day="jobInvite.day"
diff --git a/src/components/user/JobRequests/JobTransfer.vue b/src/components/user/JobRequests/JobTransfer.vue
index 6601804..b6c5d75 100644
--- a/src/components/user/JobRequests/JobTransfer.vue
+++ b/src/components/user/JobRequests/JobTransfer.vue
@@ -1,17 +1,127 @@
 <template>
-    <div>
-        <h1>
-            Transfer
-        </h1>
+  <div>
+    <v-card tile>
+      <v-card-title>
+        Eingehende Anfragen
+      </v-card-title>
+      <v-card-text>
+        <v-expansion-panels>
+          <v-expansion-panel
+            v-for="(jobrequest, index) in jobRequestsToMe"
+            :key="index"
+          >
+            <v-expansion-panel-header @click.once="seenJobRequest(jobrequest)">
+              {{ jobrequest.on_date.getDate() }}.{{
+                jobrequest.on_date.getMonth() + 1
+              }}.{{ jobrequest.on_date.getFullYear() }} von
+              {{ jobrequest.from_user.firstname }}
+              {{ jobrequest.from_user.lastname }}
+              <v-row class="text-right">
+                <v-col>
+                  <v-progress-circular
+                    indeterminate
+                    v-if="jobRequestsLoading"
+                  ></v-progress-circular>
+                </v-col>
+              </v-row>
+            </v-expansion-panel-header>
+            <v-expansion-panel-content>
+              <v-row class="text-right">
+                <v-col>
+                  <v-btn icon @click="updatingSeenJobRequest(jobrequest)">
+                    <v-icon>
+                      {{ jobrequest.watched ? seen : notSeen }}
+                    </v-icon>
+                  </v-btn>
+                </v-col>
+              </v-row>
+              <Day :day="jobrequest.day" :long="true" />
+              <v-row class="text-right">
+                <v-col>
+                  <v-btn
+                    v-show="!jobrequest.accepted"
+                    text
+                    @click="updatingAcceptedJobRequest(jobrequest)"
+                    >Annehmen</v-btn
+                  >
+                </v-col>
+              </v-row>
+            </v-expansion-panel-content>
+          </v-expansion-panel>
+        </v-expansion-panels>
+      </v-card-text>
+    </v-card>
+    <h1>
+      fromme
+    </h1>
+    <div v-for="(jobrequest, index) in jobRequestsFromMe" :key="index">
+      {{ jobrequest }}
     </div>
+  </div>
 </template>
 
 <script>
-    export default {
-        name: "JobTransfer"
+import { mapGetters, mapActions } from 'vuex'
+import { mdiEyeOff, mdiEyeCheck } from '@mdi/js'
+import Day from '@/components/user/Jobs/Day'
+export default {
+  name: 'JobTransfer',
+  components: { Day },
+  props: {},
+  data() {
+    return {
+      notSeen: mdiEyeOff,
+      seen: mdiEyeCheck
     }
+  },
+  methods: {
+    ...mapActions({
+      getJobRequests: 'jobRequests/getJobRequests',
+      updateJobRequestToMe: 'jobRequests/updateJobRequestToMe'
+    }),
+    updatingAcceptedJobRequest(jobRequest) {
+      jobRequest.accepted = true
+      jobRequest.answered = true
+      this.updateJobRequestToMe({ ...jobRequest })
+        setTimeout(() => {
+            this.getJobRequests(), 200
+        })
+    },
+    updatingSeenJobRequest(jobRequest) {
+      jobRequest.watched = !jobRequest.watched
+      this.updateJobRequestToMe({...jobRequest})
+    },
+    seenJobRequest(jobRequest) {
+      if (!jobRequest.watched) {
+        jobRequest.watched = true
+        this.updateJobRequestToMe(jobRequest)
+      }
+    }
+  },
+  computed: {
+    ...mapGetters({
+      jobRequestsToMe: 'jobRequests/jobRequestsToMe',
+      jobRequestsFromMe: 'jobRequests/jobRequestsFromMe',
+      jobRequestsLoading: 'jobRequests/jobRequestsLoading',
+      loading: 'user/loading'
+    })
+  },
+  created() {
+    if (!this.loading) {
+      this.getJobRequests()
+    }
+  },
+  watch: {
+    loading(newValue) {
+      if (!newValue) {
+        this.getJobRequests()
+      }
+    },
+    jobRequestsLoading(newValue, oldValue) {
+      console.log(newValue, oldValue)
+    }
+  }
+}
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/components/user/JobsRequest.vue b/src/components/user/JobsRequest.vue
index 1d20c53..c2283f6 100644
--- a/src/components/user/JobsRequest.vue
+++ b/src/components/user/JobsRequest.vue
@@ -2,11 +2,13 @@
   <div>
     <v-bottom-navigation v-model="bottom_nav">
       <v-btn :to="{ name: 'jobRequests', params: { kind: 'jobInvites' } }">
-          <v-badge color="red" :content="news" :value="news !== 0">Diensteinladungen</v-badge>
+        <v-badge color="red" :content="newsInvite" :value="newsInvite !== 0">
+          Diensteinladungen
+        </v-badge>
+      </v-btn>
+      <v-btn :to="{ name: 'jobRequests', params: { kind: 'jobTransfer' } }">
+        <v-badge color="red" :content="newsRequest" :value="newsRequest !== 0">Dienstübertragung</v-badge>
       </v-btn>
-      <v-btn :to="{ name: 'jobRequests', params: { kind: 'jobTransfer' } }"
-        >Dienstübertragung</v-btn
-      >
     </v-bottom-navigation>
     <JobInvites v-if="kind === 'jobInvites'"></JobInvites>
     <JobTransfer v-if="kind === 'jobTransfer'"></JobTransfer>
@@ -33,7 +35,8 @@ export default {
   },
   computed: {
     ...mapGetters({
-      news: 'jobInvites/news'
+      newsInvite: 'jobInvites/news',
+      newsRequest: 'jobRequests/news'
     })
   },
   created() {
diff --git a/src/components/user/UserNavigation.vue b/src/components/user/UserNavigation.vue
index 7c76bd8..5d0d574 100644
--- a/src/components/user/UserNavigation.vue
+++ b/src/components/user/UserNavigation.vue
@@ -77,20 +77,31 @@ export default {
   methods: {
     ...mapActions({
       getJobInvites: 'jobInvites/getJobInvites',
+      getJobRequests: 'jobRequests/getJobRequests',
       getUser: 'user/getUser'
     })
   },
   computed: {
     ...mapGetters({
-      news: 'jobInvites/news'
-    })
+      newsInvite: 'jobInvites/news',
+      newsRequest: 'jobRequests/news',
+      loading: 'user/loading'
+    }),
+    news() {
+      return this.newsInvite + this.newsRequest
+    }
   },
   created() {
     this.getUser()
-    setTimeout(() => {
-      this.getJobInvites()
-    }, 500)
 
+  },
+  watch: {
+    loading(newValue) {
+      if (!newValue) {
+        this.getJobInvites()
+        this.getJobRequests()
+      }
+    }
   }
 }
 </script>
diff --git a/src/components/vorstand/ServiceManagementComponents/Day.vue b/src/components/vorstand/ServiceManagementComponents/Day.vue
index 202367f..ac92a66 100644
--- a/src/components/vorstand/ServiceManagementComponents/Day.vue
+++ b/src/components/vorstand/ServiceManagementComponents/Day.vue
@@ -309,10 +309,12 @@ export default {
           var retVal = 'yellow'
           retVal = 'light-green'
           for (var jobkind in day.jobkinddate) {
-            if (day.jobkinddate[jobkind].worker.length >= day.jobkinddate[jobkind].maxpersons)
+            if (
+              day.jobkinddate[jobkind].worker.length >=
+              day.jobkinddate[jobkind].maxpersons
+            )
               retVal = 'light-green'
-            else
-              return 'yellow'
+            else return 'yellow'
           }
           return retVal
         }
@@ -384,9 +386,41 @@ export default {
       this.dialog = false
     },
     filterWorker() {},
+    // filterUser(jobkind) {
+    //   console.log(jobkind, this.day.jobkinddate)
+    //   var filtered = this.dbUsers.filter(user => {
+    //     var test = this.day.jobkinddate.find(item => {
+    //       if (item.job_kind === null) {
+    //         return false
+    //       }
+    //       if (item.job_kind.id === jobkind.id) {
+    //         return false
+    //       }
+    //       return item.worker.find(work => {
+    //         return work.id === user.id
+    //       })
+    //     })
+    //     console.log('test', test)
+    //     if (test) {
+    //       return false
+    //     }
+    //     if (jobkind.workgroup === null) {
+    //       return true
+    //     }
+    //     return user.workgroups.find(workgroup => {
+    //       if (jobkind.workgroup && workgroup) {
+    //         return jobkind.workgroup.id === workgroup.id
+    //       } else return true
+    //     })
+    //   })
+    //   return filtered
+    // },
+    // eslint-disable-next-line no-unused-vars
     filterUser(jobkind) {
+      console.log(jobkind, this.day.jobkinddate)
+      // eslint-disable-next-line no-unused-vars
       var filtered = this.dbUsers.filter(user => {
-        var test = this.day.jobkinddate.find(item => {
+        var userInOther = this.day.jobkinddate.find(item => {
           if (item.job_kind === null) {
             return false
           }
@@ -397,17 +431,21 @@ export default {
             return work.id === user.id
           })
         })
-        if (test) {
+        if (userInOther) {
           return false
         }
-        if (jobkind.workgroup === null) {
+        if (jobkind.id === 1 || !jobkind.workgroup) {
           return true
+        } else {
+          if (user.workgroups ? user.workgroups.length > 0 : false) {
+            return user.workgroups.find(wg => {
+              console.log(wg, jobkind.workgroup)
+              return wg.id === jobkind.workgroup.id
+            })
+          } else {
+            return false
+          }
         }
-        return user.workgroups.find(workgroup => {
-          if (jobkind.workgroup && workgroup) {
-            return jobkind.workgroup.id === workgroup.id
-          } else return true
-        })
       })
       return filtered
     },
diff --git a/src/plugins/routes.js b/src/plugins/routes.js
index 8269202..b7a896c 100644
--- a/src/plugins/routes.js
+++ b/src/plugins/routes.js
@@ -66,6 +66,9 @@ const url = {
     getJobInvites: main + 'user/getJobInvites',
     setJobInvites: main + 'user/JobInvites',
     deletJobInvite: main + 'user/deleteJobInvite',
+    getJobRequests: main + 'user/getJobRequests',
+    setJobRequests: main + 'user/JobRequests',
+    deletJobRequest: main + 'user/deleteJobRequest',
     storno: main + 'user/storno',
     getAllStatus: main + 'getAllStatus',
     getStatus: main + 'getStatus',
diff --git a/src/store/index.js b/src/store/index.js
index e212536..e68ab38 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -11,6 +11,7 @@ import usermanager from '@/store/modules/userManager'
 import wm from '@/store/modules/workgroupManagement'
 import jkm from '@/store/modules/jobkindManager'
 import jobInvites from "@/store/modules/jobInvites";
+import jobRequests from "@/store/modules/jobRequests";
 
 Vue.use(Vuex)
 
@@ -26,6 +27,7 @@ export default new Vuex.Store({
     usermanager,
     wm,
     jkm,
-    jobInvites
+    jobInvites,
+    jobRequests
   }
 })
diff --git a/src/store/modules/jobInvites.js b/src/store/modules/jobInvites.js
index 65607cf..b5094f8 100644
--- a/src/store/modules/jobInvites.js
+++ b/src/store/modules/jobInvites.js
@@ -175,6 +175,7 @@ const mutations = {
 const actions = {
   async getJobInvites({ commit, dispatch, rootState, getters }) {
     try {
+      commit('setJobInvitesLoading', true)
       const date = new Date()
       const from_me = await axios.post(
         url.user.getJobInvites,
@@ -232,6 +233,7 @@ const actions = {
         commit('updateMonthWorker', { workers: item.worker, date, getters, from_me: false })
         commit('updateMonthLocked', { locked: item.day.locked, date, getters, from_me: false })
       })
+      commit('setJobInvitesLoading', false)
       dispatch('getLifeTime', null, { root: true })
     } catch (e) {
       if (e.response)
@@ -256,6 +258,7 @@ const actions = {
     var date = new Date(data.year, data.month - 1, data.day)
     commit('setDayLoading', { date, getters, value: true })
     try {
+      commit('setJobInvitesLoading', true)
       const response = await axios.post(
         url.user.addJob,
         { ...data },
@@ -270,6 +273,7 @@ const actions = {
       })
       commit('setDayLoading', { date, getters, value: false })
       dispatch('getLifeTime', null, { root: true })
+      commit('setJobInvitesLoading', false)
     } catch (e) {
       if (e.response)
         if (e.response.status === 401) dispatch('logout', null, { root: true })
@@ -278,6 +282,7 @@ const actions = {
   async deleteJob({ commit, rootState, dispatch, getters }, data) {
     var date = new Date(data.year, data.month - 1, data.day)
     commit('setDayLoading', {date, getters, value: true})
+    commit('setJobInvitesLoading', true)
     try {
       const response = await axios.post(
           url.user.deleteJob,
@@ -294,6 +299,7 @@ const actions = {
       })
       commit('setDayLoading', {date, getters, value: false})
       dispatch('getLifeTime', null, { root: true })
+      commit('setJobInvitesLoading', false)
     } catch (e) {
       console.log(e)
       if (e.response)
@@ -302,11 +308,13 @@ const actions = {
   },
   async updateJobInviteToMe({ commit, rootState, dispatch }, data) {
     try {
+      commit('setJobInvitesLoading', true)
       const response = await axios.post(url.user.setJobInvites, data, {
         headers: { Token: rootState.login.user.accessToken }
       })
       commit('updateJobInviteToMe', response.data)
       dispatch('getLifeTime', null, { root: true })
+      commit('setJobInvitesLoading', false)
     } catch (e) {
       if (e.response)
         if (e.response.status === 401) dispatch('logout', null, { root: true })
@@ -314,8 +322,10 @@ const actions = {
   },
   async deleteJobInviteFromMe({ commit, rootState, dispatch}, data) {
     try {
+      commit('setJobInvitesLoading', true)
      await axios.post(url.user.deletJobInvite, data, {headers: {Token: rootState.login.user.accessToken}})
       commit('deleteJobInviteFromMe', data)
+      commit('setJobInvitesLoading', false)
     } catch (e) {
       if (e.response)
         if (e.response.status === 401) dispatch('logout', null, { root: true })
diff --git a/src/store/modules/jobRequests.js b/src/store/modules/jobRequests.js
new file mode 100644
index 0000000..cf9af9e
--- /dev/null
+++ b/src/store/modules/jobRequests.js
@@ -0,0 +1,371 @@
+import axios from 'axios'
+import url from '@/plugins/routes'
+
+const state = {
+  jobRequestsFromMe: [],
+  jobRequestsToMe: [],
+  jobRequestsLoading: false
+}
+
+const mutations = {
+  setJobRequestsFromMe: (state, jobRequests) => {
+    state.jobRequestsFromMe = jobRequests
+    state.jobRequestsFromMe.forEach(item => {
+      item.on_date = new Date(
+        item.on_date.year,
+        item.on_date.month - 1,
+        item.on_date.day
+      )
+      item.day = {
+        date: new Date(),
+        worker: [],
+        loading: false,
+        locked: false,
+        jobkinddate: []
+      }
+    })
+  },
+  setJobRequestsToMe: (state, jobRequests) => {
+    state.jobRequestsToMe = jobRequests
+    state.jobRequestsToMe.forEach(item => {
+      item.on_date = new Date(
+        item.on_date.year,
+        item.on_date.month - 1,
+        item.on_date.day
+      )
+      item.day = {
+        date: new Date(),
+        worker: [],
+        loading: false,
+        locked: false,
+        jobkinddate: []
+      }
+    })
+  },
+  setJobRequestsLoading: (state, value) => {
+    state.jobRequestsLoading = value
+  },
+  updateJobRequestToMe: (state, jobRequest) => {
+    state.jobRequestsToMe.forEach(item => {
+      if (item.id === jobRequest.id) {
+        item.watched = jobRequest.watched
+        item.accepted = jobRequest.accepted
+      }
+    })
+  },
+  updateMonthWorker: (state, { workers, date, getters, from_me }) => {
+    let mop
+    if (from_me) {
+      mop = getters.getDayFromMe(date)
+    } else {
+      mop = getters.getDayToMe(date)
+    }
+    mop.forEach(a => {
+      let day = a.day
+      day.jobkinddate.forEach(item => {
+        var filtered = workers.filter(worker => {
+          return item.job_kind.id === (worker.job_kind ? worker.job_kind.id : 1)
+        })
+        var filteredWorkers = []
+        filtered.forEach(item => {
+          filteredWorkers.push(item.user)
+        })
+        filteredWorkers.forEach(worker => {
+          if (
+            !item.worker.find(a => {
+              return a.id === worker.id
+            })
+          ) {
+            item.worker.push(worker)
+          }
+        })
+        item.worker.forEach(worker => {
+          if (
+            !filteredWorkers.find(a => {
+              return a.id === worker.id
+            })
+          ) {
+            item.worker.splice(item.worker.indexOf(worker), 1)
+          }
+        })
+      })
+    })
+  },
+  updateMonthLocked: (state, { locked, date, getters, from_me }) => {
+    let mop
+    if (from_me) {
+      mop = getters.getDayFromMe(date)
+    } else {
+      mop = getters.getDayToMe(date)
+    }
+    mop.forEach(a => {
+      let day = a.day
+      day.locked = !!locked
+    })
+  },
+  updateMonthJobkind: (state, { data, date, getters, from_me }) => {
+    let mop
+    if (from_me) {
+      mop = getters.getDayFromMe(date)
+    } else {
+      mop = getters.getDayToMe(date)
+    }
+    mop.forEach(a => {
+      let day = a.day
+      day.date = date
+      var backup = []
+
+      for (let jobkind in day.jobkinddate) {
+        if (day.jobkinddate[jobkind].worker !== undefined) {
+          backup.push({
+            id: day.jobkinddate[jobkind].job_kind.id,
+            worker: day.jobkinddate[jobkind].worker,
+            backupWorker: day.jobkinddate[jobkind].backupWorker
+          })
+        } else {
+          backup.push({
+            id: day.jobkinddate[jobkind].job_kind.id,
+            worker: [],
+            backupWorker: []
+          })
+        }
+      }
+      day.jobkinddate = [...data]
+      var test = day.jobkinddate.find(jobkind => {
+        return jobkind.job_kind.id === 1
+      })
+      if (!test) {
+        day.jobkinddate.push({
+          id: -1,
+          job_kind: { id: 1, name: 'Bardienst' },
+          maxpersons: 2,
+          daydate: {
+            year: date.getFullYear(),
+            month: date.getMonth() + 1,
+            day: date.getDate()
+          },
+          worker: [],
+          backupWorker: []
+        })
+      }
+      for (var jobkind in day.jobkinddate) {
+        var worker = backup.find(item => {
+          return item.id === day.jobkinddate[jobkind].job_kind.id
+        })
+        day.jobkinddate[jobkind].worker = worker ? worker.worker : []
+        day.jobkinddate[jobkind].backupWorker = worker
+          ? worker.backupWorker
+          : []
+      }
+    })
+    console.log(mop)
+  },
+  setDayLoading: (state, { getters, date, value }) => {
+    let day = getters.getDayToMe(date)
+    day.forEach(a => {
+      a.day.loading = value
+      console.log('day', value ? 'loading' : 'not loading', day, a.day.loading)
+    })
+  },
+  deleteJobRequestFromMe: (state, jobrequest) => {
+    var item = state.jobRequestsFromMe.find(item => {
+      return item.id === jobrequest.id
+    })
+    state.jobRequestsFromMe.splice(item, 1)
+  }
+}
+
+const actions = {
+  async getJobRequests({ commit, dispatch, rootState, getters }) {
+    try {
+      commit('setJobRequestsLoading', true)
+      const date = new Date()
+      const from_me = await axios.post(
+        url.user.getJobRequests,
+        {
+          from_user: rootState.user.user,
+          date: {
+            year: date.getFullYear(),
+            month: date.getMonth() + 1,
+            day: date.getDate()
+          }
+        },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      const workers_from_me = await axios.post(
+        url.user.getJobOnDates,
+        from_me.data,
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      commit('setJobRequestsFromMe', from_me.data)
+      workers_from_me.data.forEach(item => {
+        var date = new Date(
+          item.day.date.year,
+          item.day.date.month - 1,
+          item.day.date.day
+        )
+        commit('updateMonthJobkind', {
+          data: item.jobkinddate,
+          date,
+          getters,
+          from_me: true
+        })
+        commit('updateMonthWorker', {
+          workers: item.worker,
+          date,
+          getters,
+          from_me: true
+        })
+        commit('updateMonthLocked', {
+          locked: item.day.locked,
+          date,
+          getters,
+          from_me: true
+        })
+      })
+      const to_me = await axios.post(
+        url.user.getJobRequests,
+        {
+          to_user: rootState.user.user,
+          date: {
+            year: date.getFullYear(),
+            month: date.getMonth() + 1,
+            day: date.getDate()
+          }
+        },
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      const workers_to_me = await axios.post(
+        url.user.getJobOnDates,
+        to_me.data,
+        { headers: { Token: rootState.login.user.accessToken } }
+      )
+      console.log(to_me.data)
+      commit('setJobRequestsToMe', to_me.data)
+      workers_to_me.data.forEach(item => {
+        var date = new Date(
+          item.day.date.year,
+          item.day.date.month - 1,
+          item.day.date.day
+        )
+        commit('updateMonthJobkind', {
+          data: item.jobkinddate,
+          date,
+          getters,
+          from_me: false
+        })
+        commit('updateMonthWorker', {
+          workers: item.worker,
+          date,
+          getters,
+          from_me: false
+        })
+        commit('updateMonthLocked', {
+          locked: item.day.locked,
+          date,
+          getters,
+          from_me: false
+        })
+      })
+      commit('setJobRequestsLoading', false)
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
+  async setJobRequests({ commit, dispatch, rootState }, data) {
+    try {
+      commit('setJobRequestsLoading', true)
+      const response = await axios.put(url.user.setJobRequests, data, {
+        headers: { Token: rootState.login.user.accessToken }
+      })
+      commit('setJobRequestsFromMe', response.data)
+      commit('setJobRequestsLoading', false)
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
+  async updateJobRequestToMe({ commit, rootState, dispatch }, data) {
+    try {
+      commit('setJobRequestsLoading', true)
+      data.on_date = {
+        year: data.on_date.getFullYear(),
+        month: data.on_date.getMonth() + 1,
+        day: data.on_date.getDate()
+      }
+      const response = await axios.post(url.user.setJobRequests, data, {
+        headers: { Token: rootState.login.user.accessToken }
+      })
+      response.data.on_date = new Date(response.data.on_date.year, response.data.on_date.month - 1, response.data.on_date.day)
+      commit('updateJobRequestToMe', response.data)
+      commit('setJobRequestsLoading', false)
+      dispatch('getLifeTime', null, { root: true })
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  },
+  async deleteJobRequestFromMe({ commit, rootState, dispatch }, data) {
+    try {
+      commit('setJobRequestsLoading', true)
+      await axios.post(url.user.deletJobRequest, data, {
+        headers: { Token: rootState.login.user.accessToken }
+      })
+      commit('deleteJobRequestFromMe', data)
+      commit('setJobRequestsLoading', false)
+    } catch (e) {
+      if (e.response)
+        if (e.response.status === 401) dispatch('logout', null, { root: true })
+    }
+  }
+}
+
+const getters = {
+  jobRequestsFromMe: state => {
+    return state.jobRequestsFromMe
+  },
+  jobRequestsToMe: state => {
+    return state.jobRequestsToMe
+  },
+  jobRequestsLoading: state => {
+    return state.jobRequestsLoading
+  },
+  getDayToMe: state => {
+    return date => {
+      return state.jobRequestsToMe.filter(item => {
+        return item.on_date - date === 0
+      })
+    }
+  },
+  getDayFromMe: state => {
+    return date => {
+      return state.jobRequestsFromMe.filter(item => {
+        return item.on_date - date === 0
+      })
+    }
+  },
+  getDayWorkerFromMe: state => {
+    return date => {
+      return state.jobRequestsFromMe.filter(jobRequest => {
+        return jobRequest.on_date - date === 0
+      })
+    }
+  },
+  news: state => {
+    var test = state.jobRequestsToMe.filter(item => {
+      return !item.watched
+    })
+    return test.length
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+  getters
+}
diff --git a/src/store/modules/serviceManagement.js b/src/store/modules/serviceManagement.js
index a66798f..148799b 100644
--- a/src/store/modules/serviceManagement.js
+++ b/src/store/modules/serviceManagement.js
@@ -164,18 +164,26 @@ const mutations = {
   // eslint-disable-next-line no-unused-vars
   updateMonthWorker: (state, { workers, date, getters }) => {
     var day = getters.getDay(date)
-    for (var worker in workers) {
-      var jobkind = day.jobkinddate.find(jobkind => {
-        return (
-          jobkind.job_kind.id ===
-          (workers[worker].job_kind ? workers[worker].job_kind.id : 1)
-        )
+    day.jobkinddate.forEach(item => {
+      var filtered = workers.filter(worker => {
+        return item.job_kind.id === (worker.job_kind ? worker.job_kind.id : 1)
       })
-      if (jobkind) {
-        jobkind.worker.push(workers[worker].user)
-        jobkind.backupWorker.push(workers[worker].user)
-      }
-    }
+      var filteredWorkers = []
+      filtered.forEach(item => {
+        filteredWorkers.push(item.user)
+      })
+      filteredWorkers.forEach(worker => {
+        if (!item.worker.find(a => {return a.id === worker.id})) {
+          item.worker.push(worker)
+          item.backupWorker.push(worker)
+        }
+      })
+      item.worker.forEach(worker => {
+        if (!filteredWorkers.find(a => {return a.id === worker.id})) {
+          item.worker.splice(item.worker.indexOf(worker), 1)
+        }
+      })
+    })
   },
   updateMonthLocked: (state, { locked, date, getters }) => {
     var day = getters.getDay(date)

From 2401b949ceacc3df67ed1c3af643bf53679509e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Tue, 2 Jun 2020 23:41:36 +0200
Subject: [PATCH 10/12] fix User werden nun auch in Einladungen oder Abgeben in
 JobRequest angezeigt

---
 src/components/user/Jobs/Day.vue    | 93 +++++++++++++++++++----------
 src/components/user/JobsRequest.vue |  4 +-
 2 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue
index 43713a2..33f7bdf 100644
--- a/src/components/user/Jobs/Day.vue
+++ b/src/components/user/Jobs/Day.vue
@@ -1,9 +1,6 @@
 <template>
   <div v-if="day">
-    <v-card
-      :color="color(day)"
-      :max-width="long ? '' : '20em'"
-    >
+    <v-card :color="color(day)" :max-width="long ? '' : '20em'">
       <v-card-title v-if="day.date" class="subtitle-1 font-weight-bold">
         {{ name }} den {{ day.date.getDate() }}.{{ day.date.getMonth() + 1 }}.{{
           day.date.getFullYear()
@@ -76,7 +73,7 @@
             </v-list-item>
           </v-list>
         </v-menu>
-        <v-menu v-model="menu_invite" :close-on-content-click="false">
+        <v-menu v-model="menu_invite" :close-on-content-click="false" offset-y>
           <template v-slot:activator="{ on }">
             <v-btn
               v-show="
@@ -120,8 +117,9 @@
                 item-value="id"
                 chips
                 deletable-chips
-                :items="filteredDBUsers"
-              ></v-autocomplete>
+                :items="filteredDBUsers()"
+              >
+              </v-autocomplete>
             </v-card-text>
             <v-card-actions>
               <v-spacer />
@@ -136,9 +134,42 @@
             </v-card-actions>
           </v-card>
         </v-menu>
-        <v-btn v-show="!day.locked && userInWorker()" text @click="deletingJob()">Austragen</v-btn>
-
-        <v-btn v-show="day.locked && userInWorker()" text>Abgeben</v-btn>
+        <v-menu v-model="menu_request" :close-on-content-click="false" offset-y>
+          <template v-slot:activator="{ on }">
+            <v-btn v-show="day.locked && userInWorker()" text v-on="on">
+              Abgeben
+            </v-btn>
+          </template>
+          <v-card>
+            <v-card-text>
+              <v-autocomplete
+                v-model="job_invites"
+                label="Einladungen senden an"
+                return-object
+                multiple
+                filled
+                :item-text="item => item.firstname + ' ' + item.lastname"
+                item-value="id"
+                chips
+                deletable-chips
+                :items="filteredDBUsers()"
+              >
+              </v-autocomplete>
+            </v-card-text>
+            <v-card-actions>
+              <v-spacer />
+              <v-btn text>
+                Anfragen
+              </v-btn>
+            </v-card-actions>
+          </v-card>
+        </v-menu>
+        <v-btn
+          v-show="!day.locked && userInWorker()"
+          text
+          @click="deletingJob()"
+          >Austragen</v-btn
+        >
       </v-card-actions>
     </v-card>
   </div>
@@ -161,6 +192,7 @@ export default {
       requestUser: null,
       menu: false,
       menu_invite: false,
+      menu_request: false,
       update: 0,
       job_invites: []
     }
@@ -253,6 +285,26 @@ export default {
         day: sendData.on_date.getDate()
       }
       this.deleteInvite(sendData)
+    },
+    filteredDBUsers() {
+      var retVal = this.allUsers.filter(user => {
+        var test = this.day.jobkinddate.find(item => {
+          return item.worker.find(workeritem => {
+            return workeritem.id === user.id
+          })
+        })
+        return !test
+      })
+      retVal = retVal.filter(user => {
+        let getedDay = this.getDay(this.day.date)
+        let test = getedDay
+          ? getedDay.find(day => {
+              return day.to_user.id === user.id
+            })
+          : false
+        return !test
+      })
+      return retVal
     }
   },
   computed: {
@@ -286,26 +338,7 @@ export default {
       })
       return retVal
     },
-    filteredDBUsers() {
-      var retVal = this.allUsers.filter(user => {
-        var test = this.day.jobkinddate.find(item => {
-          return item.worker.find(workeritem => {
-            return workeritem.id === user.id
-          })
-        })
-        return !test
-      })
-      retVal = retVal.filter(user => {
-        let getedDay = this.getDay(this.day.date)
-        let test = getedDay
-          ? getedDay.find(day => {
-              return day.to_user.id === user.id
-            })
-          : false
-        return !test
-      })
-      return retVal
-    },
+
     name() {
       const name = this.day.date.getDay()
       if (name === 0) return 'Sonntag'
diff --git a/src/components/user/JobsRequest.vue b/src/components/user/JobsRequest.vue
index c2283f6..db0ad2a 100644
--- a/src/components/user/JobsRequest.vue
+++ b/src/components/user/JobsRequest.vue
@@ -30,7 +30,8 @@ export default {
   },
   methods: {
     ...mapActions({
-      getUser: 'user/getUser'
+      getUser: 'user/getUser',
+      getDBUsers: 'usermanager/getUsers',
     })
   },
   computed: {
@@ -41,6 +42,7 @@ export default {
   },
   created() {
     this.getUser()
+    this.getDBUsers()
   },
   watch: {
     $route() {

From 4d6db01bd355f58e1a4bb6f8a483a9baf9b5d422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Wed, 3 Jun 2020 12:29:37 +0200
Subject: [PATCH 11/12] =?UTF-8?q?user=20kann=20versendete=20dienst=C3=BCbe?=
 =?UTF-8?q?rtragungsanfragen=20l=C3=B6schen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/JobRequests/JobInvites.vue           | 106 ++++++++-------
 .../user/JobRequests/JobTransfer.vue          | 128 +++++++++++++++---
 src/components/user/Jobs.vue                  |  14 +-
 src/components/user/Jobs/Day.vue              |  59 +++++++-
 src/plugins/routes.js                         |   4 +-
 5 files changed, 227 insertions(+), 84 deletions(-)

diff --git a/src/components/user/JobRequests/JobInvites.vue b/src/components/user/JobRequests/JobInvites.vue
index 46a6e80..47c5459 100644
--- a/src/components/user/JobRequests/JobInvites.vue
+++ b/src/components/user/JobRequests/JobInvites.vue
@@ -1,55 +1,60 @@
 <template>
   <div>
-    <v-row align="center" justify="center" v-if="jobInvitesLoading">
-      <v-progress-circular indeterminate color="grey" />
-    </v-row>
-    <v-expansion-panels>
-      <v-expansion-panel
-        v-for="jobInvite in jobInvitesToMe"
-        :key="jobInvite.id"
-        @click.once="seenJobIvnite(jobInvite)"
-      >
-        <v-expansion-panel-header>
-          <div>
-            {{ jobInvite.on_date.getDate() }}.{{
-              jobInvite.on_date.getMonth() + 1
-            }}.{{ jobInvite.on_date.getFullYear() }} von
-            {{ jobInvite.from_user.firstname }}
-            {{ jobInvite.from_user.lastname }}
-          </div>
-          <v-row
-                  class="text-right"
-            style="margin-right: 5px"
-            v-show="userInWorker(jobInvite)"
+    <v-card tile :loading="jobInvitesLoading">
+      <v-card-title>
+        Eingehende Einladungen
+      </v-card-title>
+      <v-card-text>
+        <v-expansion-panels>
+          <v-expansion-panel
+            v-for="jobInvite in jobInvitesToMe"
+            :key="jobInvite.id"
+            @click.once="seenJobIvnite(jobInvite)"
           >
-            <v-col>
-              <v-icon color="green">
-                {{ check }}
-              </v-icon>
-              <v-progress-circular indeterminate v-if="jobInvitesLoading"></v-progress-circular>
-            </v-col>
-          </v-row>
-        </v-expansion-panel-header>
-        <v-expansion-panel-content :eager="true">
-          <v-row class="text-right">
-            <v-col>
-              <v-btn icon @click="updatingJobInvite(jobInvite)">
-                <v-icon>
-                  {{ jobInvite.watched ? seen : notSeen }}
-                </v-icon>
-              </v-btn>
-            </v-col>
-          </v-row>
-          <Day
-            :day="jobInvite.day"
-            :long="true"
-            :loading="jobInvite.day.loading"
-            @addingJob="addingJob(jobInvite, $event)"
-            @deletingJob="deletingJob(jobInvite, $event)"
-          />
-        </v-expansion-panel-content>
-      </v-expansion-panel>
-    </v-expansion-panels>
+            <v-expansion-panel-header>
+              <div>
+                {{ jobInvite.on_date.getDate() }}.{{
+                  jobInvite.on_date.getMonth() + 1
+                }}.{{ jobInvite.on_date.getFullYear() }} von
+                {{ jobInvite.from_user.firstname }}
+                {{ jobInvite.from_user.lastname }}
+              </div>
+              <v-row class="text-right" style="margin-right: 5px">
+                <v-col>
+                  <v-progress-circular
+                    indeterminate
+                    v-if="jobInvitesLoading"
+                  ></v-progress-circular>
+                </v-col>
+                <v-col>
+                  <v-icon color="green" v-show="userInWorker(jobInvite)">
+                    {{ check }}
+                  </v-icon>
+                </v-col>
+              </v-row>
+            </v-expansion-panel-header>
+            <v-expansion-panel-content :eager="true">
+              <v-row class="text-right">
+                <v-col>
+                  <v-btn icon @click="updatingJobInvite(jobInvite)">
+                    <v-icon>
+                      {{ jobInvite.watched ? seen : notSeen }}
+                    </v-icon>
+                  </v-btn>
+                </v-col>
+              </v-row>
+              <Day
+                :day="jobInvite.day"
+                :long="true"
+                :loading="jobInvite.day.loading"
+                @addingJob="addingJob(jobInvite, $event)"
+                @deletingJob="deletingJob(jobInvite, $event)"
+              />
+            </v-expansion-panel-content>
+          </v-expansion-panel>
+        </v-expansion-panels>
+      </v-card-text>
+    </v-card>
   </div>
 </template>
 
@@ -75,7 +80,7 @@ export default {
       getJobInvites: 'jobInvites/getJobInvites',
       addJob: 'jobInvites/addJob',
       updateJobInviteToMe: 'jobInvites/updateJobInviteToMe',
-      deleteJob: 'jobInvites/deleteJob',
+      deleteJob: 'jobInvites/deleteJob'
     }),
     forceRender() {
       setTimeout(() => {
@@ -101,7 +106,6 @@ export default {
       this.seenJobIvnite(jobInvite)
       this.deleteJob(event)
       this.forceRender()
-
     },
     userInWorker(jobinvite) {
       var jobkinddate = jobinvite.day.jobkinddate.find(item => {
diff --git a/src/components/user/JobRequests/JobTransfer.vue b/src/components/user/JobRequests/JobTransfer.vue
index b6c5d75..b35d96d 100644
--- a/src/components/user/JobRequests/JobTransfer.vue
+++ b/src/components/user/JobRequests/JobTransfer.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <v-card tile>
+    <v-card tile :loading="jobRequestsLoading">
       <v-card-title>
         Eingehende Anfragen
       </v-card-title>
@@ -11,18 +11,25 @@
             :key="index"
           >
             <v-expansion-panel-header @click.once="seenJobRequest(jobrequest)">
-              {{ jobrequest.on_date.getDate() }}.{{
-                jobrequest.on_date.getMonth() + 1
-              }}.{{ jobrequest.on_date.getFullYear() }} von
-              {{ jobrequest.from_user.firstname }}
-              {{ jobrequest.from_user.lastname }}
-              <v-row class="text-right">
+              <div>
+                {{ jobrequest.on_date.getDate() }}.{{
+                  jobrequest.on_date.getMonth() + 1
+                }}.{{ jobrequest.on_date.getFullYear() }} von
+                {{ jobrequest.from_user.firstname }}
+                {{ jobrequest.from_user.lastname }}
+              </div>
+              <v-row class="text-right" style="margin-right: 5px">
                 <v-col>
                   <v-progress-circular
                     indeterminate
                     v-if="jobRequestsLoading"
                   ></v-progress-circular>
                 </v-col>
+                <v-col>
+                  <v-icon color="green" v-show="userInWorker(jobrequest)">
+                    {{ check }}
+                  </v-icon>
+                </v-col>
               </v-row>
             </v-expansion-panel-header>
             <v-expansion-panel-content>
@@ -35,7 +42,11 @@
                   </v-btn>
                 </v-col>
               </v-row>
-              <Day :day="jobrequest.day" :long="true" />
+              <Day
+                :day="jobrequest.day"
+                :long="true"
+                @sendRequests="sendingJobRequests(jobrequest, $event)"
+              />
               <v-row class="text-right">
                 <v-col>
                   <v-btn
@@ -51,18 +62,74 @@
         </v-expansion-panels>
       </v-card-text>
     </v-card>
-    <h1>
-      fromme
-    </h1>
-    <div v-for="(jobrequest, index) in jobRequestsFromMe" :key="index">
-      {{ jobrequest }}
-    </div>
+    <v-card tile :loading="jobRequestsLoading">
+      <v-card-title>
+        Ausgehende Anfragen
+      </v-card-title>
+      <v-card-text>
+        <v-expansion-panels>
+          <v-expansion-panel
+            v-for="(jobrequest, index) in jobRequestsFromMe"
+            :key="index"
+          >
+            <v-expansion-panel-header>
+              <div>
+                {{ jobrequest.on_date.getDate() }}.{{
+                  jobrequest.on_date.getMonth() + 1
+                }}.{{ jobrequest.on_date.getFullYear() }} an
+                {{ jobrequest.to_user.firstname }}
+                {{ jobrequest.to_user.lastname }}
+              </div>
+              <v-row class="text-right" style="margin-right: 5px">
+                <v-col>
+                  <v-progress-circular
+                    indeterminate
+                    v-if="jobRequestsLoading"
+                  ></v-progress-circular>
+                </v-col>
+                <v-col>
+                  <v-icon color="green" v-show="jobrequest.accepted">
+                    {{ check }}
+                  </v-icon>
+                </v-col>
+              </v-row>
+            </v-expansion-panel-header>
+            <v-expansion-panel-content>
+              <v-row class="text-right">
+                <v-col>
+                  <v-btn icon @click="deleteJobRequestFromMe(jobrequest)">
+                    <v-icon>
+                      {{trashCan}}
+                    </v-icon>
+                  </v-btn>
+                </v-col>
+              </v-row>
+              <Day
+                :day="jobrequest.day"
+                :long="true"
+                @sendRequests="sendingJobRequests(jobrequest, $event)"
+              />
+              <v-row class="text-right">
+                <v-col>
+                  <v-btn
+                    v-show="!jobrequest.accepted"
+                    text
+                    @click="updatingAcceptedJobRequest(jobrequest)"
+                    >Annehmen
+                  </v-btn>
+                </v-col>
+              </v-row>
+            </v-expansion-panel-content>
+          </v-expansion-panel>
+        </v-expansion-panels>
+      </v-card-text>
+    </v-card>
   </div>
 </template>
 
 <script>
 import { mapGetters, mapActions } from 'vuex'
-import { mdiEyeOff, mdiEyeCheck } from '@mdi/js'
+import { mdiEyeOff, mdiEyeCheck, mdiCheck, mdiTrashCan } from '@mdi/js'
 import Day from '@/components/user/Jobs/Day'
 export default {
   name: 'JobTransfer',
@@ -71,31 +138,47 @@ export default {
   data() {
     return {
       notSeen: mdiEyeOff,
-      seen: mdiEyeCheck
+      seen: mdiEyeCheck,
+      check: mdiCheck,
+      trashCan: mdiTrashCan,
     }
   },
   methods: {
     ...mapActions({
       getJobRequests: 'jobRequests/getJobRequests',
-      updateJobRequestToMe: 'jobRequests/updateJobRequestToMe'
+      updateJobRequestToMe: 'jobRequests/updateJobRequestToMe',
+      setJobRequests: 'jobRequests/setJobRequests',
+      deleteJobRequestFromMe: 'jobRequests/deleteJobRequestFromMe'
     }),
     updatingAcceptedJobRequest(jobRequest) {
       jobRequest.accepted = true
       jobRequest.answered = true
       this.updateJobRequestToMe({ ...jobRequest })
-        setTimeout(() => {
-            this.getJobRequests(), 200
-        })
+      setTimeout(() => {
+        this.getJobRequests(), 200
+      })
     },
     updatingSeenJobRequest(jobRequest) {
       jobRequest.watched = !jobRequest.watched
-      this.updateJobRequestToMe({...jobRequest})
+      this.updateJobRequestToMe({ ...jobRequest })
     },
     seenJobRequest(jobRequest) {
       if (!jobRequest.watched) {
         jobRequest.watched = true
         this.updateJobRequestToMe(jobRequest)
       }
+    },
+    userInWorker(jobrequest) {
+      var jobkinddate = jobrequest.day.jobkinddate.find(item => {
+        return item.worker.find(workeritem => {
+          return workeritem.id === this.activeUser.id
+        })
+      })
+      return !!jobkinddate
+    },
+    sendingJobRequests(jobrequest, event) {
+      this.seenJobRequest(jobrequest)
+      this.setJobRequests(event)
     }
   },
   computed: {
@@ -103,7 +186,8 @@ export default {
       jobRequestsToMe: 'jobRequests/jobRequestsToMe',
       jobRequestsFromMe: 'jobRequests/jobRequestsFromMe',
       jobRequestsLoading: 'jobRequests/jobRequestsLoading',
-      loading: 'user/loading'
+      loading: 'user/loading',
+      activeUser: 'user/user'
     })
   },
   created() {
diff --git a/src/components/user/Jobs.vue b/src/components/user/Jobs.vue
index 8f5b9fa..1bd2ad0 100644
--- a/src/components/user/Jobs.vue
+++ b/src/components/user/Jobs.vue
@@ -85,7 +85,6 @@ export default {
   },
   created() {
     this.getActiveUser()
-    this.getJobInvites()
     this.getAllJobKinds()
     this.createMonth(this.date)
     this.getDBUsers()
@@ -112,7 +111,8 @@ export default {
       addJob: 'jobs/addJob',
       deleteJob: 'jobs/deleteJob',
       setJobInvites: 'jobInvites/setJobInvites',
-      getJobInvites: 'jobInvites/getJobInvites'
+      getJobInvites: 'jobInvites/getJobInvites',
+      getJobRequests: 'jobRequests/getJobRequests'
     }),
     changeMonth(value) {
       if (value === -1) {
@@ -139,13 +139,13 @@ export default {
     ...mapGetters({
       month: 'jobs/month',
       startDate: 'jobs/getStartDate',
-      endDate: 'jobs/getEndDate'
+      endDate: 'jobs/getEndDate',
+      loading: 'user/loading'
     })
   },
   watch: {
     $route() {
       this.getActiveUser()
-      this.getJobInvites()
       this.date = new Date(
         this.$route.params.year,
         this.$route.params.month - 1,
@@ -166,6 +166,12 @@ export default {
           day: this.endDate.getDate()
         }
       })
+    },
+    loading(newValue) {
+      if(!newValue) {
+        this.getJobInvites()
+        this.getJobRequests()
+      }
     }
   }
 }
diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue
index 33f7bdf..404608f 100644
--- a/src/components/user/Jobs/Day.vue
+++ b/src/components/user/Jobs/Day.vue
@@ -134,7 +134,7 @@
             </v-card-actions>
           </v-card>
         </v-menu>
-        <v-menu v-model="menu_request" :close-on-content-click="false" offset-y>
+        <v-menu v-model="menu_request" :close-on-content-click="false" offset-y v-if="day.locked && userInWorker()">
           <template v-slot:activator="{ on }">
             <v-btn v-show="day.locked && userInWorker()" text v-on="on">
               Abgeben
@@ -143,7 +143,7 @@
           <v-card>
             <v-card-text>
               <v-autocomplete
-                v-model="job_invites"
+                v-model="job_requests"
                 label="Einladungen senden an"
                 return-object
                 multiple
@@ -152,13 +152,13 @@
                 item-value="id"
                 chips
                 deletable-chips
-                :items="filteredDBUsers()"
+                :items="filteredDBUsersWithJobKind()"
               >
               </v-autocomplete>
             </v-card-text>
             <v-card-actions>
               <v-spacer />
-              <v-btn text>
+              <v-btn text @click="sendRequests()">
                 Anfragen
               </v-btn>
             </v-card-actions>
@@ -194,7 +194,8 @@ export default {
       menu_invite: false,
       menu_request: false,
       update: 0,
-      job_invites: []
+      job_invites: [],
+      job_requests: []
     }
   },
   created() {
@@ -223,6 +224,26 @@ export default {
       }, 200)
       this.menu_invite = false
     },
+    sendRequests() {
+      var sendData = []
+      this.job_requests.forEach(item => {
+        sendData.push({
+          from_user: this.activeUser,
+          to_user: item,
+          date: {
+            year: this.day.date.getFullYear(),
+            month: this.day.date.getMonth() + 1,
+            day: this.day.date.getDate()
+          },
+          job_kind: this.getJob_Kind()
+        })
+      })
+      this.$emit('sendRequests', sendData)
+      setTimeout(() => {
+        this.job_requests = []
+      }, 200)
+      this.menu_request = false
+    },
     color: day => {
       if (day) {
         if (day.date.getDay() === 0 || day.date.getDay() === 1) {
@@ -286,6 +307,34 @@ export default {
       }
       this.deleteInvite(sendData)
     },
+    getJob_Kind() {
+      var jobkinddate = this.day.jobkinddate.find(item => {
+        return item.worker.find(user => {
+          return this.activeUser.id === user.id
+        })
+      })
+      return jobkinddate.job_kind
+    },
+    filteredDBUsersWithJobKind() {
+      console.log(this.day.jobkinddate)
+      var retVal = this.filteredDBUsers()
+      var job_kind = this.getJob_Kind()
+
+      retVal = retVal.filter(user => {
+        if (job_kind.workgroup ? job_kind.workgroup.if === null : true) {
+          return true
+        } else {
+          if (user.workgroups ? user.workgroups.length > 0 : false) {
+            return user.workgroups.find(wg => {
+              return wg.id === job_kind.workgroup.id
+            })
+          }
+        }
+        return false
+      })
+
+      return retVal
+    },
     filteredDBUsers() {
       var retVal = this.allUsers.filter(user => {
         var test = this.day.jobkinddate.find(item => {
diff --git a/src/plugins/routes.js b/src/plugins/routes.js
index b7a896c..57d97c4 100644
--- a/src/plugins/routes.js
+++ b/src/plugins/routes.js
@@ -1,6 +1,6 @@
 //const main = 'https://192.168.5.128:5000/'
-const main = 'http://localhost:5000/'
-//const main = 'http://192.168.5.118:5000/'
+//const main = 'http://localhost:5000/'
+const main = 'http://192.168.5.118:5000/'
 //const main = 'https://groeger-clan.duckdns.org:5000/'
 
 const url = {

From ba44231e4fe22cef6a1f9e1c961263c91ec83c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Gr=C3=B6ger?= <tim@groeger-clan.de>
Date: Thu, 4 Jun 2020 13:19:48 +0200
Subject: [PATCH 12/12] =?UTF-8?q?diensteinladung=20und=20=C3=BCbertragung?=
 =?UTF-8?q?=20fertig.=20User=20k=C3=B6nnen=20leute=20einladen,=20sich=20au?=
 =?UTF-8?q?stragen,=20jobs=20abgeben=20usw.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

user können sehen, wenn es neue nachrichten gibt und sehen ob die einladung bzw. anfrage gesehen wurde.
---
 .../user/JobRequests/JobInvites.vue           | 85 +++++++++++++++++--
 .../user/JobRequests/JobTransfer.vue          | 49 +++++++----
 src/components/user/Jobs.vue                  | 18 +++-
 src/components/user/Jobs/Day.vue              | 81 ++++++++++++------
 4 files changed, 181 insertions(+), 52 deletions(-)

diff --git a/src/components/user/JobRequests/JobInvites.vue b/src/components/user/JobRequests/JobInvites.vue
index 47c5459..d0a5f0a 100644
--- a/src/components/user/JobRequests/JobInvites.vue
+++ b/src/components/user/JobRequests/JobInvites.vue
@@ -14,10 +14,12 @@
             <v-expansion-panel-header>
               <div>
                 {{ jobInvite.on_date.getDate() }}.{{
-                  jobInvite.on_date.getMonth() + 1
+                jobInvite.on_date.getMonth() + 1
                 }}.{{ jobInvite.on_date.getFullYear() }} von
-                {{ jobInvite.from_user.firstname }}
-                {{ jobInvite.from_user.lastname }}
+                <v-badge dot :value="!jobInvite.watched" color="red">
+                  {{ jobInvite.from_user.firstname }}
+                  {{ jobInvite.from_user.lastname }}
+                </v-badge>
               </div>
               <v-row class="text-right" style="margin-right: 5px">
                 <v-col>
@@ -49,6 +51,72 @@
                 :loading="jobInvite.day.loading"
                 @addingJob="addingJob(jobInvite, $event)"
                 @deletingJob="deletingJob(jobInvite, $event)"
+                @sendInvites="setJobInvites"
+                @sendRequests="setJobRequests"
+                @deleteJobInvite="deleteInvite"
+                @deleteJobRequest="deleteRequest"
+              />
+            </v-expansion-panel-content>
+          </v-expansion-panel>
+        </v-expansion-panels>
+      </v-card-text>
+    </v-card>
+    <v-card tile :loading="jobInvitesLoading">
+      <v-card-title>
+        Versendete Einladungen
+      </v-card-title>
+      <v-card-text>
+        <v-expansion-panels>
+          <v-expansion-panel
+                  v-for="jobInvite in jobInvitesFromMe"
+                  :key="jobInvite.id"
+                  @click.once="seenJobIvnite(jobInvite)"
+          >
+            <v-expansion-panel-header>
+
+              <div>
+                {{ jobInvite.on_date.getDate() }}.{{
+                jobInvite.on_date.getMonth() + 1
+                }}.{{ jobInvite.on_date.getFullYear() }} an
+                <v-badge :value="jobInvite.watched" icon="mdi-eye" color="grey" inline>
+                  {{ jobInvite.to_user.firstname }}
+                  {{ jobInvite.to_user.lastname }}
+                </v-badge>
+              </div>
+              <v-row class="text-right" style="margin-right: 5px">
+                <v-col>
+                  <v-progress-circular
+                          indeterminate
+                          v-if="jobInvitesLoading"
+                  ></v-progress-circular>
+                </v-col>
+                <v-col>
+                  <v-icon color="green" v-show="userInWorker(jobInvite)">
+                    {{ check }}
+                  </v-icon>
+                </v-col>
+              </v-row>
+            </v-expansion-panel-header>
+            <v-expansion-panel-content :eager="true">
+              <v-row class="text-right">
+                <v-col>
+                  <v-btn icon @click="deleteInvite(jobInvite)">
+                    <v-icon>
+                      {{trashCan}}
+                    </v-icon>
+                  </v-btn>
+                </v-col>
+              </v-row>
+              <Day
+                      :day="jobInvite.day"
+                      :long="true"
+                      :loading="jobInvite.day.loading"
+                      @addingJob="addingJob(jobInvite, $event)"
+                      @deletingJob="deletingJob(jobInvite, $event)"
+                      @sendInvites="setJobInvites"
+                      @sendRequests="setJobRequests"
+                      @deleteJobInvite="deleteInvite"
+                      @deleteJobRequest="deleteRequest"
               />
             </v-expansion-panel-content>
           </v-expansion-panel>
@@ -60,7 +128,7 @@
 
 <script>
 import { mapActions, mapGetters } from 'vuex'
-import { mdiEyeOff, mdiEyeCheck, mdiCheck } from '@mdi/js'
+import { mdiEyeOff, mdiEyeCheck, mdiCheck, mdiTrashCan } from '@mdi/js'
 import Day from '@/components/user/Jobs/Day'
 export default {
   name: 'JobInvites',
@@ -70,6 +138,7 @@ export default {
       notSeen: mdiEyeOff,
       seen: mdiEyeCheck,
       check: mdiCheck,
+      trashCan: mdiTrashCan,
       showNotSeen: false,
       showSeen: false,
       update: 0
@@ -79,8 +148,12 @@ export default {
     ...mapActions({
       getJobInvites: 'jobInvites/getJobInvites',
       addJob: 'jobInvites/addJob',
+      setJobInvites: 'jobInvites/setJobInvites',
       updateJobInviteToMe: 'jobInvites/updateJobInviteToMe',
-      deleteJob: 'jobInvites/deleteJob'
+      deleteJob: 'jobInvites/deleteJob',
+      setJobRequests: 'jobRequests/setJobRequests',
+      deleteInvite: 'jobInvites/deleteJobInviteFromMe',
+      deleteRequest: 'jobRequests/deleteJobRequestFromMe'
     }),
     forceRender() {
       setTimeout(() => {
@@ -110,7 +183,7 @@ export default {
     userInWorker(jobinvite) {
       var jobkinddate = jobinvite.day.jobkinddate.find(item => {
         return item.worker.find(workeritem => {
-          return workeritem.id === this.activeUser.id
+          return workeritem.id === jobinvite.to_user.id
         })
       })
       return !!jobkinddate
diff --git a/src/components/user/JobRequests/JobTransfer.vue b/src/components/user/JobRequests/JobTransfer.vue
index b35d96d..1e66168 100644
--- a/src/components/user/JobRequests/JobTransfer.vue
+++ b/src/components/user/JobRequests/JobTransfer.vue
@@ -13,10 +13,12 @@
             <v-expansion-panel-header @click.once="seenJobRequest(jobrequest)">
               <div>
                 {{ jobrequest.on_date.getDate() }}.{{
-                  jobrequest.on_date.getMonth() + 1
+                jobrequest.on_date.getMonth() + 1
                 }}.{{ jobrequest.on_date.getFullYear() }} von
-                {{ jobrequest.from_user.firstname }}
-                {{ jobrequest.from_user.lastname }}
+                <v-badge dot :value="!jobrequest.watched" color="red">
+                  {{ jobrequest.from_user.firstname }}
+                  {{ jobrequest.from_user.lastname }}
+                </v-badge>
               </div>
               <v-row class="text-right" style="margin-right: 5px">
                 <v-col>
@@ -46,15 +48,23 @@
                 :day="jobrequest.day"
                 :long="true"
                 @sendRequests="sendingJobRequests(jobrequest, $event)"
+                @addingJob="addJob"
+                @deletingJob="deleteJob"
+                @sendInvites="setJobInvites"
+                @deleteJobInvite="deleteInvite"
+                @deleteJobRequest="deleteJobRequestFromMe"
               />
               <v-row class="text-right">
                 <v-col>
                   <v-btn
-                    v-show="!jobrequest.accepted"
+                    v-show="!jobrequest.answered"
                     text
                     @click="updatingAcceptedJobRequest(jobrequest)"
                     >Annehmen</v-btn
                   >
+                  <div v-show="jobrequest.answered && !jobrequest.accepted">
+                    Dieser Dienst wurde schon übertragen.
+                  </div>
                 </v-col>
               </v-row>
             </v-expansion-panel-content>
@@ -75,10 +85,12 @@
             <v-expansion-panel-header>
               <div>
                 {{ jobrequest.on_date.getDate() }}.{{
-                  jobrequest.on_date.getMonth() + 1
+                jobrequest.on_date.getMonth() + 1
                 }}.{{ jobrequest.on_date.getFullYear() }} an
-                {{ jobrequest.to_user.firstname }}
-                {{ jobrequest.to_user.lastname }}
+                <v-badge :value="jobrequest.watched" icon="mdi-eye" color="grey" inline>
+                  {{ jobrequest.to_user.firstname }}
+                  {{ jobrequest.to_user.lastname }}
+                </v-badge>
               </div>
               <v-row class="text-right" style="margin-right: 5px">
                 <v-col>
@@ -108,17 +120,12 @@
                 :day="jobrequest.day"
                 :long="true"
                 @sendRequests="sendingJobRequests(jobrequest, $event)"
+                @addingJob="addJob"
+                @deletingJob="deleteJob"
+                @sendInvites="setJobInvites"
+                @deleteJobInvite="deleteInvite"
+                @deleteJobRequest="deleteJobRequestFromMe"
               />
-              <v-row class="text-right">
-                <v-col>
-                  <v-btn
-                    v-show="!jobrequest.accepted"
-                    text
-                    @click="updatingAcceptedJobRequest(jobrequest)"
-                    >Annehmen
-                  </v-btn>
-                </v-col>
-              </v-row>
             </v-expansion-panel-content>
           </v-expansion-panel>
         </v-expansion-panels>
@@ -148,7 +155,13 @@ export default {
       getJobRequests: 'jobRequests/getJobRequests',
       updateJobRequestToMe: 'jobRequests/updateJobRequestToMe',
       setJobRequests: 'jobRequests/setJobRequests',
-      deleteJobRequestFromMe: 'jobRequests/deleteJobRequestFromMe'
+      deleteJobRequestFromMe: 'jobRequests/deleteJobRequestFromMe',
+      deleteInvite: 'jobInvites/deleteJobInviteFromMe',
+      getJobInvites: 'jobInvites/getJobInvites',
+      addJob: 'jobInvites/addJob',
+      setJobInvites: 'jobInvites/setJobInvites',
+      updateJobInviteToMe: 'jobInvites/updateJobInviteToMe',
+      deleteJob: 'jobInvites/deleteJob',
     }),
     updatingAcceptedJobRequest(jobRequest) {
       jobRequest.accepted = true
diff --git a/src/components/user/Jobs.vue b/src/components/user/Jobs.vue
index 1bd2ad0..04b74c6 100644
--- a/src/components/user/Jobs.vue
+++ b/src/components/user/Jobs.vue
@@ -46,7 +46,16 @@
         <v-row justify="start" align="start">
           <div v-for="day in week.days" :key="day.id">
             <v-col cols="12">
-              <Day :day="day" :long="false" @addingJob="addJob" @sendInvites="setJobInvites" @deletingJob="deleteJob"/>
+              <Day
+                :day="day"
+                :long="false"
+                @addingJob="addJob"
+                @sendInvites="setJobInvites"
+                @deletingJob="deleteJob"
+                @sendRequests="setJobRequests"
+                @deleteJobInvite="deleteInvite"
+                @deleteJobRequest="deleteRequest"
+              />
             </v-col>
           </div>
         </v-row>
@@ -112,7 +121,10 @@ export default {
       deleteJob: 'jobs/deleteJob',
       setJobInvites: 'jobInvites/setJobInvites',
       getJobInvites: 'jobInvites/getJobInvites',
-      getJobRequests: 'jobRequests/getJobRequests'
+      getJobRequests: 'jobRequests/getJobRequests',
+      setJobRequests: 'jobRequests/setJobRequests',
+      deleteInvite: 'jobInvites/deleteJobInviteFromMe',
+      deleteRequest: 'jobRequests/deleteJobRequestFromMe'
     }),
     changeMonth(value) {
       if (value === -1) {
@@ -168,7 +180,7 @@ export default {
       })
     },
     loading(newValue) {
-      if(!newValue) {
+      if (!newValue) {
         this.getJobInvites()
         this.getJobRequests()
       }
diff --git a/src/components/user/Jobs/Day.vue b/src/components/user/Jobs/Day.vue
index 404608f..1cffde0 100644
--- a/src/components/user/Jobs/Day.vue
+++ b/src/components/user/Jobs/Day.vue
@@ -84,28 +84,21 @@
               >Einladen</v-btn
             >
           </template>
-          <v-card>
+          <v-card :loading="jobInvitesLoading">
             <v-card-title>
               Einladungen
             </v-card-title>
             <v-card-text>
-              <v-tooltip
-                bottom
-                v-for="(invite, index) in getInvites(day.date)"
-                :key="index"
+              <v-div
+                      bottom
+                      v-for="(invite, index) in getInvites(day.date)"
+                      :key="index"
               >
-                <template v-slot:activator="{ on }">
-                  <v-chip
-                    v-on="on"
-                    close
-                    style="margin: 5px"
-                    @click:close="deleteInvite(invite)"
-                  >
-                    {{ invite.to_user.firstname }} {{ invite.to_user.lastname }}
-                  </v-chip>
-                </template>
-                <span>Klicken um Einladung zu widerrufen.</span>
-              </v-tooltip>
+                <v-chip v-on="on" style="margin: 5px">
+                  {{ invite.to_user.firstname }}
+                  {{ invite.to_user.lastname }}
+                </v-chip>
+              </v-div>
               <v-divider style="margin-bottom: 5px" />
               <v-autocomplete
                 v-model="job_invites"
@@ -134,17 +127,41 @@
             </v-card-actions>
           </v-card>
         </v-menu>
-        <v-menu v-model="menu_request" :close-on-content-click="false" offset-y v-if="day.locked && userInWorker()">
+        <v-menu
+          v-model="menu_request"
+          :close-on-content-click="false"
+          offset-y
+          v-if="day.locked && userInWorker()"
+        >
           <template v-slot:activator="{ on }">
             <v-btn v-show="day.locked && userInWorker()" text v-on="on">
               Abgeben
             </v-btn>
           </template>
-          <v-card>
+          <v-card :loading="jobRequestsLoading">
+            <v-card-title>
+              Dienstabgabenanfrage
+            </v-card-title>
             <v-card-text>
+              <div v-if="jobRequestsLoading">
+                <v-progress-circular indeterminate />
+              </div>
+              <div v-if="!jobRequestsLoading">
+                <v-div
+                  bottom
+                  v-for="(request, index) in getRequests(day.date)"
+                  :key="index"
+                >
+                  <v-chip v-on="on" style="margin: 5px">
+                    {{ request.to_user.firstname }}
+                    {{ request.to_user.lastname }}
+                  </v-chip>
+                </v-div>
+              </div>
+              <v-divider style="margin-bottom: 5px" />
               <v-autocomplete
                 v-model="job_requests"
-                label="Einladungen senden an"
+                label="Anfragen senden an"
                 return-object
                 multiple
                 filled
@@ -202,9 +219,7 @@ export default {
     //setInterval(() => {console.log(this.day.loading)},100)
   },
   methods: {
-    ...mapActions({
-      deleteInvite: 'jobInvites/deleteJobInviteFromMe'
-    }),
+    ...mapActions({}),
     sendInvites() {
       var sendData = []
       this.job_invites.forEach(item => {
@@ -305,7 +320,20 @@ export default {
         month: sendData.on_date.getMonth() + 1,
         day: sendData.on_date.getDate()
       }
-      this.deleteInvite(sendData)
+      this.$emit('deleteJobInvite', sendData)
+    },
+    deletingRequest(jobRequest) {
+      let sendData = { ...jobRequest }
+      sendData.on_date = {
+        year: sendData.on_date.getFullYear(),
+        month: sendData.on_date.getMonth() + 1,
+        day: sendData.on_date.getDate()
+      }
+      this.$emit('deleteJobRequest', sendData)
+      this.menu_request = false
+      setTimeout(() => {
+        this.menu_request = true
+      }, 200)
     },
     getJob_Kind() {
       var jobkinddate = this.day.jobkinddate.find(item => {
@@ -361,7 +389,10 @@ export default {
       activeUser: 'user/user',
       allUsers: 'usermanager/users',
       getDay: 'jobInvites/getDayFromMe',
-      getInvites: 'jobInvites/getDayWorkerFromMe'
+      getInvites: 'jobInvites/getDayWorkerFromMe',
+      getRequests: 'jobRequests/getDayWorkerFromMe',
+      jobInvitesLoading: 'jobInvites/jobInvitesLoading',
+      jobRequestsLoading: 'jobRequests/jobRequestsLoading'
     }),
     jobkindWithSpace() {
       var retVal = this.day.jobkinddate.filter(item => {