From bca2695510d5c2d98a194c6f351b4088bb188c58 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Mon, 24 Feb 2020 15:33:15 +0100
Subject: [PATCH 01/85] Updated inter-ui with the reduced charset

---
 frontend/package-lock.json       |  5 +++--
 frontend/package.json            |  2 +-
 frontend/src/scss/variables.scss | 12 ++++--------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 050b184b53..8393fa169e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -9721,8 +9721,9 @@
       }
     },
     "inter-ui": {
-      "version": "github:manuelmeister/inter-ui#4e66f3cbb8b08440328639a3e25f8fa01c44eee6",
-      "from": "github:manuelmeister/inter-ui"
+      "version": "3.12.1",
+      "resolved": "https://registry.npmjs.org/inter-ui/-/inter-ui-3.12.1.tgz",
+      "integrity": "sha512-56Nm/WmM5kRYrq8JxsQX9YJ4Ur3dyJuPUTJq2fbvqRgL2NzJJl/M8JJaEReb/px8KkXoeRTASq6jnxU7b4u81A=="
     },
     "internal-ip": {
       "version": "4.3.0",
diff --git a/frontend/package.json b/frontend/package.json
index 08a9320eb5..e8f3c76a89 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,7 +16,7 @@
     "@mdi/font": "^4.7.95",
     "axios": "^0.19.0",
     "hal-json-normalizer": "^2.1.2",
-    "inter-ui": "github:manuelmeister/inter-ui",
+    "inter-ui": "^3.12.1",
     "lodash": "^4.17.15",
     "slugify": "^1.3.6",
     "vue": "^2.6.11",
diff --git a/frontend/src/scss/variables.scss b/frontend/src/scss/variables.scss
index 30445b7e35..579f7ee1be 100644
--- a/frontend/src/scss/variables.scss
+++ b/frontend/src/scss/variables.scss
@@ -1,13 +1,9 @@
 @use "~inter-ui/default" as inter-ui with (
-	$inter-font-path: "~inter-ui/Inter (web)"
+	$inter-font-path: "~inter-ui/Inter (web hinted latin)"
 );
-// TODO: @manuelmeister remove unused charachters (50% savings)
-//  see https://github.com/filamentgroup/glyphhanger
-
-// @include inter-ui.weight-200;
-// @include inter-ui.weight-400;
-// @include inter-ui.weight-600;
-@include inter-ui.all;
+@include inter-ui.weight-200;
+@include inter-ui.weight-400;
+@include inter-ui.weight-600;
 $body-font-family: 'Inter', sans-serif, emoji;
 $heading-font-family: $body-font-family;
 $body-font-weight: 400;

From 490efdc5201aadd2e4a9ab180d6e6cb2bcfafb9b Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Mon, 24 Feb 2020 18:18:46 +0100
Subject: [PATCH 02/85] Moved definitions into different file (otherwise
 variables.scss are always included and the definitions are duplicated).

---
 frontend/src/App.vue             |  2 +-
 frontend/src/scss/global.scss    |  8 ++++++++
 frontend/src/scss/variables.scss | 12 ++++--------
 3 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 frontend/src/scss/global.scss

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 54ffcb5e3c..7e4b01329a 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,4 +1,3 @@
-
 <template>
   <div id="app">
     <component :is="layout">
@@ -20,6 +19,7 @@ export default {
 }
 </script>
 <style lang="scss">
+  @import "src/scss/global";
   // consider replacing with CDN for production
   @import '../node_modules/@mdi/font/css/materialdesignicons.css';
 </style>
diff --git a/frontend/src/scss/global.scss b/frontend/src/scss/global.scss
new file mode 100644
index 0000000000..865ff1c64d
--- /dev/null
+++ b/frontend/src/scss/global.scss
@@ -0,0 +1,8 @@
+@use "~inter-ui/default" as inter-ui with (
+    $inter-font-path: "~inter-ui/Inter (web hinted latin)"
+  );
+@include inter-ui.weight-200;
+@include inter-ui.weight-400;
+@include inter-ui.weight-600;
+body {font-feature-settings: "ss03", "calt", "rlig", "kern"}
+.v-toolbar__title {font-weight: 500;}
diff --git a/frontend/src/scss/variables.scss b/frontend/src/scss/variables.scss
index 579f7ee1be..806eb25604 100644
--- a/frontend/src/scss/variables.scss
+++ b/frontend/src/scss/variables.scss
@@ -1,9 +1,3 @@
-@use "~inter-ui/default" as inter-ui with (
-	$inter-font-path: "~inter-ui/Inter (web hinted latin)"
-);
-@include inter-ui.weight-200;
-@include inter-ui.weight-400;
-@include inter-ui.weight-600;
 $body-font-family: 'Inter', sans-serif, emoji;
 $heading-font-family: $body-font-family;
 $body-font-weight: 400;
@@ -98,8 +92,10 @@ $headings: (
     'font-family': $body-font-family
   )
 );
-body {font-feature-settings: "ss03", "calt", "rlig", "kern"}
-.v-toolbar__title {font-weight: 500;}
 $btn-letter-spacing: .25px;
+$btn-text-transform: inherit;
 $bottom-nav-btn-min-width: 60px;
 $list-item-action-icon-margin: 20px;
+$menu-content-border-radius: 0 0 4px 4px;
+$primary-transition: .1s ease-in-out !default;
+

From 7beeaa0c6679dd308ad09843cfd6a592af5adad5 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Mon, 24 Feb 2020 18:19:23 +0100
Subject: [PATCH 03/85] Remove background skeleton loaders.

---
 frontend/src/scss/global.scss | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/frontend/src/scss/global.scss b/frontend/src/scss/global.scss
index 865ff1c64d..fda2ba9613 100644
--- a/frontend/src/scss/global.scss
+++ b/frontend/src/scss/global.scss
@@ -6,3 +6,21 @@
 @include inter-ui.weight-600;
 body {font-feature-settings: "ss03", "calt", "rlig", "kern"}
 .v-toolbar__title {font-weight: 500;}
+.v-skeleton-loader__actions,
+.v-skeleton-loader__article,
+.v-skeleton-loader__card-heading,
+.v-skeleton-loader__card-text,
+.v-skeleton-loader__date-picker,
+.v-skeleton-loader__list-item,
+.v-skeleton-loader__list-item-avatar,
+.v-skeleton-loader__list-item-text,
+.v-skeleton-loader__list-item-two-line,
+.v-skeleton-loader__list-item-avatar-two-line,
+.v-skeleton-loader__list-item-three-line,
+.v-skeleton-loader__list-item-avatar-three-line,
+.v-skeleton-loader__table-heading,
+.v-skeleton-loader__table-thead,
+.v-skeleton-loader__table-tbody,
+.v-skeleton-loader__table-tfoot {
+	background: none!important;
+}

From 3b090b4e5adf2623449e64a7fdd805d374d41cb5 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 29 Feb 2020 23:25:47 +0100
Subject: [PATCH 04/85] Shows already loaded data and better styling of the day
 headers

---
 frontend/src/components/Picasso.vue | 65 ++++++++++++++++-------------
 1 file changed, 37 insertions(+), 28 deletions(-)

diff --git a/frontend/src/components/Picasso.vue b/frontend/src/components/Picasso.vue
index 64258cda2f..d4da549365 100644
--- a/frontend/src/components/Picasso.vue
+++ b/frontend/src/components/Picasso.vue
@@ -3,33 +3,36 @@ Listing all given event instances in a calendar view.
 -->
 
 <template>
-  <v-skeleton-loader v-if="camp()._meta.loading && type === 'day'" class="ma-3"
-                     type="list-item@6" />
-  <v-skeleton-loader v-else-if="camp()._meta.loading" class="ma-3"
-                     type="table-thead,table-row@6" />
-  <v-calendar v-else
-              class="ec-picasso"
-              :events="eventInstances"
-              event-start="start_time"
-              event-end="end_time"
-              :event-name="getEventName"
-              :event-color="getEventColor"
-              interval-height="42"
-              :interval-format="getIntervalFormat"
-              first-interval="5"
-              interval-count="19"
-              :start="startDateString"
-              :end="endDateString"
-              locale="de-ch"
-              :day-format="dayFormat"
-              :type="type"
-              :weekday-format="weekdayFormat"
-              :weekdays="[1, 2, 3, 4, 5, 6, 0]"
-              color="primary"
-              @click:event="showEventInstance" />
+  <div>
+    <v-skeleton-loader v-if="camp()._meta.loading && type === 'day'" class="ma-3"
+                       type="list-item@6" />
+    <v-skeleton-loader v-else-if="camp()._meta.loading" class="ma-3"
+                       type="table-thead,table-row@6" />
+    <v-calendar v-else
+                class="ec-picasso"
+                :events="eventInstances"
+                event-start="start_time"
+                event-end="end_time"
+                :event-name="getEventName"
+                :event-color="getEventColor"
+                interval-height="42"
+                interval-width="46"
+                :interval-format="getIntervalFormat"
+                first-interval="5"
+                interval-count="19"
+                :start="startDateString"
+                :end="endDateString"
+                locale="de-ch"
+                :day-format="dayFormat"
+                :type="type"
+                :weekday-format="weekdayFormat"
+                :weekdays="[1, 2, 3, 4, 5, 6, 0]"
+                color="primary"
+                @click:event="showEventInstance" />
+  </div>
 </template>
 <script>
-import { eventInstanceRoute } from '@/router'
+import { eventInstanceRoute } from '../router'
 
 export default {
   name: 'Picasso',
@@ -55,9 +58,15 @@ export default {
   },
   methods: {
     getEventName (event, _) {
+      if (event.input.event()._meta.loading) {
+        return 'Lädt…'
+      }
       return '(' + event.input.number + ') ' + event.input.event().event_category().short + ': ' + event.input.event().title
     },
     getEventColor (event, _) {
+      if (event.event()._meta.loading) {
+        return 'grey lighten-2'
+      }
       return event.event().event_category().color.toString()
     },
     getIntervalFormat (time) {
@@ -89,12 +98,12 @@ export default {
       opacity: .75;
       border-radius: 0;
       padding: 2px;
-      white-space: pre;
+      white-space: normal;
       min-width: auto;
+      width: 100%;
 
       .v-btn__content {
-        max-width: 100%;
-        white-space: normal;
+        width: 100%;
       }
     }
 

From 37c0080c84c6a83d990aa29a00980d2f4451cdd7 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 29 Feb 2020 23:32:17 +0100
Subject: [PATCH 05/85] Created CardView as a container for the main content

---
 frontend/src/components/EventList.vue | 50 +++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 frontend/src/components/EventList.vue

diff --git a/frontend/src/components/EventList.vue b/frontend/src/components/EventList.vue
new file mode 100644
index 0000000000..651ee4874e
--- /dev/null
+++ b/frontend/src/components/EventList.vue
@@ -0,0 +1,50 @@
+<!--
+Listing all given event instances in a calendar view.
+-->
+
+<template>
+  <v-list dense>
+    <template v-for="eventInstance in eventInstances">
+      <v-skeleton-loader
+        v-if="eventInstance.event()._meta.loading"
+        :key="eventInstance._meta.self"
+        type="list-item-avatar-two-line" height="60" />
+      <v-list-item
+        v-else
+        :key="eventInstance._meta.self"
+        two-line
+        :to="eventInstanceLink(eventInstance)">
+        <v-chip class="mr-2" :color="eventInstance.event().event_category().color.toString()">{{ eventInstance.event().event_category().short }}</v-chip>
+        <v-list-item-content>
+          <v-list-item-title>{{ eventInstance.event().title }}</v-list-item-title>
+          <v-list-item-subtitle>{{ eventInstance.start_time }} - {{ eventInstance.end_time }}</v-list-item-subtitle>
+        </v-list-item-content>
+      </v-list-item>
+    </template>
+  </v-list>
+</template>
+<script>
+import { eventInstanceRoute } from '../router'
+
+export default {
+  name: 'EventList',
+  props: {
+    camp: { type: Function, required: true },
+    eventInstances: { type: Array, required: true }
+  },
+  data () {
+    return {
+    }
+  },
+  computed: {
+  },
+  methods: {
+    eventInstanceLink (eventInstance) {
+      return eventInstanceRoute(this.camp(), eventInstance)
+    }
+  }
+}
+</script>
+<style lang="scss">
+
+</style>

From 5a24f37a88daea7b71285d5f92290b3bda99f127 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 29 Feb 2020 23:32:37 +0100
Subject: [PATCH 06/85] Created CardView as a container for the main content

---
 frontend/src/components/CardView.vue | 31 ++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 frontend/src/components/CardView.vue

diff --git a/frontend/src/components/CardView.vue b/frontend/src/components/CardView.vue
new file mode 100644
index 0000000000..815261ee01
--- /dev/null
+++ b/frontend/src/components/CardView.vue
@@ -0,0 +1,31 @@
+<template>
+  <v-card :max-width="maxWidth" class="mx-auto">
+    <v-card-title v-if="title">
+      {{ title }}
+    </v-card-title>
+    <v-skeleton-loader v-if="!loaded" type="article" />
+    <slot v-else />
+  </v-card>
+</template>
+
+<script>
+export default {
+  name: 'CardView',
+  props: {
+    loaded: { type: Boolean, required: false, default: true },
+    title: { type: String, required: false, default: '' },
+    icon: { type: String, required: false, default: '' },
+    maxWidth: { type: String, default: '' }
+  }
+}
+</script>
+
+<style scoped>
+  .v-toolbar {
+    border-bottom: 1px solid;
+  }
+
+  .static {
+    position: static;
+  }
+</style>

From 627b2ed7fdc84994d8a430e0a92f32d3c9a828f2 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 29 Feb 2020 23:33:20 +0100
Subject: [PATCH 07/85] Improved text on home & implemented new CardView

---
 frontend/src/views/Home.vue | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
index fbfe424792..7b14bb5c6b 100644
--- a/frontend/src/views/Home.vue
+++ b/frontend/src/views/Home.vue
@@ -1,17 +1,20 @@
 <template>
-  <v-card>
-    <v-toolbar dense color="blue-grey lighten-5">
-      <v-toolbar-title>Home</v-toolbar-title>
-    </v-toolbar>
+  <card-view title="Herzlich willkommen bei eCamp" max-width="900">
     <v-list class="pt-0">
-      <v-list-item :to="{ name: 'camps' }">
+      <v-list-item v-if="loggedIn" :to="{ name: 'camps' }">
         <v-list-item-icon>
           <v-icon>mdi-format-list-bulleted-triangle</v-icon>
         </v-list-item-icon>
         <v-list-item-content>
-          <v-list-item-title>
-            Camp List
-          </v-list-item-title>
+          <v-list-item-title>Meine Camps</v-list-item-title>
+        </v-list-item-content>
+      </v-list-item>
+      <v-list-item v-if="!loggedIn" :to="{ name: 'login' }">
+        <v-list-item-icon>
+          <v-icon>mdi-login</v-icon>
+        </v-list-item-icon>
+        <v-list-item-content>
+          <v-list-item-title>Login</v-list-item-title>
         </v-list-item-content>
       </v-list-item>
       <v-list-item v-if="runningInDocker" href="http://localhost:3001/setup.php?dev-data" target="_blank">
@@ -41,13 +44,19 @@
         </v-list-item-content>
       </v-list-item>
     </v-list>
-  </v-card>
+  </card-view>
 </template>
 
 <script>
+import CardView from '../components/CardView'
+
 export default {
   name: 'Home',
+  components: { CardView },
   computed: {
+    loggedIn () {
+      return this.$auth.isLoggedIn()
+    },
     runningInDocker () {
       return process.env.VUE_APP_RUNNING_IN_DOCKER
     }
@@ -56,9 +65,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .v-application--is-ltr {
-    .v-list-item__action:first-child, .v-list-item__icon:first-child {
-      margin-right: 20px;
-    }
-  }
 </style>

From 9da48b4d8a3b921e683d4ab7598609f1af4b0484 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 29 Feb 2020 23:51:09 +0100
Subject: [PATCH 08/85] Added searchbar (only mockup)

---
 frontend/src/components/Search.vue | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 frontend/src/components/Search.vue

diff --git a/frontend/src/components/Search.vue b/frontend/src/components/Search.vue
new file mode 100644
index 0000000000..e884674ad4
--- /dev/null
+++ b/frontend/src/components/Search.vue
@@ -0,0 +1,28 @@
+<template>
+  <v-responsive :max-width="searchFocused ? 350 : 200" class="align-center transition-swing">
+    <v-text-field rounded
+                  hide-details solo
+                  dark label="Suchen…"
+                  solo-inverted single-line
+                  flat class="align-center px-2"
+                  append-icon="mdi-magnify"
+                  @focus="searchFocused = true"
+                  @blur="searchFocused = false"
+                  color="white" dense />
+  </v-responsive>
+</template>
+
+<script>
+export default {
+  name: 'GlobalSearch',
+  data () {
+    return {
+      searchFocused: false
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

From 2d86c293f9d626df4900e144867b9db5e5ec3a2c Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 29 Feb 2020 23:51:37 +0100
Subject: [PATCH 09/85] Fixed styling

---
 frontend/src/components/form/ApiInput.vue | 122 +++++++++++-----------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/frontend/src/components/form/ApiInput.vue b/frontend/src/components/form/ApiInput.vue
index 004ba6a0c9..1d13a66c2a 100644
--- a/frontend/src/components/form/ApiInput.vue
+++ b/frontend/src/components/form/ApiInput.vue
@@ -4,64 +4,59 @@ You can two-way bind to the value using v-model.
 -->
 
 <template>
-  <span>
-    <span v-if="!editing">{{ value }}</span>
-    <span v-if="editing">
-      <v-form
-        inline
-        class="mb-2">
-
-        <v-text-field
-          id="api-input"
-          v-model="localValue"
-          :label="label"
-          name="api-input"
-          class="mr-2 ml-2"
-          :error-messages="errorMessage"
-          :state="required && $v.localValue.$dirty ? !$v.localValue.$error : null"
-          v-bind="$attrs"
-          required
-          @input="onInput"
-          @blur="$v.localValue.$touch()">
-
-          <template slot="append-outer">
-            <v-btn
-              v-if="!autoSave"
-              small
-              color="warning"
-              class="mb-1"
-              @click="reset">
-
-              Reset
-            </v-btn>
-
-            <v-btn
-              color="primary"
-              small
-              :disabled="isSaving || (required && $v.localValue.$invalid)"
-              class="mr-2 ml-2 mb-1"
-              @click="save">
-
-              <v-progress-circular
-                v-if="isSaving"
-                indeterminate
-                color="primary"
-                size="20"
-                class="mr-2" />
-
-              <v-icon
-                v-if="showSuccessIcon"
-                left>
-                mdi-check</v-icon>
-
-              Save
-            </v-btn>
-          </template>
-        </v-text-field>
-
-      </v-form>
-    </span>
-  </span>
+  <div class="mb-4">
+    <v-text-field v-if="!editing" :label="label"
+                  hide-details="auto"
+                  v-model="value" readonly />
+    <v-text-field
+      v-if="editing"
+      class="api-input"
+      v-model="localValue"
+      :label="label"
+      name="api-input"
+      hide-details="auto"
+      :error-messages="errorMessage"
+      :state="required && $v.localValue.$dirty ? !$v.localValue.$error : null"
+      v-bind="$attrs"
+      required
+      @input="onInput"
+      @blur="$v.localValue.$touch()">
+
+      <template slot="append-outer">
+        <v-btn
+          v-if="!autoSave"
+          small
+          color="warning"
+          class="mb-0"
+          @click="reset">
+
+          Reset
+        </v-btn>
+
+        <v-btn
+          small color="primary"
+          :disabled="isSaving || (required && $v.localValue.$invalid)"
+          class="mb-0"
+          @click="save">
+
+          <v-progress-circular
+            v-if="isSaving"
+            indeterminate
+            color="primary"
+            size="20"
+            class="mr-2" />
+
+          <v-icon
+            v-if="showSuccessIcon"
+            left>
+            mdi-check
+          </v-icon>
+
+          Save
+        </v-btn>
+      </template>
+    </v-text-field>
+  </div>
 </template>
 
 <script>
@@ -162,7 +157,9 @@ export default {
         this.$v.localValue.$reset()
 
         this.showSuccessIcon = true
-        setTimeout(() => { this.showSuccessIcon = false }, 2000)
+        setTimeout(() => {
+          this.showSuccessIcon = false
+        }, 2000)
       })
     }
   }
@@ -170,7 +167,10 @@ export default {
 </script>
 
 <style scoped>
-  .dirty{
-    border:1px red solid;
+  .dirty {
+    border: 1px red solid;
+  }
+  .api-input ::v-deep .v-input__append-outer {
+    margin-bottom: 0;
   }
 </style>

From 11f76f2e69ec4a5a0ebd2064856e4e17aec7ef3d Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:08:36 +0100
Subject: [PATCH 10/85] Added CardView and readonly api input

---
 frontend/src/components/camp/Basic.vue | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/camp/Basic.vue b/frontend/src/components/camp/Basic.vue
index eb5428ea05..3f5f3a9de5 100644
--- a/frontend/src/components/camp/Basic.vue
+++ b/frontend/src/components/camp/Basic.vue
@@ -3,24 +3,15 @@ Displays details on a single camp and allows to edit them.
 -->
 
 <template>
-  <v-card>
-    <v-toolbar dense color="blue-grey lighten-5">
-      <v-icon left>
-        mdi-cogs
-      </v-icon>
-      <v-toolbar-title>
-        Einstellungen
-      </v-toolbar-title>
-      <v-spacer />
-    </v-toolbar>
+  <card-view title="Admin">
     <v-skeleton-loader v-if="camp()._meta.loading" type="article" />
     <v-card-text v-else>
       <v-form>
-        <v-text-field
+        <api-input
           label="Name"
-          readonly
-          :value="camp().name"
-          class="mr-2 ml-2" />
+          :editing="false"
+          fieldname="name"
+          :value="camp().name"/>
         <api-input
           :value="camp().title"
           :uri="camp()._meta.self"
@@ -46,14 +37,15 @@ Displays details on a single camp and allows to edit them.
         </v-list>
       </v-form>
     </v-card-text>
-  </v-card>
+  </card-view>
 </template>
 
 <script>
+import CardView from '../CardView'
 import ApiInput from '../form/ApiInput'
 export default {
   name: 'Basic',
-  components: { ApiInput },
+  components: { CardView, ApiInput },
   props: {
     camp: { type: Function, required: true }
   },

From bb796aee9439c4e32558b0ab64b7b22b06f5d838 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:11:56 +0100
Subject: [PATCH 11/85] Implemented CardView

---
 .../src/components/camp/Collaborators.vue     | 260 +++++++++---------
 1 file changed, 123 insertions(+), 137 deletions(-)

diff --git a/frontend/src/components/camp/Collaborators.vue b/frontend/src/components/camp/Collaborators.vue
index 5dc6d2ef30..15fc16f4a5 100644
--- a/frontend/src/components/camp/Collaborators.vue
+++ b/frontend/src/components/camp/Collaborators.vue
@@ -2,39 +2,136 @@
 Displays collaborators of a single camp.
 -->
 <template>
-  <v-card>
-    <v-toolbar dense color="blue-grey lighten-5">
-      <v-icon left>
-        mdi-account-group
-      </v-icon>
-      <v-toolbar-title>Mitarbeiter</v-toolbar-title>
-    </v-toolbar>
-    <v-card-text>
+  <card-view title="Team">
+    <v-simple-table width="100%">
+      <thead>
+        <tr>
+          <th width="50%">
+            User
+          </th>
+          <th width="25%">
+            Rolle
+          </th>
+          <th width="25%">
+            Option
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr
+          v-for="collaborator in establishedCollaborators"
+          :key="collaborator._meta.self">
+          <td>
+            <v-skeleton-loader v-if="collaborator.user()._meta.loading" type="text" />
+            {{ collaborator.user().username }}
+          </td>
+          <td>
+            <api-single-select
+              :value="collaborator.role"
+              :uri="collaborator._meta.self"
+              fieldname="role"
+              required
+              dense />
+          </td>
+          <td
+            style="white-space: nowrap">
+            <v-btn
+              small
+              color="warning"
+              @click="api.del(collaborator)">
+              <v-icon
+                small
+                left>
+                mdi-close
+              </v-icon>
+              delete
+            </v-btn>
+          </td>
+        </tr>
+      </tbody>
+    </v-simple-table>
+
+    <div v-if="requestedCollaborators.length > 0">
+      <h3 class="mt-4">
+        Offene Anfragen
+      </h3>
+      <v-simple-table width="100%">
+        <tr>
+          <th width="50%">
+            User
+          </th>
+          <th width="25%">
+            Rolle
+          </th>
+          <th width="25%">
+            Option
+          </th>
+        </tr>
+        <tr
+          v-for="collaborator in requestedCollaborators"
+          :key="collaborator.id">
+          <td>{{ collaborator.user().username }}</td>
+          <td>
+            <api-single-select
+              :value="collaborator.role"
+              :uri="collaborator._meta.self"
+              fieldname="role"
+              required
+              dense />
+          </td>
+          <td
+            style="white-space: nowrap">
+            <v-btn
+              small
+              color="success"
+              @click="changeStatus(collaborator, 'established')">
+              <v-icon
+                small
+                left>
+                mdi-check
+              </v-icon>
+              accept
+            </v-btn>
+            <v-btn
+              small
+              color="warning"
+              @click="changeStatus(collaborator, 'unrelated')">
+              <v-icon
+                small
+                left>
+                mdi-close
+              </v-icon>
+              deny
+            </v-btn>
+          </td>
+        </tr>
+      </v-simple-table>
+      <v-divider />
+    </div>
+
+    <div v-if="invitedCollaborators.length > 0">
+      <h3 class="mt-4">
+        Offene Einladungen
+      </h3>
       <v-simple-table width="100%">
         <thead>
           <tr>
-            <th
-              width="50%">
+            <th width="50%">
               User
             </th>
-            <th
-              width="25%">
+            <th width="25%">
               Rolle
             </th>
-            <th
-              width="25%">
+            <th width="25%">
               Option
             </th>
           </tr>
         </thead>
         <tbody>
           <tr
-            v-for="collaborator in establishedCollaborators"
-            :key="collaborator._meta.self">
-            <td>
-              <v-skeleton-loader v-if="collaborator.user()._meta.loading" type="text" />
-              {{ collaborator.user().username }}
-            </td>
+            v-for="collaborator in invitedCollaborators"
+            :key="collaborator.id">
+            <td>{{ collaborator.user().username }}</td>
             <td>
               <api-single-select
                 :value="collaborator.role"
@@ -60,124 +157,10 @@ Displays collaborators of a single camp.
           </tr>
         </tbody>
       </v-simple-table>
-
       <v-divider />
+    </div>
 
-      <div v-if="requestedCollaborators.length > 0">
-        <h3 class="mt-4">
-          Offene Anfragen
-        </h3>
-        <v-simple-table width="100%">
-          <tr>
-            <th
-              width="50%">
-              User
-            </th>
-            <th
-              width="25%">
-              Rolle
-            </th>
-            <th
-              width="25%">
-              Option
-            </th>
-          </tr>
-          <tr
-            v-for="collaborator in requestedCollaborators"
-            :key="collaborator.id">
-            <td>{{ collaborator.user().username }}</td>
-            <td>
-              <api-single-select
-                :value="collaborator.role"
-                :uri="collaborator._meta.self"
-                fieldname="role"
-                required
-                dense />
-            </td>
-            <td
-              style="white-space: nowrap">
-              <v-btn
-                small
-                color="success"
-                @click="changeStatus(collaborator, 'established')">
-                <v-icon
-                  small
-                  left>
-                  mdi-check
-                </v-icon>
-                accept
-              </v-btn>
-              <v-btn
-                small
-                color="warning"
-                @click="changeStatus(collaborator, 'unrelated')">
-                <v-icon
-                  small
-                  left>
-                  mdi-close
-                </v-icon>
-                deny
-              </v-btn>
-            </td>
-          </tr>
-        </v-simple-table>
-        <v-divider />
-      </div>
-
-      <div v-if="invitedCollaborators.length > 0">
-        <h3 class="mt-4">
-          Offene Einladungen
-        </h3>
-        <v-simple-table width="100%">
-          <thead>
-            <tr>
-              <th
-                width="50%">
-                User
-              </th>
-              <th
-                width="25%">
-                Rolle
-              </th>
-              <th
-                width="25%">
-                Option
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr
-              v-for="collaborator in invitedCollaborators"
-              :key="collaborator.id">
-              <td>{{ collaborator.user().username }}</td>
-              <td>
-                <api-single-select
-                  :value="collaborator.role"
-                  :uri="collaborator._meta.self"
-                  fieldname="role"
-                  required
-                  dense />
-              </td>
-              <td
-                style="white-space: nowrap">
-                <v-btn
-                  small
-                  color="warning"
-                  @click="api.del(collaborator)">
-                  <v-icon
-                    small
-                    left>
-                    mdi-close
-                  </v-icon>
-                  delete
-                </v-btn>
-              </td>
-            </tr>
-          </tbody>
-        </v-simple-table>
-        <v-divider />
-      </div>
-
+    <v-card-text>
       <h3 class="mt-4">
         Einladen
       </h3>
@@ -226,12 +209,15 @@ Displays collaborators of a single camp.
         </tr>
       </v-simple-table>
     </v-card-text>
-  </v-card>
+  </card-view>
 </template>
 <script>
+import CardView from '../CardView'
+
 export default {
   name: 'Collaborators',
   components: {
+    CardView,
     ApiSingleSelect: () => import('@/components/form/ApiSingleSelect.vue')
   },
   props: {

From 2abb0a72fc665fe0d638d3d15e0d3f9d1c0dd025 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:13:23 +0100
Subject: [PATCH 12/85] Added username similar as to isLoggedin

---
 frontend/src/auth.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/auth.js b/frontend/src/auth.js
index f25e3ab969..54d8b6c10f 100644
--- a/frontend/src/auth.js
+++ b/frontend/src/auth.js
@@ -14,6 +14,10 @@ function isLoggedIn () {
   return get().auth().role === 'user'
 }
 
+function username () {
+  return get().auth().username
+}
+
 export async function refreshLoginStatus (forceReload = true) {
   if (forceReload) reload(get().auth())
   await get().auth()._meta.load
@@ -55,7 +59,7 @@ async function logout () {
   return reload(get().auth().logout())._meta.load.then(() => refreshLoginStatus())
 }
 
-export const auth = { isLoggedIn, refreshLoginStatus, login, register, loginGoogle, loginPbsMiData, logout }
+export const auth = { isLoggedIn, username, refreshLoginStatus, login, register, loginGoogle, loginPbsMiData, logout }
 
 Object.defineProperties(Vue.prototype, {
   $auth: {

From 7db9c591629d49c4bafe373e43c40bab0cfa63db Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:14:11 +0100
Subject: [PATCH 13/85] Added loading filter (probably not yet correctly
 implemented, but works for now)

---
 frontend/src/main.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/src/main.js b/frontend/src/main.js
index 119a09a13d..1f2738ac3a 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -8,6 +8,13 @@ import vuetify from './plugins/vuetify'
 Vue.component('empty-layout', () => import('./layouts/EmptyLayout'))
 Vue.component('default-layout', () => import('./layouts/DefaultLayout'))
 Vue.component('camp-layout', () => import('./layouts/CampLayout'))
+Vue.filter('loading', function (value, loadingState) {
+  if (typeof value === 'function' && value().loading) {
+    return loadingState
+  } else {
+    return value
+  }
+})
 
 new Vue({
   router,

From 249af6bcbf4796d82eea5bee726c7c3222ccb62d Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:16:04 +0100
Subject: [PATCH 14/85] Improved frontend-routing

---
 frontend/src/router.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/frontend/src/router.js b/frontend/src/router.js
index 44391dcb04..e563890b78 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -38,6 +38,12 @@ export default new Router({
       component: () => import(/* webpackChunkName: "about" */ './views/Home.vue'),
       beforeEnter: requireAuth
     },
+    {
+      path: '/profile',
+      name: 'profile',
+      component: () => import(/* webpackChunkName: "about" */ './views/Profile.vue'),
+      beforeEnter: requireAuth
+    },
     {
       path: '/camps',
       name: 'camps',
@@ -50,11 +56,12 @@ export default new Router({
       path: '/camps/:campId/:campTitle?',
       components: {
         default: () => import(/* webpackChunkName: "camp" */ './views/Camp.vue'),
-        aside: () => import(/* webpackChunkName: "camps" */ './views/Camps.vue')
+        aside: () => import(/* webpackChunkName: "periods" */ './views/Periods.vue')
       },
       beforeEnter: requireAuth,
       props: {
-        default: route => ({ camp: campFromRoute(route) })
+        default: route => ({ camp: campFromRoute(route) }),
+        aside: route => ({ camp: campFromRoute(route) })
       },
       children: [
         {
@@ -64,20 +71,20 @@ export default new Router({
           meta: { layout: 'camp' }
         },
         {
-          path: 'periods',
-          name: 'camp/periods',
-          component: () => import(/* webpackChunkName: "campPeriods" */ './components/camp/Periods.vue'),
-          meta: { layout: 'camp' }
+          path: '',
+          name: 'camp',
+          redirect: { name: 'camp/picasso' }
         },
         {
           path: 'picasso',
           name: 'camp/picasso',
+          alias: '',
           component: () => import(/* webpackChunkName: "campPicasso" */ './components/camp/CampPicasso.vue'),
           meta: { layout: 'camp' }
         },
         {
-          path: '',
-          name: 'camp',
+          path: 'admin',
+          name: 'camp/admin',
           component: () => import(/* webpackChunkName: "campDetails" */ './components/camp/Basic.vue'),
           meta: { layout: 'camp' }
         }

From a1f6ca8dc5f0a843eaf1ac983568cf44ecdf59b8 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:16:43 +0100
Subject: [PATCH 15/85] Implemented CardView

---
 frontend/src/views/Camps.vue | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/Camps.vue b/frontend/src/views/Camps.vue
index 21b58b7fc7..a82eb59185 100644
--- a/frontend/src/views/Camps.vue
+++ b/frontend/src/views/Camps.vue
@@ -1,10 +1,10 @@
 <template>
-  <v-card>
-    <v-toolbar dense color="blue-grey lighten-5">
-      <v-toolbar-title>Camps</v-toolbar-title>
-    </v-toolbar>
+  <card-view title="Meine Camps" max-width="600">
     <v-list class="py-0">
-      <v-skeleton-loader v-if="camps._meta.loading" type="list-item-two-line" />
+      <template v-if="camps._meta.loading">
+        <v-skeleton-loader type="list-item-two-line" height="64"/>
+        <v-skeleton-loader type="list-item-two-line" height="64"/>
+      </template>
       <v-list-item
         v-for="camp in camps.items"
         :key="camp.id"
@@ -27,15 +27,18 @@
         </v-list-item-action>
       </v-list-item>
     </v-list>
-  </v-card>
+  </card-view>
 </template>
 
 <script>
-
 import { campRoute } from '@/router'
+const CardView = () => import('../components/CardView.vue')
 
 export default {
   name: 'Camps',
+  components: {
+    CardView
+  },
   computed: {
     camps () {
       return this.api.get().camps()

From 9c5bdc525a96996af77f9e9153a0cf67123be30d Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:17:10 +0100
Subject: [PATCH 16/85] Changed import style

---
 frontend/src/views/DayPicasso.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/DayPicasso.vue b/frontend/src/views/DayPicasso.vue
index 7031ed0f0d..00a47bdb48 100644
--- a/frontend/src/views/DayPicasso.vue
+++ b/frontend/src/views/DayPicasso.vue
@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import Picasso from '@/components/Picasso'
+import Picasso from '../components/Picasso'
 export default {
   name: 'DayPicasso',
   components: { Picasso },

From 9f9e9f70586ca583c4daaa5d4329751e12dce0b7 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:17:26 +0100
Subject: [PATCH 17/85] Implemented CardView

---
 frontend/src/views/Event.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/Event.vue b/frontend/src/views/Event.vue
index f7e511bc77..3eb6f98efd 100644
--- a/frontend/src/views/Event.vue
+++ b/frontend/src/views/Event.vue
@@ -3,7 +3,7 @@ Displays a single event
 -->
 
 <template>
-  <v-card>
+  <card-view>
     <v-toolbar dense>
       <v-btn icon @click="$router.go(-1)">
         <v-icon>mdi-arrow-left</v-icon>
@@ -44,13 +44,16 @@ Displays a single event
         </v-list>
       </template>
     </v-card-text>
-  </v-card>
+  </card-view>
 </template>
 
 <script>
+import CardView from '../components/CardView'
+
 export default {
   name: 'Event',
   components: {
+    CardView,
     ApiInput: () => import('@/components/form/ApiInput.vue')
   },
   props: {

From 546084a197682a97e418fbf525915c5a8a470d54 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:18:01 +0100
Subject: [PATCH 18/85] Changed Periods from Component to View

---
 frontend/src/views/Periods.vue | 51 ++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 frontend/src/views/Periods.vue

diff --git a/frontend/src/views/Periods.vue b/frontend/src/views/Periods.vue
new file mode 100644
index 0000000000..7060a00240
--- /dev/null
+++ b/frontend/src/views/Periods.vue
@@ -0,0 +1,51 @@
+<!--
+Displays periods of a single camp.
+-->
+
+<template>
+  <v-card>
+    <v-subheader class="text-uppercase subtitle-2">
+      Periods
+    </v-subheader>
+    <v-list>
+      <v-list-item
+        v-for="period in periods.items"
+        :key="period._meta.self"
+        two-line>
+        <v-list-item-content>
+          <v-list-item-title>{{ period.description }}</v-list-item-title>
+          <v-list-item-subtitle>{{ period.start }} - {{ period.end }}</v-list-item-subtitle>
+        </v-list-item-content>
+      </v-list-item>
+    </v-list>
+  </v-card>
+</template>
+<script>
+import { eventInstanceRoute } from '@/router'
+
+export default {
+  name: 'CampPeriods',
+  props: {
+    camp: { type: Function, required: true }
+  },
+  data () {
+    return {
+      editing: false,
+      messages: []
+    }
+  },
+  computed: {
+    periods () {
+      return this.camp().periods()
+    },
+    events () {
+      return this.camp().events()
+    }
+  },
+  methods: {
+    eventInstanceRoute (eventInstance) {
+      return eventInstanceRoute(this.camp(), eventInstance)
+    }
+  }
+}
+</script>

From cf46642f0e1db024f0f7a9072c646e4a3085c4cd Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:19:23 +0100
Subject: [PATCH 19/85] Added profile with email (read-only) TODO: Implement
 backend-methods to change e-mail address

---
 frontend/src/views/Profile.vue | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 frontend/src/views/Profile.vue

diff --git a/frontend/src/views/Profile.vue b/frontend/src/views/Profile.vue
new file mode 100644
index 0000000000..d02baa3230
--- /dev/null
+++ b/frontend/src/views/Profile.vue
@@ -0,0 +1,31 @@
+<template>
+  <card-view :title="'Profil: ' + profile.username" max-width="900">
+    <v-col>
+      <api-input
+        label="Email"
+        :uri="profile._meta.self"
+        fieldname="mail"
+        :value="profile.mail"
+        :editing="false"
+        required />
+    </v-col>
+  </card-view>
+</template>
+
+<script>
+import ApiInput from '../components/form/ApiInput'
+
+const CardView = () => import('../components/CardView')
+export default {
+  name: 'Home',
+  components: { ApiInput, CardView },
+  computed: {
+    profile () {
+      return this.api.get().profile()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>

From 2ba69adfd77986b7e6c089e254e6c72fadffdab5 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:20:08 +0100
Subject: [PATCH 20/85] Changed background color to standard material color

---
 frontend/src/scss/global.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/scss/global.scss b/frontend/src/scss/global.scss
index fda2ba9613..eaf5e0bce3 100644
--- a/frontend/src/scss/global.scss
+++ b/frontend/src/scss/global.scss
@@ -6,6 +6,9 @@
 @include inter-ui.weight-600;
 body {font-feature-settings: "ss03", "calt", "rlig", "kern"}
 .v-toolbar__title {font-weight: 500;}
+.theme--light.v-application {
+	background: #546E7A!important;
+}
 .v-skeleton-loader__actions,
 .v-skeleton-loader__article,
 .v-skeleton-loader__card-heading,

From 4c437d8a6725780af83611cf690c8d0a4f7f7a1c Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:22:27 +0100
Subject: [PATCH 21/85] Implemented CardView and optimized for mobile with
 toggle between picasso (calendar-view) and listview

---
 frontend/src/components/camp/CampPicasso.vue | 116 +++++++++++++++----
 frontend/src/components/camp/Periods.vue     |  69 -----------
 2 files changed, 92 insertions(+), 93 deletions(-)
 delete mode 100644 frontend/src/components/camp/Periods.vue

diff --git a/frontend/src/components/camp/CampPicasso.vue b/frontend/src/components/camp/CampPicasso.vue
index 200f52c61d..a27320b0bb 100644
--- a/frontend/src/components/camp/CampPicasso.vue
+++ b/frontend/src/components/camp/CampPicasso.vue
@@ -3,45 +3,95 @@ Listing all event instances of a single period.
 -->
 
 <template>
-  <v-card>
-    <v-toolbar dense class="mb-3" color="blue-grey lighten-5">
-      <v-icon left>
-        mdi-account-group
-      </v-icon>
-      <v-toolbar-title class="overflow-visible">
-        Picasso
-      </v-toolbar-title>
-      <v-tabs v-model="tab" right
-              center-active background-color="blue-grey lighten-5">
-        <v-tab v-for="period in periods.items"
-               :key="period.id">
-          {{ period.description }}
-        </v-tab>
-      </v-tabs>
-    </v-toolbar>
-    <v-tabs-items v-model="tab">
-      <v-tab-item v-for="period in periods.items"
-                  :key="period.id">
+  <card-view>
+    <div v-for="period in periods.items"
+         :key="period.id">
+      <v-app-bar v-if="$vuetify.breakpoint.xs"
+                 dense fixed
+                 color="white"
+                 style="z-index: 300"
+                 :tile="false" class="ma-2 px-3">
+        <v-btn v-if="searchOpen" icon @click="searchOpen = false">
+          <v-icon>mdi-chevron-left</v-icon>
+        </v-btn>
+        <v-text-field
+          hide-details
+          :label="searchOpen ? 'Suchen' : 'Events & Camps suchen'"
+          single-line
+          @click="searchOpen = !searchOpen" />
+        <router-link :to="{name: 'profile'}">
+          <v-avatar size="32" class="ml-4">
+            <img
+              alt="Avatar"
+              src="https://avatars0.githubusercontent.com/u/9064066?v=4&s=460">
+          </v-avatar>
+        </router-link>
+      </v-app-bar>
+      <v-dialog
+        v-model="searchOpen"
+        style="z-index: 4"
+        overlay-color="white" hide-overlay
+        fullscreen transition="dialog-top-transition">
+        <v-card>
+          <v-sheet v-if="$vuetify.breakpoint.xs" height="70" />
+          <v-card-text>
+            <v-skeleton-loader class="mx-4" boilerplate type="list-item-two-line@3" />
+          </v-card-text>
+        </v-card>
+      </v-dialog>
+      <v-sheet v-if="$vuetify.breakpoint.xs" height="56" />
+      <v-sheet>
+        <v-btn
+          :fixed="$vuetify.breakpoint.xs"
+          :absolute="!$vuetify.breakpoint.xs"
+          light class="fab--top_nav"
+          fab small
+          style="z-index: 3"
+          top right
+          :class="{'float-right':!$vuetify.breakpoint.xs}"
+          color="white"
+          @click="picassoFormat = !picassoFormat">
+          <v-icon v-if="picassoFormat">mdi-menu</v-icon>
+          <v-icon v-else>mdi-calendar-month</v-icon>
+        </v-btn>
         <picasso
+          v-if="picassoFormat"
           :camp="camp"
+          class="mx-2 ma-sm-0 pa-sm-2"
           :event-instances="period.event_instances().items"
           :start="new Date(Date.parse(period.start))"
           :end="new Date(Date.parse(period.end))" />
-      </v-tab-item>
-    </v-tabs-items>
-  </v-card>
+        <event-list v-else
+                    :camp="camp" :event-instances="period.event_instances().items" />
+        <v-btn
+          :fixed="$vuetify.breakpoint.xs"
+          :absolute="!$vuetify.breakpoint.xs"
+          dark
+          fab
+          style="z-index: 3"
+          bottom
+          right
+          class="fab--bottom_nav float-right"
+          color="red">
+          <v-icon>mdi-plus</v-icon>
+        </v-btn>
+      </v-sheet>
+    </div>
+  </card-view>
 </template>
 <script>
-import Picasso from '@/components/Picasso'
+import CardView from '../CardView'
 
 export default {
   name: 'CampPicassso',
-  components: { Picasso },
+  components: { CardView, Picasso: () => import('../Picasso'), EventList: () => import('../EventList') },
   props: {
     camp: { type: Function, required: true }
   },
   data () {
     return {
+      searchOpen: false,
+      picassoFormat: true,
       tab: null
     }
   },
@@ -55,3 +105,21 @@ export default {
   }
 }
 </script>
+
+<style lang="scss">
+  .fab--bottom_nav {
+    position: fixed;
+    bottom: 16px + 56px !important;
+    @media #{map-get($display-breakpoints, 'sm-and-up')}{
+      bottom: 16px + 36px !important;
+    }
+  }
+
+  .fab--top_nav {
+    position: fixed;
+    top: 16px + 105px !important;
+    @media #{map-get($display-breakpoints, 'sm-and-up')}{
+      top: 16px + 65px !important;
+    }
+  }
+</style>
diff --git a/frontend/src/components/camp/Periods.vue b/frontend/src/components/camp/Periods.vue
deleted file mode 100644
index 3a0be17d33..0000000000
--- a/frontend/src/components/camp/Periods.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--
-Displays periods of a single camp.
--->
-
-<template>
-  <v-card>
-    <div
-      v-for="period in periods.items" :key="period.id">
-      <v-list-item two-line>
-        <v-list-item-content>
-          <v-list-item-title class="headline">
-            {{ period.description }}
-          </v-list-item-title>
-          <v-list-item-subtitle>{{ period.start }} - {{ period.end }}</v-list-item-subtitle>
-        </v-list-item-content>
-      </v-list-item>
-      <v-list dense>
-        <template v-for="eventInstance in period.event_instances().items">
-          <v-skeleton-loader
-            v-if="eventInstance.event()._meta.loading"
-            :key="eventInstance._meta.self"
-            type="list-item-avatar-two-line" height="60" />
-          <v-list-item
-            v-else
-            :key="eventInstance._meta.self"
-            two-line
-            :to="eventInstanceRoute(eventInstance)">
-            <v-chip class="mr-2" :color="eventInstance.event().event_category().color.toString()">{{ eventInstance.event().event_category().short }}</v-chip>
-            <v-list-item-content>
-              <v-list-item-title>{{ eventInstance.event().title }}</v-list-item-title>
-              <v-list-item-subtitle>{{ eventInstance.start_time }} - {{ eventInstance.end_time }}</v-list-item-subtitle>
-            </v-list-item-content>
-          </v-list-item>
-        </template>
-      </v-list>
-      <v-divider />
-    </div>
-    <v-spacer />
-  </v-card>
-</template>
-<script>
-import { eventInstanceRoute } from '@/router'
-
-export default {
-  name: 'Periods',
-  props: {
-    camp: { type: Function, required: true }
-  },
-  data () {
-    return {
-      editing: false,
-      messages: []
-    }
-  },
-  computed: {
-    periods () {
-      return this.camp().periods()
-    },
-    events () {
-      return this.camp().events()
-    }
-  },
-  methods: {
-    eventInstanceRoute (eventInstance) {
-      return eventInstanceRoute(this.camp(), eventInstance)
-    }
-  }
-}
-</script>

From 04e573275e7527a73a012038d179c92cab2977b5 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:23:12 +0100
Subject: [PATCH 22/85] Created navigation that is more consistent

---
 frontend/src/layouts/CampLayout.vue    | 165 ++++++++++++-------------
 frontend/src/layouts/DefaultLayout.vue | 148 ++++++++++++----------
 2 files changed, 160 insertions(+), 153 deletions(-)

diff --git a/frontend/src/layouts/CampLayout.vue b/frontend/src/layouts/CampLayout.vue
index a09a1ce3ac..2e7167e7db 100644
--- a/frontend/src/layouts/CampLayout.vue
+++ b/frontend/src/layouts/CampLayout.vue
@@ -1,19 +1,19 @@
 <template>
-  <v-app style="background: #90A4AE">
+  <v-app>
     <!-- left side drawer (desktop)-->
     <v-navigation-drawer v-if="$vuetify.breakpoint.smAndUp"
                          v-model="drawer" app
                          clipped permanent
                          :mini-variant.sync="mini"
                          mini-variant-width="40"
-                         color="grey lighten-2">
+                         color="blue-grey lighten-4">
       <v-btn v-if="mini" icon>
         <v-icon>mdi-format-list-bulleted-triangle</v-icon>
       </v-btn>
       <v-spacer />
       <v-btn v-if="!mini" icon
              fixed
-             class="ma-2"
+             class="ec-drawer-collapse ma-2"
              style="z-index: 10;"
              right @click.stop="mini = !mini">
         <v-icon>mdi-chevron-left</v-icon>
@@ -27,72 +27,72 @@
     <!-- second menu/tool bar -->
     <v-app-bar v-if="$vuetify.breakpoint.smAndUp"
                app
-               clipped-left hide-on-scroll
+               clipped-left
                color="blue-grey darken-4" dark>
+
       <v-toolbar-items>
-        <v-btn icon
-               large
-               exact
-               class="title"
-               :to="{name: 'home'}">
-          ⛺
+        <v-btn text class="px-2"
+               min-width="0" rounded
+               exact :to="{ name: 'home'}">
+          <v-toolbar-title>
+            <i>🏕</i>️
+          </v-toolbar-title>
+        </v-btn>
+        <v-btn text class="justify-start px-2"
+               exact :to="campRoute(camp(), 'picasso')"
+               width="216">
+          <v-toolbar-title>
+            {{ camp().title | loading('Camp wird geladen…') }}
+          </v-toolbar-title>
         </v-btn>
       </v-toolbar-items>
 
-      <v-overflow-btn class="my-2 ec-campselect"
-                      label="Camp lädt"
-                      :editable="editableCampButton" single-line
-                      :items="lastCamps.items"
-                      item-text="title" item-value="id"
-                      :value="camp().id"
-                      hide-details return-object
-                      readonly
-                      @change="changeCamp"
-                      @blur="editableCampButton = false"
-                      @click:append.capture="editableCampButton = !editableCampButton">
-        <template v-slot:selection="data">
-          <div class="v-select__selection v-select__selection--comma v-toolbar__title"
-               @mousedown="$router.push(campRoute(data.item))">
-            {{ data.item.title }}
-          </div>
-        </template>
-      </v-overflow-btn>
-
       <v-toolbar-items>
-        <v-btn text :to="campRoute(camp(), 'periods')">
-          <v-icon :left="$vuetify.breakpoint.mdAndUp">mdi-calendar-text</v-icon>
-          <span class="sr-only-sm-and-down">Events</span>
-        </v-btn>
-        <v-btn text :to="campRoute(camp(), 'picasso')">
-          <v-icon :left="$vuetify.breakpoint.mdAndUp">mdi-calendar-month</v-icon>
-          <span class="sr-only-sm-and-down">Picasso</span>
-        </v-btn>
         <v-btn text :to="campRoute(camp(), 'collaborators')">
           <v-icon :left="$vuetify.breakpoint.mdAndUp">mdi-account-group</v-icon>
           <span class="sr-only-sm-and-down">Team</span>
         </v-btn>
-        <v-btn text :to="campRoute(camp())" exact>
-          <v-icon :left="$vuetify.breakpoint.mdAndUp">mdi-information</v-icon>
+        <v-btn text :to="campRoute(camp(), 'admin')" exact>
+          <v-icon :left="$vuetify.breakpoint.mdAndUp">mdi-cogs</v-icon>
           <span class="sr-only-sm-and-down">Admin</span>
         </v-btn>
       </v-toolbar-items>
       <v-spacer />
-      <v-btn v-if="loggedIn" text
-             @click="logout">
-        <v-icon v-if="logoutIcon" :left="$vuetify.breakpoint.mdAndUp">{{ logoutIcon }}</v-icon>
-        <v-progress-circular v-else indeterminate
-                             size="18"
-                             class="mr-2" />
-        <span class="sr-only-sm-and-down">Log out</span>
-      </v-btn>
-      <v-btn v-else text
-             :to="{ name: 'login' }">
-        <v-icon :left="$vuetify.breakpoint.mdAndUp">mdi-login</v-icon>
-        <span class="sr-only-sm-and-down">Log in</span>
-      </v-btn>
-      <v-btn icon>
-        <v-icon>mdi-account</v-icon>
-      </v-btn>
+      <global-search/>
+      <v-menu offset-y dark
+              right content-class="ec-usermenu"
+              transition="slide-y-transition"
+              z-index="5">
+        <template v-slot:activator="{ on,value }">
+          <v-toolbar-items>
+            <v-btn right text
+                   :class="{ 'v-btn--open': value }" v-on="on">
+              <span v-if="loggedIn" class="sr-only-sm-and-down">
+              {{ username }}
+              </span>
+              <v-icon class="ma-2">mdi-account</v-icon>
+            </v-btn>
+          </v-toolbar-items>
+        </template>
+        <v-list dense class="user-nav"
+                light color="blue-grey lighten-5">
+          <v-list-item block
+                       exact :to="{ name: 'camps', params: { groupName: encodeURI('Pfadi Bewegung Schweiz') } }">
+            <v-icon left>mdi-format-list-bulleted-triangle</v-icon>
+            <span>Meine Camps</span>
+          </v-list-item>
+          <v-list-item v-if="loggedIn" block @click="logout">
+            <v-icon v-if="logoutIcon" left>{{ logoutIcon }}</v-icon>
+            <v-progress-circular v-else indeterminate
+                                 size="18" class="mr-2" />
+            <span>Log out</span>
+          </v-list-item>
+          <v-list-item v-else :to="{ name: 'login' }" block>
+            <v-icon left>mdi-login</v-icon>
+            <span>Log in</span>
+          </v-list-item>
+        </v-list>
+      </v-menu>
     </v-app-bar>
 
     <!-- main content -->
@@ -104,25 +104,25 @@
     </v-content>
 
     <v-bottom-navigation v-if="$vuetify.breakpoint.xs" fixed grow>
-      <v-btn :to="{name: 'camp'}" exact>
-        <span>{{ camp().name }}</span>
-        <v-icon>mdi-tent</v-icon>
+      <v-btn>
+        <span>Material</span>
+        <v-icon>mdi-package-variant</v-icon>
       </v-btn>
-      <v-btn :to="{name: 'camp/periods'}">
-        <span>Events</span>
-        <v-icon>mdi-calendar-text</v-icon>
+      <v-btn>
+        <span>Tasks</span>
+        <v-icon>mdi-format-list-checks</v-icon>
       </v-btn>
       <v-btn :to="{name: 'camp/picasso'}">
-        <span>Picasso</span>
-        <v-icon>mdi-calendar-month</v-icon>
+        <span>Camp</span>
+        <v-icon large>mdi-tent</v-icon>
       </v-btn>
       <v-btn :to="{name: 'camp/collaborators'}" exact>
         <span>Team</span>
         <v-icon>mdi-account-group</v-icon>
       </v-btn>
-      <v-btn :to="{name: 'home'}">
-        <span>Profile</span>
-        <v-icon>mdi-account</v-icon>
+      <v-btn :to="{name: 'camp/admin'}">
+        <span>Admin</span>
+        <v-icon>mdi-cogs</v-icon>
       </v-btn>
     </v-bottom-navigation>
 
@@ -136,8 +136,10 @@
 
 <script>
 import { campRoute, campFromRoute } from '@/router'
+import GlobalSearch from '../components/Search'
 
 export default {
+  components: { GlobalSearch },
   data () {
     return {
       editableCampButton: false,
@@ -155,6 +157,9 @@ export default {
     },
     camp () {
       return campFromRoute(this.$route)
+    },
+    username () {
+      return this.$auth.username()
     }
   },
   created () {
@@ -185,17 +190,18 @@ export default {
     margin-top: 116px;
   }
 
-  .ec-campselect .v-select__slot input {
-    font-size: 1.25rem;
+  .v-btn.ec-drawer-collapse {
+    right: 0;
   }
 
-  .ec-campselect {
-    flex: 0 1 300px;
+  .v-content {
+    height: 100vh;
+    position: relative;
   }
 
-  .ec-campselect.v-overflow-btn .v-input__control::before, .ec-campselect.v-overflow-btn .v-input__slot::before {
-    border: none;
-    height: 0;
+  .v-content__wrap {
+    overflow: scroll;
+    position: static;
   }
 
   @media #{map-get($display-breakpoints, 'sm-and-down')}{
@@ -218,17 +224,4 @@ export default {
       border: 0;
     }
   }
-
-  .ec-menu-left {
-    left: 0 !important;
-    font-feature-settings: 'tnum';
-  }
-
-  .theme--dark.v-overflow-btn {
-    &:hover, &.v-input--is-focused, &.v-select--is-menu-active {
-      .v-input__slot {
-        background: map-get($blue-grey, 'darken-3')
-      }
-    }
-  }
 </style>
diff --git a/frontend/src/layouts/DefaultLayout.vue b/frontend/src/layouts/DefaultLayout.vue
index a9ac222ada..83b0412e72 100644
--- a/frontend/src/layouts/DefaultLayout.vue
+++ b/frontend/src/layouts/DefaultLayout.vue
@@ -1,64 +1,54 @@
 <template>
-  <v-app style="background: #90A4AE">
-    <!-- left side drawer (desktop)-->
-    <v-navigation-drawer v-if="$vuetify.breakpoint.smAndUp"
-                         v-model="drawer" app
-                         clipped permanent
-                         :mini-variant.sync="mini"
-                         mini-variant-width="40"
-                         color="grey lighten-2">
-      <v-btn v-if="mini" icon>
-        <v-icon>mdi-format-list-bulleted-triangle</v-icon>
-      </v-btn>
-      <v-spacer />
-      <v-btn v-if="!mini" icon
-             fixed
-             class="ma-2"
-             style="z-index: 10;"
-             right @click.stop="mini = !mini">
-        <v-icon>mdi-chevron-left</v-icon>
-      </v-btn>
-
-      <v-divider />
-
-      <router-view v-if="!mini" name="aside" />
-    </v-navigation-drawer>
-
+  <v-app>
     <!-- second menu/tool bar -->
     <v-app-bar v-if="$vuetify.breakpoint.smAndUp"
                app
                clipped-left hide-on-scroll
                color="blue-grey darken-4" dark>
-      <v-toolbar-title class="pl-4 pr-4">
-        <i>🏕</i>️ eCamp
-      </v-toolbar-title>
       <v-toolbar-items>
-        <v-btn text
+        <v-btn text class="px-2"
                exact :to="{ name: 'home'}">
-          Home
-        </v-btn>
-        <v-btn text
-               :to="{ name: 'camps', params: { groupName: encodeURI('Pfadi Bewegung Schweiz') } }">
-          Camps
+          <v-toolbar-title>
+            <i>🏕</i>️<span class="ml-4 mr-2">eCamp<sup class="blue-grey--text">v3</sup></span>
+          </v-toolbar-title>
         </v-btn>
       </v-toolbar-items>
       <v-spacer />
-      <v-btn v-if="loggedIn" text
-             @click="logout">
-        <v-icon v-if="logoutIcon" :left="$vuetify.breakpoint.mdAndUp">{{ logoutIcon }}</v-icon>
-        <v-progress-circular v-else indeterminate
-                             size="18"
-                             class="mr-2" />
-        <span class="sr-only-sm-and-down">Log out</span>
-      </v-btn>
-      <v-btn v-else text
-             :to="{ name: 'login' }">
-        <v-icon :left="$vuetify.breakpoint.mdAndUp">mdi-login</v-icon>
-        <span class="sr-only-sm-and-down">Log in</span>
-      </v-btn>
-      <v-btn icon>
-        <v-icon>mdi-account</v-icon>
-      </v-btn>
+      <global-search />
+      <v-menu offset-y dark
+              right content-class="ec-usermenu"
+              transition="slide-y-transition"
+              z-index="5">
+        <template v-slot:activator="{ on,value }">
+          <v-toolbar-items>
+            <v-btn right text
+                   :class="{ 'v-btn--open': value }" v-on="on">
+              <span v-if="loggedIn" class="sr-only-sm-and-down">
+              {{ username }}
+              </span>
+              <v-icon class="ma-2">mdi-account</v-icon>
+            </v-btn>
+          </v-toolbar-items>
+        </template>
+        <v-list dense
+                light color="blue-grey lighten-5">
+          <v-list-item block
+                       exact :to="{ name: 'camps', params: { groupName: encodeURI('Pfadi Bewegung Schweiz') } }">
+            <v-icon left>mdi-format-list-bulleted-triangle</v-icon>
+            <span>Meine Camps</span>
+          </v-list-item>
+          <v-list-item v-if="loggedIn" block @click="logout">
+            <v-icon v-if="logoutIcon" left>{{ logoutIcon }}</v-icon>
+            <v-progress-circular v-else indeterminate
+                                 size="18" class="mr-2" />
+            <span>Log out</span>
+          </v-list-item>
+          <v-list-item v-else :to="{ name: 'login' }" block>
+            <v-icon left>mdi-login</v-icon>
+            <span>Log in</span>
+          </v-list-item>
+        </v-list>
+      </v-menu>
     </v-app-bar>
 
     <!-- main content -->
@@ -69,7 +59,7 @@
       </v-container>
     </v-content>
 
-    <v-bottom-navigation v-if="$vuetify.breakpoint.xs" fixed grow>
+    <v-bottom-navigation v-if="loggedIn && $vuetify.breakpoint.xs" fixed grow>
       <v-btn :to="{name: 'home'}" exact>
         <span>Home</span>
         <v-icon>mdi-home</v-icon>
@@ -78,7 +68,7 @@
         <span>Camps</span>
         <v-icon>mdi-format-list-bulleted-triangle</v-icon>
       </v-btn>
-      <v-btn exact>
+      <v-btn :to="{name: 'profile'}">
         <span>Profile</span>
         <v-icon>mdi-account</v-icon>
       </v-btn>
@@ -93,7 +83,10 @@
 </template>
 
 <script>
+import GlobalSearch from '../components/Search'
+
 export default {
+  components: { GlobalSearch },
   data () {
     return {
       editableCampButton: false,
@@ -105,6 +98,9 @@ export default {
   computed: {
     loggedIn () {
       return this.$auth.isLoggedIn()
+    },
+    username () {
+      return this.$auth.username()
     }
   },
   created () {
@@ -131,17 +127,43 @@ export default {
     margin-top: 116px;
   }
 
-  .ec-campselect .v-select__slot input {
-    font-size: 1.25rem;
+  .v-btn--open {
+    background: #B0BEC5 !important;
+    color: rgba(0, 0, 0, 0.87) !important;
+  }
+
+  .ec-usermenu {
+    border-top-left-radius: 0 !important;
+    border-top-right-radius: 0 !important;
+    right: 0;
+    left: inherit !important;
+    .v-list {
+      border-radius: 0;
+    }
   }
 
-  .ec-campselect {
-    flex: 0 1 300px;
+  .v-app-bar .v-toolbar__content {
+    padding-left: 0;
+    padding-right: 0;
+    width: 100%;
   }
 
-  .ec-campselect.v-overflow-btn .v-input__control::before, .ec-campselect.v-overflow-btn .v-input__slot::before {
-    border: none;
-    height: 0;
+  .v-navigation-drawer__content .v-card {
+    border-top-left-radius: 0!important;
+    border-top-right-radius: 0!important;
+  }
+
+  @media #{map-get($display-breakpoints, 'xs-only')}{
+    .v-content .container {
+      min-height: calc(100% - 56px);
+      display: flex;
+
+      .v-card {
+        margin-left: 0 !important;
+        margin-right: 0 !important;
+        flex: auto;
+      }
+    }
   }
 
   @media #{map-get($display-breakpoints, 'sm-and-down')}{
@@ -169,12 +191,4 @@ export default {
     left: 0 !important;
     font-feature-settings: 'tnum';
   }
-
-  .theme--dark.v-overflow-btn {
-    &:hover, &.v-input--is-focused, &.v-select--is-menu-active {
-      .v-input__slot {
-        background: map-get($blue-grey, 'darken-3')
-      }
-    }
-  }
 </style>

From 65a85a2df0d80ec49d0312991bb5d43d8f826b4c Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:23:38 +0100
Subject: [PATCH 23/85] Updated dependencies

---
 frontend/package-lock.json | 5611 +++++++++++++++---------------------
 frontend/package.json      |   42 +-
 2 files changed, 2361 insertions(+), 3292 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 8393fa169e..446c59acf5 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -5,1256 +5,304 @@
   "requires": true,
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
-      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+      "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.0.0"
+        "@babel/highlight": "^7.8.3"
+      }
+    },
+    "@babel/compat-data": {
+      "version": "7.8.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.5.tgz",
+      "integrity": "sha512-jWYUqQX/ObOhG1UiEkbH5SANsE/8oKXiQWjj7p7xgj9Zmnt//aUvyz4dBkK0HNsS8/cbyC5NmmH87VekW+mXFg==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.8.5",
+        "invariant": "^2.2.4",
+        "semver": "^5.5.0"
       }
     },
     "@babel/core": {
-      "version": "7.7.5",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.5.tgz",
-      "integrity": "sha512-M42+ScN4+1S9iB6f+TL7QBpoQETxbclx+KNoKJABghnKYE+fMzSGqst0BZJc8CpI625bwPwYgUyRvxZ+0mZzpw==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.7.4",
-        "@babel/helpers": "^7.7.4",
-        "@babel/parser": "^7.7.5",
-        "@babel/template": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4",
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.4.tgz",
+      "integrity": "sha512-0LiLrB2PwrVI+a2/IEskBopDYSd8BCb3rOvH7D5tzoWd696TBEduBvuLVm4Nx6rltrLZqvI3MCalB2K2aVzQjA==",
+      "dev": true,
+      "requires": {
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.8.4",
+        "@babel/helpers": "^7.8.4",
+        "@babel/parser": "^7.8.4",
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.8.4",
+        "@babel/types": "^7.8.3",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.1",
         "json5": "^2.1.0",
         "lodash": "^4.17.13",
         "resolve": "^1.3.2",
         "semver": "^5.4.1",
         "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "@babel/generator": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz",
-          "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@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==",
-          "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": {
-          "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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.7.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-          "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-          "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.7.4",
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "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",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "@babel/generator": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz",
-      "integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==",
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz",
+      "integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.7.2",
+        "@babel/types": "^7.8.3",
         "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"
-      },
-      "dependencies": {
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@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"
-      },
-      "dependencies": {
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@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==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz",
+      "integrity": "sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4"
-      },
-      "dependencies": {
-        "@babel/generator": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz",
-          "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@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==",
-          "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": {
-          "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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.7.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-          "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-          "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.7.4",
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "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",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+        "@babel/helper-hoist-variables": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-compilation-targets": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz",
+      "integrity": "sha512-3k3BsKMvPp5bjxgMdrFyq0UaEO48HciVrOVF0+lon8pp95cyJ2ujAh0TrBHNMnJGT2rr0iKOJPFFbSqjDyf/Pg==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.8.4",
+        "browserslist": "^4.8.5",
+        "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.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz",
+      "integrity": "sha512-qmp4pD7zeTxsv0JNecSBsEmG1ei2MqwJq4YQcK3ZWm/0t07QstWfvuV/vm3Qt5xNMFETn2SZqpMx2MQzbtq+KA==",
       "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"
-      },
-      "dependencies": {
-        "@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==",
-          "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": {
-          "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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.7.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-          "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-          "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.7.4",
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/helper-function-name": "^7.8.3",
+        "@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.8.3",
+        "@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.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz",
+      "integrity": "sha512-Gcsm1OHCUr9o9TcJln57xhWHtdXbA2pgQ58S0Lxlks0WMGNXuki4+GLfX0p+L2ZkINUGZvfkz8rzoqJQSthI+Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-regex": "^7.4.4",
+        "@babel/helper-regex": "^7.8.3",
         "regexpu-core": "^4.6.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"
-      },
-      "dependencies": {
-        "@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==",
-          "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": {
-          "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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.7.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-          "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-          "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.7.4",
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
       }
     },
     "@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"
-      },
-      "dependencies": {
-        "@babel/generator": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz",
-          "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@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==",
-          "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": {
-          "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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.7.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-          "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-          "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.7.4",
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "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",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz",
-      "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz",
+      "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.7.0",
-        "@babel/template": "^7.7.0",
-        "@babel/types": "^7.7.0"
+        "@babel/helper-get-function-arity": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz",
-      "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==",
+      "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.0"
+        "@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"
-      },
-      "dependencies": {
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@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"
-      },
-      "dependencies": {
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@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"
-      },
-      "dependencies": {
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@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.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz",
+      "integrity": "sha512-C7NG6B7vfBa/pwCOshpMbOYUmrYQDfCpVL/JCRu0ek8B5p8kue1+BCXpg2vOYs7w5ACB9GTOBYQ5U6NwrMg+3Q==",
       "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-simple-access": "^7.8.3",
+        "@babel/helper-split-export-declaration": "^7.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/types": "^7.8.3",
         "lodash": "^4.17.13"
-      },
-      "dependencies": {
-        "@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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.7.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-          "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-          "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.7.4",
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
       }
     },
     "@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"
-      },
-      "dependencies": {
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@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==",
-      "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==",
-      "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==",
-      "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"
-      },
-      "dependencies": {
-        "@babel/generator": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz",
-          "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@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==",
-          "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": {
-          "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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.7.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-          "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-          "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.7.4",
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "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",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "@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==",
-      "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"
-      },
-      "dependencies": {
-        "@babel/generator": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz",
-          "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@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==",
-          "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": {
-          "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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.7.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-          "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-          "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.7.4",
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "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",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "@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==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.7.4",
-        "@babel/types": "^7.7.4"
-      },
-      "dependencies": {
-        "@babel/parser": {
-          "version": "7.7.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-          "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-          "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.7.4",
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
-      }
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz",
-      "integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.7.0"
-      }
-    },
-    "@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==",
-      "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"
-      },
-      "dependencies": {
-        "@babel/generator": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz",
-          "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@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==",
-          "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": {
-          "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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.7.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-          "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-          "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.7.4",
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "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",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helpers": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.4.tgz",
-      "integrity": "sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4"
-      },
-      "dependencies": {
-        "@babel/generator": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.4.tgz",
-          "integrity": "sha512-m5qo2WgdOJeyYngKImbkyQrnUN1mPceaG5BV+G0E3gWsa4l/jCSryWJdM2x8OuGAOyh+3d5pVYfZWCiNFtynxg==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4",
-            "jsesc": "^2.5.1",
-            "lodash": "^4.17.13",
-            "source-map": "^0.5.0"
-          }
-        },
-        "@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==",
-          "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": {
-          "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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.7.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-          "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-          "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.7.4",
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "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",
-            "debug": "^4.1.0",
-            "globals": "^11.1.0",
-            "lodash": "^4.17.13"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
+    },
+    "@babel/helper-plugin-utils": {
+      "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.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.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.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.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz",
+      "integrity": "sha512-xOUssL6ho41U81etpLoT2RTdvdus4VfHamCuAm4AHxGr+0it5fnwoVdwUJ7GFEqCsQYzJUhcbsN9wB9apcYKFA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-member-expression-to-functions": "^7.8.3",
+        "@babel/helper-optimise-call-expression": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-simple-access": {
+      "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.8.3",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helper-split-export-declaration": {
+      "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.8.3"
+      }
+    },
+    "@babel/helper-wrap-function": {
+      "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.8.3",
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.8.3",
+        "@babel/types": "^7.8.3"
+      }
+    },
+    "@babel/helpers": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz",
+      "integrity": "sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==",
+      "dev": true,
+      "requires": {
+        "@babel/template": "^7.8.3",
+        "@babel/traverse": "^7.8.4",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/highlight": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
-      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
+      "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
       "dev": true,
       "requires": {
         "chalk": "^2.0.0",
@@ -1263,744 +311,628 @@
       }
     },
     "@babel/parser": {
-      "version": "7.7.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz",
-      "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==",
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz",
+      "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==",
       "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-object-rest-spread": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.7.4.tgz",
-      "integrity": "sha512-rnpnZR3/iWKmiQyJ3LKJpSwLDcX/nSXhdLk4Aq/tXOApIvyu7qoabrige0ylsAJffaUC51WiBu209Q0U+86OWQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==",
       "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-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.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg==",
+      "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.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.4.tgz",
-      "integrity": "sha512-cHgqHgYvffluZk85dJ02vloErm3Y6xtH+2noOBOJ2kXOJH3aVCDnj5eR/lVNlTnYu4hndAPJD3rTFjW3qee0PA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz",
+      "integrity": "sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ==",
       "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-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.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.0.0"
+        "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
     "@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==",
-      "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",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz",
+      "integrity": "sha512-SjT0cwFJ+7Rbr1vQsvphAHwUHvSUPmMjMU/0P59G8U2HLFqSa082JO7zkbDNWs9kH/IUqpHI6xWNesGf8haF1w==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.8.3",
+        "@babel/helper-define-map": "^7.8.3",
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/helper-optimise-call-expression": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-replace-supers": "^7.8.3",
+        "@babel/helper-split-export-declaration": "^7.8.3",
         "globals": "^11.1.0"
-      },
-      "dependencies": {
-        "@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==",
-          "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": {
-          "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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.7.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-          "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-          "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.7.4",
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.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.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz",
+      "integrity": "sha512-H4X646nCkiEcHZUZaRkhE2XVsoz0J/1x3VVujnn96pSoGCtKPA99ZZA+va+gK+92Zycd6OBKCD8tDb/731bhgQ==",
       "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.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.4.tgz",
-      "integrity": "sha512-mk0cH1zyMa/XHeb6LOTXTbG7uIJ8Rrjlzu91pUx/KS3JpcgaTDwMS8kM+ar8SLOvlL2Lofi4CGBAjCo3a2x+lw==",
+      "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.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz",
+      "integrity": "sha512-iAXNlOWvcYUYoV8YIxwS7TxGRJcxyl8eQCfT+A5j8sKUzRFvJdcyjp97jL2IghWSRDaL2PU2O2tX8Cu9dTBq5A==",
       "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"
-      },
-      "dependencies": {
-        "@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==",
-          "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": {
-          "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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.7.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.5.tgz",
-          "integrity": "sha512-KNlOe9+/nk4i29g0VXgl8PEXIRms5xKLJeuZ6UptN0fHv+jDiriG+y94X6qAgWTR0h3KaoM1wK5G5h7MHFRSig==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.7.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-          "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.0.0",
-            "@babel/parser": "^7.7.4",
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.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.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz",
+      "integrity": "sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.7.5",
-        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-module-transforms": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
         "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@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.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz",
+      "integrity": "sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg==",
       "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/helper-module-transforms": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/helper-simple-access": "^7.8.3",
         "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@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.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz",
+      "integrity": "sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-hoist-variables": "^7.8.3",
+        "@babel/helper-module-transforms": "^7.8.3",
+        "@babel/helper-plugin-utils": "^7.8.3",
         "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@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.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz",
+      "integrity": "sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.7.4",
-        "@babel/helper-plugin-utils": "^7.0.0"
+        "@babel/helper-module-transforms": "^7.8.3",
+        "@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.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.7.4.tgz",
-      "integrity": "sha512-VJwhVePWPa0DqE9vcfptaJSzNDKrWU/4FbYCjZERtmqEs05g3UMXnYMZoXja7JAJ7Y7sPZipwm/pGApZt7wHlw==",
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz",
+      "integrity": "sha512-IsS3oTxeTsZlE5KqzTbcC2sV0P9pXdec53SU+Yxv7o/6dvGM5AkTotQKhoSffhNgZ/dftsSiOoxy7evCYJXzVA==",
       "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"
-      },
-      "dependencies": {
-        "@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==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.7.4"
-          }
-        },
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
+        "@babel/helper-call-delegate": "^7.8.3",
+        "@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.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz",
+      "integrity": "sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA==",
       "dev": true,
       "requires": {
         "regenerator-transform": "^0.14.0"
       }
     },
     "@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.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz",
+      "integrity": "sha512-/vqUt5Yh+cgPZXXjmaG9NT8aVfThKk7G4OqkVhrXqwsC5soMn/qTCxs36rZ2QFhpfTJcjw4SNDIZ4RUb8OL4jQ==",
       "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.6",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.6.tgz",
-      "integrity": "sha512-k5hO17iF/Q7tR9Jv8PdNBZWYW6RofxhnxKjBMc0nG4JTaWvOTiPoO/RLFwAKcA4FpmuBFm6jkoqaRJLGi0zdaQ==",
-      "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.4",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.7.4",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.7.4",
-        "@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.4",
-        "@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.4",
-        "@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.4.7",
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.4.tgz",
+      "integrity": "sha512-HihCgpr45AnSOHRbS5cWNTINs0TwaR8BS8xIIH+QwiW8cKL0llV91njQMpeMReEPVs+1Ao0x3RLEBLtt1hOq4w==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.8.4",
+        "@babel/helper-compilation-targets": "^7.8.4",
+        "@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-object-rest-spread": "^7.8.3",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-proposal-optional-chaining": "^7.8.3",
+        "@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-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.8.3",
+        "@babel/plugin-transform-computed-properties": "^7.8.3",
+        "@babel/plugin-transform-destructuring": "^7.8.3",
+        "@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.8.4",
+        "@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.8.3",
+        "@babel/plugin-transform-modules-commonjs": "^7.8.3",
+        "@babel/plugin-transform-modules-systemjs": "^7.8.3",
+        "@babel/plugin-transform-modules-umd": "^7.8.3",
+        "@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.8.4",
+        "@babel/plugin-transform-property-literals": "^7.8.3",
+        "@babel/plugin-transform-regenerator": "^7.8.3",
+        "@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/types": "^7.8.3",
+        "browserslist": "^4.8.5",
+        "core-js-compat": "^3.6.2",
         "invariant": "^2.2.2",
-        "js-levenshtein": "^1.1.3",
+        "levenary": "^1.1.1",
         "semver": "^5.5.0"
-      },
-      "dependencies": {
-        "@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==",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "lodash": "^4.17.13",
-            "to-fast-properties": "^2.0.0"
-          }
-        }
       }
     },
     "@babel/runtime": {
-      "version": "7.7.6",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.6.tgz",
-      "integrity": "sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==",
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz",
+      "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.2"
       }
     },
     "@babel/template": {
-      "version": "7.7.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz",
-      "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz",
+      "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.0",
-        "@babel/types": "^7.7.0"
+        "@babel/code-frame": "^7.8.3",
+        "@babel/parser": "^7.8.3",
+        "@babel/types": "^7.8.3"
       }
     },
     "@babel/traverse": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz",
-      "integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==",
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz",
+      "integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.7.2",
-        "@babel/helper-function-name": "^7.7.0",
-        "@babel/helper-split-export-declaration": "^7.7.0",
-        "@babel/parser": "^7.7.2",
-        "@babel/types": "^7.7.2",
+        "@babel/code-frame": "^7.8.3",
+        "@babel/generator": "^7.8.4",
+        "@babel/helper-function-name": "^7.8.3",
+        "@babel/helper-split-export-declaration": "^7.8.3",
+        "@babel/parser": "^7.8.4",
+        "@babel/types": "^7.8.3",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
         "lodash": "^4.17.13"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "@babel/types": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz",
-      "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz",
+      "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==",
       "dev": true,
       "requires": {
         "esutils": "^2.0.2",
@@ -2009,9 +941,9 @@
       }
     },
     "@cnakazawa/watch": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz",
-      "integrity": "sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
       "dev": true,
       "requires": {
         "exec-sh": "^0.3.2",
@@ -2064,16 +996,6 @@
             "restore-cursor": "^1.0.1"
           }
         },
-        "figures": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-          "dev": true,
-          "requires": {
-            "escape-string-regexp": "^1.0.5",
-            "object-assign": "^4.1.0"
-          }
-        },
         "onetime": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
@@ -2115,6 +1037,17 @@
       "requires": {
         "debug": "^3.1.0",
         "lodash.once": "^4.1.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
       }
     },
     "@hapi/address": {
@@ -2130,9 +1063,9 @@
       "dev": true
     },
     "@hapi/hoek": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.0.tgz",
-      "integrity": "sha512-7XYT10CZfPsH7j9F1Jmg1+d0ezOux2oM2GfArAzLwWe4mE2Dr3hVjsAL6+TFY49RRJlCdJDMw3nJsLFroTc8Kw==",
+      "version": "8.5.1",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
+      "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==",
       "dev": true
     },
     "@hapi/joi": {
@@ -2371,9 +1304,9 @@
       }
     },
     "@mdi/font": {
-      "version": "4.7.95",
-      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-4.7.95.tgz",
-      "integrity": "sha512-/SWooHIFz2dXkQJk3VhEXSbBplOU1lIkGSELAmw0peFEgR8KPqyM//M3vD8WDZETuEOSRVhVqLevP3okrsM5dw=="
+      "version": "4.9.95",
+      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-4.9.95.tgz",
+      "integrity": "sha512-m2sbAs+SMwRnWpkMriBxEulwuhmqRyh6X+hdOZlqSxYZUM2C2TaDnQ4gcilzdoAgru2XYnWViZ/xPuSDGgRXVw=="
     },
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
@@ -2464,33 +1397,6 @@
             "supports-color": "^2.0.0"
           }
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -2509,9 +1415,9 @@
       }
     },
     "@types/babel__core": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz",
-      "integrity": "sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==",
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.6.tgz",
+      "integrity": "sha512-tTnhWszAqvXnhW7m5jQU9PomXSiKXk2sFxpahXvI20SZKu9ylPi8WtIxueZ6ehDWikPT0jeFujMj3X4ZHuf3Tg==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -2541,9 +1447,9 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.8.tgz",
-      "integrity": "sha512-yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw==",
+      "version": "7.0.9",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz",
+      "integrity": "sha512-jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.3.0"
@@ -2579,9 +1485,9 @@
       "dev": true
     },
     "@types/istanbul-lib-report": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz",
-      "integrity": "sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "*"
@@ -2598,9 +1504,9 @@
       }
     },
     "@types/jest": {
-      "version": "24.0.23",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.23.tgz",
-      "integrity": "sha512-L7MBvwfNpe7yVPTXLn32df/EK+AMBFAFvZrRuArGs7npEWnlziUXK+5GMIUTI4NIuwok3XibsjXCs5HxviYXjg==",
+      "version": "24.9.1",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz",
+      "integrity": "sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==",
       "dev": true,
       "requires": {
         "jest-diff": "^24.3.0"
@@ -2655,18 +1561,18 @@
       "dev": true
     },
     "@types/yargs": {
-      "version": "13.0.3",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.3.tgz",
-      "integrity": "sha512-K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==",
+      "version": "13.0.8",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.8.tgz",
+      "integrity": "sha512-XAvHLwG7UQ+8M4caKIH0ZozIOYay5fQkAgyIXegXT9jPtdIGdhga+sUEdAr1CiG46aB+c64xQEYyEzlwWVTNzA==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz",
-      "integrity": "sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==",
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
+      "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
       "dev": true
     },
     "@vue/babel-helper-vue-jsx-merge-props": {
@@ -2690,24 +1596,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==",
-      "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",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-4.2.2.tgz",
+      "integrity": "sha512-QGgL+iR+ZdNO9xcFJqYjg938bwjArgIyNOFfM0m+dNSOt7wWVrlFA2v0C6aVN1sJ+IEjdurEolBTZ7hXp6Fbsg==",
+      "dev": true,
+      "requires": {
+        "@babel/core": "^7.8.4",
+        "@babel/helper-compilation-targets": "^7.8.4",
+        "@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.8.3",
+        "@babel/preset-env": "^7.8.4",
+        "@babel/runtime": "^7.8.4",
         "@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": {
@@ -2768,20 +1675,20 @@
       }
     },
     "@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.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.2.2.tgz",
+      "integrity": "sha512-6hMYDkH/rSzFkSKuu/EfTXVkUaBDR6sq5vJ161pN1q46zUB5uN1L7rJHQDjxTy1EZazk1MqU5cS10vRVhIeWvw==",
       "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.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-4.2.2.tgz",
+      "integrity": "sha512-uCXDlgUp4ehHoYosr6kbyJYeQ+aQ4lR9Zn0Bf58MFbZbmjBCi8dBKzQf7ve4bo8L8CTGjWirnzgA7pStRmWx0g==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.7.4",
-        "@vue/babel-preset-app": "^4.1.1",
-        "@vue/cli-shared-utils": "^4.1.1",
+        "@babel/core": "^7.8.4",
+        "@vue/babel-preset-app": "^4.2.2",
+        "@vue/cli-shared-utils": "^4.2.2",
         "babel-loader": "^8.0.6",
         "cache-loader": "^4.1.0",
         "thread-loader": "^2.1.3",
@@ -2789,103 +1696,95 @@
       }
     },
     "@vue/cli-plugin-e2e-cypress": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-e2e-cypress/-/cli-plugin-e2e-cypress-4.1.1.tgz",
-      "integrity": "sha512-+wxi66LEhO1QycSaoUX2pbBog1MSU8hFaKyqb4v4ob9DuPLyHcGVHoo5tdgb+RkTXIQjSKVptMqgb/OMEivPbg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-e2e-cypress/-/cli-plugin-e2e-cypress-4.2.2.tgz",
+      "integrity": "sha512-5e6VRUUlSBtwtvJH9UhBaW4sMRdMIjwY+r8xw8YSOxuglBzRn0WOfl3Ex4lRSAFYFE3OuUj9c2c8/GF88SavWw==",
       "dev": true,
       "requires": {
-        "@vue/cli-shared-utils": "^4.1.1",
-        "cypress": "^3.3.1",
-        "eslint-plugin-cypress": "^2.7.0"
+        "@vue/cli-shared-utils": "^4.2.2",
+        "cypress": "^3.8.3",
+        "eslint-plugin-cypress": "^2.8.1"
       }
     },
     "@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.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.2.2.tgz",
+      "integrity": "sha512-C6Foeq+XjsAMy+F9XTXGUtCKBgTJXGRjqUdmehU5J4i84erSIRulOahqjHr6J6IslJcDAmBekF8xXhMzX839NA==",
       "dev": true,
       "requires": {
-        "@vue/cli-shared-utils": "^4.1.1",
+        "@vue/cli-shared-utils": "^4.2.2",
         "eslint-loader": "^2.1.2",
         "globby": "^9.2.0",
+        "inquirer": "^6.3.1",
         "webpack": "^4.0.0",
         "yorkie": "^2.0.0"
       }
     },
     "@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.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.2.2.tgz",
+      "integrity": "sha512-F6uYaKKpXXgub9vd3QFNS673HIXB8+U2XGtLp7yUo00/iuLWodrzPE1zLk6i/R6o/MCtDU6Tqfow/fFeIFVLZg==",
       "dev": true,
       "requires": {
-        "@vue/cli-shared-utils": "^4.1.1"
+        "@vue/cli-shared-utils": "^4.2.2"
       }
     },
     "@vue/cli-plugin-unit-jest": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-unit-jest/-/cli-plugin-unit-jest-4.1.1.tgz",
-      "integrity": "sha512-JLTLdQ2IRUe3iIpHHpp9LHm4/8HiD0QQ9AG136J8exXbZ6TCaLdE5X2W6fZ19wV/eCaQfje3eRAOySN24MReqw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-unit-jest/-/cli-plugin-unit-jest-4.2.2.tgz",
+      "integrity": "sha512-MpBZct0TRGtGAtCAuxFQTbf4X+rJNyOnnYuNqvOPNCsBqbeNsYWLMEanJgGYBQ23jzjudcUL7CH4G1JP7eNWoA==",
       "dev": true,
       "requires": {
-        "@babel/core": "^7.7.4",
-        "@babel/plugin-transform-modules-commonjs": "^7.6.0",
+        "@babel/core": "^7.8.4",
+        "@babel/plugin-transform-modules-commonjs": "^7.8.3",
         "@types/jest": "^24.0.19",
-        "@vue/cli-shared-utils": "^4.1.1",
+        "@vue/cli-shared-utils": "^4.2.2",
         "babel-core": "^7.0.0-bridge.0",
         "babel-jest": "^24.9.0",
         "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
-        "deepmerge": "^4.0.0",
+        "deepmerge": "^4.2.2",
         "jest": "^24.9.0",
-        "jest-environment-jsdom-fifteen": "^1.0.0",
+        "jest-environment-jsdom-fifteen": "^1.0.2",
         "jest-serializer-vue": "^2.0.2",
         "jest-transform-stub": "^2.0.0",
         "jest-watch-typeahead": "^0.4.2",
         "ts-jest": "^24.2.0",
         "vue-jest": "^3.0.5"
-      },
-      "dependencies": {
-        "deepmerge": {
-          "version": "4.2.2",
-          "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
-          "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
-          "dev": true
-        }
       }
     },
     "@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.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.2.2.tgz",
+      "integrity": "sha512-/Bir5gCjesHSa+2F2CDD10QefuGJogIJ5VA6wp+zARjDIl4xg2f0SbROnompBS03K7cNNDdRXdS/o/fzKmH1yg==",
       "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.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-4.2.2.tgz",
+      "integrity": "sha512-uB+32EoXL3FvgJ/uReDMGT6KohX++qilWN58Dzgi5ixrgD1abQgIjGr9AW5SATwjcWNbU0uKP4FltWq56dxswA==",
       "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",
+        "@vue/cli-overlay": "^4.2.2",
+        "@vue/cli-plugin-router": "^4.2.2",
+        "@vue/cli-plugin-vuex": "^4.2.2",
+        "@vue/cli-shared-utils": "^4.2.2",
         "@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.0.0",
         "address": "^1.1.2",
-        "autoprefixer": "^9.7.2",
-        "browserslist": "^4.7.3",
+        "autoprefixer": "^9.7.4",
+        "browserslist": "^4.8.6",
         "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.1.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",
@@ -2895,35 +1794,52 @@
         "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",
+        "mini-css-extract-plugin": "^0.9.0",
         "minimist": "^1.2.0",
-        "ora": "^3.4.0",
+        "pnp-webpack-plugin": "^1.6.0",
         "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.4",
         "thread-loader": "^2.1.3",
         "url-loader": "^2.2.0",
-        "vue-loader": "^15.7.2",
-        "vue-style-loader": "^4.1.0",
+        "vue-loader": "^15.8.3",
+        "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-chain": "^6.3.1",
+        "webpack-dev-server": "^3.10.2",
         "webpack-merge": "^4.2.2"
       },
       "dependencies": {
+        "acorn": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
+          "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
+          "dev": true
+        },
+        "acorn-walk": {
+          "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
+        },
+        "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"
+          }
+        },
         "cacache": {
           "version": "13.0.1",
           "resolved": "https://registry.npmjs.org/cacache/-/cacache-13.0.1.tgz",
@@ -2948,43 +1864,48 @@
             "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"
-              }
-            }
           }
         },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.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"
           }
         },
-        "dotenv": {
-          "version": "8.2.0",
-          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
-          "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
+        "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
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
           "dev": true
         },
         "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.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.0.tgz",
+          "integrity": "sha512-PtXtQb7IrD8O+h6Cq1dbpJH5NzD8+9keN1zZ0YlpDzl1PwXEJEBj6u1Xa92t1Hwluoozd9TNKul5Hi2iqpsWwg==",
           "dev": true,
           "requires": {
             "commondir": "^1.0.1",
-            "make-dir": "^3.0.0",
+            "make-dir": "^3.0.2",
             "pkg-dir": "^4.1.0"
           }
         },
@@ -2998,6 +1919,39 @@
             "path-exists": "^4.0.0"
           }
         },
+        "fs-extra": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        },
+        "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
+        },
+        "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
+        },
+        "jest-worker": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz",
+          "integrity": "sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==",
+          "dev": true,
+          "requires": {
+            "merge-stream": "^2.0.0",
+            "supports-color": "^7.0.0"
+          }
+        },
         "locate-path": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@@ -3008,29 +1962,14 @@
           }
         },
         "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.0.2",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz",
+          "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==",
           "dev": true,
           "requires": {
             "semver": "^6.0.0"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
         "p-locate": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
@@ -3040,24 +1979,6 @@
             "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
-        },
-        "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"
-          }
-        },
         "path-exists": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -3073,78 +1994,96 @@
             "find-up": "^4.0.0"
           }
         },
-        "read-pkg": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-          "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-          "dev": true,
-          "requires": {
-            "@types/normalize-package-data": "^2.4.0",
-            "normalize-package-data": "^2.5.0",
-            "parse-json": "^5.0.0",
-            "type-fest": "^0.6.0"
-          }
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "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
         },
+        "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"
+          }
+        },
+        "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"
+          }
+        },
         "terser-webpack-plugin": {
-          "version": "2.2.3",
-          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.2.3.tgz",
-          "integrity": "sha512-R8cqQDld4BjVKaIR0D9Q0O/QzfgXzME3wXfSxxW23ZGv5xpMDUt1NEnCuG94y1+bKASLvc5TjIHLlNo0eK8GLA==",
+          "version": "2.3.5",
+          "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.5.tgz",
+          "integrity": "sha512-WlWksUoq+E4+JlJ+h+U+QUzXpcsMSSNXkDy9lBVkSqDn1w23Gg29L/ary9GeJVYCGiNJJX7LnVc4bwL1N3/g1w==",
           "dev": true,
           "requires": {
             "cacache": "^13.0.1",
-            "find-cache-dir": "^3.1.0",
-            "jest-worker": "^24.9.0",
-            "schema-utils": "^2.6.1",
+            "find-cache-dir": "^3.2.0",
+            "jest-worker": "^25.1.0",
+            "p-limit": "^2.2.2",
+            "schema-utils": "^2.6.4",
             "serialize-javascript": "^2.1.2",
             "source-map": "^0.6.1",
-            "terser": "^4.4.2",
+            "terser": "^4.4.3",
             "webpack-sources": "^1.4.3"
           }
         },
-        "type-fest": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-          "dev": true
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
         }
       }
     },
     "@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.2.2",
+      "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.2.2.tgz",
+      "integrity": "sha512-EK5wcxgjadqUpSzfh6Bnxd46Zx+SAaHusygqV11UZKHr4EObc/SjCpq7c7drmFkBjRqmVvrHs4jRnJJo5VgCgQ==",
       "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",
+        "read-pkg": "^5.1.1",
         "request": "^2.87.0",
         "request-promise-native": "^1.0.8",
         "semver": "^6.1.0",
-        "string.prototype.padstart": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
       "dependencies": {
@@ -3157,9 +2096,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.1",
+      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.1.1.tgz",
+      "integrity": "sha512-+lN3nsfJJDGMNz7fCpcoYIORrXo0K3OTsdr8jCM7FuqdI4+70TY6gxY6viJ2Xi1clqyPg7LpeOWwjF31vSMmUw==",
       "dev": true,
       "requires": {
         "consolidate": "^0.15.1",
@@ -3167,12 +2106,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",
@@ -3198,12 +2143,14 @@
       }
     },
     "@vue/eslint-config-standard": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/@vue/eslint-config-standard/-/eslint-config-standard-5.0.1.tgz",
-      "integrity": "sha512-8QHYlaGcO1/0IDe0JpzF6DHsQgzHUCqnrBhsX+Y9NmM81ek5XWrxzKfoMQbNXnvy69D/NzI3+a4incYAR36J0A==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@vue/eslint-config-standard/-/eslint-config-standard-5.1.2.tgz",
+      "integrity": "sha512-FTz0k77dIrj9r3xskt9jsZyL/YprrLiPRf4m3k7G6dZ5PKuD6OPqYrHR9eduUmHDFpTlRgFpTVQrq+1el9k3QQ==",
       "dev": true,
       "requires": {
-        "eslint-config-standard": "^14.1.0"
+        "eslint-config-standard": "^14.1.0",
+        "eslint-import-resolver-node": "^0.3.3",
+        "eslint-import-resolver-webpack": "^0.12.1"
       }
     },
     "@vue/preload-webpack-plugin": {
@@ -3213,9 +2160,9 @@
       "dev": true
     },
     "@vue/test-utils": {
-      "version": "1.0.0-beta.30",
-      "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.0-beta.30.tgz",
-      "integrity": "sha512-Wyvcha9fNk8+kzTDwb3xWGjPkCPzHSYSwKP6MplrPTG/auhqoad7JqUEceZLc6u7AU4km2pPQ8/m9s0RgCZ0NA==",
+      "version": "1.0.0-beta.31",
+      "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.0.0-beta.31.tgz",
+      "integrity": "sha512-IlhSx5hyEVnbvDZ3P98R1jNmy88QAd/y66Upn4EcvxSD5D4hwOutl3dIdfmSTSXs4b9DIMDnEVjX7t00cvOnvg==",
       "dev": true,
       "requires": {
         "dom-event-types": "^1.0.0",
@@ -3440,9 +2387,9 @@
       }
     },
     "acorn": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-      "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz",
+      "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==",
       "dev": true
     },
     "acorn-globals": {
@@ -3456,9 +2403,9 @@
       }
     },
     "acorn-jsx": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
-      "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
+      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
       "dev": true
     },
     "acorn-walk": {
@@ -3514,9 +2461,9 @@
       "dev": true
     },
     "ansi-colors": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+      "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
       "dev": true
     },
     "ansi-escapes": {
@@ -3624,6 +2571,12 @@
       "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
       "dev": true
     },
+    "array-find": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-find/-/array-find-1.0.0.tgz",
+      "integrity": "sha1-bI4obRHtdoMn+OYuzuhzU8o+eLg=",
+      "dev": true
+    },
     "array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
@@ -3631,32 +2584,126 @@
       "dev": true
     },
     "array-includes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.0.tgz",
-      "integrity": "sha512-ONOEQoKrvXPKk7Su92Co0YMqYO32FfqJTzkKU9u2UpIXyYZIzLSvpdg4AwvSw4mSUW0czu6inK+zby6Oj6gDjQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
+      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
+      "dev": true,
+      "requires": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.0",
+        "is-string": "^1.0.5"
+      },
+      "dependencies": {
+        "es-abstract": {
+          "version": "1.17.4",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
+          "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+          "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.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.1",
+            "string.prototype.trimright": "^2.1.1"
+          }
+        },
+        "has-symbols": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+          "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+          "dev": true
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "dev": true,
+          "requires": {
+            "has": "^1.0.3"
+          }
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "function-bind": "^1.1.1"
+          }
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "function-bind": "^1.1.1"
+          }
+        }
+      }
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+      "dev": true,
+      "requires": {
+        "array-uniq": "^1.0.1"
+      }
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true
+    },
+    "array.prototype.flat": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
+      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
       "dev": true,
       "requires": {
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.0"
+        "es-abstract": "^1.17.0-next.1"
       },
       "dependencies": {
         "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.4",
+          "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
+          "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
           "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"
           }
         },
         "has-symbols": {
@@ -3664,41 +2711,44 @@
           "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
           "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
           "dev": true
+        },
+        "is-callable": {
+          "version": "1.1.5",
+          "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
+          "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+          "dev": true
+        },
+        "is-regex": {
+          "version": "1.0.5",
+          "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
+          "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+          "dev": true,
+          "requires": {
+            "has": "^1.0.3"
+          }
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "function-bind": "^1.1.1"
+          }
+        },
+        "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==",
+          "dev": true,
+          "requires": {
+            "define-properties": "^1.1.3",
+            "function-bind": "^1.1.1"
+          }
         }
       }
     },
-    "array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
-    },
-    "array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
-      "dev": true
-    },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
-    },
-    "array.prototype.flat": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.2.tgz",
-      "integrity": "sha512-VXjh7lAL4KXKF2hY4FnEW9eRW6IhdvFW1sN/JwLbmECbCgACCnBHNyP3lFiYuttr0jxRN9Bsc5+G27dMseSWqQ==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.15.0",
-        "function-bind": "^1.1.1"
-      }
-    },
     "asn1": {
       "version": "0.2.4",
       "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -3765,12 +2815,12 @@
       "dev": true
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+      "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.14"
+        "lodash": "^4.17.10"
       }
     },
     "async-each": {
@@ -3798,26 +2848,18 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "9.7.3",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.3.tgz",
-      "integrity": "sha512-8T5Y1C5Iyj6PgkPSFd0ODvK9DIleuPKUPYniNxybS47g2k2wFgLZ46lGQHlBuGKIAEV8fbCDfKCCRS1tvOgc3Q==",
+      "version": "9.7.4",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.4.tgz",
+      "integrity": "sha512-g0Ya30YrMBAEZk60lp+qfX5YQllG+S5W3GYCFvyHTvhOki0AEQJLPEcIuGRsqVwLi8FvXPVtwTGhfr38hVpm0g==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.8.0",
-        "caniuse-lite": "^1.0.30001012",
+        "browserslist": "^4.8.3",
+        "caniuse-lite": "^1.0.30001020",
         "chalk": "^2.4.2",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
-        "postcss": "^7.0.23",
+        "postcss": "^7.0.26",
         "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
-        }
       }
     },
     "aws-sign2": {
@@ -3833,12 +2875,34 @@
       "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==",
       "requires": {
-        "follow-redirects": "1.5.10",
-        "is-buffer": "^2.0.2"
+        "follow-redirects": "1.5.10"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "follow-redirects": {
+          "version": "1.5.10",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+          "requires": {
+            "debug": "=3.1.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        }
       }
     },
     "axios-mock-adapter": {
@@ -3916,15 +2980,15 @@
       "dev": true
     },
     "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"
       }
@@ -3984,51 +3048,6 @@
         "find-up": "^3.0.0",
         "istanbul-lib-instrument": "^3.3.0",
         "test-exclude": "^5.2.3"
-      },
-      "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.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        }
       }
     },
     "babel-plugin-jest-hoist": {
@@ -4140,6 +3159,12 @@
           "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
           "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
           "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
@@ -4275,6 +3300,16 @@
       "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
       "dev": true
     },
+    "bindings": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "file-uri-to-path": "1.0.0"
+      }
+    },
     "bluebird": {
       "version": "3.7.2",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
@@ -4314,23 +3349,10 @@
             "ms": "2.0.0"
           }
         },
-        "http-errors": {
-          "version": "1.7.2",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-          "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-          "dev": true,
-          "requires": {
-            "depd": "~1.1.2",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.1.1",
-            "statuses": ">= 1.5.0 < 2",
-            "toidentifier": "1.0.0"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
           "dev": true
         },
         "qs": {
@@ -4338,18 +3360,6 @@
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
           "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
           "dev": true
-        },
-        "raw-body": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-          "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-          "dev": true,
-          "requires": {
-            "bytes": "3.1.0",
-            "http-errors": "1.7.2",
-            "iconv-lite": "0.4.24",
-            "unpipe": "1.0.0"
-          }
         }
       }
     },
@@ -4521,14 +3531,14 @@
       }
     },
     "browserslist": {
-      "version": "4.8.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.2.tgz",
-      "integrity": "sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA==",
+      "version": "4.8.7",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.7.tgz",
+      "integrity": "sha512-gFOnZNYBHrEyUML0xr5NJ6edFaaKbTFX9S9kQHlYfCP0Rit/boRIz4G+Avq6/4haEKJXdGGUnoolx+5MWW2BoA==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001015",
-        "electron-to-chromium": "^1.3.322",
-        "node-releases": "^1.1.42"
+        "caniuse-lite": "^1.0.30001027",
+        "electron-to-chromium": "^1.3.349",
+        "node-releases": "^1.1.49"
       }
     },
     "bs-logger": {
@@ -4657,13 +3667,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.0",
+          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.0.tgz",
+          "integrity": "sha512-PtXtQb7IrD8O+h6Cq1dbpJH5NzD8+9keN1zZ0YlpDzl1PwXEJEBj6u1Xa92t1Hwluoozd9TNKul5Hi2iqpsWwg==",
           "dev": true,
           "requires": {
             "commondir": "^1.0.1",
-            "make-dir": "^3.0.0",
+            "make-dir": "^3.0.2",
             "pkg-dir": "^4.1.0"
           }
         },
@@ -4687,23 +3697,14 @@
           }
         },
         "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.0.2",
+          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz",
+          "integrity": "sha512-rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w==",
           "dev": true,
           "requires": {
             "semver": "^6.0.0"
           }
         },
-        "p-limit": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
         "p-locate": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
@@ -4713,12 +3714,6 @@
             "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",
@@ -4818,9 +3813,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001015",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001015.tgz",
-      "integrity": "sha512-/xL2AbW/XWHNu1gnIrO8UitBGoFthcsDgU9VLK1/dpsoxbaD5LscHozKze05R6WLsBvLhqv78dAPozMFQBYLbQ==",
+      "version": "1.0.30001030",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001030.tgz",
+      "integrity": "sha512-QGK0W4Ft/Ac+zTjEiRJfwDNATvS3fodDczBXrH42784kcfqcDKpEPfN08N0HQjrAp8He/Jw8QiSS9QRn7XAbUw==",
       "dev": true
     },
     "capture-exit": {
@@ -4833,9 +3828,9 @@
       }
     },
     "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": {
@@ -4894,9 +3889,9 @@
       }
     },
     "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": {
@@ -4909,9 +3904,9 @@
       }
     },
     "ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
       "dev": true
     },
     "cipher-base": {
@@ -4948,9 +3943,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"
@@ -4994,9 +3989,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",
@@ -5076,15 +4071,6 @@
             "p-locate": "^4.1.0"
           }
         },
-        "p-limit": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
         "p-locate": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
@@ -5094,12 +4080,6 @@
             "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
-        },
         "parse5": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
@@ -5144,9 +4124,9 @@
           }
         },
         "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.1.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
+          "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
           "dev": true,
           "requires": {
             "cliui": "^6.0.0",
@@ -5240,13 +4220,22 @@
       "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.2.0",
+      "resolved": "https://registry.npmjs.org/clipboardy/-/clipboardy-2.2.0.tgz",
+      "integrity": "sha512-9ry9nC3VFULNmoEIqvuRwCIQ9M7wjnm4O+yvk7xkmhR+7FAUWaeX751oeYJbORg0h0zmqW1EVDoZK8f7yapwbg==",
       "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.1.1",
+          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz",
+          "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==",
+          "dev": true
+        }
       }
     },
     "cliui": {
@@ -5260,6 +4249,17 @@
         "wrap-ansi": "^5.1.0"
       },
       "dependencies": {
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -5390,12 +4390,20 @@
       "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"
+      },
+      "dependencies": {
+        "mime-db": {
+          "version": "1.43.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
+          "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==",
+          "dev": true
+        }
       }
     },
     "compression": {
@@ -5427,6 +4435,12 @@
           "requires": {
             "ms": "2.0.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
@@ -5468,12 +4482,6 @@
             "is-extendable": "^0.1.0"
           }
         },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -5624,21 +4632,6 @@
           "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
           "dev": true
         },
-        "p-limit": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-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",
@@ -5665,25 +4658,25 @@
       }
     },
     "core-js": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.5.0.tgz",
-      "integrity": "sha512-Ifh3kj78gzQ7NAoJXeTu+XwzDld0QRIwjBLRqAMhuLhP3d2Av5wmgE9ycfnvK6NAEjTkQ1sDPeoEZAWO3Hx1Uw==",
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+      "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw==",
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.5.0.tgz",
-      "integrity": "sha512-E7iJB72svRjJTnm9HDvujzNVMCm3ZcDYEedkJ/sDTNsy/0yooCd9Cg7GSzE7b4e0LfIkjijdB1tqg0pGwxWeWg==",
+      "version": "3.6.4",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.4.tgz",
+      "integrity": "sha512-zAa3IZPvsJ0slViBQ2z+vgyyTuhd3MFn1rBQjZSKVEgB0UMYhUkCj9jJUVPgGTGqWvsBVmfnruXgTcNyTlEiSA==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.8.2",
-        "semver": "^6.3.0"
+        "browserslist": "^4.8.3",
+        "semver": "7.0.0"
       },
       "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.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
           "dev": true
         }
       }
@@ -5825,9 +4818,9 @@
       }
     },
     "css-loader": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.3.0.tgz",
-      "integrity": "sha512-x9Y1vvHe5RR+4tzwFdWExPueK00uqFTCw7mZy+9aE/X1SKWOArm5luaOrtJ4d05IpOwJ6S86b/tVcIdhw1Bu4A==",
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-3.4.2.tgz",
+      "integrity": "sha512-jYq4zdZT0oS0Iykt+fqnzVLRIeiPWhka+7BqPn+oSIpWJAHak5tmB/WZrJ2a21JhCeFyNnnlroSl8c+MtVndzA==",
       "dev": true,
       "requires": {
         "camelcase": "^5.3.1",
@@ -5842,20 +4835,6 @@
         "postcss-modules-values": "^3.0.0",
         "postcss-value-parser": "^4.0.2",
         "schema-utils": "^2.6.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==",
-          "dev": true
-        }
       }
     },
     "css-select": {
@@ -5894,12 +4873,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",
@@ -5907,9 +4880,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": {
@@ -6026,9 +4999,9 @@
       "dev": true
     },
     "cypress": {
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.8.0.tgz",
-      "integrity": "sha512-gtEbqCgKETRc3pQFMsELRgIBNgiQg7vbOWTrCi7WE7bgOwNCaW9PEX8Jb3UN8z/maIp9WwzoFfeySfelYY7nRA==",
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-3.8.3.tgz",
+      "integrity": "sha512-I9L/d+ilTPPA4vq3NC1OPKmw7jJIpMKNdyfR8t1EXYzYCjyqbc59migOm1YSse/VRbISLJ+QGb5k4Y3bz2lkYw==",
       "dev": true,
       "requires": {
         "@cypress/listr-verbose-renderer": "0.4.1",
@@ -6042,6 +5015,7 @@
         "commander": "2.15.1",
         "common-tags": "1.8.0",
         "debug": "3.2.6",
+        "eventemitter2": "4.1.2",
         "execa": "0.10.0",
         "executable": "4.1.1",
         "extract-zip": "1.6.7",
@@ -6089,12 +5063,6 @@
           "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=",
           "dev": true
         },
-        "ci-info": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
-          "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
-          "dev": true
-        },
         "cli-cursor": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
@@ -6140,27 +5108,6 @@
             "strip-eof": "^1.0.0"
           }
         },
-        "figures": {
-          "version": "1.7.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
-          "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-          "dev": true,
-          "requires": {
-            "escape-string-regexp": "^1.0.5",
-            "object-assign": "^4.1.0"
-          }
-        },
-        "fs-extra": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-          "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
         "get-stream": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
@@ -6176,15 +5123,6 @@
             "repeating": "^2.0.0"
           }
         },
-        "is-ci": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
-          "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-          "dev": true,
-          "requires": {
-            "ci-info": "^1.5.0"
-          }
-        },
         "listr": {
           "version": "0.12.0",
           "resolved": "https://registry.npmjs.org/listr/-/listr-0.12.0.tgz",
@@ -6334,12 +5272,6 @@
             "cli-cursor": "^1.0.2"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "onetime": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
@@ -6418,15 +5350,6 @@
           "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
           "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
           "dev": true
-        },
-        "tmp": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz",
-          "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==",
-          "dev": true,
-          "requires": {
-            "rimraf": "^2.6.3"
-          }
         }
       }
     },
@@ -6476,11 +5399,12 @@
       "dev": true
     },
     "debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+      "dev": true,
       "requires": {
-        "ms": "2.0.0"
+        "ms": "^2.1.1"
       }
     },
     "decamelize": {
@@ -6521,6 +5445,12 @@
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
       "dev": true
     },
+    "deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true
+    },
     "default-gateway": {
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-5.0.5.tgz",
@@ -6581,9 +5511,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"
@@ -6831,13 +5761,12 @@
       }
     },
     "doctrine": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-      "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2",
-        "isarray": "^1.0.0"
+        "esutils": "^2.0.2"
       }
     },
     "dom-converter": {
@@ -6914,14 +5843,28 @@
       }
     },
     "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"
+      },
+      "dependencies": {
+        "is-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+          "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
+          "dev": true
+        }
       }
     },
+    "dotenv": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
+      "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
+      "dev": true
+    },
     "dotenv-expand": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
@@ -7005,9 +5948,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.361",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.361.tgz",
+      "integrity": "sha512-OzSVjWpsRhJyr9PSAXkeloSe6e9viU2ToGt1wXlXFsGcxuI9vlsnalL+V/AM59Z2pEo3wRxIddtOGsT7Y6x/sQ==",
       "dev": true
     },
     "elegant-spinner": {
@@ -7106,12 +6049,12 @@
       }
     },
     "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": {
@@ -7156,24 +6099,18 @@
       "dev": true
     },
     "escodegen": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
-      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz",
+      "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==",
       "dev": true,
       "requires": {
-        "esprima": "^3.1.3",
+        "esprima": "^4.0.1",
         "estraverse": "^4.2.0",
         "esutils": "^2.0.2",
         "optionator": "^0.8.1",
         "source-map": "~0.6.1"
       },
       "dependencies": {
-        "esprima": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -7184,9 +6121,9 @@
       }
     },
     "eslint": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.7.2.tgz",
-      "integrity": "sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
+      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
@@ -7228,24 +6165,36 @@
         "v8-compile-cache": "^2.0.3"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "ansi-escapes": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz",
+          "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "type-fest": "^0.8.1"
           }
         },
-        "doctrine": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-          "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "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": {
-            "esutils": "^2.0.2"
+            "restore-cursor": "^3.1.0"
           }
         },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
         "eslint-scope": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
@@ -7256,6 +6205,15 @@
             "estraverse": "^4.1.1"
           }
         },
+        "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"
+          }
+        },
         "glob-parent": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
@@ -7284,24 +6242,98 @@
             "resolve-from": "^4.0.0"
           }
         },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+        "inquirer": {
+          "version": "7.0.4",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz",
+          "integrity": "sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==",
+          "dev": true,
+          "requires": {
+            "ansi-escapes": "^4.2.1",
+            "chalk": "^2.4.2",
+            "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.2.0",
+            "rxjs": "^6.5.3",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^5.1.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"
+          }
+        },
         "resolve-from": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
           "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
           "dev": true
         },
+        "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"
+          }
+        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "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"
+          },
+          "dependencies": {
+            "strip-ansi": {
+              "version": "6.0.0",
+              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+              "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+              "dev": true,
+              "requires": {
+                "ansi-regex": "^5.0.0"
+              }
+            }
+          }
+        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -7309,6 +6341,14 @@
           "dev": true,
           "requires": {
             "ansi-regex": "^4.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-json-comments": {
@@ -7316,6 +6356,12 @@
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
           "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
           "dev": true
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
         }
       }
     },
@@ -7326,13 +6372,57 @@
       "dev": true
     },
     "eslint-import-resolver-node": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
-      "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz",
+      "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==",
+      "dev": true,
+      "requires": {
+        "debug": "^2.6.9",
+        "resolve": "^1.13.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "resolve": {
+          "version": "1.15.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
+          "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
+      }
+    },
+    "eslint-import-resolver-webpack": {
+      "version": "0.12.1",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.12.1.tgz",
+      "integrity": "sha512-O/sUAXk6GWrICiN8JUkkjdt9uZpqZHP+FVnTxtEILL6EZMaPSrnP4lGPSFwcKsv7O211maqq4Nz60+dh236hVg==",
       "dev": true,
       "requires": {
+        "array-find": "^1.0.0",
         "debug": "^2.6.9",
-        "resolve": "^1.5.0"
+        "enhanced-resolve": "^0.9.1",
+        "find-root": "^1.1.0",
+        "has": "^1.0.3",
+        "interpret": "^1.2.0",
+        "lodash": "^4.17.15",
+        "node-libs-browser": "^1.0.0 || ^2.0.0",
+        "resolve": "^1.13.1",
+        "semver": "^5.7.1"
       },
       "dependencies": {
         "debug": {
@@ -7343,6 +6433,44 @@
           "requires": {
             "ms": "2.0.0"
           }
+        },
+        "enhanced-resolve": {
+          "version": "0.9.1",
+          "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
+          "integrity": "sha1-TW5omzcl+GCQknzMhs2fFjW4ni4=",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "memory-fs": "^0.2.0",
+            "tapable": "^0.1.8"
+          }
+        },
+        "memory-fs": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
+          "integrity": "sha1-8rslNovBIeORwlIN6Slpyu4KApA=",
+          "dev": true
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "resolve": {
+          "version": "1.15.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
+          "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        },
+        "tapable": {
+          "version": "0.1.10",
+          "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",
+          "integrity": "sha1-KcNXB8K3DlDQdIK10gLo7URtr9Q=",
+          "dev": true
         }
       }
     },
@@ -7360,9 +6488,9 @@
       }
     },
     "eslint-module-utils": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.5.0.tgz",
-      "integrity": "sha512-kCo8pZaNz2dsAW7nCUjuVoI11EBXXpIzfNxmaoLhXoRDOnqXLC4iSGVRdZPhOitfbdEfMEfKOiENaK6wDPZEGw==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz",
+      "integrity": "sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q==",
       "dev": true,
       "requires": {
         "debug": "^2.6.9",
@@ -7378,6 +6506,55 @@
             "ms": "2.0.0"
           }
         },
+        "find-up": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+          "dev": true,
+          "requires": {
+            "locate-path": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "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": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "p-limit": {
+          "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": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
         "pkg-dir": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
@@ -7390,9 +6567,9 @@
       }
     },
     "eslint-plugin-cypress": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.8.1.tgz",
-      "integrity": "sha512-jDpcP+MmjmqQO/x3bwIXgp4cl7Q66RYS5/IsuOQP4Qo2sEqE3DI8tTxBQ1EhnV5qEDd2Z2TYHR+5vYI6oCN4uw==",
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.10.3.tgz",
+      "integrity": "sha512-CvFeoCquShfO8gHNIKA1VpUTz78WtknMebLemBd1lRbcmJNjwpqCqpQYUG/XVja8GjdX/e2TJXYa+EUBxehtUg==",
       "dev": true,
       "requires": {
         "globals": "^11.12.0"
@@ -7417,9 +6594,9 @@
       }
     },
     "eslint-plugin-import": {
-      "version": "2.19.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.19.1.tgz",
-      "integrity": "sha512-x68131aKoCZlCae7rDXKSAQmbT5DQuManyXo2sK6fJJ0aK5CWAkv6A6HJZGgqC8IhjQxYPgo6/IY4Oz8AFsbBw==",
+      "version": "2.20.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz",
+      "integrity": "sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw==",
       "dev": true,
       "requires": {
         "array-includes": "^3.0.3",
@@ -7445,6 +6622,25 @@
             "ms": "2.0.0"
           }
         },
+        "doctrine": {
+          "version": "1.5.0",
+          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "isarray": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "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": "^2.0.0"
+          }
+        },
         "load-json-file": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
@@ -7457,6 +6653,46 @@
             "strip-bom": "^3.0.0"
           }
         },
+        "locate-path": {
+          "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": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
+        "p-limit": {
+          "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": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+          "dev": true,
+          "requires": {
+            "p-limit": "^1.1.0"
+          }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
+        },
         "parse-json": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
@@ -7545,12 +6781,14 @@
       "dev": true
     },
     "eslint-plugin-vue": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.0.1.tgz",
-      "integrity": "sha512-5tgFPcxGDKjfVB/6Yi56bKiWxygUibfZmzSh26Np3kuwAk/lfaGbVld+Yt+MPgD84ppvcachtiL4/winsXLjXA==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-6.2.1.tgz",
+      "integrity": "sha512-MiIDOotoWseIfLIfGeDzF6sDvHkVvGd2JgkvjyHtN3q4RoxdAXrAMuI3SXTOKatljgacKwpNAYShmcKZa4yZzw==",
       "dev": true,
       "requires": {
-        "vue-eslint-parser": "^6.0.5"
+        "natural-compare": "^1.4.0",
+        "semver": "^5.6.0",
+        "vue-eslint-parser": "^7.0.0"
       }
     },
     "eslint-scope": {
@@ -7604,9 +6842,9 @@
       "dev": true
     },
     "esquery": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz",
+      "integrity": "sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==",
       "dev": true,
       "requires": {
         "estraverse": "^4.0.0"
@@ -7645,6 +6883,12 @@
       "integrity": "sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==",
       "dev": true
     },
+    "eventemitter2": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-4.1.2.tgz",
+      "integrity": "sha1-DhqEd6+CGm7zmVsxG/dMI6UkfxU=",
+      "dev": true
+    },
     "eventemitter3": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
@@ -7652,9 +6896,9 @@
       "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": {
@@ -7767,6 +7011,12 @@
           "requires": {
             "is-extendable": "^0.1.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
@@ -7831,6 +7081,12 @@
             "ms": "2.0.0"
           }
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
         "qs": {
           "version": "6.7.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
@@ -7875,6 +7131,17 @@
         "chardet": "^0.7.0",
         "iconv-lite": "^0.4.24",
         "tmp": "^0.0.33"
+      },
+      "dependencies": {
+        "tmp": {
+          "version": "0.0.33",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+          "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+          "dev": true,
+          "requires": {
+            "os-tmpdir": "~1.0.2"
+          }
+        }
       }
     },
     "extglob": {
@@ -7972,6 +7239,12 @@
             "ms": "2.0.0"
           }
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
         "yauzl": {
           "version": "2.4.1",
           "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
@@ -8064,12 +7337,13 @@
       "dev": true
     },
     "figures": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz",
-      "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
       "dev": true,
       "requires": {
-        "escape-string-regexp": "^1.0.5"
+        "escape-string-regexp": "^1.0.5",
+        "object-assign": "^4.1.0"
       }
     },
     "file-entry-cache": {
@@ -8091,6 +7365,13 @@
         "schema-utils": "^2.5.0"
       }
     },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
     "filesize": {
       "version": "3.6.1",
       "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz",
@@ -8143,6 +7424,12 @@
           "requires": {
             "ms": "2.0.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
@@ -8175,13 +7462,19 @@
         "pkg-dir": "^3.0.0"
       }
     },
+    "find-root": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz",
+      "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==",
+      "dev": true
+    },
     "find-up": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-      "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "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": "^2.0.0"
+        "locate-path": "^3.0.0"
       }
     },
     "flat-cache": {
@@ -8223,11 +7516,23 @@
       }
     },
     "follow-redirects": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.10.0.tgz",
+      "integrity": "sha512-4eyLK6s6lH32nOvLLwlIOnr9zrL8Sm+OvW4pVTJNoXeGzYIkHVf+pADQi+OJ0E67hiuSLezPVPyBcIZO50TmmQ==",
+      "dev": true,
       "requires": {
-        "debug": "=3.1.0"
+        "debug": "^3.0.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
       }
     },
     "for-in": {
@@ -8285,9 +7590,9 @@
       }
     },
     "fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+      "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -8296,9 +7601,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"
@@ -8323,14 +7628,15 @@
       "dev": true
     },
     "fsevents": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
-      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+      "version": "1.2.11",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
+      "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
       "dev": true,
       "optional": true,
       "requires": {
+        "bindings": "^1.5.0",
         "nan": "^2.12.1",
-        "node-pre-gyp": "^0.12.0"
+        "node-pre-gyp": "*"
       },
       "dependencies": {
         "abbrev": {
@@ -8378,7 +7684,7 @@
           }
         },
         "chownr": {
-          "version": "1.1.1",
+          "version": "1.1.3",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -8408,7 +7714,7 @@
           "optional": true
         },
         "debug": {
-          "version": "4.1.1",
+          "version": "3.2.6",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -8435,12 +7741,12 @@
           "optional": true
         },
         "fs-minipass": {
-          "version": "1.2.5",
+          "version": "1.2.7",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "^2.6.0"
           }
         },
         "fs.realpath": {
@@ -8466,7 +7772,7 @@
           }
         },
         "glob": {
-          "version": "7.1.3",
+          "version": "7.1.6",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -8495,7 +7801,7 @@
           }
         },
         "ignore-walk": {
-          "version": "3.0.1",
+          "version": "3.0.3",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -8514,7 +7820,7 @@
           }
         },
         "inherits": {
-          "version": "2.0.3",
+          "version": "2.0.4",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -8556,7 +7862,7 @@
           "optional": true
         },
         "minipass": {
-          "version": "2.3.5",
+          "version": "2.9.0",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -8566,12 +7872,12 @@
           }
         },
         "minizlib": {
-          "version": "1.2.1",
+          "version": "1.3.3",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "minipass": "^2.2.1"
+            "minipass": "^2.9.0"
           }
         },
         "mkdirp": {
@@ -8584,24 +7890,24 @@
           }
         },
         "ms": {
-          "version": "2.1.1",
+          "version": "2.1.2",
           "bundled": true,
           "dev": true,
           "optional": true
         },
         "needle": {
-          "version": "2.3.0",
+          "version": "2.4.0",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
-            "debug": "^4.1.0",
+            "debug": "^3.2.6",
             "iconv-lite": "^0.4.4",
             "sax": "^1.2.4"
           }
         },
         "node-pre-gyp": {
-          "version": "0.12.0",
+          "version": "0.14.0",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -8615,7 +7921,7 @@
             "rc": "^1.2.7",
             "rimraf": "^2.6.1",
             "semver": "^5.3.0",
-            "tar": "^4"
+            "tar": "^4.4.2"
           }
         },
         "nopt": {
@@ -8629,13 +7935,22 @@
           }
         },
         "npm-bundled": {
-          "version": "1.0.6",
+          "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.1",
+          "version": "1.4.7",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -8706,7 +8021,7 @@
           "optional": true
         },
         "process-nextick-args": {
-          "version": "2.0.0",
+          "version": "2.0.1",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -8747,7 +8062,7 @@
           }
         },
         "rimraf": {
-          "version": "2.6.3",
+          "version": "2.7.1",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -8774,7 +8089,7 @@
           "optional": true
         },
         "semver": {
-          "version": "5.7.0",
+          "version": "5.7.1",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -8827,18 +8142,18 @@
           "optional": true
         },
         "tar": {
-          "version": "4.4.8",
+          "version": "4.4.13",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
             "chownr": "^1.1.1",
             "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.4",
-            "minizlib": "^1.1.1",
+            "minipass": "^2.8.6",
+            "minizlib": "^1.2.1",
             "mkdirp": "^0.5.0",
             "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
+            "yallist": "^3.0.3"
           }
         },
         "util-deprecate": {
@@ -8863,7 +8178,7 @@
           "optional": true
         },
         "yallist": {
-          "version": "3.0.3",
+          "version": "3.1.1",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -8882,6 +8197,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",
@@ -8916,17 +8237,6 @@
       "dev": true,
       "requires": {
         "async": "2.6.1"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.6.1",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
-          "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
-          "dev": true,
-          "requires": {
-            "lodash": "^4.17.10"
-          }
-        }
       }
     },
     "getpass": {
@@ -9046,26 +8356,6 @@
       "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
       "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",
@@ -9141,12 +8431,6 @@
         "kind-of": "^4.0.0"
       },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
         "kind-of": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
@@ -9169,9 +8453,9 @@
       }
     },
     "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": {
@@ -9197,13 +8481,10 @@
       "dev": true
     },
     "highlight.js": {
-      "version": "9.17.0",
-      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.17.0.tgz",
-      "integrity": "sha512-PyO7FK7z8ZC7FqBlmAxm4d+1DYaoS6+uaxt9KGkyP1AnmGRLnWmNod1yp9BFjUyHoDF00k+V57gF6X9ifY7f/A==",
-      "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",
@@ -9223,9 +8504,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.6",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.6.tgz",
+      "integrity": "sha512-Kp6rShEsCHhF5dD3EWKdkgVA8ix90oSUJ0VY4g9goxxa0+f4lx63muTftn0mlJ/+8IESGWyKnP//V2D7S4ZbIQ==",
       "dev": true
     },
     "hpack.js": {
@@ -9273,6 +8554,12 @@
       "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
       "dev": true
     },
+    "html-escaper": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz",
+      "integrity": "sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==",
+      "dev": true
+    },
     "html-minifier": {
       "version": "3.5.21",
       "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz",
@@ -9293,36 +8580,6 @@
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
           "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
           "dev": true
-        },
-        "he": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-          "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-          "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
-            }
-          }
         }
       }
     },
@@ -9394,9 +8651,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",
@@ -9413,16 +8670,24 @@
       "dev": true
     },
     "http-errors": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
-      "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
       "dev": true,
       "requires": {
         "depd": "~1.1.2",
-        "inherits": "2.0.4",
+        "inherits": "2.0.3",
         "setprototypeof": "1.1.1",
         "statuses": ">= 1.5.0 < 2",
         "toidentifier": "1.0.0"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+          "dev": true
+        }
       }
     },
     "http-parser-js": {
@@ -9556,149 +8821,75 @@
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
-    },
-    "indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
-    "indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-      "dev": true
-    },
-    "infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "dev": true
-    },
-    "inquirer": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.0.tgz",
-      "integrity": "sha512-rSdC7zelHdRQFkWnhsMu2+2SO41mpv2oF2zy4tMhmiLWkcKbOAs87fWAJhVXttKVwhdZvymvnuM95EyEXg2/tQ==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^2.4.2",
-        "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.2.0",
-        "rxjs": "^6.4.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^5.1.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz",
-          "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.8.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "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"
-          }
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "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
-        },
-        "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"
-          }
-        },
-        "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==",
+    },
+    "indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true
+    },
+    "indexes-of": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+      "dev": true
+    },
+    "infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "dev": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "inquirer": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+      "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "^3.2.0",
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-width": "^2.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^2.0.0",
+        "lodash": "^4.17.12",
+        "mute-stream": "0.0.7",
+        "run-async": "^2.2.0",
+        "rxjs": "^6.4.0",
+        "string-width": "^2.1.0",
+        "strip-ansi": "^5.1.0",
+        "through": "^2.3.6"
+      },
+      "dependencies": {
+        "figures": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+          "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
           "dev": true,
           "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "6.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-              "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^5.0.0"
-              }
-            }
+            "escape-string-regexp": "^1.0.5"
           }
         },
         "strip-ansi": {
@@ -9708,14 +8899,6 @@
           "dev": true,
           "requires": {
             "ansi-regex": "^4.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
-            }
           }
         }
       }
@@ -9781,9 +8964,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": {
@@ -9801,12 +8984,6 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -9840,9 +9017,10 @@
       }
     },
     "is-buffer": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-      "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -9851,12 +9029,12 @@
       "dev": true
     },
     "is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
       "dev": true,
       "requires": {
-        "ci-info": "^2.0.0"
+        "ci-info": "^1.5.0"
       }
     },
     "is-color-stop": {
@@ -9882,12 +9060,6 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -9943,13 +9115,10 @@
       "dev": true
     },
     "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz",
+      "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==",
+      "dev": true
     },
     "is-fullwidth-code-point": {
       "version": "2.0.0",
@@ -9980,17 +9149,6 @@
       "requires": {
         "global-dirs": "^0.1.0",
         "is-path-inside": "^1.0.0"
-      },
-      "dependencies": {
-        "is-path-inside": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
-          "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
-          "dev": true,
-          "requires": {
-            "path-is-inside": "^1.0.1"
-          }
-        }
       }
     },
     "is-number": {
@@ -10002,12 +9160,6 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -10047,15 +9199,26 @@
       "dev": true,
       "requires": {
         "is-path-inside": "^2.1.0"
+      },
+      "dependencies": {
+        "is-path-inside": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+          "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+          "dev": true,
+          "requires": {
+            "path-is-inside": "^1.0.2"
+          }
+        }
       }
     },
     "is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
       "dev": true,
       "requires": {
-        "path-is-inside": "^1.0.2"
+        "path-is-inside": "^1.0.1"
       }
     },
     "is-plain-obj": {
@@ -10106,6 +9269,12 @@
       "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
       "dev": true
     },
+    "is-string": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
+      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
+      "dev": true
+    },
     "is-svg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz",
@@ -10236,21 +9405,6 @@
         "source-map": "^0.6.1"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -10260,12 +9414,12 @@
       }
     },
     "istanbul-reports": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz",
-      "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==",
+      "version": "2.2.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz",
+      "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==",
       "dev": true,
       "requires": {
-        "handlebars": "^4.1.2"
+        "html-escaper": "^2.0.0"
       }
     },
     "javascript-stringify": {
@@ -10284,6 +9438,21 @@
         "jest-cli": "^24.9.0"
       },
       "dependencies": {
+        "ci-info": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+          "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+          "dev": true
+        },
+        "is-ci": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+          "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^2.0.0"
+          }
+        },
         "jest-cli": {
           "version": "24.9.0",
           "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz",
@@ -10418,9 +9587,9 @@
           "dev": true
         },
         "cssstyle": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.0.0.tgz",
-          "integrity": "sha512-QXSAu2WBsSRXCPjvI43Y40m6fMevvyRm8JVAuF9ksQz5jha4pWP1wpaK7Yu5oLFc6+XAY+hj8YhefyXcBB53gg==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz",
+          "integrity": "sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==",
           "dev": true,
           "requires": {
             "cssom": "~0.3.6"
@@ -10497,13 +9666,10 @@
           }
         },
         "ws": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.0.tgz",
-          "integrity": "sha512-+SqNqFbwTm/0DC18KYzIsMTnEWpLwJsiasW/O17la4iDRRIO9uaHbvKiAS3AHgTiuuWerK/brj4O6MYZkei9xg==",
-          "dev": true,
-          "requires": {
-            "async-limiter": "^1.0.0"
-          }
+          "version": "7.2.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz",
+          "integrity": "sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==",
+          "dev": true
         }
       }
     },
@@ -10781,6 +9947,21 @@
         "source-map": "^0.6.0"
       },
       "dependencies": {
+        "ci-info": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+          "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+          "dev": true
+        },
+        "is-ci": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+          "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+          "dev": true,
+          "requires": {
+            "ci-info": "^2.0.0"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -10851,6 +10032,12 @@
           "requires": {
             "ansi-regex": "^4.1.0"
           }
+        },
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "dev": true
         }
       }
     },
@@ -10891,9 +10078,9 @@
       }
     },
     "js-beautify": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.2.tgz",
-      "integrity": "sha512-ZtBYyNUYJIsBWERnQP0rPN9KjkrDfJcMjuVGcvXOUJrD1zmOGwhRwQ4msG+HJ+Ni/FA7+sRQEMYVzdTQDvnzvQ==",
+      "version": "1.10.3",
+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.3.tgz",
+      "integrity": "sha512-wfk/IAWobz1TfApSdivH5PJ0miIHgDoYb1ugSqHcODPmaYu46rYe5FVuIEkhjg8IQiv6rDNPyhsqbsohI/C2vQ==",
       "dev": true,
       "requires": {
         "config-chain": "^1.1.12",
@@ -10903,12 +10090,6 @@
         "nopt": "~4.0.1"
       }
     },
-    "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",
@@ -11067,9 +10248,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
     },
     "kleur": {
@@ -11130,6 +10311,15 @@
       "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": {
+        "leven": "^3.1.0"
+      }
+    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -11685,12 +10875,12 @@
       }
     },
     "locate-path": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-      "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "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": "^2.0.0",
+        "p-locate": "^3.0.0",
         "path-exists": "^3.0.0"
       }
     },
@@ -11811,9 +11001,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.7",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz",
+      "integrity": "sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==",
       "dev": true
     },
     "loose-envify": {
@@ -11851,9 +11041,9 @@
       }
     },
     "make-error": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
-      "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
       "dev": true
     },
     "makeerror": {
@@ -12047,9 +11237,9 @@
       "dev": true
     },
     "mini-css-extract-plugin": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz",
-      "integrity": "sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw==",
+      "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",
@@ -12231,9 +11421,10 @@
       }
     },
     "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "multicast-dns": {
       "version": "6.2.3",
@@ -12252,9 +11443,9 @@
       "dev": true
     },
     "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
       "dev": true
     },
     "mz": {
@@ -12427,9 +11618,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.42",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.42.tgz",
-      "integrity": "sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA==",
+      "version": "1.1.50",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.50.tgz",
+      "integrity": "sha512-lgAmPv9eYZ0bGwUYAKlr8MG6K4CvWliWqnkcT2P8mMAgVrH3lqfBPorFlxiG1pHQnqmavJZ9vbMXUTNyMLbrgQ==",
       "dev": true,
       "requires": {
         "semver": "^6.3.0"
@@ -12551,12 +11742,6 @@
             "is-descriptor": "^0.1.0"
           }
         },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -12707,24 +11892,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",
@@ -12840,21 +12007,21 @@
       "dev": true
     },
     "p-limit": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz",
+      "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==",
       "dev": true,
       "requires": {
-        "p-try": "^1.0.0"
+        "p-try": "^2.0.0"
       }
     },
     "p-locate": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-      "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "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": "^1.1.0"
+        "p-limit": "^2.0.0"
       }
     },
     "p-map": {
@@ -12882,15 +12049,15 @@
       }
     },
     "p-try": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "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
     },
     "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": {
@@ -13094,71 +12261,26 @@
       "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
       "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
-      "requires": {
-        "node-modules-regexp": "^1.0.0"
-      }
-    },
-    "pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "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.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.0.0"
-          }
-        },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        }
+      "requires": {
+        "pinkie": "^2.0.0"
+      }
+    },
+    "pirates": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
+      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+      "dev": true,
+      "requires": {
+        "node-modules-regexp": "^1.0.0"
+      }
+    },
+    "pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+      "dev": true,
+      "requires": {
+        "find-up": "^3.0.0"
       }
     },
     "please-upgrade-node": {
@@ -13176,6 +12298,15 @@
       "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
       "dev": true
     },
+    "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",
@@ -13187,6 +12318,15 @@
         "mkdirp": "^0.5.1"
       },
       "dependencies": {
+        "async": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+          "dev": true,
+          "requires": {
+            "lodash": "^4.17.14"
+          }
+        },
         "debug": {
           "version": "3.2.6",
           "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
@@ -13195,12 +12335,6 @@
           "requires": {
             "ms": "^2.1.1"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
@@ -13211,9 +12345,9 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.24",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.24.tgz",
-      "integrity": "sha512-Xl0XvdNWg+CblAXzNvbSOUvgJXwSjmbAKORqyw9V2AlHrm1js2gFw9y3jibBAhpKZi8b5JzJCVh/FyzPsTtgTA==",
+      "version": "7.0.27",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz",
+      "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
@@ -13239,15 +12373,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": {
@@ -13261,6 +12394,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": {
@@ -13271,6 +12412,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": {
@@ -13354,6 +12503,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": {
@@ -13371,12 +12528,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"
           }
@@ -13391,6 +12548,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": {
@@ -13403,6 +12568,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": {
@@ -13417,6 +12590,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": {
@@ -13432,12 +12613,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"
           }
@@ -13463,31 +12644,6 @@
         "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": {
@@ -13498,25 +12654,6 @@
       "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": {
@@ -13547,6 +12684,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": {
@@ -13559,6 +12704,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": {
@@ -13571,6 +12724,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": {
@@ -13582,6 +12743,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": {
@@ -13593,6 +12762,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": {
@@ -13604,6 +12781,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": {
@@ -13616,6 +12801,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": {
@@ -13626,6 +12819,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": {
@@ -13637,6 +12838,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": {
@@ -13661,15 +12870,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"
       }
@@ -13684,6 +12901,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": {
@@ -13698,9 +12923,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.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz",
+      "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==",
       "dev": true
     },
     "prelude-ls": {
@@ -13796,13 +13021,13 @@
       "dev": true
     },
     "prompts": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.0.tgz",
-      "integrity": "sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz",
+      "integrity": "sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.3"
+        "sisteransi": "^1.0.4"
       }
     },
     "proto-list": {
@@ -13812,13 +13037,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": {
@@ -13963,6 +13188,18 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
       "dev": true
     },
+    "raw-body": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.1.0",
+        "http-errors": "1.7.2",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      }
+    },
     "react-is": {
       "version": "16.12.0",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz",
@@ -13970,14 +13207,29 @@
       "dev": true
     },
     "read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
       "dev": true,
       "requires": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
+        "@types/normalize-package-data": "^2.4.0",
+        "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"
+          }
+        }
       }
     },
     "read-pkg-up": {
@@ -13990,55 +13242,23 @@
         "read-pkg": "^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.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
+        "read-pkg": {
           "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==",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.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
         }
       }
     },
     "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",
@@ -14155,9 +13375,9 @@
       "dev": true
     },
     "regjsparser": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
-      "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.3.tgz",
+      "integrity": "sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA==",
       "dev": true,
       "requires": {
         "jsesc": "~0.5.0"
@@ -14433,9 +13653,9 @@
       "dev": true
     },
     "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz",
+      "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==",
       "dev": true,
       "requires": {
         "is-promise": "^2.1.0"
@@ -14504,37 +13724,27 @@
       }
     },
     "sass": {
-      "version": "1.24.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.24.0.tgz",
-      "integrity": "sha512-1TsPyMhLTx+9DLlmwg02iBW2p4poGA7LlkWJLpUY/XticFKNhPcx+l4FsIJLKl6oSUfXmAKpVljHEez1hwjqiw==",
+      "version": "1.26.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.26.1.tgz",
+      "integrity": "sha512-DWtzW0jDu+96MYkEdM8vUigjpisvM9qSlDwNvTFcr+XC7o2+3aXSAbHNcJ+8HzD1857uW9Opbxgu39esytVUKA==",
       "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": {
-        "schema-utils": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.5.0.tgz",
-          "integrity": "sha512-32ISrwW2scPXHUSusP8qMg5dLUawKkyV+/qIEV9JdXKx+rsM6mi8vZY8khg2M69Qom16rtroWXD3Ybtiws38gQ==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.10.2",
-            "ajv-keywords": "^3.4.1"
-          }
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -14559,9 +13769,9 @@
       }
     },
     "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.4",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz",
+      "integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==",
       "dev": true,
       "requires": {
         "ajv": "^6.10.2",
@@ -14695,6 +13905,12 @@
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
           "dev": true
         },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
+        },
         "setprototypeof": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
@@ -14912,6 +14128,12 @@
           "requires": {
             "is-extendable": "^0.1.0"
           }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+          "dev": true
         }
       }
     },
@@ -14975,12 +14197,6 @@
         "kind-of": "^3.2.0"
       },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -15033,12 +14249,6 @@
           "requires": {
             "websocket-driver": ">=0.5.1"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
@@ -15064,12 +14274,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",
@@ -15143,23 +14353,6 @@
         "http-deceiver": "^1.2.7",
         "select-hose": "^2.0.0",
         "spdy-transport": "^3.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
       }
     },
     "spdy-transport": {
@@ -15176,25 +14369,10 @@
         "wbuf": "^1.7.3"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "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",
@@ -15258,9 +14436,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": {
@@ -15381,49 +14559,32 @@
       }
     },
     "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": "2.1.1",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "dev": true,
       "requires": {
-        "emoji-regex": "^7.0.1",
         "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
+        "strip-ansi": "^4.0.0"
       },
       "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+          "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==",
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "^3.0.0"
           }
         }
       }
     },
-    "string.prototype.padend": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz",
-      "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.4.3",
-        "function-bind": "^1.0.2"
-      }
-    },
-    "string.prototype.padstart": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/string.prototype.padstart/-/string.prototype.padstart-3.0.0.tgz",
-      "integrity": "sha1-W8+tOfRkm7LQMSkuGbzwtRDUskI=",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.4.3",
-        "function-bind": "^1.0.2"
-      }
-    },
     "string.prototype.trimleft": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
@@ -15523,12 +14684,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"
           }
@@ -15602,6 +14763,28 @@
         "lodash": "^4.17.14",
         "slice-ansi": "^2.1.0",
         "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "tapable": {
@@ -15611,9 +14794,9 @@
       "dev": true
     },
     "terser": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.4.2.tgz",
-      "integrity": "sha512-Uufrsvhj9O1ikwgITGsZ5EZS6qPokUOkCegS7fYOdGTv+OA90vndUbU6PEjr5ePqHfNUbGyMO7xyIZv2MhsALQ==",
+      "version": "4.6.4",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.4.tgz",
+      "integrity": "sha512-5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -15762,12 +14945,12 @@
       "dev": true
     },
     "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz",
+      "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==",
       "dev": true,
       "requires": {
-        "os-tmpdir": "~1.0.2"
+        "rimraf": "^2.6.3"
       }
     },
     "tmpl": {
@@ -15797,12 +14980,6 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -15882,9 +15059,9 @@
       "dev": true
     },
     "ts-jest": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-24.2.0.tgz",
-      "integrity": "sha512-Yc+HLyldlIC9iIK8xEN7tV960Or56N49MDP7hubCZUeI7EbIOTsas6rXCMB4kQjLACJ7eDOF4xWEO5qumpKsag==",
+      "version": "24.3.0",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-24.3.0.tgz",
+      "integrity": "sha512-Hb94C/+QRIgjVZlJyiWwouYUF+siNJHJHknyspaOcZ+OQAIdFG/UrdQVXw/0B8Z3No34xkUXZJpOTy9alOWdVQ==",
       "dev": true,
       "requires": {
         "bs-logger": "0.x",
@@ -15916,6 +15093,12 @@
         }
       }
     },
+    "ts-pnp": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.1.6.tgz",
+      "integrity": "sha512-CrG5GqAAzMT7144Cl+UIFP7mz/iIhiy+xQ6GGcnjTezhALT02uPMRw7tgDSESgB5MsfKt55+GPWw4ir1kVtMIQ==",
+      "dev": true
+    },
     "tsconfig": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/tsconfig/-/tsconfig-7.0.0.tgz",
@@ -15965,9 +15148,9 @@
       }
     },
     "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
       "dev": true
     },
     "type-is": {
@@ -15987,22 +15170,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
         }
       }
     },
@@ -16286,9 +15473,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": {
@@ -16319,62 +15506,46 @@
       "integrity": "sha512-th5xVbInVoyIoe+qY+9GCflEVezxAvztD4xpFF39SRQYqpoKD2qkmX8yv08jJG9a2SgNOCjirjJGSwg/wTrbmA=="
     },
     "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.1.3",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
+          "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
           "dev": true
         }
       }
     },
     "vue-eslint-parser": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-6.0.5.tgz",
-      "integrity": "sha512-Bvjlx7rH1Ulvus56KHeLXOjEi3JMOYTa1GAqZr9lBQhd8weK8mV7U7V2l85yokBZEWHJQjLn6X3nosY8TzkOKg==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.0.0.tgz",
+      "integrity": "sha512-yR0dLxsTT7JfD2YQo9BhnQ6bUTLsZouuzt9SKRP7XNaZJV459gvlsJo4vT2nhZ/2dH9j3c53bIx9dnqU2prM9g==",
       "dev": true,
       "requires": {
         "debug": "^4.1.1",
-        "eslint-scope": "^4.0.0",
-        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^5.0.0",
+        "eslint-scope": "^5.0.0",
+        "eslint-visitor-keys": "^1.1.0",
+        "espree": "^6.1.2",
         "esquery": "^1.0.1",
-        "lodash": "^4.17.11"
+        "lodash": "^4.17.15"
       },
       "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "espree": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
-          "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
+        "eslint-scope": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
+          "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
           "dev": true,
           "requires": {
-            "acorn": "^6.0.7",
-            "acorn-jsx": "^5.0.0",
-            "eslint-visitor-keys": "^1.0.0"
+            "esrecurse": "^4.1.0",
+            "estraverse": "^4.1.1"
           }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
         }
       }
     },
@@ -16403,22 +15574,30 @@
       }
     },
     "vue-loader": {
-      "version": "15.7.2",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.7.2.tgz",
-      "integrity": "sha512-H/P9xt/nkocyu4hZKg5TzPqyCT1oKOaCSk9zs0JCbJuy0Q8KtR0bjJpnT/5R5x/Ckd1GFkkLQnQ1C4x6xXeLZg==",
+      "version": "15.9.0",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.0.tgz",
+      "integrity": "sha512-FeDHvTSpwyLeF7LIV1PYkvqUQgTJ8UmOxhSlCyRSxaXCKk+M6NF4tDQsLsPPNeDPyR7TfRQ8MLg6v+8PsDV9xQ==",
       "dev": true,
       "requires": {
-        "@vue/component-compiler-utils": "^3.0.0",
+        "@vue/component-compiler-utils": "^3.1.0",
         "hash-sum": "^1.0.2",
         "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.1.6",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.6.tgz",
+      "integrity": "sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA=="
     },
     "vue-style-loader": {
       "version": "4.1.2",
@@ -16428,6 +15607,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-svg-loader": {
@@ -16457,14 +15644,14 @@
       "dev": true
     },
     "vuelidate": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.4.tgz",
-      "integrity": "sha512-QHZWYOL325Zo+2K7VBNEJTZ496Kd8Z31p85aQJFldKudUUGBmgw4zu4ghl4CyqPwjRCmqZ9lDdx4FSdMnu4fGg=="
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/vuelidate/-/vuelidate-0.7.5.tgz",
+      "integrity": "sha512-GAAG8QAFVp7BFeQlNaThpTbimq3+HypBPNwdkCkHZZeVaD5zmXXfhp357dcUJXHXTZjSln0PvP6wiwLZXkFTwg=="
     },
     "vuetify": {
-      "version": "2.1.15",
-      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.1.15.tgz",
-      "integrity": "sha512-M35NJvlzkbCpFfsK08xraNvCpiNCIbYUXI/hkzjWHQV1MFIZnjrDTVtYoiudCyJ52zlrhWezAr4pzFOCLAr6RA=="
+      "version": "2.2.15",
+      "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.2.15.tgz",
+      "integrity": "sha512-okz+Q7YfCkLLJsxdldlYWUHcbRX/G+fo/0zSS3rXU+Ir76sxZzIOkSsqox1exFWQJn1PqA0itiHR0QTWygv8VA=="
     },
     "vuetify-loader": {
       "version": "1.4.3",
@@ -16545,9 +15732,9 @@
       "dev": true
     },
     "webpack": {
-      "version": "4.41.2",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.2.tgz",
-      "integrity": "sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==",
+      "version": "4.41.6",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.6.tgz",
+      "integrity": "sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA==",
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
@@ -16570,7 +15757,7 @@
         "node-libs-browser": "^2.2.1",
         "schema-utils": "^1.0.0",
         "tapable": "^1.1.3",
-        "terser-webpack-plugin": "^1.4.1",
+        "terser-webpack-plugin": "^1.4.3",
         "watchpack": "^1.6.0",
         "webpack-sources": "^1.4.1"
       },
@@ -16621,13 +15808,13 @@
       }
     },
     "webpack-chain": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.0.0.tgz",
-      "integrity": "sha512-NK62XgJOOSmYs4kaXFIKKeClpuOVHY7m6e4XwxbVX/2HAUboH6xFCTVXMVv8+jB6K8o/UGjlo1Cv3XXOyNAAGw==",
+      "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",
-        "javascript-stringify": "^2.0.0"
+        "javascript-stringify": "^2.0.1"
       },
       "dependencies": {
         "deepmerge": {
@@ -16652,9 +15839,9 @@
       }
     },
     "webpack-dev-server": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz",
-      "integrity": "sha512-E6uQ4kRrTX9URN9s/lIbqTAztwEPdvzVrcmHE8EQ9YnuT9J8Es5Wrd8n9BKg1a0oZ5EgEke/EQFgUsp18dSTBw==",
+      "version": "3.10.3",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.10.3.tgz",
+      "integrity": "sha512-e4nWev8YzEVNdOMcNzNeCN947sWJNd43E5XvsJzbAL08kGc2frm1tQ32hTJslRS+H65LCb/AaUCYU7fjHCpDeQ==",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
@@ -16672,7 +15859,7 @@
         "ip": "^1.1.5",
         "is-absolute-url": "^3.0.3",
         "killable": "^1.0.1",
-        "loglevel": "^1.6.4",
+        "loglevel": "^1.6.6",
         "opn": "^5.5.0",
         "p-retry": "^3.0.1",
         "portfinder": "^1.0.25",
@@ -16726,24 +15913,6 @@
             }
           }
         },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
         "get-caller-file": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
@@ -16756,46 +15925,15 @@
           "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
           "dev": true
         },
-        "locate-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-          "dev": true,
-          "requires": {
-            "p-try": "^2.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+        "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=",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "number-is-nan": "^1.0.0"
           }
         },
-        "p-try": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-          "dev": true
-        },
         "require-main-filename": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
@@ -16819,33 +15957,6 @@
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
-          "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^3.0.0"
-              }
-            }
-          }
-        },
         "strip-ansi": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -16874,15 +15985,6 @@
             "strip-ansi": "^3.0.1"
           },
           "dependencies": {
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-              "dev": true,
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
             "string-width": {
               "version": "1.0.2",
               "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -17038,12 +16140,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",
@@ -17064,6 +16160,17 @@
         "strip-ansi": "^5.0.0"
       },
       "dependencies": {
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
         "strip-ansi": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
@@ -17158,48 +16265,25 @@
         "yargs-parser": "^13.1.1"
       },
       "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.2.1",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-          "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+        "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": {
-            "p-try": "^2.0.0"
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.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==",
+        "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": {
-            "p-limit": "^2.0.0"
+            "ansi-regex": "^4.1.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
         }
       }
     },
@@ -17246,12 +16330,6 @@
         "strip-indent": "^2.0.0"
       },
       "dependencies": {
-        "ci-info": {
-          "version": "1.6.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
-          "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==",
-          "dev": true
-        },
         "cross-spawn": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
@@ -17284,15 +16362,6 @@
           "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
           "dev": true
         },
-        "is-ci": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
-          "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-          "dev": true,
-          "requires": {
-            "ci-info": "^1.5.0"
-          }
-        },
         "lru-cache": {
           "version": "4.1.5",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index e8f3c76a89..a312dba5b3 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,43 +13,43 @@
     "start": "vue-cli-service serve"
   },
   "dependencies": {
-    "@mdi/font": "^4.7.95",
-    "axios": "^0.19.0",
+    "@mdi/font": "^4.9.95",
+    "axios": "^0.19.2",
     "hal-json-normalizer": "^2.1.2",
     "inter-ui": "^3.12.1",
     "lodash": "^4.17.15",
     "slugify": "^1.3.6",
     "vue": "^2.6.11",
     "vue-axios": "^2.1.5",
-    "vue-router": "^3.1.3",
-    "vuelidate": "^0.7.4",
-    "vuetify": "^2.1.15",
+    "vue-router": "^3.1.6",
+    "vuelidate": "^0.7.5",
+    "vuetify": "^2.2.15",
     "vuex": "^3.1.2"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.1.1",
-    "@vue/cli-plugin-e2e-cypress": "^4.1.1",
-    "@vue/cli-plugin-eslint": "^4.1.1",
-    "@vue/cli-plugin-unit-jest": "^4.1.1",
-    "@vue/cli-service": "^4.1.1",
-    "@vue/eslint-config-standard": "^5.0.1",
-    "@vue/test-utils": "^1.0.0-beta.30",
+    "@vue/cli-plugin-babel": "^4.2.2",
+    "@vue/cli-plugin-e2e-cypress": "^4.2.2",
+    "@vue/cli-plugin-eslint": "^4.2.2",
+    "@vue/cli-plugin-unit-jest": "^4.2.2",
+    "@vue/cli-service": "^4.2.2",
+    "@vue/eslint-config-standard": "^5.1.2",
+    "@vue/test-utils": "^1.0.0-beta.31",
     "axios-mock-adapter": "^1.17.0",
-    "babel-eslint": "^10.0.3",
+    "babel-eslint": "^10.1.0",
     "coveralls": "^3.0.9",
-    "eslint": "^6.7.2",
-    "eslint-plugin-import": "^2.19.1",
+    "eslint": "^6.8.0",
+    "eslint-plugin-import": "^2.20.1",
     "eslint-plugin-node": "^10.0.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
-    "eslint-plugin-vue": "^6.0.1",
+    "eslint-plugin-vue": "^6.2.1",
     "lint-staged": "^9.5.0",
-    "sass": "^1.24.0",
-    "sass-loader": "^8.0.0",
-    "vuetify-loader": "^1.3.0",
-    "vue-cli-plugin-vuetify": "^2.0.2",
+    "sass": "^1.26.1",
+    "sass-loader": "^8.0.2",
+    "vue-cli-plugin-vuetify": "^2.0.5",
     "vue-svg-loader": "^0.15.0",
-    "vue-template-compiler": "^2.6.11"
+    "vue-template-compiler": "^2.6.11",
+    "vuetify-loader": "^1.3.0"
   },
   "eslintConfig": {
     "root": true,

From 06c5e18a2156de329267780b3a4e944dfecd2afb Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:24:09 +0100
Subject: [PATCH 24/85] Added profile link in login

---
 .../eCampApi/src/eCampApi/V1/Rpc/Auth/AuthController.php  | 2 ++
 .../src/eCampApi/V1/Rpc/Index/IndexController.php         | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/backend/module/eCampApi/src/eCampApi/V1/Rpc/Auth/AuthController.php b/backend/module/eCampApi/src/eCampApi/V1/Rpc/Auth/AuthController.php
index 9420b76b68..190ea42920 100644
--- a/backend/module/eCampApi/src/eCampApi/V1/Rpc/Auth/AuthController.php
+++ b/backend/module/eCampApi/src/eCampApi/V1/Rpc/Auth/AuthController.php
@@ -57,9 +57,11 @@ public function indexAction() {
         }
         if ($user != null) {
             $data['user'] = $user->getDisplayName();
+            $data['username'] = $user->getUsername();
             $data['role'] = $user->getRole();
         } else {
             $data['user'] = 'guest';
+            $data['username'] = 'guest';
             $data['role'] = 'guest';
         }
 
diff --git a/backend/module/eCampApi/src/eCampApi/V1/Rpc/Index/IndexController.php b/backend/module/eCampApi/src/eCampApi/V1/Rpc/Index/IndexController.php
index 3eb6d4a8d8..81ed10cbce 100644
--- a/backend/module/eCampApi/src/eCampApi/V1/Rpc/Index/IndexController.php
+++ b/backend/module/eCampApi/src/eCampApi/V1/Rpc/Index/IndexController.php
@@ -37,6 +37,14 @@ public function indexAction() {
         }
         if ($user != null) {
             $data['user'] = $user->getDisplayName();
+
+            $data['profile'] = Link::factory([
+                'rel' => 'profile',
+                'route' => [
+                    'name' => 'e-camp-api.rest.doctrine.user',
+                    'params' => [ 'user_id' => $userId ]
+                ]
+            ]);
         } else {
             $data['user'] = 'guest';
         }

From c8f437315f13e9d5d94a1f482bc7ff148317f528 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 1 Mar 2020 00:26:02 +0100
Subject: [PATCH 25/85] Linted

---
 frontend/src/components/Search.vue        |  5 ++---
 frontend/src/components/camp/Basic.vue    |  2 +-
 frontend/src/components/form/ApiInput.vue | 11 ++++-------
 frontend/src/layouts/CampLayout.vue       |  5 ++---
 frontend/src/layouts/DefaultLayout.vue    |  2 +-
 frontend/src/views/Camps.vue              |  4 ++--
 6 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/Search.vue b/frontend/src/components/Search.vue
index e884674ad4..9b85d2f586 100644
--- a/frontend/src/components/Search.vue
+++ b/frontend/src/components/Search.vue
@@ -6,9 +6,8 @@
                   solo-inverted single-line
                   flat class="align-center px-2"
                   append-icon="mdi-magnify"
-                  @focus="searchFocused = true"
-                  @blur="searchFocused = false"
-                  color="white" dense />
+                  color="white" dense
+                  @focus="searchFocused = true" @blur="searchFocused = false" />
   </v-responsive>
 </template>
 
diff --git a/frontend/src/components/camp/Basic.vue b/frontend/src/components/camp/Basic.vue
index 3f5f3a9de5..71781bb3f8 100644
--- a/frontend/src/components/camp/Basic.vue
+++ b/frontend/src/components/camp/Basic.vue
@@ -11,7 +11,7 @@ Displays details on a single camp and allows to edit them.
           label="Name"
           :editing="false"
           fieldname="name"
-          :value="camp().name"/>
+          :value="camp().name" />
         <api-input
           :value="camp().title"
           :uri="camp()._meta.self"
diff --git a/frontend/src/components/form/ApiInput.vue b/frontend/src/components/form/ApiInput.vue
index 1d13a66c2a..98b684ae0e 100644
--- a/frontend/src/components/form/ApiInput.vue
+++ b/frontend/src/components/form/ApiInput.vue
@@ -5,13 +5,13 @@ You can two-way bind to the value using v-model.
 
 <template>
   <div class="mb-4">
-    <v-text-field v-if="!editing" :label="label"
-                  hide-details="auto"
-                  v-model="value" readonly />
+    <v-text-field v-if="!editing" v-model="value"
+                  :label="label"
+                  hide-details="auto" readonly />
     <v-text-field
       v-if="editing"
-      class="api-input"
       v-model="localValue"
+      class="api-input"
       :label="label"
       name="api-input"
       hide-details="auto"
@@ -21,7 +21,6 @@ You can two-way bind to the value using v-model.
       required
       @input="onInput"
       @blur="$v.localValue.$touch()">
-
       <template slot="append-outer">
         <v-btn
           v-if="!autoSave"
@@ -29,7 +28,6 @@ You can two-way bind to the value using v-model.
           color="warning"
           class="mb-0"
           @click="reset">
-
           Reset
         </v-btn>
 
@@ -38,7 +36,6 @@ You can two-way bind to the value using v-model.
           :disabled="isSaving || (required && $v.localValue.$invalid)"
           class="mb-0"
           @click="save">
-
           <v-progress-circular
             v-if="isSaving"
             indeterminate
diff --git a/frontend/src/layouts/CampLayout.vue b/frontend/src/layouts/CampLayout.vue
index 2e7167e7db..16076deb2a 100644
--- a/frontend/src/layouts/CampLayout.vue
+++ b/frontend/src/layouts/CampLayout.vue
@@ -29,7 +29,6 @@
                app
                clipped-left
                color="blue-grey darken-4" dark>
-
       <v-toolbar-items>
         <v-btn text class="px-2"
                min-width="0" rounded
@@ -58,7 +57,7 @@
         </v-btn>
       </v-toolbar-items>
       <v-spacer />
-      <global-search/>
+      <global-search />
       <v-menu offset-y dark
               right content-class="ec-usermenu"
               transition="slide-y-transition"
@@ -68,7 +67,7 @@
             <v-btn right text
                    :class="{ 'v-btn--open': value }" v-on="on">
               <span v-if="loggedIn" class="sr-only-sm-and-down">
-              {{ username }}
+                {{ username }}
               </span>
               <v-icon class="ma-2">mdi-account</v-icon>
             </v-btn>
diff --git a/frontend/src/layouts/DefaultLayout.vue b/frontend/src/layouts/DefaultLayout.vue
index 83b0412e72..2a79a1dbd2 100644
--- a/frontend/src/layouts/DefaultLayout.vue
+++ b/frontend/src/layouts/DefaultLayout.vue
@@ -24,7 +24,7 @@
             <v-btn right text
                    :class="{ 'v-btn--open': value }" v-on="on">
               <span v-if="loggedIn" class="sr-only-sm-and-down">
-              {{ username }}
+                {{ username }}
               </span>
               <v-icon class="ma-2">mdi-account</v-icon>
             </v-btn>
diff --git a/frontend/src/views/Camps.vue b/frontend/src/views/Camps.vue
index a82eb59185..ae6932e5e9 100644
--- a/frontend/src/views/Camps.vue
+++ b/frontend/src/views/Camps.vue
@@ -2,8 +2,8 @@
   <card-view title="Meine Camps" max-width="600">
     <v-list class="py-0">
       <template v-if="camps._meta.loading">
-        <v-skeleton-loader type="list-item-two-line" height="64"/>
-        <v-skeleton-loader type="list-item-two-line" height="64"/>
+        <v-skeleton-loader type="list-item-two-line" height="64" />
+        <v-skeleton-loader type="list-item-two-line" height="64" />
       </template>
       <v-list-item
         v-for="camp in camps.items"

From 2cf421b7e61715e1df1dc4e94c0f16edbc20e0dd Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Fri, 6 Mar 2020 21:06:07 +0100
Subject: [PATCH 26/85] Implemented the filter as instructed by @carlobeltrame

https://github.com/ecamp/ecamp3/pull/376#discussion_r387620285
https://github.com/ecamp/ecamp3/pull/376#discussion_r387718631
---
 frontend/src/components/Picasso.vue   | 10 ++--------
 frontend/src/main.js                  | 10 +++++-----
 frontend/src/store/storeValueProxy.js |  1 +
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/Picasso.vue b/frontend/src/components/Picasso.vue
index 85264d5551..8c87e8bd09 100644
--- a/frontend/src/components/Picasso.vue
+++ b/frontend/src/components/Picasso.vue
@@ -8,8 +8,8 @@ Listing all given event instances in a calendar view.
     :events="eventInstances"
     event-start="start_time"
     event-end="end_time"
-    :event-name="getEventName"
-    :event-color="getEventColor"
+    :event-name="getEventName | loading('Lädt…', ({ input }) => input.event()._meta.loading)"
+    :event-color="getEventColor | loading('grey lighten-2', eventInstance => eventInstance.event()._meta.loading)"
     interval-height="42"
     interval-width="46"
     :interval-format="getIntervalFormat"
@@ -55,15 +55,9 @@ export default {
   },
   methods: {
     getEventName (event, _) {
-      if (event.input.event()._meta.loading) {
-        return 'Lädt…'
-      }
       return '(' + event.input.number + ') ' + event.input.event().event_category().short + ': ' + event.input.event().title
     },
     getEventColor (event, _) {
-      if (event.event()._meta.loading) {
-        return 'grey lighten-2'
-      }
       return event.event().event_category().color.toString()
     },
     getIntervalFormat (time) {
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 1f2738ac3a..69e0a93540 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -8,12 +8,12 @@ import vuetify from './plugins/vuetify'
 Vue.component('empty-layout', () => import('./layouts/EmptyLayout'))
 Vue.component('default-layout', () => import('./layouts/DefaultLayout'))
 Vue.component('camp-layout', () => import('./layouts/CampLayout'))
-Vue.filter('loading', function (value, loadingState) {
-  if (typeof value === 'function' && value().loading) {
-    return loadingState
-  } else {
-    return value
+Vue.filter('loading', function (value, loadingState, isLoading = v => typeof v === 'function' && v.loading) {
+  if (typeof value === 'function' && !value.loading) {
+    // Wrap the function that is passed into the | loading filter
+    return (v, ...args) => isLoading(v) ? loadingState : value(v, ...args)
   }
+  return isLoading(value) ? loadingState : value
 })
 
 new Vue({
diff --git a/frontend/src/store/storeValueProxy.js b/frontend/src/store/storeValueProxy.js
index 358b41d0a1..9d3fabc571 100644
--- a/frontend/src/store/storeValueProxy.js
+++ b/frontend/src/store/storeValueProxy.js
@@ -76,6 +76,7 @@ function loadingProxy (entityLoaded, uri = null) {
       }
       // Normal property access: return a function that yields another loadingProxy and renders as empty string
       const result = () => loadingProxy(propertyLoaded.then(property => property()._meta.load))
+      result.loading = true
       result.toString = () => ''
       return result
     }

From 045fc2f1e724fb904ff9ce8850474e254a016064 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Fri, 13 Mar 2020 23:40:49 +0100
Subject: [PATCH 27/85] Changed structure to only use the `vue-router` and no
 layouts, which improves rendering and loading between states.

---
 frontend/src/App.vue                          | 131 +++++++++-
 frontend/src/components/Picasso.vue           |   5 +-
 frontend/src/components/base/BackButton.vue   |  16 ++
 .../src/components/{ => base}/CardView.vue    |   9 +-
 frontend/src/components/camp/Basic.vue        |   2 +-
 frontend/src/components/camp/CampPicasso.vue  |   2 +-
 .../src/components/camp/Collaborators.vue     |   2 +-
 frontend/src/components/global/Logo.vue       |  32 +++
 frontend/src/layouts/CampLayout.vue           | 226 ------------------
 frontend/src/layouts/DefaultLayout.vue        | 194 ---------------
 frontend/src/layouts/EmptyLayout.vue          |  14 --
 frontend/src/main.js                          |   3 -
 frontend/src/router.js                        |  68 ++++--
 frontend/src/scss/global.scss                 |   1 +
 frontend/src/views/BottomBar.vue              |  19 ++
 frontend/src/views/Camps.vue                  |  63 ++---
 frontend/src/views/Event.vue                  |  85 -------
 frontend/src/views/Home.vue                   |  96 ++++----
 frontend/src/views/Periods.vue                |  51 ----
 frontend/src/views/Profile.vue                |  39 +--
 frontend/src/views/TopBar.vue                 |  88 +++++++
 frontend/src/views/auth/Login.vue             | 151 ++++++------
 frontend/src/views/auth/LoginCallback.vue     |  20 +-
 frontend/src/views/auth/Register.vue          | 115 ++++-----
 frontend/src/views/auth/RegisterDone.vue      |  49 ++--
 frontend/src/views/auth/TopBar.vue            |  22 ++
 frontend/src/views/camp/BottomBar.vue         |  35 +++
 frontend/src/views/{ => camp}/Camp.vue        |   4 +-
 frontend/src/views/camp/Periods.vue           |  55 +++++
 frontend/src/views/camp/SideBar.vue           |  40 ++++
 frontend/src/views/camp/TopBar.vue            | 108 +++++++++
 frontend/src/views/{ => event}/DayPicasso.vue |  28 ++-
 frontend/src/views/event/Event.vue            |  85 +++++++
 33 files changed, 957 insertions(+), 901 deletions(-)
 create mode 100644 frontend/src/components/base/BackButton.vue
 rename frontend/src/components/{ => base}/CardView.vue (77%)
 create mode 100644 frontend/src/components/global/Logo.vue
 delete mode 100644 frontend/src/layouts/CampLayout.vue
 delete mode 100644 frontend/src/layouts/DefaultLayout.vue
 delete mode 100644 frontend/src/layouts/EmptyLayout.vue
 create mode 100644 frontend/src/views/BottomBar.vue
 delete mode 100644 frontend/src/views/Event.vue
 delete mode 100644 frontend/src/views/Periods.vue
 create mode 100644 frontend/src/views/TopBar.vue
 create mode 100644 frontend/src/views/auth/TopBar.vue
 create mode 100644 frontend/src/views/camp/BottomBar.vue
 rename frontend/src/views/{ => camp}/Camp.vue (75%)
 create mode 100644 frontend/src/views/camp/Periods.vue
 create mode 100644 frontend/src/views/camp/SideBar.vue
 create mode 100644 frontend/src/views/camp/TopBar.vue
 rename frontend/src/views/{ => event}/DayPicasso.vue (54%)
 create mode 100644 frontend/src/views/event/Event.vue

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 7e4b01329a..dd7f405ec5 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,25 +1,132 @@
 <template>
-  <div id="app">
-    <component :is="layout">
+  <v-app>
+    <router-view name="topbar" />
+
+    <router-view name="aside" />
+
+    <!-- main content -->
+    <v-content>
       <router-view />
-    </component>
-  </div>
+    </v-content>
+
+    <router-view name="bottombar" />
+
+    <!-- footer -->
+    <v-footer v-if="$vuetify.breakpoint.mdAndUp"
+              app color="grey lighten-5">
+      eCamp v0.1.0
+    </v-footer>
+  </v-app>
 </template>
 
 <script>
-const defaultLayout = 'default'
-
 export default {
-  name: 'App',
-  computed: {
-    layout () {
-      return (this.$route.meta.layout || defaultLayout) + '-layout'
-    }
-  }
+  name: 'App'
 }
 </script>
 <style lang="scss">
   @import "src/scss/global";
   // consider replacing with CDN for production
   @import '../node_modules/@mdi/font/css/materialdesignicons.css';
+
+  .v-navigation-drawer--temporary.v-navigation-drawer--clipped {
+    z-index: 5;
+    margin-top: 116px;
+  }
+
+  .v-btn.ec-drawer-collapse {
+    right: 0;
+  }
+
+  .v-content {
+    height: 100vh;
+    position: relative;
+  }
+
+  .v-app-bar .v-toolbar__content {
+    padding-left: 0;
+    padding-right: 0;
+    width: 100%;
+  }
+
+  .v-content__wrap {
+    overflow: scroll;
+    position: static;
+  }
+
+  .user-nav {
+    border-top-left-radius: 0!important;
+    border-top-right-radius: 0!important;
+  }
+
+  .v-navigation-drawer--temporary.v-navigation-drawer--clipped {
+    z-index: 5;
+    margin-top: 116px;
+  }
+
+  .v-btn--open {
+    background: #B0BEC5 !important;
+    color: rgba(0, 0, 0, 0.87) !important;
+  }
+
+  .ec-usermenu {
+    border-top-left-radius: 0 !important;
+    border-top-right-radius: 0 !important;
+    right: 0;
+    left: inherit !important;
+
+    .v-list {
+      border-radius: 0;
+    }
+  }
+
+  .v-app-bar .v-toolbar__content {
+    padding-left: 0;
+    padding-right: 0;
+    width: 100%;
+  }
+
+  .v-navigation-drawer__content .v-card {
+    border-top-left-radius: 0 !important;
+    border-top-right-radius: 0 !important;
+  }
+
+  @media #{map-get($display-breakpoints, 'xs-only')}{
+    .v-content .container {
+      min-height: calc(100% - 56px);
+      display: flex;
+
+      .v-card {
+        margin-left: 0 !important;
+        margin-right: 0 !important;
+        flex: auto;
+      }
+    }
+  }
+
+  .ec-menu-left {
+    left: 0 !important;
+    font-feature-settings: 'tnum';
+  }
+
+  @media #{map-get($display-breakpoints, 'sm-and-down')}{
+    .container.container--fluid {
+      padding: 0;
+
+      & > .v-card {
+        border-radius: 0;
+      }
+    }
+    .sr-only-sm-and-down {
+      position: absolute;
+      width: 1px;
+      height: 1px;
+      padding: 0;
+      overflow: hidden;
+      clip: rect(0, 0, 0, 0);
+      white-space: nowrap;
+      clip-path: inset(50%);
+      border: 0;
+    }
+  }
 </style>
diff --git a/frontend/src/components/Picasso.vue b/frontend/src/components/Picasso.vue
index 8c87e8bd09..d6b72bdcd7 100644
--- a/frontend/src/components/Picasso.vue
+++ b/frontend/src/components/Picasso.vue
@@ -10,7 +10,7 @@ Listing all given event instances in a calendar view.
     event-end="end_time"
     :event-name="getEventName | loading('Lädt…', ({ input }) => input.event()._meta.loading)"
     :event-color="getEventColor | loading('grey lighten-2', eventInstance => eventInstance.event()._meta.loading)"
-    interval-height="42"
+    :interval-height="intervalHeight"
     interval-width="46"
     :interval-format="getIntervalFormat"
     first-interval="5"
@@ -35,7 +35,8 @@ export default {
     eventInstances: { type: Array, required: true },
     start: { type: Date, required: true },
     end: { type: Date, required: true },
-    type: { type: String, required: false, default: 'week' }
+    type: { type: String, required: false, default: 'week' },
+    intervalHeight: { type: Number, required: false, default: 42 }
   },
   data () {
     return {
diff --git a/frontend/src/components/base/BackButton.vue b/frontend/src/components/base/BackButton.vue
new file mode 100644
index 0000000000..167e7f537b
--- /dev/null
+++ b/frontend/src/components/base/BackButton.vue
@@ -0,0 +1,16 @@
+<template>
+  <v-btn v-if="$vuetify.breakpoint.xsOnly" aria-label="Zurück"
+         icon @click="$router.go(-1)">
+    <v-icon>mdi-arrow-left</v-icon>
+  </v-btn>
+</template>
+
+<script>
+export default {
+  name: 'BackButton'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/components/CardView.vue b/frontend/src/components/base/CardView.vue
similarity index 77%
rename from frontend/src/components/CardView.vue
rename to frontend/src/components/base/CardView.vue
index 815261ee01..6ad6c13c81 100644
--- a/frontend/src/components/CardView.vue
+++ b/frontend/src/components/base/CardView.vue
@@ -1,8 +1,11 @@
 <template>
   <v-card :max-width="maxWidth" class="mx-auto">
-    <v-card-title v-if="title">
-      {{ title }}
-    </v-card-title>
+    <slot name="title">
+      <v-card-title v-if="title">
+        <v-icon v-if="icon" left>{{ icon }}</v-icon>
+        {{ title }}
+      </v-card-title>
+    </slot>
     <v-skeleton-loader v-if="!loaded" type="article" />
     <slot v-else />
   </v-card>
diff --git a/frontend/src/components/camp/Basic.vue b/frontend/src/components/camp/Basic.vue
index 71781bb3f8..04e9fd7c86 100644
--- a/frontend/src/components/camp/Basic.vue
+++ b/frontend/src/components/camp/Basic.vue
@@ -41,7 +41,7 @@ Displays details on a single camp and allows to edit them.
 </template>
 
 <script>
-import CardView from '../CardView'
+import CardView from '../base/CardView'
 import ApiInput from '../form/ApiInput'
 export default {
   name: 'Basic',
diff --git a/frontend/src/components/camp/CampPicasso.vue b/frontend/src/components/camp/CampPicasso.vue
index 48db05285d..35bec2860f 100644
--- a/frontend/src/components/camp/CampPicasso.vue
+++ b/frontend/src/components/camp/CampPicasso.vue
@@ -81,7 +81,7 @@ Listing all event instances of a single period.
   </card-view>
 </template>
 <script>
-import CardView from '../CardView'
+import CardView from '../base/CardView'
 
 export default {
   name: 'CampPicassso',
diff --git a/frontend/src/components/camp/Collaborators.vue b/frontend/src/components/camp/Collaborators.vue
index 15fc16f4a5..228caf4567 100644
--- a/frontend/src/components/camp/Collaborators.vue
+++ b/frontend/src/components/camp/Collaborators.vue
@@ -212,7 +212,7 @@ Displays collaborators of a single camp.
   </card-view>
 </template>
 <script>
-import CardView from '../CardView'
+import CardView from '../base/CardView'
 
 export default {
   name: 'Collaborators',
diff --git a/frontend/src/components/global/Logo.vue b/frontend/src/components/global/Logo.vue
new file mode 100644
index 0000000000..c77081bc6c
--- /dev/null
+++ b/frontend/src/components/global/Logo.vue
@@ -0,0 +1,32 @@
+<template>
+  <v-toolbar-items>
+    <v-btn text class="px-2"
+           min-width="0" rounded
+           exact :to="{ name: 'home'}">
+      <v-toolbar-title>
+        <i>🏕</i>️<span v-if="text" class="ml-4 mr-2">eCamp</span>
+      </v-toolbar-title>
+    </v-btn>
+    <slot/>
+  </v-toolbar-items>
+</template>
+
+<script>
+import { campRoute } from '@/router'
+
+export default {
+  name: 'Logo',
+  props: {
+    text: { type: Boolean, default: false }
+  },
+  computed: {
+    campHome () {
+      return this.camp ? campRoute(this.camp, 'picasso') : false
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/layouts/CampLayout.vue b/frontend/src/layouts/CampLayout.vue
deleted file mode 100644
index 16076deb2a..0000000000
--- a/frontend/src/layouts/CampLayout.vue
+++ /dev/null
@@ -1,226 +0,0 @@
-<template>
-  <v-app>
-    <!-- left side drawer (desktop)-->
-    <v-navigation-drawer v-if="$vuetify.breakpoint.smAndUp"
-                         v-model="drawer" app
-                         clipped permanent
-                         :mini-variant.sync="mini"
-                         mini-variant-width="40"
-                         color="blue-grey lighten-4">
-      <v-btn v-if="mini" icon>
-        <v-icon>mdi-format-list-bulleted-triangle</v-icon>
-      </v-btn>
-      <v-spacer />
-      <v-btn v-if="!mini" icon
-             fixed
-             class="ec-drawer-collapse ma-2"
-             style="z-index: 10;"
-             right @click.stop="mini = !mini">
-        <v-icon>mdi-chevron-left</v-icon>
-      </v-btn>
-
-      <v-divider />
-
-      <router-view v-if="!mini" name="aside" />
-    </v-navigation-drawer>
-
-    <!-- second menu/tool bar -->
-    <v-app-bar v-if="$vuetify.breakpoint.smAndUp"
-               app
-               clipped-left
-               color="blue-grey darken-4" dark>
-      <v-toolbar-items>
-        <v-btn text class="px-2"
-               min-width="0" rounded
-               exact :to="{ name: 'home'}">
-          <v-toolbar-title>
-            <i>🏕</i>️
-          </v-toolbar-title>
-        </v-btn>
-        <v-btn text class="justify-start px-2"
-               exact :to="campRoute(camp(), 'picasso')"
-               width="216">
-          <v-toolbar-title>
-            {{ camp().title | loading('Camp wird geladen…') }}
-          </v-toolbar-title>
-        </v-btn>
-      </v-toolbar-items>
-
-      <v-toolbar-items>
-        <v-btn text :to="campRoute(camp(), 'collaborators')">
-          <v-icon :left="$vuetify.breakpoint.mdAndUp">mdi-account-group</v-icon>
-          <span class="sr-only-sm-and-down">Team</span>
-        </v-btn>
-        <v-btn text :to="campRoute(camp(), 'admin')" exact>
-          <v-icon :left="$vuetify.breakpoint.mdAndUp">mdi-cogs</v-icon>
-          <span class="sr-only-sm-and-down">Admin</span>
-        </v-btn>
-      </v-toolbar-items>
-      <v-spacer />
-      <global-search />
-      <v-menu offset-y dark
-              right content-class="ec-usermenu"
-              transition="slide-y-transition"
-              z-index="5">
-        <template v-slot:activator="{ on,value }">
-          <v-toolbar-items>
-            <v-btn right text
-                   :class="{ 'v-btn--open': value }" v-on="on">
-              <span v-if="loggedIn" class="sr-only-sm-and-down">
-                {{ username }}
-              </span>
-              <v-icon class="ma-2">mdi-account</v-icon>
-            </v-btn>
-          </v-toolbar-items>
-        </template>
-        <v-list dense class="user-nav"
-                light color="blue-grey lighten-5">
-          <v-list-item block
-                       exact :to="{ name: 'camps', params: { groupName: encodeURI('Pfadi Bewegung Schweiz') } }">
-            <v-icon left>mdi-format-list-bulleted-triangle</v-icon>
-            <span>Meine Camps</span>
-          </v-list-item>
-          <v-list-item v-if="loggedIn" block @click="logout">
-            <v-icon v-if="logoutIcon" left>{{ logoutIcon }}</v-icon>
-            <v-progress-circular v-else indeterminate
-                                 size="18" class="mr-2" />
-            <span>Log out</span>
-          </v-list-item>
-          <v-list-item v-else :to="{ name: 'login' }" block>
-            <v-icon left>mdi-login</v-icon>
-            <span>Log in</span>
-          </v-list-item>
-        </v-list>
-      </v-menu>
-    </v-app-bar>
-
-    <!-- main content -->
-    <v-content>
-      <v-container
-        fluid>
-        <router-view />
-      </v-container>
-    </v-content>
-
-    <v-bottom-navigation v-if="$vuetify.breakpoint.xs" fixed grow>
-      <v-btn>
-        <span>Material</span>
-        <v-icon>mdi-package-variant</v-icon>
-      </v-btn>
-      <v-btn>
-        <span>Tasks</span>
-        <v-icon>mdi-format-list-checks</v-icon>
-      </v-btn>
-      <v-btn :to="{name: 'camp/picasso'}">
-        <span>Camp</span>
-        <v-icon large>mdi-tent</v-icon>
-      </v-btn>
-      <v-btn :to="{name: 'camp/collaborators'}" exact>
-        <span>Team</span>
-        <v-icon>mdi-account-group</v-icon>
-      </v-btn>
-      <v-btn :to="{name: 'camp/admin'}">
-        <span>Admin</span>
-        <v-icon>mdi-cogs</v-icon>
-      </v-btn>
-    </v-bottom-navigation>
-
-    <!-- footer -->
-    <v-footer v-if="$vuetify.breakpoint.mdAndUp"
-              app color="grey lighten-5">
-      eCamp v0.0.1
-    </v-footer>
-  </v-app>
-</template>
-
-<script>
-import { campRoute, campFromRoute } from '@/router'
-import GlobalSearch from '../components/Search'
-
-export default {
-  components: { GlobalSearch },
-  data () {
-    return {
-      editableCampButton: false,
-      drawer: false,
-      mini: !this.$vuetify.breakpoint.mdAndUp,
-      logoutIcon: 'mdi-logout'
-    }
-  },
-  computed: {
-    loggedIn () {
-      return this.$auth.isLoggedIn()
-    },
-    lastCamps () {
-      return this.api.get().camps()
-    },
-    camp () {
-      return campFromRoute(this.$route)
-    },
-    username () {
-      return this.$auth.username()
-    }
-  },
-  created () {
-    this.$vuetify.theme.themes.dark.grey = 'ffcc00'
-  },
-  methods: {
-    logout () {
-      this.logoutIcon = ''
-      this.$auth.logout().then(() => this.$router.replace({ name: 'login' }))
-    },
-    changeCamp (selectedCamp) {
-      this.$router.push(campRoute(selectedCamp))
-    },
-    prevent (event) {
-      event.stopImmediatePropagation()
-      event.preventDefault()
-      event.cancelBubble = true
-      return null
-    },
-    campRoute
-  }
-}
-</script>
-
-<style lang="scss">
-  .v-navigation-drawer--temporary.v-navigation-drawer--clipped {
-    z-index: 5;
-    margin-top: 116px;
-  }
-
-  .v-btn.ec-drawer-collapse {
-    right: 0;
-  }
-
-  .v-content {
-    height: 100vh;
-    position: relative;
-  }
-
-  .v-content__wrap {
-    overflow: scroll;
-    position: static;
-  }
-
-  @media #{map-get($display-breakpoints, 'sm-and-down')}{
-    .container.container--fluid {
-      padding: 0;
-
-      & > .v-card {
-        border-radius: 0;
-      }
-    }
-    .sr-only-sm-and-down {
-      position: absolute;
-      width: 1px;
-      height: 1px;
-      padding: 0;
-      overflow: hidden;
-      clip: rect(0, 0, 0, 0);
-      white-space: nowrap;
-      clip-path: inset(50%);
-      border: 0;
-    }
-  }
-</style>
diff --git a/frontend/src/layouts/DefaultLayout.vue b/frontend/src/layouts/DefaultLayout.vue
deleted file mode 100644
index 2a79a1dbd2..0000000000
--- a/frontend/src/layouts/DefaultLayout.vue
+++ /dev/null
@@ -1,194 +0,0 @@
-<template>
-  <v-app>
-    <!-- second menu/tool bar -->
-    <v-app-bar v-if="$vuetify.breakpoint.smAndUp"
-               app
-               clipped-left hide-on-scroll
-               color="blue-grey darken-4" dark>
-      <v-toolbar-items>
-        <v-btn text class="px-2"
-               exact :to="{ name: 'home'}">
-          <v-toolbar-title>
-            <i>🏕</i>️<span class="ml-4 mr-2">eCamp<sup class="blue-grey--text">v3</sup></span>
-          </v-toolbar-title>
-        </v-btn>
-      </v-toolbar-items>
-      <v-spacer />
-      <global-search />
-      <v-menu offset-y dark
-              right content-class="ec-usermenu"
-              transition="slide-y-transition"
-              z-index="5">
-        <template v-slot:activator="{ on,value }">
-          <v-toolbar-items>
-            <v-btn right text
-                   :class="{ 'v-btn--open': value }" v-on="on">
-              <span v-if="loggedIn" class="sr-only-sm-and-down">
-                {{ username }}
-              </span>
-              <v-icon class="ma-2">mdi-account</v-icon>
-            </v-btn>
-          </v-toolbar-items>
-        </template>
-        <v-list dense
-                light color="blue-grey lighten-5">
-          <v-list-item block
-                       exact :to="{ name: 'camps', params: { groupName: encodeURI('Pfadi Bewegung Schweiz') } }">
-            <v-icon left>mdi-format-list-bulleted-triangle</v-icon>
-            <span>Meine Camps</span>
-          </v-list-item>
-          <v-list-item v-if="loggedIn" block @click="logout">
-            <v-icon v-if="logoutIcon" left>{{ logoutIcon }}</v-icon>
-            <v-progress-circular v-else indeterminate
-                                 size="18" class="mr-2" />
-            <span>Log out</span>
-          </v-list-item>
-          <v-list-item v-else :to="{ name: 'login' }" block>
-            <v-icon left>mdi-login</v-icon>
-            <span>Log in</span>
-          </v-list-item>
-        </v-list>
-      </v-menu>
-    </v-app-bar>
-
-    <!-- main content -->
-    <v-content>
-      <v-container
-        fluid>
-        <router-view />
-      </v-container>
-    </v-content>
-
-    <v-bottom-navigation v-if="loggedIn && $vuetify.breakpoint.xs" fixed grow>
-      <v-btn :to="{name: 'home'}" exact>
-        <span>Home</span>
-        <v-icon>mdi-home</v-icon>
-      </v-btn>
-      <v-btn :to="{name: 'camps'}" exact>
-        <span>Camps</span>
-        <v-icon>mdi-format-list-bulleted-triangle</v-icon>
-      </v-btn>
-      <v-btn :to="{name: 'profile'}">
-        <span>Profile</span>
-        <v-icon>mdi-account</v-icon>
-      </v-btn>
-    </v-bottom-navigation>
-
-    <!-- footer -->
-    <v-footer v-if="$vuetify.breakpoint.mdAndUp"
-              app color="grey lighten-5">
-      eCamp v0.0.1
-    </v-footer>
-  </v-app>
-</template>
-
-<script>
-import GlobalSearch from '../components/Search'
-
-export default {
-  components: { GlobalSearch },
-  data () {
-    return {
-      editableCampButton: false,
-      drawer: false,
-      mini: !this.$vuetify.breakpoint.mdAndUp,
-      logoutIcon: 'mdi-logout'
-    }
-  },
-  computed: {
-    loggedIn () {
-      return this.$auth.isLoggedIn()
-    },
-    username () {
-      return this.$auth.username()
-    }
-  },
-  created () {
-    this.$vuetify.theme.themes.dark.grey = 'ffcc00'
-  },
-  methods: {
-    logout () {
-      this.logoutIcon = ''
-      this.$auth.logout().then(() => this.$router.replace({ name: 'login' }))
-    },
-    prevent (event) {
-      event.stopImmediatePropagation()
-      event.preventDefault()
-      event.cancelBubble = true
-      return null
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-  .v-navigation-drawer--temporary.v-navigation-drawer--clipped {
-    z-index: 5;
-    margin-top: 116px;
-  }
-
-  .v-btn--open {
-    background: #B0BEC5 !important;
-    color: rgba(0, 0, 0, 0.87) !important;
-  }
-
-  .ec-usermenu {
-    border-top-left-radius: 0 !important;
-    border-top-right-radius: 0 !important;
-    right: 0;
-    left: inherit !important;
-    .v-list {
-      border-radius: 0;
-    }
-  }
-
-  .v-app-bar .v-toolbar__content {
-    padding-left: 0;
-    padding-right: 0;
-    width: 100%;
-  }
-
-  .v-navigation-drawer__content .v-card {
-    border-top-left-radius: 0!important;
-    border-top-right-radius: 0!important;
-  }
-
-  @media #{map-get($display-breakpoints, 'xs-only')}{
-    .v-content .container {
-      min-height: calc(100% - 56px);
-      display: flex;
-
-      .v-card {
-        margin-left: 0 !important;
-        margin-right: 0 !important;
-        flex: auto;
-      }
-    }
-  }
-
-  @media #{map-get($display-breakpoints, 'sm-and-down')}{
-    .container.container--fluid {
-      padding: 0;
-
-      & > .v-card {
-        border-radius: 0;
-      }
-    }
-    .sr-only-sm-and-down {
-      position: absolute;
-      width: 1px;
-      height: 1px;
-      padding: 0;
-      overflow: hidden;
-      clip: rect(0, 0, 0, 0);
-      white-space: nowrap;
-      clip-path: inset(50%);
-      border: 0;
-    }
-  }
-
-  .ec-menu-left {
-    left: 0 !important;
-    font-feature-settings: 'tnum';
-  }
-</style>
diff --git a/frontend/src/layouts/EmptyLayout.vue b/frontend/src/layouts/EmptyLayout.vue
deleted file mode 100644
index 5a5cd921eb..0000000000
--- a/frontend/src/layouts/EmptyLayout.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-<template>
-  <v-app>
-    <router-view />
-  </v-app>
-</template>
-
-<script>
-export default {
-}
-
-</script>
-
-<style lang="scss">
-</style>
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 69e0a93540..86f549a443 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -5,9 +5,6 @@ import router from '@/router'
 import store from './store'
 import vuetify from './plugins/vuetify'
 
-Vue.component('empty-layout', () => import('./layouts/EmptyLayout'))
-Vue.component('default-layout', () => import('./layouts/DefaultLayout'))
-Vue.component('camp-layout', () => import('./layouts/CampLayout'))
 Vue.filter('loading', function (value, loadingState, isLoading = v => typeof v === 'function' && v.loading) {
   if (typeof value === 'function' && !value.loading) {
     // Wrap the function that is passed into the | loading filter
diff --git a/frontend/src/router.js b/frontend/src/router.js
index e563890b78..8eaf45928d 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -12,51 +12,72 @@ export default new Router({
     {
       path: '/register',
       name: 'register',
-      meta: { layout: 'empty' },
-      component: () => import(/* webpackChunkName: "register" */ './views/auth/Register.vue')
+      components: {
+        topbar: () => import(/* webpackChunkName: "register" */ './views/auth/TopBar'),
+        default: () => import(/* webpackChunkName: "register" */ './views/auth/Register')
+      }
     },
     {
       path: '/register-done',
       name: 'register-done',
-      meta: { layout: 'empty' },
-      component: () => import(/* webpackChunkName: "register" */ './views/auth/RegisterDone.vue')
+      components: {
+        topbar: () => import(/* webpackChunkName: "register" */ './views/auth/TopBar'),
+        default: () => import(/* webpackChunkName: "register" */ './views/auth/RegisterDone')
+      }
     },
     {
       path: '/login',
       name: 'login',
-      meta: { layout: 'empty' },
-      component: () => import(/* webpackChunkName: "login" */ './views/auth/Login.vue')
+      components: {
+        topbar: () => import(/* webpackChunkName: "register" */ './views/auth/TopBar'),
+        default: () => import(/* webpackChunkName: "login" */ './views/auth/Login')
+      }
     },
     {
       path: '/loginCallback',
       name: 'loginCallback',
-      component: () => import(/* webpackChunkName: "login" */ './views/auth/LoginCallback.vue')
+      components: {
+        topbar: () => import(/* webpackChunkName: "register" */ './views/auth/TopBar'),
+        default: () => import(/* webpackChunkName: "login" */ './views/auth/LoginCallback')
+      }
     },
     {
       path: '/',
       name: 'home',
-      component: () => import(/* webpackChunkName: "about" */ './views/Home.vue'),
+      components: {
+        topbar: () => import(/* webpackChunkName: "register" */ './views/TopBar'),
+        default: () => import(/* webpackChunkName: "about" */ './views/Home'),
+        bottombar: () => import(/* webpackChunkName: "register" */ './views/BottomBar')
+      },
       beforeEnter: requireAuth
     },
     {
       path: '/profile',
       name: 'profile',
-      component: () => import(/* webpackChunkName: "about" */ './views/Profile.vue'),
+      components: {
+        topbar: () => import(/* webpackChunkName: "register" */ './views/TopBar'),
+        default: () => import(/* webpackChunkName: "about" */ './views/Profile'),
+        bottombar: () => import(/* webpackChunkName: "register" */ './views/BottomBar')
+      },
       beforeEnter: requireAuth
     },
     {
       path: '/camps',
       name: 'camps',
       components: {
-        default: () => import(/* webpackChunkName: "camps" */ './views/Camps.vue')
+        topbar: () => import(/* webpackChunkName: "register" */ './views/TopBar'),
+        default: () => import(/* webpackChunkName: "camps" */ './views/Camps'),
+        bottombar: () => import(/* webpackChunkName: "register" */ './views/BottomBar')
       },
       beforeEnter: requireAuth
     },
     {
       path: '/camps/:campId/:campTitle?',
       components: {
-        default: () => import(/* webpackChunkName: "camp" */ './views/Camp.vue'),
-        aside: () => import(/* webpackChunkName: "periods" */ './views/Periods.vue')
+        topbar: () => import(/* webpackChunkName: "register" */ './views/camp/TopBar'),
+        default: () => import(/* webpackChunkName: "camp" */ './views/camp/Camp'),
+        aside: () => import(/* webpackChunkName: "periods" */ './views/camp/Periods'),
+        bottombar: () => import(/* webpackChunkName: "register" */ './views/camp/BottomBar')
       },
       beforeEnter: requireAuth,
       props: {
@@ -67,8 +88,7 @@ export default new Router({
         {
           path: 'collaborators',
           name: 'camp/collaborators',
-          component: () => import(/* webpackChunkName: "campCollaborators" */ './components/camp/Collaborators.vue'),
-          meta: { layout: 'camp' }
+          component: () => import(/* webpackChunkName: "campCollaborators" */ './components/camp/Collaborators.vue')
         },
         {
           path: '',
@@ -79,26 +99,25 @@ export default new Router({
           path: 'picasso',
           name: 'camp/picasso',
           alias: '',
-          component: () => import(/* webpackChunkName: "campPicasso" */ './components/camp/CampPicasso.vue'),
-          meta: { layout: 'camp' }
+          component: () => import(/* webpackChunkName: "campPicasso" */ './components/camp/CampPicasso.vue')
         },
         {
           path: 'admin',
           name: 'camp/admin',
-          component: () => import(/* webpackChunkName: "campDetails" */ './components/camp/Basic.vue'),
-          meta: { layout: 'camp' }
+          component: () => import(/* webpackChunkName: "campDetails" */ './components/camp/Basic.vue')
         }
       ]
     },
     {
-      path: '/camps/:campId/:campTitle?/events/:eventInstanceId/:eventName?',
+      path: '/camps/:campId/:campTitle/events/:eventInstanceId/:eventName?',
       name: 'event',
       components: {
-        default: () => import(/* webpackChunkName: "event" */ './views/Event.vue'),
-        aside: () => import(/* webpackChunkName: "day" */ './views/DayPicasso.vue')
+        topbar: () => import(/* webpackChunkName: "register" */ './views/camp/TopBar'),
+        default: () => import(/* webpackChunkName: "event" */ './views/event/Event'),
+        aside: () => import(/* webpackChunkName: "day" */ './views/event/DayPicasso'),
+        bottombar: () => import(/* webpackChunkName: "register" */ './views/camp/BottomBar')
       },
       beforeEnter: requireAuth,
-      meta: { layout: 'camp' },
       props: {
         default: route => ({ eventInstance: eventInstanceFromRoute(route) }),
         aside: route => ({ day: dayFromEventInstanceInRoute(route) })
@@ -143,5 +162,8 @@ export function campRoute (camp, subroute) {
 
 export function eventInstanceRoute (camp, eventInstance) {
   if (camp._meta.loading || eventInstance._meta.loading || eventInstance.event()._meta.loading) return {}
-  return { name: 'event', params: { campId: camp.id, campTitle: slugify(camp.title), eventInstanceId: eventInstance.id, eventName: slugify(eventInstance.event().title) } }
+  return {
+    name: 'event',
+    params: { campId: camp.id, campTitle: slugify(camp.title), eventInstanceId: eventInstance.id, eventName: slugify(eventInstance.event().title) }
+  }
 }
diff --git a/frontend/src/scss/global.scss b/frontend/src/scss/global.scss
index eaf5e0bce3..e0d0042ee8 100644
--- a/frontend/src/scss/global.scss
+++ b/frontend/src/scss/global.scss
@@ -9,6 +9,7 @@ body {font-feature-settings: "ss03", "calt", "rlig", "kern"}
 .theme--light.v-application {
 	background: #546E7A!important;
 }
+.v-calendar-daily,
 .v-skeleton-loader__actions,
 .v-skeleton-loader__article,
 .v-skeleton-loader__card-heading,
diff --git a/frontend/src/views/BottomBar.vue b/frontend/src/views/BottomBar.vue
new file mode 100644
index 0000000000..af9fce2ead
--- /dev/null
+++ b/frontend/src/views/BottomBar.vue
@@ -0,0 +1,19 @@
+<template>
+  <v-bottom-navigation v-if="$vuetify.breakpoint.xs" app
+                       fixed grow>
+    <v-btn :to="{name: 'camps'}">
+      <span>Meine Camps</span>
+      <v-icon>mdi-format-list-bulleted-triangle</v-icon>
+    </v-btn>
+  </v-bottom-navigation>
+</template>
+
+<script>
+export default {
+  name: 'BottomBar'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/views/Camps.vue b/frontend/src/views/Camps.vue
index ae6932e5e9..1140dc4cdc 100644
--- a/frontend/src/views/Camps.vue
+++ b/frontend/src/views/Camps.vue
@@ -1,38 +1,41 @@
 <template>
-  <card-view title="Meine Camps" max-width="600">
-    <v-list class="py-0">
-      <template v-if="camps._meta.loading">
-        <v-skeleton-loader type="list-item-two-line" height="64" />
-        <v-skeleton-loader type="list-item-two-line" height="64" />
-      </template>
-      <v-list-item
-        v-for="camp in camps.items"
-        :key="camp.id"
-        two-line
-        :to="campRoute(camp)">
-        <v-list-item-content>
-          <v-list-item-title>{{ camp.title }}</v-list-item-title>
-          <v-list-item-subtitle>
-            {{ camp.name }} - {{ camp.camp_type().organization().name }}
-          </v-list-item-subtitle>
-        </v-list-item-content>
-        <v-list-item-action>
-          <v-btn
-            icon
-            @click.prevent="deleteCamp(camp, ...arguments)">
-            <v-icon left>
-              mdi-delete
-            </v-icon>
-          </v-btn>
-        </v-list-item-action>
-      </v-list-item>
-    </v-list>
-  </card-view>
+  <v-container fluid>
+    <card-view title="Meine Camps" max-width="600">
+      <v-list class="py-0">
+        <template v-if="camps._meta.loading">
+          <v-skeleton-loader type="list-item-two-line" height="64" />
+          <v-skeleton-loader type="list-item-two-line" height="64" />
+        </template>
+        <v-list-item
+          v-for="camp in camps.items"
+          :key="camp.id"
+          two-line
+          :to="campRoute(camp)">
+          <v-list-item-content>
+            <v-list-item-title>{{ camp.title }}</v-list-item-title>
+            <v-list-item-subtitle>
+              {{ camp.name }} - {{ camp.camp_type().organization().name }}
+            </v-list-item-subtitle>
+          </v-list-item-content>
+          <v-list-item-action>
+            <v-btn
+              icon
+              @click.prevent="deleteCamp(camp, ...arguments)">
+              <v-icon left>
+                mdi-delete
+              </v-icon>
+            </v-btn>
+          </v-list-item-action>
+        </v-list-item>
+      </v-list>
+    </card-view>
+  </v-container>
 </template>
 
 <script>
 import { campRoute } from '@/router'
-const CardView = () => import('../components/CardView.vue')
+
+const CardView = () => import('../components/base/CardView.vue')
 
 export default {
   name: 'Camps',
diff --git a/frontend/src/views/Event.vue b/frontend/src/views/Event.vue
deleted file mode 100644
index 3eb6f98efd..0000000000
--- a/frontend/src/views/Event.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
-Displays a single event
--->
-
-<template>
-  <card-view>
-    <v-toolbar dense>
-      <v-btn icon @click="$router.go(-1)">
-        <v-icon>mdi-arrow-left</v-icon>
-      </v-btn>
-      <v-toolbar-title class="pl-2">
-        {{ eventInstance().number }}
-        <v-chip v-if="!category._meta.loading" dark :color="category.color">{{ category.short }}</v-chip>
-        {{ event.title }}
-      </v-toolbar-title>
-    </v-toolbar>
-    <v-card-text>
-      <v-skeleton-loader v-if="event._meta.loading" type="article" />
-      <template v-else>
-        <api-input
-          :value="event.title"
-          :uri="event._meta.self"
-          fieldname="title"
-          :auto-save="false"
-          label="Titel"
-          required />
-        <api-input
-          :value="event.title"
-          :uri="event._meta.self"
-          fieldname="title"
-          :auto-save="true"
-          label="Titel"
-          required />
-        <v-list>
-          <v-label>Instanzen</v-label>
-          <v-list-item
-            v-for="instance in instances.items"
-            :key="instance._meta.self"
-            two-line>
-            <v-list-item-content>
-              1. Montag<br> {{ instance.start_time }} bis {{ instance.end_time }}
-            </v-list-item-content>
-          </v-list-item>
-        </v-list>
-      </template>
-    </v-card-text>
-  </card-view>
-</template>
-
-<script>
-import CardView from '../components/CardView'
-
-export default {
-  name: 'Event',
-  components: {
-    CardView,
-    ApiInput: () => import('@/components/form/ApiInput.vue')
-  },
-  props: {
-    eventInstance: { type: Function, required: true }
-  },
-  computed: {
-    event () {
-      return this.eventInstance().event()
-    },
-    category () {
-      return this.event.event_category()
-    },
-    instances () {
-      return this.event.event_instances()
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-  .v-card .v-list-item {
-    padding-left: 0;
-  }
-
-  .event_title input {
-    font-size: 28px;
-  }
-</style>
diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
index 7b14bb5c6b..d641b5c9d7 100644
--- a/frontend/src/views/Home.vue
+++ b/frontend/src/views/Home.vue
@@ -1,54 +1,56 @@
 <template>
-  <card-view title="Herzlich willkommen bei eCamp" max-width="900">
-    <v-list class="pt-0">
-      <v-list-item v-if="loggedIn" :to="{ name: 'camps' }">
-        <v-list-item-icon>
-          <v-icon>mdi-format-list-bulleted-triangle</v-icon>
-        </v-list-item-icon>
-        <v-list-item-content>
-          <v-list-item-title>Meine Camps</v-list-item-title>
-        </v-list-item-content>
-      </v-list-item>
-      <v-list-item v-if="!loggedIn" :to="{ name: 'login' }">
-        <v-list-item-icon>
-          <v-icon>mdi-login</v-icon>
-        </v-list-item-icon>
-        <v-list-item-content>
-          <v-list-item-title>Login</v-list-item-title>
-        </v-list-item-content>
-      </v-list-item>
-      <v-list-item v-if="runningInDocker" href="http://localhost:3001/setup.php?dev-data" target="_blank">
-        <v-list-item-icon>
-          <v-icon>mdi-database-plus</v-icon>
-        </v-list-item-icon>
-        <v-list-item-content>
-          <v-list-item-title>
-            Beispiel-Camps laden
-          </v-list-item-title>
-          <v-list-item-subtitle>
-            Dev data
-          </v-list-item-subtitle>
-        </v-list-item-content>
-      </v-list-item>
-      <v-list-item v-if="runningInDocker" href="http://localhost:3001/setup.php?prod-data" target="_blank">
-        <v-list-item-icon>
-          <v-icon>mdi-database-plus</v-icon>
-        </v-list-item-icon>
-        <v-list-item-content>
-          <v-list-item-title>
-            Beispiel-Camps laden
-          </v-list-item-title>
-          <v-list-item-subtitle>
-            Prod data
-          </v-list-item-subtitle>
-        </v-list-item-content>
-      </v-list-item>
-    </v-list>
-  </card-view>
+  <v-container>
+    <card-view title="Herzlich willkommen bei eCamp" max-width="600">
+      <v-list class="pt-0">
+        <v-list-item v-if="loggedIn" :to="{ name: 'camps' }">
+          <v-list-item-icon>
+            <v-icon>mdi-format-list-bulleted-triangle</v-icon>
+          </v-list-item-icon>
+          <v-list-item-content>
+            <v-list-item-title>Meine Camps</v-list-item-title>
+          </v-list-item-content>
+        </v-list-item>
+        <v-list-item v-if="!loggedIn" :to="{ name: 'login' }">
+          <v-list-item-icon>
+            <v-icon>mdi-login</v-icon>
+          </v-list-item-icon>
+          <v-list-item-content>
+            <v-list-item-title>Login</v-list-item-title>
+          </v-list-item-content>
+        </v-list-item>
+        <v-list-item v-if="runningInDocker" href="http://localhost:3001/setup.php?dev-data" target="_blank">
+          <v-list-item-icon>
+            <v-icon>mdi-database-plus</v-icon>
+          </v-list-item-icon>
+          <v-list-item-content>
+            <v-list-item-title>
+              Beispiel-Camps laden
+            </v-list-item-title>
+            <v-list-item-subtitle>
+              Dev data
+            </v-list-item-subtitle>
+          </v-list-item-content>
+        </v-list-item>
+        <v-list-item v-if="runningInDocker" href="http://localhost:3001/setup.php?prod-data" target="_blank">
+          <v-list-item-icon>
+            <v-icon>mdi-database-plus</v-icon>
+          </v-list-item-icon>
+          <v-list-item-content>
+            <v-list-item-title>
+              Beispiel-Camps laden
+            </v-list-item-title>
+            <v-list-item-subtitle>
+              Prod data
+            </v-list-item-subtitle>
+          </v-list-item-content>
+        </v-list-item>
+      </v-list>
+    </card-view>
+  </v-container>
 </template>
 
 <script>
-import CardView from '../components/CardView'
+import CardView from '../components/base/CardView'
 
 export default {
   name: 'Home',
diff --git a/frontend/src/views/Periods.vue b/frontend/src/views/Periods.vue
deleted file mode 100644
index 7060a00240..0000000000
--- a/frontend/src/views/Periods.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-Displays periods of a single camp.
--->
-
-<template>
-  <v-card>
-    <v-subheader class="text-uppercase subtitle-2">
-      Periods
-    </v-subheader>
-    <v-list>
-      <v-list-item
-        v-for="period in periods.items"
-        :key="period._meta.self"
-        two-line>
-        <v-list-item-content>
-          <v-list-item-title>{{ period.description }}</v-list-item-title>
-          <v-list-item-subtitle>{{ period.start }} - {{ period.end }}</v-list-item-subtitle>
-        </v-list-item-content>
-      </v-list-item>
-    </v-list>
-  </v-card>
-</template>
-<script>
-import { eventInstanceRoute } from '@/router'
-
-export default {
-  name: 'CampPeriods',
-  props: {
-    camp: { type: Function, required: true }
-  },
-  data () {
-    return {
-      editing: false,
-      messages: []
-    }
-  },
-  computed: {
-    periods () {
-      return this.camp().periods()
-    },
-    events () {
-      return this.camp().events()
-    }
-  },
-  methods: {
-    eventInstanceRoute (eventInstance) {
-      return eventInstanceRoute(this.camp(), eventInstance)
-    }
-  }
-}
-</script>
diff --git a/frontend/src/views/Profile.vue b/frontend/src/views/Profile.vue
index d02baa3230..8df915a063 100644
--- a/frontend/src/views/Profile.vue
+++ b/frontend/src/views/Profile.vue
@@ -1,24 +1,33 @@
 <template>
-  <card-view :title="'Profil: ' + profile.username" max-width="900">
-    <v-col>
-      <api-input
-        label="Email"
-        :uri="profile._meta.self"
-        fieldname="mail"
-        :value="profile.mail"
-        :editing="false"
-        required />
-    </v-col>
-  </card-view>
+  <v-container fluid>
+    <card-view max-width="600">
+      <template v-slot:title>
+        <v-card-title>
+          <back-button />
+          {{ 'Profil: ' + profile.username }}
+        </v-card-title>
+      </template>
+      <v-col>
+        <api-input
+          label="Email"
+          :uri="profile._meta.self"
+          fieldname="mail"
+          :value="profile.mail"
+          :editing="false"
+          required />
+      </v-col>
+    </card-view>
+  </v-container>
 </template>
 
 <script>
-import ApiInput from '../components/form/ApiInput'
-
-const CardView = () => import('../components/CardView')
 export default {
   name: 'Home',
-  components: { ApiInput, CardView },
+  components: {
+    ApiInput: () => import('@/components/form/ApiInput'),
+    CardView: () => import('@/components/base/CardView'),
+    BackButton: () => import('@/components/base/BackButton')
+  },
   computed: {
     profile () {
       return this.api.get().profile()
diff --git a/frontend/src/views/TopBar.vue b/frontend/src/views/TopBar.vue
new file mode 100644
index 0000000000..7b7e704e7d
--- /dev/null
+++ b/frontend/src/views/TopBar.vue
@@ -0,0 +1,88 @@
+<template>
+  <v-app-bar
+    v-if="$vuetify.breakpoint.smAndUp"
+    app clipped-left
+    color="blue-grey darken-4" dark>
+    <logo text/>
+    <v-spacer />
+    <global-search />
+    <v-menu offset-y dark
+            right content-class="ec-usermenu"
+            transition="slide-y-transition"
+            z-index="5">
+      <template v-slot:activator="{ on,value }">
+        <v-toolbar-items>
+          <v-btn right text
+                 :class="{ 'v-btn--open': value }" v-on="on">
+              <span v-if="$auth.isLoggedIn()" class="sr-only-sm-and-down">
+                {{ username }}
+              </span>
+            <v-icon class="ma-2">mdi-account</v-icon>
+          </v-btn>
+        </v-toolbar-items>
+      </template>
+      <v-list dense
+              light color="blue-grey lighten-5">
+        <v-list-item block :to="{ name: 'profile' }">
+          <v-icon left>mdi-account</v-icon>
+          <span>Profil</span>
+        </v-list-item>
+        <v-list-item block
+                     exact :to="{ name: 'camps', params: { groupName: encodeURI('Pfadi Bewegung Schweiz') } }">
+          <v-icon left>mdi-format-list-bulleted-triangle</v-icon>
+          <span>Meine Camps</span>
+        </v-list-item>
+        <v-list-item :to="{ name: 'login' }" block>
+          <v-icon left>mdi-login</v-icon>
+          <span>Log in</span>
+        </v-list-item>
+      </v-list>
+    </v-menu>
+  </v-app-bar>
+</template>
+
+<script>
+import { campFromRoute, campRoute } from '@/router'
+import GlobalSearch from '@/components/Search'
+
+export default {
+  name: 'TopBar',
+  components: {
+    GlobalSearch,
+    Logo: () => import('@/components/global/Logo')
+  },
+  data () {
+    return {
+      logoutIcon: 'mdi-logout'
+    }
+  },
+  computed: {
+    isLoggedIn () {
+      return this.$auth.isLoggedIn()
+    },
+    camp () {
+      return campFromRoute(this.$route)
+    },
+    username () {
+      return this.$auth.username()
+    }
+  },
+  methods: {
+    logout () {
+      this.logoutIcon = ''
+      this.$auth.logout().then(() => this.$router.replace({ name: 'login' }))
+    },
+    prevent (event) {
+      event.stopImmediatePropagation()
+      event.preventDefault()
+      event.cancelBubble = true
+      return null
+    },
+    campRoute
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/views/auth/Login.vue b/frontend/src/views/auth/Login.vue
index 59d62d77b2..cb5cf6c8ef 100644
--- a/frontend/src/views/auth/Login.vue
+++ b/frontend/src/views/auth/Login.vue
@@ -1,85 +1,76 @@
 <template>
-  <v-content>
-    <v-toolbar absolute width="100%"
-               color="blue-grey darken-4" dark>
-      <v-toolbar-title>
-        <v-btn icon class="title">🏕</v-btn>
-        eCamp
-      </v-toolbar-title>
-    </v-toolbar>
-    <v-container class="fill-height justify-center align-center" fluid>
-      <v-col cols="12" sm="8" md="4">
-        <v-card class="elevation-12">
-          <v-toolbar color="green" dark elevation="1">
-            <v-toolbar-title>Login</v-toolbar-title>
-            <v-spacer />
-            <v-btn color="green darken-3" :to="{ name: 'register' }">Register</v-btn>
-          </v-toolbar>
-          <v-card-text>
-            <v-alert v-if="error" type="error">Login failed</v-alert>
-            <v-form @submit.prevent="login">
-              <v-text-field
-                id="inputUsername"
-                v-model="username"
-                label="Username"
-                name="username"
-                prepend-icon="mdi-account"
-                type="text" />
+  <v-container class="fill-height justify-center align-center" fluid>
+    <v-col cols="12" sm="8" md="4">
+      <v-card class="elevation-12">
+        <v-toolbar color="green" dark elevation="1">
+          <v-toolbar-title>Login</v-toolbar-title>
+          <v-spacer />
+          <v-btn color="green darken-3" :to="{ name: 'register' }">Register</v-btn>
+        </v-toolbar>
+        <v-card-text>
+          <v-alert v-if="error" type="error">Login failed</v-alert>
+          <v-form @submit.prevent="login">
+            <v-text-field
+              id="inputUsername"
+              v-model="username"
+              label="Username"
+              name="username"
+              prepend-icon="mdi-account"
+              type="text" />
 
-              <v-text-field
-                id="inputPassword"
-                v-model="password"
-                label="Password"
-                name="password"
-                prepend-icon="mdi-lock"
-                type="password" />
-              <v-switch label="Remember me" />
-            </v-form>
-          </v-card-text>
-          <v-card-actions>
-            <v-spacer />
-            <v-menu offset-y>
-              <template v-slot:activator="{ on }">
-                <v-btn
-                  color="green"
-                  dark
-                  v-on="on">
-                  <v-progress-circular v-if="hitobitoLoggingIn" indeterminate
-                                       size="14"
-                                       class="mr-2" />
-                  Hitobito
-                </v-btn>
-              </template>
-              <v-list>
-                <v-list-item
-                  @click="loginPbsMiData">
-                  <v-list-item-icon class="mr-3">
-                    <PbsMiDataLogo />
-                  </v-list-item-icon>
-                  <v-list-item-title>PBS MiData</v-list-item-title>
-                </v-list-item>
-                <v-list-item>
-                  <v-list-item-title>jubla.db</v-list-item-title>
-                </v-list-item>
-              </v-list>
-            </v-menu>
-            <v-btn color="red" dark @click="loginGoogle">
-              <v-progress-circular v-if="googleLoggingIn" indeterminate
-                                   size="14"
-                                   class="mr-2" />
-              Google
-            </v-btn>
-            <v-btn color="primary" @click="login">
-              <v-progress-circular v-if="normalLoggingIn" indeterminate
-                                   size="14"
-                                   class="mr-2" />
-              Login
-            </v-btn>
-          </v-card-actions>
-        </v-card>
-      </v-col>
-    </v-container>
-  </v-content>
+            <v-text-field
+              id="inputPassword"
+              v-model="password"
+              label="Password"
+              name="password"
+              prepend-icon="mdi-lock"
+              type="password" />
+            <v-switch label="Remember me" />
+          </v-form>
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer />
+          <v-menu offset-y>
+            <template v-slot:activator="{ on }">
+              <v-btn
+                color="green"
+                dark
+                v-on="on">
+                <v-progress-circular v-if="hitobitoLoggingIn" indeterminate
+                                     size="14"
+                                     class="mr-2" />
+                Hitobito
+              </v-btn>
+            </template>
+            <v-list>
+              <v-list-item
+                @click="loginPbsMiData">
+                <v-list-item-icon class="mr-3">
+                  <PbsMiDataLogo />
+                </v-list-item-icon>
+                <v-list-item-title>PBS MiData</v-list-item-title>
+              </v-list-item>
+              <v-list-item>
+                <v-list-item-title>jubla.db</v-list-item-title>
+              </v-list-item>
+            </v-list>
+          </v-menu>
+          <v-btn color="red" dark @click="loginGoogle">
+            <v-progress-circular v-if="googleLoggingIn" indeterminate
+                                 size="14"
+                                 class="mr-2" />
+            Google
+          </v-btn>
+          <v-btn color="primary" @click="login">
+            <v-progress-circular v-if="normalLoggingIn" indeterminate
+                                 size="14"
+                                 class="mr-2" />
+            Login
+          </v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-col>
+  </v-container>
 </template>
 
 <script>
diff --git a/frontend/src/views/auth/LoginCallback.vue b/frontend/src/views/auth/LoginCallback.vue
index 08ee825a65..3bad23613c 100644
--- a/frontend/src/views/auth/LoginCallback.vue
+++ b/frontend/src/views/auth/LoginCallback.vue
@@ -1,15 +1,13 @@
 <template>
-  <v-content>
-    <v-sheet color="green dark-3">
-      <v-container class="fill-height" fluid>
-        <v-row align="center" justify="center">
-          <v-card>
-            <v-card-text><h3>Logging you in</h3></v-card-text>
-          </v-card>
-        </v-row>
-      </v-container>
-    </v-sheet>
-  </v-content>
+  <v-sheet color="green dark-3">
+    <v-container class="fill-height" fluid>
+      <v-row align="center" justify="center">
+        <v-card>
+          <v-card-text><h3>Logging you in</h3></v-card-text>
+        </v-card>
+      </v-row>
+    </v-container>
+  </v-sheet>
 </template>
 <script>
 export default {
diff --git a/frontend/src/views/auth/Register.vue b/frontend/src/views/auth/Register.vue
index 051350de35..062f828bea 100644
--- a/frontend/src/views/auth/Register.vue
+++ b/frontend/src/views/auth/Register.vue
@@ -1,69 +1,60 @@
 <template>
-  <v-content>
-    <v-toolbar absolute width="100%"
-               color="blue-grey darken-4" dark>
-      <v-toolbar-title>
-        <v-btn icon class="title">🏕</v-btn>
-        eCamp
-      </v-toolbar-title>
-    </v-toolbar>
-    <v-container class="fill-height align-center justify-center" fluid>
-      <v-col cols="12" sm="8" md="4">
-        <v-card class="elevation-12">
-          <v-toolbar color="green" dark elevation="1">
-            <v-toolbar-title>Register</v-toolbar-title>
-            <v-spacer />
-            <v-btn color="green darken-3" :to="{ name: 'login' }">Login</v-btn>
-          </v-toolbar>
-          <v-card-text>
-            <v-form @submit.prevent="register">
-              <v-text-field
-                id="inputUsername"
-                v-model="username"
-                label="Username"
-                name="username"
-                prepend-icon="mdi-account"
-                type="text" />
+  <v-container class="fill-height align-center justify-center" fluid>
+    <v-col cols="12" sm="8" md="4">
+      <v-card class="elevation-12">
+        <v-toolbar color="green" dark elevation="1">
+          <v-toolbar-title>Register</v-toolbar-title>
+          <v-spacer />
+          <v-btn color="green darken-3" :to="{ name: 'login' }">Login</v-btn>
+        </v-toolbar>
+        <v-card-text>
+          <v-form @submit.prevent="register">
+            <v-text-field
+              id="inputUsername"
+              v-model="username"
+              label="Username"
+              name="username"
+              prepend-icon="mdi-account"
+              type="text" />
 
-              <v-text-field
-                id="inputEmail"
-                v-model="email"
-                label="eMail"
-                name="email"
-                prepend-icon="mdi-email"
-                type="text" />
+            <v-text-field
+              id="inputEmail"
+              v-model="email"
+              label="eMail"
+              name="email"
+              prepend-icon="mdi-email"
+              type="text" />
 
-              <v-text-field
-                id="inputPassword1"
-                v-model="pw1"
-                label="Password"
-                name="password"
-                :rules="pw1Rules"
-                validate-on-blur
-                prepend-icon="mdi-lock"
-                type="password" />
+            <v-text-field
+              id="inputPassword1"
+              v-model="pw1"
+              label="Password"
+              name="password"
+              :rules="pw1Rules"
+              validate-on-blur
+              prepend-icon="mdi-lock"
+              type="password" />
 
-              <v-text-field
-                id="inputPassword2"
-                v-model="pw2"
-                label="Password erneut eingeben"
-                name="password"
-                :rules="pw2Rules"
-                validate-on-blur
-                prepend-icon="mdi-lock"
-                type="password" />
-            </v-form>
-          </v-card-text>
-          <v-card-actions>
-            <v-spacer />
-            <v-btn color="primary" :disabled="!formComplete" @click="register">
-              Register
-            </v-btn>
-          </v-card-actions>
-        </v-card>
-      </v-col>
-    </v-container>
-  </v-content>
+            <v-text-field
+              id="inputPassword2"
+              v-model="pw2"
+              label="Password erneut eingeben"
+              name="password"
+              :rules="pw2Rules"
+              validate-on-blur
+              prepend-icon="mdi-lock"
+              type="password" />
+          </v-form>
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer />
+          <v-btn color="primary" :disabled="!formComplete" @click="register">
+            Register
+          </v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-col>
+  </v-container>
 </template>
 
 <script>
diff --git a/frontend/src/views/auth/RegisterDone.vue b/frontend/src/views/auth/RegisterDone.vue
index f05d3124f9..a1cbd63fa4 100644
--- a/frontend/src/views/auth/RegisterDone.vue
+++ b/frontend/src/views/auth/RegisterDone.vue
@@ -1,33 +1,24 @@
 <template>
-  <v-content>
-    <v-toolbar absolute width="100%"
-               color="blue-grey darken-4" dark>
-      <v-toolbar-title>
-        <v-btn icon class="title">🏕</v-btn>
-        eCamp
-      </v-toolbar-title>
-    </v-toolbar>
-    <v-container class="fill-height justify-center align-center" fluid>
-      <v-col cols="12" sm="8" md="4">
-        <v-card class="elevation-12">
-          <v-toolbar dense color="blue-grey lighten-5">
-            <v-toolbar-title>Registering</v-toolbar-title>
-          </v-toolbar>
-          <v-card-text>
-            <v-alert type="success">
-              Successfully registered.
-            </v-alert>
-          </v-card-text>
-          <v-card-actions>
-            <v-spacer />
-            <v-btn color="primary" :to="{name: 'login'}">
-              Login
-            </v-btn>
-          </v-card-actions>
-        </v-card>
-      </v-col>
-    </v-container>
-  </v-content>
+  <v-container class="fill-height justify-center align-center" fluid>
+    <v-col cols="12" sm="8" md="4">
+      <v-card class="elevation-12">
+        <v-toolbar dense color="blue-grey lighten-5">
+          <v-toolbar-title>Registering</v-toolbar-title>
+        </v-toolbar>
+        <v-card-text>
+          <v-alert type="success">
+            Successfully registered.
+          </v-alert>
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer />
+          <v-btn color="primary" :to="{name: 'login'}">
+            Login
+          </v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-col>
+  </v-container>
 </template>
 
 <script>
diff --git a/frontend/src/views/auth/TopBar.vue b/frontend/src/views/auth/TopBar.vue
new file mode 100644
index 0000000000..246dfb6d94
--- /dev/null
+++ b/frontend/src/views/auth/TopBar.vue
@@ -0,0 +1,22 @@
+<template>
+  <v-app-bar v-if="$vuetify.breakpoint.smAndUp" app
+             clipped-left
+             color="blue-grey darken-4" dark>
+    <logo text/>
+    <v-spacer />
+  </v-app-bar>
+</template>
+
+<script>
+
+export default {
+  name: 'TopBar',
+  components: {
+    Logo: () => import('@/components/global/Logo')
+  }
+}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/frontend/src/views/camp/BottomBar.vue b/frontend/src/views/camp/BottomBar.vue
new file mode 100644
index 0000000000..a2d57b29bb
--- /dev/null
+++ b/frontend/src/views/camp/BottomBar.vue
@@ -0,0 +1,35 @@
+<template>
+  <v-bottom-navigation v-if="$vuetify.breakpoint.xs" app
+                       fixed grow>
+    <v-btn>
+      <span>Material</span>
+      <v-icon>mdi-package-variant</v-icon>
+    </v-btn>
+    <v-btn>
+      <span>Tasks</span>
+      <v-icon>mdi-format-list-checks</v-icon>
+    </v-btn>
+    <v-btn :to="{name: 'camp/picasso'}">
+      <span>Camp</span>
+      <v-icon large>mdi-tent</v-icon>
+    </v-btn>
+    <v-btn :to="{name: 'camp/collaborators'}" exact>
+      <span>Team</span>
+      <v-icon>mdi-account-group</v-icon>
+    </v-btn>
+    <v-btn :to="{name: 'camp/admin'}">
+      <span>Admin</span>
+      <v-icon>mdi-cogs</v-icon>
+    </v-btn>
+  </v-bottom-navigation>
+</template>
+
+<script>
+export default {
+  name: 'BottomBar'
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/views/Camp.vue b/frontend/src/views/camp/Camp.vue
similarity index 75%
rename from frontend/src/views/Camp.vue
rename to frontend/src/views/camp/Camp.vue
index daf7445863..41cf9d9c0e 100644
--- a/frontend/src/views/Camp.vue
+++ b/frontend/src/views/camp/Camp.vue
@@ -3,7 +3,9 @@ Displays several tabs with details on a single camp.
 -->
 
 <template>
-  <router-view :camp="camp" />
+  <v-container fluid>
+    <router-view :camp="camp" />
+  </v-container>
 </template>
 
 <script>
diff --git a/frontend/src/views/camp/Periods.vue b/frontend/src/views/camp/Periods.vue
new file mode 100644
index 0000000000..8b496065a9
--- /dev/null
+++ b/frontend/src/views/camp/Periods.vue
@@ -0,0 +1,55 @@
+<!--
+Displays periods of a single camp.
+-->
+
+<template>
+  <side-bar>
+    <v-card>
+      <v-subheader class="text-uppercase subtitle-2">
+        Periods
+      </v-subheader>
+      <v-list>
+        <v-list-item
+          v-for="period in periods.items"
+          :key="period._meta.self"
+          two-line>
+          <v-list-item-content>
+            <v-list-item-title>{{ period.description }}</v-list-item-title>
+            <v-list-item-subtitle>{{ period.start }} - {{ period.end }}</v-list-item-subtitle>
+          </v-list-item-content>
+        </v-list-item>
+      </v-list>
+    </v-card>
+  </side-bar>
+</template>
+<script>
+import { eventInstanceRoute } from '@/router'
+import SideBar from '@/views/camp/SideBar'
+
+export default {
+  name: 'CampPeriods',
+  components: { SideBar },
+  props: {
+    camp: { type: Function, required: true }
+  },
+  data () {
+    return {
+      editing: false,
+      messages: []
+    }
+  },
+  computed: {
+    periods () {
+      return this.camp().periods()
+    },
+    events () {
+      return this.camp().events()
+    }
+  },
+  methods: {
+    eventInstanceRoute (eventInstance) {
+      return eventInstanceRoute(this.camp(), eventInstance)
+    }
+  }
+}
+</script>
diff --git a/frontend/src/views/camp/SideBar.vue b/frontend/src/views/camp/SideBar.vue
new file mode 100644
index 0000000000..bee1d406da
--- /dev/null
+++ b/frontend/src/views/camp/SideBar.vue
@@ -0,0 +1,40 @@
+<template>
+  <v-navigation-drawer v-if="$vuetify.breakpoint.smAndUp"
+                       v-model="drawer" app
+                       clipped permanent
+                       :mini-variant.sync="mini"
+                       mini-variant-width="40"
+                       color="blue-grey lighten-4">
+    <v-btn v-if="mini" icon>
+      <v-icon>mdi-format-list-bulleted-triangle</v-icon>
+    </v-btn>
+    <v-spacer />
+    <v-btn v-if="!mini" icon
+           fixed
+           class="ec-drawer-collapse ma-2"
+           style="z-index: 10;"
+           right @click.stop="mini = !mini">
+      <v-icon>mdi-chevron-left</v-icon>
+    </v-btn>
+
+    <v-divider />
+
+    <slot v-if="!mini"/>
+  </v-navigation-drawer>
+</template>
+
+<script>
+export default {
+  name: 'SideBar',
+  data () {
+    return {
+      drawer: false,
+      mini: !this.$vuetify.breakpoint.mdAndUp
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/views/camp/TopBar.vue b/frontend/src/views/camp/TopBar.vue
new file mode 100644
index 0000000000..7dc2f932e1
--- /dev/null
+++ b/frontend/src/views/camp/TopBar.vue
@@ -0,0 +1,108 @@
+<template>
+  <v-app-bar v-if="$vuetify.breakpoint.smAndUp" app
+             clipped-left
+             color="blue-grey darken-4" dark>
+    <logo>
+      <v-btn text class="justify-start px-2"
+             exact :to="campRoute(camp(), 'picasso')"
+             width="216">
+        <v-toolbar-title>
+          {{ camp().title | loading('Camp wird geladen…') }}
+        </v-toolbar-title>
+      </v-btn>
+    </logo>
+
+    <v-toolbar-items>
+      <v-btn text :to="campRoute(camp(), 'collaborators')">
+        <v-icon :left="$vuetify.breakpoint.mdAndUp">mdi-account-group</v-icon>
+        <span class="sr-only-sm-and-down">Team</span>
+      </v-btn>
+      <v-btn text :to="campRoute(camp(), 'admin')" exact>
+        <v-icon :left="$vuetify.breakpoint.mdAndUp">mdi-cogs</v-icon>
+        <span class="sr-only-sm-and-down">Admin</span>
+      </v-btn>
+    </v-toolbar-items>
+    <v-spacer />
+    <global-search />
+    <v-menu offset-y dark
+            right content-class="ec-usermenu"
+            transition="slide-y-transition"
+            z-index="5">
+      <template v-slot:activator="{ on,value }">
+        <v-toolbar-items>
+          <v-btn right text
+                 :class="{ 'v-btn--open': value }" v-on="on">
+              <span class="sr-only-sm-and-down">
+                {{ username }}
+              </span>
+            <v-icon class="ma-2">mdi-account</v-icon>
+          </v-btn>
+        </v-toolbar-items>
+      </template>
+      <v-list dense class="user-nav"
+              light color="blue-grey lighten-5">
+        <v-list-item block :to="{ name: 'profile' }">
+          <v-icon left>mdi-account</v-icon>
+          <span>Profil</span>
+        </v-list-item>
+        <v-list-item block
+                     exact :to="{ name: 'camps', params: { groupName: encodeURI('Pfadi Bewegung Schweiz') } }">
+          <v-icon left>mdi-format-list-bulleted-triangle</v-icon>
+          <span>Meine Camps</span>
+        </v-list-item>
+        <v-list-item block @click="logout">
+          <v-icon v-if="logoutIcon" left>{{ logoutIcon }}</v-icon>
+          <v-progress-circular v-else indeterminate
+                               size="18" class="mr-2" />
+          <span>Log out</span>
+        </v-list-item>
+      </v-list>
+    </v-menu>
+  </v-app-bar>
+</template>
+
+<script>
+import { campFromRoute, campRoute } from '@/router'
+import GlobalSearch from '@/components/Search'
+
+export default {
+  name: 'TopBar',
+  components: {
+    GlobalSearch,
+    Logo: () => import('@/components/global/Logo')
+  },
+  data () {
+    return {
+      logoutIcon: 'mdi-logout'
+    }
+  },
+  computed: {
+    isLoggedIn () {
+      return this.$auth.isLoggedIn()
+    },
+    camp () {
+      return campFromRoute(this.$route)
+    },
+    username () {
+      return this.$auth.username()
+    }
+  },
+  methods: {
+    logout () {
+      this.logoutIcon = ''
+      this.$auth.logout().then(() => this.$router.replace({ name: 'login' }))
+    },
+    prevent (event) {
+      event.stopImmediatePropagation()
+      event.preventDefault()
+      event.cancelBubble = true
+      return null
+    },
+    campRoute
+  }
+}
+</script>
+
+<style lang="scss">
+
+</style>
diff --git a/frontend/src/views/DayPicasso.vue b/frontend/src/views/event/DayPicasso.vue
similarity index 54%
rename from frontend/src/views/DayPicasso.vue
rename to frontend/src/views/event/DayPicasso.vue
index f7297412c6..455bd1def5 100644
--- a/frontend/src/views/DayPicasso.vue
+++ b/frontend/src/views/event/DayPicasso.vue
@@ -1,19 +1,27 @@
 <template>
-  <v-skeleton-loader v-if="eventInstances.loading" class="ma-3"
-                     type="list-item@6" />
-  <picasso v-else
-           :camp="period.camp"
-           :event-instances="eventInstances.items"
-           :start="startOfDay"
-           :end="endOfDay"
-           type="day" />
+  <side-bar>
+    <card-view title="Tagesübersicht">
+      <v-skeleton-loader v-if="eventInstances.loading" class="ma-3"
+                         type="list-item@6" />
+      <picasso v-else
+               :camp="period.camp"
+               :event-instances="eventInstances.items"
+               :start="startOfDay"
+               interval-height="36"
+               :end="endOfDay"
+               type="day" />
+    </card-view>
+  </side-bar>
 </template>
 
 <script>
-import Picasso from '../components/Picasso'
+import Picasso from '@/components/Picasso'
+import SideBar from '@/views/camp/SideBar'
+import CardView from '@/components/base/CardView'
+
 export default {
   name: 'DayPicasso',
-  components: { Picasso },
+  components: { CardView, SideBar, Picasso },
   props: {
     day: { type: Function, required: true }
   },
diff --git a/frontend/src/views/event/Event.vue b/frontend/src/views/event/Event.vue
new file mode 100644
index 0000000000..817aa5275d
--- /dev/null
+++ b/frontend/src/views/event/Event.vue
@@ -0,0 +1,85 @@
+<!--
+Displays a single event
+-->
+
+<template>
+  <v-container fluid>
+    <card-view>
+      <v-toolbar dense>
+        <back-button />
+        <v-toolbar-title class="pl-2">
+          {{ eventInstance().number }}
+          <v-chip v-if="!category._meta.loading" dark :color="category.color">{{ category.short }}</v-chip>
+          {{ event.title }}
+        </v-toolbar-title>
+      </v-toolbar>
+      <v-card-text>
+        <v-skeleton-loader v-if="event._meta.loading" type="article" />
+        <template v-else>
+          <api-input
+            :value="event.title"
+            :uri="event._meta.self"
+            fieldname="title"
+            :auto-save="false"
+            label="Titel"
+            required />
+          <api-input
+            :value="event.title"
+            :uri="event._meta.self"
+            fieldname="title"
+            :auto-save="true"
+            label="Titel"
+            required />
+          <v-list>
+            <v-label>Instanzen</v-label>
+            <v-list-item
+              v-for="instance in instances.items"
+              :key="instance._meta.self"
+              two-line>
+              <v-list-item-content>
+                1. Montag<br> {{ instance.start_time }} bis {{ instance.end_time }}
+              </v-list-item-content>
+            </v-list-item>
+          </v-list>
+        </template>
+      </v-card-text>
+    </card-view>
+  </v-container>
+</template>
+
+<script>
+
+export default {
+  name: 'Event',
+  components: {
+    BackButton: () => import('@/components/global/BackButton'),
+    CardView: () => import('@/components/base/CardView'),
+    ApiInput: () => import('@/components/form/ApiInput.vue')
+  },
+  props: {
+    eventInstance: { type: Function, required: true }
+  },
+  computed: {
+    event () {
+      return this.eventInstance().event()
+    },
+    category () {
+      return this.event.event_category()
+    },
+    instances () {
+      return this.event.event_instances()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+  .v-card .v-list-item {
+    padding-left: 0;
+  }
+
+  .event_title input {
+    font-size: 28px;
+  }
+</style>

From 8e1d0cd84925c841cded5eec297908a5a38230ed Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Fri, 13 Mar 2020 23:54:52 +0100
Subject: [PATCH 28/85] Renamed CardView.vue to ContentCard.vue and moved
 Picasso.vue and CampPicasso.vue to right place

---
 .../src/components/base/{CardView.vue => ContentCard.vue} | 2 +-
 frontend/src/components/camp/Basic.vue                    | 8 ++++----
 frontend/src/components/camp/Collaborators.vue            | 8 ++++----
 frontend/src/components/{ => camp}/Picasso.vue            | 0
 frontend/src/views/Camps.vue                              | 8 +++-----
 frontend/src/views/Home.vue                               | 8 ++++----
 frontend/src/views/Profile.vue                            | 6 +++---
 .../camp/CampPicasso.vue => views/camp/WeekPicasso.vue}   | 8 ++++----
 frontend/src/views/event/DayPicasso.vue                   | 2 +-
 frontend/src/views/event/Event.vue                        | 4 ++--
 10 files changed, 26 insertions(+), 28 deletions(-)
 rename frontend/src/components/base/{CardView.vue => ContentCard.vue} (96%)
 rename frontend/src/components/{ => camp}/Picasso.vue (100%)
 rename frontend/src/{components/camp/CampPicasso.vue => views/camp/WeekPicasso.vue} (93%)

diff --git a/frontend/src/components/base/CardView.vue b/frontend/src/components/base/ContentCard.vue
similarity index 96%
rename from frontend/src/components/base/CardView.vue
rename to frontend/src/components/base/ContentCard.vue
index 6ad6c13c81..a6532cdd5d 100644
--- a/frontend/src/components/base/CardView.vue
+++ b/frontend/src/components/base/ContentCard.vue
@@ -13,7 +13,7 @@
 
 <script>
 export default {
-  name: 'CardView',
+  name: 'ContentCard',
   props: {
     loaded: { type: Boolean, required: false, default: true },
     title: { type: String, required: false, default: '' },
diff --git a/frontend/src/components/camp/Basic.vue b/frontend/src/components/camp/Basic.vue
index 04e9fd7c86..19858eedec 100644
--- a/frontend/src/components/camp/Basic.vue
+++ b/frontend/src/components/camp/Basic.vue
@@ -3,7 +3,7 @@ Displays details on a single camp and allows to edit them.
 -->
 
 <template>
-  <card-view title="Admin">
+  <content-card title="Admin">
     <v-skeleton-loader v-if="camp()._meta.loading" type="article" />
     <v-card-text v-else>
       <v-form>
@@ -37,15 +37,15 @@ Displays details on a single camp and allows to edit them.
         </v-list>
       </v-form>
     </v-card-text>
-  </card-view>
+  </content-card>
 </template>
 
 <script>
-import CardView from '../base/CardView'
 import ApiInput from '../form/ApiInput'
+import ContentCard from '@/components/base/ContentCard'
 export default {
   name: 'Basic',
-  components: { CardView, ApiInput },
+  components: { ContentCard, ApiInput },
   props: {
     camp: { type: Function, required: true }
   },
diff --git a/frontend/src/components/camp/Collaborators.vue b/frontend/src/components/camp/Collaborators.vue
index 228caf4567..6e3c9c5718 100644
--- a/frontend/src/components/camp/Collaborators.vue
+++ b/frontend/src/components/camp/Collaborators.vue
@@ -2,7 +2,7 @@
 Displays collaborators of a single camp.
 -->
 <template>
-  <card-view title="Team">
+  <content-card title="Team">
     <v-simple-table width="100%">
       <thead>
         <tr>
@@ -209,15 +209,15 @@ Displays collaborators of a single camp.
         </tr>
       </v-simple-table>
     </v-card-text>
-  </card-view>
+  </content-card>
 </template>
 <script>
-import CardView from '../base/CardView'
+import ContentCard from '@/components/base/ContentCard'
 
 export default {
   name: 'Collaborators',
   components: {
-    CardView,
+    ContentCard,
     ApiSingleSelect: () => import('@/components/form/ApiSingleSelect.vue')
   },
   props: {
diff --git a/frontend/src/components/Picasso.vue b/frontend/src/components/camp/Picasso.vue
similarity index 100%
rename from frontend/src/components/Picasso.vue
rename to frontend/src/components/camp/Picasso.vue
diff --git a/frontend/src/views/Camps.vue b/frontend/src/views/Camps.vue
index 1140dc4cdc..86dc3f5904 100644
--- a/frontend/src/views/Camps.vue
+++ b/frontend/src/views/Camps.vue
@@ -1,6 +1,6 @@
 <template>
   <v-container fluid>
-    <card-view title="Meine Camps" max-width="600">
+    <content-card title="Meine Camps" max-width="600">
       <v-list class="py-0">
         <template v-if="camps._meta.loading">
           <v-skeleton-loader type="list-item-two-line" height="64" />
@@ -28,19 +28,17 @@
           </v-list-item-action>
         </v-list-item>
       </v-list>
-    </card-view>
+    </content-card>
   </v-container>
 </template>
 
 <script>
 import { campRoute } from '@/router'
 
-const CardView = () => import('../components/base/CardView.vue')
-
 export default {
   name: 'Camps',
   components: {
-    CardView
+    ContentCard: () => import('@/components/base/ContentCard')
   },
   computed: {
     camps () {
diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
index d641b5c9d7..4fe96bd285 100644
--- a/frontend/src/views/Home.vue
+++ b/frontend/src/views/Home.vue
@@ -1,6 +1,6 @@
 <template>
   <v-container>
-    <card-view title="Herzlich willkommen bei eCamp" max-width="600">
+    <content-card title="Herzlich willkommen bei eCamp" max-width="600">
       <v-list class="pt-0">
         <v-list-item v-if="loggedIn" :to="{ name: 'camps' }">
           <v-list-item-icon>
@@ -45,16 +45,16 @@
           </v-list-item-content>
         </v-list-item>
       </v-list>
-    </card-view>
+    </content-card>
   </v-container>
 </template>
 
 <script>
-import CardView from '../components/base/CardView'
+import ContentCard from '@/components/base/ContentCard'
 
 export default {
   name: 'Home',
-  components: { CardView },
+  components: { ContentCard },
   computed: {
     loggedIn () {
       return this.$auth.isLoggedIn()
diff --git a/frontend/src/views/Profile.vue b/frontend/src/views/Profile.vue
index 8df915a063..b025783587 100644
--- a/frontend/src/views/Profile.vue
+++ b/frontend/src/views/Profile.vue
@@ -1,6 +1,6 @@
 <template>
   <v-container fluid>
-    <card-view max-width="600">
+    <content-card max-width="600">
       <template v-slot:title>
         <v-card-title>
           <back-button />
@@ -16,7 +16,7 @@
           :editing="false"
           required />
       </v-col>
-    </card-view>
+    </content-card>
   </v-container>
 </template>
 
@@ -25,7 +25,7 @@ export default {
   name: 'Home',
   components: {
     ApiInput: () => import('@/components/form/ApiInput'),
-    CardView: () => import('@/components/base/CardView'),
+    ContentCard: () => import('@/components/base/ContentCard'),
     BackButton: () => import('@/components/base/BackButton')
   },
   computed: {
diff --git a/frontend/src/components/camp/CampPicasso.vue b/frontend/src/views/camp/WeekPicasso.vue
similarity index 93%
rename from frontend/src/components/camp/CampPicasso.vue
rename to frontend/src/views/camp/WeekPicasso.vue
index 35bec2860f..428bede5b4 100644
--- a/frontend/src/components/camp/CampPicasso.vue
+++ b/frontend/src/views/camp/WeekPicasso.vue
@@ -3,7 +3,7 @@ Listing all event instances of a single period.
 -->
 
 <template>
-  <card-view>
+  <content-card>
     <div v-for="period in periods.items"
          :key="period.id">
       <v-app-bar
@@ -78,14 +78,14 @@ Listing all event instances of a single period.
         </v-btn>
       </v-sheet>
     </div>
-  </card-view>
+  </content-card>
 </template>
 <script>
-import CardView from '../base/CardView'
+import ContentCard from '@/components/base/ContentCard'
 
 export default {
   name: 'CampPicassso',
-  components: { CardView, Picasso: () => import('../Picasso'), EventList: () => import('../EventList') },
+  components: { ContentCard, Picasso: () => import('@/components/Picasso'), EventList: () => import('@/components/EventList') },
   props: {
     camp: { type: Function, required: true }
   },
diff --git a/frontend/src/views/event/DayPicasso.vue b/frontend/src/views/event/DayPicasso.vue
index 455bd1def5..a4894081e1 100644
--- a/frontend/src/views/event/DayPicasso.vue
+++ b/frontend/src/views/event/DayPicasso.vue
@@ -17,7 +17,7 @@
 <script>
 import Picasso from '@/components/Picasso'
 import SideBar from '@/views/camp/SideBar'
-import CardView from '@/components/base/CardView'
+import CardView from '@/components/base/ContentCard'
 
 export default {
   name: 'DayPicasso',
diff --git a/frontend/src/views/event/Event.vue b/frontend/src/views/event/Event.vue
index 817aa5275d..3884dd0a34 100644
--- a/frontend/src/views/event/Event.vue
+++ b/frontend/src/views/event/Event.vue
@@ -52,8 +52,8 @@ Displays a single event
 export default {
   name: 'Event',
   components: {
-    BackButton: () => import('@/components/global/BackButton'),
-    CardView: () => import('@/components/base/CardView'),
+    BackButton: () => import('@/components/base/BackButton'),
+    CardView: () => import('@/components/base/ContentCard'),
     ApiInput: () => import('@/components/form/ApiInput.vue')
   },
   props: {

From 909bbc1dadbbfedbd800b93a0cb27eba4e18363e Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 10:09:17 +0100
Subject: [PATCH 29/85] isLoggedIn entfernt, da wir hier bereits eingeloggt
 sind.

---
 frontend/src/views/TopBar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/TopBar.vue b/frontend/src/views/TopBar.vue
index 7b7e704e7d..292fefe991 100644
--- a/frontend/src/views/TopBar.vue
+++ b/frontend/src/views/TopBar.vue
@@ -14,7 +14,7 @@
         <v-toolbar-items>
           <v-btn right text
                  :class="{ 'v-btn--open': value }" v-on="on">
-              <span v-if="$auth.isLoggedIn()" class="sr-only-sm-and-down">
+              <span class="sr-only-sm-and-down">
                 {{ username }}
               </span>
             <v-icon class="ma-2">mdi-account</v-icon>

From a9103a211641a42393c7347be9ae223cb4e9eb5c Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 10:10:22 +0100
Subject: [PATCH 30/85] Nur eine Periode zeigen. Evtl muss die Periode in Route
 aufgenommen werden.

---
 frontend/src/views/camp/WeekPicasso.vue | 154 ++++++++++++------------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/frontend/src/views/camp/WeekPicasso.vue b/frontend/src/views/camp/WeekPicasso.vue
index 428bede5b4..70170acf8d 100644
--- a/frontend/src/views/camp/WeekPicasso.vue
+++ b/frontend/src/views/camp/WeekPicasso.vue
@@ -4,88 +4,85 @@ Listing all event instances of a single period.
 
 <template>
   <content-card>
-    <div v-for="period in periods.items"
-         :key="period.id">
-      <v-app-bar
-        v-if="$vuetify.breakpoint.xs"
-        dense fixed
+    <v-app-bar
+      v-if="$vuetify.breakpoint.xs"
+      dense fixed
+      color="white"
+      style="z-index: 300"
+      :tile="false" class="ma-2 px-3">
+      <v-btn v-if="searchOpen" icon @click="searchOpen = false">
+        <v-icon>mdi-chevron-left</v-icon>
+      </v-btn>
+      <v-text-field
+        hide-details
+        :label="searchOpen ? 'Suchen' : 'Events & Camps suchen'"
+        single-line
+        @click="searchOpen = !searchOpen" />
+      <router-link :to="{name: 'profile'}">
+        <v-avatar size="32" class="ml-4">
+          <img
+            alt="Avatar"
+            src="https://avatars0.githubusercontent.com/u/9064066?v=4&s=460">
+        </v-avatar>
+      </router-link>
+    </v-app-bar>
+    <v-dialog
+      v-model="searchOpen"
+      style="z-index: 4"
+      overlay-color="white" hide-overlay
+      fullscreen transition="dialog-top-transition">
+      <v-card>
+        <v-sheet v-if="$vuetify.breakpoint.xs" height="70" />
+        <v-card-text>
+          <v-skeleton-loader class="mx-4" boilerplate type="list-item-two-line@3" />
+        </v-card-text>
+      </v-card>
+    </v-dialog>
+    <v-sheet v-if="$vuetify.breakpoint.xs" height="56" />
+    <v-sheet>
+      <v-btn
+        :fixed="$vuetify.breakpoint.xs"
+        :absolute="!$vuetify.breakpoint.xs"
+        light class="fab--top_nav"
+        fab small
+        style="z-index: 3"
+        top right
+        :class="{'float-right':!$vuetify.breakpoint.xs}"
         color="white"
-        style="z-index: 300"
-        :tile="false" class="ma-2 px-3">
-        <v-btn v-if="searchOpen" icon @click="searchOpen = false">
-          <v-icon>mdi-chevron-left</v-icon>
-        </v-btn>
-        <v-text-field
-          hide-details
-          :label="searchOpen ? 'Suchen' : 'Events & Camps suchen'"
-          single-line
-          @click="searchOpen = !searchOpen" />
-        <router-link :to="{name: 'profile'}">
-          <v-avatar size="32" class="ml-4">
-            <img
-              alt="Avatar"
-              src="https://avatars0.githubusercontent.com/u/9064066?v=4&s=460">
-          </v-avatar>
-        </router-link>
-      </v-app-bar>
-      <v-dialog
-        v-model="searchOpen"
-        style="z-index: 4"
-        overlay-color="white" hide-overlay
-        fullscreen transition="dialog-top-transition">
-        <v-card>
-          <v-sheet v-if="$vuetify.breakpoint.xs" height="70" />
-          <v-card-text>
-            <v-skeleton-loader class="mx-4" boilerplate type="list-item-two-line@3" />
-          </v-card-text>
-        </v-card>
-      </v-dialog>
-      <v-sheet v-if="$vuetify.breakpoint.xs" height="56" />
-      <v-sheet>
-        <v-btn
-          :fixed="$vuetify.breakpoint.xs"
-          :absolute="!$vuetify.breakpoint.xs"
-          light class="fab--top_nav"
-          fab small
-          style="z-index: 3"
-          top right
-          :class="{'float-right':!$vuetify.breakpoint.xs}"
-          color="white"
-          @click="picassoFormat = !picassoFormat">
-          <v-icon v-if="picassoFormat">mdi-menu</v-icon>
-          <v-icon v-else>mdi-calendar-month</v-icon>
-        </v-btn>
-        <picasso
-          v-if="picassoFormat"
-          :camp="camp"
-          class="mx-2 ma-sm-0 pa-sm-2"
-          :event-instances="period.event_instances().items"
-          :start="new Date(Date.parse(period.start))"
-          :end="new Date(Date.parse(period.end))" />
-        <event-list v-else
-                    :camp="camp" :event-instances="period.event_instances().items" />
-        <v-btn
-          :fixed="$vuetify.breakpoint.xs"
-          :absolute="!$vuetify.breakpoint.xs"
-          dark
-          fab
-          style="z-index: 3"
-          bottom
-          right
-          class="fab--bottom_nav float-right"
-          color="red">
-          <v-icon>mdi-plus</v-icon>
-        </v-btn>
-      </v-sheet>
-    </div>
+        @click="picassoFormat = !picassoFormat">
+        <v-icon v-if="picassoFormat">mdi-menu</v-icon>
+        <v-icon v-else>mdi-calendar-month</v-icon>
+      </v-btn>
+      <picasso
+        v-if="picassoFormat"
+        :camp="camp"
+        class="mx-2 ma-sm-0 pa-sm-2"
+        :event-instances="firstPeriod.event_instances().items"
+        :start="new Date(Date.parse(firstPeriod.start))"
+        :end="new Date(Date.parse(firstPeriod.end))" />
+      <event-list v-else
+                  :camp="camp" :event-instances="firstPeriod.event_instances().items" />
+      <v-btn
+        :fixed="$vuetify.breakpoint.xs"
+        :absolute="!$vuetify.breakpoint.xs"
+        dark
+        fab
+        style="z-index: 3"
+        bottom
+        right
+        class="fab--bottom_nav float-right"
+        color="red">
+        <v-icon>mdi-plus</v-icon>
+      </v-btn>
+    </v-sheet>
   </content-card>
 </template>
 <script>
 import ContentCard from '@/components/base/ContentCard'
 
 export default {
-  name: 'CampPicassso',
-  components: { ContentCard, Picasso: () => import('@/components/Picasso'), EventList: () => import('@/components/EventList') },
+  name: 'WeekPicasso',
+  components: { ContentCard, Picasso: () => import('@/components/camp/Picasso'), EventList: () => import('@/components/camp/EventList') },
   props: {
     camp: { type: Function, required: true }
   },
@@ -100,9 +97,12 @@ export default {
     periods () {
       return this.camp().periods()
     },
-    events () {
-      return this.camp().events()
+    firstPeriod () {
+      return this.periods.items[0]
     }
+  },
+  mounted () {
+    this.camp().events()
   }
 }
 </script>

From cf2190f96f8a44f2c8d7b6952d77681fcfd9afa1 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 10:11:00 +0100
Subject: [PATCH 31/85] Rearranged

---
 frontend/src/components/{ => camp}/EventList.vue | 2 +-
 frontend/src/components/camp/Picasso.vue         | 5 +----
 frontend/src/router.js                           | 4 ++--
 frontend/src/views/event/DayPicasso.vue          | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)
 rename frontend/src/components/{ => camp}/EventList.vue (96%)

diff --git a/frontend/src/components/EventList.vue b/frontend/src/components/camp/EventList.vue
similarity index 96%
rename from frontend/src/components/EventList.vue
rename to frontend/src/components/camp/EventList.vue
index 651ee4874e..d255a00fa0 100644
--- a/frontend/src/components/EventList.vue
+++ b/frontend/src/components/camp/EventList.vue
@@ -24,7 +24,7 @@ Listing all given event instances in a calendar view.
   </v-list>
 </template>
 <script>
-import { eventInstanceRoute } from '../router'
+import { eventInstanceRoute } from '@/router'
 
 export default {
   name: 'EventList',
diff --git a/frontend/src/components/camp/Picasso.vue b/frontend/src/components/camp/Picasso.vue
index d6b72bdcd7..e0af5ea80d 100644
--- a/frontend/src/components/camp/Picasso.vue
+++ b/frontend/src/components/camp/Picasso.vue
@@ -26,7 +26,7 @@ Listing all given event instances in a calendar view.
     @click:event="showEventInstance" />
 </template>
 <script>
-import { eventInstanceRoute } from '../router'
+import { eventInstanceRoute } from '@/router'
 
 export default {
   name: 'Picasso',
@@ -51,9 +51,6 @@ export default {
       return this.formatDateForProp(this.end)
     }
   },
-  mounted () {
-    this.camp().events()
-  },
   methods: {
     getEventName (event, _) {
       return '(' + event.input.number + ') ' + event.input.event().event_category().short + ': ' + event.input.event().title
diff --git a/frontend/src/router.js b/frontend/src/router.js
index 8eaf45928d..993ff2da80 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -99,12 +99,12 @@ export default new Router({
           path: 'picasso',
           name: 'camp/picasso',
           alias: '',
-          component: () => import(/* webpackChunkName: "campPicasso" */ './components/camp/CampPicasso.vue')
+          component: () => import(/* webpackChunkName: "campPicasso" */ './views/camp/WeekPicasso')
         },
         {
           path: 'admin',
           name: 'camp/admin',
-          component: () => import(/* webpackChunkName: "campDetails" */ './components/camp/Basic.vue')
+          component: () => import(/* webpackChunkName: "campDetails" */ './components/camp/Basic')
         }
       ]
     },
diff --git a/frontend/src/views/event/DayPicasso.vue b/frontend/src/views/event/DayPicasso.vue
index a4894081e1..5faf077b04 100644
--- a/frontend/src/views/event/DayPicasso.vue
+++ b/frontend/src/views/event/DayPicasso.vue
@@ -15,7 +15,7 @@
 </template>
 
 <script>
-import Picasso from '@/components/Picasso'
+import Picasso from '@/components/camp/Picasso'
 import SideBar from '@/views/camp/SideBar'
 import CardView from '@/components/base/ContentCard'
 

From d78f70204f309897d6339bc1a503d05214b98258 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 10:49:45 +0100
Subject: [PATCH 32/85] Added character variants so that the characters are
 more easily distinguishable

---
 frontend/src/scss/global.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/scss/global.scss b/frontend/src/scss/global.scss
index e0d0042ee8..ff988486d8 100644
--- a/frontend/src/scss/global.scss
+++ b/frontend/src/scss/global.scss
@@ -4,7 +4,7 @@
 @include inter-ui.weight-200;
 @include inter-ui.weight-400;
 @include inter-ui.weight-600;
-body {font-feature-settings: "ss03", "calt", "rlig", "kern"}
+body {font-feature-settings: "ss03", "calt", "rlig", "kern", "cv05", "cv07", "cv08"}
 .v-toolbar__title {font-weight: 500;}
 .theme--light.v-application {
 	background: #546E7A!important;

From f6ab0f137d39838c2fd58522e96e2b1a1b71eaae Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 10:52:22 +0100
Subject: [PATCH 33/85] Removed unnecessary definitions

---
 frontend/src/components/camp/EventList.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/frontend/src/components/camp/EventList.vue b/frontend/src/components/camp/EventList.vue
index d255a00fa0..305e90d57a 100644
--- a/frontend/src/components/camp/EventList.vue
+++ b/frontend/src/components/camp/EventList.vue
@@ -32,12 +32,6 @@ export default {
     camp: { type: Function, required: true },
     eventInstances: { type: Array, required: true }
   },
-  data () {
-    return {
-    }
-  },
-  computed: {
-  },
   methods: {
     eventInstanceLink (eventInstance) {
       return eventInstanceRoute(this.camp(), eventInstance)

From 45a6c9ac82647d8f4d741c0b5ac81fd5e6457399 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 10:52:50 +0100
Subject: [PATCH 34/85] Removed unnecessary loggedin

---
 frontend/src/views/Home.vue        | 13 +------------
 frontend/src/views/camp/TopBar.vue |  3 ---
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/frontend/src/views/Home.vue b/frontend/src/views/Home.vue
index 4fe96bd285..1d93cedb91 100644
--- a/frontend/src/views/Home.vue
+++ b/frontend/src/views/Home.vue
@@ -2,7 +2,7 @@
   <v-container>
     <content-card title="Herzlich willkommen bei eCamp" max-width="600">
       <v-list class="pt-0">
-        <v-list-item v-if="loggedIn" :to="{ name: 'camps' }">
+        <v-list-item :to="{ name: 'camps' }">
           <v-list-item-icon>
             <v-icon>mdi-format-list-bulleted-triangle</v-icon>
           </v-list-item-icon>
@@ -10,14 +10,6 @@
             <v-list-item-title>Meine Camps</v-list-item-title>
           </v-list-item-content>
         </v-list-item>
-        <v-list-item v-if="!loggedIn" :to="{ name: 'login' }">
-          <v-list-item-icon>
-            <v-icon>mdi-login</v-icon>
-          </v-list-item-icon>
-          <v-list-item-content>
-            <v-list-item-title>Login</v-list-item-title>
-          </v-list-item-content>
-        </v-list-item>
         <v-list-item v-if="runningInDocker" href="http://localhost:3001/setup.php?dev-data" target="_blank">
           <v-list-item-icon>
             <v-icon>mdi-database-plus</v-icon>
@@ -56,9 +48,6 @@ export default {
   name: 'Home',
   components: { ContentCard },
   computed: {
-    loggedIn () {
-      return this.$auth.isLoggedIn()
-    },
     runningInDocker () {
       return process.env.VUE_APP_RUNNING_IN_DOCKER
     }
diff --git a/frontend/src/views/camp/TopBar.vue b/frontend/src/views/camp/TopBar.vue
index 7dc2f932e1..d9f3d6d6b1 100644
--- a/frontend/src/views/camp/TopBar.vue
+++ b/frontend/src/views/camp/TopBar.vue
@@ -77,9 +77,6 @@ export default {
     }
   },
   computed: {
-    isLoggedIn () {
-      return this.$auth.isLoggedIn()
-    },
     camp () {
       return campFromRoute(this.$route)
     },

From 6f039ce54604470adc52b0191aa056298ec38054 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 11:04:42 +0100
Subject: [PATCH 35/85] Extracted MobileSearch.vue from WeekPicasso.vue and
 renamed Search.vue to DesktopSearch.vue

---
 .../{Search.vue => base/DesktopSearch.vue}    |  2 +-
 .../src/components/{global => base}/Logo.vue  |  0
 frontend/src/components/base/MobileSearch.vue | 53 +++++++++++++++++++
 frontend/src/views/TopBar.vue                 |  8 +--
 frontend/src/views/auth/TopBar.vue            |  2 +-
 frontend/src/views/camp/TopBar.vue            |  8 +--
 frontend/src/views/camp/WeekPicasso.vue       | 44 +++------------
 7 files changed, 70 insertions(+), 47 deletions(-)
 rename frontend/src/components/{Search.vue => base/DesktopSearch.vue} (96%)
 rename frontend/src/components/{global => base}/Logo.vue (100%)
 create mode 100644 frontend/src/components/base/MobileSearch.vue

diff --git a/frontend/src/components/Search.vue b/frontend/src/components/base/DesktopSearch.vue
similarity index 96%
rename from frontend/src/components/Search.vue
rename to frontend/src/components/base/DesktopSearch.vue
index 9b85d2f586..bfe2e63e3e 100644
--- a/frontend/src/components/Search.vue
+++ b/frontend/src/components/base/DesktopSearch.vue
@@ -13,7 +13,7 @@
 
 <script>
 export default {
-  name: 'GlobalSearch',
+  name: 'DesktopSearch',
   data () {
     return {
       searchFocused: false
diff --git a/frontend/src/components/global/Logo.vue b/frontend/src/components/base/Logo.vue
similarity index 100%
rename from frontend/src/components/global/Logo.vue
rename to frontend/src/components/base/Logo.vue
diff --git a/frontend/src/components/base/MobileSearch.vue b/frontend/src/components/base/MobileSearch.vue
new file mode 100644
index 0000000000..abca2475e3
--- /dev/null
+++ b/frontend/src/components/base/MobileSearch.vue
@@ -0,0 +1,53 @@
+<template>
+  <v-sheet v-if="$vuetify.breakpoint.xs" height="56">
+    <v-app-bar
+      v-if="$vuetify.breakpoint.xs"
+      dense fixed
+      color="white"
+      style="z-index: 300"
+      :tile="false" class="ma-2 px-3">
+      <v-btn v-if="searchOpen" icon @click="searchOpen = false">
+        <v-icon>mdi-chevron-left</v-icon>
+      </v-btn>
+      <v-text-field
+        hide-details
+        :label="searchOpen ? 'Suchen' : 'Events & Camps suchen'"
+        single-line
+        @click="searchOpen = !searchOpen" />
+      <router-link :to="{name: 'profile'}">
+        <v-avatar size="32" class="ml-4">
+          <img
+            alt="Avatar"
+            src="https://avatars0.githubusercontent.com/u/9064066?v=4&s=460">
+        </v-avatar>
+      </router-link>
+    </v-app-bar>
+    <v-dialog
+      v-model="searchOpen"
+      style="z-index: 4"
+      overlay-color="white" hide-overlay
+      fullscreen transition="dialog-top-transition">
+      <v-card>
+        <v-sheet v-if="$vuetify.breakpoint.xs" height="70" />
+        <v-card-text>
+          <v-skeleton-loader class="mx-4" boilerplate type="list-item-two-line@3" />
+        </v-card-text>
+      </v-card>
+    </v-dialog>
+  </v-sheet>
+</template>
+
+<script>
+export default {
+  name: 'MobileSearch',
+  data () {
+    return {
+      searchOpen: false
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/views/TopBar.vue b/frontend/src/views/TopBar.vue
index 292fefe991..20dc6bbd08 100644
--- a/frontend/src/views/TopBar.vue
+++ b/frontend/src/views/TopBar.vue
@@ -5,7 +5,7 @@
     color="blue-grey darken-4" dark>
     <logo text/>
     <v-spacer />
-    <global-search />
+    <desktop-search />
     <v-menu offset-y dark
             right content-class="ec-usermenu"
             transition="slide-y-transition"
@@ -43,13 +43,13 @@
 
 <script>
 import { campFromRoute, campRoute } from '@/router'
-import GlobalSearch from '@/components/Search'
+import DesktopSearch from '@/components/base/DesktopSearch'
 
 export default {
   name: 'TopBar',
   components: {
-    GlobalSearch,
-    Logo: () => import('@/components/global/Logo')
+    DesktopSearch,
+    Logo: () => import('@/components/base/Logo')
   },
   data () {
     return {
diff --git a/frontend/src/views/auth/TopBar.vue b/frontend/src/views/auth/TopBar.vue
index 246dfb6d94..f3eab62f8d 100644
--- a/frontend/src/views/auth/TopBar.vue
+++ b/frontend/src/views/auth/TopBar.vue
@@ -12,7 +12,7 @@
 export default {
   name: 'TopBar',
   components: {
-    Logo: () => import('@/components/global/Logo')
+    Logo: () => import('@/components/base/Logo')
   }
 }
 </script>
diff --git a/frontend/src/views/camp/TopBar.vue b/frontend/src/views/camp/TopBar.vue
index d9f3d6d6b1..d380f5a801 100644
--- a/frontend/src/views/camp/TopBar.vue
+++ b/frontend/src/views/camp/TopBar.vue
@@ -23,7 +23,7 @@
       </v-btn>
     </v-toolbar-items>
     <v-spacer />
-    <global-search />
+    <desktop-search />
     <v-menu offset-y dark
             right content-class="ec-usermenu"
             transition="slide-y-transition"
@@ -63,13 +63,13 @@
 
 <script>
 import { campFromRoute, campRoute } from '@/router'
-import GlobalSearch from '@/components/Search'
+import DesktopSearch from '@/components/base/DesktopSearch'
 
 export default {
   name: 'TopBar',
   components: {
-    GlobalSearch,
-    Logo: () => import('@/components/global/Logo')
+    DesktopSearch,
+    Logo: () => import('@/components/base/Logo')
   },
   data () {
     return {
diff --git a/frontend/src/views/camp/WeekPicasso.vue b/frontend/src/views/camp/WeekPicasso.vue
index 70170acf8d..885fbc2161 100644
--- a/frontend/src/views/camp/WeekPicasso.vue
+++ b/frontend/src/views/camp/WeekPicasso.vue
@@ -4,42 +4,8 @@ Listing all event instances of a single period.
 
 <template>
   <content-card>
-    <v-app-bar
-      v-if="$vuetify.breakpoint.xs"
-      dense fixed
-      color="white"
-      style="z-index: 300"
-      :tile="false" class="ma-2 px-3">
-      <v-btn v-if="searchOpen" icon @click="searchOpen = false">
-        <v-icon>mdi-chevron-left</v-icon>
-      </v-btn>
-      <v-text-field
-        hide-details
-        :label="searchOpen ? 'Suchen' : 'Events & Camps suchen'"
-        single-line
-        @click="searchOpen = !searchOpen" />
-      <router-link :to="{name: 'profile'}">
-        <v-avatar size="32" class="ml-4">
-          <img
-            alt="Avatar"
-            src="https://avatars0.githubusercontent.com/u/9064066?v=4&s=460">
-        </v-avatar>
-      </router-link>
-    </v-app-bar>
-    <v-dialog
-      v-model="searchOpen"
-      style="z-index: 4"
-      overlay-color="white" hide-overlay
-      fullscreen transition="dialog-top-transition">
-      <v-card>
-        <v-sheet v-if="$vuetify.breakpoint.xs" height="70" />
-        <v-card-text>
-          <v-skeleton-loader class="mx-4" boilerplate type="list-item-two-line@3" />
-        </v-card-text>
-      </v-card>
-    </v-dialog>
-    <v-sheet v-if="$vuetify.breakpoint.xs" height="56" />
     <v-sheet>
+      <mobile-search />
       <v-btn
         :fixed="$vuetify.breakpoint.xs"
         :absolute="!$vuetify.breakpoint.xs"
@@ -82,13 +48,17 @@ import ContentCard from '@/components/base/ContentCard'
 
 export default {
   name: 'WeekPicasso',
-  components: { ContentCard, Picasso: () => import('@/components/camp/Picasso'), EventList: () => import('@/components/camp/EventList') },
+  components: {
+    ContentCard,
+    MobileSearch: () => import('@/components/base/MobileSearch'),
+    Picasso: () => import('@/components/camp/Picasso'),
+    EventList: () => import('@/components/camp/EventList')
+  },
   props: {
     camp: { type: Function, required: true }
   },
   data () {
     return {
-      searchOpen: false,
       picassoFormat: true,
       tab: null
     }

From 0a9667480d995b6a1f66be61edeb0c430e3b257c Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 11:19:14 +0100
Subject: [PATCH 36/85] Now with correct `v-app` usage, the sizing is correct

---
 frontend/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index dd7f405ec5..3ca3fe2fc1 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -93,7 +93,7 @@ export default {
 
   @media #{map-get($display-breakpoints, 'xs-only')}{
     .v-content .container {
-      min-height: calc(100% - 56px);
+      height: 100%;
       display: flex;
 
       .v-card {

From 2db86752c17cbf7519e40ef4852ae891e2b96c02 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 11:19:55 +0100
Subject: [PATCH 37/85] Sidebar consistency improved

---
 frontend/src/views/event/DayPicasso.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/event/DayPicasso.vue b/frontend/src/views/event/DayPicasso.vue
index 5faf077b04..7ebc702630 100644
--- a/frontend/src/views/event/DayPicasso.vue
+++ b/frontend/src/views/event/DayPicasso.vue
@@ -1,6 +1,9 @@
 <template>
   <side-bar>
-    <card-view title="Tagesübersicht">
+    <card-view>
+      <v-subheader class="text-uppercase subtitle-2">
+        Tagesübersicht
+      </v-subheader>
       <v-skeleton-loader v-if="eventInstances.loading" class="ma-3"
                          type="list-item@6" />
       <picasso v-else

From 914923277e26af61bfda105a9b7af158045ed5d8 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 11:20:16 +0100
Subject: [PATCH 38/85] Now with correct `v-app` usage, the sizing is correct

---
 frontend/src/components/base/MobileSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/base/MobileSearch.vue b/frontend/src/components/base/MobileSearch.vue
index abca2475e3..c3e3978a94 100644
--- a/frontend/src/components/base/MobileSearch.vue
+++ b/frontend/src/components/base/MobileSearch.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-sheet v-if="$vuetify.breakpoint.xs" height="56">
+  <v-sheet v-if="$vuetify.breakpoint.xs" min-height="56">
     <v-app-bar
       v-if="$vuetify.breakpoint.xs"
       dense fixed

From bf967648f4ff5f5f1a547ca17a5a5d64c40771a5 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 11:21:46 +0100
Subject: [PATCH 39/85] Removed unnecessary definition

---
 frontend/src/views/camp/Periods.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/frontend/src/views/camp/Periods.vue b/frontend/src/views/camp/Periods.vue
index 8b496065a9..daf6c9c1e1 100644
--- a/frontend/src/views/camp/Periods.vue
+++ b/frontend/src/views/camp/Periods.vue
@@ -23,7 +23,6 @@ Displays periods of a single camp.
   </side-bar>
 </template>
 <script>
-import { eventInstanceRoute } from '@/router'
 import SideBar from '@/views/camp/SideBar'
 
 export default {
@@ -45,11 +44,6 @@ export default {
     events () {
       return this.camp().events()
     }
-  },
-  methods: {
-    eventInstanceRoute (eventInstance) {
-      return eventInstanceRoute(this.camp(), eventInstance)
-    }
   }
 }
 </script>

From 0e7d6edba2a9c3b9f24a52f98e8966d7b49b3530 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 11:30:10 +0100
Subject: [PATCH 40/85] Improved naming of view components

---
 frontend/src/router.js                                        | 4 ++--
 frontend/src/views/camp/{WeekPicasso.vue => CampOverview.vue} | 2 +-
 frontend/src/views/event/{DayPicasso.vue => DayOverview.vue}  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename frontend/src/views/camp/{WeekPicasso.vue => CampOverview.vue} (98%)
 rename frontend/src/views/event/{DayPicasso.vue => DayOverview.vue} (98%)

diff --git a/frontend/src/router.js b/frontend/src/router.js
index 993ff2da80..1699f14acd 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -99,7 +99,7 @@ export default new Router({
           path: 'picasso',
           name: 'camp/picasso',
           alias: '',
-          component: () => import(/* webpackChunkName: "campPicasso" */ './views/camp/WeekPicasso')
+          component: () => import(/* webpackChunkName: "campPicasso" */ './views/camp/CampOverview')
         },
         {
           path: 'admin',
@@ -114,7 +114,7 @@ export default new Router({
       components: {
         topbar: () => import(/* webpackChunkName: "register" */ './views/camp/TopBar'),
         default: () => import(/* webpackChunkName: "event" */ './views/event/Event'),
-        aside: () => import(/* webpackChunkName: "day" */ './views/event/DayPicasso'),
+        aside: () => import(/* webpackChunkName: "day" */ './views/event/DayOverview'),
         bottombar: () => import(/* webpackChunkName: "register" */ './views/camp/BottomBar')
       },
       beforeEnter: requireAuth,
diff --git a/frontend/src/views/camp/WeekPicasso.vue b/frontend/src/views/camp/CampOverview.vue
similarity index 98%
rename from frontend/src/views/camp/WeekPicasso.vue
rename to frontend/src/views/camp/CampOverview.vue
index 885fbc2161..424ef56e6c 100644
--- a/frontend/src/views/camp/WeekPicasso.vue
+++ b/frontend/src/views/camp/CampOverview.vue
@@ -47,7 +47,7 @@ Listing all event instances of a single period.
 import ContentCard from '@/components/base/ContentCard'
 
 export default {
-  name: 'WeekPicasso',
+  name: 'CampOverview',
   components: {
     ContentCard,
     MobileSearch: () => import('@/components/base/MobileSearch'),
diff --git a/frontend/src/views/event/DayPicasso.vue b/frontend/src/views/event/DayOverview.vue
similarity index 98%
rename from frontend/src/views/event/DayPicasso.vue
rename to frontend/src/views/event/DayOverview.vue
index 7ebc702630..19bf152932 100644
--- a/frontend/src/views/event/DayPicasso.vue
+++ b/frontend/src/views/event/DayOverview.vue
@@ -23,7 +23,7 @@ import SideBar from '@/views/camp/SideBar'
 import CardView from '@/components/base/ContentCard'
 
 export default {
-  name: 'DayPicasso',
+  name: 'DayOverview',
   components: { CardView, SideBar, Picasso },
   props: {
     day: { type: Function, required: true }

From 2a5d1ed95dc3147a216fb5d247a6e8a9f4aa12b8 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 12:41:48 +0100
Subject: [PATCH 41/85] Store format in query. Also added parse Boolean query
 parameter function

---
 frontend/src/router.js                   | 48 +++++++++++++-----------
 frontend/src/views/camp/CampOverview.vue | 17 +++++----
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/frontend/src/router.js b/frontend/src/router.js
index 1699f14acd..d9dbbe7066 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -13,7 +13,7 @@ export default new Router({
       path: '/register',
       name: 'register',
       components: {
-        topbar: () => import(/* webpackChunkName: "register" */ './views/auth/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/auth/TopBar'),
         default: () => import(/* webpackChunkName: "register" */ './views/auth/Register')
       }
     },
@@ -21,7 +21,7 @@ export default new Router({
       path: '/register-done',
       name: 'register-done',
       components: {
-        topbar: () => import(/* webpackChunkName: "register" */ './views/auth/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/auth/TopBar'),
         default: () => import(/* webpackChunkName: "register" */ './views/auth/RegisterDone')
       }
     },
@@ -29,7 +29,7 @@ export default new Router({
       path: '/login',
       name: 'login',
       components: {
-        topbar: () => import(/* webpackChunkName: "register" */ './views/auth/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/auth/TopBar'),
         default: () => import(/* webpackChunkName: "login" */ './views/auth/Login')
       }
     },
@@ -37,7 +37,7 @@ export default new Router({
       path: '/loginCallback',
       name: 'loginCallback',
       components: {
-        topbar: () => import(/* webpackChunkName: "register" */ './views/auth/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/auth/TopBar'),
         default: () => import(/* webpackChunkName: "login" */ './views/auth/LoginCallback')
       }
     },
@@ -45,9 +45,9 @@ export default new Router({
       path: '/',
       name: 'home',
       components: {
-        topbar: () => import(/* webpackChunkName: "register" */ './views/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/TopBar'),
         default: () => import(/* webpackChunkName: "about" */ './views/Home'),
-        bottombar: () => import(/* webpackChunkName: "register" */ './views/BottomBar')
+        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/BottomBar')
       },
       beforeEnter: requireAuth
     },
@@ -55,9 +55,9 @@ export default new Router({
       path: '/profile',
       name: 'profile',
       components: {
-        topbar: () => import(/* webpackChunkName: "register" */ './views/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/TopBar'),
         default: () => import(/* webpackChunkName: "about" */ './views/Profile'),
-        bottombar: () => import(/* webpackChunkName: "register" */ './views/BottomBar')
+        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/BottomBar')
       },
       beforeEnter: requireAuth
     },
@@ -65,19 +65,19 @@ export default new Router({
       path: '/camps',
       name: 'camps',
       components: {
-        topbar: () => import(/* webpackChunkName: "register" */ './views/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/TopBar'),
         default: () => import(/* webpackChunkName: "camps" */ './views/Camps'),
-        bottombar: () => import(/* webpackChunkName: "register" */ './views/BottomBar')
+        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/BottomBar')
       },
       beforeEnter: requireAuth
     },
     {
       path: '/camps/:campId/:campTitle?',
       components: {
-        topbar: () => import(/* webpackChunkName: "register" */ './views/camp/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/camp/TopBar'),
         default: () => import(/* webpackChunkName: "camp" */ './views/camp/Camp'),
         aside: () => import(/* webpackChunkName: "periods" */ './views/camp/Periods'),
-        bottombar: () => import(/* webpackChunkName: "register" */ './views/camp/BottomBar')
+        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/camp/BottomBar')
       },
       beforeEnter: requireAuth,
       props: {
@@ -90,16 +90,11 @@ export default new Router({
           name: 'camp/collaborators',
           component: () => import(/* webpackChunkName: "campCollaborators" */ './components/camp/Collaborators.vue')
         },
-        {
-          path: '',
-          name: 'camp',
-          redirect: { name: 'camp/picasso' }
-        },
         {
           path: 'picasso',
           name: 'camp/picasso',
-          alias: '',
-          component: () => import(/* webpackChunkName: "campPicasso" */ './views/camp/CampOverview')
+          component: () => import(/* webpackChunkName: "campPicasso" */ './views/camp/CampOverview'),
+          beforeEnter: parseBooleanInQuery
         },
         {
           path: 'admin',
@@ -112,10 +107,10 @@ export default new Router({
       path: '/camps/:campId/:campTitle/events/:eventInstanceId/:eventName?',
       name: 'event',
       components: {
-        topbar: () => import(/* webpackChunkName: "register" */ './views/camp/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/camp/TopBar'),
         default: () => import(/* webpackChunkName: "event" */ './views/event/Event'),
         aside: () => import(/* webpackChunkName: "day" */ './views/event/DayOverview'),
-        bottombar: () => import(/* webpackChunkName: "register" */ './views/camp/BottomBar')
+        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/camp/BottomBar')
       },
       beforeEnter: requireAuth,
       props: {
@@ -136,6 +131,17 @@ function requireAuth (to, from, next) {
   })
 }
 
+function parseBooleanInQuery (to, from, next) {
+  for (const [key, val] of Object.entries(to.query)) {
+    if (val === null || val === 'true') {
+      to.query[key] = true
+    } else if (val === 'false') {
+      to.query[key] = false
+    }
+  }
+  next()
+}
+
 export function campFromRoute (route) {
   return function () {
     return this.api.get('/camp/' + route.params.campId)
diff --git a/frontend/src/views/camp/CampOverview.vue b/frontend/src/views/camp/CampOverview.vue
index 424ef56e6c..afaafca399 100644
--- a/frontend/src/views/camp/CampOverview.vue
+++ b/frontend/src/views/camp/CampOverview.vue
@@ -15,19 +15,20 @@ Listing all event instances of a single period.
         top right
         :class="{'float-right':!$vuetify.breakpoint.xs}"
         color="white"
-        @click="picassoFormat = !picassoFormat">
-        <v-icon v-if="picassoFormat">mdi-menu</v-icon>
-        <v-icon v-else>mdi-calendar-month</v-icon>
+        :to="{ query: { ...$route.query, list: !listFormat } }">
+        <v-icon v-if="listFormat">mdi-calendar-month</v-icon>
+        <v-icon v-else>mdi-menu</v-icon>
       </v-btn>
+      <event-list
+        v-if="listFormat"
+        :camp="camp" :event-instances="firstPeriod.event_instances().items" />
       <picasso
-        v-if="picassoFormat"
+        v-else
         :camp="camp"
         class="mx-2 ma-sm-0 pa-sm-2"
         :event-instances="firstPeriod.event_instances().items"
         :start="new Date(Date.parse(firstPeriod.start))"
         :end="new Date(Date.parse(firstPeriod.end))" />
-      <event-list v-else
-                  :camp="camp" :event-instances="firstPeriod.event_instances().items" />
       <v-btn
         :fixed="$vuetify.breakpoint.xs"
         :absolute="!$vuetify.breakpoint.xs"
@@ -59,11 +60,13 @@ export default {
   },
   data () {
     return {
-      picassoFormat: true,
       tab: null
     }
   },
   computed: {
+    listFormat () {
+      return this.$route.query.list
+    },
     periods () {
       return this.camp().periods()
     },

From b164743fbbcf4aa9f699527d30b5e1fccc2fdf74 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 12:49:59 +0100
Subject: [PATCH 42/85] Made route naming consistent

---
 frontend/src/router.js                | 4 ++--
 frontend/src/views/camp/BottomBar.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/router.js b/frontend/src/router.js
index d9dbbe7066..b6994e14c4 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -91,8 +91,8 @@ export default new Router({
           component: () => import(/* webpackChunkName: "campCollaborators" */ './components/camp/Collaborators.vue')
         },
         {
-          path: 'picasso',
-          name: 'camp/picasso',
+          path: 'overview',
+          name: 'camp/overview',
           component: () => import(/* webpackChunkName: "campPicasso" */ './views/camp/CampOverview'),
           beforeEnter: parseBooleanInQuery
         },
diff --git a/frontend/src/views/camp/BottomBar.vue b/frontend/src/views/camp/BottomBar.vue
index a2d57b29bb..1068229f42 100644
--- a/frontend/src/views/camp/BottomBar.vue
+++ b/frontend/src/views/camp/BottomBar.vue
@@ -9,7 +9,7 @@
       <span>Tasks</span>
       <v-icon>mdi-format-list-checks</v-icon>
     </v-btn>
-    <v-btn :to="{name: 'camp/picasso'}">
+    <v-btn :to="{name: 'camp/overview'}">
       <span>Camp</span>
       <v-icon large>mdi-tent</v-icon>
     </v-btn>

From 8033683b21493f83a0ee28c5ab4e1ffba675a99a Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 13:02:15 +0100
Subject: [PATCH 43/85] Removed username from auth.js, exchanged it for profile
 and removed references to route picasso

---
 frontend/src/auth.js                  | 6 +-----
 frontend/src/components/base/Logo.vue | 2 +-
 frontend/src/views/TopBar.vue         | 2 +-
 frontend/src/views/camp/TopBar.vue    | 4 ++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/frontend/src/auth.js b/frontend/src/auth.js
index 54d8b6c10f..f25e3ab969 100644
--- a/frontend/src/auth.js
+++ b/frontend/src/auth.js
@@ -14,10 +14,6 @@ function isLoggedIn () {
   return get().auth().role === 'user'
 }
 
-function username () {
-  return get().auth().username
-}
-
 export async function refreshLoginStatus (forceReload = true) {
   if (forceReload) reload(get().auth())
   await get().auth()._meta.load
@@ -59,7 +55,7 @@ async function logout () {
   return reload(get().auth().logout())._meta.load.then(() => refreshLoginStatus())
 }
 
-export const auth = { isLoggedIn, username, refreshLoginStatus, login, register, loginGoogle, loginPbsMiData, logout }
+export const auth = { isLoggedIn, refreshLoginStatus, login, register, loginGoogle, loginPbsMiData, logout }
 
 Object.defineProperties(Vue.prototype, {
   $auth: {
diff --git a/frontend/src/components/base/Logo.vue b/frontend/src/components/base/Logo.vue
index c77081bc6c..78c66e3c1e 100644
--- a/frontend/src/components/base/Logo.vue
+++ b/frontend/src/components/base/Logo.vue
@@ -21,7 +21,7 @@ export default {
   },
   computed: {
     campHome () {
-      return this.camp ? campRoute(this.camp, 'picasso') : false
+      return this.camp ? campRoute(this.camp, 'overview') : false
     }
   }
 }
diff --git a/frontend/src/views/TopBar.vue b/frontend/src/views/TopBar.vue
index 20dc6bbd08..b25947758d 100644
--- a/frontend/src/views/TopBar.vue
+++ b/frontend/src/views/TopBar.vue
@@ -64,7 +64,7 @@ export default {
       return campFromRoute(this.$route)
     },
     username () {
-      return this.$auth.username()
+      return this.api.get().profile().username
     }
   },
   methods: {
diff --git a/frontend/src/views/camp/TopBar.vue b/frontend/src/views/camp/TopBar.vue
index d380f5a801..f9d0a676f4 100644
--- a/frontend/src/views/camp/TopBar.vue
+++ b/frontend/src/views/camp/TopBar.vue
@@ -4,7 +4,7 @@
              color="blue-grey darken-4" dark>
     <logo>
       <v-btn text class="justify-start px-2"
-             exact :to="campRoute(camp(), 'picasso')"
+             exact :to="campRoute(camp(), 'overview')"
              width="216">
         <v-toolbar-title>
           {{ camp().title | loading('Camp wird geladen…') }}
@@ -81,7 +81,7 @@ export default {
       return campFromRoute(this.$route)
     },
     username () {
-      return this.$auth.username()
+      return this.api.get().profile().username
     }
   },
   methods: {

From 10fc6742c339ef2f53002be3259a69f02d23b566 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 17:07:28 +0100
Subject: [PATCH 44/85] Use correct api input

---
 frontend/src/views/Profile.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/Profile.vue b/frontend/src/views/Profile.vue
index b025783587..48a1af8ece 100644
--- a/frontend/src/views/Profile.vue
+++ b/frontend/src/views/Profile.vue
@@ -8,7 +8,7 @@
         </v-card-title>
       </template>
       <v-col>
-        <api-input
+        <api-text-field
           label="Email"
           :uri="profile._meta.self"
           fieldname="mail"
@@ -24,7 +24,7 @@
 export default {
   name: 'Home',
   components: {
-    ApiInput: () => import('@/components/form/ApiInput'),
+    ApiTextField: () => import('@/components/form/ApiTextField'),
     ContentCard: () => import('@/components/base/ContentCard'),
     BackButton: () => import('@/components/base/BackButton')
   },

From 93320e2e7ee3cbacc1c5c153de7f386512f6c83e Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 17:09:25 +0100
Subject: [PATCH 45/85] Renamed CampHome to Admin

---
 frontend/src/router.js                              |  2 +-
 frontend/src/views/camp/{CampHome.vue => Admin.vue} | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)
 rename frontend/src/views/camp/{CampHome.vue => Admin.vue} (63%)

diff --git a/frontend/src/router.js b/frontend/src/router.js
index 1011491537..b753c243be 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -99,7 +99,7 @@ export default new Router({
         {
           path: 'admin',
           name: 'camp/admin',
-          component: () => import(/* webpackChunkName: "campDetails" */ './views/camp/CampHome')
+          component: () => import(/* webpackChunkName: "campAdmin" */ './views/camp/Admin')
         }
       ]
     },
diff --git a/frontend/src/views/camp/CampHome.vue b/frontend/src/views/camp/Admin.vue
similarity index 63%
rename from frontend/src/views/camp/CampHome.vue
rename to frontend/src/views/camp/Admin.vue
index 5e4bb71d9b..0751837fcc 100644
--- a/frontend/src/views/camp/CampHome.vue
+++ b/frontend/src/views/camp/Admin.vue
@@ -1,25 +1,26 @@
 <!--
-Home screen of a camp: Displays details & perdios of a single camp and allows to edit them.
+Admin screen of a camp: Displays details & periods of a single camp and allows to edit them.
 -->
 
 <template>
-  <div>
+  <content-card>
     <camp-settings :camp="camp" />
 
     <camp-periods :camp="camp" />
 
     <api-demo :camp="camp" />
-  </div>
+  </content-card>
 </template>
 
 <script>
 import CampSettings from '@/components/camp/CampSettings'
 import CampPeriods from '@/components/camp/CampPeriods'
 import ApiDemo from '@/components/camp/ApiDemo'
+import ContentCard from '@/components/base/ContentCard'
 
 export default {
-  name: 'CampHome',
-  components: { CampSettings, CampPeriods, ApiDemo },
+  name: 'Admin',
+  components: { ContentCard, CampSettings, CampPeriods, ApiDemo },
   props: {
     camp: { type: Function, required: true }
   },

From 52444e9ac7dda9097104f5b15413193d9d278823 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 17:14:54 +0100
Subject: [PATCH 46/85] Fixed campRoute without subroute

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

diff --git a/frontend/src/router.js b/frontend/src/router.js
index b753c243be..4e2dd10b09 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -162,7 +162,7 @@ function dayFromEventInstanceInRoute (route) {
 
 export function campRoute (camp, subroute) {
   if (camp._meta.loading) return {}
-  const routeName = subroute ? 'camp/' + subroute : 'camp'
+  const routeName = subroute ? 'camp/' + subroute : 'camp/overview'
   return { name: routeName, params: { campId: camp.id, campTitle: slugify(camp.title) } }
 }
 

From 9f082cb8daefba7c379a12b3c38d7cfd7fd3fa71 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 18:54:55 +0100
Subject: [PATCH 47/85] Fixed problems and improved consistency with merged
 features from devel

---
 frontend/src/App.vue                          |   2 +-
 frontend/src/components/base/ContentCard.vue  |   1 +
 frontend/src/components/base/ContentGroup.vue |  34 ++
 frontend/src/components/camp/ApiDemo.vue      |  11 +-
 frontend/src/components/camp/CampPeriods.vue  |  10 +-
 .../components/camp/CampPeriodsListItem.vue   |   2 +-
 frontend/src/components/camp/CampSettings.vue |  12 +-
 .../src/components/camp/Collaborators.vue     | 314 +++++++++---------
 frontend/src/components/form/ApiWrapper.vue   |  30 +-
 frontend/src/scss/global.scss                 |   1 +
 frontend/src/scss/variables.scss              |   4 +-
 frontend/src/views/camp/Admin.vue             |  13 +-
 12 files changed, 243 insertions(+), 191 deletions(-)
 create mode 100644 frontend/src/components/base/ContentGroup.vue

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 3ca3fe2fc1..382af10d56 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -93,7 +93,7 @@ export default {
 
   @media #{map-get($display-breakpoints, 'xs-only')}{
     .v-content .container {
-      height: 100%;
+      min-height: 100%;
       display: flex;
 
       .v-card {
diff --git a/frontend/src/components/base/ContentCard.vue b/frontend/src/components/base/ContentCard.vue
index 05754d7175..a124e7754b 100644
--- a/frontend/src/components/base/ContentCard.vue
+++ b/frontend/src/components/base/ContentCard.vue
@@ -31,6 +31,7 @@ export default {
   .v-toolbar {
     border-bottom: 1px solid;
   }
+  .v-card__title {font-weight: 600;}
 
   .static {
     position: static;
diff --git a/frontend/src/components/base/ContentGroup.vue b/frontend/src/components/base/ContentGroup.vue
new file mode 100644
index 0000000000..d809a44910
--- /dev/null
+++ b/frontend/src/components/base/ContentGroup.vue
@@ -0,0 +1,34 @@
+<!--
+Displays the content wrapped inside a card.
+-->
+
+<template>
+  <v-sheet class="ec-content-group mb-8">
+    <slot name="title">
+      <div v-if="title" class="ec-content-group__title mb-4 py-1 subtitle-1">
+        <v-icon v-if="icon" left>{{ icon }}</v-icon>
+        {{ title }}
+      </div>
+    </slot>
+    <v-skeleton-loader v-if="!loaded" type="article" />
+    <slot v-else />
+  </v-sheet>
+</template>
+
+<script>
+export default {
+  name: 'ContentGroup',
+  props: {
+    loaded: { type: Boolean, required: false, default: true },
+    title: { type: String, required: false, default: '' },
+    icon: { type: String, required: false, default: '' },
+    maxWidth: { type: String, default: '' }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .ec-content-group__title {
+    border-bottom: 1px solid map-get($blue-grey, 'lighten-4');
+  }
+</style>
diff --git a/frontend/src/components/camp/ApiDemo.vue b/frontend/src/components/camp/ApiDemo.vue
index 64a16bf177..f69ab8f05e 100644
--- a/frontend/src/components/camp/ApiDemo.vue
+++ b/frontend/src/components/camp/ApiDemo.vue
@@ -3,14 +3,15 @@ Displays details on a single camp and allows to edit them.
 -->
 
 <template>
-  <content-card icon="mdi-cogs" title="Api Demo">
+  <content-group title="Api Demo">
     <v-skeleton-loader v-if="camp()._meta.loading" type="article" />
     <v-form v-else>
       <v-text-field
         label="Name"
+        outlined hide-details="auto"
         readonly
         :value="camp().name"
-        class="mr-2 ml-2" />
+        class="my-4" />
       <api-text-field
         :value="camp().title"
         :uri="camp()._meta.self"
@@ -72,7 +73,7 @@ Displays details on a single camp and allows to edit them.
         </v-list-item>
       </v-list>
     </v-form>
-  </content-card>
+  </content-group>
 </template>
 
 <script>
@@ -83,11 +84,11 @@ import ApiTimePicker from '../form/ApiTimePicker'
 import ApiCheckbox from '../form/ApiCheckbox'
 import ApiColorPicker from '../form/ApiColorPicker'
 
-import ContentCard from '@/components/base/ContentCard'
+import ContentGroup from '@/components/base/ContentGroup'
 
 export default {
   name: 'ApiDemo',
-  components: { ContentCard, ApiTextField, ApiTextarea, ApiCheckbox, ApiDatePicker, ApiTimePicker, ApiColorPicker },
+  components: { ContentGroup, ApiTextField, ApiTextarea, ApiCheckbox, ApiDatePicker, ApiTimePicker, ApiColorPicker },
   props: {
     camp: { type: Function, required: true }
   },
diff --git a/frontend/src/components/camp/CampPeriods.vue b/frontend/src/components/camp/CampPeriods.vue
index b6e46a1aff..a9a35f40b9 100644
--- a/frontend/src/components/camp/CampPeriods.vue
+++ b/frontend/src/components/camp/CampPeriods.vue
@@ -3,9 +3,9 @@ Displays all periods of a single camp and allows to edit them & create new ones
 -->
 
 <template>
-  <content-card icon="mdi-calendar-plus" title="Periods">
+  <content-group title="Periods">
     <v-skeleton-loader v-if="camp()._meta.loading" type="article" />
-    <v-list>
+    <v-list class="py-0">
       <period-item
         v-for="period in periods.items"
         :key="period.id"
@@ -24,18 +24,18 @@ Displays all periods of a single camp and allows to edit them & create new ones
         </v-list-item-action>
       </v-list-item>
     </v-list>
-  </content-card>
+  </content-group>
 </template>
 
 <script>
-import ContentCard from '@/components/base/ContentCard'
 import ButtonAdd from '@/components/base/ButtonAdd'
 import PeriodItem from '@/components/camp/CampPeriodsListItem'
 import DialogPeriodCreate from '@/components/dialog/DialogPeriodCreate'
+import ContentGroup from '@/components/base/ContentGroup'
 
 export default {
   name: 'CampPeriods',
-  components: { ContentCard, ButtonAdd, PeriodItem, DialogPeriodCreate },
+  components: { ContentGroup, ButtonAdd, PeriodItem, DialogPeriodCreate },
   props: {
     camp: { type: Function, required: true }
   },
diff --git a/frontend/src/components/camp/CampPeriodsListItem.vue b/frontend/src/components/camp/CampPeriodsListItem.vue
index 1337cb8776..5dec15071d 100644
--- a/frontend/src/components/camp/CampPeriodsListItem.vue
+++ b/frontend/src/components/camp/CampPeriodsListItem.vue
@@ -4,7 +4,7 @@ Displays a single period as a list item including controls to edit and delete it
 
 <template>
   <v-list-item>
-    <v-list-item-content>
+    <v-list-item-content class="pt-0 pb-2">
       <v-list-item-title>{{ period.description }}</v-list-item-title>
       <v-list-item-subtitle>{{ period.start }} - {{ period.end }}</v-list-item-subtitle>
     </v-list-item-content>
diff --git a/frontend/src/components/camp/CampSettings.vue b/frontend/src/components/camp/CampSettings.vue
index 947bc46ade..e3eafbc5d7 100644
--- a/frontend/src/components/camp/CampSettings.vue
+++ b/frontend/src/components/camp/CampSettings.vue
@@ -3,14 +3,16 @@ Displays details on a single camp and allows to edit them.
 -->
 
 <template>
-  <content-card icon="mdi-cogs" title="Einstellungen">
+  <content-group title="Einstellungen">
     <v-skeleton-loader v-if="camp()._meta.loading" type="article" />
     <v-form v-else>
       <v-text-field
         label="Name"
+        outlined
         readonly
+        hide-details="auto"
         :value="camp().name"
-        class="mr-2 ml-2" />
+        class="mb-4" />
       <api-text-field
         :value="camp().title"
         :uri="camp()._meta.self"
@@ -24,16 +26,16 @@ Displays details on a single camp and allows to edit them.
         label="Motto"
         required />
     </v-form>
-  </content-card>
+  </content-group>
 </template>
 
 <script>
-import ContentCard from '@/components/base/ContentCard'
 import ApiTextField from '@/components/form/ApiTextField'
+import ContentGroup from '@/components/base/ContentGroup'
 
 export default {
   name: 'CampSettings',
-  components: { ApiTextField, ContentCard },
+  components: { ContentGroup, ApiTextField },
   props: {
     camp: { type: Function, required: true }
   },
diff --git a/frontend/src/components/camp/Collaborators.vue b/frontend/src/components/camp/Collaborators.vue
index 8d60d7810d..fd49e4f3d2 100644
--- a/frontend/src/components/camp/Collaborators.vue
+++ b/frontend/src/components/camp/Collaborators.vue
@@ -3,120 +3,117 @@ Displays collaborators of a single camp.
 -->
 <template>
   <content-card title="Team">
-    <v-simple-table width="100%">
-      <thead>
-        <tr>
-          <th width="50%">
-            User
-          </th>
-          <th width="25%">
-            Rolle
-          </th>
-          <th width="25%">
-            Option
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr
-          v-for="collaborator in establishedCollaborators"
-          :key="collaborator._meta.self">
-          <td>
-            <v-skeleton-loader v-if="collaborator.user()._meta.loading" type="text" />
-            {{ collaborator.user().username }}
-          </td>
-          <td>
-            <api-select
-              :value="collaborator.role"
-              :uri="collaborator._meta.self"
-              fieldname="role"
-              :items="['member', 'manager']"
-              required
-              dense />
-          </td>
-          <td
-            style="white-space: nowrap">
-            <v-btn
-              small
-              color="warning"
-              @click="api.del(collaborator)">
-              <v-icon
+    <v-card-text>
+      <content-group title="Mitglieder">
+        <v-simple-table width="100%">
+          <thead>
+          <tr>
+            <th width="50%">
+              User
+            </th>
+            <th width="25%">
+              Rolle
+            </th>
+            <th width="25%">
+              Option
+            </th>
+          </tr>
+          </thead>
+          <tbody>
+          <tr
+            v-for="collaborator in establishedCollaborators"
+            :key="collaborator._meta.self">
+            <td>
+              <v-skeleton-loader v-if="collaborator.user()._meta.loading" type="text" />
+              {{ collaborator.user().username }}
+            </td>
+            <td>
+              <api-select
+                :value="collaborator.role"
+                :uri="collaborator._meta.self"
+                fieldname="role"
+                :items="['member', 'manager']"
+                required
+                dense />
+            </td>
+            <td
+              style="white-space: nowrap">
+              <v-btn
                 small
-                left>
-                mdi-close
-              </v-icon>
-              delete
-            </v-btn>
-          </td>
-        </tr>
-      </tbody>
-    </v-simple-table>
+                color="warning"
+                @click="api.del(collaborator)">
+                <v-icon
+                  small
+                  left>
+                  mdi-close
+                </v-icon>
+                delete
+              </v-btn>
+            </td>
+          </tr>
+          </tbody>
+        </v-simple-table>
+      </content-group>
 
-    <div v-if="requestedCollaborators.length > 0">
-      <h3 class="mt-4">
-        Offene Anfragen
-      </h3>
-      <v-simple-table width="100%">
-        <tr>
-          <th width="50%">
-            User
-          </th>
-          <th width="25%">
-            Rolle
-          </th>
-          <th width="25%">
-            Option
-          </th>
-        </tr>
-        <tr
-          v-for="collaborator in requestedCollaborators"
-          :key="collaborator.id">
-          <td>{{ collaborator.user().username }}</td>
-          <td>
-            <api-select
-              :value="collaborator.role"
-              :uri="collaborator._meta.self"
-              fieldname="role"
-              :items="['member', 'manager']"
-              required
-              dense />
-          </td>
-          <td
-            style="white-space: nowrap">
-            <v-btn
-              small
-              color="success"
-              @click="changeStatus(collaborator, 'established')">
-              <v-icon
+      <content-group title="Offene Anfragen" v-if="requestedCollaborators.length > 0">
+        <v-simple-table width="100%">
+          <tr>
+            <th width="50%">
+              User
+            </th>
+            <th width="25%">
+              Rolle
+            </th>
+            <th width="25%">
+              Option
+            </th>
+          </tr>
+          <tr
+            v-for="collaborator in requestedCollaborators"
+            :key="collaborator.id">
+            <td>{{ collaborator.user().username }}</td>
+            <td>
+              <api-select
+                :value="collaborator.role"
+                :uri="collaborator._meta.self"
+                fieldname="role"
+                :items="['member', 'manager']"
+                required
+                dense />
+            </td>
+            <td
+              style="white-space: nowrap">
+              <v-btn
                 small
-                left>
-                mdi-check
-              </v-icon>
-              accept
-            </v-btn>
-            <v-btn
-              small
-              color="warning"
-              @click="changeStatus(collaborator, 'unrelated')">
-              <v-icon
+                color="success"
+                @click="changeStatus(collaborator, 'established')">
+                <v-icon
+                  small
+                  left>
+                  mdi-check
+                </v-icon>
+                accept
+              </v-btn>
+              <v-btn
                 small
-                left>
-                mdi-close
-              </v-icon>
-              deny
-            </v-btn>
-          </td>
-        </tr>
-      </v-simple-table>
-      <v-divider />
-    </div>
+                color="warning"
+                @click="changeStatus(collaborator, 'unrelated')">
+                <v-icon
+                  small
+                  left>
+                  mdi-close
+                </v-icon>
+                deny
+              </v-btn>
+            </td>
+          </tr>
+        </v-simple-table>
+        <v-divider />
+      </content-group>
 
-    <div v-if="invitedCollaborators.length > 0">
-      <h3 class="mt-4">
-        Offene Einladungen
-      </h3>
-      <v-simple-table width="100%">
-        <thead>
+      <content-group title="Offene Einladungen" v-if="invitedCollaborators.length > 0">
+        <v-simple-table width="100%">
+          <thead>
           <tr>
             <th width="50%">
               User
@@ -128,8 +125,8 @@ Displays collaborators of a single camp.
               Option
             </th>
           </tr>
-        </thead>
-        <tbody>
+          </thead>
+          <tbody>
           <tr
             v-for="collaborator in invitedCollaborators"
             :key="collaborator.id">
@@ -158,68 +155,67 @@ Displays collaborators of a single camp.
               </v-btn>
             </td>
           </tr>
-        </tbody>
-      </v-simple-table>
-      <v-divider />
-    </div>
-
-    <v-card-text>
-      <h3 class="mt-4">
-        Einladen
-      </h3>
+          </tbody>
+        </v-simple-table>
+        <v-divider />
+      </content-group>
 
-      <v-text-field
-        v-model="search"
-        hide-details
-        prepend-icon="mdi-account-search"
-        single-line
-        placeholder="Suchen" />
+      <content-group title="Einladen">
+        <v-text-field
+          v-model="search"
+          hide-details
+          prepend-icon="mdi-account-search"
+          single-line
+          placeholder="Suchen" />
 
-      <v-simple-table
-        width="100%"
-        class="mt-4">
-        <tr
-          v-for="result in searchResults"
-          :key="result.id">
-          <td>{{ result.username }}</td>
-          <td
-            style="white-space: nowrap">
-            <v-btn
-              small
-              color="success"
-              class="mr-1"
-              @click="invite(result, 'member')">
-              <v-icon
+        <v-simple-table
+          width="100%"
+          class="mt-4">
+          <tr
+            v-for="result in searchResults"
+            :key="result.id">
+            <td>{{ result.username }}</td>
+            <td
+              style="white-space: nowrap">
+              <v-btn
                 small
-                left>
-                mdi-plus-circle
-              </v-icon>
-              member
-            </v-btn>
+                color="success"
+                class="mr-1"
+                @click="invite(result, 'member')">
+                <v-icon
+                  small
+                  left>
+                  mdi-plus-circle
+                </v-icon>
+                member
+              </v-btn>
 
-            <v-btn
-              small
-              color="success"
-              @click="invite(result, 'manager')">
-              <v-icon
+              <v-btn
                 small
-                left>
-                mdi-plus-circle
-              </v-icon>
-              manager
-            </v-btn>
-          </td>
-        </tr>
-      </v-simple-table>
+                color="success"
+                @click="invite(result, 'manager')">
+                <v-icon
+                  small
+                  left>
+                  mdi-plus-circle
+                </v-icon>
+                manager
+              </v-btn>
+            </td>
+          </tr>
+        </v-simple-table>
+      </content-group>
     </v-card-text>
   </content-card>
 </template>
 <script>
 import ContentCard from '@/components/base/ContentCard'
+import ContentGroup from '@/components/base/ContentGroup'
 
 export default {
   name: 'Collaborators',
   components: {
+    ContentGroup,
     ContentCard,
     ApiSelect: () => import('@/components/form/ApiSelect.vue')
   },
diff --git a/frontend/src/components/form/ApiWrapper.vue b/frontend/src/components/form/ApiWrapper.vue
index 813b5e37ac..8cc9890fff 100644
--- a/frontend/src/components/form/ApiWrapper.vue
+++ b/frontend/src/components/form/ApiWrapper.vue
@@ -5,7 +5,8 @@ Wrapper component for form components to save data back to API
 <template>
   <v-form
     inline
-    class="mb-4">
+    v-bind:class="{'d-flex api-wrapper--savable':!autoSave && !readonly}"
+    class="my-4">
     <slot
       :localValue="localValue"
       :errorMessages="errorMessages"
@@ -16,9 +17,10 @@ Wrapper component for form components to save data back to API
     <v-btn
       v-if="!autoSave && !readonly"
       :disabled="disabled"
-      small
-      color="warning"
+      small elevation="0"
+      color="warning" tile
       class="mb-0"
+      height="auto"
       @click="reset">
       Reset
     </v-btn>
@@ -26,9 +28,10 @@ Wrapper component for form components to save data back to API
     <v-btn
       v-if="!autoSave && !readonly"
       color="primary"
-      small
+      small elevation="0"
       :disabled="disabled || isSaving || (required && $v.localValue.$invalid)"
-      class="mb-0"
+      class="mb-0 v-btn--last-instance"
+      height="auto"
       @click="save">
       <v-progress-circular
         v-if="isSaving"
@@ -151,7 +154,9 @@ export default {
       this.api.patch(this.uri, { [this.fieldname]: this.localValue }).then(() => {
         this.isSaving = false
         this.showSuccessIcon = true
-        setTimeout(() => { this.showSuccessIcon = false }, 2000)
+        setTimeout(() => {
+          this.showSuccessIcon = false
+        }, 2000)
       }, (e, a) => {
         console.log('error')
       })
@@ -161,5 +166,16 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+  .v-btn--last-instance {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+  }
+</style>
+
+<style lang="scss" >
+  .api-wrapper--savable .v-text-field {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+  }
 </style>
diff --git a/frontend/src/scss/global.scss b/frontend/src/scss/global.scss
index ff988486d8..b292bc35e1 100644
--- a/frontend/src/scss/global.scss
+++ b/frontend/src/scss/global.scss
@@ -3,6 +3,7 @@
   );
 @include inter-ui.weight-200;
 @include inter-ui.weight-400;
+@include inter-ui.weight-500;
 @include inter-ui.weight-600;
 body {font-feature-settings: "ss03", "calt", "rlig", "kern", "cv05", "cv07", "cv08"}
 .v-toolbar__title {font-weight: 500;}
diff --git a/frontend/src/scss/variables.scss b/frontend/src/scss/variables.scss
index 806eb25604..eb9a6e046b 100644
--- a/frontend/src/scss/variables.scss
+++ b/frontend/src/scss/variables.scss
@@ -44,13 +44,13 @@ $headings: (
   ),
   'h6': (
     'size': 1.25rem,
-    'weight': 500,
+    'weight': 600,
     'line-height': 1.428571429,
     'letter-spacing': -.0125em,
     'font-family': $heading-font-family
   ),
   'subtitle-1': (
-    'size': 1rem,
+    'size': 1.125rem,
     'weight': 400,
     'line-height': 1.428571429,
     'letter-spacing': -.017em,
diff --git a/frontend/src/views/camp/Admin.vue b/frontend/src/views/camp/Admin.vue
index 0751837fcc..70bc68e24b 100644
--- a/frontend/src/views/camp/Admin.vue
+++ b/frontend/src/views/camp/Admin.vue
@@ -3,12 +3,14 @@ Admin screen of a camp: Displays details & periods of a single camp and allows t
 -->
 
 <template>
-  <content-card>
-    <camp-settings :camp="camp" />
+  <content-card title="Admin">
+    <v-card-text>
+      <camp-settings :camp="camp" />
 
-    <camp-periods :camp="camp" />
+      <camp-periods :camp="camp" />
 
-    <api-demo :camp="camp" />
+      <api-demo :camp="camp" />
+    </v-card-text>
   </content-card>
 </template>
 
@@ -25,8 +27,7 @@ export default {
     camp: { type: Function, required: true }
   },
   data () {
-    return {
-    }
+    return {}
   }
 }
 </script>

From 78b8c58c974e481792ded80883872c09bda34db4 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sat, 14 Mar 2020 23:50:13 +0100
Subject: [PATCH 48/85] Fixed layout of the forms

---
 .../components/dialog/DialogEntityDelete.vue  |  8 +---
 frontend/src/components/dialog/DialogForm.vue |  4 +-
 .../components/dialog/DialogPeriodCreate.vue  | 41 +++++++++----------
 .../components/dialog/DialogPeriodEdit.vue    | 39 +++++++++---------
 4 files changed, 42 insertions(+), 50 deletions(-)

diff --git a/frontend/src/components/dialog/DialogEntityDelete.vue b/frontend/src/components/dialog/DialogEntityDelete.vue
index af80a2d4e8..7b06812092 100644
--- a/frontend/src/components/dialog/DialogEntityDelete.vue
+++ b/frontend/src/components/dialog/DialogEntityDelete.vue
@@ -12,18 +12,14 @@
     <template v-slot:activator="scope">
       <slot name="activator" v-bind="scope" />
     </template>
-
-    <v-row>
-      <v-col cols="12">
-        Do you really want do delete <slot>this</slot>?
-      </v-col>
-    </v-row>
+    Do you really want do delete <slot>this</slot>?
   </dialog-form>
 </template>
 
 <script>
 import DialogForm from './DialogForm'
 import DialogBase from './DialogBase'
+
 export default {
   name: 'DialogEntityDelete',
   components: { DialogForm },
diff --git a/frontend/src/components/dialog/DialogForm.vue b/frontend/src/components/dialog/DialogForm.vue
index ced7cb2e21..64faf01cec 100644
--- a/frontend/src/components/dialog/DialogForm.vue
+++ b/frontend/src/components/dialog/DialogForm.vue
@@ -19,9 +19,7 @@
         </v-toolbar>
 
         <v-card-text>
-          <v-container>
-            <slot />
-          </v-container>
+          <slot />
         </v-card-text>
         <v-card-actions>
           <v-spacer />
diff --git a/frontend/src/components/dialog/DialogPeriodCreate.vue b/frontend/src/components/dialog/DialogPeriodCreate.vue
index 68689cb1c3..0253cb6a17 100644
--- a/frontend/src/components/dialog/DialogPeriodCreate.vue
+++ b/frontend/src/components/dialog/DialogPeriodCreate.vue
@@ -11,32 +11,31 @@
       <slot name="activator" v-bind="scope" />
     </template>
 
-    <v-row>
-      <v-col cols="12">
-        <v-text-field
-          v-model="entityData.description"
-          label="Description"
-          required />
-      </v-col>
-      <v-col cols="12">
-        <v-text-field
-          v-model="entityData.start"
-          label="Start"
-          required />
-      </v-col>
-      <v-col cols="12">
-        <v-text-field
-          v-model="entityData.end"
-          label="End"
-          required />
-      </v-col>
-    </v-row>
+    <v-text-field
+      hide-details="auto" outlined
+      class="mb-4"
+      v-model="entityData.description"
+      label="Description"
+      required />
+    <v-text-field
+      hide-details="auto" outlined
+      class="mb-4"
+      v-model="entityData.start"
+      label="Start"
+      required />
+    <v-text-field
+      hide-details="auto" outlined
+      class="mb-4"
+      v-model="entityData.end"
+      label="End"
+      required />
   </dialog-form>
 </template>
 
 <script>
 import DialogForm from './DialogForm'
 import DialogBase from './DialogBase'
+
 export default {
   name: 'DialogPeriodCreate',
   components: { DialogForm },
@@ -60,7 +59,7 @@ export default {
       if (showDialog) {
         this.setEntityData({ camp_id: this.camp.id })
       } else {
-      // clear form on exit
+        // clear form on exit
         this.clearEntityData()
       }
     }
diff --git a/frontend/src/components/dialog/DialogPeriodEdit.vue b/frontend/src/components/dialog/DialogPeriodEdit.vue
index 9fdcfc0a57..c97c972e98 100644
--- a/frontend/src/components/dialog/DialogPeriodEdit.vue
+++ b/frontend/src/components/dialog/DialogPeriodEdit.vue
@@ -10,32 +10,31 @@
       <slot name="activator" v-bind="scope" />
     </template>
 
-    <v-row>
-      <v-col cols="12">
-        <v-text-field
-          v-model="entityData.description"
-          label="Description"
-          required />
-      </v-col>
-      <v-col cols="12">
-        <v-text-field
-          v-model="entityData.start"
-          label="Start"
-          required />
-      </v-col>
-      <v-col cols="12">
-        <v-text-field
-          v-model="entityData.end"
-          label="End"
-          required />
-      </v-col>
-    </v-row>
+    <v-text-field
+      hide-details="auto" outlined
+      class="mb-4"
+      v-model="entityData.description"
+      label="Description"
+      required />
+    <v-text-field
+      hide-details="auto" outlined
+      class="mb-4"
+      v-model="entityData.start"
+      label="Start"
+      required />
+    <v-text-field
+      hide-details="auto" outlined
+      class="mb-4"
+      v-model="entityData.end"
+      label="End"
+      required />
   </dialog-form>
 </template>
 
 <script>
 import DialogBase from './DialogBase'
 import DialogForm from './DialogForm'
+
 export default {
   name: 'DialogPeriodEdit',
   components: { DialogForm },

From 04bcc658c986ace767284bef4069debd22eafe23 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 09:49:58 +0100
Subject: [PATCH 49/85] Improved spacing

---
 frontend/src/components/base/ContentGroup.vue |  2 +-
 frontend/src/components/camp/ApiDemo.vue      | 20 +++++++++++--------
 frontend/src/components/camp/CampPeriods.vue  |  2 +-
 frontend/src/components/camp/CampSettings.vue |  3 ++-
 frontend/src/components/form/ApiWrapper.vue   |  3 +--
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/base/ContentGroup.vue b/frontend/src/components/base/ContentGroup.vue
index d809a44910..5ed4b4fb3d 100644
--- a/frontend/src/components/base/ContentGroup.vue
+++ b/frontend/src/components/base/ContentGroup.vue
@@ -5,7 +5,7 @@ Displays the content wrapped inside a card.
 <template>
   <v-sheet class="ec-content-group mb-8">
     <slot name="title">
-      <div v-if="title" class="ec-content-group__title mb-4 py-1 subtitle-1">
+      <div v-if="title" class="ec-content-group__title py-1 subtitle-1">
         <v-icon v-if="icon" left>{{ icon }}</v-icon>
         {{ title }}
       </div>
diff --git a/frontend/src/components/camp/ApiDemo.vue b/frontend/src/components/camp/ApiDemo.vue
index f69ab8f05e..7d7ebc8a8a 100644
--- a/frontend/src/components/camp/ApiDemo.vue
+++ b/frontend/src/components/camp/ApiDemo.vue
@@ -18,6 +18,7 @@ Displays details on a single camp and allows to edit them.
         fieldname="title"
         label="Titel"
         :auto-save="false"
+        class="my-4"
         readonly
         required />
       <api-textarea
@@ -27,6 +28,7 @@ Displays details on a single camp and allows to edit them.
         label="Motto"
         :auto-save="false"
         disabled
+        class="my-4"
         required />
 
       <api-checkbox
@@ -35,6 +37,7 @@ Displays details on a single camp and allows to edit them.
         fieldname="check"
         label="Checkbox example"
         readonly
+        class="mb-4"
         required />
 
       <api-time-picker
@@ -42,6 +45,7 @@ Displays details on a single camp and allows to edit them.
         :uri="camp()._meta.self"
         fieldname="time"
         label="Startzeit"
+        class="mb-4"
         disabled
         required />
 
@@ -51,6 +55,7 @@ Displays details on a single camp and allows to edit them.
         fieldname="color"
         label="Color Example"
         readonly
+        class="mb-4"
         required />
 
       <v-list>
@@ -61,15 +66,14 @@ Displays details on a single camp and allows to edit them.
           <v-list-item-content>
             <v-list-item-title>{{ period.description }}</v-list-item-title>
             <v-list-item-subtitle>{{ period.start }} - {{ period.end }}</v-list-item-subtitle>
-
-            <api-date-picker
-              :value="period.start"
-              :uri="period._meta.self"
-              fieldname="start"
-              label="Starttermin"
-              disabled
-              required />
           </v-list-item-content>
+          <api-date-picker
+            :value="period.start"
+            :uri="period._meta.self"
+            fieldname="start"
+            label="Starttermin"
+            disabled
+            required />
         </v-list-item>
       </v-list>
     </v-form>
diff --git a/frontend/src/components/camp/CampPeriods.vue b/frontend/src/components/camp/CampPeriods.vue
index a9a35f40b9..58d47d34e2 100644
--- a/frontend/src/components/camp/CampPeriods.vue
+++ b/frontend/src/components/camp/CampPeriods.vue
@@ -5,7 +5,7 @@ Displays all periods of a single camp and allows to edit them & create new ones
 <template>
   <content-group title="Periods">
     <v-skeleton-loader v-if="camp()._meta.loading" type="article" />
-    <v-list class="py-0">
+    <v-list>
       <period-item
         v-for="period in periods.items"
         :key="period.id"
diff --git a/frontend/src/components/camp/CampSettings.vue b/frontend/src/components/camp/CampSettings.vue
index e3eafbc5d7..6416f7e25b 100644
--- a/frontend/src/components/camp/CampSettings.vue
+++ b/frontend/src/components/camp/CampSettings.vue
@@ -12,12 +12,13 @@ Displays details on a single camp and allows to edit them.
         readonly
         hide-details="auto"
         :value="camp().name"
-        class="mb-4" />
+        class="my-4" />
       <api-text-field
         :value="camp().title"
         :uri="camp()._meta.self"
         fieldname="title"
         label="Titel"
+        class="mb-4"
         required />
       <api-text-field
         :value="camp().motto"
diff --git a/frontend/src/components/form/ApiWrapper.vue b/frontend/src/components/form/ApiWrapper.vue
index 8cc9890fff..5d78729b1c 100644
--- a/frontend/src/components/form/ApiWrapper.vue
+++ b/frontend/src/components/form/ApiWrapper.vue
@@ -5,8 +5,7 @@ Wrapper component for form components to save data back to API
 <template>
   <v-form
     inline
-    v-bind:class="{'d-flex api-wrapper--savable':!autoSave && !readonly}"
-    class="my-4">
+    :class="{'d-flex api-wrapper--savable':!autoSave && !readonly}">
     <slot
       :localValue="localValue"
       :errorMessages="errorMessages"

From b200a5763382d1c0b54a893f72e61a80e1ca1dc4 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 09:55:10 +0100
Subject: [PATCH 50/85] Optimized collaborator view

---
 .../components/camp/CollaboratorListItem.vue  |  47 +++++
 .../src/components/camp/Collaborators.vue     | 194 +++---------------
 2 files changed, 80 insertions(+), 161 deletions(-)
 create mode 100644 frontend/src/components/camp/CollaboratorListItem.vue

diff --git a/frontend/src/components/camp/CollaboratorListItem.vue b/frontend/src/components/camp/CollaboratorListItem.vue
new file mode 100644
index 0000000000..ca44218978
--- /dev/null
+++ b/frontend/src/components/camp/CollaboratorListItem.vue
@@ -0,0 +1,47 @@
+<template>
+  <v-list-item class="px-0" two-line>
+    <v-list-item-avatar>
+      <v-img src="https://i.pravatar.cc/300" />
+    </v-list-item-avatar>
+    <v-list-item-content>
+      <v-list-item-title>{{ collaborator.user().username }}</v-list-item-title>
+      <v-list-item-subtitle>{{ collaborator.user().mail }}</v-list-item-subtitle>
+    </v-list-item-content>
+    <api-select
+      :value="collaborator.role"
+      :uri="collaborator._meta.self"
+      fieldname="role"
+      :items="['member', 'manager']"
+      required
+      dense />
+    <v-list-item-action>
+      <v-btn
+        small
+        color="warning"
+        @click="api.del(collaborator)">
+        <v-icon
+          small
+          left>
+          mdi-close
+        </v-icon>
+        delete
+      </v-btn>
+    </v-list-item-action>
+  </v-list-item>
+</template>
+
+<script>
+import ApiSelect from '@/components/form/ApiSelect'
+
+export default {
+  name: 'CollaboratorListItem',
+  components: { ApiSelect },
+  props: {
+    collaborator: { type: Object, required: true }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/components/camp/Collaborators.vue b/frontend/src/components/camp/Collaborators.vue
index fd49e4f3d2..d207afcf8d 100644
--- a/frontend/src/components/camp/Collaborators.vue
+++ b/frontend/src/components/camp/Collaborators.vue
@@ -5,159 +5,27 @@ Displays collaborators of a single camp.
   <content-card title="Team">
     <v-card-text>
       <content-group title="Mitglieder">
-        <v-simple-table width="100%">
-          <thead>
-          <tr>
-            <th width="50%">
-              User
-            </th>
-            <th width="25%">
-              Rolle
-            </th>
-            <th width="25%">
-              Option
-            </th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr
+        <v-list>
+          <collaborator-list-item
             v-for="collaborator in establishedCollaborators"
-            :key="collaborator._meta.self">
-            <td>
-              <v-skeleton-loader v-if="collaborator.user()._meta.loading" type="text" />
-              {{ collaborator.user().username }}
-            </td>
-            <td>
-              <api-select
-                :value="collaborator.role"
-                :uri="collaborator._meta.self"
-                fieldname="role"
-                :items="['member', 'manager']"
-                required
-                dense />
-            </td>
-            <td
-              style="white-space: nowrap">
-              <v-btn
-                small
-                color="warning"
-                @click="api.del(collaborator)">
-                <v-icon
-                  small
-                  left>
-                  mdi-close
-                </v-icon>
-                delete
-              </v-btn>
-            </td>
-          </tr>
-          </tbody>
-        </v-simple-table>
+            :key="collaborator._meta.self" :collaborator="collaborator" />
+        </v-list>
       </content-group>
 
-      <content-group title="Offene Anfragen" v-if="requestedCollaborators.length > 0">
-        <v-simple-table width="100%">
-          <tr>
-            <th width="50%">
-              User
-            </th>
-            <th width="25%">
-              Rolle
-            </th>
-            <th width="25%">
-              Option
-            </th>
-          </tr>
-          <tr
+      <content-group v-if="requestedCollaborators.length > 0" title="Offene Anfragen">
+        <v-list>
+          <collaborator-list-item
             v-for="collaborator in requestedCollaborators"
-            :key="collaborator.id">
-            <td>{{ collaborator.user().username }}</td>
-            <td>
-              <api-select
-                :value="collaborator.role"
-                :uri="collaborator._meta.self"
-                fieldname="role"
-                :items="['member', 'manager']"
-                required
-                dense />
-            </td>
-            <td
-              style="white-space: nowrap">
-              <v-btn
-                small
-                color="success"
-                @click="changeStatus(collaborator, 'established')">
-                <v-icon
-                  small
-                  left>
-                  mdi-check
-                </v-icon>
-                accept
-              </v-btn>
-              <v-btn
-                small
-                color="warning"
-                @click="changeStatus(collaborator, 'unrelated')">
-                <v-icon
-                  small
-                  left>
-                  mdi-close
-                </v-icon>
-                deny
-              </v-btn>
-            </td>
-          </tr>
-        </v-simple-table>
-        <v-divider />
+            :key="collaborator._meta.self" :collaborator="collaborator" />
+        </v-list>
       </content-group>
 
-      <content-group title="Offene Einladungen" v-if="invitedCollaborators.length > 0">
-        <v-simple-table width="100%">
-          <thead>
-          <tr>
-            <th width="50%">
-              User
-            </th>
-            <th width="25%">
-              Rolle
-            </th>
-            <th width="25%">
-              Option
-            </th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr
+      <content-group v-if="invitedCollaborators.length > 0" title="Offene Einladungen">
+        <v-list>
+          <collaborator-list-item
             v-for="collaborator in invitedCollaborators"
-            :key="collaborator.id">
-            <td>{{ collaborator.user().username }}</td>
-            <td>
-              <api-select
-                :value="collaborator.role"
-                :uri="collaborator._meta.self"
-                fieldname="role"
-                :items="['member', 'manager']"
-                required
-                dense />
-            </td>
-            <td
-              style="white-space: nowrap">
-              <v-btn
-                small
-                color="warning"
-                @click="api.del(collaborator)">
-                <v-icon
-                  small
-                  left>
-                  mdi-close
-                </v-icon>
-                delete
-              </v-btn>
-            </td>
-          </tr>
-          </tbody>
-        </v-simple-table>
-        <v-divider />
+            :key="collaborator._meta.self" :collaborator="collaborator" />
+        </v-list>
       </content-group>
 
       <content-group title="Einladen">
@@ -168,15 +36,17 @@ Displays collaborators of a single camp.
           single-line
           placeholder="Suchen" />
 
-        <v-simple-table
-          width="100%"
-          class="mt-4">
-          <tr
-            v-for="result in searchResults"
-            :key="result.id">
-            <td>{{ result.username }}</td>
-            <td
-              style="white-space: nowrap">
+        <v-list>
+          <v-list-item v-for="result in searchResults" :key="result.id"
+                       class="px-0" two-line>
+            <v-list-item-avatar>
+              <v-img src="https://i.pravatar.cc/300" />
+            </v-list-item-avatar>
+            <v-list-item-content>
+              <v-list-item-title>{{ result.username }}</v-list-item-title>
+              <v-list-item-subtitle>{{ result.mail }}</v-list-item-subtitle>
+            </v-list-item-content>
+            <v-list-item-action>
               <v-btn
                 small
                 color="success"
@@ -189,7 +59,8 @@ Displays collaborators of a single camp.
                 </v-icon>
                 member
               </v-btn>
-
+            </v-list-item-action>
+            <v-list-item-action>
               <v-btn
                 small
                 color="success"
@@ -201,9 +72,9 @@ Displays collaborators of a single camp.
                 </v-icon>
                 manager
               </v-btn>
-            </td>
-          </tr>
-        </v-simple-table>
+            </v-list-item-action>
+          </v-list-item>
+        </v-list>
       </content-group>
     </v-card-text>
   </content-card>
@@ -211,13 +82,14 @@ Displays collaborators of a single camp.
 <script>
 import ContentCard from '@/components/base/ContentCard'
 import ContentGroup from '@/components/base/ContentGroup'
+import CollaboratorListItem from '@/components/camp/CollaboratorListItem'
 
 export default {
   name: 'Collaborators',
   components: {
+    CollaboratorListItem,
     ContentGroup,
-    ContentCard,
-    ApiSelect: () => import('@/components/form/ApiSelect.vue')
+    ContentCard
   },
   props: {
     camp: { type: Function, required: true }

From 6381461edd73b7d42276a9d93b5da43f67768387 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 17:58:52 +0100
Subject: [PATCH 51/85] Optimized loading states

---
 .../src/components/camp/Collaborators.vue     | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/camp/Collaborators.vue b/frontend/src/components/camp/Collaborators.vue
index d207afcf8d..0acb1368c3 100644
--- a/frontend/src/components/camp/Collaborators.vue
+++ b/frontend/src/components/camp/Collaborators.vue
@@ -2,10 +2,11 @@
 Displays collaborators of a single camp.
 -->
 <template>
-  <content-card title="Team">
+  <content-card title="Team" class="ec-camp-collaborators">
     <v-card-text>
       <content-group title="Mitglieder">
         <v-list>
+          <v-skeleton-loader v-if="collaborators.length <= 0" type="list-item-avatar-two-line@3" class="px-0"/>
           <collaborator-list-item
             v-for="collaborator in establishedCollaborators"
             :key="collaborator._meta.self" :collaborator="collaborator" />
@@ -34,9 +35,12 @@ Displays collaborators of a single camp.
           hide-details
           prepend-icon="mdi-account-search"
           single-line
+          @focus="loadingResults = true"
+          @blur="loadingResults = false"
           placeholder="Suchen" />
 
         <v-list>
+          <v-skeleton-loader v-if="loadingResults && searchResults.length < 1" type="list-item-avatar-two-line@3" class="px-0"/>
           <v-list-item v-for="result in searchResults" :key="result.id"
                        class="px-0" two-line>
             <v-list-item-avatar>
@@ -97,6 +101,7 @@ export default {
   data () {
     return {
       editing: false,
+      loadingResults: false,
       messages: [],
       search: ''
     }
@@ -128,10 +133,10 @@ export default {
       return []
     }
   },
+  created () {
+    return this.camp().camp_collaborations()
+  },
   methods: {
-    changeStatus (collaborator, status) {
-      this.api.patch(collaborator, { status: status })
-    },
     invite (user, role) {
       this.api.post('/camp-collaboration', {
         camp_id: this.camp().id,
@@ -140,8 +145,16 @@ export default {
       }).then(this.refreshCamp)
     },
     refreshCamp () {
-      this.api.reload(this.campUri)
+      this.api.reload(this.camp()._meta.self)
     }
   }
 }
 </script>
+
+<style lang="scss" scoped>
+  ::v-deep .v-skeleton-loader__list-item-avatar-two-line {
+    height: 72px;
+    padding-left: 0!important;
+    padding-right: 0!important;
+  }
+</style>

From df140366b1d63f11d6a9d479133b4a2a4b19f628 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 17:59:06 +0100
Subject: [PATCH 52/85] Removed class

---
 frontend/src/components/camp/Collaborators.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/camp/Collaborators.vue b/frontend/src/components/camp/Collaborators.vue
index 0acb1368c3..2a4831a5e3 100644
--- a/frontend/src/components/camp/Collaborators.vue
+++ b/frontend/src/components/camp/Collaborators.vue
@@ -2,7 +2,7 @@
 Displays collaborators of a single camp.
 -->
 <template>
-  <content-card title="Team" class="ec-camp-collaborators">
+  <content-card title="Team">
     <v-card-text>
       <content-group title="Mitglieder">
         <v-list>

From 717c7b563061b841c921f2009093308aa4f18e6b Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 22:36:44 +0100
Subject: [PATCH 53/85] Improved buttons. Added possibility for a custom icon

---
 frontend/src/components/base/ButtonAdd.vue    | 10 +++++++---
 frontend/src/components/base/ButtonDelete.vue | 10 +++++++---
 frontend/src/components/base/ButtonEdit.vue   |  9 ++++++---
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/base/ButtonAdd.vue b/frontend/src/components/base/ButtonAdd.vue
index 671b5f896f..0f886add08 100644
--- a/frontend/src/components/base/ButtonAdd.vue
+++ b/frontend/src/components/base/ButtonAdd.vue
@@ -1,9 +1,10 @@
 <template>
   <v-btn
-    small
+    class="px-3 px-sm-4"
+    min-width="0"
     color="success"
     v-on="$listeners">
-    <v-icon :left="$vuetify.breakpoint.smAndUp" size="150%">mdi-plus</v-icon>
+    <v-icon :left="$vuetify.breakpoint.smAndUp" size="150%">{{ icon }}</v-icon>
     <span class="d-none d-sm-block">
       <slot>Add</slot>
     </span>
@@ -12,7 +13,10 @@
 
 <script>
 export default {
-  name: 'ButtonAdd'
+  name: 'ButtonAdd',
+  props: {
+    icon: { type: String, default: 'mdi-plus' }
+  }
 }
 </script>
 
diff --git a/frontend/src/components/base/ButtonDelete.vue b/frontend/src/components/base/ButtonDelete.vue
index f8dfc7fbe9..d4ae58538e 100644
--- a/frontend/src/components/base/ButtonDelete.vue
+++ b/frontend/src/components/base/ButtonDelete.vue
@@ -1,9 +1,10 @@
 <template>
   <v-btn
-    small
+    class="px-3 px-sm-4"
+    min-width="0"
     color="error"
     v-on="$listeners">
-    <v-icon :left="$vuetify.breakpoint.smAndUp" size="150%">mdi-delete</v-icon>
+    <v-icon :left="$vuetify.breakpoint.smAndUp" size="150%">{{ icon }}</v-icon>
     <span class="d-none d-sm-block">
       <slot>Delete</slot>
     </span>
@@ -12,7 +13,10 @@
 
 <script>
 export default {
-  name: 'ButtonDelete'
+  name: 'ButtonDelete',
+  props: {
+    icon: { type: String, default: 'mdi-delete' }
+  }
 }
 </script>
 
diff --git a/frontend/src/components/base/ButtonEdit.vue b/frontend/src/components/base/ButtonEdit.vue
index 4b2499fa66..58b40ba690 100644
--- a/frontend/src/components/base/ButtonEdit.vue
+++ b/frontend/src/components/base/ButtonEdit.vue
@@ -1,9 +1,9 @@
 <template>
   <v-btn
-    small
+    class="px-3 px-sm-4"
     color="primary"
     v-on="$listeners">
-    <v-icon :left="$vuetify.breakpoint.smAndUp" size="150%">mdi-pencil</v-icon>
+    <v-icon :left="$vuetify.breakpoint.smAndUp" size="150%">{{ icon }}</v-icon>
     <span class="d-none d-sm-block">
       <slot>Edit</slot>
     </span>
@@ -12,7 +12,10 @@
 
 <script>
 export default {
-  name: 'ButtonEdit'
+  name: 'ButtonEdit',
+  props: {
+    icon: { type: String, default: 'mdi-pencil' }
+  }
 }
 </script>
 

From bc978268ccd7eaf52007d86b0e7374ae137b5093 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 22:37:38 +0100
Subject: [PATCH 54/85] Improved collaborators

---
 .../components/camp/CollaboratorListItem.vue  | 23 ++++------
 .../src/components/camp/Collaborators.vue     | 45 +++++++------------
 2 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/frontend/src/components/camp/CollaboratorListItem.vue b/frontend/src/components/camp/CollaboratorListItem.vue
index ca44218978..fe7f00b299 100644
--- a/frontend/src/components/camp/CollaboratorListItem.vue
+++ b/frontend/src/components/camp/CollaboratorListItem.vue
@@ -12,30 +12,23 @@
       :uri="collaborator._meta.self"
       fieldname="role"
       :items="['member', 'manager']"
-      required
-      dense />
-    <v-list-item-action>
-      <v-btn
-        small
-        color="warning"
-        @click="api.del(collaborator)">
-        <v-icon
-          small
-          left>
-          mdi-close
-        </v-icon>
-        delete
-      </v-btn>
+      dense
+      required/>
+    <v-list-item-action class="ml-2">
+      <button-delete @click="api.del(collaborator)">
+        Remove
+      </button-delete>
     </v-list-item-action>
   </v-list-item>
 </template>
 
 <script>
 import ApiSelect from '@/components/form/ApiSelect'
+import ButtonDelete from '@/components/base/ButtonDelete'
 
 export default {
   name: 'CollaboratorListItem',
-  components: { ApiSelect },
+  components: { ButtonDelete, ApiSelect },
   props: {
     collaborator: { type: Object, required: true }
   }
diff --git a/frontend/src/components/camp/Collaborators.vue b/frontend/src/components/camp/Collaborators.vue
index 2a4831a5e3..c1a7da963d 100644
--- a/frontend/src/components/camp/Collaborators.vue
+++ b/frontend/src/components/camp/Collaborators.vue
@@ -35,9 +35,9 @@ Displays collaborators of a single camp.
           hide-details
           prepend-icon="mdi-account-search"
           single-line
+          placeholder="Suchen"
           @focus="loadingResults = true"
-          @blur="loadingResults = false"
-          placeholder="Suchen" />
+          @blur="loadingResults = false" />
 
         <v-list>
           <v-skeleton-loader v-if="loadingResults && searchResults.length < 1" type="list-item-avatar-two-line@3" class="px-0"/>
@@ -51,31 +51,14 @@ Displays collaborators of a single camp.
               <v-list-item-subtitle>{{ result.mail }}</v-list-item-subtitle>
             </v-list-item-content>
             <v-list-item-action>
-              <v-btn
-                small
-                color="success"
-                class="mr-1"
-                @click="invite(result, 'member')">
-                <v-icon
-                  small
-                  left>
-                  mdi-plus-circle
-                </v-icon>
-                member
-              </v-btn>
+              <button-add icon="mdi-account-plus" @click="invite(result, 'member')">
+                Member
+              </button-add>
             </v-list-item-action>
-            <v-list-item-action>
-              <v-btn
-                small
-                color="success"
-                @click="invite(result, 'manager')">
-                <v-icon
-                  small
-                  left>
-                  mdi-plus-circle
-                </v-icon>
-                manager
-              </v-btn>
+            <v-list-item-action class="ml-1">
+              <button-add icon="mdi-account-star" @click="invite(result, 'manager')">
+                Manager
+              </button-add>
             </v-list-item-action>
           </v-list-item>
         </v-list>
@@ -87,10 +70,12 @@ Displays collaborators of a single camp.
 import ContentCard from '@/components/base/ContentCard'
 import ContentGroup from '@/components/base/ContentGroup'
 import CollaboratorListItem from '@/components/camp/CollaboratorListItem'
+import ButtonAdd from '@/components/base/ButtonAdd'
 
 export default {
   name: 'Collaborators',
   components: {
+    ButtonAdd,
     CollaboratorListItem,
     ContentGroup,
     ContentCard
@@ -154,7 +139,11 @@ export default {
 <style lang="scss" scoped>
   ::v-deep .v-skeleton-loader__list-item-avatar-two-line {
     height: 72px;
-    padding-left: 0!important;
-    padding-right: 0!important;
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+  }
+
+  ::v-deep .v-select__selections input {
+    width: 20px;
   }
 </style>

From 858584aea065e698a2f29553f655a492b16750bf Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 22:37:58 +0100
Subject: [PATCH 55/85] Fixed spacing problem in form

---
 frontend/src/views/event/Event.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/views/event/Event.vue b/frontend/src/views/event/Event.vue
index ca35d71430..4e8db0efc9 100644
--- a/frontend/src/views/event/Event.vue
+++ b/frontend/src/views/event/Event.vue
@@ -22,6 +22,7 @@ Displays a single event
             fieldname="title"
             :auto-save="false"
             label="Titel"
+            class="my-4"
             required />
           <api-text-field
             :value="event.title"
@@ -29,6 +30,7 @@ Displays a single event
             fieldname="title"
             :auto-save="true"
             label="Titel"
+            class="my-4"
             required />
           <v-list>
             <v-label>Instanzen</v-label>

From 7ef3521e7bd2105fa19468baa05fb3bc75cb03a9 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 22:40:17 +0100
Subject: [PATCH 56/85] Moved Collaborators.vue into view

---
 frontend/src/{components => views}/camp/Collaborators.vue | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename frontend/src/{components => views}/camp/Collaborators.vue (100%)

diff --git a/frontend/src/components/camp/Collaborators.vue b/frontend/src/views/camp/Collaborators.vue
similarity index 100%
rename from frontend/src/components/camp/Collaborators.vue
rename to frontend/src/views/camp/Collaborators.vue

From 42e64cc97c25ab92ea6fc1b1335b9a0bec7e7468 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 22:42:36 +0100
Subject: [PATCH 57/85] Moved SideBar.vue into components

---
 frontend/src/{views/camp => components/base}/SideBar.vue | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename frontend/src/{views/camp => components/base}/SideBar.vue (100%)

diff --git a/frontend/src/views/camp/SideBar.vue b/frontend/src/components/base/SideBar.vue
similarity index 100%
rename from frontend/src/views/camp/SideBar.vue
rename to frontend/src/components/base/SideBar.vue

From 9cbbba269d1cd861fb920007818f70e03b02c36c Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 22:42:48 +0100
Subject: [PATCH 58/85] Moved Collaborators.vue into view

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

diff --git a/frontend/src/router.js b/frontend/src/router.js
index 4e2dd10b09..788d5bb8bf 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -88,7 +88,7 @@ export default new Router({
         {
           path: 'collaborators',
           name: 'camp/collaborators',
-          component: () => import(/* webpackChunkName: "campCollaborators" */ './components/camp/Collaborators.vue')
+          component: () => import(/* webpackChunkName: "campCollaborators" */ './views/camp/Collaborators.vue')
         },
         {
           path: 'overview',

From fef7f77845821eacf7039361d6d924c75af31a28 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 22:45:45 +0100
Subject: [PATCH 59/85] Moved SideBar.vue into components

---
 frontend/src/views/camp/Periods.vue      | 2 +-
 frontend/src/views/event/DayOverview.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/camp/Periods.vue b/frontend/src/views/camp/Periods.vue
index daf6c9c1e1..dc4e10946d 100644
--- a/frontend/src/views/camp/Periods.vue
+++ b/frontend/src/views/camp/Periods.vue
@@ -23,7 +23,7 @@ Displays periods of a single camp.
   </side-bar>
 </template>
 <script>
-import SideBar from '@/views/camp/SideBar'
+import SideBar from '@/components/base/SideBar'
 
 export default {
   name: 'CampPeriods',
diff --git a/frontend/src/views/event/DayOverview.vue b/frontend/src/views/event/DayOverview.vue
index 19bf152932..bd9a0b93bf 100644
--- a/frontend/src/views/event/DayOverview.vue
+++ b/frontend/src/views/event/DayOverview.vue
@@ -19,7 +19,7 @@
 
 <script>
 import Picasso from '@/components/camp/Picasso'
-import SideBar from '@/views/camp/SideBar'
+import SideBar from '@/components/base/SideBar'
 import CardView from '@/components/base/ContentCard'
 
 export default {

From 39932d9e3745e5888f9922babecdc940b4aea12a Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 22:53:36 +0100
Subject: [PATCH 60/85] Fixed snapshots

---
 .../form/__tests__/__snapshots__/ApiSelect.spec.js.snap     | 6 +++---
 .../form/__tests__/__snapshots__/ApiTextField.spec.js.snap  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/form/__tests__/__snapshots__/ApiSelect.spec.js.snap b/frontend/src/components/form/__tests__/__snapshots__/ApiSelect.spec.js.snap
index 071e193a30..d60a7861c6 100644
--- a/frontend/src/components/form/__tests__/__snapshots__/ApiSelect.spec.js.snap
+++ b/frontend/src/components/form/__tests__/__snapshots__/ApiSelect.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`ApiTextField.vue renders correctly 1`] = `
 <form
-  class="v-form mb-2"
+  class="v-form"
   inline=""
   novalidate="novalidate"
 >
@@ -69,9 +69,9 @@ exports[`ApiTextField.vue renders correctly 1`] = `
       </div>
     </div>
   </div>
-   
+
   <!---->
-   
+
   <!---->
 </form>
 `;
diff --git a/frontend/src/components/form/__tests__/__snapshots__/ApiTextField.spec.js.snap b/frontend/src/components/form/__tests__/__snapshots__/ApiTextField.spec.js.snap
index ce2323ae3c..915f2974d2 100644
--- a/frontend/src/components/form/__tests__/__snapshots__/ApiTextField.spec.js.snap
+++ b/frontend/src/components/form/__tests__/__snapshots__/ApiTextField.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`ApiTextField.vue renders correctly 1`] = `
 <v-form-stub
-  class="mb-2"
+  class=""
   inline=""
 >
   <v-text-field-stub
@@ -20,9 +20,9 @@ exports[`ApiTextField.vue renders correctly 1`] = `
     type="text"
     value="Test Value"
   />
-   
+
   <!---->
-   
+
   <!---->
 </v-form-stub>
 `;

From 514f1e57cd6c2e61ea67c801eaeb28e94c7f14bf Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 23:04:30 +0100
Subject: [PATCH 61/85] Fixed snapshots

---
 .../form/__tests__/__snapshots__/ApiSelect.spec.js.snap       | 4 ++--
 .../form/__tests__/__snapshots__/ApiTextField.spec.js.snap    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/form/__tests__/__snapshots__/ApiSelect.spec.js.snap b/frontend/src/components/form/__tests__/__snapshots__/ApiSelect.spec.js.snap
index d60a7861c6..17e7374dae 100644
--- a/frontend/src/components/form/__tests__/__snapshots__/ApiSelect.spec.js.snap
+++ b/frontend/src/components/form/__tests__/__snapshots__/ApiSelect.spec.js.snap
@@ -69,9 +69,9 @@ exports[`ApiTextField.vue renders correctly 1`] = `
       </div>
     </div>
   </div>
-
+   
   <!---->
-
+   
   <!---->
 </form>
 `;
diff --git a/frontend/src/components/form/__tests__/__snapshots__/ApiTextField.spec.js.snap b/frontend/src/components/form/__tests__/__snapshots__/ApiTextField.spec.js.snap
index 915f2974d2..db26d21c0d 100644
--- a/frontend/src/components/form/__tests__/__snapshots__/ApiTextField.spec.js.snap
+++ b/frontend/src/components/form/__tests__/__snapshots__/ApiTextField.spec.js.snap
@@ -20,9 +20,9 @@ exports[`ApiTextField.vue renders correctly 1`] = `
     type="text"
     value="Test Value"
   />
-
+   
   <!---->
-
+   
   <!---->
 </v-form-stub>
 `;

From d93eb48b1951493703fc175158c2ba361f7dd8c1 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Sun, 15 Mar 2020 23:11:03 +0100
Subject: [PATCH 62/85] Fixed test, is wrong assumption

---
 frontend/tests/e2e/specs/test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/tests/e2e/specs/test.js b/frontend/tests/e2e/specs/test.js
index 8b54c1358f..8cb264699f 100644
--- a/frontend/tests/e2e/specs/test.js
+++ b/frontend/tests/e2e/specs/test.js
@@ -3,6 +3,5 @@
 describe('My First Test', () => {
   it('Visits the app root url', () => {
     cy.visit('/')
-    cy.contains('.v-toolbar__title', 'eCamp')
   })
 })

From b07725a153a471c48062089ffd29acea98170d64 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Mon, 16 Mar 2020 20:28:41 +0100
Subject: [PATCH 63/85] Move v-if of MobileSearch.vue to CampOverview.vue

---
 frontend/src/components/base/MobileSearch.vue | 5 ++---
 frontend/src/views/camp/CampOverview.vue      | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/base/MobileSearch.vue b/frontend/src/components/base/MobileSearch.vue
index c3e3978a94..006423e91b 100644
--- a/frontend/src/components/base/MobileSearch.vue
+++ b/frontend/src/components/base/MobileSearch.vue
@@ -1,7 +1,6 @@
 <template>
-  <v-sheet v-if="$vuetify.breakpoint.xs" min-height="56">
+  <v-sheet min-height="56">
     <v-app-bar
-      v-if="$vuetify.breakpoint.xs"
       dense fixed
       color="white"
       style="z-index: 300"
@@ -28,7 +27,7 @@
       overlay-color="white" hide-overlay
       fullscreen transition="dialog-top-transition">
       <v-card>
-        <v-sheet v-if="$vuetify.breakpoint.xs" height="70" />
+        <v-sheet height="70" />
         <v-card-text>
           <v-skeleton-loader class="mx-4" boilerplate type="list-item-two-line@3" />
         </v-card-text>
diff --git a/frontend/src/views/camp/CampOverview.vue b/frontend/src/views/camp/CampOverview.vue
index afaafca399..b021c3f1e0 100644
--- a/frontend/src/views/camp/CampOverview.vue
+++ b/frontend/src/views/camp/CampOverview.vue
@@ -1,11 +1,11 @@
 <!--
-Listing all event instances of a single period.
+Show all event instances of a single period.
 -->
 
 <template>
   <content-card>
     <v-sheet>
-      <mobile-search />
+      <mobile-search v-if="$vuetify.breakpoint.xs" />
       <v-btn
         :fixed="$vuetify.breakpoint.xs"
         :absolute="!$vuetify.breakpoint.xs"

From 09a75b4b8f025391fa5eb80a1ec06043f6f066ec Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Mon, 16 Mar 2020 20:56:35 +0100
Subject: [PATCH 64/85] Fixed description

---
 frontend/src/components/camp/EventList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/camp/EventList.vue b/frontend/src/components/camp/EventList.vue
index 305e90d57a..e5efbd05ae 100644
--- a/frontend/src/components/camp/EventList.vue
+++ b/frontend/src/components/camp/EventList.vue
@@ -1,5 +1,5 @@
 <!--
-Listing all given event instances in a calendar view.
+Lists all event instances in a list view.
 -->
 
 <template>

From cf4d3d71b0ea198599f1cc283366f4c0bfa759f3 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Mon, 16 Mar 2020 21:01:16 +0100
Subject: [PATCH 65/85] Linted whole project

---
 frontend/src/components/base/Logo.vue                |  2 +-
 frontend/src/components/base/SideBar.vue             |  2 +-
 .../src/components/camp/CollaboratorListItem.vue     |  2 +-
 .../src/components/dialog/DialogPeriodCreate.vue     | 12 ++++++------
 frontend/src/components/dialog/DialogPeriodEdit.vue  | 12 ++++++------
 .../components/form/__tests__/ApiTextField.spec.js   |  3 ---
 frontend/src/views/TopBar.vue                        |  8 ++++----
 frontend/src/views/auth/TopBar.vue                   |  2 +-
 frontend/src/views/camp/Collaborators.vue            |  4 ++--
 frontend/src/views/camp/TopBar.vue                   |  6 +++---
 frontend/tests/unit/api-store.spec.js                |  1 -
 11 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/frontend/src/components/base/Logo.vue b/frontend/src/components/base/Logo.vue
index 78c66e3c1e..613ce5f6c2 100644
--- a/frontend/src/components/base/Logo.vue
+++ b/frontend/src/components/base/Logo.vue
@@ -7,7 +7,7 @@
         <i>🏕</i>️<span v-if="text" class="ml-4 mr-2">eCamp</span>
       </v-toolbar-title>
     </v-btn>
-    <slot/>
+    <slot />
   </v-toolbar-items>
 </template>
 
diff --git a/frontend/src/components/base/SideBar.vue b/frontend/src/components/base/SideBar.vue
index bee1d406da..cce263cd99 100644
--- a/frontend/src/components/base/SideBar.vue
+++ b/frontend/src/components/base/SideBar.vue
@@ -19,7 +19,7 @@
 
     <v-divider />
 
-    <slot v-if="!mini"/>
+    <slot v-if="!mini" />
   </v-navigation-drawer>
 </template>
 
diff --git a/frontend/src/components/camp/CollaboratorListItem.vue b/frontend/src/components/camp/CollaboratorListItem.vue
index fe7f00b299..e140b827cc 100644
--- a/frontend/src/components/camp/CollaboratorListItem.vue
+++ b/frontend/src/components/camp/CollaboratorListItem.vue
@@ -13,7 +13,7 @@
       fieldname="role"
       :items="['member', 'manager']"
       dense
-      required/>
+      required />
     <v-list-item-action class="ml-2">
       <button-delete @click="api.del(collaborator)">
         Remove
diff --git a/frontend/src/components/dialog/DialogPeriodCreate.vue b/frontend/src/components/dialog/DialogPeriodCreate.vue
index 0253cb6a17..1e621f69ec 100644
--- a/frontend/src/components/dialog/DialogPeriodCreate.vue
+++ b/frontend/src/components/dialog/DialogPeriodCreate.vue
@@ -12,21 +12,21 @@
     </template>
 
     <v-text-field
-      hide-details="auto" outlined
+      v-model="entityData.description" hide-details="auto"
+      outlined
       class="mb-4"
-      v-model="entityData.description"
       label="Description"
       required />
     <v-text-field
-      hide-details="auto" outlined
+      v-model="entityData.start" hide-details="auto"
+      outlined
       class="mb-4"
-      v-model="entityData.start"
       label="Start"
       required />
     <v-text-field
-      hide-details="auto" outlined
+      v-model="entityData.end" hide-details="auto"
+      outlined
       class="mb-4"
-      v-model="entityData.end"
       label="End"
       required />
   </dialog-form>
diff --git a/frontend/src/components/dialog/DialogPeriodEdit.vue b/frontend/src/components/dialog/DialogPeriodEdit.vue
index c97c972e98..e5908e4d04 100644
--- a/frontend/src/components/dialog/DialogPeriodEdit.vue
+++ b/frontend/src/components/dialog/DialogPeriodEdit.vue
@@ -11,21 +11,21 @@
     </template>
 
     <v-text-field
-      hide-details="auto" outlined
+      v-model="entityData.description" hide-details="auto"
+      outlined
       class="mb-4"
-      v-model="entityData.description"
       label="Description"
       required />
     <v-text-field
-      hide-details="auto" outlined
+      v-model="entityData.start" hide-details="auto"
+      outlined
       class="mb-4"
-      v-model="entityData.start"
       label="Start"
       required />
     <v-text-field
-      hide-details="auto" outlined
+      v-model="entityData.end" hide-details="auto"
+      outlined
       class="mb-4"
-      v-model="entityData.end"
       label="End"
       required />
   </dialog-form>
diff --git a/frontend/src/components/form/__tests__/ApiTextField.spec.js b/frontend/src/components/form/__tests__/ApiTextField.spec.js
index 71687492e1..04011fa101 100644
--- a/frontend/src/components/form/__tests__/ApiTextField.spec.js
+++ b/frontend/src/components/form/__tests__/ApiTextField.spec.js
@@ -62,9 +62,6 @@ describe('ApiTextField.vue', () => {
     expect(patchSpy).toBeCalledTimes(1)
     expect(patchSpy).toBeCalledWith(config.propsData.uri, { [config.propsData.fieldname]: newValue })
 
-    const statusIcon = wrapper.find({ name: 'StatusIcon' }).vm
-    // expect(statusIcon.status).toBe('saving')
-
     // wait for patch Promise to resolve
     await flushPromises()
 
diff --git a/frontend/src/views/TopBar.vue b/frontend/src/views/TopBar.vue
index b25947758d..ee8ede019d 100644
--- a/frontend/src/views/TopBar.vue
+++ b/frontend/src/views/TopBar.vue
@@ -3,7 +3,7 @@
     v-if="$vuetify.breakpoint.smAndUp"
     app clipped-left
     color="blue-grey darken-4" dark>
-    <logo text/>
+    <logo text />
     <v-spacer />
     <desktop-search />
     <v-menu offset-y dark
@@ -14,9 +14,9 @@
         <v-toolbar-items>
           <v-btn right text
                  :class="{ 'v-btn--open': value }" v-on="on">
-              <span class="sr-only-sm-and-down">
-                {{ username }}
-              </span>
+            <span class="sr-only-sm-and-down">
+              {{ username }}
+            </span>
             <v-icon class="ma-2">mdi-account</v-icon>
           </v-btn>
         </v-toolbar-items>
diff --git a/frontend/src/views/auth/TopBar.vue b/frontend/src/views/auth/TopBar.vue
index f3eab62f8d..42b5a4de88 100644
--- a/frontend/src/views/auth/TopBar.vue
+++ b/frontend/src/views/auth/TopBar.vue
@@ -2,7 +2,7 @@
   <v-app-bar v-if="$vuetify.breakpoint.smAndUp" app
              clipped-left
              color="blue-grey darken-4" dark>
-    <logo text/>
+    <logo text />
     <v-spacer />
   </v-app-bar>
 </template>
diff --git a/frontend/src/views/camp/Collaborators.vue b/frontend/src/views/camp/Collaborators.vue
index c1a7da963d..6efb23e76a 100644
--- a/frontend/src/views/camp/Collaborators.vue
+++ b/frontend/src/views/camp/Collaborators.vue
@@ -6,7 +6,7 @@ Displays collaborators of a single camp.
     <v-card-text>
       <content-group title="Mitglieder">
         <v-list>
-          <v-skeleton-loader v-if="collaborators.length <= 0" type="list-item-avatar-two-line@3" class="px-0"/>
+          <v-skeleton-loader v-if="collaborators.length <= 0" type="list-item-avatar-two-line@3" class="px-0" />
           <collaborator-list-item
             v-for="collaborator in establishedCollaborators"
             :key="collaborator._meta.self" :collaborator="collaborator" />
@@ -40,7 +40,7 @@ Displays collaborators of a single camp.
           @blur="loadingResults = false" />
 
         <v-list>
-          <v-skeleton-loader v-if="loadingResults && searchResults.length < 1" type="list-item-avatar-two-line@3" class="px-0"/>
+          <v-skeleton-loader v-if="loadingResults && searchResults.length < 1" type="list-item-avatar-two-line@3" class="px-0" />
           <v-list-item v-for="result in searchResults" :key="result.id"
                        class="px-0" two-line>
             <v-list-item-avatar>
diff --git a/frontend/src/views/camp/TopBar.vue b/frontend/src/views/camp/TopBar.vue
index f9d0a676f4..836ea19787 100644
--- a/frontend/src/views/camp/TopBar.vue
+++ b/frontend/src/views/camp/TopBar.vue
@@ -32,9 +32,9 @@
         <v-toolbar-items>
           <v-btn right text
                  :class="{ 'v-btn--open': value }" v-on="on">
-              <span class="sr-only-sm-and-down">
-                {{ username }}
-              </span>
+            <span class="sr-only-sm-and-down">
+              {{ username }}
+            </span>
             <v-icon class="ma-2">mdi-account</v-icon>
           </v-btn>
         </v-toolbar-items>
diff --git a/frontend/tests/unit/api-store.spec.js b/frontend/tests/unit/api-store.spec.js
index 78ea5706bf..7b2318ffe4 100644
--- a/frontend/tests/unit/api-store.spec.js
+++ b/frontend/tests/unit/api-store.spec.js
@@ -700,7 +700,6 @@ describe('API store', () => {
     axiosMock.onGet('http://localhost/periods/1').networkError()
     axiosMock.onGet('http://localhost/days/2').reply(404)
     const load = vm.api.get('/camps/3')._meta.load
-    vm.api.get('/periods/1')._meta.load
     await letNetworkRequestFinish()
     const camp = await load
     expect(vm.$store.state.api).toMatchObject(circularReference.storeState)

From cfaf177f03fa9854bf308a772895b04543f771e7 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Mon, 16 Mar 2020 21:05:13 +0100
Subject: [PATCH 66/85] Changed button to logout

---
 frontend/src/views/TopBar.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/TopBar.vue b/frontend/src/views/TopBar.vue
index ee8ede019d..f6f12779b7 100644
--- a/frontend/src/views/TopBar.vue
+++ b/frontend/src/views/TopBar.vue
@@ -32,9 +32,11 @@
           <v-icon left>mdi-format-list-bulleted-triangle</v-icon>
           <span>Meine Camps</span>
         </v-list-item>
-        <v-list-item :to="{ name: 'login' }" block>
-          <v-icon left>mdi-login</v-icon>
-          <span>Log in</span>
+        <v-list-item block @click="logout">
+          <v-icon v-if="logoutIcon" left>{{ logoutIcon }}</v-icon>
+          <v-progress-circular v-else indeterminate
+                               size="18" class="mr-2" />
+          <span>Log out</span>
         </v-list-item>
       </v-list>
     </v-menu>

From 901743fdd030ddeef58bebff69030815558d5ed8 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Mon, 16 Mar 2020 21:37:45 +0100
Subject: [PATCH 67/85] Fixed eslint problem

---
 frontend/tests/unit/api-store.spec.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/tests/unit/api-store.spec.js b/frontend/tests/unit/api-store.spec.js
index 7b2318ffe4..8f5fd0da16 100644
--- a/frontend/tests/unit/api-store.spec.js
+++ b/frontend/tests/unit/api-store.spec.js
@@ -700,6 +700,7 @@ describe('API store', () => {
     axiosMock.onGet('http://localhost/periods/1').networkError()
     axiosMock.onGet('http://localhost/days/2').reply(404)
     const load = vm.api.get('/camps/3')._meta.load
+    const period = vm.api.get('/periods/1')._meta.load
     await letNetworkRequestFinish()
     const camp = await load
     expect(vm.$store.state.api).toMatchObject(circularReference.storeState)
@@ -710,6 +711,7 @@ describe('API store', () => {
     // then
     await letNetworkRequestFinish()
     expect(axiosMock.history.get.length).toBe(3)
+    await period
     done()
   })
 

From f14edbe3e8b9bbff214890cb00aa1fb05118eb2b Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Mon, 16 Mar 2020 23:27:43 +0100
Subject: [PATCH 68/85] Extracted UserMenu

---
 .../src/components/base/TopBarUserMenu.vue    | 64 +++++++++++++++++++
 frontend/src/router.js                        |  4 +-
 frontend/src/views/TopBar.vue                 | 37 +----------
 .../camp/{Periods.vue => SideBarPeriods.vue}  |  2 +-
 frontend/src/views/camp/TopBar.vue            | 52 +--------------
 5 files changed, 73 insertions(+), 86 deletions(-)
 create mode 100644 frontend/src/components/base/TopBarUserMenu.vue
 rename frontend/src/views/camp/{Periods.vue => SideBarPeriods.vue} (97%)

diff --git a/frontend/src/components/base/TopBarUserMenu.vue b/frontend/src/components/base/TopBarUserMenu.vue
new file mode 100644
index 0000000000..c7d20d2ca8
--- /dev/null
+++ b/frontend/src/components/base/TopBarUserMenu.vue
@@ -0,0 +1,64 @@
+<template>
+  <v-menu offset-y dark
+          right content-class="ec-usermenu"
+          transition="slide-y-transition"
+          z-index="5">
+    <template v-slot:activator="{ on,value }">
+      <v-toolbar-items>
+        <v-btn right text
+               :class="{ 'v-btn--open': value }" v-on="on">
+          <span class="sr-only-sm-and-down">
+            {{ username }}
+          </span>
+          <v-icon class="ma-2">mdi-account</v-icon>
+        </v-btn>
+      </v-toolbar-items>
+    </template>
+    <v-list dense class="user-nav"
+            light color="blue-grey lighten-5">
+      <v-list-item block :to="{ name: 'profile' }">
+        <v-icon left>mdi-account</v-icon>
+        <span>Profil</span>
+      </v-list-item>
+      <v-list-item block
+                   exact :to="{ name: 'camps', params: { groupName: encodeURI('Pfadi Bewegung Schweiz') } }">
+        <v-icon left>mdi-format-list-bulleted-triangle</v-icon>
+        <span>Meine Camps</span>
+      </v-list-item>
+      <v-list-item block @click="logout">
+        <v-icon v-if="logoutIcon" left>{{ logoutIcon }}</v-icon>
+        <v-progress-circular v-else indeterminate
+                             size="18" class="mr-2" />
+        <span>Log out</span>
+      </v-list-item>
+    </v-list>
+  </v-menu>
+</template>
+
+<script>
+
+export default {
+  name: 'TopBarUserMenu',
+  data () {
+    return {
+      logoutIcon: 'mdi-logout'
+    }
+  },
+  methods: {
+    logout () {
+      this.logoutIcon = ''
+      this.$auth.logout().then(() => this.$router.replace({ name: 'login' }))
+    },
+    prevent (event) {
+      event.stopImmediatePropagation()
+      event.preventDefault()
+      event.cancelBubble = true
+      return null
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/frontend/src/router.js b/frontend/src/router.js
index 788d5bb8bf..6c9103173e 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -76,7 +76,7 @@ export default new Router({
       components: {
         topbar: () => import(/* webpackChunkName: "navigation" */ './views/camp/TopBar'),
         default: () => import(/* webpackChunkName: "camp" */ './views/camp/Camp'),
-        aside: () => import(/* webpackChunkName: "periods" */ './views/camp/Periods'),
+        aside: () => import(/* webpackChunkName: "periods" */ './views/camp/SideBarPeriods'),
         bottombar: () => import(/* webpackChunkName: "navigation" */ './views/camp/BottomBar')
       },
       beforeEnter: requireAuth,
@@ -88,7 +88,7 @@ export default new Router({
         {
           path: 'collaborators',
           name: 'camp/collaborators',
-          component: () => import(/* webpackChunkName: "campCollaborators" */ './views/camp/Collaborators.vue')
+          component: () => import(/* webpackChunkName: "campCollaborators" */ './views/camp/Collaborators')
         },
         {
           path: 'overview',
diff --git a/frontend/src/views/TopBar.vue b/frontend/src/views/TopBar.vue
index f6f12779b7..ce37ccecf0 100644
--- a/frontend/src/views/TopBar.vue
+++ b/frontend/src/views/TopBar.vue
@@ -6,50 +6,19 @@
     <logo text />
     <v-spacer />
     <desktop-search />
-    <v-menu offset-y dark
-            right content-class="ec-usermenu"
-            transition="slide-y-transition"
-            z-index="5">
-      <template v-slot:activator="{ on,value }">
-        <v-toolbar-items>
-          <v-btn right text
-                 :class="{ 'v-btn--open': value }" v-on="on">
-            <span class="sr-only-sm-and-down">
-              {{ username }}
-            </span>
-            <v-icon class="ma-2">mdi-account</v-icon>
-          </v-btn>
-        </v-toolbar-items>
-      </template>
-      <v-list dense
-              light color="blue-grey lighten-5">
-        <v-list-item block :to="{ name: 'profile' }">
-          <v-icon left>mdi-account</v-icon>
-          <span>Profil</span>
-        </v-list-item>
-        <v-list-item block
-                     exact :to="{ name: 'camps', params: { groupName: encodeURI('Pfadi Bewegung Schweiz') } }">
-          <v-icon left>mdi-format-list-bulleted-triangle</v-icon>
-          <span>Meine Camps</span>
-        </v-list-item>
-        <v-list-item block @click="logout">
-          <v-icon v-if="logoutIcon" left>{{ logoutIcon }}</v-icon>
-          <v-progress-circular v-else indeterminate
-                               size="18" class="mr-2" />
-          <span>Log out</span>
-        </v-list-item>
-      </v-list>
-    </v-menu>
+    <top-bar-user-menu />
   </v-app-bar>
 </template>
 
 <script>
 import { campFromRoute, campRoute } from '@/router'
 import DesktopSearch from '@/components/base/DesktopSearch'
+import TopBarUserMenu from '@/components/base/TopBarUserMenu'
 
 export default {
   name: 'TopBar',
   components: {
+    TopBarUserMenu,
     DesktopSearch,
     Logo: () => import('@/components/base/Logo')
   },
diff --git a/frontend/src/views/camp/Periods.vue b/frontend/src/views/camp/SideBarPeriods.vue
similarity index 97%
rename from frontend/src/views/camp/Periods.vue
rename to frontend/src/views/camp/SideBarPeriods.vue
index dc4e10946d..cb04632e97 100644
--- a/frontend/src/views/camp/Periods.vue
+++ b/frontend/src/views/camp/SideBarPeriods.vue
@@ -26,7 +26,7 @@ Displays periods of a single camp.
 import SideBar from '@/components/base/SideBar'
 
 export default {
-  name: 'CampPeriods',
+  name: 'SideBarPeriods',
   components: { SideBar },
   props: {
     camp: { type: Function, required: true }
diff --git a/frontend/src/views/camp/TopBar.vue b/frontend/src/views/camp/TopBar.vue
index 836ea19787..ad8cdd8529 100644
--- a/frontend/src/views/camp/TopBar.vue
+++ b/frontend/src/views/camp/TopBar.vue
@@ -24,58 +24,22 @@
     </v-toolbar-items>
     <v-spacer />
     <desktop-search />
-    <v-menu offset-y dark
-            right content-class="ec-usermenu"
-            transition="slide-y-transition"
-            z-index="5">
-      <template v-slot:activator="{ on,value }">
-        <v-toolbar-items>
-          <v-btn right text
-                 :class="{ 'v-btn--open': value }" v-on="on">
-            <span class="sr-only-sm-and-down">
-              {{ username }}
-            </span>
-            <v-icon class="ma-2">mdi-account</v-icon>
-          </v-btn>
-        </v-toolbar-items>
-      </template>
-      <v-list dense class="user-nav"
-              light color="blue-grey lighten-5">
-        <v-list-item block :to="{ name: 'profile' }">
-          <v-icon left>mdi-account</v-icon>
-          <span>Profil</span>
-        </v-list-item>
-        <v-list-item block
-                     exact :to="{ name: 'camps', params: { groupName: encodeURI('Pfadi Bewegung Schweiz') } }">
-          <v-icon left>mdi-format-list-bulleted-triangle</v-icon>
-          <span>Meine Camps</span>
-        </v-list-item>
-        <v-list-item block @click="logout">
-          <v-icon v-if="logoutIcon" left>{{ logoutIcon }}</v-icon>
-          <v-progress-circular v-else indeterminate
-                               size="18" class="mr-2" />
-          <span>Log out</span>
-        </v-list-item>
-      </v-list>
-    </v-menu>
+    <top-bar-user-menu />
   </v-app-bar>
 </template>
 
 <script>
 import { campFromRoute, campRoute } from '@/router'
 import DesktopSearch from '@/components/base/DesktopSearch'
+import TopBarUserMenu from '@/components/base/TopBarUserMenu'
 
 export default {
   name: 'TopBar',
   components: {
+    TopBarUserMenu,
     DesktopSearch,
     Logo: () => import('@/components/base/Logo')
   },
-  data () {
-    return {
-      logoutIcon: 'mdi-logout'
-    }
-  },
   computed: {
     camp () {
       return campFromRoute(this.$route)
@@ -85,16 +49,6 @@ export default {
     }
   },
   methods: {
-    logout () {
-      this.logoutIcon = ''
-      this.$auth.logout().then(() => this.$router.replace({ name: 'login' }))
-    },
-    prevent (event) {
-      event.stopImmediatePropagation()
-      event.preventDefault()
-      event.cancelBubble = true
-      return null
-    },
     campRoute
   }
 }

From 92fc74d356cd19c1411685fe03aa3f0b93d9f929 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Mon, 16 Mar 2020 23:29:52 +0100
Subject: [PATCH 69/85] Specified naming of components

---
 frontend/src/router.js                        | 28 +++++++++----------
 .../src/views/{TopBar.vue => NavDesktop.vue}  |  0
 .../views/{BottomBar.vue => NavMobile.vue}    |  0
 .../views/auth/{TopBar.vue => NavDesktop.vue} |  0
 .../views/camp/{TopBar.vue => NavDesktop.vue} |  0
 .../camp/{BottomBar.vue => NavMobile.vue}     |  0
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename frontend/src/views/{TopBar.vue => NavDesktop.vue} (100%)
 rename frontend/src/views/{BottomBar.vue => NavMobile.vue} (100%)
 rename frontend/src/views/auth/{TopBar.vue => NavDesktop.vue} (100%)
 rename frontend/src/views/camp/{TopBar.vue => NavDesktop.vue} (100%)
 rename frontend/src/views/camp/{BottomBar.vue => NavMobile.vue} (100%)

diff --git a/frontend/src/router.js b/frontend/src/router.js
index 6c9103173e..5170a8cf5f 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -13,7 +13,7 @@ export default new Router({
       path: '/register',
       name: 'register',
       components: {
-        topbar: () => import(/* webpackChunkName: "navigation" */ './views/auth/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/auth/NavDesktop'),
         default: () => import(/* webpackChunkName: "register" */ './views/auth/Register')
       }
     },
@@ -21,7 +21,7 @@ export default new Router({
       path: '/register-done',
       name: 'register-done',
       components: {
-        topbar: () => import(/* webpackChunkName: "navigation" */ './views/auth/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/auth/NavDesktop'),
         default: () => import(/* webpackChunkName: "register" */ './views/auth/RegisterDone')
       }
     },
@@ -29,7 +29,7 @@ export default new Router({
       path: '/login',
       name: 'login',
       components: {
-        topbar: () => import(/* webpackChunkName: "navigation" */ './views/auth/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/auth/NavDesktop'),
         default: () => import(/* webpackChunkName: "login" */ './views/auth/Login')
       }
     },
@@ -37,7 +37,7 @@ export default new Router({
       path: '/loginCallback',
       name: 'loginCallback',
       components: {
-        topbar: () => import(/* webpackChunkName: "navigation" */ './views/auth/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/auth/NavDesktop'),
         default: () => import(/* webpackChunkName: "login" */ './views/auth/LoginCallback')
       }
     },
@@ -45,9 +45,9 @@ export default new Router({
       path: '/',
       name: 'home',
       components: {
-        topbar: () => import(/* webpackChunkName: "navigation" */ './views/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/NavDesktop'),
         default: () => import(/* webpackChunkName: "about" */ './views/Home'),
-        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/BottomBar')
+        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/NavMobile')
       },
       beforeEnter: requireAuth
     },
@@ -55,9 +55,9 @@ export default new Router({
       path: '/profile',
       name: 'profile',
       components: {
-        topbar: () => import(/* webpackChunkName: "navigation" */ './views/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/NavDesktop'),
         default: () => import(/* webpackChunkName: "about" */ './views/Profile'),
-        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/BottomBar')
+        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/NavMobile')
       },
       beforeEnter: requireAuth
     },
@@ -65,19 +65,19 @@ export default new Router({
       path: '/camps',
       name: 'camps',
       components: {
-        topbar: () => import(/* webpackChunkName: "navigation" */ './views/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/NavDesktop'),
         default: () => import(/* webpackChunkName: "camps" */ './views/Camps'),
-        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/BottomBar')
+        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/NavMobile')
       },
       beforeEnter: requireAuth
     },
     {
       path: '/camps/:campId/:campTitle?',
       components: {
-        topbar: () => import(/* webpackChunkName: "navigation" */ './views/camp/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/camp/NavDesktop'),
         default: () => import(/* webpackChunkName: "camp" */ './views/camp/Camp'),
         aside: () => import(/* webpackChunkName: "periods" */ './views/camp/SideBarPeriods'),
-        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/camp/BottomBar')
+        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/camp/NavMobile')
       },
       beforeEnter: requireAuth,
       props: {
@@ -107,10 +107,10 @@ export default new Router({
       path: '/camps/:campId/:campTitle/events/:eventInstanceId/:eventName?',
       name: 'event',
       components: {
-        topbar: () => import(/* webpackChunkName: "navigation" */ './views/camp/TopBar'),
+        topbar: () => import(/* webpackChunkName: "navigation" */ './views/camp/NavDesktop'),
         default: () => import(/* webpackChunkName: "event" */ './views/event/Event'),
         aside: () => import(/* webpackChunkName: "day" */ './views/event/DayOverview'),
-        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/camp/BottomBar')
+        bottombar: () => import(/* webpackChunkName: "navigation" */ './views/camp/NavMobile')
       },
       beforeEnter: requireAuth,
       props: {
diff --git a/frontend/src/views/TopBar.vue b/frontend/src/views/NavDesktop.vue
similarity index 100%
rename from frontend/src/views/TopBar.vue
rename to frontend/src/views/NavDesktop.vue
diff --git a/frontend/src/views/BottomBar.vue b/frontend/src/views/NavMobile.vue
similarity index 100%
rename from frontend/src/views/BottomBar.vue
rename to frontend/src/views/NavMobile.vue
diff --git a/frontend/src/views/auth/TopBar.vue b/frontend/src/views/auth/NavDesktop.vue
similarity index 100%
rename from frontend/src/views/auth/TopBar.vue
rename to frontend/src/views/auth/NavDesktop.vue
diff --git a/frontend/src/views/camp/TopBar.vue b/frontend/src/views/camp/NavDesktop.vue
similarity index 100%
rename from frontend/src/views/camp/TopBar.vue
rename to frontend/src/views/camp/NavDesktop.vue
diff --git a/frontend/src/views/camp/BottomBar.vue b/frontend/src/views/camp/NavMobile.vue
similarity index 100%
rename from frontend/src/views/camp/BottomBar.vue
rename to frontend/src/views/camp/NavMobile.vue

From 14f29170ea86d5cfedd5e789477daa6f31496afb Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Mon, 16 Mar 2020 23:30:45 +0100
Subject: [PATCH 70/85] Removed condition on BackButton.vue

---
 frontend/src/components/base/BackButton.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/base/BackButton.vue b/frontend/src/components/base/BackButton.vue
index 167e7f537b..e2c171b480 100644
--- a/frontend/src/components/base/BackButton.vue
+++ b/frontend/src/components/base/BackButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-btn v-if="$vuetify.breakpoint.xsOnly" aria-label="Zurück"
+  <v-btn aria-label="Zurück"
          icon @click="$router.go(-1)">
     <v-icon>mdi-arrow-left</v-icon>
   </v-btn>

From d6dfb747beb879e9335c6c4862e0caaefd03adfc Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Mon, 16 Mar 2020 23:34:50 +0100
Subject: [PATCH 71/85] Adjusted name of the components

---
 .../base/{DesktopSearch.vue => NavDesktopSearch.vue}        | 2 +-
 .../base/{TopBarUserMenu.vue => NavDesktopUserMenu.vue}     | 2 +-
 frontend/src/views/NavDesktop.vue                           | 6 +++---
 frontend/src/views/NavMobile.vue                            | 2 +-
 frontend/src/views/auth/NavDesktop.vue                      | 2 +-
 frontend/src/views/camp/NavDesktop.vue                      | 6 +++---
 frontend/src/views/camp/NavMobile.vue                       | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
 rename frontend/src/components/base/{DesktopSearch.vue => NavDesktopSearch.vue} (95%)
 rename frontend/src/components/base/{TopBarUserMenu.vue => NavDesktopUserMenu.vue} (98%)

diff --git a/frontend/src/components/base/DesktopSearch.vue b/frontend/src/components/base/NavDesktopSearch.vue
similarity index 95%
rename from frontend/src/components/base/DesktopSearch.vue
rename to frontend/src/components/base/NavDesktopSearch.vue
index bfe2e63e3e..566421cbe9 100644
--- a/frontend/src/components/base/DesktopSearch.vue
+++ b/frontend/src/components/base/NavDesktopSearch.vue
@@ -13,7 +13,7 @@
 
 <script>
 export default {
-  name: 'DesktopSearch',
+  name: 'NavDesktopSearch',
   data () {
     return {
       searchFocused: false
diff --git a/frontend/src/components/base/TopBarUserMenu.vue b/frontend/src/components/base/NavDesktopUserMenu.vue
similarity index 98%
rename from frontend/src/components/base/TopBarUserMenu.vue
rename to frontend/src/components/base/NavDesktopUserMenu.vue
index c7d20d2ca8..c827d0368f 100644
--- a/frontend/src/components/base/TopBarUserMenu.vue
+++ b/frontend/src/components/base/NavDesktopUserMenu.vue
@@ -38,7 +38,7 @@
 <script>
 
 export default {
-  name: 'TopBarUserMenu',
+  name: 'NavDesktopUserMenu',
   data () {
     return {
       logoutIcon: 'mdi-logout'
diff --git a/frontend/src/views/NavDesktop.vue b/frontend/src/views/NavDesktop.vue
index ce37ccecf0..15d5c597de 100644
--- a/frontend/src/views/NavDesktop.vue
+++ b/frontend/src/views/NavDesktop.vue
@@ -12,11 +12,11 @@
 
 <script>
 import { campFromRoute, campRoute } from '@/router'
-import DesktopSearch from '@/components/base/DesktopSearch'
-import TopBarUserMenu from '@/components/base/TopBarUserMenu'
+import DesktopSearch from '@/components/base/NavDesktopSearch'
+import TopBarUserMenu from '@/components/base/NavDesktopUserMenu'
 
 export default {
-  name: 'TopBar',
+  name: 'NavDesktop',
   components: {
     TopBarUserMenu,
     DesktopSearch,
diff --git a/frontend/src/views/NavMobile.vue b/frontend/src/views/NavMobile.vue
index af9fce2ead..336c7343d1 100644
--- a/frontend/src/views/NavMobile.vue
+++ b/frontend/src/views/NavMobile.vue
@@ -10,7 +10,7 @@
 
 <script>
 export default {
-  name: 'BottomBar'
+  name: 'NavMobile'
 }
 </script>
 
diff --git a/frontend/src/views/auth/NavDesktop.vue b/frontend/src/views/auth/NavDesktop.vue
index 42b5a4de88..7064e73fd8 100644
--- a/frontend/src/views/auth/NavDesktop.vue
+++ b/frontend/src/views/auth/NavDesktop.vue
@@ -10,7 +10,7 @@
 <script>
 
 export default {
-  name: 'TopBar',
+  name: 'NavDesktop',
   components: {
     Logo: () => import('@/components/base/Logo')
   }
diff --git a/frontend/src/views/camp/NavDesktop.vue b/frontend/src/views/camp/NavDesktop.vue
index ad8cdd8529..c4dd947e7d 100644
--- a/frontend/src/views/camp/NavDesktop.vue
+++ b/frontend/src/views/camp/NavDesktop.vue
@@ -30,11 +30,11 @@
 
 <script>
 import { campFromRoute, campRoute } from '@/router'
-import DesktopSearch from '@/components/base/DesktopSearch'
-import TopBarUserMenu from '@/components/base/TopBarUserMenu'
+import DesktopSearch from '@/components/base/NavDesktopSearch'
+import TopBarUserMenu from '@/components/base/NavDesktopUserMenu'
 
 export default {
-  name: 'TopBar',
+  name: 'NavDesktop',
   components: {
     TopBarUserMenu,
     DesktopSearch,
diff --git a/frontend/src/views/camp/NavMobile.vue b/frontend/src/views/camp/NavMobile.vue
index 1068229f42..061e3cf7d4 100644
--- a/frontend/src/views/camp/NavMobile.vue
+++ b/frontend/src/views/camp/NavMobile.vue
@@ -26,7 +26,7 @@
 
 <script>
 export default {
-  name: 'BottomBar'
+  name: 'NavMobile'
 }
 </script>
 

From 57317eade25ffc6a8eb11ddd78950a15402d958c Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Mon, 16 Mar 2020 23:38:17 +0100
Subject: [PATCH 72/85] Changed mini setting to computed

---
 frontend/src/components/base/SideBar.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/base/SideBar.vue b/frontend/src/components/base/SideBar.vue
index cce263cd99..473e8deba3 100644
--- a/frontend/src/components/base/SideBar.vue
+++ b/frontend/src/components/base/SideBar.vue
@@ -28,8 +28,12 @@ export default {
   name: 'SideBar',
   data () {
     return {
-      drawer: false,
-      mini: !this.$vuetify.breakpoint.mdAndUp
+      drawer: false
+    }
+  },
+  computed: {
+    mini () {
+      return !this.$vuetify.breakpoint.mdAndUp
     }
   }
 }

From 143047576eaf5536a3df4753e808bb60eb1a0ff4 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Tue, 17 Mar 2020 10:44:01 +0100
Subject: [PATCH 73/85] Implemented suggestions from @carlobeltrame

Signed-off-by: Manuel Meister <news.manuelsworld@gmail.com>
---
 frontend/src/router.js                   | 24 ++++++++----------------
 frontend/src/views/camp/CampOverview.vue |  2 +-
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/frontend/src/router.js b/frontend/src/router.js
index 5170a8cf5f..080d7cb68a 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -90,16 +90,19 @@ export default new Router({
           name: 'camp/collaborators',
           component: () => import(/* webpackChunkName: "campCollaborators" */ './views/camp/Collaborators')
         },
+        {
+          path: 'admin',
+          name: 'camp/admin',
+          component: () => import(/* webpackChunkName: "campAdmin" */ './views/camp/Admin')
+        },
         {
           path: 'overview',
           name: 'camp/overview',
-          component: () => import(/* webpackChunkName: "campPicasso" */ './views/camp/CampOverview'),
-          beforeEnter: parseBooleanInQuery
+          component: () => import(/* webpackChunkName: "campPicasso" */ './views/camp/CampOverview')
         },
         {
-          path: 'admin',
-          name: 'camp/admin',
-          component: () => import(/* webpackChunkName: "campAdmin" */ './views/camp/Admin')
+          path: '',
+          redirect: { name: 'camp/overview' }
         }
       ]
     },
@@ -131,17 +134,6 @@ function requireAuth (to, from, next) {
   })
 }
 
-function parseBooleanInQuery (to, from, next) {
-  for (const [key, val] of Object.entries(to.query)) {
-    if (val === null || val === 'true') {
-      to.query[key] = true
-    } else if (val === 'false') {
-      to.query[key] = false
-    }
-  }
-  next()
-}
-
 export function campFromRoute (route) {
   return function () {
     return this.api.get('/camp/' + route.params.campId)
diff --git a/frontend/src/views/camp/CampOverview.vue b/frontend/src/views/camp/CampOverview.vue
index b021c3f1e0..5a27bef58c 100644
--- a/frontend/src/views/camp/CampOverview.vue
+++ b/frontend/src/views/camp/CampOverview.vue
@@ -15,7 +15,7 @@ Show all event instances of a single period.
         top right
         :class="{'float-right':!$vuetify.breakpoint.xs}"
         color="white"
-        :to="{ query: { ...$route.query, list: !listFormat } }">
+        :to="{ query: { ...$route.query, list: !listFormat || undefined } }">
         <v-icon v-if="listFormat">mdi-calendar-month</v-icon>
         <v-icon v-else>mdi-menu</v-icon>
       </v-btn>

From a1ded10a26550cfedbbcae782c751b42d38e4734 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Tue, 17 Mar 2020 11:06:17 +0100
Subject: [PATCH 74/85] Solved active button problem with query params

---
 frontend/src/views/camp/NavDesktop.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/camp/NavDesktop.vue b/frontend/src/views/camp/NavDesktop.vue
index c4dd947e7d..5903ea2574 100644
--- a/frontend/src/views/camp/NavDesktop.vue
+++ b/frontend/src/views/camp/NavDesktop.vue
@@ -4,7 +4,7 @@
              color="blue-grey darken-4" dark>
     <logo>
       <v-btn text class="justify-start px-2"
-             exact :to="campRoute(camp(), 'overview')"
+             :to="campRoute(camp(), 'overview')"
              width="216">
         <v-toolbar-title>
           {{ camp().title | loading('Camp wird geladen…') }}

From 406b2db4a4350ed887277f04c4fcd81b2b26ead6 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Tue, 17 Mar 2020 15:08:06 +0100
Subject: [PATCH 75/85] The router-definition can't really be tested

---
 frontend/src/router.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/router.js b/frontend/src/router.js
index 080d7cb68a..2514d240b7 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -5,6 +5,7 @@ import { refreshLoginStatus } from '@/auth'
 
 Vue.use(Router)
 
+/* istanbul ignore next */
 export default new Router({
   mode: 'history',
   base: process.env.BASE_URL,

From 11508a7db11d364baefccd4a1ef4c272c3b86a45 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Wed, 18 Mar 2020 11:20:21 +0100
Subject: [PATCH 76/85] Implemented suggestions from @usu
 https://github.com/ecamp/ecamp3/pull/376#discussion_r394118460

---
 frontend/src/components/base/NavDesktopUserMenu.vue          | 5 +++++
 frontend/src/components/camp/CampSettings.vue                | 1 -
 frontend/src/components/camp/CollaboratorListItem.vue        | 1 +
 frontend/src/components/form/ApiWrapper.vue                  | 2 +-
 .../form/__tests__/__snapshots__/ApiSelect.spec.js.snap      | 2 +-
 .../form/__tests__/__snapshots__/ApiTextField.spec.js.snap   | 2 +-
 frontend/src/mixins/apiPropsMixin.js                         | 5 ++++-
 frontend/src/views/camp/NavDesktop.vue                       | 3 ---
 frontend/src/views/event/Event.vue                           | 2 --
 9 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/base/NavDesktopUserMenu.vue b/frontend/src/components/base/NavDesktopUserMenu.vue
index c827d0368f..c96e7b28e0 100644
--- a/frontend/src/components/base/NavDesktopUserMenu.vue
+++ b/frontend/src/components/base/NavDesktopUserMenu.vue
@@ -44,6 +44,11 @@ export default {
       logoutIcon: 'mdi-logout'
     }
   },
+  computed: {
+    username () {
+      return this.api.get().profile().username
+    }
+  },
   methods: {
     logout () {
       this.logoutIcon = ''
diff --git a/frontend/src/components/camp/CampSettings.vue b/frontend/src/components/camp/CampSettings.vue
index 6416f7e25b..d7494a251c 100644
--- a/frontend/src/components/camp/CampSettings.vue
+++ b/frontend/src/components/camp/CampSettings.vue
@@ -18,7 +18,6 @@ Displays details on a single camp and allows to edit them.
         :uri="camp()._meta.self"
         fieldname="title"
         label="Titel"
-        class="mb-4"
         required />
       <api-text-field
         :value="camp().motto"
diff --git a/frontend/src/components/camp/CollaboratorListItem.vue b/frontend/src/components/camp/CollaboratorListItem.vue
index e140b827cc..9296a639fc 100644
--- a/frontend/src/components/camp/CollaboratorListItem.vue
+++ b/frontend/src/components/camp/CollaboratorListItem.vue
@@ -12,6 +12,7 @@
       :uri="collaborator._meta.self"
       fieldname="role"
       :items="['member', 'manager']"
+      no-margin
       dense
       required />
     <v-list-item-action class="ml-2">
diff --git a/frontend/src/components/form/ApiWrapper.vue b/frontend/src/components/form/ApiWrapper.vue
index 5d78729b1c..46170c99cb 100644
--- a/frontend/src/components/form/ApiWrapper.vue
+++ b/frontend/src/components/form/ApiWrapper.vue
@@ -5,7 +5,7 @@ Wrapper component for form components to save data back to API
 <template>
   <v-form
     inline
-    :class="{'d-flex api-wrapper--savable':!autoSave && !readonly}">
+    :class="{'d-flex api-wrapper--savable':!autoSave && !readonly,'my-4':!noMargin}">
     <slot
       :localValue="localValue"
       :errorMessages="errorMessages"
diff --git a/frontend/src/components/form/__tests__/__snapshots__/ApiSelect.spec.js.snap b/frontend/src/components/form/__tests__/__snapshots__/ApiSelect.spec.js.snap
index 17e7374dae..36a53acef8 100644
--- a/frontend/src/components/form/__tests__/__snapshots__/ApiSelect.spec.js.snap
+++ b/frontend/src/components/form/__tests__/__snapshots__/ApiSelect.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`ApiTextField.vue renders correctly 1`] = `
 <form
-  class="v-form"
+  class="v-form my-4"
   inline=""
   novalidate="novalidate"
 >
diff --git a/frontend/src/components/form/__tests__/__snapshots__/ApiTextField.spec.js.snap b/frontend/src/components/form/__tests__/__snapshots__/ApiTextField.spec.js.snap
index db26d21c0d..493ca2f915 100644
--- a/frontend/src/components/form/__tests__/__snapshots__/ApiTextField.spec.js.snap
+++ b/frontend/src/components/form/__tests__/__snapshots__/ApiTextField.spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`ApiTextField.vue renders correctly 1`] = `
 <v-form-stub
-  class=""
+  class="my-4"
   inline=""
 >
   <v-text-field-stub
diff --git a/frontend/src/mixins/apiPropsMixin.js b/frontend/src/mixins/apiPropsMixin.js
index 8d6c2c86ad..d4ee77173f 100644
--- a/frontend/src/mixins/apiPropsMixin.js
+++ b/frontend/src/mixins/apiPropsMixin.js
@@ -20,7 +20,10 @@ export const apiPropsMixin = {
     autoSaveDelay: { type: Number, default: 800, required: false },
 
     /* Validation criteria */
-    required: { type: Boolean, default: false, required: false }
+    required: { type: Boolean, default: false, required: false },
+
+    /* Removes the margin (for inline fields) */
+    noMargin: { type: Boolean, default: false, required: false }
   }
 
 }
diff --git a/frontend/src/views/camp/NavDesktop.vue b/frontend/src/views/camp/NavDesktop.vue
index 5903ea2574..22277debe6 100644
--- a/frontend/src/views/camp/NavDesktop.vue
+++ b/frontend/src/views/camp/NavDesktop.vue
@@ -43,9 +43,6 @@ export default {
   computed: {
     camp () {
       return campFromRoute(this.$route)
-    },
-    username () {
-      return this.api.get().profile().username
     }
   },
   methods: {
diff --git a/frontend/src/views/event/Event.vue b/frontend/src/views/event/Event.vue
index 4e8db0efc9..ca35d71430 100644
--- a/frontend/src/views/event/Event.vue
+++ b/frontend/src/views/event/Event.vue
@@ -22,7 +22,6 @@ Displays a single event
             fieldname="title"
             :auto-save="false"
             label="Titel"
-            class="my-4"
             required />
           <api-text-field
             :value="event.title"
@@ -30,7 +29,6 @@ Displays a single event
             fieldname="title"
             :auto-save="true"
             label="Titel"
-            class="my-4"
             required />
           <v-list>
             <v-label>Instanzen</v-label>

From 751b0f608503250c8f5bd321f55bdaab553018d8 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Wed, 18 Mar 2020 11:21:05 +0100
Subject: [PATCH 77/85] Fixed console error Loading behaviour should be
 improved #390

---
 frontend/src/views/camp/CampOverview.vue | 35 +++++++++++++++++-------
 1 file changed, 25 insertions(+), 10 deletions(-)

diff --git a/frontend/src/views/camp/CampOverview.vue b/frontend/src/views/camp/CampOverview.vue
index 5a27bef58c..092724a688 100644
--- a/frontend/src/views/camp/CampOverview.vue
+++ b/frontend/src/views/camp/CampOverview.vue
@@ -19,16 +19,22 @@ Show all event instances of a single period.
         <v-icon v-if="listFormat">mdi-calendar-month</v-icon>
         <v-icon v-else>mdi-menu</v-icon>
       </v-btn>
-      <event-list
-        v-if="listFormat"
-        :camp="camp" :event-instances="firstPeriod.event_instances().items" />
-      <picasso
-        v-else
-        :camp="camp"
-        class="mx-2 ma-sm-0 pa-sm-2"
-        :event-instances="firstPeriod.event_instances().items"
-        :start="new Date(Date.parse(firstPeriod.start))"
-        :end="new Date(Date.parse(firstPeriod.end))" />
+      <template v-if="!firstPeriodLoaded">
+        <v-skeleton-loader v-if="listFormat" type="list-item-avatar-two-line@2" class="py-2" />
+        <v-skeleton-loader v-else type="table" />
+      </template>
+      <template v-if="firstPeriod">
+        <event-list
+          v-if="listFormat"
+          :camp="camp" :event-instances="firstPeriod.event_instances().items" />
+        <picasso
+          v-else
+          :camp="camp"
+          class="mx-2 ma-sm-0 pa-sm-2"
+          :event-instances="firstPeriod.event_instances().items"
+          :start="new Date(Date.parse(firstPeriod.start))"
+          :end="new Date(Date.parse(firstPeriod.end))" />
+      </template>
       <v-btn
         :fixed="$vuetify.breakpoint.xs"
         :absolute="!$vuetify.breakpoint.xs"
@@ -72,6 +78,9 @@ export default {
     },
     firstPeriod () {
       return this.periods.items[0]
+    },
+    firstPeriodLoaded () {
+      return this.firstPeriod && !this.firstPeriod._meta.loading
     }
   },
   mounted () {
@@ -97,3 +106,9 @@ export default {
     }
   }
 </style>
+
+<style lang="scss" scoped>
+  ::v-deep .v-skeleton-loader__list-item-avatar-two-line {
+    height: 60px;
+  }
+</style>

From 5a154e82b716ac81907379ad9c022e8f422e1544 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Wed, 18 Mar 2020 11:31:23 +0100
Subject: [PATCH 78/85] Fixed naming

---
 frontend/src/views/NavDesktop.vue      | 6 +++---
 frontend/src/views/camp/NavDesktop.vue | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/views/NavDesktop.vue b/frontend/src/views/NavDesktop.vue
index 15d5c597de..d90e74c84f 100644
--- a/frontend/src/views/NavDesktop.vue
+++ b/frontend/src/views/NavDesktop.vue
@@ -6,19 +6,19 @@
     <logo text />
     <v-spacer />
     <desktop-search />
-    <top-bar-user-menu />
+    <nav-desktop-user-menu />
   </v-app-bar>
 </template>
 
 <script>
 import { campFromRoute, campRoute } from '@/router'
 import DesktopSearch from '@/components/base/NavDesktopSearch'
-import TopBarUserMenu from '@/components/base/NavDesktopUserMenu'
+import NavDesktopUserMenu from '@/components/base/NavDesktopUserMenu'
 
 export default {
   name: 'NavDesktop',
   components: {
-    TopBarUserMenu,
+    NavDesktopUserMenu,
     DesktopSearch,
     Logo: () => import('@/components/base/Logo')
   },
diff --git a/frontend/src/views/camp/NavDesktop.vue b/frontend/src/views/camp/NavDesktop.vue
index 22277debe6..23d1244c61 100644
--- a/frontend/src/views/camp/NavDesktop.vue
+++ b/frontend/src/views/camp/NavDesktop.vue
@@ -24,19 +24,19 @@
     </v-toolbar-items>
     <v-spacer />
     <desktop-search />
-    <top-bar-user-menu />
+    <nav-desktop-user-menu />
   </v-app-bar>
 </template>
 
 <script>
 import { campFromRoute, campRoute } from '@/router'
 import DesktopSearch from '@/components/base/NavDesktopSearch'
-import TopBarUserMenu from '@/components/base/NavDesktopUserMenu'
+import NavDesktopUserMenu from '@/components/base/NavDesktopUserMenu'
 
 export default {
   name: 'NavDesktop',
   components: {
-    TopBarUserMenu,
+    NavDesktopUserMenu,
     DesktopSearch,
     Logo: () => import('@/components/base/Logo')
   },

From 3ab8a4f4094efbf822659363a2da529c719b0478 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Wed, 18 Mar 2020 11:35:58 +0100
Subject: [PATCH 79/85] Removed unnecessary styles

---
 frontend/src/components/base/ContentCard.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/frontend/src/components/base/ContentCard.vue b/frontend/src/components/base/ContentCard.vue
index a124e7754b..049bfca2a7 100644
--- a/frontend/src/components/base/ContentCard.vue
+++ b/frontend/src/components/base/ContentCard.vue
@@ -28,12 +28,5 @@ export default {
 </script>
 
 <style scoped>
-  .v-toolbar {
-    border-bottom: 1px solid;
-  }
   .v-card__title {font-weight: 600;}
-
-  .static {
-    position: static;
-  }
 </style>

From be846753c6be5d88ac31c3a7ceb5bb1dffd37986 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Wed, 18 Mar 2020 11:38:30 +0100
Subject: [PATCH 80/85] Used ContentCard in aside

---
 frontend/src/views/camp/SideBarPeriods.vue | 7 ++++---
 frontend/src/views/event/DayOverview.vue   | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/frontend/src/views/camp/SideBarPeriods.vue b/frontend/src/views/camp/SideBarPeriods.vue
index cb04632e97..a17c625447 100644
--- a/frontend/src/views/camp/SideBarPeriods.vue
+++ b/frontend/src/views/camp/SideBarPeriods.vue
@@ -4,7 +4,7 @@ Displays periods of a single camp.
 
 <template>
   <side-bar>
-    <v-card>
+    <content-card>
       <v-subheader class="text-uppercase subtitle-2">
         Periods
       </v-subheader>
@@ -19,15 +19,16 @@ Displays periods of a single camp.
           </v-list-item-content>
         </v-list-item>
       </v-list>
-    </v-card>
+    </content-card>
   </side-bar>
 </template>
 <script>
 import SideBar from '@/components/base/SideBar'
+import ContentCard from '@/components/base/ContentCard'
 
 export default {
   name: 'SideBarPeriods',
-  components: { SideBar },
+  components: { ContentCard, SideBar },
   props: {
     camp: { type: Function, required: true }
   },
diff --git a/frontend/src/views/event/DayOverview.vue b/frontend/src/views/event/DayOverview.vue
index bd9a0b93bf..da799e873c 100644
--- a/frontend/src/views/event/DayOverview.vue
+++ b/frontend/src/views/event/DayOverview.vue
@@ -1,6 +1,6 @@
 <template>
   <side-bar>
-    <card-view>
+    <content-card>
       <v-subheader class="text-uppercase subtitle-2">
         Tagesübersicht
       </v-subheader>
@@ -13,18 +13,18 @@
                interval-height="36"
                :end="endOfDay"
                type="day" />
-    </card-view>
+    </content-card>
   </side-bar>
 </template>
 
 <script>
 import Picasso from '@/components/camp/Picasso'
 import SideBar from '@/components/base/SideBar'
-import CardView from '@/components/base/ContentCard'
+import ContentCard from '@/components/base/ContentCard'
 
 export default {
   name: 'DayOverview',
-  components: { CardView, SideBar, Picasso },
+  components: { ContentCard, SideBar, Picasso },
   props: {
     day: { type: Function, required: true }
   },

From c820cc7e865ab92099aa1b368a0903822426c992 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Wed, 18 Mar 2020 11:39:03 +0100
Subject: [PATCH 81/85] Fixed wrong type

---
 frontend/src/views/event/DayOverview.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/event/DayOverview.vue b/frontend/src/views/event/DayOverview.vue
index da799e873c..7f024047f4 100644
--- a/frontend/src/views/event/DayOverview.vue
+++ b/frontend/src/views/event/DayOverview.vue
@@ -10,7 +10,7 @@
                :camp="period.camp"
                :event-instances="eventInstances.items"
                :start="startOfDay"
-               interval-height="36"
+               :interval-height="36"
                :end="endOfDay"
                type="day" />
     </content-card>

From e34f70293a603a4778711b2e4aa80ab96b333cf9 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Wed, 18 Mar 2020 11:42:12 +0100
Subject: [PATCH 82/85] Improved consistency in naming

---
 frontend/src/router.js                                          | 2 +-
 .../src/views/event/{DayOverview.vue => SideBarOverview.vue}    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename frontend/src/views/event/{DayOverview.vue => SideBarOverview.vue} (98%)

diff --git a/frontend/src/router.js b/frontend/src/router.js
index 2514d240b7..eea08a7ed2 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -113,7 +113,7 @@ export default new Router({
       components: {
         topbar: () => import(/* webpackChunkName: "navigation" */ './views/camp/NavDesktop'),
         default: () => import(/* webpackChunkName: "event" */ './views/event/Event'),
-        aside: () => import(/* webpackChunkName: "day" */ './views/event/DayOverview'),
+        aside: () => import(/* webpackChunkName: "day" */ './views/event/SideBarOverview'),
         bottombar: () => import(/* webpackChunkName: "navigation" */ './views/camp/NavMobile')
       },
       beforeEnter: requireAuth,
diff --git a/frontend/src/views/event/DayOverview.vue b/frontend/src/views/event/SideBarOverview.vue
similarity index 98%
rename from frontend/src/views/event/DayOverview.vue
rename to frontend/src/views/event/SideBarOverview.vue
index 7f024047f4..0b4cad78ca 100644
--- a/frontend/src/views/event/DayOverview.vue
+++ b/frontend/src/views/event/SideBarOverview.vue
@@ -23,7 +23,7 @@ import SideBar from '@/components/base/SideBar'
 import ContentCard from '@/components/base/ContentCard'
 
 export default {
-  name: 'DayOverview',
+  name: 'SideBarOverview',
   components: { ContentCard, SideBar, Picasso },
   props: {
     day: { type: Function, required: true }

From 1fdb27430d478afa718cb8dc4ede69a8329d6a0a Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Wed, 18 Mar 2020 11:51:31 +0100
Subject: [PATCH 83/85] Renamed overview to program

---
 frontend/src/components/base/Logo.vue                |  2 +-
 frontend/src/router.js                               | 12 ++++++------
 .../views/camp/{CampOverview.vue => CampProgram.vue} |  2 +-
 frontend/src/views/camp/NavDesktop.vue               |  2 +-
 frontend/src/views/camp/NavMobile.vue                |  2 +-
 .../{SideBarOverview.vue => SideBarProgram.vue}      |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename frontend/src/views/camp/{CampOverview.vue => CampProgram.vue} (99%)
 rename frontend/src/views/event/{SideBarOverview.vue => SideBarProgram.vue} (98%)

diff --git a/frontend/src/components/base/Logo.vue b/frontend/src/components/base/Logo.vue
index 613ce5f6c2..e471835c65 100644
--- a/frontend/src/components/base/Logo.vue
+++ b/frontend/src/components/base/Logo.vue
@@ -21,7 +21,7 @@ export default {
   },
   computed: {
     campHome () {
-      return this.camp ? campRoute(this.camp, 'overview') : false
+      return this.camp ? campRoute(this.camp, 'program') : false
     }
   }
 }
diff --git a/frontend/src/router.js b/frontend/src/router.js
index eea08a7ed2..0f65566d48 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -97,13 +97,13 @@ export default new Router({
           component: () => import(/* webpackChunkName: "campAdmin" */ './views/camp/Admin')
         },
         {
-          path: 'overview',
-          name: 'camp/overview',
-          component: () => import(/* webpackChunkName: "campPicasso" */ './views/camp/CampOverview')
+          path: 'program',
+          name: 'camp/program',
+          component: () => import(/* webpackChunkName: "campProgram" */ './views/camp/CampProgram')
         },
         {
           path: '',
-          redirect: { name: 'camp/overview' }
+          redirect: { name: 'camp/program' }
         }
       ]
     },
@@ -113,7 +113,7 @@ export default new Router({
       components: {
         topbar: () => import(/* webpackChunkName: "navigation" */ './views/camp/NavDesktop'),
         default: () => import(/* webpackChunkName: "event" */ './views/event/Event'),
-        aside: () => import(/* webpackChunkName: "day" */ './views/event/SideBarOverview'),
+        aside: () => import(/* webpackChunkName: "day" */ './views/event/SideBarProgram'),
         bottombar: () => import(/* webpackChunkName: "navigation" */ './views/camp/NavMobile')
       },
       beforeEnter: requireAuth,
@@ -155,7 +155,7 @@ function dayFromEventInstanceInRoute (route) {
 
 export function campRoute (camp, subroute) {
   if (camp._meta.loading) return {}
-  const routeName = subroute ? 'camp/' + subroute : 'camp/overview'
+  const routeName = subroute ? 'camp/' + subroute : 'camp/program'
   return { name: routeName, params: { campId: camp.id, campTitle: slugify(camp.title) } }
 }
 
diff --git a/frontend/src/views/camp/CampOverview.vue b/frontend/src/views/camp/CampProgram.vue
similarity index 99%
rename from frontend/src/views/camp/CampOverview.vue
rename to frontend/src/views/camp/CampProgram.vue
index 092724a688..212bace60e 100644
--- a/frontend/src/views/camp/CampOverview.vue
+++ b/frontend/src/views/camp/CampProgram.vue
@@ -54,7 +54,7 @@ Show all event instances of a single period.
 import ContentCard from '@/components/base/ContentCard'
 
 export default {
-  name: 'CampOverview',
+  name: 'CampProgram',
   components: {
     ContentCard,
     MobileSearch: () => import('@/components/base/MobileSearch'),
diff --git a/frontend/src/views/camp/NavDesktop.vue b/frontend/src/views/camp/NavDesktop.vue
index 23d1244c61..3ff5cc7651 100644
--- a/frontend/src/views/camp/NavDesktop.vue
+++ b/frontend/src/views/camp/NavDesktop.vue
@@ -4,7 +4,7 @@
              color="blue-grey darken-4" dark>
     <logo>
       <v-btn text class="justify-start px-2"
-             :to="campRoute(camp(), 'overview')"
+             :to="campRoute(camp(), 'program')"
              width="216">
         <v-toolbar-title>
           {{ camp().title | loading('Camp wird geladen…') }}
diff --git a/frontend/src/views/camp/NavMobile.vue b/frontend/src/views/camp/NavMobile.vue
index 061e3cf7d4..02c80405ad 100644
--- a/frontend/src/views/camp/NavMobile.vue
+++ b/frontend/src/views/camp/NavMobile.vue
@@ -9,7 +9,7 @@
       <span>Tasks</span>
       <v-icon>mdi-format-list-checks</v-icon>
     </v-btn>
-    <v-btn :to="{name: 'camp/overview'}">
+    <v-btn :to="{name: 'camp/program'}">
       <span>Camp</span>
       <v-icon large>mdi-tent</v-icon>
     </v-btn>
diff --git a/frontend/src/views/event/SideBarOverview.vue b/frontend/src/views/event/SideBarProgram.vue
similarity index 98%
rename from frontend/src/views/event/SideBarOverview.vue
rename to frontend/src/views/event/SideBarProgram.vue
index 0b4cad78ca..5d8489344e 100644
--- a/frontend/src/views/event/SideBarOverview.vue
+++ b/frontend/src/views/event/SideBarProgram.vue
@@ -23,7 +23,7 @@ import SideBar from '@/components/base/SideBar'
 import ContentCard from '@/components/base/ContentCard'
 
 export default {
-  name: 'SideBarOverview',
+  name: 'SideBarProgram',
   components: { ContentCard, SideBar, Picasso },
   props: {
     day: { type: Function, required: true }

From 5cd48b8f8689c9aeca55f134532ea49cbea79306 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Wed, 18 Mar 2020 12:04:45 +0100
Subject: [PATCH 84/85] Removed last reference to CardView (was replaced by
 ContentView)

---
 frontend/src/views/event/Event.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/event/Event.vue b/frontend/src/views/event/Event.vue
index ca35d71430..b2eae5be6f 100644
--- a/frontend/src/views/event/Event.vue
+++ b/frontend/src/views/event/Event.vue
@@ -4,7 +4,7 @@ Displays a single event
 
 <template>
   <v-container fluid>
-    <card-view>
+    <content-card>
       <v-toolbar dense>
         <back-button />
         <v-toolbar-title class="pl-2">
@@ -43,17 +43,18 @@ Displays a single event
           </v-list>
         </template>
       </v-card-text>
-    </card-view>
+    </content-card>
   </v-container>
 </template>
 
 <script>
+import ContentCard from '@/components/base/ContentCard'
 
 export default {
   name: 'Event',
   components: {
     BackButton: () => import('@/components/base/BackButton'),
-    CardView: () => import('@/components/base/ContentCard'),
+    ContentCard,
     ApiTextField: () => import('@/components/form/ApiTextField')
   },
   props: {

From cdd4752f6cef4bb5b4f202628cde006d0aaebc87 Mon Sep 17 00:00:00 2001
From: Manuel Meister <news.manuelsworld@gmail.com>
Date: Wed, 18 Mar 2020 12:17:54 +0100
Subject: [PATCH 85/85] Added test for vue loading filter

---
 frontend/tests/unit/api-store.spec.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/frontend/tests/unit/api-store.spec.js b/frontend/tests/unit/api-store.spec.js
index 8f5fd0da16..0fe0bcceeb 100644
--- a/frontend/tests/unit/api-store.spec.js
+++ b/frontend/tests/unit/api-store.spec.js
@@ -894,4 +894,12 @@ describe('API store', () => {
     expect(await load).toMatchObject({ id: 83, name: 'Pflock', _meta: { self: 'http://localhost/camps/1/users/83' } })
     done()
   })
+
+  it('sets property loading on LoadingProxy to true', async done => {
+    // given
+    axiosMock.onGet('http://localhost/camps/1').reply(200, embeddedSingleEntity.serverResponse)
+    const loadingProxy = vm.api.get('/camps/1')
+    expect(loadingProxy.loading).toBe(true)
+    done()
+  })
 })