From b6598370af5acebe78635cb1171571302f746798 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sun, 15 Nov 2020 22:30:53 +0100
Subject: [PATCH 01/21] fix howler instance unloading before playing

---
 src/components/Main.vue    | 39 ++++++++++----------------------------
 src/components/Sidebar.vue | 28 +++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 src/components/Sidebar.vue

diff --git a/src/components/Main.vue b/src/components/Main.vue
index 20e773b..47e0bba 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -40,28 +40,9 @@
 						No stations were found matching your search term
 					</template>
 				</EmptyContent>
+				<Sidebar />
 			</template>
 		</AppContent>
-		<AppSidebar v-show="showSidebar"
-			:title="sidebarStation.name"
-			:subtitle="stationTags"
-			@close="showSidebar=false">
-			<div>
-				<h3><span class="icon-tag" /> {{ t('radio', 'Stream URL') }}</h3>
-				<Multiselect
-					class="sidebar__tags"
-					:value="tags"
-					:auto-limit="false"
-					:limit="7"
-					:options="allTags"
-					:multiple="true"
-					:taggable="true"
-					:placeholder="t('bookmarks', 'Select tags and create new ones')"
-					:disabled="!isEditable"
-					@input="onTagsChange"
-					@tag="onAddTag" />
-			</div>
-		</AppSidebar>
 	</Content>
 </template>
 
@@ -71,16 +52,16 @@ import AppContent from '@nextcloud/vue/dist/Components/AppContent'
 import Breadcrumbs from '@nextcloud/vue/dist/Components/Breadcrumbs'
 import Breadcrumb from '@nextcloud/vue/dist/Components/Breadcrumb'
 import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent'
-import AppSidebar from '@nextcloud/vue/dist/Components/AppSidebar'
-import AppSidebarTab from '@nextcloud/vue/dist/Components/AppSidebarTab'
-import Navigation from './Navigation'
-import Table from './Table'
-import { Howl } from 'howler'
-
-import { generateUrl } from '@nextcloud/router'
+import generateUrl from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 import axios from '@nextcloud/axios'
 
+import Navigation from './Navigation'
+import Sidebar from './Sidebar'
+import Table from './Table'
+
+import Howl from 'howler'
+
 let audioPlayer = null
 
 export default {
@@ -93,8 +74,7 @@ export default {
 		Breadcrumb,
 		Table,
 		EmptyContent,
-		AppSidebar,
-		AppSidebarTab,
+		Sidebar,
 	},
 	data: () => ({
 		tableData: [],
@@ -231,6 +211,7 @@ export default {
 					vm.$store.dispatch('isBuffering', false)
 				},
 			})
+			audioPlayer.unload()
 			audioPlayer.play()
 			audioPlayer.fade(0, vm.player.volume, 500)
 
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
new file mode 100644
index 0000000..f3bf9e6
--- /dev/null
+++ b/src/components/Sidebar.vue
@@ -0,0 +1,28 @@
+<template>
+	<AppSidebar v-show="showSidebar"
+		:title="sidebarStation.name"
+		:subtitle="stationTags"
+		@close="showSidebar=false">
+		<input type="text" :value="sidebarStation.url_resolved" disabled="disabled">
+		<Actions>
+			<ActionButton icon="icon-clippy" @click="copyLink( { url: shareUrl(share) })">
+				{{ t('radio', 'Copy link to clipboard') }}
+			</ActionButton>
+		</Actions>
+	</AppSidebar>
+</template>
+
+<script>
+import AppSidebar from '@nextcloud/vue/dist/Components/AppSidebar'
+import Actions from '@nextcloud/vue/dist/Components/Actions'
+import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+
+export default {
+	name: 'Sidebar',
+	components: {
+		AppSidebar,
+		Actions,
+		ActionButton,
+	},
+}
+</script>

From 524cd875e1f890258e3115ad07c66602e6d3bcb3 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sun, 15 Nov 2020 23:39:03 +0100
Subject: [PATCH 02/21] fix correct display recent

---
 lib/Db/RecentMapper.php  | 12 ++++++++++--
 src/components/Main.vue  | 19 ++-----------------
 src/components/Table.vue |  3 +--
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/lib/Db/RecentMapper.php b/lib/Db/RecentMapper.php
index 10b640f..afbbd5d 100644
--- a/lib/Db/RecentMapper.php
+++ b/lib/Db/RecentMapper.php
@@ -23,8 +23,12 @@ class RecentMapper extends QBMapper {
 	public function find(int $id, string $userId): Station {
 		/* @var $qb IQueryBuilder */
 		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
+		$qb->selectDistinct('stationuuid')
+			->addSelect('name')
+			->addSelect('favicon')
+			->addSelect('urlresolved')
 			->from('recent')
+			->orderBy('id', 'DESC')
 			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)))
 			->andWhere($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
 		return $this->findEntity($qb);
@@ -37,8 +41,12 @@ class RecentMapper extends QBMapper {
 	public function findAll(string $userId): array {
 		/* @var $qb IQueryBuilder */
 		$qb = $this->db->getQueryBuilder();
-		$qb->select('*')
+		$qb->selectDistinct('stationuuid')
+			->addSelect('name')
+			->addSelect('favicon')
+			->addSelect('urlresolved')
 			->from('recent')
+			->orderBy('id', 'DESC')
 			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
 		return $this->findEntities($qb);
 	}
diff --git a/src/components/Main.vue b/src/components/Main.vue
index 47e0bba..4be76ac 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -3,14 +3,6 @@
 		<Navigation
 			:station-data="tableData" />
 		<AppContent>
-			<Breadcrumbs
-				v-if="tableData.length > 0"
-				class="breadcrumbs">
-				<Breadcrumb title="Home" href="/" />
-				<Breadcrumb
-					:title="t('radio', 'Top')"
-					href="/Top" />
-			</Breadcrumbs>
 			<Table
 				v-if="!pageLoading && tableData.length > 0"
 				:station-data="tableData"
@@ -40,7 +32,6 @@
 						No stations were found matching your search term
 					</template>
 				</EmptyContent>
-				<Sidebar />
 			</template>
 		</AppContent>
 	</Content>
@@ -49,18 +40,15 @@
 <script>
 import Content from '@nextcloud/vue/dist/Components/Content'
 import AppContent from '@nextcloud/vue/dist/Components/AppContent'
-import Breadcrumbs from '@nextcloud/vue/dist/Components/Breadcrumbs'
-import Breadcrumb from '@nextcloud/vue/dist/Components/Breadcrumb'
 import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent'
-import generateUrl from '@nextcloud/router'
+import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 import axios from '@nextcloud/axios'
 
 import Navigation from './Navigation'
-import Sidebar from './Sidebar'
 import Table from './Table'
 
-import Howl from 'howler'
+import { Howl } from 'howler'
 
 let audioPlayer = null
 
@@ -70,11 +58,8 @@ export default {
 		Navigation,
 		Content,
 		AppContent,
-		Breadcrumbs,
-		Breadcrumb,
 		Table,
 		EmptyContent,
-		Sidebar,
 	},
 	data: () => ({
 		tableData: [],
diff --git a/src/components/Table.vue b/src/components/Table.vue
index fe25695..1867228 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -115,8 +115,7 @@ table {
 		background-color: var(--color-main-background-translucent);
 		z-index: 60;
 		position: sticky;
-		position: -webkit-sticky;
-		top: 99px;
+		top: 50px;
 
 		th {
 			border-bottom: 1px solid var(--color-border);

From f69bbfb523de757367ed27305b100e8756f0935f Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sun, 15 Nov 2020 23:45:43 +0100
Subject: [PATCH 03/21] fix howler instance unloading before playing

---
 src/components/Main.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Main.vue b/src/components/Main.vue
index 4be76ac..1f52a01 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -48,7 +48,7 @@ import axios from '@nextcloud/axios'
 import Navigation from './Navigation'
 import Table from './Table'
 
-import { Howl } from 'howler'
+import { Howl, Howler } from 'howler'
 
 let audioPlayer = null
 
@@ -171,6 +171,7 @@ export default {
 			} else {
 				stationSrc = station.url_resolved
 			}
+			Howler.unload()
 			audioPlayer = new Howl({
 				src: stationSrc,
 				volume: vm.player.volume,
@@ -196,7 +197,6 @@ export default {
 					vm.$store.dispatch('isBuffering', false)
 				},
 			})
-			audioPlayer.unload()
 			audioPlayer.play()
 			audioPlayer.fade(0, vm.player.volume, 500)
 

From 95311ebcff5953201199ac6d2c10c136bd7a5384 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 16 Nov 2020 21:32:25 +0100
Subject: [PATCH 04/21] fix and style sidebar

---
 src/components/Main.vue    |  11 ++--
 src/components/Sidebar.vue | 122 ++++++++++++++++++++++++++++++++++---
 2 files changed, 120 insertions(+), 13 deletions(-)

diff --git a/src/components/Main.vue b/src/components/Main.vue
index 1f52a01..5752541 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -34,6 +34,9 @@
 				</EmptyContent>
 			</template>
 		</AppContent>
+		<Sidebar
+			:show-sidebar="showSidebar"
+			:sidebar-station="sidebarStation" />
 	</Content>
 </template>
 
@@ -47,6 +50,7 @@ import axios from '@nextcloud/axios'
 
 import Navigation from './Navigation'
 import Table from './Table'
+import Sidebar from './Sidebar'
 
 import { Howl, Howler } from 'howler'
 
@@ -60,6 +64,7 @@ export default {
 		AppContent,
 		Table,
 		EmptyContent,
+		Sidebar,
 	},
 	data: () => ({
 		tableData: [],
@@ -73,12 +78,6 @@ export default {
 		player() {
 			return this.$store.state.player
 		},
-		stationTags() {
-			if (this.sidebarStation.tags) {
-				return this.sidebarStation.tags.replaceAll(',', ', ')
-			}
-			return ''
-		},
 	},
 	watch: {
 		$route: 'onRoute',
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index f3bf9e6..f775ca8 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -1,14 +1,62 @@
 <template>
-	<AppSidebar v-show="showSidebar"
+	<AppSidebar
+		v-show="showSidebar"
 		:title="sidebarStation.name"
 		:subtitle="stationTags"
+		:background="sidebarStation.favicon"
+		class="has-preview"
 		@close="showSidebar=false">
-		<input type="text" :value="sidebarStation.url_resolved" disabled="disabled">
-		<Actions>
-			<ActionButton icon="icon-clippy" @click="copyLink( { url: shareUrl(share) })">
-				{{ t('radio', 'Copy link to clipboard') }}
-			</ActionButton>
-		</Actions>
+		<div class="configBox">
+			<span class="icon icon-link" />
+			<span class="title">
+				Stream URL
+			</span>
+			<div class="content">
+				<input type="text" :value="sidebarStation.url_resolved" disabled="disabled">
+				<Actions>
+					<ActionButton icon="icon-clippy" @click="copyLink( { url: shareUrl(share) })">
+						{{ t('radio', 'Copy link to clipboard') }}
+					</ActionButton>
+				</Actions>
+			</div>
+		</div>
+		<div class="configBox">
+			<span class="icon icon-external" />
+			<span class="title">
+				Homepage
+			</span>
+			<div class="content">
+				<span>
+					<a
+						:href="sidebarStation.homepage"
+						target="new">
+						{{ sidebarStation.homepage }}
+					</a>
+				</span>
+			</div>
+		</div>
+		<div class="configBox">
+			<span class="icon icon-details" />
+			<span class="title">
+				Country & Language
+			</span>
+			<div class="content">
+				<span>
+					{{ sidebarStation.country }}, {{ sidebarStation.language }}
+				</span>
+			</div>
+		</div>
+		<div class="configBox">
+			<span class="icon icon-details" />
+			<span class="title">
+				Codec & Bitrate
+			</span>
+			<div class="content">
+				<span>
+					{{ sidebarStation.codec }}, {{ sidebarStation.bitrate }}
+				</span>
+			</div>
+		</div>
 	</AppSidebar>
 </template>
 
@@ -24,5 +72,65 @@ export default {
 		Actions,
 		ActionButton,
 	},
+	props: {
+		showSidebar: {
+			type: Boolean,
+			default() { return false },
+		},
+		sidebarStation: {
+			type: Array,
+			default() { return [] },
+		},
+	},
+	computed: {
+		stationTags() {
+			if (this.sidebarStation.tags) {
+				return this.sidebarStation.tags.replaceAll(',', ', ')
+			}
+			return ''
+		},
+	},
 }
 </script>
+
+<style lang="scss" scoped>
+
+.app-sidebar {
+	&.has-preview::v-deep {
+		.app-sidebar-header__figure {
+			background-size: cover;
+			height: 200px;
+		}
+	}
+}
+
+.configBox {
+	padding: 0 15px;
+	margin-bottom: 20px;
+}
+
+.configBox .title {
+	font-size: 1.2em;
+	display: block;
+	margin-bottom: 15px;
+}
+
+.configBox .icon {
+	float: left;
+	margin: 4px 7px 0px 0px;
+}
+
+.configBox .content {
+	display: flex;
+	margin-left: 25px;
+}
+
+.configBox .content input {
+	flex-grow: 1;
+}
+
+.configBox .content button {
+	margin-top: -3px;
+}
+
+</style>

From 336e51bd1de8b4471c44a7afbe0eddb450e9c9a4 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Tue, 17 Nov 2020 13:32:15 +0100
Subject: [PATCH 05/21] fix toggle sidebar

---
 src/components/Main.vue    | 13 +++++++++----
 src/components/Sidebar.vue |  7 ++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/components/Main.vue b/src/components/Main.vue
index 5752541..f1e26b0 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -36,7 +36,8 @@
 		</AppContent>
 		<Sidebar
 			:show-sidebar="showSidebar"
-			:sidebar-station="sidebarStation" />
+			:sidebar-station="sidebarStation"
+			@toggleSidebar="toggleSidebar" />
 	</Content>
 </template>
 
@@ -332,9 +333,13 @@ export default {
 				})
 		},
 
-		toggleSidebar(station) {
-			this.showSidebar = true
-			this.sidebarStation = station
+		toggleSidebar(station = null) {
+			if (station) {
+				this.showSidebar = true
+				this.sidebarStation = station
+			} else {
+				this.showSidebar = false
+			}
 		},
 	},
 }
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index f775ca8..9300ba5 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -5,7 +5,7 @@
 		:subtitle="stationTags"
 		:background="sidebarStation.favicon"
 		class="has-preview"
-		@close="showSidebar=false">
+		@close="toggleSidebar">
 		<div class="configBox">
 			<span class="icon icon-link" />
 			<span class="title">
@@ -90,6 +90,11 @@ export default {
 			return ''
 		},
 	},
+	methods: {
+		toggleSidebar(station) {
+			this.$emit('toggleSidebar')
+		},
+	},
 }
 </script>
 

From 2d68c459706fb5c08bc35cbba3f0dd0f14ebe158 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Tue, 17 Nov 2020 13:46:48 +0100
Subject: [PATCH 06/21] fix add favorite and add to recent on certain pages

---
 src/components/Main.vue   | 16 ++++++++++++++--
 src/components/Player.vue |  2 ++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/Main.vue b/src/components/Main.vue
index f1e26b0..c862409 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -135,10 +135,16 @@ export default {
 				}
 			} else {
 				try {
+					let stationSrc = ''
+					if (!station.url_resolved) {
+						stationSrc = station.urlresolved
+					} else {
+						stationSrc = station.url_resolved
+					}
 					const stationMap = {
 						id: -1,
 						name: station.name,
-						urlresolved: station.url_resolved,
+						urlresolved: stationSrc,
 						favicon: station.favicon,
 						stationuuid: station.stationuuid,
 					}
@@ -205,10 +211,16 @@ export default {
 
 			/* Put into recent stations */
 			try {
+				let stationSrc = ''
+				if (!station.url_resolved) {
+					stationSrc = station.urlresolved
+				} else {
+					stationSrc = station.url_resolved
+				}
 				const stationMap = {
 					id: -1,
 					name: station.name,
-					urlresolved: station.url_resolved,
+					urlresolved: stationSrc,
 					favicon: station.favicon,
 					stationuuid: station.stationuuid,
 				}
diff --git a/src/components/Player.vue b/src/components/Player.vue
index 8f1e528..20509ea 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -24,6 +24,8 @@
 			@change="saveVolume($event)">
 		<div class="playerMetadata">
 			{{ player.title }}
+			{{ player.isPlaying }}
+			{{ player.isBuffering }}
 		</div>
 	</div>
 </template>

From ac8c6e31be02025ea055de9b715fb07307f9a624 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Tue, 17 Nov 2020 14:33:27 +0100
Subject: [PATCH 07/21] catch more errors, fix errors

---
 src/components/Main.vue   | 89 ++++++++++++++++++++++-----------------
 src/components/Player.vue |  2 -
 2 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/src/components/Main.vue b/src/components/Main.vue
index c862409..3c96c56 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -71,7 +71,7 @@ export default {
 		tableData: [],
 		pageLoading: false,
 		blurHashes: require('../assets/blurHashes.json'),
-		favorites: null,
+		favorites: [],
 		showSidebar: false,
 		sidebarStation: [],
 	}),
@@ -164,8 +164,10 @@ export default {
 			 * @param {Object} station Station object
 			 */
 		async doPlay(station) {
-
 			const vm = this
+
+			vm.$store.dispatch('isBuffering', true)
+
 			if (audioPlayer !== null) {
 				audioPlayer.fade(vm.player.volume, 0, 500)
 			}
@@ -180,6 +182,7 @@ export default {
 			Howler.unload()
 			audioPlayer = new Howl({
 				src: stationSrc,
+				html5: true,
 				volume: vm.player.volume,
 				/* onfade() { // FIXME
 					if (this.volume() === 0) {
@@ -187,6 +190,7 @@ export default {
 					}
 				}, */
 				onplay() {
+					console.log('onplay')
 					vm.$store.dispatch('isPlaying', true)
 					vm.$store.dispatch('isBuffering', false)
 				},
@@ -194,12 +198,13 @@ export default {
 					vm.$store.dispatch('isPlaying', false)
 					vm.$store.dispatch('isBuffering', false)
 				},
-				onload() {
-					vm.$store.dispatch('isPlaying', true)
+				onend() {
+					showError(t('radio', 'Lost connection to radio station, retrying ...'))
+					vm.$store.dispatch('isPlaying', false)
 					vm.$store.dispatch('isBuffering', true)
 				},
-				onstop() {
-					vm.$store.dispatch('isPlaying', false)
+				onloaderror() {
+					showError(t('radio', 'Unable to reach and play radio station'))
 					vm.$store.dispatch('isBuffering', false)
 				},
 			})
@@ -207,7 +212,11 @@ export default {
 			audioPlayer.fade(0, vm.player.volume, 500)
 
 			/* Count click */
-			axios.get(this.$apiUrl + '/json/url/' + station.stationuuid)
+			try {
+				axios.get(this.$apiUrl + '/json/url/' + station.stationuuid)
+			} catch (error) {
+				showError(t('radio', 'Unable to count play on remote API'))
+			}
 
 			/* Put into recent stations */
 			try {
@@ -232,10 +241,6 @@ export default {
 
 		},
 
-		/**
-		 * Fetching radio stations using Radio-Browser.info API
-			 * @param {String} menuState Entries to load
-		 */
 		async loadStations(menuState = 'TOP') {
 
 			const vm = this
@@ -290,26 +295,30 @@ export default {
 				queryURI = generateUrl('/apps/radio/api/recent')
 			}
 
-			await axios.get(queryURI, {
-				params: {
-					limit: 20,
-					order: sortBy,
-					reverse: true,
-					offset: vm.tableData.length,
-				},
-			})
-				.then(function(response) {
-					for (let i = 0; i < response.data.length; i++) {
-						const obj = response.data[i]
-						let blurHash = vm.blurHashes[obj.stationuuid]
-						if (!blurHash) {
-							blurHash = 'L1TSUA?bj[?b~qfQfQj[ayfQfQfQ'
-						}
-						response.data[i].blurHash = blurHash
-					}
-					vm.tableData = vm.tableData.concat(response.data)
-					vm.pageLoading = false
+			try {
+				await axios.get(queryURI, {
+					params: {
+						limit: 20,
+						order: sortBy,
+						reverse: true,
+						offset: vm.tableData.length,
+					},
 				})
+					.then(function(response) {
+						for (let i = 0; i < response.data.length; i++) {
+							const obj = response.data[i]
+							let blurHash = vm.blurHashes[obj.stationuuid]
+							if (!blurHash) {
+								blurHash = 'L1TSUA?bj[?b~qfQfQj[ayfQfQfQ'
+							}
+							response.data[i].blurHash = blurHash
+						}
+						vm.tableData = vm.tableData.concat(response.data)
+						vm.pageLoading = false
+					})
+			} catch (error) {
+				showError(t('radio', 'Could not fetch stations from remote API'))
+			}
 		},
 
 		/**
@@ -335,14 +344,18 @@ export default {
 
 		async loadFavorites() {
 			const vm = this
-			await axios.get(generateUrl('/apps/radio/api/favorites'))
-				.then(function(response) {
-					const favorites = []
-					for (let i = 0, len = response.data.length; i < len; i++) {
-						favorites.push([response.data[i].id, response.data[i].stationuuid])
-					}
-					vm.favorites = favorites
-				})
+			try {
+				await axios.get(generateUrl('/apps/radio/api/favorites'))
+					.then(function(response) {
+						const favorites = []
+						for (let i = 0, len = response.data.length; i < len; i++) {
+							favorites.push([response.data[i].id, response.data[i].stationuuid])
+						}
+						vm.favorites = favorites
+					})
+			} catch (error) {
+				showError(t('radio', 'Unable to load favorites'))
+			}
 		},
 
 		toggleSidebar(station = null) {
diff --git a/src/components/Player.vue b/src/components/Player.vue
index 20509ea..8f1e528 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -24,8 +24,6 @@
 			@change="saveVolume($event)">
 		<div class="playerMetadata">
 			{{ player.title }}
-			{{ player.isPlaying }}
-			{{ player.isBuffering }}
 		</div>
 	</div>
 </template>

From 02de2c652d00fb76540fb107a0d3dad54c06bb42 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 18 Nov 2020 14:21:33 +0100
Subject: [PATCH 08/21] further work on dashboard

---
 css/dashboard.css             |   4 +-
 lib/Dashboard/RadioWidget.php |  13 +-
 package-lock.json             |  61 +++++++++
 package.json                  |   2 +
 src/components/Dashboard.vue  | 245 ++++++++++++++++++++++++++++++++++
 src/components/Table.vue      |   9 +-
 src/dashboard.js              |  19 +++
 src/main.js                   |   5 +-
 webpack.js                    |  22 +--
 9 files changed, 349 insertions(+), 31 deletions(-)
 create mode 100644 src/components/Dashboard.vue
 create mode 100644 src/dashboard.js

diff --git a/css/dashboard.css b/css/dashboard.css
index 4e0568b..5fbcfce 100644
--- a/css/dashboard.css
+++ b/css/dashboard.css
@@ -1,7 +1,7 @@
-.icon-mail {
+.icon-radio {
 	background-image: url(./../img/radio-trans.svg);
 }
 
-body.theme--dark .icon-mail {
+body.theme--dark .icon-radio {
 	background-image: url(./../img/radio.svg);
 }
diff --git a/lib/Dashboard/RadioWidget.php b/lib/Dashboard/RadioWidget.php
index 9c5bca8..d7023f0 100644
--- a/lib/Dashboard/RadioWidget.php
+++ b/lib/Dashboard/RadioWidget.php
@@ -4,6 +4,8 @@ namespace OCA\Radio\Dashboard;
 
 use OCP\Dashboard\IWidget;
 use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\Util;
 
 use OCA\Radio\AppInfo\Application;
 
@@ -22,14 +24,14 @@ class RadioWidget implements IWidget {
 	 * @inheritDoc
 	 */
 	public function getId(): string {
-		return 'radio';
+		return Application::APP_ID;
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	public function getTitle(): string {
-        return $this->l10n->t('Favorite Radio stations');
+        return $this->l10n->t('Radio stations');
         }
 
 	/**
@@ -50,14 +52,15 @@ class RadioWidget implements IWidget {
 	 * @inheritDoc
 	 */
 	public function getUrl(): ?string {
-		return \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => 'connected-accounts']);
+		return \OC::$server->getURLGenerator()->linkToRoute('radio.page.index');
+		// return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('radio.page.index'));
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	public function load(): void {
-        \OC_Util::addScript(Application::APP_ID, Application::APP_ID . '-dashboard');
-        \OC_Util::addStyle(Application::APP_ID, 'dashboard');
+        Util::addScript(Application::APP_ID, 'dashboard');
+        Util::addStyle(Application::APP_ID, 'dashboard');
     }
 }
diff --git a/package-lock.json b/package-lock.json
index 42d6616..734af25 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2568,6 +2568,47 @@
 				"node-gettext": "^3.0.0"
 			}
 		},
+		"@nextcloud/moment": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/moment/-/moment-1.1.1.tgz",
+			"integrity": "sha512-lh7Xn9Ver12pLfE0rpjxE6x/ipscAV+7fw1u+7TJak1QR1T1UDRMZ9dA7z77W8mZH2C3yveTh/VEHZIflKBrng==",
+			"requires": {
+				"@nextcloud/l10n": "1.2.0",
+				"core-js": "3.6.4",
+				"jed": "^1.1.1",
+				"moment": "2.24.0",
+				"node-gettext": "^2.0.0"
+			},
+			"dependencies": {
+				"@nextcloud/l10n": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/@nextcloud/l10n/-/l10n-1.2.0.tgz",
+					"integrity": "sha512-aPsVAewCYMNe2h0yse3Fj7LofvnvFPimojw24K47ip1+I1gawMIsQL+BYAnN8wzlcbsDTEc7I1FxtOh+8dHHIA==",
+					"requires": {
+						"core-js": "^3.6.4",
+						"node-gettext": "^3.0.0"
+					},
+					"dependencies": {
+						"node-gettext": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/node-gettext/-/node-gettext-3.0.0.tgz",
+							"integrity": "sha512-/VRYibXmVoN6tnSAY2JWhNRhWYJ8Cd844jrZU/DwLVoI4vBI6ceYbd8i42sYZ9uOgDH3S7vslIKOWV/ZrT2YBA==",
+							"requires": {
+								"lodash.get": "^4.4.2"
+							}
+						}
+					}
+				},
+				"node-gettext": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/node-gettext/-/node-gettext-2.1.0.tgz",
+					"integrity": "sha512-vsHImHl+Py0vB7M2UXcFEJ5NJ3950gcja45YclBFtYxYeZiqdfQdcu+G9s4L7jpRFSh/J/7VoS3upR4JM1nS+g==",
+					"requires": {
+						"lodash.get": "^4.4.2"
+					}
+				}
+			}
+		},
 		"@nextcloud/router": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/@nextcloud/router/-/router-1.2.0.tgz",
@@ -2630,6 +2671,16 @@
 				}
 			}
 		},
+		"@nextcloud/vue-dashboard": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/vue-dashboard/-/vue-dashboard-1.0.1.tgz",
+			"integrity": "sha512-QKOf0qm4UYobuC3djLYwICSuj29H6xnm24IHetc0AMsrfhwPNN1/CC5IWEl1uKCCvwI0NA02HXCVFLtUErlgyg==",
+			"requires": {
+				"@nextcloud/vue": "^2.3.0",
+				"core-js": "^3.6.4",
+				"vue": "^2.6.11"
+			}
+		},
 		"@nextcloud/webpack-vue-config": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-1.1.0.tgz",
@@ -7179,6 +7230,11 @@
 			"integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
 			"dev": true
 		},
+		"jed": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/jed/-/jed-1.1.1.tgz",
+			"integrity": "sha1-elSbvZ/+FYWwzQoZHiAwVb7ldLQ="
+		},
 		"js-base64": {
 			"version": "2.6.2",
 			"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.2.tgz",
@@ -7908,6 +7964,11 @@
 				"minimist": "^1.2.5"
 			}
 		},
+		"moment": {
+			"version": "2.24.0",
+			"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+			"integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+		},
 		"move-concurrently": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index ef69d8f..971bc88 100644
--- a/package.json
+++ b/package.json
@@ -33,8 +33,10 @@
 		"@nextcloud/axios": "^1.4.0",
 		"@nextcloud/dialogs": "^3.0.0",
 		"@nextcloud/l10n": "^1.4.1",
+		"@nextcloud/moment": "^1.1.1",
 		"@nextcloud/router": "^1.2.0",
 		"@nextcloud/vue": "^2.7.0",
+		"@nextcloud/vue-dashboard": "^1.0.1",
 		"howler": "^2.2.1",
 		"music-metadata": "^7.4.1",
 		"vue": "^2.6.12",
diff --git a/src/components/Dashboard.vue b/src/components/Dashboard.vue
new file mode 100644
index 0000000..c6bab86
--- /dev/null
+++ b/src/components/Dashboard.vue
@@ -0,0 +1,245 @@
+<template>
+	<DashboardWidget :items="items"
+		:show-more-url="showMoreUrl"
+		:show-more-text="title"
+		:loading="state === 'loading'">
+		<template #empty-content>
+			<EmptyContent
+				v-if="emptyContentMessage"
+				:icon="emptyContentIcon">
+				<template #desc>
+					{{ emptyContentMessage }}
+					<div v-if="state === 'no-token' || state === 'error'" class="connect-button">
+						<a class="button" :href="settingsUrl">
+							{{ t('integration_twitter', 'Connect to Twitter') }}
+						</a>
+					</div>
+				</template>
+			</EmptyContent>
+		</template>
+	</DashboardWidget>
+</template>
+
+<script>
+import axios from '@nextcloud/axios'
+import { generateUrl, imagePath } from '@nextcloud/router'
+import { showError } from '@nextcloud/dialogs'
+import moment from '@nextcloud/moment'
+import { DashboardWidget } from '@nextcloud/vue-dashboard'
+import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent'
+
+export default {
+	name: 'Dashboard',
+
+	components: {
+		DashboardWidget, EmptyContent,
+	},
+
+	props: {
+		title: {
+			type: String,
+			required: true,
+		},
+	},
+
+	data() {
+		return {
+			notifications: [],
+			showMoreUrl: 'https://twitter.com/notifications',
+			// lastDate could be computed but we want to keep the value when first notification is removed
+			// to avoid getting it again on next request
+			lastDate: null,
+			loop: null,
+			state: 'loading',
+			settingsUrl: generateUrl('/settings/user/connected-accounts#twitter_prefs'),
+			darkThemeColor: OCA.Accessibility.theme === 'dark' ? 'ffffff' : '000000',
+		}
+	},
+
+	computed: {
+		items() {
+			// get rid of follow request counts
+			let items = this.notifications.filter((n) => {
+				return (!['follow_request'].includes(n.type))
+			})
+
+			// if we have follow requests, show them in first
+			if (this.followRequestItem && this.followRequestItem.number > 0) {
+				items.unshift(this.followRequestItem)
+			}
+
+			// then filter out unnecessary private messages
+			const privMsgAuthorIds = []
+			items = items.filter((n) => {
+				if (n.type !== 'message') {
+					return true
+				} else if (privMsgAuthorIds.includes(n.sender_screen_name)) {
+					return false
+				} else {
+					privMsgAuthorIds.push(n.sender_screen_name)
+					return true
+				}
+			})
+
+			return items.map((n) => {
+				return {
+					id: n.id,
+					targetUrl: this.getNotificationTarget(n),
+					avatarUrl: this.getUserAvatarUrl(n),
+					avatarUsername: this.getAvatarText(n),
+					overlayIconUrl: this.getNotificationTypeImage(n),
+					mainText: this.getMainText(n),
+					subText: this.getSubline(n),
+				}
+			})
+		},
+		followRequestItem() {
+			// find the last follow request notif
+			return this.notifications.find((n) => {
+				return n.type === 'follow_request'
+			})
+		},
+		lastMoment() {
+			return moment(this.lastDate)
+		},
+		emptyContentMessage() {
+			if (this.state === 'no-token') {
+				return t('radio', 'No Twitter account connected')
+			} else if (this.state === 'error') {
+				return t('radio', 'Error connecting to Twitter')
+			} else if (this.state === 'ok') {
+				return t('radio', 'No Twitter notifications!')
+			}
+			return ''
+		},
+		emptyContentIcon() {
+			if (this.state === 'no-token') {
+				return 'icon-radio'
+			} else if (this.state === 'error') {
+				return 'icon-close'
+			} else if (this.state === 'ok') {
+				return 'icon-checkmark'
+			}
+			return 'icon-checkmark'
+		},
+	},
+
+	beforeMount() {
+		this.fetchNotifications()
+		this.loop = setInterval(() => this.fetchNotifications(), 120000)
+	},
+
+	mounted() {
+	},
+
+	methods: {
+		fetchNotifications() {
+			const req = {}
+			if (this.lastDate) {
+				req.params = {
+					since: this.lastDate,
+				}
+			}
+			axios.get(generateUrl('/apps/radio/favorites'), req).then((response) => {
+				this.processNotifications(response.data)
+				this.state = 'ok'
+			}).catch((error) => {
+				clearInterval(this.loop)
+				if (error.response && error.response.status === 400) {
+					this.state = 'no-token'
+				} else if (error.response && error.response.status === 401) {
+					showError(t('integration_twitter', 'Failed to get Twitter notifications'))
+					this.state = 'error'
+				} else {
+					// there was an error in notif processing
+					console.debug(error)
+				}
+			})
+		},
+		processNotifications(newNotifications) {
+			if (this.lastDate) {
+				// just add those which are more recent than our most recent one
+				let i = 0
+				while (i < newNotifications.length && this.lastDate < newNotifications[i].timestamp) {
+					i++
+				}
+				if (i > 0) {
+					const toAdd = this.filter(newNotifications.slice(0, i))
+					this.notifications = toAdd.concat(this.notifications)
+				}
+			} else {
+				// first time we don't check the date
+				this.notifications = this.filter(newNotifications)
+			}
+			// update lastDate manually (explained in data)
+			const nbNotif = this.notifications.length
+			this.lastDate = (nbNotif > 0) ? this.notifications[0].timestamp : null
+		},
+		filter(notifications) {
+			return notifications
+		},
+		getUserAvatarUrl(n) {
+			return (n.profile_image_url_https && n.sender_id_str)
+				? generateUrl('/apps/integration_twitter/avatar?') + encodeURIComponent('userId') + '=' + encodeURIComponent(n.sender_id_str)
+				: n.type === 'follow_request'
+					? imagePath('integration_twitter', 'twitter.png')
+					: ''
+		},
+		getAvatarText(n) {
+			if (['follow_request'].includes(n.type)) {
+				return '!'
+			}
+			return ''
+		},
+		getNotificationTarget(n) {
+			if (['retweet', 'mention'].includes(n.type)) {
+				return 'https://twitter.com/' + n.sender_screen_name + '/status/' + n.id_str
+			} else if (['message'].includes(n.type)) {
+				return 'https://twitter.com/messages'
+			} else if (['follow_request'].includes(n.type)) {
+				return 'https://twitter.com/follower_requests'
+			}
+			return ''
+		},
+		getMainText(n) {
+			if (['follow_request'].includes(n.type)) {
+				return t('integration_twitter', '{nb} follow requests', { nb: n.number })
+			} else if (['retweet', 'mention'].includes(n.type)) {
+				let text = n.text
+				while (text.startsWith('@')) {
+					text = text.replace(/^@[^\s]*\s?/, '')
+				}
+				return text
+			}
+			return n.text
+		},
+		getSubline(n) {
+			if (['follow_request'].includes(n.type)) {
+				return t('integration_twitter', 'System')
+			}
+			return '@' + n.sender_screen_name
+		},
+		getNotificationTypeImage(n) {
+			if (n.type === 'mention') {
+				return generateUrl('/svg/integration_twitter/arobase?color=ffffff')
+			} else if (n.type === 'message') {
+				return generateUrl('/svg/integration_twitter/message?color=ffffff')
+			} else if (n.type === 'retweet') {
+				return generateUrl('/svg/integration_twitter/retweet?color=ffffff')
+			} else if (n.type === 'follow_request') {
+				return generateUrl('/svg/integration_twitter/follow_request?color=ffffff')
+			}
+			return ''
+		},
+		getFormattedDate(n) {
+			return moment(n.timestamp).format('LLL')
+		},
+	},
+}
+</script>
+
+<style scoped lang="scss">
+::v-deep .connect-button {
+	margin-top: 10px;
+}
+</style>
diff --git a/src/components/Table.vue b/src/components/Table.vue
index 1867228..cbba36c 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -178,10 +178,15 @@ table {
 			padding-right: 0px;
 		}
 
+		td.nameColumn {
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			padding-right: 0px;
+		}
+
 		td.nameColumn .innernametext {
 			color: var(--color-main-text);
-			text-overflow: ellipsis;
-			overflow: hidden;
 			position: relative;
 			vertical-align: top;
 			user-select: none;
diff --git a/src/dashboard.js b/src/dashboard.js
new file mode 100644
index 0000000..d1dbab4
--- /dev/null
+++ b/src/dashboard.js
@@ -0,0 +1,19 @@
+import Vue from 'vue'
+import { translate, translatePlural } from '@nextcloud/l10n'
+import Dashboard from './components/Dashboard'
+
+Vue.prototype.t = translate
+Vue.prototype.n = translatePlural
+Vue.prototype.OC = window.OC
+Vue.prototype.OCA = window.OCA
+
+document.addEventListener('DOMContentLoaded', function() {
+
+	OCA.Dashboard.register('radio', (el, { widget }) => {
+		const View = Vue.extend(Dashboard)
+		new View({
+			propsData: { title: widget.title },
+		}).$mount(el)
+	})
+
+})
diff --git a/src/main.js b/src/main.js
index ceca8c7..0eee982 100644
--- a/src/main.js
+++ b/src/main.js
@@ -27,13 +27,16 @@ import { translate, translatePlural } from '@nextcloud/l10n'
 
 import App from './App'
 
+import './dashboard'
+
 import VueBlurHash from 'vue-blurhash'
 
 import 'vue-blurhash/dist/vue-blurhash.css'
 
 Vue.prototype.t = translate
 Vue.prototype.n = translatePlural
-
+Vue.prototype.OC = window.OC
+Vue.prototype.OCA = window.OCA
 Vue.prototype.$apiUrl = 'https://de1.api.radio-browser.info'
 
 Vue.use(VueBlurHash)
diff --git a/webpack.js b/webpack.js
index 8e37c6e..e5daa92 100644
--- a/webpack.js
+++ b/webpack.js
@@ -1,23 +1,3 @@
-const { merge } = require('webpack-merge')
 const webpackConfig = require('@nextcloud/webpack-vue-config')
 
-const config = {
-	module: {
-		rules: [
-			{
-				test: /\.(png|jpg|gif)$/,
-				loader: 'file-loader',
-				options: {
-					name: '[name].[ext]?[hash]',
-				},
-			},
-		],
-	},
-}
-
-const mergedConfigs = merge(config, webpackConfig)
-
-// Remove duplicate rules by the `test` key
-mergedConfigs.module.rules = mergedConfigs.module.rules.filter((v, i, a) => a.findIndex(t => (t.test.toString() === v.test.toString())) === i)
-
-module.exports = mergedConfigs
+module.exports = webpackConfig

From c7d21c74d83075d97b3bb89144c84ee4380175d8 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 19 Nov 2020 10:01:55 +0100
Subject: [PATCH 09/21] fix dashboard widget

---
 lib/Dashboard/RadioWidget.php |  16 +--
 src/components/Dashboard.vue  | 177 ++++------------------------------
 src/dashboard.js              |  26 +++--
 src/main.js                   |   2 -
 webpack.js                    |  23 ++++-
 5 files changed, 62 insertions(+), 182 deletions(-)

diff --git a/lib/Dashboard/RadioWidget.php b/lib/Dashboard/RadioWidget.php
index d7023f0..b47d8af 100644
--- a/lib/Dashboard/RadioWidget.php
+++ b/lib/Dashboard/RadioWidget.php
@@ -14,10 +14,15 @@ class RadioWidget implements IWidget {
 	/** @var IL10N */
 	private $l10n;
 
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
 	public function __construct(
-		IL10N $l10n
+		IL10N $l10n,
+		IURLGenerator $urlGenerator
 	) {
 		$this->l10n = $l10n;
+		$this->urlGenerator = $urlGenerator;
 	}
 
 	/**
@@ -52,15 +57,14 @@ class RadioWidget implements IWidget {
 	 * @inheritDoc
 	 */
 	public function getUrl(): ?string {
-		return \OC::$server->getURLGenerator()->linkToRoute('radio.page.index');
-		// return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('radio.page.index'));
+		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('radio.page.index'));
 	}
 
 	/**
 	 * @inheritDoc
 	 */
 	public function load(): void {
-        Util::addScript(Application::APP_ID, 'dashboard');
-        Util::addStyle(Application::APP_ID, 'dashboard');
-    }
+  	Util::addScript(Application::APP_ID, 'radio-dashboard');
+    Util::addStyle(Application::APP_ID, 'dashboard');
+	}
 }
diff --git a/src/components/Dashboard.vue b/src/components/Dashboard.vue
index c6bab86..2421aef 100644
--- a/src/components/Dashboard.vue
+++ b/src/components/Dashboard.vue
@@ -9,11 +9,6 @@
 				:icon="emptyContentIcon">
 				<template #desc>
 					{{ emptyContentMessage }}
-					<div v-if="state === 'no-token' || state === 'error'" class="connect-button">
-						<a class="button" :href="settingsUrl">
-							{{ t('integration_twitter', 'Connect to Twitter') }}
-						</a>
-					</div>
 				</template>
 			</EmptyContent>
 		</template>
@@ -22,9 +17,8 @@
 
 <script>
 import axios from '@nextcloud/axios'
-import { generateUrl, imagePath } from '@nextcloud/router'
+import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
-import moment from '@nextcloud/moment'
 import { DashboardWidget } from '@nextcloud/vue-dashboard'
 import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent'
 
@@ -32,90 +26,49 @@ export default {
 	name: 'Dashboard',
 
 	components: {
-		DashboardWidget, EmptyContent,
+		DashboardWidget,
+		EmptyContent,
 	},
 
 	props: {
 		title: {
 			type: String,
-			required: true,
+			required: false,
+			default: 'radio',
 		},
 	},
 
 	data() {
 		return {
 			notifications: [],
-			showMoreUrl: 'https://twitter.com/notifications',
-			// lastDate could be computed but we want to keep the value when first notification is removed
-			// to avoid getting it again on next request
-			lastDate: null,
-			loop: null,
+			showMoreUrl: generateUrl('/apps/radio/api/favorites'),
 			state: 'loading',
-			settingsUrl: generateUrl('/settings/user/connected-accounts#twitter_prefs'),
 			darkThemeColor: OCA.Accessibility.theme === 'dark' ? 'ffffff' : '000000',
 		}
 	},
 
 	computed: {
 		items() {
-			// get rid of follow request counts
-			let items = this.notifications.filter((n) => {
-				return (!['follow_request'].includes(n.type))
-			})
-
-			// if we have follow requests, show them in first
-			if (this.followRequestItem && this.followRequestItem.number > 0) {
-				items.unshift(this.followRequestItem)
-			}
-
-			// then filter out unnecessary private messages
-			const privMsgAuthorIds = []
-			items = items.filter((n) => {
-				if (n.type !== 'message') {
-					return true
-				} else if (privMsgAuthorIds.includes(n.sender_screen_name)) {
-					return false
-				} else {
-					privMsgAuthorIds.push(n.sender_screen_name)
-					return true
-				}
-			})
-
-			return items.map((n) => {
+			return this.notifications.map((n) => {
 				return {
 					id: n.id,
-					targetUrl: this.getNotificationTarget(n),
-					avatarUrl: this.getUserAvatarUrl(n),
-					avatarUsername: this.getAvatarText(n),
-					overlayIconUrl: this.getNotificationTypeImage(n),
-					mainText: this.getMainText(n),
-					subText: this.getSubline(n),
+					targetUrl: generateUrl('/apps/radio/api/favorites'),
+					avatarUrl: n.favicon,
+					mainText: n.name,
+					subText: n.tags,
 				}
 			})
 		},
-		followRequestItem() {
-			// find the last follow request notif
-			return this.notifications.find((n) => {
-				return n.type === 'follow_request'
-			})
-		},
-		lastMoment() {
-			return moment(this.lastDate)
-		},
 		emptyContentMessage() {
-			if (this.state === 'no-token') {
-				return t('radio', 'No Twitter account connected')
-			} else if (this.state === 'error') {
-				return t('radio', 'Error connecting to Twitter')
+			if (this.state === 'error') {
+				return t('radio', 'Error fetching favorite stations')
 			} else if (this.state === 'ok') {
-				return t('radio', 'No Twitter notifications!')
+				return t('radio', 'No favorites added yet!')
 			}
 			return ''
 		},
 		emptyContentIcon() {
-			if (this.state === 'no-token') {
-				return 'icon-radio'
-			} else if (this.state === 'error') {
+			if (this.state === 'error') {
 				return 'icon-close'
 			} else if (this.state === 'ok') {
 				return 'icon-checkmark'
@@ -126,29 +79,18 @@ export default {
 
 	beforeMount() {
 		this.fetchNotifications()
-		this.loop = setInterval(() => this.fetchNotifications(), 120000)
-	},
-
-	mounted() {
 	},
 
 	methods: {
 		fetchNotifications() {
 			const req = {}
-			if (this.lastDate) {
-				req.params = {
-					since: this.lastDate,
-				}
-			}
-			axios.get(generateUrl('/apps/radio/favorites'), req).then((response) => {
+			axios.get(generateUrl('/apps/radio/api/favorites'), req).then((response) => {
 				this.processNotifications(response.data)
 				this.state = 'ok'
 			}).catch((error) => {
 				clearInterval(this.loop)
-				if (error.response && error.response.status === 400) {
-					this.state = 'no-token'
-				} else if (error.response && error.response.status === 401) {
-					showError(t('integration_twitter', 'Failed to get Twitter notifications'))
+				if (error.response && error.response.status === 401) {
+					showError(t('radio', 'Failed to fetch favorite radio stations'))
 					this.state = 'error'
 				} else {
 					// there was an error in notif processing
@@ -157,89 +99,8 @@ export default {
 			})
 		},
 		processNotifications(newNotifications) {
-			if (this.lastDate) {
-				// just add those which are more recent than our most recent one
-				let i = 0
-				while (i < newNotifications.length && this.lastDate < newNotifications[i].timestamp) {
-					i++
-				}
-				if (i > 0) {
-					const toAdd = this.filter(newNotifications.slice(0, i))
-					this.notifications = toAdd.concat(this.notifications)
-				}
-			} else {
-				// first time we don't check the date
-				this.notifications = this.filter(newNotifications)
-			}
-			// update lastDate manually (explained in data)
-			const nbNotif = this.notifications.length
-			this.lastDate = (nbNotif > 0) ? this.notifications[0].timestamp : null
-		},
-		filter(notifications) {
-			return notifications
-		},
-		getUserAvatarUrl(n) {
-			return (n.profile_image_url_https && n.sender_id_str)
-				? generateUrl('/apps/integration_twitter/avatar?') + encodeURIComponent('userId') + '=' + encodeURIComponent(n.sender_id_str)
-				: n.type === 'follow_request'
-					? imagePath('integration_twitter', 'twitter.png')
-					: ''
-		},
-		getAvatarText(n) {
-			if (['follow_request'].includes(n.type)) {
-				return '!'
-			}
-			return ''
-		},
-		getNotificationTarget(n) {
-			if (['retweet', 'mention'].includes(n.type)) {
-				return 'https://twitter.com/' + n.sender_screen_name + '/status/' + n.id_str
-			} else if (['message'].includes(n.type)) {
-				return 'https://twitter.com/messages'
-			} else if (['follow_request'].includes(n.type)) {
-				return 'https://twitter.com/follower_requests'
-			}
-			return ''
-		},
-		getMainText(n) {
-			if (['follow_request'].includes(n.type)) {
-				return t('integration_twitter', '{nb} follow requests', { nb: n.number })
-			} else if (['retweet', 'mention'].includes(n.type)) {
-				let text = n.text
-				while (text.startsWith('@')) {
-					text = text.replace(/^@[^\s]*\s?/, '')
-				}
-				return text
-			}
-			return n.text
-		},
-		getSubline(n) {
-			if (['follow_request'].includes(n.type)) {
-				return t('integration_twitter', 'System')
-			}
-			return '@' + n.sender_screen_name
-		},
-		getNotificationTypeImage(n) {
-			if (n.type === 'mention') {
-				return generateUrl('/svg/integration_twitter/arobase?color=ffffff')
-			} else if (n.type === 'message') {
-				return generateUrl('/svg/integration_twitter/message?color=ffffff')
-			} else if (n.type === 'retweet') {
-				return generateUrl('/svg/integration_twitter/retweet?color=ffffff')
-			} else if (n.type === 'follow_request') {
-				return generateUrl('/svg/integration_twitter/follow_request?color=ffffff')
-			}
-			return ''
-		},
-		getFormattedDate(n) {
-			return moment(n.timestamp).format('LLL')
+			this.notifications = newNotifications
 		},
 	},
 }
 </script>
-
-<style scoped lang="scss">
-::v-deep .connect-button {
-	margin-top: 10px;
-}
-</style>
diff --git a/src/dashboard.js b/src/dashboard.js
index d1dbab4..29ea55b 100644
--- a/src/dashboard.js
+++ b/src/dashboard.js
@@ -1,19 +1,15 @@
 import Vue from 'vue'
-import { translate, translatePlural } from '@nextcloud/l10n'
-import Dashboard from './components/Dashboard'
+import router from './router'
+import store from './store'
+import Dashboard from './components/Dashboard.vue'
 
-Vue.prototype.t = translate
-Vue.prototype.n = translatePlural
-Vue.prototype.OC = window.OC
-Vue.prototype.OCA = window.OCA
-
-document.addEventListener('DOMContentLoaded', function() {
-
-	OCA.Dashboard.register('radio', (el, { widget }) => {
-		const View = Vue.extend(Dashboard)
-		new View({
-			propsData: { title: widget.title },
-		}).$mount(el)
+document.addEventListener('DOMContentLoaded', () => {
+	OCA.Dashboard.register('radio', (el) => {
+		global.Radio = new Vue({
+			el,
+			store,
+			router,
+			render: h => h(Dashboard),
+		})
 	})
-
 })
diff --git a/src/main.js b/src/main.js
index 0eee982..7331165 100644
--- a/src/main.js
+++ b/src/main.js
@@ -27,8 +27,6 @@ import { translate, translatePlural } from '@nextcloud/l10n'
 
 import App from './App'
 
-import './dashboard'
-
 import VueBlurHash from 'vue-blurhash'
 
 import 'vue-blurhash/dist/vue-blurhash.css'
diff --git a/webpack.js b/webpack.js
index e5daa92..f1726a2 100644
--- a/webpack.js
+++ b/webpack.js
@@ -1,3 +1,24 @@
+const { merge } = require('webpack-merge')
+const path = require('path')
 const webpackConfig = require('@nextcloud/webpack-vue-config')
 
-module.exports = webpackConfig
+const config = {
+	entry: {
+		dashboard: path.join(__dirname, 'src', 'dashboard.js'),
+	},
+	module: {
+		rules: [
+			{
+				test: /\.vue$/,
+				loader: 'vue-loader',
+			},
+		],
+	},
+}
+
+const mergedConfigs = merge(config, webpackConfig)
+
+// Remove duplicate rules by the `test` key
+mergedConfigs.module.rules = mergedConfigs.module.rules.filter((v, i, a) => a.findIndex(t => (t.test.toString() === v.test.toString())) === i)
+
+module.exports = mergedConfigs

From 00253d43ce60003ed5976b28b244a9214249ab36 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 19 Nov 2020 10:16:00 +0100
Subject: [PATCH 10/21] sidebar: fix copy link to clipboard

---
 package-lock.json            | 41 ++++++++++++++++++++++++++++++++++++
 package.json                 |  1 +
 src/components/Dashboard.vue |  4 ++--
 src/components/Sidebar.vue   | 22 +++++++++++++++++--
 src/main.js                  |  2 ++
 5 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 734af25..0ef7d65 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4183,6 +4183,16 @@
 			"integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
 			"dev": true
 		},
+		"clipboard": {
+			"version": "2.0.6",
+			"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz",
+			"integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==",
+			"requires": {
+				"good-listener": "^1.2.2",
+				"select": "^1.1.2",
+				"tiny-emitter": "^2.0.0"
+			}
+		},
 		"cliui": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -4787,6 +4797,11 @@
 			"integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
 			"dev": true
 		},
+		"delegate": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+			"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+		},
 		"delegates": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
@@ -6509,6 +6524,14 @@
 				"minimist": "^1.2.5"
 			}
 		},
+		"good-listener": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+			"integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
+			"requires": {
+				"delegate": "^3.1.2"
+			}
+		},
 		"graceful-fs": {
 			"version": "4.2.3",
 			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
@@ -9531,6 +9554,11 @@
 				}
 			}
 		},
+		"select": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+			"integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
+		},
 		"semver": {
 			"version": "5.7.1",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -10812,6 +10840,11 @@
 				"setimmediate": "^1.0.4"
 			}
 		},
+		"tiny-emitter": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+			"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+		},
 		"tinycolor2": {
 			"version": "1.4.2",
 			"resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz",
@@ -11328,6 +11361,14 @@
 			"resolved": "https://registry.npmjs.org/vue-blurhash/-/vue-blurhash-0.1.2.tgz",
 			"integrity": "sha512-VfIiQW2+F1HsJktumGsEwCsp0CYLdnmTcCA3nMvZ8Bze8bkpp9tonIygzBnjUKN0WZyOxb22i9QQ+lqgngjedA=="
 		},
+		"vue-clipboard2": {
+			"version": "0.3.1",
+			"resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.1.tgz",
+			"integrity": "sha512-H5S/agEDj0kXjUb5GP2c0hCzIXWRBygaWLN3NEFsaI9I3uWin778SFEMt8QRXiPG+7anyjqWiw2lqcxWUSfkYg==",
+			"requires": {
+				"clipboard": "^2.0.0"
+			}
+		},
 		"vue-color": {
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/vue-color/-/vue-color-2.7.1.tgz",
diff --git a/package.json b/package.json
index 971bc88..b0ae78a 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
 		"music-metadata": "^7.4.1",
 		"vue": "^2.6.12",
 		"vue-blurhash": "^0.1.2",
+		"vue-clipboard2": "^0.3.1",
 		"vue-router": "^3.4.7",
 		"vuex": "^3.5.1"
 	},
diff --git a/src/components/Dashboard.vue b/src/components/Dashboard.vue
index 2421aef..d2c4667 100644
--- a/src/components/Dashboard.vue
+++ b/src/components/Dashboard.vue
@@ -41,7 +41,7 @@ export default {
 	data() {
 		return {
 			notifications: [],
-			showMoreUrl: generateUrl('/apps/radio/api/favorites'),
+			showMoreUrl: generateUrl('/apps/radio/#/favorites'),
 			state: 'loading',
 			darkThemeColor: OCA.Accessibility.theme === 'dark' ? 'ffffff' : '000000',
 		}
@@ -52,7 +52,7 @@ export default {
 			return this.notifications.map((n) => {
 				return {
 					id: n.id,
-					targetUrl: generateUrl('/apps/radio/api/favorites'),
+					targetUrl: generateUrl('/apps/radio/#/favorites'),
 					avatarUrl: n.favicon,
 					mainText: n.name,
 					subText: n.tags,
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 9300ba5..f838ccd 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -12,9 +12,9 @@
 				Stream URL
 			</span>
 			<div class="content">
-				<input type="text" :value="sidebarStation.url_resolved" disabled="disabled">
+				<input type="text" :value="urlResolved" disabled="disabled">
 				<Actions>
-					<ActionButton icon="icon-clippy" @click="copyLink( { url: shareUrl(share) })">
+					<ActionButton icon="icon-clippy" @click="copyLink">
 						{{ t('radio', 'Copy link to clipboard') }}
 					</ActionButton>
 				</Actions>
@@ -64,6 +64,7 @@
 import AppSidebar from '@nextcloud/vue/dist/Components/AppSidebar'
 import Actions from '@nextcloud/vue/dist/Components/Actions'
 import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+import { showError, showSuccess } from '@nextcloud/dialogs'
 
 export default {
 	name: 'Sidebar',
@@ -83,6 +84,13 @@ export default {
 		},
 	},
 	computed: {
+		urlResolved() {
+			if (this.sidebarStation.url_resolved) {
+				return this.sidebarStation.url_resolved
+			} else {
+				return this.sidebarStation.urlresolved
+			}
+		},
 		stationTags() {
 			if (this.sidebarStation.tags) {
 				return this.sidebarStation.tags.replaceAll(',', ', ')
@@ -94,6 +102,16 @@ export default {
 		toggleSidebar(station) {
 			this.$emit('toggleSidebar')
 		},
+		copyLink() {
+			this.$copyText(this.urlResolved).then(
+				function() {
+					showSuccess(t('radio', 'Link copied to clipboard'))
+				},
+				function() {
+					showError(t('radio', 'Error while copying link to clipboard'))
+				}
+			)
+		},
 	},
 }
 </script>
diff --git a/src/main.js b/src/main.js
index 7331165..d688f64 100644
--- a/src/main.js
+++ b/src/main.js
@@ -28,6 +28,7 @@ import { translate, translatePlural } from '@nextcloud/l10n'
 import App from './App'
 
 import VueBlurHash from 'vue-blurhash'
+import VueClipboard from 'vue-clipboard2'
 
 import 'vue-blurhash/dist/vue-blurhash.css'
 
@@ -37,6 +38,7 @@ Vue.prototype.OC = window.OC
 Vue.prototype.OCA = window.OCA
 Vue.prototype.$apiUrl = 'https://de1.api.radio-browser.info'
 
+Vue.use(VueClipboard)
 Vue.use(VueBlurHash)
 
 export default new Vue({

From 8fed9b6c6620ff2fd032663fd8af3416747bc59e Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 19 Nov 2020 10:43:57 +0100
Subject: [PATCH 11/21] fix empty content recent page

---
 src/components/Main.vue | 58 +++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/components/Main.vue b/src/components/Main.vue
index 3c96c56..1334946 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -13,26 +13,14 @@
 			<EmptyContent
 				v-if="pageLoading"
 				icon="icon-loading" />
-			<template
-				v-if="tableData.length === 0 && !pageLoading">
-				<EmptyContent
-					v-show="$route.name==='FAVORITES'"
-					icon="icon-star">
-					No favorites yet
-					<template #desc>
-						Stations you mark as favorite will show up here
-					</template>
-				</EmptyContent>
-				<EmptyContent
-					v-if="tableData.length === 0 && !pageLoading"
-					v-show="$route.name==='SEARCH'"
-					icon="icon-search">
-					No search results
-					<template #desc>
-						No stations were found matching your search term
-					</template>
-				</EmptyContent>
-			</template>
+			<EmptyContent
+				v-if="tableData.length === 0 && !pageLoading"
+				:icon="emptyContentIcon">
+				{{ emptyContentMessage }}
+				<template #desc>
+					{{ emptyContentDesc }}
+				</template>
+			</EmptyContent>
 		</AppContent>
 		<Sidebar
 			:show-sidebar="showSidebar"
@@ -79,6 +67,36 @@ export default {
 		player() {
 			return this.$store.state.player
 		},
+		emptyContentMessage() {
+			if (this.$route.name === 'FAVORITES') {
+				return 'No favorites yet'
+			} else if (this.$route.name === 'RECENT') {
+				return 'No recent stations yet'
+			} else if (this.$route.name === 'SEARCH') {
+				return 'No search results'
+			}
+			return 'No stations here'
+		},
+		emptyContentIcon() {
+			if (this.$route.name === 'FAVORITES') {
+				return 'icon-star'
+			} else if (this.$route.name === 'RECENT') {
+				return 'icon-recent'
+			} else if (this.$route.name === 'SEARCH') {
+				return 'icon-search'
+			}
+			return 'icon-radio'
+		},
+		emptyContentDesc() {
+			if (this.$route.name === 'FAVORITES') {
+				return 'Stations you mark as favorite will show up here'
+			} else if (this.$route.name === 'RECENT') {
+				return 'Stations you recently played will show up here'
+			} else if (this.$route.name === 'SEARCH') {
+				return 'No stations were found matching your search term'
+			}
+			return 'No stations here'
+		},
 	},
 	watch: {
 		$route: 'onRoute',

From ff3a7454414c42117f2ef503c6b58b9772e2106f Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 19 Nov 2020 11:06:44 +0100
Subject: [PATCH 12/21] update npm

---
 package-lock.json | 2795 +++++++++++++++++++++------------------------
 package.json      |   35 +-
 2 files changed, 1350 insertions(+), 1480 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0ef7d65..8151682 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,28 +31,23 @@
 			}
 		},
 		"@babel/compat-data": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
-			"integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
-			"requires": {
-				"browserslist": "^4.12.0",
-				"invariant": "^2.2.4",
-				"semver": "^5.5.0"
-			}
+			"version": "7.12.5",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz",
+			"integrity": "sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg=="
 		},
 		"@babel/core": {
-			"version": "7.11.6",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz",
-			"integrity": "sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==",
+			"version": "7.12.3",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz",
+			"integrity": "sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==",
 			"requires": {
 				"@babel/code-frame": "^7.10.4",
-				"@babel/generator": "^7.11.6",
-				"@babel/helper-module-transforms": "^7.11.0",
-				"@babel/helpers": "^7.10.4",
-				"@babel/parser": "^7.11.5",
+				"@babel/generator": "^7.12.1",
+				"@babel/helper-module-transforms": "^7.12.1",
+				"@babel/helpers": "^7.12.1",
+				"@babel/parser": "^7.12.3",
 				"@babel/template": "^7.10.4",
-				"@babel/traverse": "^7.11.5",
-				"@babel/types": "^7.11.5",
+				"@babel/traverse": "^7.12.1",
+				"@babel/types": "^7.12.1",
 				"convert-source-map": "^1.7.0",
 				"debug": "^4.1.0",
 				"gensync": "^1.0.0-beta.1",
@@ -72,11 +67,11 @@
 					}
 				},
 				"@babel/generator": {
-					"version": "7.11.6",
-					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-					"integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+					"integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
 					"requires": {
-						"@babel/types": "^7.11.5",
+						"@babel/types": "^7.12.5",
 						"jsesc": "^2.5.1",
 						"source-map": "^0.5.0"
 					}
@@ -118,9 +113,9 @@
 					}
 				},
 				"@babel/parser": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-					"integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+					"integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="
 				},
 				"@babel/template": {
 					"version": "7.10.4",
@@ -133,25 +128,25 @@
 					}
 				},
 				"@babel/traverse": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-					"integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+					"integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
 					"requires": {
 						"@babel/code-frame": "^7.10.4",
-						"@babel/generator": "^7.11.5",
+						"@babel/generator": "^7.12.5",
 						"@babel/helper-function-name": "^7.10.4",
 						"@babel/helper-split-export-declaration": "^7.11.0",
-						"@babel/parser": "^7.11.5",
-						"@babel/types": "^7.11.5",
+						"@babel/parser": "^7.12.5",
+						"@babel/types": "^7.12.5",
 						"debug": "^4.1.0",
 						"globals": "^11.1.0",
 						"lodash": "^4.17.19"
 					}
 				},
 				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
 						"lodash": "^4.17.19",
@@ -181,9 +176,9 @@
 			},
 			"dependencies": {
 				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
 						"lodash": "^4.17.19",
@@ -202,9 +197,9 @@
 			},
 			"dependencies": {
 				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
 						"lodash": "^4.17.19",
@@ -214,27 +209,25 @@
 			}
 		},
 		"@babel/helper-compilation-targets": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
-			"integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
+			"version": "7.12.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz",
+			"integrity": "sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==",
 			"requires": {
-				"@babel/compat-data": "^7.10.4",
-				"browserslist": "^4.12.0",
-				"invariant": "^2.2.4",
-				"levenary": "^1.1.1",
+				"@babel/compat-data": "^7.12.5",
+				"@babel/helper-validator-option": "^7.12.1",
+				"browserslist": "^4.14.5",
 				"semver": "^5.5.0"
 			}
 		},
 		"@babel/helper-create-class-features-plugin": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz",
-			"integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz",
+			"integrity": "sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==",
 			"requires": {
 				"@babel/helper-function-name": "^7.10.4",
-				"@babel/helper-member-expression-to-functions": "^7.10.5",
+				"@babel/helper-member-expression-to-functions": "^7.12.1",
 				"@babel/helper-optimise-call-expression": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-replace-supers": "^7.10.4",
+				"@babel/helper-replace-supers": "^7.12.1",
 				"@babel/helper-split-export-declaration": "^7.10.4"
 			},
 			"dependencies": {
@@ -264,25 +257,12 @@
 						"@babel/types": "^7.10.4"
 					}
 				},
-				"@babel/helper-member-expression-to-functions": {
-					"version": "7.10.5",
-					"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.5.tgz",
-					"integrity": "sha512-HiqJpYD5+WopCXIAbQDG0zye5XYVvcO9w/DHp5GsaGkRUaamLj2bEtu6i8rnGGprAhHM3qidCMgp71HF4endhA==",
-					"requires": {
-						"@babel/types": "^7.10.5"
-					}
-				},
-				"@babel/helper-plugin-utils": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-					"integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
-				},
 				"@babel/helper-split-export-declaration": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz",
-					"integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==",
+					"version": "7.11.0",
+					"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+					"integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
 					"requires": {
-						"@babel/types": "^7.10.4"
+						"@babel/types": "^7.11.0"
 					}
 				},
 				"@babel/highlight": {
@@ -296,9 +276,9 @@
 					}
 				},
 				"@babel/parser": {
-					"version": "7.10.5",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.5.tgz",
-					"integrity": "sha512-wfryxy4bE1UivvQKSQDU4/X6dr+i8bctjUjj8Zyt3DQy7NtPizJXT8M52nqpNKL+nq2PW8lxk4ZqLj0fD4B4hQ=="
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+					"integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="
 				},
 				"@babel/template": {
 					"version": "7.10.4",
@@ -311,9 +291,9 @@
 					}
 				},
 				"@babel/types": {
-					"version": "7.10.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.5.tgz",
-					"integrity": "sha512-ixV66KWfCI6GKoA/2H9v6bQdbfXEwwpOdQ8cRvb4F+eyvhlaHxWFMQB4+3d9QFJXZsiiiqVrewNV0DFEQpyT4Q==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
 						"lodash": "^4.17.19",
@@ -323,13 +303,13 @@
 			}
 		},
 		"@babel/helper-create-regexp-features-plugin": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
-			"integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz",
+			"integrity": "sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==",
 			"requires": {
 				"@babel/helper-annotate-as-pure": "^7.10.4",
 				"@babel/helper-regex": "^7.10.4",
-				"regexpu-core": "^4.7.0"
+				"regexpu-core": "^4.7.1"
 			}
 		},
 		"@babel/helper-define-map": {
@@ -379,9 +359,9 @@
 					}
 				},
 				"@babel/parser": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-					"integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+					"integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="
 				},
 				"@babel/template": {
 					"version": "7.10.4",
@@ -394,9 +374,9 @@
 					}
 				},
 				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
 						"lodash": "^4.17.19",
@@ -406,17 +386,17 @@
 			}
 		},
 		"@babel/helper-explode-assignable-expression": {
-			"version": "7.11.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
-			"integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz",
+			"integrity": "sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==",
 			"requires": {
-				"@babel/types": "^7.10.4"
+				"@babel/types": "^7.12.1"
 			},
 			"dependencies": {
 				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
 						"lodash": "^4.17.19",
@@ -454,9 +434,9 @@
 			},
 			"dependencies": {
 				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
 						"lodash": "^4.17.19",
@@ -466,211 +446,60 @@
 			}
 		},
 		"@babel/helper-member-expression-to-functions": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.4.tgz",
-			"integrity": "sha512-m5j85pK/KZhuSdM/8cHUABQTAslV47OjfIB9Cc7P+PvlAoBzdb79BGNfw8RhT5Mq3p+xGd0ZfAKixbrUZx0C7A==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
+			"integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
 			"requires": {
-				"@babel/types": "^7.10.4"
+				"@babel/types": "^7.12.1"
 			},
 			"dependencies": {
 				"@babel/types": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
-					"integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
-						"lodash": "^4.17.13",
+						"lodash": "^4.17.19",
 						"to-fast-properties": "^2.0.0"
 					}
 				}
 			}
 		},
 		"@babel/helper-module-imports": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-			"integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+			"version": "7.12.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
+			"integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
 			"requires": {
-				"@babel/types": "^7.10.4"
+				"@babel/types": "^7.12.5"
 			},
 			"dependencies": {
 				"@babel/types": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
-					"integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
-						"lodash": "^4.17.13",
+						"lodash": "^4.17.19",
 						"to-fast-properties": "^2.0.0"
 					}
 				}
 			}
 		},
 		"@babel/helper-module-transforms": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-			"integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz",
+			"integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==",
 			"requires": {
-				"@babel/helper-module-imports": "^7.10.4",
-				"@babel/helper-replace-supers": "^7.10.4",
-				"@babel/helper-simple-access": "^7.10.4",
+				"@babel/helper-module-imports": "^7.12.1",
+				"@babel/helper-replace-supers": "^7.12.1",
+				"@babel/helper-simple-access": "^7.12.1",
 				"@babel/helper-split-export-declaration": "^7.11.0",
+				"@babel/helper-validator-identifier": "^7.10.4",
 				"@babel/template": "^7.10.4",
-				"@babel/types": "^7.11.0",
+				"@babel/traverse": "^7.12.1",
+				"@babel/types": "^7.12.1",
 				"lodash": "^4.17.19"
 			},
-			"dependencies": {
-				"@babel/code-frame": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-					"integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-					"requires": {
-						"@babel/highlight": "^7.10.4"
-					}
-				},
-				"@babel/helper-split-export-declaration": {
-					"version": "7.11.0",
-					"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-					"integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-					"requires": {
-						"@babel/types": "^7.11.0"
-					}
-				},
-				"@babel/highlight": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-					"integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-					"requires": {
-						"@babel/helper-validator-identifier": "^7.10.4",
-						"chalk": "^2.0.0",
-						"js-tokens": "^4.0.0"
-					}
-				},
-				"@babel/parser": {
-					"version": "7.11.0",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.0.tgz",
-					"integrity": "sha512-qvRvi4oI8xii8NllyEc4MDJjuZiNaRzyb7Y7lup1NqJV8TZHF4O27CcP+72WPn/k1zkgJ6WJfnIbk4jTsVAZHw=="
-				},
-				"@babel/template": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-					"integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-					"requires": {
-						"@babel/code-frame": "^7.10.4",
-						"@babel/parser": "^7.10.4",
-						"@babel/types": "^7.10.4"
-					}
-				},
-				"@babel/types": {
-					"version": "7.11.0",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-					"integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-					"requires": {
-						"@babel/helper-validator-identifier": "^7.10.4",
-						"lodash": "^4.17.19",
-						"to-fast-properties": "^2.0.0"
-					}
-				}
-			}
-		},
-		"@babel/helper-optimise-call-expression": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
-			"integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
-			"requires": {
-				"@babel/types": "^7.10.4"
-			},
-			"dependencies": {
-				"@babel/types": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
-					"integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
-					"requires": {
-						"@babel/helper-validator-identifier": "^7.10.4",
-						"lodash": "^4.17.13",
-						"to-fast-properties": "^2.0.0"
-					}
-				}
-			}
-		},
-		"@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=="
-		},
-		"@babel/helper-regex": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
-			"integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
-			"requires": {
-				"lodash": "^4.17.19"
-			}
-		},
-		"@babel/helper-remap-async-to-generator": {
-			"version": "7.11.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
-			"integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.10.4",
-				"@babel/helper-wrap-function": "^7.10.4",
-				"@babel/template": "^7.10.4",
-				"@babel/types": "^7.10.4"
-			},
-			"dependencies": {
-				"@babel/code-frame": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-					"integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-					"requires": {
-						"@babel/highlight": "^7.10.4"
-					}
-				},
-				"@babel/highlight": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-					"integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-					"requires": {
-						"@babel/helper-validator-identifier": "^7.10.4",
-						"chalk": "^2.0.0",
-						"js-tokens": "^4.0.0"
-					}
-				},
-				"@babel/parser": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-					"integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
-				},
-				"@babel/template": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-					"integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-					"requires": {
-						"@babel/code-frame": "^7.10.4",
-						"@babel/parser": "^7.10.4",
-						"@babel/types": "^7.10.4"
-					}
-				},
-				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
-					"requires": {
-						"@babel/helper-validator-identifier": "^7.10.4",
-						"lodash": "^4.17.19",
-						"to-fast-properties": "^2.0.0"
-					}
-				}
-			}
-		},
-		"@babel/helper-replace-supers": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-			"integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
-			"requires": {
-				"@babel/helper-member-expression-to-functions": "^7.10.4",
-				"@babel/helper-optimise-call-expression": "^7.10.4",
-				"@babel/traverse": "^7.10.4",
-				"@babel/types": "^7.10.4"
-			},
 			"dependencies": {
 				"@babel/code-frame": {
 					"version": "7.10.4",
@@ -681,13 +510,12 @@
 					}
 				},
 				"@babel/generator": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.4.tgz",
-					"integrity": "sha512-toLIHUIAgcQygFZRAQcsLQV3CBuX6yOIru1kJk/qqqvcRmZrYe6WavZTSG+bB8MxhnL9YPf+pKQfuiP161q7ng==",
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+					"integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
 					"requires": {
-						"@babel/types": "^7.10.4",
+						"@babel/types": "^7.12.5",
 						"jsesc": "^2.5.1",
-						"lodash": "^4.17.13",
 						"source-map": "^0.5.0"
 					}
 				},
@@ -710,11 +538,11 @@
 					}
 				},
 				"@babel/helper-split-export-declaration": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz",
-					"integrity": "sha512-pySBTeoUff56fL5CBU2hWm9TesA4r/rOkI9DyJLvvgz09MB9YtfIYe3iBriVaYNaPe+Alua0vBIOVOLs2buWhg==",
+					"version": "7.11.0",
+					"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+					"integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
 					"requires": {
-						"@babel/types": "^7.10.4"
+						"@babel/types": "^7.11.0"
 					}
 				},
 				"@babel/highlight": {
@@ -728,9 +556,9 @@
 					}
 				},
 				"@babel/parser": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz",
-					"integrity": "sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA=="
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+					"integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="
 				},
 				"@babel/template": {
 					"version": "7.10.4",
@@ -743,54 +571,98 @@
 					}
 				},
 				"@babel/traverse": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.4.tgz",
-					"integrity": "sha512-aSy7p5THgSYm4YyxNGz6jZpXf+Ok40QF3aA2LyIONkDHpAcJzDUqlCKXv6peqYUs2gmic849C/t2HKw2a2K20Q==",
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+					"integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
 					"requires": {
 						"@babel/code-frame": "^7.10.4",
-						"@babel/generator": "^7.10.4",
+						"@babel/generator": "^7.12.5",
 						"@babel/helper-function-name": "^7.10.4",
-						"@babel/helper-split-export-declaration": "^7.10.4",
-						"@babel/parser": "^7.10.4",
-						"@babel/types": "^7.10.4",
+						"@babel/helper-split-export-declaration": "^7.11.0",
+						"@babel/parser": "^7.12.5",
+						"@babel/types": "^7.12.5",
 						"debug": "^4.1.0",
 						"globals": "^11.1.0",
-						"lodash": "^4.17.13"
+						"lodash": "^4.17.19"
 					}
 				},
 				"@babel/types": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
-					"integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
-						"lodash": "^4.17.13",
+						"lodash": "^4.17.19",
 						"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==",
-					"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=="
 				}
 			}
 		},
-		"@babel/helper-simple-access": {
+		"@babel/helper-optimise-call-expression": {
 			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-			"integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
+			"integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
 			"requires": {
-				"@babel/template": "^7.10.4",
 				"@babel/types": "^7.10.4"
 			},
+			"dependencies": {
+				"@babel/types": {
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
+					"requires": {
+						"@babel/helper-validator-identifier": "^7.10.4",
+						"lodash": "^4.17.19",
+						"to-fast-properties": "^2.0.0"
+					}
+				}
+			}
+		},
+		"@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=="
+		},
+		"@babel/helper-regex": {
+			"version": "7.10.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
+			"integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
+			"requires": {
+				"lodash": "^4.17.19"
+			}
+		},
+		"@babel/helper-remap-async-to-generator": {
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz",
+			"integrity": "sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==",
+			"requires": {
+				"@babel/helper-annotate-as-pure": "^7.10.4",
+				"@babel/helper-wrap-function": "^7.10.4",
+				"@babel/types": "^7.12.1"
+			},
+			"dependencies": {
+				"@babel/types": {
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
+					"requires": {
+						"@babel/helper-validator-identifier": "^7.10.4",
+						"lodash": "^4.17.19",
+						"to-fast-properties": "^2.0.0"
+					}
+				}
+			}
+		},
+		"@babel/helper-replace-supers": {
+			"version": "7.12.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+			"integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
+			"requires": {
+				"@babel/helper-member-expression-to-functions": "^7.12.1",
+				"@babel/helper-optimise-call-expression": "^7.10.4",
+				"@babel/traverse": "^7.12.5",
+				"@babel/types": "^7.12.5"
+			},
 			"dependencies": {
 				"@babel/code-frame": {
 					"version": "7.10.4",
@@ -800,6 +672,42 @@
 						"@babel/highlight": "^7.10.4"
 					}
 				},
+				"@babel/generator": {
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+					"integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
+					"requires": {
+						"@babel/types": "^7.12.5",
+						"jsesc": "^2.5.1",
+						"source-map": "^0.5.0"
+					}
+				},
+				"@babel/helper-function-name": {
+					"version": "7.10.4",
+					"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+					"integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+					"requires": {
+						"@babel/helper-get-function-arity": "^7.10.4",
+						"@babel/template": "^7.10.4",
+						"@babel/types": "^7.10.4"
+					}
+				},
+				"@babel/helper-get-function-arity": {
+					"version": "7.10.4",
+					"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+					"integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+					"requires": {
+						"@babel/types": "^7.10.4"
+					}
+				},
+				"@babel/helper-split-export-declaration": {
+					"version": "7.11.0",
+					"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+					"integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+					"requires": {
+						"@babel/types": "^7.11.0"
+					}
+				},
 				"@babel/highlight": {
 					"version": "7.10.4",
 					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
@@ -811,9 +719,9 @@
 					}
 				},
 				"@babel/parser": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.4.tgz",
-					"integrity": "sha512-8jHII4hf+YVDsskTF6WuMB3X4Eh+PsUkC2ljq22so5rHvH+T8BzyL94VOdyFLNR8tBSVXOTbNHOKpR4TfRxVtA=="
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+					"integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="
 				},
 				"@babel/template": {
 					"version": "7.10.4",
@@ -825,30 +733,66 @@
 						"@babel/types": "^7.10.4"
 					}
 				},
+				"@babel/traverse": {
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+					"integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
+					"requires": {
+						"@babel/code-frame": "^7.10.4",
+						"@babel/generator": "^7.12.5",
+						"@babel/helper-function-name": "^7.10.4",
+						"@babel/helper-split-export-declaration": "^7.11.0",
+						"@babel/parser": "^7.12.5",
+						"@babel/types": "^7.12.5",
+						"debug": "^4.1.0",
+						"globals": "^11.1.0",
+						"lodash": "^4.17.19"
+					}
+				},
 				"@babel/types": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.4.tgz",
-					"integrity": "sha512-UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
-						"lodash": "^4.17.13",
+						"lodash": "^4.17.19",
+						"to-fast-properties": "^2.0.0"
+					}
+				}
+			}
+		},
+		"@babel/helper-simple-access": {
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz",
+			"integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==",
+			"requires": {
+				"@babel/types": "^7.12.1"
+			},
+			"dependencies": {
+				"@babel/types": {
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
+					"requires": {
+						"@babel/helper-validator-identifier": "^7.10.4",
+						"lodash": "^4.17.19",
 						"to-fast-properties": "^2.0.0"
 					}
 				}
 			}
 		},
 		"@babel/helper-skip-transparent-expression-wrappers": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
-			"integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
+			"integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
 			"requires": {
-				"@babel/types": "^7.11.0"
+				"@babel/types": "^7.12.1"
 			},
 			"dependencies": {
 				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
 						"lodash": "^4.17.19",
@@ -871,10 +815,15 @@
 			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
 			"integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw=="
 		},
+		"@babel/helper-validator-option": {
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz",
+			"integrity": "sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A=="
+		},
 		"@babel/helper-wrap-function": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
-			"integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+			"version": "7.12.3",
+			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz",
+			"integrity": "sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==",
 			"requires": {
 				"@babel/helper-function-name": "^7.10.4",
 				"@babel/template": "^7.10.4",
@@ -891,136 +840,11 @@
 					}
 				},
 				"@babel/generator": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.5.tgz",
-					"integrity": "sha512-9UqHWJ4IwRTy4l0o8gq2ef8ws8UPzvtMkVKjTLAiRmza9p9V6Z+OfuNd9fB1j5Q67F+dVJtPC2sZXI8NM9br4g==",
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+					"integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
 					"requires": {
-						"@babel/types": "^7.11.5",
-						"jsesc": "^2.5.1",
-						"source-map": "^0.6.1"
-					}
-				},
-				"@babel/helper-function-name": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-					"integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-					"requires": {
-						"@babel/helper-get-function-arity": "^7.10.4",
-						"@babel/template": "^7.10.4",
-						"@babel/types": "^7.10.4"
-					}
-				},
-				"@babel/helper-get-function-arity": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-					"integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-					"requires": {
-						"@babel/types": "^7.10.4"
-					}
-				},
-				"@babel/helper-split-export-declaration": {
-					"version": "7.11.0",
-					"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-					"integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-					"requires": {
-						"@babel/types": "^7.11.0"
-					}
-				},
-				"@babel/highlight": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-					"integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-					"requires": {
-						"@babel/helper-validator-identifier": "^7.10.4",
-						"chalk": "^2.0.0",
-						"js-tokens": "^4.0.0"
-					}
-				},
-				"@babel/parser": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-					"integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
-				},
-				"@babel/template": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-					"integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-					"requires": {
-						"@babel/code-frame": "^7.10.4",
-						"@babel/parser": "^7.10.4",
-						"@babel/types": "^7.10.4"
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-					"integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
-					"requires": {
-						"@babel/code-frame": "^7.10.4",
-						"@babel/generator": "^7.11.5",
-						"@babel/helper-function-name": "^7.10.4",
-						"@babel/helper-split-export-declaration": "^7.11.0",
-						"@babel/parser": "^7.11.5",
-						"@babel/types": "^7.11.5",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0",
-						"lodash": "^4.17.19"
-					}
-				},
-				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
-					"requires": {
-						"@babel/helper-validator-identifier": "^7.10.4",
-						"lodash": "^4.17.19",
-						"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==",
-					"requires": {
-						"ms": "^2.1.1"
-					}
-				},
-				"ms": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-				},
-				"source-map": {
-					"version": "0.6.1",
-					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-					"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-				}
-			}
-		},
-		"@babel/helpers": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
-			"integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
-			"requires": {
-				"@babel/template": "^7.10.4",
-				"@babel/traverse": "^7.10.4",
-				"@babel/types": "^7.10.4"
-			},
-			"dependencies": {
-				"@babel/code-frame": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-					"integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-					"requires": {
-						"@babel/highlight": "^7.10.4"
-					}
-				},
-				"@babel/generator": {
-					"version": "7.11.6",
-					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-					"integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
-					"requires": {
-						"@babel/types": "^7.11.5",
+						"@babel/types": "^7.12.5",
 						"jsesc": "^2.5.1",
 						"source-map": "^0.5.0"
 					}
@@ -1062,9 +886,9 @@
 					}
 				},
 				"@babel/parser": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-					"integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+					"integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="
 				},
 				"@babel/template": {
 					"version": "7.10.4",
@@ -1077,25 +901,132 @@
 					}
 				},
 				"@babel/traverse": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-					"integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+					"integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
 					"requires": {
 						"@babel/code-frame": "^7.10.4",
-						"@babel/generator": "^7.11.5",
+						"@babel/generator": "^7.12.5",
 						"@babel/helper-function-name": "^7.10.4",
 						"@babel/helper-split-export-declaration": "^7.11.0",
-						"@babel/parser": "^7.11.5",
-						"@babel/types": "^7.11.5",
+						"@babel/parser": "^7.12.5",
+						"@babel/types": "^7.12.5",
 						"debug": "^4.1.0",
 						"globals": "^11.1.0",
 						"lodash": "^4.17.19"
 					}
 				},
 				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
+					"requires": {
+						"@babel/helper-validator-identifier": "^7.10.4",
+						"lodash": "^4.17.19",
+						"to-fast-properties": "^2.0.0"
+					}
+				}
+			}
+		},
+		"@babel/helpers": {
+			"version": "7.12.5",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz",
+			"integrity": "sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==",
+			"requires": {
+				"@babel/template": "^7.10.4",
+				"@babel/traverse": "^7.12.5",
+				"@babel/types": "^7.12.5"
+			},
+			"dependencies": {
+				"@babel/code-frame": {
+					"version": "7.10.4",
+					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+					"integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+					"requires": {
+						"@babel/highlight": "^7.10.4"
+					}
+				},
+				"@babel/generator": {
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+					"integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
+					"requires": {
+						"@babel/types": "^7.12.5",
+						"jsesc": "^2.5.1",
+						"source-map": "^0.5.0"
+					}
+				},
+				"@babel/helper-function-name": {
+					"version": "7.10.4",
+					"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
+					"integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+					"requires": {
+						"@babel/helper-get-function-arity": "^7.10.4",
+						"@babel/template": "^7.10.4",
+						"@babel/types": "^7.10.4"
+					}
+				},
+				"@babel/helper-get-function-arity": {
+					"version": "7.10.4",
+					"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
+					"integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+					"requires": {
+						"@babel/types": "^7.10.4"
+					}
+				},
+				"@babel/helper-split-export-declaration": {
+					"version": "7.11.0",
+					"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
+					"integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+					"requires": {
+						"@babel/types": "^7.11.0"
+					}
+				},
+				"@babel/highlight": {
+					"version": "7.10.4",
+					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
+					"integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
+					"requires": {
+						"@babel/helper-validator-identifier": "^7.10.4",
+						"chalk": "^2.0.0",
+						"js-tokens": "^4.0.0"
+					}
+				},
+				"@babel/parser": {
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+					"integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="
+				},
+				"@babel/template": {
+					"version": "7.10.4",
+					"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
+					"integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+					"requires": {
+						"@babel/code-frame": "^7.10.4",
+						"@babel/parser": "^7.10.4",
+						"@babel/types": "^7.10.4"
+					}
+				},
+				"@babel/traverse": {
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+					"integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
+					"requires": {
+						"@babel/code-frame": "^7.10.4",
+						"@babel/generator": "^7.12.5",
+						"@babel/helper-function-name": "^7.10.4",
+						"@babel/helper-split-export-declaration": "^7.11.0",
+						"@babel/parser": "^7.12.5",
+						"@babel/types": "^7.12.5",
+						"debug": "^4.1.0",
+						"globals": "^11.1.0",
+						"lodash": "^4.17.19"
+					}
+				},
+				"@babel/types": {
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
 						"lodash": "^4.17.19",
@@ -1122,12 +1053,12 @@
 			"dev": true
 		},
 		"@babel/plugin-proposal-async-generator-functions": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
-			"integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz",
+			"integrity": "sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-remap-async-to-generator": "^7.10.4",
+				"@babel/helper-remap-async-to-generator": "^7.12.1",
 				"@babel/plugin-syntax-async-generators": "^7.8.0"
 			},
 			"dependencies": {
@@ -1139,11 +1070,11 @@
 			}
 		},
 		"@babel/plugin-proposal-class-properties": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz",
-			"integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz",
+			"integrity": "sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==",
 			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.10.4",
+				"@babel/helper-create-class-features-plugin": "^7.12.1",
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
 			"dependencies": {
@@ -1155,9 +1086,9 @@
 			}
 		},
 		"@babel/plugin-proposal-dynamic-import": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
-			"integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz",
+			"integrity": "sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4",
 				"@babel/plugin-syntax-dynamic-import": "^7.8.0"
@@ -1171,9 +1102,9 @@
 			}
 		},
 		"@babel/plugin-proposal-export-namespace-from": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz",
-			"integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz",
+			"integrity": "sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4",
 				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
@@ -1187,9 +1118,9 @@
 			}
 		},
 		"@babel/plugin-proposal-json-strings": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
-			"integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz",
+			"integrity": "sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4",
 				"@babel/plugin-syntax-json-strings": "^7.8.0"
@@ -1203,9 +1134,9 @@
 			}
 		},
 		"@babel/plugin-proposal-logical-assignment-operators": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz",
-			"integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz",
+			"integrity": "sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4",
 				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
@@ -1219,9 +1150,9 @@
 			}
 		},
 		"@babel/plugin-proposal-nullish-coalescing-operator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
-			"integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz",
+			"integrity": "sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4",
 				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
@@ -1235,9 +1166,9 @@
 			}
 		},
 		"@babel/plugin-proposal-numeric-separator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
-			"integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
+			"version": "7.12.5",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz",
+			"integrity": "sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4",
 				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
@@ -1251,13 +1182,13 @@
 			}
 		},
 		"@babel/plugin-proposal-object-rest-spread": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
-			"integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz",
+			"integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4",
 				"@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-				"@babel/plugin-transform-parameters": "^7.10.4"
+				"@babel/plugin-transform-parameters": "^7.12.1"
 			},
 			"dependencies": {
 				"@babel/helper-plugin-utils": {
@@ -1268,9 +1199,9 @@
 			}
 		},
 		"@babel/plugin-proposal-optional-catch-binding": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
-			"integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz",
+			"integrity": "sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4",
 				"@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
@@ -1284,12 +1215,12 @@
 			}
 		},
 		"@babel/plugin-proposal-optional-chaining": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
-			"integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz",
+			"integrity": "sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
 				"@babel/plugin-syntax-optional-chaining": "^7.8.0"
 			},
 			"dependencies": {
@@ -1301,11 +1232,11 @@
 			}
 		},
 		"@babel/plugin-proposal-private-methods": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz",
-			"integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz",
+			"integrity": "sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==",
 			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.10.4",
+				"@babel/helper-create-class-features-plugin": "^7.12.1",
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
 			"dependencies": {
@@ -1317,11 +1248,11 @@
 			}
 		},
 		"@babel/plugin-proposal-unicode-property-regex": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
-			"integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz",
+			"integrity": "sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==",
 			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.10.4",
+				"@babel/helper-create-regexp-features-plugin": "^7.12.1",
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
 			"dependencies": {
@@ -1341,9 +1272,9 @@
 			}
 		},
 		"@babel/plugin-syntax-class-properties": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
-			"integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz",
+			"integrity": "sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -1442,9 +1373,9 @@
 			}
 		},
 		"@babel/plugin-syntax-top-level-await": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
-			"integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz",
+			"integrity": "sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -1472,9 +1403,9 @@
 			}
 		},
 		"@babel/plugin-transform-arrow-functions": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
-			"integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz",
+			"integrity": "sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -1487,13 +1418,13 @@
 			}
 		},
 		"@babel/plugin-transform-async-to-generator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
-			"integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz",
+			"integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==",
 			"requires": {
-				"@babel/helper-module-imports": "^7.10.4",
+				"@babel/helper-module-imports": "^7.12.1",
 				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-remap-async-to-generator": "^7.10.4"
+				"@babel/helper-remap-async-to-generator": "^7.12.1"
 			},
 			"dependencies": {
 				"@babel/helper-plugin-utils": {
@@ -1504,9 +1435,9 @@
 			}
 		},
 		"@babel/plugin-transform-block-scoped-functions": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
-			"integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz",
+			"integrity": "sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -1519,9 +1450,9 @@
 			}
 		},
 		"@babel/plugin-transform-block-scoping": {
-			"version": "7.11.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
-			"integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz",
+			"integrity": "sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -1534,16 +1465,16 @@
 			}
 		},
 		"@babel/plugin-transform-classes": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
-			"integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz",
+			"integrity": "sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==",
 			"requires": {
 				"@babel/helper-annotate-as-pure": "^7.10.4",
 				"@babel/helper-define-map": "^7.10.4",
 				"@babel/helper-function-name": "^7.10.4",
 				"@babel/helper-optimise-call-expression": "^7.10.4",
 				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-replace-supers": "^7.10.4",
+				"@babel/helper-replace-supers": "^7.12.1",
 				"@babel/helper-split-export-declaration": "^7.10.4",
 				"globals": "^11.1.0"
 			},
@@ -1598,9 +1529,9 @@
 					}
 				},
 				"@babel/parser": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-					"integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+					"integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="
 				},
 				"@babel/template": {
 					"version": "7.10.4",
@@ -1613,9 +1544,9 @@
 					}
 				},
 				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
 						"lodash": "^4.17.19",
@@ -1625,9 +1556,9 @@
 			}
 		},
 		"@babel/plugin-transform-computed-properties": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
-			"integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz",
+			"integrity": "sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -1640,9 +1571,9 @@
 			}
 		},
 		"@babel/plugin-transform-destructuring": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
-			"integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz",
+			"integrity": "sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -1655,11 +1586,11 @@
 			}
 		},
 		"@babel/plugin-transform-dotall-regex": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
-			"integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz",
+			"integrity": "sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==",
 			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.10.4",
+				"@babel/helper-create-regexp-features-plugin": "^7.12.1",
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
 			"dependencies": {
@@ -1671,9 +1602,9 @@
 			}
 		},
 		"@babel/plugin-transform-duplicate-keys": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
-			"integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz",
+			"integrity": "sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -1686,9 +1617,9 @@
 			}
 		},
 		"@babel/plugin-transform-exponentiation-operator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
-			"integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz",
+			"integrity": "sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==",
 			"requires": {
 				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
 				"@babel/helper-plugin-utils": "^7.10.4"
@@ -1702,9 +1633,9 @@
 			}
 		},
 		"@babel/plugin-transform-for-of": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
-			"integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz",
+			"integrity": "sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -1717,9 +1648,9 @@
 			}
 		},
 		"@babel/plugin-transform-function-name": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
-			"integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz",
+			"integrity": "sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==",
 			"requires": {
 				"@babel/helper-function-name": "^7.10.4",
 				"@babel/helper-plugin-utils": "^7.10.4"
@@ -1767,9 +1698,9 @@
 					}
 				},
 				"@babel/parser": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-					"integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q=="
+					"version": "7.12.5",
+					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+					"integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="
 				},
 				"@babel/template": {
 					"version": "7.10.4",
@@ -1782,9 +1713,9 @@
 					}
 				},
 				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
 						"lodash": "^4.17.19",
@@ -1794,9 +1725,9 @@
 			}
 		},
 		"@babel/plugin-transform-literals": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
-			"integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz",
+			"integrity": "sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -1809,9 +1740,9 @@
 			}
 		},
 		"@babel/plugin-transform-member-expression-literals": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
-			"integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz",
+			"integrity": "sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -1824,11 +1755,11 @@
 			}
 		},
 		"@babel/plugin-transform-modules-amd": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
-			"integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz",
+			"integrity": "sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==",
 			"requires": {
-				"@babel/helper-module-transforms": "^7.10.5",
+				"@babel/helper-module-transforms": "^7.12.1",
 				"@babel/helper-plugin-utils": "^7.10.4",
 				"babel-plugin-dynamic-import-node": "^2.3.3"
 			},
@@ -1841,13 +1772,13 @@
 			}
 		},
 		"@babel/plugin-transform-modules-commonjs": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
-			"integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz",
+			"integrity": "sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==",
 			"requires": {
-				"@babel/helper-module-transforms": "^7.10.4",
+				"@babel/helper-module-transforms": "^7.12.1",
 				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-simple-access": "^7.10.4",
+				"@babel/helper-simple-access": "^7.12.1",
 				"babel-plugin-dynamic-import-node": "^2.3.3"
 			},
 			"dependencies": {
@@ -1859,13 +1790,14 @@
 			}
 		},
 		"@babel/plugin-transform-modules-systemjs": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
-			"integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz",
+			"integrity": "sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==",
 			"requires": {
 				"@babel/helper-hoist-variables": "^7.10.4",
-				"@babel/helper-module-transforms": "^7.10.5",
+				"@babel/helper-module-transforms": "^7.12.1",
 				"@babel/helper-plugin-utils": "^7.10.4",
+				"@babel/helper-validator-identifier": "^7.10.4",
 				"babel-plugin-dynamic-import-node": "^2.3.3"
 			},
 			"dependencies": {
@@ -1877,11 +1809,11 @@
 			}
 		},
 		"@babel/plugin-transform-modules-umd": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
-			"integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz",
+			"integrity": "sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==",
 			"requires": {
-				"@babel/helper-module-transforms": "^7.10.4",
+				"@babel/helper-module-transforms": "^7.12.1",
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
 			"dependencies": {
@@ -1893,17 +1825,17 @@
 			}
 		},
 		"@babel/plugin-transform-named-capturing-groups-regex": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
-			"integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz",
+			"integrity": "sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==",
 			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.10.4"
+				"@babel/helper-create-regexp-features-plugin": "^7.12.1"
 			}
 		},
 		"@babel/plugin-transform-new-target": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
-			"integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz",
+			"integrity": "sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -1916,12 +1848,12 @@
 			}
 		},
 		"@babel/plugin-transform-object-super": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
-			"integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz",
+			"integrity": "sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-replace-supers": "^7.10.4"
+				"@babel/helper-replace-supers": "^7.12.1"
 			},
 			"dependencies": {
 				"@babel/helper-plugin-utils": {
@@ -1932,43 +1864,24 @@
 			}
 		},
 		"@babel/plugin-transform-parameters": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
-			"integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz",
+			"integrity": "sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==",
 			"requires": {
-				"@babel/helper-get-function-arity": "^7.10.4",
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
 			"dependencies": {
-				"@babel/helper-get-function-arity": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-					"integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-					"requires": {
-						"@babel/types": "^7.10.4"
-					}
-				},
 				"@babel/helper-plugin-utils": {
 					"version": "7.10.4",
 					"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
 					"integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
-				},
-				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
-					"requires": {
-						"@babel/helper-validator-identifier": "^7.10.4",
-						"lodash": "^4.17.19",
-						"to-fast-properties": "^2.0.0"
-					}
 				}
 			}
 		},
 		"@babel/plugin-transform-property-literals": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
-			"integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz",
+			"integrity": "sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -1981,17 +1894,17 @@
 			}
 		},
 		"@babel/plugin-transform-regenerator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
-			"integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz",
+			"integrity": "sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==",
 			"requires": {
 				"regenerator-transform": "^0.14.2"
 			}
 		},
 		"@babel/plugin-transform-reserved-words": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
-			"integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz",
+			"integrity": "sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -2004,9 +1917,9 @@
 			}
 		},
 		"@babel/plugin-transform-shorthand-properties": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
-			"integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz",
+			"integrity": "sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -2019,12 +1932,12 @@
 			}
 		},
 		"@babel/plugin-transform-spread": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
-			"integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz",
+			"integrity": "sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
+				"@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
 			},
 			"dependencies": {
 				"@babel/helper-plugin-utils": {
@@ -2035,9 +1948,9 @@
 			}
 		},
 		"@babel/plugin-transform-sticky-regex": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
-			"integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz",
+			"integrity": "sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4",
 				"@babel/helper-regex": "^7.10.4"
@@ -2051,11 +1964,10 @@
 			}
 		},
 		"@babel/plugin-transform-template-literals": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
-			"integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz",
+			"integrity": "sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==",
 			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.10.4",
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
 			"dependencies": {
@@ -2067,9 +1979,9 @@
 			}
 		},
 		"@babel/plugin-transform-typeof-symbol": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
-			"integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz",
+			"integrity": "sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -2091,143 +2003,17 @@
 				"@babel/plugin-syntax-typescript": "^7.12.1"
 			},
 			"dependencies": {
-				"@babel/code-frame": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-					"integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-					"requires": {
-						"@babel/highlight": "^7.10.4"
-					}
-				},
-				"@babel/generator": {
-					"version": "7.12.1",
-					"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz",
-					"integrity": "sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==",
-					"requires": {
-						"@babel/types": "^7.12.1",
-						"jsesc": "^2.5.1",
-						"source-map": "^0.5.0"
-					}
-				},
-				"@babel/helper-create-class-features-plugin": {
-					"version": "7.12.1",
-					"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz",
-					"integrity": "sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==",
-					"requires": {
-						"@babel/helper-function-name": "^7.10.4",
-						"@babel/helper-member-expression-to-functions": "^7.12.1",
-						"@babel/helper-optimise-call-expression": "^7.10.4",
-						"@babel/helper-replace-supers": "^7.12.1",
-						"@babel/helper-split-export-declaration": "^7.10.4"
-					}
-				},
-				"@babel/helper-function-name": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-					"integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
-					"requires": {
-						"@babel/helper-get-function-arity": "^7.10.4",
-						"@babel/template": "^7.10.4",
-						"@babel/types": "^7.10.4"
-					}
-				},
-				"@babel/helper-get-function-arity": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-					"integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-					"requires": {
-						"@babel/types": "^7.10.4"
-					}
-				},
-				"@babel/helper-member-expression-to-functions": {
-					"version": "7.12.1",
-					"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
-					"integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
-					"requires": {
-						"@babel/types": "^7.12.1"
-					}
-				},
 				"@babel/helper-plugin-utils": {
 					"version": "7.10.4",
 					"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
 					"integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
-				},
-				"@babel/helper-replace-supers": {
-					"version": "7.12.1",
-					"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz",
-					"integrity": "sha512-zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==",
-					"requires": {
-						"@babel/helper-member-expression-to-functions": "^7.12.1",
-						"@babel/helper-optimise-call-expression": "^7.10.4",
-						"@babel/traverse": "^7.12.1",
-						"@babel/types": "^7.12.1"
-					}
-				},
-				"@babel/helper-split-export-declaration": {
-					"version": "7.11.0",
-					"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-					"integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
-					"requires": {
-						"@babel/types": "^7.11.0"
-					}
-				},
-				"@babel/highlight": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-					"integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-					"requires": {
-						"@babel/helper-validator-identifier": "^7.10.4",
-						"chalk": "^2.0.0",
-						"js-tokens": "^4.0.0"
-					}
-				},
-				"@babel/parser": {
-					"version": "7.12.3",
-					"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz",
-					"integrity": "sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw=="
-				},
-				"@babel/template": {
-					"version": "7.10.4",
-					"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-					"integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-					"requires": {
-						"@babel/code-frame": "^7.10.4",
-						"@babel/parser": "^7.10.4",
-						"@babel/types": "^7.10.4"
-					}
-				},
-				"@babel/traverse": {
-					"version": "7.12.1",
-					"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz",
-					"integrity": "sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==",
-					"requires": {
-						"@babel/code-frame": "^7.10.4",
-						"@babel/generator": "^7.12.1",
-						"@babel/helper-function-name": "^7.10.4",
-						"@babel/helper-split-export-declaration": "^7.11.0",
-						"@babel/parser": "^7.12.1",
-						"@babel/types": "^7.12.1",
-						"debug": "^4.1.0",
-						"globals": "^11.1.0",
-						"lodash": "^4.17.19"
-					}
-				},
-				"@babel/types": {
-					"version": "7.12.1",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz",
-					"integrity": "sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==",
-					"requires": {
-						"@babel/helper-validator-identifier": "^7.10.4",
-						"lodash": "^4.17.19",
-						"to-fast-properties": "^2.0.0"
-					}
 				}
 			}
 		},
 		"@babel/plugin-transform-unicode-escapes": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz",
-			"integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz",
+			"integrity": "sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==",
 			"requires": {
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
@@ -2240,11 +2026,11 @@
 			}
 		},
 		"@babel/plugin-transform-unicode-regex": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
-			"integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz",
+			"integrity": "sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==",
 			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.10.4",
+				"@babel/helper-create-regexp-features-plugin": "^7.12.1",
 				"@babel/helper-plugin-utils": "^7.10.4"
 			},
 			"dependencies": {
@@ -2277,29 +2063,30 @@
 			}
 		},
 		"@babel/preset-env": {
-			"version": "7.11.5",
-			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz",
-			"integrity": "sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz",
+			"integrity": "sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==",
 			"requires": {
-				"@babel/compat-data": "^7.11.0",
-				"@babel/helper-compilation-targets": "^7.10.4",
-				"@babel/helper-module-imports": "^7.10.4",
+				"@babel/compat-data": "^7.12.1",
+				"@babel/helper-compilation-targets": "^7.12.1",
+				"@babel/helper-module-imports": "^7.12.1",
 				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-proposal-async-generator-functions": "^7.10.4",
-				"@babel/plugin-proposal-class-properties": "^7.10.4",
-				"@babel/plugin-proposal-dynamic-import": "^7.10.4",
-				"@babel/plugin-proposal-export-namespace-from": "^7.10.4",
-				"@babel/plugin-proposal-json-strings": "^7.10.4",
-				"@babel/plugin-proposal-logical-assignment-operators": "^7.11.0",
-				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
-				"@babel/plugin-proposal-numeric-separator": "^7.10.4",
-				"@babel/plugin-proposal-object-rest-spread": "^7.11.0",
-				"@babel/plugin-proposal-optional-catch-binding": "^7.10.4",
-				"@babel/plugin-proposal-optional-chaining": "^7.11.0",
-				"@babel/plugin-proposal-private-methods": "^7.10.4",
-				"@babel/plugin-proposal-unicode-property-regex": "^7.10.4",
+				"@babel/helper-validator-option": "^7.12.1",
+				"@babel/plugin-proposal-async-generator-functions": "^7.12.1",
+				"@babel/plugin-proposal-class-properties": "^7.12.1",
+				"@babel/plugin-proposal-dynamic-import": "^7.12.1",
+				"@babel/plugin-proposal-export-namespace-from": "^7.12.1",
+				"@babel/plugin-proposal-json-strings": "^7.12.1",
+				"@babel/plugin-proposal-logical-assignment-operators": "^7.12.1",
+				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
+				"@babel/plugin-proposal-numeric-separator": "^7.12.1",
+				"@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+				"@babel/plugin-proposal-optional-catch-binding": "^7.12.1",
+				"@babel/plugin-proposal-optional-chaining": "^7.12.1",
+				"@babel/plugin-proposal-private-methods": "^7.12.1",
+				"@babel/plugin-proposal-unicode-property-regex": "^7.12.1",
 				"@babel/plugin-syntax-async-generators": "^7.8.0",
-				"@babel/plugin-syntax-class-properties": "^7.10.4",
+				"@babel/plugin-syntax-class-properties": "^7.12.1",
 				"@babel/plugin-syntax-dynamic-import": "^7.8.0",
 				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
 				"@babel/plugin-syntax-json-strings": "^7.8.0",
@@ -2309,45 +2096,42 @@
 				"@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.10.4",
-				"@babel/plugin-transform-arrow-functions": "^7.10.4",
-				"@babel/plugin-transform-async-to-generator": "^7.10.4",
-				"@babel/plugin-transform-block-scoped-functions": "^7.10.4",
-				"@babel/plugin-transform-block-scoping": "^7.10.4",
-				"@babel/plugin-transform-classes": "^7.10.4",
-				"@babel/plugin-transform-computed-properties": "^7.10.4",
-				"@babel/plugin-transform-destructuring": "^7.10.4",
-				"@babel/plugin-transform-dotall-regex": "^7.10.4",
-				"@babel/plugin-transform-duplicate-keys": "^7.10.4",
-				"@babel/plugin-transform-exponentiation-operator": "^7.10.4",
-				"@babel/plugin-transform-for-of": "^7.10.4",
-				"@babel/plugin-transform-function-name": "^7.10.4",
-				"@babel/plugin-transform-literals": "^7.10.4",
-				"@babel/plugin-transform-member-expression-literals": "^7.10.4",
-				"@babel/plugin-transform-modules-amd": "^7.10.4",
-				"@babel/plugin-transform-modules-commonjs": "^7.10.4",
-				"@babel/plugin-transform-modules-systemjs": "^7.10.4",
-				"@babel/plugin-transform-modules-umd": "^7.10.4",
-				"@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4",
-				"@babel/plugin-transform-new-target": "^7.10.4",
-				"@babel/plugin-transform-object-super": "^7.10.4",
-				"@babel/plugin-transform-parameters": "^7.10.4",
-				"@babel/plugin-transform-property-literals": "^7.10.4",
-				"@babel/plugin-transform-regenerator": "^7.10.4",
-				"@babel/plugin-transform-reserved-words": "^7.10.4",
-				"@babel/plugin-transform-shorthand-properties": "^7.10.4",
-				"@babel/plugin-transform-spread": "^7.11.0",
-				"@babel/plugin-transform-sticky-regex": "^7.10.4",
-				"@babel/plugin-transform-template-literals": "^7.10.4",
-				"@babel/plugin-transform-typeof-symbol": "^7.10.4",
-				"@babel/plugin-transform-unicode-escapes": "^7.10.4",
-				"@babel/plugin-transform-unicode-regex": "^7.10.4",
+				"@babel/plugin-syntax-top-level-await": "^7.12.1",
+				"@babel/plugin-transform-arrow-functions": "^7.12.1",
+				"@babel/plugin-transform-async-to-generator": "^7.12.1",
+				"@babel/plugin-transform-block-scoped-functions": "^7.12.1",
+				"@babel/plugin-transform-block-scoping": "^7.12.1",
+				"@babel/plugin-transform-classes": "^7.12.1",
+				"@babel/plugin-transform-computed-properties": "^7.12.1",
+				"@babel/plugin-transform-destructuring": "^7.12.1",
+				"@babel/plugin-transform-dotall-regex": "^7.12.1",
+				"@babel/plugin-transform-duplicate-keys": "^7.12.1",
+				"@babel/plugin-transform-exponentiation-operator": "^7.12.1",
+				"@babel/plugin-transform-for-of": "^7.12.1",
+				"@babel/plugin-transform-function-name": "^7.12.1",
+				"@babel/plugin-transform-literals": "^7.12.1",
+				"@babel/plugin-transform-member-expression-literals": "^7.12.1",
+				"@babel/plugin-transform-modules-amd": "^7.12.1",
+				"@babel/plugin-transform-modules-commonjs": "^7.12.1",
+				"@babel/plugin-transform-modules-systemjs": "^7.12.1",
+				"@babel/plugin-transform-modules-umd": "^7.12.1",
+				"@babel/plugin-transform-named-capturing-groups-regex": "^7.12.1",
+				"@babel/plugin-transform-new-target": "^7.12.1",
+				"@babel/plugin-transform-object-super": "^7.12.1",
+				"@babel/plugin-transform-parameters": "^7.12.1",
+				"@babel/plugin-transform-property-literals": "^7.12.1",
+				"@babel/plugin-transform-regenerator": "^7.12.1",
+				"@babel/plugin-transform-reserved-words": "^7.12.1",
+				"@babel/plugin-transform-shorthand-properties": "^7.12.1",
+				"@babel/plugin-transform-spread": "^7.12.1",
+				"@babel/plugin-transform-sticky-regex": "^7.12.1",
+				"@babel/plugin-transform-template-literals": "^7.12.1",
+				"@babel/plugin-transform-typeof-symbol": "^7.12.1",
+				"@babel/plugin-transform-unicode-escapes": "^7.12.1",
+				"@babel/plugin-transform-unicode-regex": "^7.12.1",
 				"@babel/preset-modules": "^0.1.3",
-				"@babel/types": "^7.11.5",
-				"browserslist": "^4.12.0",
+				"@babel/types": "^7.12.1",
 				"core-js-compat": "^3.6.2",
-				"invariant": "^2.2.2",
-				"levenary": "^1.1.1",
 				"semver": "^5.5.0"
 			},
 			"dependencies": {
@@ -2357,9 +2141,9 @@
 					"integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg=="
 				},
 				"@babel/types": {
-					"version": "7.11.5",
-					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-					"integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+					"version": "7.12.6",
+					"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+					"integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
 					"requires": {
 						"@babel/helper-validator-identifier": "^7.10.4",
 						"lodash": "^4.17.19",
@@ -2397,9 +2181,9 @@
 			}
 		},
 		"@babel/runtime": {
-			"version": "7.11.2",
-			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
-			"integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
+			"version": "7.12.5",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
+			"integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
 			"requires": {
 				"regenerator-runtime": "^0.13.4"
 			}
@@ -2470,19 +2254,34 @@
 			}
 		},
 		"@nextcloud/axios": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-1.4.0.tgz",
-			"integrity": "sha512-7ePHUve3++aB0Ma+lc68B/wRn09FmrPFaFKpdUygIxak89lRvixqLc+98AdLtGPQegof+dKTIwwnuNTy0E95HA==",
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/axios/-/axios-1.5.0.tgz",
+			"integrity": "sha512-n7jnv6UmnF8Ti4Mp2a4K9EXen1q9q2qMug9Y8uFmdPX+wItPdJlDGVAtDH+oEkAj77jHjNNsL2rZz/Oy9t56xw==",
 			"requires": {
 				"@babel/cli": "^7.8.4",
 				"@babel/core": "^7.9.0",
 				"@babel/preset-env": "^7.9.0",
 				"@babel/preset-typescript": "^7.9.0",
 				"@nextcloud/auth": "^1.2.2",
-				"axios": "^0.20.0",
+				"axios": "^0.21.0",
 				"core-js": "^3.6.4"
 			}
 		},
+		"@nextcloud/browser-storage": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/browser-storage/-/browser-storage-0.1.1.tgz",
+			"integrity": "sha512-bWzs/A44rEK8b3CMOFw0ZhsenagrWdsB902LOEwmlMCcFysiFgWiOPbF4/0/ODlOYjvPrO02wf6RigWtb8P+gA==",
+			"requires": {
+				"core-js": "3.6.1"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "3.6.1",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.1.tgz",
+					"integrity": "sha512-186WjSik2iTGfDjfdCZAxv2ormxtKgemjC3SI6PL31qOA0j5LhTDVjHChccoc7brwLvpvLPiMyRlcO88C4l1QQ=="
+				}
+			}
+		},
 		"@nextcloud/browserslist-config": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@nextcloud/browserslist-config/-/browserslist-config-1.0.0.tgz",
@@ -2499,9 +2298,9 @@
 			}
 		},
 		"@nextcloud/dialogs": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-3.0.0.tgz",
-			"integrity": "sha512-5FVP0RSxIpKTKdSUlQ4osDDz/oCx2/4+InliB5MX2EcrjDe6q3fZMabSGnFTnIAu0CXRTzBk7RpneaIFGv+d5A==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-3.1.1.tgz",
+			"integrity": "sha512-T816Jo5Dz/NrMXn+rDDAkb1mLcCPD2ZKFX7cVjYvfKP9Ta9LxaRlvwAhS/K7bQ17fpjX8jAmqwrhO8MWDnGGmA==",
 			"requires": {
 				"@nextcloud/l10n": "^1.3.0",
 				"@nextcloud/typings": "^1.0.0",
@@ -2552,9 +2351,9 @@
 			}
 		},
 		"@nextcloud/initial-state": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-1.1.2.tgz",
-			"integrity": "sha512-AmewfDmsCgL9j062VWkgWPg+dfyu63xxqv29ErAJ1WZiEQK/gb2IyiILDMTXdVeNHGDY874mzBcAAkpFO/DxnQ==",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/initial-state/-/initial-state-1.2.0.tgz",
+			"integrity": "sha512-/ZN4f/gihvRPXa7S2mgV2Is5QyEGqb4/Z2OGHxilJV86ZKBnR9DlA5dFqtzdV86dHVsZ+PfthUI3vDPJ81hTJA==",
 			"requires": {
 				"core-js": "^3.6.4"
 			}
@@ -2626,24 +2425,29 @@
 			}
 		},
 		"@nextcloud/vue": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-2.7.0.tgz",
-			"integrity": "sha512-iZxTUWsDvfQdi3FRqEBfv5MGqJPPISk9FEXhX98wnWX37YaDwx9qOpvAQo+/6bjVVwwu8E7oWJN24NE4rxWhBg==",
+			"version": "2.9.0",
+			"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-2.9.0.tgz",
+			"integrity": "sha512-OaddUORB2MdrXtmqnXJlbftYMGBBX339utLe2b4jz2qaT/IvvaTmwet6qSl/736upLaJveIoPrdyn3FZea5CUg==",
 			"requires": {
 				"@nextcloud/auth": "^1.2.3",
 				"@nextcloud/axios": "^1.3.2",
+				"@nextcloud/browser-storage": "^0.1.1",
 				"@nextcloud/capabilities": "^1.0.2",
-				"@nextcloud/dialogs": "^2.0.1",
+				"@nextcloud/dialogs": "^3.0.0",
 				"@nextcloud/event-bus": "^1.1.4",
 				"@nextcloud/l10n": "^1.2.3",
 				"@nextcloud/router": "^1.0.2",
 				"core-js": "^3.6.5",
 				"debounce": "1.2.0",
-				"emoji-mart-vue-fast": "^7.0.4",
+				"emoji-mart-vue-fast": "^7.0.7",
+				"escape-html": "^1.0.3",
 				"hammerjs": "^2.0.8",
 				"linkifyjs": "~2.1.9",
 				"md5": "^2.2.1",
 				"regenerator-runtime": "^0.13.5",
+				"string-length": "^4.0.1",
+				"striptags": "^3.1.1",
+				"tributejs": "^5.1.3",
 				"v-click-outside": "^3.0.1",
 				"v-tooltip": "^2.0.3",
 				"vue": "^2.6.11",
@@ -2653,21 +2457,10 @@
 				"vue2-datepicker": "^3.6.2"
 			},
 			"dependencies": {
-				"@nextcloud/dialogs": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/@nextcloud/dialogs/-/dialogs-2.0.1.tgz",
-					"integrity": "sha512-Bme8vcs8n4XT5spBgkDEv1z9zNOE23AIbr5jF1WJ1A2XNMNj5Zvy29RosIh0k7H+1lN0PlU38u+eMV1Ets3E4A==",
-					"requires": {
-						"@nextcloud/l10n": "^1.3.0",
-						"@nextcloud/typings": "^0.2.2",
-						"core-js": "^3.6.4",
-						"toastify-js": "^1.9.1"
-					}
-				},
 				"core-js": {
-					"version": "3.6.5",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
-					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
+					"version": "3.7.0",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.7.0.tgz",
+					"integrity": "sha512-NwS7fI5M5B85EwpWuIwJN4i/fbisQUwLwiSNUWeXlkAZ0sbBjLEvLvFLf1uzAUV66PcEPt4xCGCmOZSxVf3xzA=="
 				}
 			}
 		},
@@ -2682,9 +2475,9 @@
 			}
 		},
 		"@nextcloud/webpack-vue-config": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-1.1.0.tgz",
-			"integrity": "sha512-3eDbH05tlkfM12syuM36QS+xU1r80iX21PZ5tN+/O9Ekto2psmt+vf7Vgs5JX20M97Uy89POQ09A8tQUj83Yuw==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@nextcloud/webpack-vue-config/-/webpack-vue-config-1.4.1.tgz",
+			"integrity": "sha512-beyvB/6kqIJiVrc36/MlkeGoBb9zHBfbvJsvk2ia5lJCTBP41YELltFiFHpLiEJrlC2zvBzPDhF+7zZsPfa7mg==",
 			"dev": true
 		},
 		"@nicolo-ribaudo/chokidar-2": {
@@ -2811,13 +2604,13 @@
 			}
 		},
 		"@stylelint/postcss-markdown": {
-			"version": "0.36.1",
-			"resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.1.tgz",
-			"integrity": "sha512-iDxMBWk9nB2BPi1VFQ+Dc5+XpvODBHw2n3tYpaBZuEAFQlbtF9If0Qh5LTTwSi/XwdbJ2jt+0dis3i8omyggpw==",
+			"version": "0.36.2",
+			"resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz",
+			"integrity": "sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==",
 			"dev": true,
 			"requires": {
-				"remark": "^12.0.0",
-				"unist-util-find-all-after": "^3.0.1"
+				"remark": "^13.0.0",
+				"unist-util-find-all-after": "^3.0.2"
 			}
 		},
 		"@tokenizer/token": {
@@ -2825,12 +2618,6 @@
 			"resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.1.1.tgz",
 			"integrity": "sha512-XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w=="
 		},
-		"@types/color-name": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-			"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-			"dev": true
-		},
 		"@types/debug": {
 			"version": "4.1.5",
 			"resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz",
@@ -2853,12 +2640,26 @@
 			"integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
 			"dev": true
 		},
+		"@types/mdast": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz",
+			"integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==",
+			"dev": true,
+			"requires": {
+				"@types/unist": "*"
+			}
+		},
 		"@types/minimist": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.0.tgz",
-			"integrity": "sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=",
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
+			"integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
 			"dev": true
 		},
+		"@types/node": {
+			"version": "14.14.8",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.8.tgz",
+			"integrity": "sha512-z/5Yd59dCKI5kbxauAJgw6dLPzW+TNOItNE00PkpzNwUIEwdj/Lsqwq94H5DdYBX7C13aRA0CY32BK76+neEUA=="
+		},
 		"@types/normalize-package-data": {
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
@@ -2871,6 +2672,15 @@
 			"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
 			"dev": true
 		},
+		"@types/readable-stream": {
+			"version": "2.3.9",
+			"resolved": "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-2.3.9.tgz",
+			"integrity": "sha512-sqsgQqFT7HmQz/V5jH1O0fvQQnXAJO46Gg9LRO/JPfjmVmGUlcx831TZZO3Y3HtWhIkzf3kTsNT0Z0kzIhIvZw==",
+			"requires": {
+				"@types/node": "*",
+				"safe-buffer": "*"
+			}
+		},
 		"@types/semver": {
 			"version": "7.3.4",
 			"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.3.4.tgz",
@@ -2883,9 +2693,9 @@
 			"dev": true
 		},
 		"@vue/component-compiler-utils": {
-			"version": "3.1.2",
-			"resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.1.2.tgz",
-			"integrity": "sha512-QLq9z8m79mCinpaEeSURhnNCN6djxpHw0lpP/bodMlt5kALfONpryMthvnrQOlTcIKoF+VoPi+lPHUYeDFPXug==",
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.2.0.tgz",
+			"integrity": "sha512-lejBLa7xAMsfiZfNp7Kv51zOzifnb29FwdnMLa96z26kXErPFioSf9BMcePVIQ6/Gc6/mC0UrPpxAWIHyae0vw==",
 			"dev": true,
 			"requires": {
 				"consolidate": "^0.15.1",
@@ -2908,9 +2718,9 @@
 			}
 		},
 		"@vue/test-utils": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.1.0.tgz",
-			"integrity": "sha512-M+3jtVqNYIrvzO5gaxogre5a5+96h0hN/dXw+5Lj0t+dp6fAhYcUjpLrC9j9cEEkl2Rcuh/gKYRUmR5N4vcqPw==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-1.1.1.tgz",
+			"integrity": "sha512-/32538ilZ9qSiu1gui7zfBn+IFy+zoTaQTZ1qiLfQXzZtaeAD23kJMrnqaoe2w8JzJoXuqHUl2ruuStG8rwFYQ==",
 			"dev": true,
 			"requires": {
 				"dom-event-types": "^1.0.0",
@@ -3394,16 +3204,10 @@
 				"postcss-value-parser": "^4.1.0"
 			},
 			"dependencies": {
-				"caniuse-lite": {
-					"version": "1.0.30001137",
-					"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz",
-					"integrity": "sha512-54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw==",
-					"dev": true
-				},
 				"postcss": {
-					"version": "7.0.34",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.34.tgz",
-					"integrity": "sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==",
+					"version": "7.0.35",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+					"integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
 					"dev": true,
 					"requires": {
 						"chalk": "^2.4.2",
@@ -3441,9 +3245,9 @@
 			"dev": true
 		},
 		"axios": {
-			"version": "0.20.0",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-0.20.0.tgz",
-			"integrity": "sha512-ANA4rr2BDcmmAQLOKft2fufrtuvlqR+cXNNinUmvfeSNCOF98PZL+7M/v1zIdGo7OLjEA9J2gXJL+j4zGsl0bA==",
+			"version": "0.21.0",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz",
+			"integrity": "sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==",
 			"requires": {
 				"follow-redirects": "^1.10.0"
 			}
@@ -3463,83 +3267,16 @@
 			}
 		},
 		"babel-loader": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
-			"integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
+			"version": "8.2.1",
+			"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.1.tgz",
+			"integrity": "sha512-dMF8sb2KQ8kJl21GUjkW1HWmcsL39GOV5vnzjqrCzEPNY0S0UfMLnumidiwIajDSBmKhYf5iRW+HXaM4cvCKBw==",
 			"dev": true,
 			"requires": {
 				"find-cache-dir": "^2.1.0",
 				"loader-utils": "^1.4.0",
-				"mkdirp": "^0.5.3",
+				"make-dir": "^2.1.0",
 				"pify": "^4.0.1",
 				"schema-utils": "^2.6.5"
-			},
-			"dependencies": {
-				"ajv": {
-					"version": "6.12.0",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz",
-					"integrity": "sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==",
-					"dev": true,
-					"requires": {
-						"fast-deep-equal": "^3.1.1",
-						"fast-json-stable-stringify": "^2.0.0",
-						"json-schema-traverse": "^0.4.1",
-						"uri-js": "^4.2.2"
-					}
-				},
-				"emojis-list": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-					"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-					"dev": true
-				},
-				"json5": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.0"
-					}
-				},
-				"loader-utils": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-					"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-					"dev": true,
-					"requires": {
-						"big.js": "^5.2.2",
-						"emojis-list": "^3.0.0",
-						"json5": "^1.0.1"
-					}
-				},
-				"mkdirp": {
-					"version": "0.5.3",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz",
-					"integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.5"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "1.2.5",
-							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-							"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-							"dev": true
-						}
-					}
-				},
-				"schema-utils": {
-					"version": "2.6.5",
-					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
-					"integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
-					"dev": true,
-					"requires": {
-						"ajv": "^6.12.0",
-						"ajv-keywords": "^3.4.1"
-					}
-				}
 			}
 		},
 		"babel-plugin-dynamic-import-node": {
@@ -3629,8 +3366,7 @@
 		"big.js": {
 			"version": "5.2.2",
 			"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-			"dev": true
+			"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
 		},
 		"binary-extensions": {
 			"version": "2.1.0",
@@ -3811,14 +3547,15 @@
 			}
 		},
 		"browserslist": {
-			"version": "4.13.0",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz",
-			"integrity": "sha512-MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ==",
+			"version": "4.14.7",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.7.tgz",
+			"integrity": "sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==",
 			"requires": {
-				"caniuse-lite": "^1.0.30001093",
-				"electron-to-chromium": "^1.3.488",
-				"escalade": "^3.0.1",
-				"node-releases": "^1.1.58"
+				"caniuse-lite": "^1.0.30001157",
+				"colorette": "^1.2.1",
+				"electron-to-chromium": "^1.3.591",
+				"escalade": "^3.1.1",
+				"node-releases": "^1.1.66"
 			}
 		},
 		"buffer": {
@@ -3996,9 +3733,9 @@
 			}
 		},
 		"caniuse-lite": {
-			"version": "1.0.30001096",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001096.tgz",
-			"integrity": "sha512-PFTw9UyVfbkcMEFs82q8XVlRayj7HKvnhu5BLcmjGpv+SNyiWasCcWXPGJuO0rK0dhLRDJmtZcJ+LHUfypbw1w=="
+			"version": "1.0.30001159",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001159.tgz",
+			"integrity": "sha512-w9Ph56jOsS8RL20K9cLND3u/+5WASWdhC/PPrf+V3/HsM3uHOavWOR1Xzakbv4Puo/srmPHudkmCRWM7Aq+/UA=="
 		},
 		"caseless": {
 			"version": "0.12.0",
@@ -4006,12 +3743,6 @@
 			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
 			"dev": true
 		},
-		"ccount": {
-			"version": "1.0.5",
-			"resolved": "https://registry.npmjs.org/ccount/-/ccount-1.0.5.tgz",
-			"integrity": "sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==",
-			"dev": true
-		},
 		"chalk": {
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -4022,18 +3753,17 @@
 				"supports-color": "^5.3.0"
 			}
 		},
+		"char-regex": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+			"integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="
+		},
 		"character-entities": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
 			"integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
 			"dev": true
 		},
-		"character-entities-html4": {
-			"version": "1.1.4",
-			"resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.4.tgz",
-			"integrity": "sha512-HRcDxZuZqMx3/a+qrzxdBKBPUpxWEq9xw2OPZ3a/174ihfrQKVsFhqtthBInFy1zZ9GgZyFXOatNujm8M+El3g==",
-			"dev": true
-		},
 		"character-entities-legacy": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
@@ -4264,12 +3994,6 @@
 			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
 			"dev": true
 		},
-		"collapse-white-space": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
-			"integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==",
-			"dev": true
-		},
 		"collection-visit": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -4295,8 +4019,7 @@
 		"colorette": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
-			"integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==",
-			"dev": true
+			"integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw=="
 		},
 		"combined-stream": {
 			"version": "1.0.8",
@@ -4452,11 +4175,11 @@
 			"integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="
 		},
 		"core-js-compat": {
-			"version": "3.6.5",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-			"integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+			"version": "3.7.0",
+			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz",
+			"integrity": "sha512-V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==",
 			"requires": {
-				"browserslist": "^4.8.5",
+				"browserslist": "^4.14.6",
 				"semver": "7.0.0"
 			},
 			"dependencies": {
@@ -4683,15 +4406,10 @@
 				"assert-plus": "^1.0.0"
 			}
 		},
-		"date-fns": {
-			"version": "2.16.1",
-			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.16.1.tgz",
-			"integrity": "sha512-sAJVKx/FqrLYHAQeN7VpJrPhagZc9R4ImZIWYRFZaaohR3KzmuK88touwsSwSVT8Qcbd4zoDsnGfX4GFB4imyQ=="
-		},
 		"date-format-parse": {
-			"version": "0.2.5",
-			"resolved": "https://registry.npmjs.org/date-format-parse/-/date-format-parse-0.2.5.tgz",
-			"integrity": "sha512-PzvB3p9bTxrGQbz3ZlO/kxgXzKZhMo4l0OQfPqVYjuwixHRS9yHH6cUJI9JG2Hh6iUQgh17T7w95lzQ131dS/g=="
+			"version": "0.2.6",
+			"resolved": "https://registry.npmjs.org/date-format-parse/-/date-format-parse-0.2.6.tgz",
+			"integrity": "sha512-sdxnYAWmLopeb+6Hmw+vo3or4OCJOnh4+YoJ9p+Id3o2EnNP0INpTqx7wr8UregfMpgaSZAH473R/ytiaB3gVg=="
 		},
 		"de-indent": {
 			"version": "1.0.2",
@@ -4876,27 +4594,14 @@
 			"dev": true
 		},
 		"dom-serializer": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
-			"integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.1.0.tgz",
+			"integrity": "sha512-ox7bvGXt2n+uLWtCRLybYx60IrOlWL/aCebWJk1T0d4m3y2tzf4U3ij9wBMUb6YJZpz06HCCYuyCDveE2xXmzQ==",
 			"dev": true,
 			"requires": {
 				"domelementtype": "^2.0.1",
+				"domhandler": "^3.0.0",
 				"entities": "^2.0.0"
-			},
-			"dependencies": {
-				"domelementtype": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
-					"integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==",
-					"dev": true
-				},
-				"entities": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-					"integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
-					"dev": true
-				}
 			}
 		},
 		"domain-browser": {
@@ -4906,28 +4611,29 @@
 			"dev": true
 		},
 		"domelementtype": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-			"integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
+			"integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==",
 			"dev": true
 		},
 		"domhandler": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-			"integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz",
+			"integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==",
 			"dev": true,
 			"requires": {
-				"domelementtype": "1"
+				"domelementtype": "^2.0.1"
 			}
 		},
 		"domutils": {
-			"version": "1.7.0",
-			"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-			"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+			"version": "2.4.2",
+			"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.4.2.tgz",
+			"integrity": "sha512-NKbgaM8ZJOecTZsIzW5gSuplsX2IWW2mIK7xVr8hTQF2v1CJWTmLZ1HOCh5sH+IzVPAGE5IucooOkvwBRAdowA==",
 			"dev": true,
 			"requires": {
-				"dom-serializer": "0",
-				"domelementtype": "1"
+				"dom-serializer": "^1.0.1",
+				"domelementtype": "^2.0.1",
+				"domhandler": "^3.3.0"
 			}
 		},
 		"duplexify": {
@@ -4973,9 +4679,9 @@
 			}
 		},
 		"electron-to-chromium": {
-			"version": "1.3.492",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.492.tgz",
-			"integrity": "sha512-AD6v9Y2wN0HuoRH4LwCmlSHjkKq51D1U52bTuvM5uPzisbHVm3Hms15c42TBFLewxnSqxAynK/tbeaUi4Rnjqw=="
+			"version": "1.3.601",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.601.tgz",
+			"integrity": "sha512-ctRyXD9y0mZu8pgeNwBUhLP3Guyr5YuqkfLKYmpTwYx7o9JtCEJme9JVX4xBXPr5ZNvr/iBXUvHLFEVJQThATg=="
 		},
 		"elliptic": {
 			"version": "6.5.3",
@@ -5001,9 +4707,9 @@
 			}
 		},
 		"emoji-mart-vue-fast": {
-			"version": "7.0.6",
-			"resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-7.0.6.tgz",
-			"integrity": "sha512-nvGoIRMhgVYHFBcHJMjjYKS71RopuBRGuO/51DqOcIFreRJAaTvAwmk9eUjI1mwXHY7b/cCarrGi3FBE7Kz37A==",
+			"version": "7.0.7",
+			"resolved": "https://registry.npmjs.org/emoji-mart-vue-fast/-/emoji-mart-vue-fast-7.0.7.tgz",
+			"integrity": "sha512-Nrk4IOjKcKKYyMnRm4lreEiPpvDX+h3FKI86SYs05dCFZ0WZIMTGok26dtWvJqseTThS1UghsNEjM4HrfDjIJg==",
 			"requires": {
 				"@babel/polyfill": "7.2.5",
 				"@babel/runtime": "7.3.4",
@@ -5034,8 +4740,7 @@
 		"emojis-list": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-			"dev": true
+			"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="
 		},
 		"end-of-stream": {
 			"version": "1.4.4",
@@ -5058,9 +4763,9 @@
 			}
 		},
 		"entities": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-			"integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+			"integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
 			"dev": true
 		},
 		"errno": {
@@ -5112,9 +4817,14 @@
 			}
 		},
 		"escalade": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.1.tgz",
-			"integrity": "sha512-DR6NO3h9niOT+MZs7bjxlj2a1k+POu5RN8CLTPX2+i78bRi9eLe7+0zXgUHMnGXWybYcL61E9hGhPKqedy8tQA=="
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+		},
+		"escape-html": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+			"integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
 		},
 		"escape-string-regexp": {
 			"version": "1.0.5",
@@ -5509,69 +5219,12 @@
 			}
 		},
 		"eslint-plugin-html": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.1.0.tgz",
-			"integrity": "sha512-xcqithhnjUxoEDRL0hYci4RSS8EZ1NGr3/H8x3BxJvxgbu4R3YaEUea9i93j95NuAgoAbOUfNmybta8fqi4UbA==",
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-6.1.1.tgz",
+			"integrity": "sha512-JSe3ZDb7feKMnQM27XWGeoIjvP4oWQMJD9GZ6wW67J7/plVL87NK72RBwlvfc3tTZiYUchHhxAwtgEd1GdofDA==",
 			"dev": true,
 			"requires": {
-				"htmlparser2": "^4.1.0"
-			},
-			"dependencies": {
-				"dom-serializer": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.1.0.tgz",
-					"integrity": "sha512-ox7bvGXt2n+uLWtCRLybYx60IrOlWL/aCebWJk1T0d4m3y2tzf4U3ij9wBMUb6YJZpz06HCCYuyCDveE2xXmzQ==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.0.1",
-						"domhandler": "^3.0.0",
-						"entities": "^2.0.0"
-					}
-				},
-				"domelementtype": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
-					"integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==",
-					"dev": true
-				},
-				"domhandler": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz",
-					"integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.0.1"
-					}
-				},
-				"domutils": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.4.2.tgz",
-					"integrity": "sha512-NKbgaM8ZJOecTZsIzW5gSuplsX2IWW2mIK7xVr8hTQF2v1CJWTmLZ1HOCh5sH+IzVPAGE5IucooOkvwBRAdowA==",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "^1.0.1",
-						"domelementtype": "^2.0.1",
-						"domhandler": "^3.3.0"
-					}
-				},
-				"entities": {
-					"version": "2.0.3",
-					"resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-					"integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
-					"dev": true
-				},
-				"htmlparser2": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz",
-					"integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==",
-					"dev": true,
-					"requires": {
-						"domelementtype": "^2.0.1",
-						"domhandler": "^3.0.0",
-						"domutils": "^2.0.0",
-						"entities": "^2.0.0"
-					}
-				}
+				"htmlparser2": "^5.0.1"
 			}
 		},
 		"eslint-plugin-import": {
@@ -5669,9 +5322,9 @@
 			"dev": true
 		},
 		"eslint-plugin-standard": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz",
-			"integrity": "sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz",
+			"integrity": "sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ==",
 			"dev": true
 		},
 		"eslint-plugin-vue": {
@@ -5950,8 +5603,7 @@
 		"fast-deep-equal": {
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-			"integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
-			"dev": true
+			"integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
 		},
 		"fast-glob": {
 			"version": "3.2.4",
@@ -6024,8 +5676,7 @@
 		"fast-json-stable-stringify": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-			"dev": true
+			"integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
 		},
 		"fast-levenshtein": {
 			"version": "2.0.6",
@@ -6040,9 +5691,9 @@
 			"dev": true
 		},
 		"fastq": {
-			"version": "1.8.0",
-			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
-			"integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
+			"version": "1.9.0",
+			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz",
+			"integrity": "sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==",
 			"dev": true,
 			"requires": {
 				"reusify": "^1.0.4"
@@ -6073,9 +5724,9 @@
 			}
 		},
 		"file-loader": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.1.1.tgz",
-			"integrity": "sha512-Klt8C4BjWSXYQAfhpYYkG4qHNTna4toMHEbWrI5IuVoxbU6uiDKeKAP99R8mmbJi3lvewn/jQBOgU4+NS3tDQw==",
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz",
+			"integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==",
 			"dev": true,
 			"requires": {
 				"loader-utils": "^2.0.0",
@@ -6131,11 +5782,11 @@
 			}
 		},
 		"file-type": {
-			"version": "16.0.0",
-			"resolved": "https://registry.npmjs.org/file-type/-/file-type-16.0.0.tgz",
-			"integrity": "sha512-0u4D11yDu0NXF+8qp1eiQ/6cOwPI7sbu9/bGzUOhlwzKbB9FYFivgTtsVPtlkXAakfByWjOsLp2/Jx927OVetg==",
+			"version": "16.0.1",
+			"resolved": "https://registry.npmjs.org/file-type/-/file-type-16.0.1.tgz",
+			"integrity": "sha512-rwXqMZiizJd0uXZE52KN2DtPBAV99qz9cUTHHt8pSyaQzgVYrHJGR0qt2p4N/yzHEL/tGrlB/TgawQb4Fnxxyw==",
 			"requires": {
-				"readable-web-to-node-stream": "^2.0.0",
+				"readable-web-to-node-stream": "^3.0.0",
 				"strtok3": "^6.0.3",
 				"token-types": "^2.0.0",
 				"typedarray-to-buffer": "^3.1.5"
@@ -6366,9 +6017,9 @@
 			}
 		},
 		"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=="
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
 		},
 		"get-caller-file": {
 			"version": "2.0.5",
@@ -6688,30 +6339,15 @@
 			"dev": true
 		},
 		"htmlparser2": {
-			"version": "3.10.1",
-			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
-			"integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+			"version": "5.0.1",
+			"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-5.0.1.tgz",
+			"integrity": "sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==",
 			"dev": true,
 			"requires": {
-				"domelementtype": "^1.3.1",
-				"domhandler": "^2.3.0",
-				"domutils": "^1.5.1",
-				"entities": "^1.1.1",
-				"inherits": "^2.0.1",
-				"readable-stream": "^3.1.1"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "3.6.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-					"dev": true,
-					"requires": {
-						"inherits": "^2.0.3",
-						"string_decoder": "^1.1.1",
-						"util-deprecate": "^1.0.1"
-					}
-				}
+				"domelementtype": "^2.0.1",
+				"domhandler": "^3.3.0",
+				"domutils": "^2.4.2",
+				"entities": "^2.0.0"
 			}
 		},
 		"http-signature": {
@@ -6969,14 +6605,6 @@
 			"integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
 			"dev": true
 		},
-		"invariant": {
-			"version": "2.2.4",
-			"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-			"integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-			"requires": {
-				"loose-envify": "^1.0.0"
-			}
-		},
 		"is-accessor-descriptor": {
 			"version": "0.1.6",
 			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
@@ -7001,12 +6629,6 @@
 			"integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
 			"dev": true
 		},
-		"is-alphanumeric": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz",
-			"integrity": "sha1-Spzvcdr0wAHB2B1j0UDPU/1oifQ=",
-			"dev": true
-		},
 		"is-alphanumerical": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
@@ -7043,6 +6665,15 @@
 			"integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
 			"dev": true
 		},
+		"is-core-module": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz",
+			"integrity": "sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==",
+			"dev": true,
+			"requires": {
+				"has": "^1.0.3"
+			}
+		},
 		"is-data-descriptor": {
 			"version": "0.1.4",
 			"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -7208,23 +6839,11 @@
 			"integrity": "sha1-Fjnssb4DauxppUy7QBz77XEUq38=",
 			"dev": true
 		},
-		"is-whitespace-character": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
-			"integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==",
-			"dev": true
-		},
 		"is-windows": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
 			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
 		},
-		"is-word-character": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
-			"integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==",
-			"dev": true
-		},
 		"is-wsl": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
@@ -7332,8 +6951,7 @@
 		"json-schema-traverse": {
 			"version": "0.4.1",
 			"resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-			"dev": true
+			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
 		},
 		"json-stable-stringify-without-jsonify": {
 			"version": "1.0.1",
@@ -7389,24 +7007,11 @@
 			"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
 		},
 		"known-css-properties": {
-			"version": "0.19.0",
-			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.19.0.tgz",
-			"integrity": "sha512-eYboRV94Vco725nKMlpkn3nV2+96p9c3gKXRsYqAJSswSENvBhN7n5L+uDhY58xQa0UukWsDMTGELzmD8Q+wTA==",
+			"version": "0.20.0",
+			"resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.20.0.tgz",
+			"integrity": "sha512-URvsjaA9ypfreqJ2/ylDr5MUERhJZ+DhguoWRr2xgS5C7aGCalXo+ewL+GixgKBfhT2vuL02nbIgNGqVWgTOYw==",
 			"dev": true
 		},
-		"leven": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-			"integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="
-		},
-		"levenary": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-			"integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-			"requires": {
-				"leven": "^3.1.0"
-			}
-		},
 		"levn": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -7520,12 +7125,11 @@
 			},
 			"dependencies": {
 				"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==",
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 					"dev": true,
 					"requires": {
-						"@types/color-name": "^1.1.1",
 						"color-convert": "^2.0.1"
 					}
 				},
@@ -7577,14 +7181,6 @@
 			"integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
 			"dev": true
 		},
-		"loose-envify": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-			"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-			"requires": {
-				"js-tokens": "^3.0.0 || ^4.0.0"
-			}
-		},
 		"loud-rejection": {
 			"version": "1.6.0",
 			"resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
@@ -7633,21 +7229,6 @@
 				"object-visit": "^1.0.0"
 			}
 		},
-		"markdown-escapes": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz",
-			"integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==",
-			"dev": true
-		},
-		"markdown-table": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
-			"integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
-			"dev": true,
-			"requires": {
-				"repeat-string": "^1.0.0"
-			}
-		},
 		"material-colors": {
 			"version": "1.2.6",
 			"resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
@@ -7680,15 +7261,38 @@
 				"safe-buffer": "^5.1.2"
 			}
 		},
-		"mdast-util-compact": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz",
-			"integrity": "sha512-7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA==",
+		"mdast-util-from-markdown": {
+			"version": "0.8.1",
+			"resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.1.tgz",
+			"integrity": "sha512-qJXNcFcuCSPqUF0Tb0uYcFDIq67qwB3sxo9RPdf9vG8T90ViKnksFqdB/Coq2a7sTnxL/Ify2y7aIQXDkQFH0w==",
 			"dev": true,
 			"requires": {
-				"unist-util-visit": "^2.0.0"
+				"@types/mdast": "^3.0.0",
+				"mdast-util-to-string": "^1.0.0",
+				"micromark": "~2.10.0",
+				"parse-entities": "^2.0.0"
 			}
 		},
+		"mdast-util-to-markdown": {
+			"version": "0.5.3",
+			"resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.5.3.tgz",
+			"integrity": "sha512-sr8q7fQJ1xoCqZSXW6dO/MYu2Md+a4Hfk9uO+XHCfiBhVM0EgWtfAV7BuN+ff6otUeu2xDyt1o7vhZGwOG3+BA==",
+			"dev": true,
+			"requires": {
+				"@types/unist": "^2.0.0",
+				"longest-streak": "^2.0.0",
+				"mdast-util-to-string": "^1.0.0",
+				"parse-entities": "^2.0.0",
+				"repeat-string": "^1.0.0",
+				"zwitch": "^1.0.0"
+			}
+		},
+		"mdast-util-to-string": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz",
+			"integrity": "sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==",
+			"dev": true
+		},
 		"media-typer": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-1.1.0.tgz",
@@ -7831,6 +7435,16 @@
 			"integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
 			"dev": true
 		},
+		"micromark": {
+			"version": "2.10.1",
+			"resolved": "https://registry.npmjs.org/micromark/-/micromark-2.10.1.tgz",
+			"integrity": "sha512-fUuVF8sC1X7wsCS29SYQ2ZfIZYbTymp0EYr6sab3idFjigFFjGa5UwoniPlV9tAgntjuapW1t9U+S0yDYeGKHQ==",
+			"dev": true,
+			"requires": {
+				"debug": "^4.0.0",
+				"parse-entities": "^2.0.0"
+			}
+		},
 		"micromatch": {
 			"version": "3.1.10",
 			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
@@ -8012,9 +7626,9 @@
 			"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
 		},
 		"music-metadata": {
-			"version": "7.4.1",
-			"resolved": "https://registry.npmjs.org/music-metadata/-/music-metadata-7.4.1.tgz",
-			"integrity": "sha512-wImJchxYyUkF/y2fNNYNYzfJ+EHKUMc14tqhRMRSXGy4g16FUexBU5hBg3/56sm8eqlu0Axgc2/Mdh+XUKfByA==",
+			"version": "7.5.0",
+			"resolved": "https://registry.npmjs.org/music-metadata/-/music-metadata-7.5.0.tgz",
+			"integrity": "sha512-PLem0psHyfYfDuZ3ir7EMXsOtkJsCgQNG0e9wvjgYeeAG2WPpwSZkPaTmuJUUIX7hxojj8VhG+iwuz/f+BpXgQ==",
 			"requires": {
 				"content-type": "^1.0.4",
 				"debug": "^4.2.0",
@@ -8171,9 +7785,9 @@
 			}
 		},
 		"node-releases": {
-			"version": "1.1.60",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz",
-			"integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="
+			"version": "1.1.67",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.67.tgz",
+			"integrity": "sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg=="
 		},
 		"node-sass": {
 			"version": "4.14.1",
@@ -8717,6 +8331,88 @@
 			"dev": true,
 			"requires": {
 				"htmlparser2": "^3.10.0"
+			},
+			"dependencies": {
+				"dom-serializer": {
+					"version": "0.2.2",
+					"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+					"integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+					"dev": true,
+					"requires": {
+						"domelementtype": "^2.0.1",
+						"entities": "^2.0.0"
+					},
+					"dependencies": {
+						"domelementtype": {
+							"version": "2.0.2",
+							"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.2.tgz",
+							"integrity": "sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==",
+							"dev": true
+						},
+						"entities": {
+							"version": "2.1.0",
+							"resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
+							"integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==",
+							"dev": true
+						}
+					}
+				},
+				"domelementtype": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+					"integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+					"dev": true
+				},
+				"domhandler": {
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
+					"integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
+					"dev": true,
+					"requires": {
+						"domelementtype": "1"
+					}
+				},
+				"domutils": {
+					"version": "1.7.0",
+					"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+					"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+					"dev": true,
+					"requires": {
+						"dom-serializer": "0",
+						"domelementtype": "1"
+					}
+				},
+				"entities": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+					"integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+					"dev": true
+				},
+				"htmlparser2": {
+					"version": "3.10.1",
+					"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
+					"integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
+					"dev": true,
+					"requires": {
+						"domelementtype": "^1.3.1",
+						"domhandler": "^2.3.0",
+						"domutils": "^1.5.1",
+						"entities": "^1.1.1",
+						"inherits": "^2.0.1",
+						"readable-stream": "^3.1.1"
+					}
+				},
+				"readable-stream": {
+					"version": "3.6.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+					"dev": true,
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
 			}
 		},
 		"postcss-less": {
@@ -8972,8 +8668,7 @@
 		"punycode": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-			"dev": true
+			"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 		},
 		"qs": {
 			"version": "6.5.2",
@@ -9099,9 +8794,25 @@
 			}
 		},
 		"readable-web-to-node-stream": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-2.0.0.tgz",
-			"integrity": "sha512-+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA=="
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.0.tgz",
+			"integrity": "sha512-HNmLb3n0SteGAs8HQlErYPGeO+y7cvL/mVUKtXeUkl0iCZ/2GIgKGrCFHyS7UXFnO8uc9U+0y3pYIzAPsjFfvA==",
+			"requires": {
+				"@types/readable-stream": "^2.3.9",
+				"readable-stream": "^3.6.0"
+			},
+			"dependencies": {
+				"readable-stream": {
+					"version": "3.6.0",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+					"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+					"requires": {
+						"inherits": "^2.0.3",
+						"string_decoder": "^1.1.1",
+						"util-deprecate": "^1.0.1"
+					}
+				}
+			}
 		},
 		"readdirp": {
 			"version": "3.4.0",
@@ -9123,9 +8834,9 @@
 			}
 		},
 		"regenerate": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
-			"integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="
 		},
 		"regenerate-unicode-properties": {
 			"version": "8.2.0",
@@ -9136,9 +8847,9 @@
 			}
 		},
 		"regenerator-runtime": {
-			"version": "0.13.5",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
-			"integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+			"integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
 		},
 		"regenerator-transform": {
 			"version": "0.14.5",
@@ -9164,9 +8875,9 @@
 			"dev": true
 		},
 		"regexpu-core": {
-			"version": "4.7.0",
-			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-			"integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
+			"version": "4.7.1",
+			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
+			"integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
 			"requires": {
 				"regenerate": "^1.4.0",
 				"regenerate-unicode-properties": "^8.2.0",
@@ -9197,60 +8908,32 @@
 			}
 		},
 		"remark": {
-			"version": "12.0.1",
-			"resolved": "https://registry.npmjs.org/remark/-/remark-12.0.1.tgz",
-			"integrity": "sha512-gS7HDonkdIaHmmP/+shCPejCEEW+liMp/t/QwmF0Xt47Rpuhl32lLtDV1uKWvGoq+kxr5jSgg5oAIpGuyULjUw==",
+			"version": "13.0.0",
+			"resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz",
+			"integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==",
 			"dev": true,
 			"requires": {
-				"remark-parse": "^8.0.0",
-				"remark-stringify": "^8.0.0",
-				"unified": "^9.0.0"
+				"remark-parse": "^9.0.0",
+				"remark-stringify": "^9.0.0",
+				"unified": "^9.1.0"
 			}
 		},
 		"remark-parse": {
-			"version": "8.0.3",
-			"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
-			"integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
+			"integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==",
 			"dev": true,
 			"requires": {
-				"ccount": "^1.0.0",
-				"collapse-white-space": "^1.0.2",
-				"is-alphabetical": "^1.0.0",
-				"is-decimal": "^1.0.0",
-				"is-whitespace-character": "^1.0.0",
-				"is-word-character": "^1.0.0",
-				"markdown-escapes": "^1.0.0",
-				"parse-entities": "^2.0.0",
-				"repeat-string": "^1.5.4",
-				"state-toggle": "^1.0.0",
-				"trim": "0.0.1",
-				"trim-trailing-lines": "^1.0.0",
-				"unherit": "^1.0.4",
-				"unist-util-remove-position": "^2.0.0",
-				"vfile-location": "^3.0.0",
-				"xtend": "^4.0.1"
+				"mdast-util-from-markdown": "^0.8.0"
 			}
 		},
 		"remark-stringify": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz",
-			"integrity": "sha512-q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A==",
+			"version": "9.0.0",
+			"resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.0.tgz",
+			"integrity": "sha512-8x29DpTbVzEc6Dwb90qhxCtbZ6hmj3BxWWDpMhA+1WM4dOEGH5U5/GFe3Be5Hns5MvPSFAr1e2KSVtKZkK5nUw==",
 			"dev": true,
 			"requires": {
-				"ccount": "^1.0.0",
-				"is-alphanumeric": "^1.0.0",
-				"is-decimal": "^1.0.0",
-				"is-whitespace-character": "^1.0.0",
-				"longest-streak": "^2.0.1",
-				"markdown-escapes": "^1.0.0",
-				"markdown-table": "^2.0.0",
-				"mdast-util-compact": "^2.0.0",
-				"parse-entities": "^2.0.0",
-				"repeat-string": "^1.5.4",
-				"state-toggle": "^1.0.0",
-				"stringify-entities": "^3.0.0",
-				"unherit": "^1.0.4",
-				"xtend": "^4.0.1"
+				"mdast-util-to-markdown": "^0.5.0"
 			}
 		},
 		"remove-trailing-separator": {
@@ -9428,9 +9111,9 @@
 			"dev": true
 		},
 		"run-parallel": {
-			"version": "1.1.9",
-			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
-			"integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
+			"version": "1.1.10",
+			"resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz",
+			"integrity": "sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==",
 			"dev": true
 		},
 		"run-queue": {
@@ -9905,12 +9588,6 @@
 				"figgy-pudding": "^3.5.1"
 			}
 		},
-		"state-toggle": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz",
-			"integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==",
-			"dev": true
-		},
 		"static-extend": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -9978,6 +9655,30 @@
 			"integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==",
 			"dev": true
 		},
+		"string-length": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz",
+			"integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==",
+			"requires": {
+				"char-regex": "^1.0.2",
+				"strip-ansi": "^6.0.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+					"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+				},
+				"strip-ansi": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+					"requires": {
+						"ansi-regex": "^5.0.0"
+					}
+				}
+			}
+		},
 		"string-width": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@@ -10017,19 +9718,6 @@
 				"safe-buffer": "~5.1.0"
 			}
 		},
-		"stringify-entities": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.1.tgz",
-			"integrity": "sha512-Lsk3ISA2++eJYqBMPKcr/8eby1I6L0gP0NlxF8Zja6c05yr/yCYyb2c9PwXjd08Ib3If1vn1rbs1H5ZtVuOfvQ==",
-			"dev": true,
-			"requires": {
-				"character-entities-html4": "^1.0.0",
-				"character-entities-legacy": "^1.0.0",
-				"is-alphanumerical": "^1.0.0",
-				"is-decimal": "^1.0.2",
-				"is-hexadecimal": "^1.0.0"
-			}
-		},
 		"strip-ansi": {
 			"version": "3.0.1",
 			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
@@ -10060,6 +9748,11 @@
 			"integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
 			"dev": true
 		},
+		"striptags": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/striptags/-/striptags-3.1.1.tgz",
+			"integrity": "sha1-yMPn/db7S7OjKjt1LltePjgJPr0="
+		},
 		"strtok3": {
 			"version": "6.0.4",
 			"resolved": "https://registry.npmjs.org/strtok3/-/strtok3-6.0.4.tgz",
@@ -10070,6 +9763,58 @@
 				"peek-readable": "^3.1.0"
 			}
 		},
+		"style-loader": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/style-loader/-/style-loader-2.0.0.tgz",
+			"integrity": "sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==",
+			"requires": {
+				"loader-utils": "^2.0.0",
+				"schema-utils": "^3.0.0"
+			},
+			"dependencies": {
+				"@types/json-schema": {
+					"version": "7.0.6",
+					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+					"integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="
+				},
+				"ajv": {
+					"version": "6.12.6",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+					"requires": {
+						"fast-deep-equal": "^3.1.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
+				},
+				"ajv-keywords": {
+					"version": "3.5.2",
+					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+					"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
+				},
+				"loader-utils": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+					"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+					"requires": {
+						"big.js": "^5.2.2",
+						"emojis-list": "^3.0.0",
+						"json5": "^2.1.2"
+					}
+				},
+				"schema-utils": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+					"integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+					"requires": {
+						"@types/json-schema": "^7.0.6",
+						"ajv": "^6.12.5",
+						"ajv-keywords": "^3.5.2"
+					}
+				}
+			}
+		},
 		"style-search": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
@@ -10077,22 +9822,22 @@
 			"dev": true
 		},
 		"stylelint": {
-			"version": "13.7.2",
-			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.7.2.tgz",
-			"integrity": "sha512-mmieorkfmO+ZA6CNDu1ic9qpt4tFvH2QUB7vqXgrMVHe5ENU69q7YDq0YUg/UHLuCsZOWhUAvcMcLzLDIERzSg==",
+			"version": "13.8.0",
+			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.8.0.tgz",
+			"integrity": "sha512-iHH3dv3UI23SLDrH4zMQDjLT9/dDIz/IpoFeuNxZmEx86KtfpjDOscxLTFioQyv+2vQjPlRZnK0UoJtfxLICXQ==",
 			"dev": true,
 			"requires": {
 				"@stylelint/postcss-css-in-js": "^0.37.2",
-				"@stylelint/postcss-markdown": "^0.36.1",
+				"@stylelint/postcss-markdown": "^0.36.2",
 				"autoprefixer": "^9.8.6",
 				"balanced-match": "^1.0.0",
 				"chalk": "^4.1.0",
 				"cosmiconfig": "^7.0.0",
-				"debug": "^4.1.1",
+				"debug": "^4.2.0",
 				"execall": "^2.0.0",
 				"fast-glob": "^3.2.4",
 				"fastest-levenshtein": "^1.0.12",
-				"file-entry-cache": "^5.0.1",
+				"file-entry-cache": "^6.0.0",
 				"get-stdin": "^8.0.0",
 				"global-modules": "^2.0.0",
 				"globby": "^11.0.1",
@@ -10101,14 +9846,14 @@
 				"ignore": "^5.1.8",
 				"import-lazy": "^4.0.0",
 				"imurmurhash": "^0.1.4",
-				"known-css-properties": "^0.19.0",
+				"known-css-properties": "^0.20.0",
 				"lodash": "^4.17.20",
 				"log-symbols": "^4.0.0",
 				"mathml-tag-names": "^2.1.3",
-				"meow": "^7.1.1",
+				"meow": "^8.0.0",
 				"micromatch": "^4.0.2",
 				"normalize-selector": "^0.2.0",
-				"postcss": "^7.0.32",
+				"postcss": "^7.0.35",
 				"postcss-html": "^0.36.0",
 				"postcss-less": "^3.1.4",
 				"postcss-media-query-parser": "^0.2.3",
@@ -10116,7 +9861,7 @@
 				"postcss-safe-parser": "^4.0.2",
 				"postcss-sass": "^0.4.4",
 				"postcss-scss": "^2.1.1",
-				"postcss-selector-parser": "^6.0.2",
+				"postcss-selector-parser": "^6.0.4",
 				"postcss-syntax": "^0.36.2",
 				"postcss-value-parser": "^4.1.0",
 				"resolve-from": "^5.0.0",
@@ -10127,15 +9872,15 @@
 				"style-search": "^0.1.0",
 				"sugarss": "^2.0.0",
 				"svg-tags": "^1.0.0",
-				"table": "^6.0.1",
-				"v8-compile-cache": "^2.1.1",
+				"table": "^6.0.3",
+				"v8-compile-cache": "^2.2.0",
 				"write-file-atomic": "^3.0.3"
 			},
 			"dependencies": {
 				"ajv": {
-					"version": "6.12.5",
-					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz",
-					"integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==",
+					"version": "6.12.6",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
 					"dev": true,
 					"requires": {
 						"fast-deep-equal": "^3.1.1",
@@ -10151,12 +9896,11 @@
 					"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==",
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 					"dev": true,
 					"requires": {
-						"@types/color-name": "^1.1.1",
 						"color-convert": "^2.0.1"
 					}
 				},
@@ -10211,12 +9955,30 @@
 					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
 					"dev": true
 				},
+				"debug": {
+					"version": "4.2.0",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+					"integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
+					"dev": true,
+					"requires": {
+						"ms": "2.1.2"
+					}
+				},
 				"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
 				},
+				"file-entry-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz",
+					"integrity": "sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA==",
+					"dev": true,
+					"requires": {
+						"flat-cache": "^3.0.4"
+					}
+				},
 				"fill-range": {
 					"version": "7.0.1",
 					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -10236,6 +9998,22 @@
 						"path-exists": "^4.0.0"
 					}
 				},
+				"flat-cache": {
+					"version": "3.0.4",
+					"resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+					"integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+					"dev": true,
+					"requires": {
+						"flatted": "^3.1.0",
+						"rimraf": "^3.0.2"
+					}
+				},
+				"flatted": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz",
+					"integrity": "sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA==",
+					"dev": true
+				},
 				"get-stdin": {
 					"version": "8.0.0",
 					"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
@@ -10248,6 +10026,15 @@
 					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
 					"dev": true
 				},
+				"hosted-git-info": {
+					"version": "3.0.7",
+					"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.7.tgz",
+					"integrity": "sha512-fWqc0IcuXs+BmE9orLDyVykAG9GJtGLGuZAAqgcckPgv5xad4AcXGIv8galtQvlwutxSlaMcdw7BUtq2EIvqCQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "^6.0.0"
+					}
+				},
 				"ignore": {
 					"version": "5.1.8",
 					"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
@@ -10287,6 +10074,15 @@
 					"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
 					"dev": true
 				},
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "^4.0.0"
+					}
+				},
 				"map-obj": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz",
@@ -10294,9 +10090,9 @@
 					"dev": true
 				},
 				"meow": {
-					"version": "7.1.1",
-					"resolved": "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz",
-					"integrity": "sha512-GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==",
+					"version": "8.0.0",
+					"resolved": "https://registry.npmjs.org/meow/-/meow-8.0.0.tgz",
+					"integrity": "sha512-nbsTRz2fwniJBFgUkcdISq8y/q9n9VbiHYbfwklFh5V4V2uAcxtKQkDc0yCLPM/kP0d+inZBewn3zJqewHE7kg==",
 					"dev": true,
 					"requires": {
 						"@types/minimist": "^1.2.0",
@@ -10304,12 +10100,12 @@
 						"decamelize-keys": "^1.1.0",
 						"hard-rejection": "^2.1.0",
 						"minimist-options": "4.1.0",
-						"normalize-package-data": "^2.5.0",
+						"normalize-package-data": "^3.0.0",
 						"read-pkg-up": "^7.0.1",
 						"redent": "^3.0.0",
 						"trim-newlines": "^3.0.0",
-						"type-fest": "^0.13.1",
-						"yargs-parser": "^18.1.3"
+						"type-fest": "^0.18.0",
+						"yargs-parser": "^20.2.3"
 					}
 				},
 				"micromatch": {
@@ -10322,6 +10118,24 @@
 						"picomatch": "^2.0.5"
 					}
 				},
+				"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
+				},
+				"normalize-package-data": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.0.tgz",
+					"integrity": "sha512-6lUjEI0d3v6kFrtgA/lOx4zHCWULXsFNIjHolnZCKCTLA6m/G625cdn3O7eNmT0iD3jfo6HZ9cdImGZwf21prw==",
+					"dev": true,
+					"requires": {
+						"hosted-git-info": "^3.0.6",
+						"resolve": "^1.17.0",
+						"semver": "^7.3.2",
+						"validate-npm-package-license": "^3.0.1"
+					}
+				},
 				"p-locate": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
@@ -10338,9 +10152,9 @@
 					"dev": true
 				},
 				"postcss": {
-					"version": "7.0.34",
-					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.34.tgz",
-					"integrity": "sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==",
+					"version": "7.0.35",
+					"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+					"integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
 					"dev": true,
 					"requires": {
 						"chalk": "^2.4.2",
@@ -10411,6 +10225,18 @@
 						}
 					}
 				},
+				"postcss-selector-parser": {
+					"version": "6.0.4",
+					"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
+					"integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
+					"dev": true,
+					"requires": {
+						"cssesc": "^3.0.0",
+						"indexes-of": "^1.0.1",
+						"uniq": "^1.0.1",
+						"util-deprecate": "^1.0.2"
+					}
+				},
 				"read-pkg": {
 					"version": "5.2.0",
 					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -10423,6 +10249,30 @@
 						"type-fest": "^0.6.0"
 					},
 					"dependencies": {
+						"hosted-git-info": {
+							"version": "2.8.8",
+							"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz",
+							"integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==",
+							"dev": true
+						},
+						"normalize-package-data": {
+							"version": "2.5.0",
+							"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+							"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+							"dev": true,
+							"requires": {
+								"hosted-git-info": "^2.1.4",
+								"resolve": "^1.10.0",
+								"semver": "2 || 3 || 4 || 5",
+								"validate-npm-package-license": "^3.0.1"
+							}
+						},
+						"semver": {
+							"version": "5.7.1",
+							"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+							"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+							"dev": true
+						},
 						"type-fest": {
 							"version": "0.6.0",
 							"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
@@ -10460,12 +10310,37 @@
 						"strip-indent": "^3.0.0"
 					}
 				},
+				"resolve": {
+					"version": "1.19.0",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
+					"integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
+					"dev": true,
+					"requires": {
+						"is-core-module": "^2.1.0",
+						"path-parse": "^1.0.6"
+					}
+				},
 				"resolve-from": {
 					"version": "5.0.0",
 					"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
 					"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
 					"dev": true
 				},
+				"rimraf": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+					"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+					"dev": true,
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				},
+				"semver": {
+					"version": "7.3.2",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+					"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+					"dev": true
+				},
 				"slash": {
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
@@ -10555,20 +10430,28 @@
 					"dev": true
 				},
 				"type-fest": {
-					"version": "0.13.1",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-					"integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+					"version": "0.18.1",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+					"integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+					"dev": true
+				},
+				"v8-compile-cache": {
+					"version": "2.2.0",
+					"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz",
+					"integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==",
+					"dev": true
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
 					"dev": true
 				},
 				"yargs-parser": {
-					"version": "18.1.3",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-					"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-					"dev": true,
-					"requires": {
-						"camelcase": "^5.0.0",
-						"decamelize": "^1.2.0"
-					}
+					"version": "20.2.4",
+					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz",
+					"integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==",
+					"dev": true
 				}
 			}
 		},
@@ -10601,16 +10484,40 @@
 			}
 		},
 		"stylelint-webpack-plugin": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/stylelint-webpack-plugin/-/stylelint-webpack-plugin-2.1.0.tgz",
-			"integrity": "sha512-nx6pF+s4kWuXj2pAhPiMjAsRZqsPphamy2rwUuPiKmb1FRYtXZL0jl+iwoqc/W3hMaia+UMiGJBzkjXKLXmSmA==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/stylelint-webpack-plugin/-/stylelint-webpack-plugin-2.1.1.tgz",
+			"integrity": "sha512-WHdaWCp4NANcTcltuRjZCjM7jVhdaSg7ag/sQLE22Bf84g5nQC4nBBK8FBdHAssJsho0fDRiwyrzGsIPO+b94A==",
 			"dev": true,
 			"requires": {
 				"arrify": "^2.0.1",
 				"micromatch": "^4.0.2",
-				"schema-utils": "^2.7.0"
+				"schema-utils": "^3.0.0"
 			},
 			"dependencies": {
+				"@types/json-schema": {
+					"version": "7.0.6",
+					"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
+					"integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
+					"dev": true
+				},
+				"ajv": {
+					"version": "6.12.6",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+					"dev": true,
+					"requires": {
+						"fast-deep-equal": "^3.1.1",
+						"fast-json-stable-stringify": "^2.0.0",
+						"json-schema-traverse": "^0.4.1",
+						"uri-js": "^4.2.2"
+					}
+				},
+				"ajv-keywords": {
+					"version": "3.5.2",
+					"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+					"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+					"dev": true
+				},
 				"arrify": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
@@ -10651,6 +10558,17 @@
 						"picomatch": "^2.0.5"
 					}
 				},
+				"schema-utils": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz",
+					"integrity": "sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==",
+					"dev": true,
+					"requires": {
+						"@types/json-schema": "^7.0.6",
+						"ajv": "^6.12.5",
+						"ajv-keywords": "^3.5.2"
+					}
+				},
 				"to-regex-range": {
 					"version": "5.0.1",
 					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -10932,11 +10850,10 @@
 				"punycode": "^2.1.1"
 			}
 		},
-		"trim": {
-			"version": "0.0.1",
-			"resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
-			"integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0=",
-			"dev": true
+		"tributejs": {
+			"version": "5.1.3",
+			"resolved": "https://registry.npmjs.org/tributejs/-/tributejs-5.1.3.tgz",
+			"integrity": "sha512-B5CXihaVzXw+1UHhNFyAwUTMDk1EfoLP5Tj1VhD9yybZ1I8DZJEv8tZ1l0RJo0t0tk9ZhR8eG5tEsaCvRigmdQ=="
 		},
 		"trim-newlines": {
 			"version": "1.0.0",
@@ -10944,12 +10861,6 @@
 			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
 			"dev": true
 		},
-		"trim-trailing-lines": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz",
-			"integrity": "sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==",
-			"dev": true
-		},
 		"trough": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
@@ -11044,16 +10955,6 @@
 				"is-typedarray": "^1.0.0"
 			}
 		},
-		"unherit": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
-			"integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==",
-			"dev": true,
-			"requires": {
-				"inherits": "^2.0.0",
-				"xtend": "^4.0.0"
-			}
-		},
 		"unicode-canonical-property-names-ecmascript": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -11093,9 +10994,9 @@
 			},
 			"dependencies": {
 				"is-buffer": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-					"integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
+					"version": "2.0.5",
+					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+					"integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
 					"dev": true
 				}
 			}
@@ -11136,29 +11037,20 @@
 			}
 		},
 		"unist-util-find-all-after": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.1.tgz",
-			"integrity": "sha512-0GICgc++sRJesLwEYDjFVJPJttBpVQaTNgc6Jw0Jhzvfs+jtKePEMu+uD+PqkRUrAvGQqwhpDwLGWo1PK8PDEw==",
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
+			"integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==",
 			"dev": true,
 			"requires": {
 				"unist-util-is": "^4.0.0"
 			}
 		},
 		"unist-util-is": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz",
-			"integrity": "sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.3.tgz",
+			"integrity": "sha512-bTofCFVx0iQM8Jqb1TBDVRIQW03YkD3p66JOd/aCWuqzlLyUtx1ZAGw/u+Zw+SttKvSVcvTiKYbfrtLoLefykw==",
 			"dev": true
 		},
-		"unist-util-remove-position": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
-			"integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
-			"dev": true,
-			"requires": {
-				"unist-util-visit": "^2.0.0"
-			}
-		},
 		"unist-util-stringify-position": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
@@ -11168,27 +11060,6 @@
 				"@types/unist": "^2.0.2"
 			}
 		},
-		"unist-util-visit": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-			"integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
-			"dev": true,
-			"requires": {
-				"@types/unist": "^2.0.0",
-				"unist-util-is": "^4.0.0",
-				"unist-util-visit-parents": "^3.0.0"
-			}
-		},
-		"unist-util-visit-parents": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.0.tgz",
-			"integrity": "sha512-0g4wbluTF93npyPrp/ymd3tCDTMnP0yo2akFD2FIBAYXq/Sga3lwaU1D8OYKbtpioaI6CkDcQ6fsMnmtzt7htw==",
-			"dev": true,
-			"requires": {
-				"@types/unist": "^2.0.0",
-				"unist-util-is": "^4.0.0"
-			}
-		},
 		"universalify": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -11205,7 +11076,6 @@
 			"version": "4.2.2",
 			"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
 			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-			"dev": true,
 			"requires": {
 				"punycode": "^2.1.0"
 			}
@@ -11322,19 +11192,13 @@
 			},
 			"dependencies": {
 				"is-buffer": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-					"integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==",
+					"version": "2.0.5",
+					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+					"integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
 					"dev": true
 				}
 			}
 		},
-		"vfile-location": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.1.0.tgz",
-			"integrity": "sha512-FCZ4AN9xMcjFIG1oGmZKo61PjwJHRVA+0/tPUP2ul4uIwjGGndIxavEMRpWn5p4xwm/ZsdXp9YNygf1ZyE4x8g==",
-			"dev": true
-		},
 		"vfile-message": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
@@ -11430,9 +11294,9 @@
 			"dev": true
 		},
 		"vue-loader": {
-			"version": "15.9.3",
-			"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.3.tgz",
-			"integrity": "sha512-Y67VnGGgVLH5Voostx8JBZgPQTlDQeOVBLOEsjc2cXbCYBKexSKEpOA56x0YZofoDOTszrLnIShyOX1p9uCEHA==",
+			"version": "15.9.5",
+			"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.5.tgz",
+			"integrity": "sha512-oeMOs2b5o5gRqkxfds10bCx6JeXYTwivRgbb8hzOrcThD2z1+GqEKE3EX9A2SGbsYDf4rXwRg6D5n1w0jO5SwA==",
 			"dev": true,
 			"requires": {
 				"@vue/component-compiler-utils": "^3.1.0",
@@ -11458,9 +11322,9 @@
 			"integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg=="
 		},
 		"vue-router": {
-			"version": "3.4.7",
-			"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.7.tgz",
-			"integrity": "sha512-CbHXue5BLrDivOk5O4eZ0WT4Yj8XwdXa4kCnsEIOzYUPF/07ZukayA2jGxDCJxLc9SgVQX9QX0OuGOwGlVB4Qg=="
+			"version": "3.4.9",
+			"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.9.tgz",
+			"integrity": "sha512-CGAKWN44RqXW06oC+u4mPgHLQQi2t6vLD/JbGRDAXm0YpMv0bgpKuU5bBd7AvMgfTz9kXVRIWKHqRwGEb8xFkA=="
 		},
 		"vue-style-loader": {
 			"version": "4.1.2",
@@ -11504,12 +11368,11 @@
 			"integrity": "sha512-yaX2its9XAJKGuQqf7LsiZHHSkxsIK8rmCOQOvEGEoF41blKRK8qr9my4qYoD6ikdLss4n8tKqYBecmaY0+WJg=="
 		},
 		"vue2-datepicker": {
-			"version": "3.6.2",
-			"resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-3.6.2.tgz",
-			"integrity": "sha512-J2fCwUmCxIOPUvwQ12e8evFY9cCv6vJmgxRD9fGeUv6JeMMeLwkdpeQZOcqbMf/4mk1cSrY2/9Fr8DaB30LBpA==",
+			"version": "3.8.0",
+			"resolved": "https://registry.npmjs.org/vue2-datepicker/-/vue2-datepicker-3.8.0.tgz",
+			"integrity": "sha512-FRofR4z0o/+gXBUdzAc/DBWTfhEvy1A7QhTI4l8GgU21+Veawpw5p7/toE+Gj9hWkYXN833SSjXSDW7+BGQ7nQ==",
 			"requires": {
-				"date-fns": "^2.0.1",
-				"date-format-parse": "^0.2.5"
+				"date-format-parse": "^0.2.6"
 			}
 		},
 		"vuex": {
@@ -11766,9 +11629,9 @@
 			}
 		},
 		"webpack-merge": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.2.0.tgz",
-			"integrity": "sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA==",
+			"version": "5.4.0",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.4.0.tgz",
+			"integrity": "sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==",
 			"dev": true,
 			"requires": {
 				"clone-deep": "^4.0.1",
@@ -11994,6 +11857,12 @@
 				"camelcase": "^5.0.0",
 				"decamelize": "^1.2.0"
 			}
+		},
+		"zwitch": {
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
+			"integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
+			"dev": true
 		}
 	}
 }
diff --git a/package.json b/package.json
index b0ae78a..ef91c26 100644
--- a/package.json
+++ b/package.json
@@ -30,19 +30,20 @@
 		"stylelint:fix": "stylelint src --fix"
 	},
 	"dependencies": {
-		"@nextcloud/axios": "^1.4.0",
-		"@nextcloud/dialogs": "^3.0.0",
+		"@nextcloud/axios": "^1.5.0",
+		"@nextcloud/dialogs": "^3.1.1",
 		"@nextcloud/l10n": "^1.4.1",
 		"@nextcloud/moment": "^1.1.1",
 		"@nextcloud/router": "^1.2.0",
-		"@nextcloud/vue": "^2.7.0",
+		"@nextcloud/vue": "^2.9.0",
 		"@nextcloud/vue-dashboard": "^1.0.1",
 		"howler": "^2.2.1",
-		"music-metadata": "^7.4.1",
+		"music-metadata": "^7.5.0",
+		"style-loader": "^2.0.0",
 		"vue": "^2.6.12",
 		"vue-blurhash": "^0.1.2",
 		"vue-clipboard2": "^0.3.1",
-		"vue-router": "^3.4.7",
+		"vue-router": "^3.4.9",
 		"vuex": "^3.5.1"
 	},
 	"browserslist": [
@@ -52,38 +53,38 @@
 		"node": ">=10.0.0"
 	},
 	"devDependencies": {
-		"@babel/core": "^7.11.6",
+		"@babel/core": "^7.12.3",
 		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
-		"@babel/preset-env": "^7.11.5",
+		"@babel/preset-env": "^7.12.1",
 		"@nextcloud/browserslist-config": "^1.0.0",
 		"@nextcloud/eslint-config": "^2.2.0",
 		"@nextcloud/eslint-plugin": "^1.5.0",
-		"@nextcloud/webpack-vue-config": "^1.1.0",
-		"@vue/test-utils": "^1.1.0",
+		"@nextcloud/webpack-vue-config": "^1.4.1",
+		"@vue/test-utils": "^1.1.1",
 		"babel-eslint": "^10.1.0",
-		"babel-loader": "^8.1.0",
+		"babel-loader": "^8.2.1",
 		"css-loader": "^3.6.0",
 		"eslint": "^6.8.0",
 		"eslint-config-standard": "^14.1.1",
 		"eslint-import-resolver-webpack": "^0.13.0",
 		"eslint-loader": "^4.0.2",
-		"eslint-plugin-html": "^6.1.0",
+		"eslint-plugin-html": "^6.1.1",
 		"eslint-plugin-import": "^2.22.1",
 		"eslint-plugin-node": "^11.1.0",
 		"eslint-plugin-promise": "^4.2.1",
-		"eslint-plugin-standard": "^4.0.1",
+		"eslint-plugin-standard": "^4.1.0",
 		"eslint-plugin-vue": "^6.2.2",
-		"file-loader": "^6.1.1",
+		"file-loader": "^6.2.0",
 		"node-sass": "^4.14.1",
 		"sass-loader": "^8.0.2",
-		"stylelint": "^13.7.2",
+		"stylelint": "^13.8.0",
 		"stylelint-config-recommended-scss": "^4.2.0",
 		"stylelint-scss": "^3.18.0",
-		"stylelint-webpack-plugin": "^2.1.0",
-		"vue-loader": "^15.9.3",
+		"stylelint-webpack-plugin": "^2.1.1",
+		"vue-loader": "^15.9.5",
 		"vue-template-compiler": "^2.6.12",
 		"webpack": "^4.44.2",
 		"webpack-cli": "^3.3.12",
-		"webpack-merge": "^5.2.0"
+		"webpack-merge": "^5.4.0"
 	}
 }

From 05d6634d0cd84617779ef5284d10055480ccb037 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Thu, 19 Nov 2020 22:35:13 +0100
Subject: [PATCH 13/21] fix settingscontroller bug, add more props to db
 backend

---
 lib/Controller/FavoriteController.php         | 29 ++++++++----
 lib/Controller/RecentController.php           | 20 +++++---
 lib/Controller/SettingsController.php         |  2 +-
 lib/Db/RecentMapper.php                       | 12 +++++
 lib/Db/Station.php                            | 14 +++++-
 .../Version000000Date20181013124731.php       | 12 +++++
 lib/Service/FavoriteService.php               | 18 ++++++-
 lib/Service/RecentService.php                 | 18 ++++++-
 src/components/Dashboard.vue                  |  2 +-
 src/components/Main.vue                       | 47 +++++++++----------
 src/components/Sidebar.vue                    |  7 ++-
 11 files changed, 130 insertions(+), 51 deletions(-)

diff --git a/lib/Controller/FavoriteController.php b/lib/Controller/FavoriteController.php
index 722d333..72bbd0d 100644
--- a/lib/Controller/FavoriteController.php
+++ b/lib/Controller/FavoriteController.php
@@ -44,20 +44,29 @@ class FavoriteController extends Controller {
 	/**
 	 * @NoAdminRequired
 	 */
-	public function create(string $stationuuid, string $name, string $favicon, string $urlresolved): DataResponse {
-		return new DataResponse($this->service->create($stationuuid, $name,
-			$favicon, $urlresolved, $this->userId));
-	}
+	 public function create(string $stationuuid, string $name, string $favicon, string $urlresolved,
+ 		string $bitrate, string $country, string $language, string $homepage,
+ 		string $codec, string $tags): DataResponse {
+ 		return new DataResponse($this->service->create($stationuuid, $name,
+ 			$favicon, $urlresolved, $bitrate, $country, $language, $homepage, $codec,
+ 			$tags, $this->userId));
+ 	}
 
 	/**
 	 * @NoAdminRequired
 	 */
-	public function update(int $id, string $stationuuid,
-						   string $name, string $favicon, string $urlresolved): DataResponse {
-		return $this->handleNotFound(function () use ($id, $stationuuid, $name, $favicon, $urlresolved) {
-			return $this->service->update($id, $stationuuid, $name, $favicon, $urlresolved, $this->userId);
-		});
-	}
+	 public function update(int $id, string $stationuuid,
+ 						   string $name, string $favicon, string $urlresolved,
+ 							 string $bitrate, string $country, string $language, string $homepage,
+ 					 		 string $codec, string $tags): DataResponse {
+ 		return $this->handleNotFound(function () use ($id, $stationuuid, $name,
+ 			$favicon, $urlresolved, $bitrate, $country, $language, $homepage, $codec,
+ 			$tags) {
+ 			return $this->service->update($id, $stationuuid, $name, $favicon,
+ 				$urlresolved, $bitrate, $country, $language, $homepage, $codec,
+ 				$tags, $this->userId);
+ 		});
+ 	}
 
 	/**
 	 * @NoAdminRequired
diff --git a/lib/Controller/RecentController.php b/lib/Controller/RecentController.php
index 8f39145..78c9695 100644
--- a/lib/Controller/RecentController.php
+++ b/lib/Controller/RecentController.php
@@ -44,18 +44,26 @@ class RecentController extends Controller {
 	/**
 	 * @NoAdminRequired
 	 */
-	public function create(string $stationuuid, string $name, string $favicon, string $urlresolved): DataResponse {
+	public function create(string $stationuuid, string $name, string $favicon, string $urlresolved,
+		string $bitrate, string $country, string $language, string $homepage,
+		string $codec, string $tags): DataResponse {
 		return new DataResponse($this->service->create($stationuuid, $name,
-			$favicon, $urlresolved, $this->userId));
+			$favicon, $urlresolved, $bitrate, $country, $language, $homepage, $codec,
+			$tags, $this->userId));
 	}
 
 	/**
 	 * @NoAdminRequired
 	 */
-	public function update(int $id, string $stationuuid,
-						   string $name, string $favicon, string $urlresolved): DataResponse {
-		return $this->handleNotFound(function () use ($id, $stationuuid, $name, $favicon, $urlresolved) {
-			return $this->service->update($id, $stationuuid, $name, $favicon, $urlresolved, $this->userId);
+	public function update(int $id, string $stationuuid, string $name,
+		string $favicon, string $urlresolved, string $bitrate, string $country,
+		string $language, string $homepage, string $codec, string $tags): DataResponse {
+		return $this->handleNotFound(function () use ($id, $stationuuid, $name,
+			$favicon, $urlresolved, $bitrate, $country, $language, $homepage, $codec,
+			$tags) {
+			return $this->service->update($id, $stationuuid, $name, $favicon,
+				$urlresolved, $bitrate, $country, $language, $homepage, $codec,
+				$tags, $this->userId);
 		});
 	}
 
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index b0307ef..c8f66ac 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -79,7 +79,7 @@ class SettingsController extends ApiController {
 	 */
 	public function setMenuState($menuState = ""): JSONResponse {
 		if ($menuState == 'SEARCH') {
-			return true;
+			return new JSONResponse(['status' => 'success'], Http::STATUS_OK);
 		};
 		$legalArguments = ['TOP', 'RECENT', 'NEW', 'FAVORITES', 'CATEGORIES'];
 		if (!in_array($menuState, $legalArguments)) {
diff --git a/lib/Db/RecentMapper.php b/lib/Db/RecentMapper.php
index afbbd5d..e8b368c 100644
--- a/lib/Db/RecentMapper.php
+++ b/lib/Db/RecentMapper.php
@@ -27,6 +27,12 @@ class RecentMapper extends QBMapper {
 			->addSelect('name')
 			->addSelect('favicon')
 			->addSelect('urlresolved')
+			->addSelect('bitrate')
+			->addSelect('country')
+			->addSelect('language')
+			->addSelect('homepage')
+			->addSelect('codec')
+			->addSelect('tags')
 			->from('recent')
 			->orderBy('id', 'DESC')
 			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)))
@@ -45,6 +51,12 @@ class RecentMapper extends QBMapper {
 			->addSelect('name')
 			->addSelect('favicon')
 			->addSelect('urlresolved')
+			->addSelect('bitrate')
+			->addSelect('country')
+			->addSelect('language')
+			->addSelect('homepage')
+			->addSelect('codec')
+			->addSelect('tags')
 			->from('recent')
 			->orderBy('id', 'DESC')
 			->where($qb->expr()->eq('user_id', $qb->createNamedParameter($userId)));
diff --git a/lib/Db/Station.php b/lib/Db/Station.php
index 8780fa1..868f155 100644
--- a/lib/Db/Station.php
+++ b/lib/Db/Station.php
@@ -11,6 +11,12 @@ class Station extends Entity implements JsonSerializable {
 	protected $name;
 	protected $favicon;
 	protected $urlresolved;
+	protected $bitrate;
+	protected $country;
+	protected $language;
+	protected $homepage;
+	protected $codec;
+	protected $tags;
 	protected $userId;
 
 	public function jsonSerialize(): array {
@@ -19,7 +25,13 @@ class Station extends Entity implements JsonSerializable {
 			'stationuuid' => $this->stationuuid,
 			'name' => $this->name,
 			'favicon' => $this->favicon,
-			'urlresolved' => $this->urlresolved
+			'urlresolved' => $this->urlresolved,
+			'bitrate' => $this->bitrate,
+			'country' => $this->country,
+			'language' => $this->language,
+			'homepage' => $this->homepage,
+			'codec' => $this->codec,
+			'tags' => $this->tags
 		];
 	}
 }
diff --git a/lib/Migration/Version000000Date20181013124731.php b/lib/Migration/Version000000Date20181013124731.php
index 58dea7f..bffbcab 100644
--- a/lib/Migration/Version000000Date20181013124731.php
+++ b/lib/Migration/Version000000Date20181013124731.php
@@ -38,6 +38,12 @@ class Version000000Date20181013124731 extends SimpleMigrationStep {
 			]);
 			$table->addColumn('favicon', 'text');
 			$table->addColumn('urlresolved', 'text');
+			$table->addColumn('bitrate', 'text');
+			$table->addColumn('country', 'text');
+			$table->addColumn('language', 'text');
+			$table->addColumn('homepage', 'text');
+			$table->addColumn('codec', 'text');
+			$table->addColumn('tags', 'text');
 
 			$table->setPrimaryKey(['id']);
 			$table->addIndex(['user_id'], 'favorites_user_id_index');
@@ -60,6 +66,12 @@ class Version000000Date20181013124731 extends SimpleMigrationStep {
 			]);
 			$table->addColumn('favicon', 'text');
 			$table->addColumn('urlresolved', 'text');
+			$table->addColumn('bitrate', 'text');
+			$table->addColumn('country', 'text');
+			$table->addColumn('language', 'text');
+			$table->addColumn('homepage', 'text');
+			$table->addColumn('codec', 'text');
+			$table->addColumn('tags', 'text');
 
 			$table->setPrimaryKey(['id']);
 			$table->addIndex(['user_id'], 'recent_user_id_index');
diff --git a/lib/Service/FavoriteService.php b/lib/Service/FavoriteService.php
index b9d7aea..9e6c934 100644
--- a/lib/Service/FavoriteService.php
+++ b/lib/Service/FavoriteService.php
@@ -45,23 +45,37 @@ class FavoriteService {
 		}
 	}
 
-	public function create($stationuuid, $name, $favicon, $urlresolved, $userId) {
+	public function create($stationuuid, $name, $favicon, $urlresolved,
+	 	$bitrate, $country, $language, $homepage, $codec, $tags, $userId) {
 		$station = new Station();
 		$station->setStationuuid($stationuuid);
 		$station->setName($name);
 		$station->setFavicon($favicon);
 		$station->setUrlresolved($urlresolved);
+		$station->setBitrate($bitrate);
+		$station->setCountry($country);
+		$station->setLanguage($language);
+		$station->setHomepage($homepage);
+		$station->setCodec($codec);
+		$station->setTags($tags);
 		$station->setUserId($userId);
 		return $this->mapper->insert($station);
 	}
 
-	public function update($id, $stationuuid, $name, $favicon, $urlresolved, $userId) {
+	public function update($id, $stationuuid, $name, $favicon, $urlresolved,
+		$bitrate, $country, $language, $homepage, $codec, $tags, $userId) {
 		try {
 			$station = $this->mapper->find($id, $userId);
 			$station->setStationuuid($stationuuid);
 			$station->setName($name);
 			$station->setFavicon($favicon);
 			$station->setUrlresolved($urlresolved);
+			$station->setBitrate($bitrate);
+			$station->setCountry($country);
+			$station->setLanguage($language);
+			$station->setHomepage($homepage);
+			$station->setCodec($codec);
+			$station->setTags($tags);
 			return $this->mapper->update($station);
 		} catch (Exception $e) {
 			$this->handleException($e);
diff --git a/lib/Service/RecentService.php b/lib/Service/RecentService.php
index 4b67f8e..4ce269c 100644
--- a/lib/Service/RecentService.php
+++ b/lib/Service/RecentService.php
@@ -45,23 +45,37 @@ class RecentService {
 		}
 	}
 
-	public function create($stationuuid, $name, $favicon, $urlresolved, $userId) {
+	public function create($stationuuid, $name, $favicon, $urlresolved,
+		$bitrate, $country, $language, $homepage, $codec, $tags, $userId) {
 		$station = new Station();
 		$station->setStationuuid($stationuuid);
 		$station->setName($name);
 		$station->setFavicon($favicon);
 		$station->setUrlresolved($urlresolved);
+		$station->setBitrate($bitrate);
+		$station->setCountry($country);
+		$station->setLanguage($language);
+		$station->setHomepage($homepage);
+		$station->setCodec($codec);
+		$station->setTags($tags);
 		$station->setUserId($userId);
 		return $this->mapper->insert($station);
 	}
 
-	public function update($id, $stationuuid, $name, $favicon, $urlresolved, $userId) {
+	public function update($id, $stationuuid, $name, $favicon, $urlresolved,
+		$bitrate, $country, $language, $homepage, $codec, $tags, $userId) {
 		try {
 			$station = $this->mapper->find($id, $userId);
 			$station->setStationuuid($stationuuid);
 			$station->setName($name);
 			$station->setFavicon($favicon);
 			$station->setUrlresolved($urlresolved);
+			$station->setBitrate($bitrate);
+			$station->setCountry($country);
+			$station->setLanguage($language);
+			$station->setHomepage($homepage);
+			$station->setCodec($codec);
+			$station->setTags($tags);
 			return $this->mapper->update($station);
 		} catch (Exception $e) {
 			$this->handleException($e);
diff --git a/src/components/Dashboard.vue b/src/components/Dashboard.vue
index d2c4667..f323dc0 100644
--- a/src/components/Dashboard.vue
+++ b/src/components/Dashboard.vue
@@ -55,7 +55,7 @@ export default {
 					targetUrl: generateUrl('/apps/radio/#/favorites'),
 					avatarUrl: n.favicon,
 					mainText: n.name,
-					subText: n.tags,
+					subText: n.tags.replaceAll(',', ', '),
 				}
 			})
 		},
diff --git a/src/components/Main.vue b/src/components/Main.vue
index 1334946..da9dedf 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -61,7 +61,7 @@ export default {
 		blurHashes: require('../assets/blurHashes.json'),
 		favorites: [],
 		showSidebar: false,
-		sidebarStation: [],
+		sidebarStation: {},
 	}),
 	computed: {
 		player() {
@@ -161,10 +161,16 @@ export default {
 					}
 					const stationMap = {
 						id: -1,
-						name: station.name,
-						urlresolved: stationSrc,
-						favicon: station.favicon,
-						stationuuid: station.stationuuid,
+						name: station.name.toString(),
+						urlresolved: stationSrc.toString(),
+						favicon: station.favicon.toString(),
+						stationuuid: station.stationuuid.toString(),
+						bitrate: station.bitrate.toString(),
+						country: station.country.toString(),
+						language: station.language.toString(),
+						homepage: station.homepage.toString(),
+						codec: station.codec.toString(),
+						tags: station.tags.toString(),
 					}
 					await axios
 						.post(generateUrl('/apps/radio/api/favorites'), stationMap)
@@ -246,10 +252,16 @@ export default {
 				}
 				const stationMap = {
 					id: -1,
-					name: station.name,
-					urlresolved: stationSrc,
-					favicon: station.favicon,
-					stationuuid: station.stationuuid,
+					name: station.name.toString(),
+					urlresolved: stationSrc.toString(),
+					favicon: station.favicon.toString(),
+					stationuuid: station.stationuuid.toString(),
+					bitrate: station.bitrate.toString(),
+					country: station.country.toString(),
+					language: station.language.toString(),
+					homepage: station.homepage.toString(),
+					codec: station.codec.toString(),
+					tags: station.tags.toString(),
 				}
 				await axios
 					.post(generateUrl('/apps/radio/api/recent'), stationMap)
@@ -390,27 +402,10 @@ export default {
 
 <style>
 
-/* Make breadcrumbs sticky and intransparent.
-   Move them to the right and show navigation
-	 toggle on smaller screens */
-
-.breadcrumbs {
-	background-color: var(--color-main-background-translucent);
-	z-index: 60;
-	position: sticky;
-	position: -webkit-sticky;
-	top: 50px;
-	padding-bottom: 5px;
-	margin-left: 35px;
-}
-
 @media only screen and (min-width: 1024px) {
 	.app-navigation-toggle {
 		display: none;
 	}
-	.breadcrumbs {
-		margin-left: 0px;
-	}
 }
 
 </style>
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index f838ccd..ff5df09 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -79,8 +79,10 @@ export default {
 			default() { return false },
 		},
 		sidebarStation: {
-			type: Array,
-			default() { return [] },
+			type: Object,
+			default() {
+				return {}
+			},
 		},
 	},
 	computed: {
@@ -103,6 +105,7 @@ export default {
 			this.$emit('toggleSidebar')
 		},
 		copyLink() {
+			console.log(this.sidebarStation.favicon)
 			this.$copyText(this.urlResolved).then(
 				function() {
 					showSuccess(t('radio', 'Link copied to clipboard'))

From 84b6003fe1f6bff76b907bdf6908d8643ebee7d1 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 21 Nov 2020 10:50:26 +0100
Subject: [PATCH 14/21] prefill stations if window size too big

---
 package-lock.json          |  5 +++++
 package.json               |  1 +
 src/components/Main.vue    | 42 +++++++++++++++++++++++++-------------
 src/components/Sidebar.vue |  8 ++++----
 src/components/Table.vue   |  2 +-
 src/main.js                |  2 ++
 6 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8151682..b6b765c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11321,6 +11321,11 @@
 			"resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.5.tgz",
 			"integrity": "sha512-bhP7MlgJQ8TIkZJXAfDf78uJO+mEI3CaLABLjv0WNzr4CcGRGPIAItyWYnP6LsPA4Oq0WE+suidNs6dgpO4RHg=="
 		},
+		"vue-resize-observer": {
+			"version": "1.0.32",
+			"resolved": "https://registry.npmjs.org/vue-resize-observer/-/vue-resize-observer-1.0.32.tgz",
+			"integrity": "sha512-Hz1xigu7RmEf4/7eO6Z7OhbYhaTJo87rEZu5XbzbvHn3+MUTMJe/FCtSowe+rwBc7WaPsKcxDp3izMIDUXe5Eg=="
+		},
 		"vue-router": {
 			"version": "3.4.9",
 			"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.9.tgz",
diff --git a/package.json b/package.json
index ef91c26..05957ed 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
 		"vue": "^2.6.12",
 		"vue-blurhash": "^0.1.2",
 		"vue-clipboard2": "^0.3.1",
+		"vue-resize-observer": "^1.0.32",
 		"vue-router": "^3.4.9",
 		"vuex": "^3.5.1"
 	},
diff --git a/src/components/Main.vue b/src/components/Main.vue
index da9dedf..8afe3e8 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -4,7 +4,8 @@
 			:station-data="tableData" />
 		<AppContent>
 			<Table
-				v-if="!pageLoading && tableData.length > 0"
+				v-show="!pageLoading && tableData.length > 0"
+				v-resize="onResize"
 				:station-data="tableData"
 				:favorites="favorites"
 				@doPlay="doPlay"
@@ -69,11 +70,11 @@ export default {
 		},
 		emptyContentMessage() {
 			if (this.$route.name === 'FAVORITES') {
-				return 'No favorites yet'
+				return t('radio', 'No favorites yet')
 			} else if (this.$route.name === 'RECENT') {
-				return 'No recent stations yet'
+				return t('radio', 'No recent stations yet')
 			} else if (this.$route.name === 'SEARCH') {
-				return 'No search results'
+				return t('radio', 'No search results')
 			}
 			return 'No stations here'
 		},
@@ -89,13 +90,13 @@ export default {
 		},
 		emptyContentDesc() {
 			if (this.$route.name === 'FAVORITES') {
-				return 'Stations you mark as favorite will show up here'
+				return t('radio', 'Stations you mark as favorite will show up here')
 			} else if (this.$route.name === 'RECENT') {
-				return 'Stations you recently played will show up here'
+				return t('radio', 'Stations you recently played will show up here')
 			} else if (this.$route.name === 'SEARCH') {
-				return 'No stations were found matching your search term'
+				return t('radio', 'No stations were found matching your search term')
 			}
-			return 'No stations here'
+			return t('radio', 'No stations here')
 		},
 	},
 	watch: {
@@ -123,6 +124,19 @@ export default {
 	},
 	methods: {
 
+		onResize({ width, height }) {
+			const contentHeight = document.getElementById('app-content-vue').scrollHeight
+			const tableHeight = height
+			if (tableHeight < contentHeight) {
+				this.preFill()
+			}
+		},
+
+		preFill() {
+			const route = this.$route
+			this.loadStations(route.name)
+		},
+
 		async onRoute() {
 			this.tableData = []
 			this.pageLoading = true
@@ -281,22 +295,22 @@ export default {
 			if (vm.$route.name === 'CATEGORIES') {
 				vm.tableData = [
 					{
-						name: 'Countries',
+						name: t('radio', 'Countries'),
 						type: 'folder',
 						path: '#/categories/countries',
 					},
 					{
-						name: 'States',
+						name: t('radio', 'States'),
 						type: 'folder',
 						path: '#/categories/states',
 					},
 					{
-						name: 'Languages',
+						name: t('radio', 'Languages'),
 						type: 'folder',
 						path: '#/categories/languages',
 					},
 					{
-						name: 'Tags',
+						name: t('radio', 'Tags'),
 						type: 'folder',
 						path: '#/categories/tags',
 					},
@@ -305,7 +319,8 @@ export default {
 				return true
 			}
 
-			// FIXME: Skip loading more stations on certain sites
+			// FIXME: Implement pagination for fav & recent
+			// Skip loading more stations on certain sites
 			if (vm.tableData.length > 0
 				&& (vm.$route.name === 'FAVORITES'
 				|| vm.$route.name === 'RECENT')) {
@@ -362,7 +377,6 @@ export default {
 		    }
 			}
 		},
-
 		loadSettings() {
 
 			axios.defaults.headers.common = {
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index ff5df09..d99c2f8 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -9,7 +9,7 @@
 		<div class="configBox">
 			<span class="icon icon-link" />
 			<span class="title">
-				Stream URL
+				{{ t('radio', 'Stream URL') }}
 			</span>
 			<div class="content">
 				<input type="text" :value="urlResolved" disabled="disabled">
@@ -23,7 +23,7 @@
 		<div class="configBox">
 			<span class="icon icon-external" />
 			<span class="title">
-				Homepage
+				{{ t('radio', 'Homepage') }}
 			</span>
 			<div class="content">
 				<span>
@@ -38,7 +38,7 @@
 		<div class="configBox">
 			<span class="icon icon-details" />
 			<span class="title">
-				Country & Language
+				{{ t('radio', 'Country & Language') }}
 			</span>
 			<div class="content">
 				<span>
@@ -49,7 +49,7 @@
 		<div class="configBox">
 			<span class="icon icon-details" />
 			<span class="title">
-				Codec & Bitrate
+				{{ t('radio', 'Codec & Bitrate') }}
 			</span>
 			<div class="content">
 				<span>
diff --git a/src/components/Table.vue b/src/components/Table.vue
index cbba36c..9f48816 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -1,5 +1,5 @@
 <template>
-	<table v-if="stationData" id="table">
+	<table>
 		<thead>
 			<tr>
 				<th class="iconColumn" />
diff --git a/src/main.js b/src/main.js
index d688f64..5d81ee7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -29,6 +29,7 @@ import App from './App'
 
 import VueBlurHash from 'vue-blurhash'
 import VueClipboard from 'vue-clipboard2'
+import VueResizeObserver from 'vue-resize-observer'
 
 import 'vue-blurhash/dist/vue-blurhash.css'
 
@@ -40,6 +41,7 @@ Vue.prototype.$apiUrl = 'https://de1.api.radio-browser.info'
 
 Vue.use(VueClipboard)
 Vue.use(VueBlurHash)
+Vue.use(VueResizeObserver)
 
 export default new Vue({
 	el: '#content',

From 322150821e4006f395bcb386fe7631b267322506 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 21 Nov 2020 19:02:52 +0100
Subject: [PATCH 15/21] fix MIT license

---
 CHANGELOG.md                      | 10 ++++++++++
 COPYING                           |  7 -------
 LICENSE                           | 21 +++++++++++++++++++++
 Makefile                          |  1 -
 appinfo/routes.php                | 21 ---------------------
 css/icons.scss                    | 23 -----------------------
 lib/Controller/PageController.php | 21 ---------------------
 src/components/Main.vue           |  8 +-------
 8 files changed, 32 insertions(+), 80 deletions(-)
 delete mode 100644 COPYING
 create mode 100644 LICENSE

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa7bcac..1574845 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 1.0.0 - 2020-11
+### Added
+ - Complete new rewrite in VueJS
+   Many bugs fixed and some features added.
+   - Dashboard integration
+   - Unified search support
+   - Show recent played stations
+   - Show sidebar with further infos
+   - Improved performance and stability
+
 ## 0.6.6 - 2020-02
 ### Added
  - French translation
diff --git a/COPYING b/COPYING
deleted file mode 100644
index 9f7f3aa..0000000
--- a/COPYING
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright 2018 Jonas Heinrich
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d1c8928
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Jonas Heinrich
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Makefile b/Makefile
index f7147f0..6083b8c 100644
--- a/Makefile
+++ b/Makefile
@@ -49,4 +49,3 @@ clean:
 
 clean-dev:
 	rm -rf node_modules
-
diff --git a/appinfo/routes.php b/appinfo/routes.php
index b4f73fc..9dcb970 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -1,25 +1,4 @@
 <?php
-/**
- * @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
 
 return [
     'resources' => [
diff --git a/css/icons.scss b/css/icons.scss
index 743e80a..57abccb 100644
--- a/css/icons.scss
+++ b/css/icons.scss
@@ -1,26 +1,3 @@
-
-/**
- * @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
 @include icon-black-white('recent', 'radio', 1);
 @include icon-black-white('radio', 'radio', 1);
 @include icon-black-white('radio-trans', 'radio', 1);
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 3032166..ee13ad9 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -1,26 +1,5 @@
 <?php
 declare(strict_types=1);
-/**
- * @copyright Copyright (c) 2019 John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
 
 namespace OCA\Radio\Controller;
 
diff --git a/src/components/Main.vue b/src/components/Main.vue
index 8afe3e8..4719754 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -222,11 +222,6 @@ export default {
 				src: stationSrc,
 				html5: true,
 				volume: vm.player.volume,
-				/* onfade() { // FIXME
-					if (this.volume() === 0) {
-						this.unload()
-					}
-				}, */
 				onplay() {
 					console.log('onplay')
 					vm.$store.dispatch('isPlaying', true)
@@ -319,7 +314,6 @@ export default {
 				return true
 			}
 
-			// FIXME: Implement pagination for fav & recent
 			// Skip loading more stations on certain sites
 			if (vm.tableData.length > 0
 				&& (vm.$route.name === 'FAVORITES'
@@ -380,7 +374,7 @@ export default {
 		loadSettings() {
 
 			axios.defaults.headers.common = {
-				'User-Agent': 'Nextcloud Radio App/1.0', // FIXME: Reference global version number
+				'User-Agent': 'Nextcloud Radio App/1.0',
 			}
 			this.$store.dispatch('getVolumeState')
 

From 290d3581dc3c3aa6846e53c00f3ea2b6a001cf70 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 21 Nov 2020 19:23:26 +0100
Subject: [PATCH 16/21] beginning to implement category browser

---
 src/components/Main.vue  |   4 --
 src/components/Table.vue | 111 ++++++++++++++++++++++++---------------
 2 files changed, 68 insertions(+), 47 deletions(-)

diff --git a/src/components/Main.vue b/src/components/Main.vue
index 4719754..6c955d6 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -236,10 +236,6 @@ export default {
 					vm.$store.dispatch('isPlaying', false)
 					vm.$store.dispatch('isBuffering', true)
 				},
-				onloaderror() {
-					showError(t('radio', 'Unable to reach and play radio station'))
-					vm.$store.dispatch('isBuffering', false)
-				},
 			})
 			audioPlayer.play()
 			audioPlayer.fade(0, vm.player.volume, 500)
diff --git a/src/components/Table.vue b/src/components/Table.vue
index 9f48816..4989974 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -10,49 +10,67 @@
 			</tr>
 		</thead>
 		<tbody>
-			<tr
-				v-for="(station, idx) in stationData"
-				:key="idx"
-				:class="{ selected: idx === activeItem}">
-				<td @click="doPlay(idx, station)">
-					<blur-hash-image
-						class="stationIcon"
-						width="32"
-						height="32"
-						:hash="station.blurHash"
-						:src="station.favicon" />
-					<span :class="{ 'icon-starred': favorites.flat().includes(station.stationuuid) }" />
-				</td>
-				<td class="nameColumn" @click="doPlay(idx, station)">
-					<span class="innernametext">
-						{{ station.name }}
-					</span>
-				</td>
-				<td class="actionColumn">
-					<Actions>
-						<ActionButton
-							v-if="!favorites.flat().includes(station.stationuuid)"
-							icon="icon-star"
-							:close-after-click="true"
-							@click="doFavor(idx, station)">
-							{{ t('radio', 'Add to favorites') }}
-						</ActionButton>
-						<ActionButton
-							v-if="favorites.flat().includes(station.stationuuid)"
-							icon="icon-star"
-							:close-after-click="true"
-							@click="doFavor(idx, station)">
-							{{ t('radio', 'Remove from favorites') }}
-						</ActionButton>
-						<ActionButton
-							icon="icon-info"
-							:close-after-click="true"
-							@click="toggleSidebar(station)">
-							{{ t('radio', 'Details') }}
-						</ActionButton>
-					</Actions>
-				</td>
-			</tr>
+			<template v-if="stationData[0].type!=='folder'">
+				<tr
+					v-for="(station, idx) in stationData"
+					:key="idx"
+					:class="{ selected: idx === activeItem}">
+					<td @click="doPlay(idx, station)">
+						<blur-hash-image
+							class="stationIcon"
+							width="32"
+							height="32"
+							:hash="station.blurHash"
+							:src="station.favicon" />
+						<span :class="{ 'icon-starred': favorites.flat().includes(station.stationuuid) }" />
+					</td>
+					<td class="nameColumn" @click="doPlay(idx, station)">
+						<span class="innernametext">
+							{{ station.name }}
+						</span>
+					</td>
+					<td class="actionColumn">
+						<Actions>
+							<ActionButton
+								v-if="!favorites.flat().includes(station.stationuuid)"
+								icon="icon-star"
+								:close-after-click="true"
+								@click="doFavor(idx, station)">
+								{{ t('radio', 'Add to favorites') }}
+							</ActionButton>
+							<ActionButton
+								v-if="favorites.flat().includes(station.stationuuid)"
+								icon="icon-star"
+								:close-after-click="true"
+								@click="doFavor(idx, station)">
+								{{ t('radio', 'Remove from favorites') }}
+							</ActionButton>
+							<ActionButton
+								icon="icon-info"
+								:close-after-click="true"
+								@click="toggleSidebar(station)">
+								{{ t('radio', 'Details') }}
+							</ActionButton>
+						</Actions>
+					</td>
+				</tr>
+			</template>
+			<template v-if="stationData[0].type==='folder'">
+				<tr
+					v-for="(station, idx) in stationData"
+					:key="idx"
+					@click="doPlay(idx, station)">
+					<td>
+						<span class="icon-folder" />
+					</td>
+					<td class="nameColumn">
+						<span class="innernametext">
+							{{ station.name }}
+						</span>
+					</td>
+					<td class="actionColumn" />
+				</tr>
+			</template>
 		</tbody>
 	</table>
 </template>
@@ -151,6 +169,13 @@ table {
 			background-repeat: no-repeat;
 			border-bottom: 1px solid var(--color-border);
 			cursor: pointer;
+
+			span.icon-folder {
+				display: block;
+				background-size: cover;
+				width: 30px;
+				height: 30px;
+			}
 		}
 
 		tr {

From d5038611e28516777da25bfff429d60707b2ea5a Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 21 Nov 2020 23:06:42 +0100
Subject: [PATCH 17/21] implementing categories

---
 src/components/Main.vue  | 110 ++++++++++++++++++++++++++-------------
 src/components/Table.vue |  19 +++++--
 src/router.js            |   2 +-
 3 files changed, 91 insertions(+), 40 deletions(-)

diff --git a/src/components/Main.vue b/src/components/Main.vue
index 6c955d6..1a03c94 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -63,6 +63,7 @@ export default {
 		favorites: [],
 		showSidebar: false,
 		sidebarStation: {},
+		queryParams: {},
 	}),
 	computed: {
 		player() {
@@ -223,7 +224,6 @@ export default {
 				html5: true,
 				volume: vm.player.volume,
 				onplay() {
-					console.log('onplay')
 					vm.$store.dispatch('isPlaying', true)
 					vm.$store.dispatch('isBuffering', false)
 				},
@@ -284,36 +284,63 @@ export default {
 			let sortBy = 'clickcount'
 
 			if (vm.$route.name === 'CATEGORIES') {
-				vm.tableData = [
-					{
-						name: t('radio', 'Countries'),
-						type: 'folder',
-						path: '#/categories/countries',
-					},
-					{
-						name: t('radio', 'States'),
-						type: 'folder',
-						path: '#/categories/states',
-					},
-					{
-						name: t('radio', 'Languages'),
-						type: 'folder',
-						path: '#/categories/languages',
-					},
-					{
-						name: t('radio', 'Tags'),
-						type: 'folder',
-						path: '#/categories/tags',
-					},
-				]
-				vm.pageLoading = false
-				return true
+				if (vm.$route.path === '/categories') {
+					vm.tableData = [
+						{
+							name: t('radio', 'Countries'),
+							type: 'folder',
+							path: '/categories/countries',
+						},
+						{
+							name: t('radio', 'States'),
+							type: 'folder',
+							path: '/categories/states',
+						},
+						{
+							name: t('radio', 'Languages'),
+							type: 'folder',
+							path: '/categories/languages',
+						},
+						{
+							name: t('radio', 'Tags'),
+							type: 'folder',
+							path: '/categories/tags',
+						},
+					]
+					vm.pageLoading = false
+					return true
+				} else if (vm.$route.params.category === 'tags') {
+					if (vm.$route.params.query) {
+						queryURI = this.$apiUrl + '/json/stations/search?tag=' + vm.$route.params.query + '&tagExact=true'
+					} else {
+						queryURI = this.$apiUrl + '/json/tags'
+					}
+				} else if (vm.$route.params.category === 'countries') {
+					if (vm.$route.params.query) {
+						queryURI = this.$apiUrl + '/json/stations/search?country=' + vm.$route.params.query + '&countryExact=true'
+					} else {
+						queryURI = this.$apiUrl + '/json/countries'
+					}
+				} else if (vm.$route.params.category === 'states') {
+					if (vm.$route.params.query) {
+						queryURI = this.$apiUrl + '/json/stations/search?state=' + vm.$route.params.query + '&stateExact=true'
+					} else {
+						queryURI = this.$apiUrl + '/json/states'
+					}
+				} else if (vm.$route.params.category === 'languages') {
+					if (vm.$route.params.query) {
+						queryURI = this.$apiUrl + '/json/stations/search?language=' + vm.$route.params.query + '&languageExact=true'
+					} else {
+						queryURI = this.$apiUrl + '/json/languages'
+					}
+				}
 			}
 
 			// Skip loading more stations on certain sites
 			if (vm.tableData.length > 0
 				&& (vm.$route.name === 'FAVORITES'
-				|| vm.$route.name === 'RECENT')) {
+				|| vm.$route.name === 'RECENT'
+				|| vm.$route.name === 'CATEGORIES')) {
 				return true
 			}
 
@@ -330,23 +357,34 @@ export default {
 				queryURI = generateUrl('/apps/radio/api/recent')
 			}
 
+			if (menuState !== 'CATEGORIES') {
+				vm.queryParams = {
+					limit: 20,
+					order: sortBy,
+					reverse: true,
+					offset: vm.tableData.length,
+				}
+			} else {
+				vm.queryParams = {}
+			}
+
 			try {
 				await axios.get(queryURI, {
-					params: {
-						limit: 20,
-						order: sortBy,
-						reverse: true,
-						offset: vm.tableData.length,
-					},
+					params: vm.queryParams,
 				})
 					.then(function(response) {
 						for (let i = 0; i < response.data.length; i++) {
 							const obj = response.data[i]
-							let blurHash = vm.blurHashes[obj.stationuuid]
-							if (!blurHash) {
-								blurHash = 'L1TSUA?bj[?b~qfQfQj[ayfQfQfQ'
+							if (obj.stationuuid) {
+								let blurHash = vm.blurHashes[obj.stationuuid]
+								if (!blurHash) {
+									blurHash = 'L1TSUA?bj[?b~qfQfQj[ayfQfQfQ'
+								}
+								response.data[i].blurHash = blurHash
+							} else {
+								response.data[i].type = 'folder'
+								response.data[i].path = vm.$route.path + '/' + obj.name
 							}
-							response.data[i].blurHash = blurHash
 						}
 						vm.tableData = vm.tableData.concat(response.data)
 						vm.pageLoading = false
diff --git a/src/components/Table.vue b/src/components/Table.vue
index 4989974..85ab037 100644
--- a/src/components/Table.vue
+++ b/src/components/Table.vue
@@ -10,7 +10,7 @@
 			</tr>
 		</thead>
 		<tbody>
-			<template v-if="stationData[0].type!=='folder'">
+			<template v-if="!isFolder">
 				<tr
 					v-for="(station, idx) in stationData"
 					:key="idx"
@@ -55,11 +55,11 @@
 					</td>
 				</tr>
 			</template>
-			<template v-if="stationData[0].type==='folder'">
+			<template v-if="isFolder">
 				<tr
 					v-for="(station, idx) in stationData"
 					:key="idx"
-					@click="doPlay(idx, station)">
+					@click="changeRoute(station.path)">
 					<td>
 						<span class="icon-folder" />
 					</td>
@@ -98,6 +98,16 @@ export default {
 	data: () => ({
 		activeItem: null,
 	}),
+	computed: {
+		isFolder() {
+			if (this.stationData[0]) {
+				if (this.stationData[0].type === 'folder') {
+					return true
+				}
+			}
+			return false
+		},
+	},
 	methods: {
 		doPlay(idx, station) {
 			this.activeItem = idx
@@ -109,6 +119,9 @@ export default {
 		toggleSidebar(station) {
 			this.$emit('toggleSidebar', station)
 		},
+		changeRoute(path) {
+			this.$router.push({ path })
+		},
 	},
 }
 </script>
diff --git a/src/router.js b/src/router.js
index 92b0f43..958eb18 100644
--- a/src/router.js
+++ b/src/router.js
@@ -33,7 +33,7 @@ const router = new Router({
 			name: 'FAVORITES',
 		},
 		{
-			path: '/categories',
+			path: '/categories/:category?/:query?',
 			component: Main,
 			name: 'CATEGORIES',
 		},

From a364043f5f8521d3804a27736c233e82937e75f0 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 21 Nov 2020 23:21:44 +0100
Subject: [PATCH 18/21] adding krankerl config

---
 Makefile                   | 3 +++
 krankerl.toml              | 6 ++++++
 src/components/Main.vue    | 2 +-
 src/components/Sidebar.vue | 1 -
 src/main.js                | 1 +
 5 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 krankerl.toml

diff --git a/Makefile b/Makefile
index 6083b8c..92f2140 100644
--- a/Makefile
+++ b/Makefile
@@ -49,3 +49,6 @@ clean:
 
 clean-dev:
 	rm -rf node_modules
+
+appstore:
+	krankerl package
diff --git a/krankerl.toml b/krankerl.toml
new file mode 100644
index 0000000..6c87aad
--- /dev/null
+++ b/krankerl.toml
@@ -0,0 +1,6 @@
+[package]
+before_cmds = [
+	"composer install --no-dev -o",
+	"npm install --deps",
+	"npm run build",
+]
diff --git a/src/components/Main.vue b/src/components/Main.vue
index 1a03c94..6ae2976 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -408,7 +408,7 @@ export default {
 		loadSettings() {
 
 			axios.defaults.headers.common = {
-				'User-Agent': 'Nextcloud Radio App/1.0',
+				'User-Agent': 'Nextcloud Radio App/' + this.$version,
 			}
 			this.$store.dispatch('getVolumeState')
 
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index d99c2f8..0b121f4 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -105,7 +105,6 @@ export default {
 			this.$emit('toggleSidebar')
 		},
 		copyLink() {
-			console.log(this.sidebarStation.favicon)
 			this.$copyText(this.urlResolved).then(
 				function() {
 					showSuccess(t('radio', 'Link copied to clipboard'))
diff --git a/src/main.js b/src/main.js
index 5d81ee7..d45075f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -38,6 +38,7 @@ Vue.prototype.n = translatePlural
 Vue.prototype.OC = window.OC
 Vue.prototype.OCA = window.OCA
 Vue.prototype.$apiUrl = 'https://de1.api.radio-browser.info'
+Vue.prototype.$version = '1.0'
 
 Vue.use(VueClipboard)
 Vue.use(VueBlurHash)

From 1b23c68948885a5ddc0e5058f0dc46c6f43c31c7 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sun, 22 Nov 2020 16:13:40 +0100
Subject: [PATCH 19/21] fix CORS and CSP

---
 lib/AppInfo/Application.php | 17 +++++++++++++++++
 package.json                |  1 +
 src/components/Main.vue     | 16 +++++++++++++---
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 63cc497..a4a0f07 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace OCA\Radio\AppInfo;
 
+use OC\Security\CSP\ContentSecurityPolicy;
 use OCA\Radio\Search\SearchProvider;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
@@ -30,8 +31,24 @@ class Application extends App implements IBootstrap {
 			return $c->get(IRequest::class);
 		});
 
+		$this->registerCsp();
+
 	}
 
 	public function boot(IBootContext $context): void {
 	}
+
+	/**
+	 * Allow radio-browser hosts in the csp
+	 *
+	 * @throws \OCP\AppFramework\QueryException
+	 */
+	public function registerCsp() {
+		$manager = $this->getContainer()->getServer()->getContentSecurityPolicyManager();
+		$policy  = new ContentSecurityPolicy();
+		$policy->addAllowedConnectDomain('https://de1.api.radio-browser.info');
+		$policy->addAllowedImageDomain('*');
+		$policy->addAllowedMediaDomain('*');
+		$manager->addDefaultPolicy($policy);
+	}
 }
diff --git a/package.json b/package.json
index 05957ed..ae04390 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
 		"@nextcloud/router": "^1.2.0",
 		"@nextcloud/vue": "^2.9.0",
 		"@nextcloud/vue-dashboard": "^1.0.1",
+		"axios": "^0.21.0",
 		"howler": "^2.2.1",
 		"music-metadata": "^7.5.0",
 		"style-loader": "^2.0.0",
diff --git a/src/components/Main.vue b/src/components/Main.vue
index 6ae2976..b366fa3 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -45,6 +45,7 @@ import Sidebar from './Sidebar'
 import { Howl, Howler } from 'howler'
 
 let audioPlayer = null
+const requesttoken = axios.defaults.headers.requesttoken
 
 export default {
 	name: 'Main',
@@ -187,6 +188,7 @@ export default {
 						codec: station.codec.toString(),
 						tags: station.tags.toString(),
 					}
+					axios.defaults.headers.requesttoken = requesttoken
 					await axios
 						.post(generateUrl('/apps/radio/api/favorites'), stationMap)
 						.then(response => {
@@ -242,6 +244,7 @@ export default {
 
 			/* Count click */
 			try {
+				delete axios.defaults.headers.requesttoken
 				axios.get(this.$apiUrl + '/json/url/' + station.stationuuid)
 			} catch (error) {
 				showError(t('radio', 'Unable to count play on remote API'))
@@ -268,6 +271,7 @@ export default {
 					codec: station.codec.toString(),
 					tags: station.tags.toString(),
 				}
+				axios.defaults.headers.requesttoken = requesttoken
 				await axios
 					.post(generateUrl('/apps/radio/api/recent'), stationMap)
 			} catch (error) {
@@ -369,6 +373,11 @@ export default {
 			}
 
 			try {
+				if (menuState === 'FAVORITES' || menuState === 'RECENT') {
+					axios.defaults.headers.requesttoken = requesttoken
+				} else {
+					delete axios.defaults.headers.requesttoken
+				}
 				await axios.get(queryURI, {
 					params: vm.queryParams,
 				})
@@ -407,9 +416,9 @@ export default {
 		},
 		loadSettings() {
 
-			axios.defaults.headers.common = {
-				'User-Agent': 'Nextcloud Radio App/' + this.$version,
-			}
+			// axios.defaults.headers.common = {
+			// 'User-Agent': 'Nextcloud Radio App/' + this.$version,
+			// }
 			this.$store.dispatch('getVolumeState')
 
 		},
@@ -417,6 +426,7 @@ export default {
 		async loadFavorites() {
 			const vm = this
 			try {
+				axios.defaults.headers.requesttoken = requesttoken
 				await axios.get(generateUrl('/apps/radio/api/favorites'))
 					.then(function(response) {
 						const favorites = []

From 577f88c39899fed636ae4f8204b3b8214f0de345 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sun, 22 Nov 2020 16:17:48 +0100
Subject: [PATCH 20/21] fix CORS and CSP

---
 src/components/Main.vue | 1 +
 src/router.js           | 2 ++
 src/store.js            | 5 +++++
 3 files changed, 8 insertions(+)

diff --git a/src/components/Main.vue b/src/components/Main.vue
index b366fa3..0d41c27 100644
--- a/src/components/Main.vue
+++ b/src/components/Main.vue
@@ -159,6 +159,7 @@ export default {
 							stationid = this.favorites[i][0]
 						}
 					}
+					axios.defaults.headers.requesttoken = requesttoken
 					await axios
 						.delete(generateUrl(`/apps/radio/api/favorites/${stationid}`))
 						.then(response => {
diff --git a/src/router.js b/src/router.js
index 958eb18..1b51d62 100644
--- a/src/router.js
+++ b/src/router.js
@@ -7,6 +7,7 @@ import Main from './components/Main'
 import store from './store.js'
 
 Vue.use(Router)
+const requesttoken = axios.defaults.headers.requesttoken
 
 const router = new Router({
 	base: generateUrl('/apps/radio/'),
@@ -52,6 +53,7 @@ router.beforeEach((to, from, next) => {
 		store.dispatch('setMenuState', to.name)
 		next()
 	} else {
+		axios.defaults.headers.requesttoken = requesttoken
 		axios
 			.get(generateUrl('/apps/radio/settings/menuState'))
 			.then(async response => {
diff --git a/src/store.js b/src/store.js
index 96e8d11..d57b1e8 100644
--- a/src/store.js
+++ b/src/store.js
@@ -5,6 +5,7 @@ import axios from '@nextcloud/axios'
 import { generateUrl } from '@nextcloud/router'
 
 Vue.use(Vuex)
+const requesttoken = axios.defaults.headers.requesttoken
 
 export default new Vuex.Store({
 	state: {
@@ -52,11 +53,13 @@ export default new Vuex.Store({
 			state.player.title = title
 		},
 		setMenuState(state, menuState) {
+			axios.defaults.headers.requesttoken = requesttoken
 			axios.post(generateUrl('/apps/radio/settings/menuState'), {
 				menuState,
 			})
 		},
 		getMenuState(state) {
+			axios.defaults.headers.requesttoken = requesttoken
 			axios
 				.get(generateUrl('/apps/radio/settings/menuState'))
 				.then(async response => {
@@ -67,11 +70,13 @@ export default new Vuex.Store({
 				})
 		},
 		setVolumeState(state, volumeState) {
+			axios.defaults.headers.requesttoken = requesttoken
 			axios.post(generateUrl('/apps/radio/settings/volumeState'), {
 				volumeState,
 			})
 		},
 		getVolumeState(state) {
+			axios.defaults.headers.requesttoken = requesttoken
 			axios
 				.get(generateUrl('/apps/radio/settings/volumeState'))
 				.then(async response => {

From 5a7e80e9c905ba87cbb143d33e7deefc53fdf1d3 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 23 Nov 2020 22:14:15 +0100
Subject: [PATCH 21/21] fix appinfo

---
 appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index 960a8dd..755c473 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,7 +5,7 @@
     <name>Radio</name>
     <summary>Radio listening app</summary>
     <description>Listening to your favorite radio stations in Nextcloud</description>
-    <version>1.0</version>
+    <version>1.0.0</version>
     <licence>MIT</licence>
     <author mail="onny@project-insanity.org" >Jonas Heinrich</author>
     <namespace>Radio</namespace>