From fd62a0382036f9eddcfdeae7d34134a334bdba2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 9 Mar 2023 18:06:14 +0100
Subject: [PATCH 01/91] Add hint text to create and edit a post of a group

---
 .../ContributionForm/ContributionForm.vue     | 59 ++++++++++++++-----
 webapp/locales/de.json                        |  3 +-
 webapp/locales/en.json                        |  3 +-
 webapp/pages/post/create.vue                  |  2 +-
 webapp/pages/post/edit/_id.vue                |  2 +-
 5 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 0428b2e23..5757d72b5 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -41,7 +41,7 @@
           {{ formData.title.length }}/{{ formSchema.title.max }}
           <base-icon v-if="errors && errors.title" name="warning" />
         </ds-chip>
-        <hc-editor
+        <editor
           :users="users"
           :value="formData.content"
           :hashtags="hashtags"
@@ -64,14 +64,33 @@
           {{ formData.categoryIds.length }} / 3
           <base-icon v-if="errors && errors.categoryIds" name="warning" />
         </ds-chip>
-        <div class="buttons">
-          <base-button data-test="cancel-button" :disabled="loading" @click="$router.back()" danger>
-            {{ $t('actions.cancel') }}
-          </base-button>
-          <base-button type="submit" icon="check" :loading="loading" :disabled="errors" filled>
-            {{ $t('actions.save') }}
-          </base-button>
-        </div>
+        <ds-flex class="buttons-footer" gutter="xxx-small">
+          <ds-flex-item width="3.5">
+            <!-- eslint-disable vue/no-v-text-v-html-on-component -->
+            <ds-text
+              v-if="groupId"
+              class="info-text"
+              v-html="$t('contribution.visibleOnlyForMembersOfGroup', { name: groupName })"
+            />
+            <!-- eslint-enable vue/no-v-text-v-html-on-component -->
+          </ds-flex-item>
+          <ds-flex-item width="0.25" />
+          <ds-flex-item style="align-self: flex-end">
+            <base-button
+              data-test="cancel-button"
+              :disabled="loading"
+              @click="$router.back()"
+              danger
+            >
+              {{ $t('actions.cancel') }}
+            </base-button>
+          </ds-flex-item>
+          <ds-flex-item style="align-self: flex-end">
+            <base-button type="submit" icon="check" :loading="loading" :disabled="errors" filled>
+              {{ $t('actions.save') }}
+            </base-button>
+          </ds-flex-item>
+        </ds-flex>
       </base-card>
     </template>
   </ds-form>
@@ -80,7 +99,7 @@
 <script>
 import gql from 'graphql-tag'
 import { mapGetters } from 'vuex'
-import HcEditor from '~/components/Editor/Editor'
+import Editor from '~/components/Editor/Editor'
 import PostMutations from '~/graphql/PostMutations.js'
 import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
 import ImageUploader from '~/components/Uploader/ImageUploader'
@@ -89,7 +108,7 @@ import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParams
 
 export default {
   components: {
-    HcEditor,
+    Editor,
     ImageUploader,
     PageParamsLink,
     CategoriesSelect,
@@ -99,8 +118,8 @@ export default {
       type: Object,
       default: () => ({}),
     },
-    groupId: {
-      type: String,
+    group: {
+      type: Object,
       default: () => null,
     },
   },
@@ -152,6 +171,12 @@ export default {
     contentLength() {
       return this.$filters.removeHtml(this.formData.content).length
     },
+    groupId() {
+      return this.group && this.group.id
+    },
+    groupName() {
+      return this.group && this.group.name
+    },
   },
   methods: {
     submit() {
@@ -284,8 +309,9 @@ export default {
     align-self: flex-end;
   }
 
-  > .buttons {
+  > .buttons-footer {
     align-self: flex-end;
+    width: 85%;
     margin-top: $space-base;
   }
 
@@ -297,5 +323,10 @@ export default {
       display: block;
     }
   }
+
+  .info-text {
+    display: inline;
+    vertical-align: middle;
+  }
 }
 </style>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 6a43a865a..ac6df3cda 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -289,7 +289,8 @@
       },
       "supportedFormats": "Füge ein Bild im Dateiformat JPG, PNG oder GIF ein"
     },
-    "title": "Titel"
+    "title": "Titel",
+    "visibleOnlyForMembersOfGroup": "Dieser Beitrag wird nur für Mitglieder der Gruppe „<b>{name}</b>“ sichtbar sein."
   },
   "delete": {
     "cancel": "Abbrechen",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 01ba4e8aa..a6faf4769 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -289,7 +289,8 @@
       },
       "supportedFormats": "Insert a picture of file format JPG, PNG or GIF"
     },
-    "title": "Title"
+    "title": "Title",
+    "visibleOnlyForMembersOfGroup": "This post will only be visible to members of the “<b>{name}</b>” group."
   },
   "delete": {
     "cancel": "Cancel",
diff --git a/webapp/pages/post/create.vue b/webapp/pages/post/create.vue
index 3dbf3ae8a..60309480d 100644
--- a/webapp/pages/post/create.vue
+++ b/webapp/pages/post/create.vue
@@ -9,7 +9,7 @@
     <ds-space margin="large" />
     <ds-flex :width="{ base: '100%' }" gutter="base">
       <ds-flex-item :width="{ base: '100%', md: 5 }">
-        <contribution-form :groupId="groupId" />
+        <contribution-form :group="group" />
       </ds-flex-item>
       <ds-flex-item :width="{ base: '100%', md: 1 }">&nbsp;</ds-flex-item>
     </ds-flex>
diff --git a/webapp/pages/post/edit/_id.vue b/webapp/pages/post/edit/_id.vue
index 391c97375..3813c3a95 100644
--- a/webapp/pages/post/edit/_id.vue
+++ b/webapp/pages/post/edit/_id.vue
@@ -9,7 +9,7 @@
     <ds-space margin="large" />
     <ds-flex :width="{ base: '100%' }" gutter="base">
       <ds-flex-item :width="{ base: '100%', md: 3 }">
-        <contribution-form :contribution="contribution" />
+        <contribution-form :contribution="contribution" :group="contribution.group" />
       </ds-flex-item>
       <ds-flex-item :width="{ base: '100%', md: 1 }">&nbsp;</ds-flex-item>
     </ds-flex>

From 691fa9b7443b69fe17f656d367f7a80d312874f8 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 13 Mar 2023 13:52:47 +0100
Subject: [PATCH 02/91] add key pendingMember to locales

---
 webapp/locales/de.json | 3 ++-
 webapp/locales/en.json | 3 ++-
 webapp/locales/es.json | 3 ++-
 webapp/locales/fr.json | 3 ++-
 webapp/locales/it.json | 3 ++-
 webapp/locales/nl.json | 3 ++-
 webapp/locales/pl.json | 3 ++-
 webapp/locales/pt.json | 3 ++-
 webapp/locales/ru.json | 3 ++-
 9 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index f4ad97d01..5ba26f30c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -447,7 +447,8 @@
     "in": "in",
     "joinLeaveButton": {
       "iAmMember": "Bin Mitglied",
-      "join": "Beitreten"
+      "join": "Beitreten",
+      "pendingMember": "Ausstehendes Mitglied"
     },
     "labelSlug": "Eindeutiger Gruppenname",
     "leaveModal": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index d44625b7f..a45be7837 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -447,7 +447,8 @@
     "in": "in",
     "joinLeaveButton": {
       "iAmMember": "I'm a member",
-      "join": "Join"
+      "join": "Join",
+      "pendingMember": "Pending member"
     },
     "labelSlug": "Unique group name",
     "leaveModal": {
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index a9668c9cf..a313b3dc4 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -302,7 +302,8 @@
     "goal": null,
     "joinLeaveButton": {
       "iAmMember": null,
-      "join": null
+      "join": null,
+      "pendingMember": null
     },
     "membersCount": null,
     "membersListTitle": null
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index 9149c1493..511ca4568 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -291,7 +291,8 @@
     "goal": null,
     "joinLeaveButton": {
       "iAmMember": null,
-      "join": null
+      "join": null,
+      "pendingMember": null
     },
     "membersCount": null,
     "membersListTitle": null
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index 3fc2f7e6b..548278fc9 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -299,7 +299,8 @@
     "goal": null,
     "joinLeaveButton": {
       "iAmMember": null,
-      "join": null
+      "join": null,
+      "pendingMember": null
     },
     "membersCount": null,
     "membersListTitle": null
diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
index 66f296eb0..27fbc8865 100644
--- a/webapp/locales/nl.json
+++ b/webapp/locales/nl.json
@@ -87,7 +87,8 @@
     "goal": null,
     "joinLeaveButton": {
       "iAmMember": null,
-      "join": null
+      "join": null,
+      "pendingMember": null
     },
     "membersCount": null,
     "membersListTitle": null
diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
index 41120dd26..3b7d1200a 100644
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@@ -171,7 +171,8 @@
     "goal": null,
     "joinLeaveButton": {
       "iAmMember": null,
-      "join": null
+      "join": null,
+      "pendingMember": null
     },
     "membersCount": null,
     "membersListTitle": null
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 9cde701d2..121fc903d 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -337,7 +337,8 @@
     "goal": null,
     "joinLeaveButton": {
       "iAmMember": null,
-      "join": null
+      "join": null,
+      "pendingMember": null
     },
     "membersCount": null,
     "membersListTitle": null
diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json
index 292f83831..4ae664cd8 100644
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@@ -316,7 +316,8 @@
     "goal": null,
     "joinLeaveButton": {
       "iAmMember": null,
-      "join": null
+      "join": null,
+      "pendingMember": null
     },
     "membersCount": null,
     "membersListTitle": null

From 6eccde6cbee099ff6792d0bc2480c00ffa7f4ed0 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 13 Mar 2023 13:55:08 +0100
Subject: [PATCH 03/91] change locales key roles.usual

---
 webapp/locales/de.json | 2 +-
 webapp/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 5ba26f30c..f341f405c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -483,7 +483,7 @@
       "admin": "Administrator",
       "owner": "Inhaber",
       "pending": "Ausstehendes Mitglied",
-      "usual": "Einfaches Mitglied"
+      "usual": "Mitglied"
     },
     "save": "Neue Gruppe anlegen",
     "type": "Öffentlichkeit der Gruppe",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index a45be7837..e8c50fc23 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -483,7 +483,7 @@
       "admin": "Administrator",
       "owner": "Owner",
       "pending": "Pending Member",
-      "usual": "Simple Member"
+      "usual": "Member"
     },
     "save": "Create new group",
     "type": "Visibility of the group",

From f38cf8428829843495c85dbdecb24d223618d37f Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Mon, 13 Mar 2023 17:02:37 +0100
Subject: [PATCH 04/91] add mode forpending user to join leave button

---
 webapp/components/Button/JoinLeaveButton.vue | 18 ++++++++++++++----
 webapp/pages/group/_id/_slug.vue             |  1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/webapp/components/Button/JoinLeaveButton.vue b/webapp/components/Button/JoinLeaveButton.vue
index 9bcb5042a..57337b4ac 100644
--- a/webapp/components/Button/JoinLeaveButton.vue
+++ b/webapp/components/Button/JoinLeaveButton.vue
@@ -24,6 +24,7 @@ export default {
     group: { type: Object, required: true },
     userId: { type: String, required: true },
     isMember: { type: Boolean, required: true },
+    isNonePendingMember: { type: Boolean, required: true },
     disabled: { type: Boolean, default: false },
     loading: { type: Boolean, default: false },
   },
@@ -35,15 +36,24 @@ export default {
   },
   computed: {
     icon() {
-      if (this.isMember && this.hovered) {
-        return 'close'
+      if (this.isMember) {
+        if (this.hovered) {
+          return 'close'
+        } else if (this.isNonePendingMember) {
+          return 'check'
+        } else {
+          return 'question-circle'
+        }
       } else {
-        return this.isMember ? 'check' : 'plus'
+        return 'plus'
       }
     },
     label() {
       if (this.isMember) {
-        return this.$t('group.joinLeaveButton.iAmMember')
+        if (this.isNonePendingMember) {
+          return this.$t('group.joinLeaveButton.iAmMember')
+        }
+        return this.$t('group.joinLeaveButton.pendingMember')
       } else {
         return this.$t('group.joinLeaveButton.join')
       }
diff --git a/webapp/pages/group/_id/_slug.vue b/webapp/pages/group/_id/_slug.vue
index 641b8802e..1eda842d3 100644
--- a/webapp/pages/group/_id/_slug.vue
+++ b/webapp/pages/group/_id/_slug.vue
@@ -102,6 +102,7 @@
               :group="group || {}"
               :userId="currentUser.id"
               :isMember="isGroupMember"
+              :isNonePendingMember="isGroupMemberNonePending"
               :disabled="isGroupOwner"
               :loading="$apollo.loading"
               @prepare="prepareJoinLeave"

From a46dd099ac1a57a9c98b29c50711f5d31ed018e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 14 Mar 2023 07:32:19 +0100
Subject: [PATCH 05/91] Fix webapp test by sending 'null' if group in post is
 undefined

---
 webapp/pages/post/edit/_id.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/webapp/pages/post/edit/_id.vue b/webapp/pages/post/edit/_id.vue
index 3813c3a95..d365709be 100644
--- a/webapp/pages/post/edit/_id.vue
+++ b/webapp/pages/post/edit/_id.vue
@@ -9,7 +9,10 @@
     <ds-space margin="large" />
     <ds-flex :width="{ base: '100%' }" gutter="base">
       <ds-flex-item :width="{ base: '100%', md: 3 }">
-        <contribution-form :contribution="contribution" :group="contribution.group" />
+        <contribution-form
+          :contribution="contribution"
+          :group="contribution && contribution.group ? contribution.group : null"
+        />
       </ds-flex-item>
       <ds-flex-item :width="{ base: '100%', md: 1 }">&nbsp;</ds-flex-item>
     </ds-flex>

From e2c82116ae1b2f46842f17a373289fdb7360e1b9 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 10:43:35 +0100
Subject: [PATCH 06/91] feat(webapp): GroupList shows 2 GroupItem per row

---
 webapp/components/Group/GroupList.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue
index 7618e5b57..93ad6e2b0 100644
--- a/webapp/components/Group/GroupList.vue
+++ b/webapp/components/Group/GroupList.vue
@@ -1,9 +1,12 @@
 <template>
-  <div class="group-list">
-    <ds-space margin-bottom="small" v-for="group in groups" :key="group.id">
+  <ds-flex class="group-list">
+    <ds-flex-item 
+      v-for="group in groups"
+      :key="group.id" 
+      :width="{ base: '47%' }">
       <group-teaser :group="group" />
-    </ds-space>
-  </div>
+    </ds-flex-item>
+  </ds-flex>
 </template>
 
 <script>
@@ -19,3 +22,8 @@ export default {
   },
 }
 </script>
+<style lang="scss">
+.ds-flex-item {
+  margin: 0em 1em 2em 1em;
+}
+</style>

From 2eed0986a57ab9f35d78c42edb70056f2f7665d7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 10:44:15 +0100
Subject: [PATCH 07/91] Change ds-container to ds-space to remove padding

---
 webapp/pages/groups.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/pages/groups.vue b/webapp/pages/groups.vue
index 386905c5b..6b895de72 100644
--- a/webapp/pages/groups.vue
+++ b/webapp/pages/groups.vue
@@ -4,7 +4,7 @@
       <tab-navigation :tabs="tabOptions" :activeTab="tabActive" @switch-tab="handleTab" />
     </ds-space>
     <ds-space margin="large" />
-    <ds-container>
+    <ds-space>
       <!-- create group -->
       <ds-space centered>
         <nuxt-link :to="{ name: 'group-create' }">
@@ -49,7 +49,7 @@
           @next="nextResults"
         />
       </ds-space>
-    </ds-container>
+    </ds-space>
   </div>
 </template>
 

From 19ac18af2af3ad1cf77107be620f7deed4e156f7 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 11:08:47 +0100
Subject: [PATCH 08/91] Base is now width 98% after md we switch to 48%

---
 webapp/components/Group/GroupList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue
index 93ad6e2b0..debe0e7a5 100644
--- a/webapp/components/Group/GroupList.vue
+++ b/webapp/components/Group/GroupList.vue
@@ -3,7 +3,7 @@
     <ds-flex-item 
       v-for="group in groups"
       :key="group.id" 
-      :width="{ base: '47%' }">
+      :width="{ base: '98%', sm: '98%', md: '48%' }">
       <group-teaser :group="group" />
     </ds-flex-item>
   </ds-flex>
@@ -24,6 +24,6 @@ export default {
 </script>
 <style lang="scss">
 .ds-flex-item {
-  margin: 0em 1em 2em 1em;
+  margin: 0 1% 2% 1%;
 }
 </style>

From fe422f5c777ad9f1c78cf1d5bdc2f5b650ee26f2 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Wed, 15 Mar 2023 11:39:03 +0100
Subject: [PATCH 09/91] add leave and tooltip key tolocales

---
 webapp/locales/de.json | 4 +++-
 webapp/locales/en.json | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index f341f405c..b2d802bc1 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -448,7 +448,9 @@
     "joinLeaveButton": {
       "iAmMember": "Bin Mitglied",
       "join": "Beitreten",
-      "pendingMember": "Ausstehendes Mitglied"
+      "leave": "Verlassen",
+      "pendingMember": "Ausstehendes Mitglied",
+      "tooltip": "Der Inhaber muss dich noch bestätigen."
     },
     "labelSlug": "Eindeutiger Gruppenname",
     "leaveModal": {
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index e8c50fc23..a718abdd7 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -448,7 +448,9 @@
     "joinLeaveButton": {
       "iAmMember": "I'm a member",
       "join": "Join",
-      "pendingMember": "Pending member"
+      "leave": "Leave",
+      "pendingMember": "Pending member",
+      "tooltip": "The owner has yet to confirm you."
     },
     "labelSlug": "Unique group name",
     "leaveModal": {

From 5d5100f08cb816efaf72a0225ca28fba62f1d0e3 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Wed, 15 Mar 2023 11:43:14 +0100
Subject: [PATCH 10/91] change join leave button behavior for pending user

---
 webapp/components/Button/JoinLeaveButton.vue | 28 ++++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/webapp/components/Button/JoinLeaveButton.vue b/webapp/components/Button/JoinLeaveButton.vue
index 57337b4ac..cd91a029e 100644
--- a/webapp/components/Button/JoinLeaveButton.vue
+++ b/webapp/components/Button/JoinLeaveButton.vue
@@ -6,6 +6,7 @@
     :icon="icon"
     :filled="isMember && !hovered"
     :danger="isMember && hovered"
+    v-tooltip="tooltip"
     @mouseenter.native="onHover"
     @mouseleave.native="hovered = false"
     @click.prevent="toggle"
@@ -37,27 +38,32 @@ export default {
   computed: {
     icon() {
       if (this.isMember) {
-        if (this.hovered) {
-          return 'close'
-        } else if (this.isNonePendingMember) {
-          return 'check'
+        if (this.isNonePendingMember) {
+          return this.hovered ? 'close' : 'check'
         } else {
-          return 'question-circle'
+          return this.hovered ? 'close' : 'question-circle'
         }
-      } else {
-        return 'plus'
       }
+      return 'plus'
     },
     label() {
       if (this.isMember) {
         if (this.isNonePendingMember) {
-          return this.$t('group.joinLeaveButton.iAmMember')
+          return this.hovered ? this.$t('group.joinLeaveButton.leave') : this.$t('group.joinLeaveButton.iAmMember')
+        } else {
+          return this.$t('group.joinLeaveButton.pendingMember')
         }
-        return this.$t('group.joinLeaveButton.pendingMember')
-      } else {
-        return this.$t('group.joinLeaveButton.join')
       }
+      return this.$t('group.joinLeaveButton.join')
     },
+    tooltip() {
+      return {
+        content: this.$t('group.joinLeaveButton.tooltip'),
+        placement: 'right',
+        show: this.isMember && !this.isNonePendingMember && this.hovered,
+        trigger: this.isMember && !this.isNonePendingMember ? 'hover' : 'manual'
+      }
+    }
   },
   watch: {
     isMember() {

From be130f849a5ebf6a865c17a0affcae0d82c1dee9 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 11:44:13 +0100
Subject: [PATCH 11/91] Fix linting.

---
 webapp/components/Group/GroupList.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue
index debe0e7a5..692e518d8 100644
--- a/webapp/components/Group/GroupList.vue
+++ b/webapp/components/Group/GroupList.vue
@@ -1,9 +1,10 @@
 <template>
   <ds-flex class="group-list">
-    <ds-flex-item 
+    <ds-flex-item
       v-for="group in groups"
-      :key="group.id" 
-      :width="{ base: '98%', sm: '98%', md: '48%' }">
+      :key="group.id"
+      :width="{ base: '98%', sm: '98%', md: '48%' }"
+    >
       <group-teaser :group="group" />
     </ds-flex-item>
   </ds-flex>

From 176050082b1f4da5104d45d0ce05fbdd27d9e381 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 11:55:18 +0100
Subject: [PATCH 12/91] Add scoped to style

---
 webapp/components/Group/GroupList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue
index 692e518d8..8ee027ce6 100644
--- a/webapp/components/Group/GroupList.vue
+++ b/webapp/components/Group/GroupList.vue
@@ -23,7 +23,7 @@ export default {
   },
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .ds-flex-item {
   margin: 0 1% 2% 1%;
 }

From a67e3452da4db61613ba518e5c51e16f93de15dd Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 15 Mar 2023 11:57:28 +0100
Subject: [PATCH 13/91] do not delete migrations

---
 backend/src/db/factories.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/db/factories.js b/backend/src/db/factories.js
index ecc792736..44af5bbea 100644
--- a/backend/src/db/factories.js
+++ b/backend/src/db/factories.js
@@ -23,6 +23,7 @@ export const cleanDatabase = async (options = {}) => {
       return transaction.run(
         `
           MATCH (everything)
+          WHERE NOT 'Migration' IN labels(everything)
           DETACH DELETE everything
         `,
       )

From 6223edcb2081e7146199e83ed46882570db56146 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 12:02:19 +0100
Subject: [PATCH 14/91] Change style ds-flex-item to class name group-item

---
 webapp/components/Group/GroupList.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp/components/Group/GroupList.vue b/webapp/components/Group/GroupList.vue
index 8ee027ce6..dbde61ac6 100644
--- a/webapp/components/Group/GroupList.vue
+++ b/webapp/components/Group/GroupList.vue
@@ -4,6 +4,7 @@
       v-for="group in groups"
       :key="group.id"
       :width="{ base: '98%', sm: '98%', md: '48%' }"
+      class="group-item"
     >
       <group-teaser :group="group" />
     </ds-flex-item>
@@ -24,7 +25,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.ds-flex-item {
+.group-item {
   margin: 0 1% 2% 1%;
 }
 </style>

From 19b81a85b12a45b2e15228bf6d16762faf9fa516 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 15 Mar 2023 12:17:10 +0100
Subject: [PATCH 15/91] Change padding-bottom from 5px to 20px

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

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index bb6eff0f4..0094f5706 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -346,7 +346,7 @@ export default {
   position: fixed;
   z-index: 6;
   margin-top: -35px;
-  padding: 20px 10px 5px 10px;
+  padding: 20px 10px 20px 10px;
   background-color: #f5f4f6;
 }
 @media screen and (max-width: 656px) {

From 67d15db533b2a52900794730c82fbcffed7e04cb Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 15 Mar 2023 12:25:41 +0100
Subject: [PATCH 16/91] cluster upgrade to specific version

---
 deployment/scripts/cluster.upgrade.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/deployment/scripts/cluster.upgrade.sh b/deployment/scripts/cluster.upgrade.sh
index 2502a778a..1aec2cf18 100755
--- a/deployment/scripts/cluster.upgrade.sh
+++ b/deployment/scripts/cluster.upgrade.sh
@@ -7,7 +7,13 @@ SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 # configuration
 CONFIGURATION=${CONFIGURATION:-"example"}
 KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
-VALUES=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubernetes/values.yaml
+VALUES=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubernetes/values.
+DOCKERHUB_OCELOT_TAG=${DOCKERHUB_OCELOT_TAG:-"latest"}
 
 # upgrade with helm
-helm --kubeconfig=${KUBECONFIG} upgrade ocelot --values ${VALUES} ${SCRIPT_DIR}/../src/kubernetes/ --debug --timeout 10m
\ No newline at end of file
+helm --kubeconfig=${KUBECONFIG} upgrade ocelot \
+  --values ${VALUES} \
+  --set appVersion="${DOCKERHUB_OCELOT_TAG}"
+  ${SCRIPT_DIR}/../src/kubernetes/ \
+  --debug \
+  --timeout 10m
\ No newline at end of file

From 40a80fa93a703fcd9115f8c3c92aeee9555fe2d8 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Wed, 15 Mar 2023 12:45:54 +0100
Subject: [PATCH 17/91] update webapp/locales/de.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 webapp/locales/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index b2d802bc1..c63e1790c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -450,7 +450,7 @@
       "join": "Beitreten",
       "leave": "Verlassen",
       "pendingMember": "Ausstehendes Mitglied",
-      "tooltip": "Der Inhaber muss dich noch bestätigen."
+      "tooltip": "Der Gruppeninhaber muss dich noch bestätigen."
     },
     "labelSlug": "Eindeutiger Gruppenname",
     "leaveModal": {

From 6a66c99a7dffd5d447c9ff1ada904045ca969fb9 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Wed, 15 Mar 2023 12:46:10 +0100
Subject: [PATCH 18/91] update webapp/locales/en.json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>
---
 webapp/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index a718abdd7..e00075919 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -450,7 +450,7 @@
       "join": "Join",
       "leave": "Leave",
       "pendingMember": "Pending member",
-      "tooltip": "The owner has yet to confirm you."
+      "tooltip": "The group owner has yet to confirm you."
     },
     "labelSlug": "Unique group name",
     "leaveModal": {

From 6896536a3b5d98bb2e1d7890013fad9c22500764 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 15 Mar 2023 13:43:34 +0100
Subject: [PATCH 19/91] trigger build success on stage repo

---
 .github/workflows/publish.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 4452f2286..94e3ffe66 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -300,6 +300,14 @@ jobs:
           repository: ${{ github.repository }}
           client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
 
+      - name: Repository Dispatch stage.ocelot.social
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          token: ${{ github.token }}
+          event-type: trigger-build-success
+          repository: 'Ocelot-Social-Community/stage.ocelot.social'
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
+
   # ##############################################################################
   # # JOB: KUBERNETES DEPLOY ACTUAL/LATEST VERSION ######################################
   # ##############################################################################

From 28952567b0bf69f2340bdde5bc48bb59f388bd20 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 15 Mar 2023 15:27:22 +0100
Subject: [PATCH 20/91] feat(backend): notifications for groups

---
 .../notifications/notificationsMiddleware.js  | 44 +++++++++++
 .../notificationsMiddleware.spec.js           | 79 +++++++++++++++++++
 .../schema/types/enum/ReasonNotification.gql  |  1 +
 backend/src/schema/types/type/NOTIFIED.gql    |  3 +-
 4 files changed, 126 insertions(+), 1 deletion(-)

diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js
index a871605f7..e619fcee8 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.js
@@ -51,6 +51,19 @@ const publishNotifications = async (context, promises) => {
   })
 }
 
+
+const handleJoinGroup = async (resolve, root, args, context, resolveInfo) => {
+  const { groupId } = args
+  const user = await resolve(root, args, context, resolveInfo)
+  if (user) {
+    await publishNotifications(
+      context,
+      [notifyOwnersOfGroup(groupId, 'user_joined_group', context)]
+    )
+  }
+  return user
+}
+
 const handleContentDataOfPost = async (resolve, root, args, context, resolveInfo) => {
   const idsOfUsers = extractMentionedUsers(args.content)
   const post = await resolve(root, args, context, resolveInfo)
@@ -94,6 +107,36 @@ const postAuthorOfComment = async (commentId, { context }) => {
   }
 }
 
+const notifyOwnersOfGroup = async (groupId, reason, context) => {
+  const cypher = `
+    MATCH (group:Group { id: $groupId })<-[membership:MEMBER_OF]-(owner:User)
+    WHERE membership.role = 'owner'
+    WITH owner, group
+    MERGE (group)-[notification:NOTIFIED {reason: $reason}]->(owner)
+    WITH group, owner, notification
+    SET notification.read = FALSE
+    SET notification.createdAt = COALESCE(notification.createdAt, toString(datetime()))
+    SET notification.updatedAt = toString(datetime())
+    RETURN notification {.*, from: group, to: properties(owner)}
+  `
+  const session = context.driver.session()
+  const writeTxResultPromise = session.writeTransaction(async (transaction) => {
+    const notificationTransactionResponse = await transaction.run(cypher, {
+      groupId,
+      reason,
+    })
+    return notificationTransactionResponse.records.map((record) => record.get('notification'))
+  })
+  try {
+    const notifications = await writeTxResultPromise
+    return notifications
+  } catch (error) {
+    throw new Error(error)    
+  } finally {
+    session.close()
+  }
+}
+
 const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
   if (!(idsOfUsers && idsOfUsers.length)) return []
   await validateNotifyUsers(label, reason)
@@ -188,5 +231,6 @@ export default {
     UpdatePost: handleContentDataOfPost,
     CreateComment: handleContentDataOfComment,
     UpdateComment: handleContentDataOfComment,
+    JoinGroup: handleJoinGroup,
   },
 }
diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
index a8a5d396b..42ff5a0c6 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
@@ -3,6 +3,14 @@ import { cleanDatabase } from '../../db/factories'
 import { createTestClient } from 'apollo-server-testing'
 import { getNeode, getDriver } from '../../db/neo4j'
 import createServer, { pubsub } from '../../server'
+import {
+  createGroupMutation,
+  joinGroupMutation,
+  leaveGroupMutation,
+  changeGroupMemberRoleMutation,
+  removeUserFromGroupMutation,
+} from '../../graphql/groups'
+
 
 let server, query, mutate, notifiedUser, authenticatedUser
 let publishSpy
@@ -102,6 +110,9 @@ describe('notifications', () => {
             id
             content
           }
+          ... on Group {
+            id
+          }
         }
       }
     }
@@ -616,4 +627,72 @@ describe('notifications', () => {
       })
     })
   })
+
+  describe('group notifications', () => {
+    let groupOwner
+    let group
+    
+    beforeEach(async () => {
+      groupOwner = await neode.create(
+        'User',
+        {
+          id: 'group-owner',
+          name: 'Group Owner',
+          slug: 'group-owner',
+        },
+        {
+          email: 'owner@example.org',
+          password: '1234',
+        },
+      )
+      authenticatedUser = await groupOwner.toJson()
+      await mutate({
+        mutation: createGroupMutation(),
+        variables: {
+          id: 'closed-group',
+          name: 'The Closed Group',
+          about: 'Will test the closed group!',
+          description: 'Some description' + Array(50).join('_'),
+          groupType: 'public',
+          actionRadius: 'regional',
+          categoryIds,
+        },
+      })
+    })
+
+    describe('user joins group', () => {
+      beforeEach(async () => {
+        authenticatedUser = await notifiedUser.toJson()
+        await mutate({
+          mutation: joinGroupMutation(),
+          variables: {
+            groupId: 'closed-group',
+            userId: authenticatedUser.id,
+          },
+        })
+        authenticatedUser = await groupOwner.toJson()
+      })
+
+      it('works', async () => {
+        await expect(query({
+          query: notificationQuery,
+        })).resolves.toMatchObject({
+          data: {
+            notifications: [
+              {
+                read: false,
+                reason: 'user_joined_group',
+                createdAt: expect.any(String),
+                from: {
+                  __typename: 'Group',
+                  id: 'closed-group',
+                }
+              },
+            ],
+          },
+          errors: undefined,
+        })
+      })
+    })
+  })
 })
diff --git a/backend/src/schema/types/enum/ReasonNotification.gql b/backend/src/schema/types/enum/ReasonNotification.gql
index e870e01dc..e5a348398 100644
--- a/backend/src/schema/types/enum/ReasonNotification.gql
+++ b/backend/src/schema/types/enum/ReasonNotification.gql
@@ -2,4 +2,5 @@ enum ReasonNotification {
   mentioned_in_post
   mentioned_in_comment
   commented_on_post
+  user_joined_group
 }
diff --git a/backend/src/schema/types/type/NOTIFIED.gql b/backend/src/schema/types/type/NOTIFIED.gql
index 864cdea4d..ea02ee87e 100644
--- a/backend/src/schema/types/type/NOTIFIED.gql
+++ b/backend/src/schema/types/type/NOTIFIED.gql
@@ -8,7 +8,7 @@ type NOTIFIED {
   reason: NotificationReason
 }
 
-union NotificationSource = Post | Comment
+union NotificationSource = Post | Comment | Group
 
 enum NotificationOrdering {
   createdAt_asc
@@ -21,6 +21,7 @@ enum NotificationReason {
   mentioned_in_post
   mentioned_in_comment
   commented_on_post
+  user_joined_group
 }
 
 type Query {

From 10c02c251e48748e31a0d7a2b9353676bc4d95ec Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 15 Mar 2023 16:23:45 +0100
Subject: [PATCH 21/91] group notifications in notification dropdown

---
 .../components/Notification/Notification.vue   | 18 ++++++++++++------
 webapp/graphql/User.js                         |  8 ++++++++
 webapp/locales/de.json                         |  3 ++-
 webapp/locales/en.json                         |  3 ++-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Notification/Notification.vue b/webapp/components/Notification/Notification.vue
index acb83b028..931295c35 100644
--- a/webapp/components/Notification/Notification.vue
+++ b/webapp/components/Notification/Notification.vue
@@ -1,16 +1,16 @@
 <template>
   <article :class="{ '--read': notification.read, notification: true }">
     <client-only>
-      <user-teaser :user="from.author" :date-time="from.createdAt" />
+      <user-teaser :user="isGroup ? to : from.author" :date-time="from.createdAt" />
     </client-only>
     <p class="description">{{ $t(`notifications.reason.${notification.reason}`) }}</p>
     <nuxt-link
       class="link"
-      :to="{ name: 'post-id-slug', params, ...hashParam }"
+      :to="{ name: isGroup ? 'group' : 'post-id-slug', params, hashParam }"
       @click.native="$emit('read')"
     >
       <base-card wideContent>
-        <h2 class="title">{{ from.title || from.post.title }}</h2>
+        <h2 class="title">{{ from.title || from.groupName || from.post.title }}</h2>
         <p>
           <strong v-if="isComment" class="comment">{{ $t(`notifications.comment`) }}:</strong>
           {{ from.contentExcerpt | removeHtml }}
@@ -38,14 +38,20 @@ export default {
     from() {
       return this.notification.from
     },
+    to() {
+      return this.notification.to
+    },
     isComment() {
       return this.from.__typename === 'Comment'
     },
+    isGroup() {
+      return this.from.__typename === 'Group'
+    },
     params() {
-      const post = this.isComment ? this.from.post : this.from
+      const target = this.isComment ? this.from.post : this.from
       return {
-        id: post.id,
-        slug: post.slug,
+        id: target.id,
+        slug: target.slug,
       }
     },
     hashParam() {
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index a9e58a719..4aff0baaf 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -6,6 +6,7 @@ import {
   userFragment,
   postFragment,
   commentFragment,
+  groupFragment,
 } from './Fragments'
 
 export const profileUserQuery = (i18n) => {
@@ -113,6 +114,7 @@ export const notificationQuery = (_i18n) => {
     ${userFragment}
     ${commentFragment}
     ${postFragment}
+    ${groupFragment}
 
     query ($read: Boolean, $orderBy: NotificationOrdering, $first: Int, $offset: Int) {
       notifications(read: $read, orderBy: $orderBy, first: $first, offset: $offset) {
@@ -121,6 +123,9 @@ export const notificationQuery = (_i18n) => {
         reason
         createdAt
         updatedAt
+        to {
+          ...user
+        }
         from {
           __typename
           ... on Post {
@@ -141,6 +146,9 @@ export const notificationQuery = (_i18n) => {
               }
             }
           }
+          ... on Group {
+            ...group
+          }
         }
       }
     }
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index f4ad97d01..830b9efc7 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -649,7 +649,8 @@
     "reason": {
       "commented_on_post": "Hat Deinen Beitrag kommentiert …",
       "mentioned_in_comment": "Hat Dich in einem Kommentar erwähnt …",
-      "mentioned_in_post": "Hat Dich in einem Beitrag erwähnt …"
+      "mentioned_in_post": "Hat Dich in einem Beitrag erwähnt …",
+      "user_joined_group": "Ist Deiner Gruppe beigetreten …"
     },
     "title": "Benachrichtigungen",
     "user": "Nutzer"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index d44625b7f..7e8e0bbaa 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -649,7 +649,8 @@
     "reason": {
       "commented_on_post": "Commented on your post …",
       "mentioned_in_comment": "Mentioned you in a comment …",
-      "mentioned_in_post": "Mentioned you in a post …"
+      "mentioned_in_post": "Mentioned you in a post …",
+      "user_joined_group": "Joined your group …"
     },
     "title": "Notifications",
     "user": "User"

From 60b9262d7a010bd47113f1992d195f557c2e3c63 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 15 Mar 2023 16:35:30 +0100
Subject: [PATCH 22/91] new locales

---
 .../NotificationsTable/NotificationsTable.vue | 23 ++++++++++++++-----
 webapp/locales/de.json                        |  2 +-
 webapp/locales/en.json                        |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/webapp/components/NotificationsTable/NotificationsTable.vue b/webapp/components/NotificationsTable/NotificationsTable.vue
index 7065b2624..70d187d04 100644
--- a/webapp/components/NotificationsTable/NotificationsTable.vue
+++ b/webapp/components/NotificationsTable/NotificationsTable.vue
@@ -39,7 +39,9 @@
                     <ds-space margin-bottom="base">
                       <client-only>
                         <user-teaser
-                          :user="notification.from.author"
+                          :user="
+                            isGroup(notification.from) ? notification.to : notification.from.author
+                          "
                           :date-time="notification.from.createdAt"
                           :class="{ 'notification-status': notification.read }"
                         />
@@ -61,14 +63,18 @@
                     class="notification-mention-post"
                     :class="{ 'notification-status': notification.read }"
                     :to="{
-                      name: 'post-id-slug',
+                      name: isGroup(notification.from) ? 'group' : 'post-id-slug',
                       params: params(notification.from),
                       hash: hashParam(notification.from),
                     }"
                     @click.native="markNotificationAsRead(notification.from.id)"
                   >
                     <b>
-                      {{ notification.from.title || notification.from.post.title | truncate(50) }}
+                      {{
+                        notification.from.title ||
+                        notification.from.groupName ||
+                        notification.from.post.title | truncate(50)
+                      }}
                     </b>
                   </nuxt-link>
                 </base-card>
@@ -132,11 +138,16 @@ export default {
     isComment(notificationSource) {
       return notificationSource.__typename === 'Comment'
     },
+    isGroup(notificationSource) {
+      return notificationSource.__typename === 'Group'
+    },
     params(notificationSource) {
-      const post = this.isComment(notificationSource) ? notificationSource.post : notificationSource
+      const target = this.isComment(notificationSource)
+        ? notificationSource.post
+        : notificationSource
       return {
-        id: post.id,
-        slug: post.slug,
+        id: target.id,
+        slug: target.slug,
       }
     },
     hashParam(notificationSource) {
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 830b9efc7..b5651675e 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -645,7 +645,7 @@
     },
     "markAllAsRead": "Markiere alle als gelesen",
     "pageLink": "Alle Benachrichtigungen",
-    "post": "Beitrag",
+    "post": "Beitrag oder Gruppe",
     "reason": {
       "commented_on_post": "Hat Deinen Beitrag kommentiert …",
       "mentioned_in_comment": "Hat Dich in einem Kommentar erwähnt …",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 7e8e0bbaa..ff5be4470 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -645,7 +645,7 @@
     },
     "markAllAsRead": "Mark all as read",
     "pageLink": "All notifications",
-    "post": "Post",
+    "post": "Post or Group",
     "reason": {
       "commented_on_post": "Commented on your post …",
       "mentioned_in_comment": "Mentioned you in a comment …",

From 997dff4decfb333134326f81c3f6e7bcc56643e9 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 15 Mar 2023 17:34:16 +0100
Subject: [PATCH 23/91] add related user to notified model

---
 .../notifications/notificationsMiddleware.js  | 16 +++++-----
 .../notificationsMiddleware.spec.js           | 32 ++++++++++++-------
 backend/src/schema/resolvers/notifications.js | 19 ++++++++---
 backend/src/schema/types/type/NOTIFIED.gql    |  1 +
 4 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js
index e619fcee8..80c78cfeb 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.js
@@ -51,15 +51,13 @@ const publishNotifications = async (context, promises) => {
   })
 }
 
-
 const handleJoinGroup = async (resolve, root, args, context, resolveInfo) => {
-  const { groupId } = args
+  const { groupId, userId } = args
   const user = await resolve(root, args, context, resolveInfo)
   if (user) {
-    await publishNotifications(
-      context,
-      [notifyOwnersOfGroup(groupId, 'user_joined_group', context)]
-    )
+    await publishNotifications(context, [
+      notifyOwnersOfGroup(groupId, userId, 'user_joined_group', context),
+    ])
   }
   return user
 }
@@ -107,7 +105,7 @@ const postAuthorOfComment = async (commentId, { context }) => {
   }
 }
 
-const notifyOwnersOfGroup = async (groupId, reason, context) => {
+const notifyOwnersOfGroup = async (groupId, userId, reason, context) => {
   const cypher = `
     MATCH (group:Group { id: $groupId })<-[membership:MEMBER_OF]-(owner:User)
     WHERE membership.role = 'owner'
@@ -117,6 +115,7 @@ const notifyOwnersOfGroup = async (groupId, reason, context) => {
     SET notification.read = FALSE
     SET notification.createdAt = COALESCE(notification.createdAt, toString(datetime()))
     SET notification.updatedAt = toString(datetime())
+    SET notification.relatedUserId = $userId
     RETURN notification {.*, from: group, to: properties(owner)}
   `
   const session = context.driver.session()
@@ -124,6 +123,7 @@ const notifyOwnersOfGroup = async (groupId, reason, context) => {
     const notificationTransactionResponse = await transaction.run(cypher, {
       groupId,
       reason,
+      userId,
     })
     return notificationTransactionResponse.records.map((record) => record.get('notification'))
   })
@@ -131,7 +131,7 @@ const notifyOwnersOfGroup = async (groupId, reason, context) => {
     const notifications = await writeTxResultPromise
     return notifications
   } catch (error) {
-    throw new Error(error)    
+    throw new Error(error)
   } finally {
     session.close()
   }
diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
index 42ff5a0c6..cca84df0e 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
@@ -6,12 +6,11 @@ import createServer, { pubsub } from '../../server'
 import {
   createGroupMutation,
   joinGroupMutation,
-  leaveGroupMutation,
-  changeGroupMemberRoleMutation,
-  removeUserFromGroupMutation,
+  //  leaveGroupMutation,
+  //  changeGroupMemberRoleMutation,
+  //  removeUserFromGroupMutation,
 } from '../../graphql/groups'
 
-
 let server, query, mutate, notifiedUser, authenticatedUser
 let publishSpy
 const driver = getDriver()
@@ -100,6 +99,9 @@ describe('notifications', () => {
         read
         reason
         createdAt
+        relatedUser {
+          id
+        }
         from {
           __typename
           ... on Post {
@@ -196,6 +198,7 @@ describe('notifications', () => {
                       id: 'c47',
                       content: commentContent,
                     },
+                    relatedUser: null,
                   },
                 ],
               },
@@ -368,6 +371,7 @@ describe('notifications', () => {
                       id: 'p47',
                       content: expectedUpdatedContent,
                     },
+                    relatedUser: null,
                   },
                 ],
               },
@@ -524,6 +528,7 @@ describe('notifications', () => {
                       id: 'c47',
                       content: commentContent,
                     },
+                    relatedUser: null,
                   },
                 ],
               },
@@ -558,6 +563,7 @@ describe('notifications', () => {
                       id: 'c47',
                       content: commentContent,
                     },
+                    relatedUser: null,
                   },
                 ],
               },
@@ -630,8 +636,7 @@ describe('notifications', () => {
 
   describe('group notifications', () => {
     let groupOwner
-    let group
-    
+
     beforeEach(async () => {
       groupOwner = await neode.create(
         'User',
@@ -673,10 +678,12 @@ describe('notifications', () => {
         authenticatedUser = await groupOwner.toJson()
       })
 
-      it('works', async () => {
-        await expect(query({
-          query: notificationQuery,
-        })).resolves.toMatchObject({
+      it('has the notification in database', async () => {
+        await expect(
+          query({
+            query: notificationQuery,
+          }),
+        ).resolves.toMatchObject({
           data: {
             notifications: [
               {
@@ -686,7 +693,10 @@ describe('notifications', () => {
                 from: {
                   __typename: 'Group',
                   id: 'closed-group',
-                }
+                },
+                relatedUser: {
+                  id: 'you',
+                },
               },
             ],
           },
diff --git a/backend/src/schema/resolvers/notifications.js b/backend/src/schema/resolvers/notifications.js
index a2b850336..042a55c13 100644
--- a/backend/src/schema/resolvers/notifications.js
+++ b/backend/src/schema/resolvers/notifications.js
@@ -47,12 +47,21 @@ export default {
           ` 
           MATCH (resource {deleted: false, disabled: false})-[notification:NOTIFIED]->(user:User {id:$id})
           ${whereClause}
-          WITH user, notification, resource,
+          OPTIONAL MATCH (resource)<-[membership:MEMBER_OF]-(relatedUser:User { id: notification.relatedUserId })
+          WITH user, notification, resource, membership, relatedUser,
           [(resource)<-[:WROTE]-(author:User) | author {.*}] AS authors,
-          [(resource)-[:COMMENTS]->(post:Post)<-[:WROTE]-(author:User) | post{.*, author: properties(author)} ] AS posts
-          WITH resource, user, notification, authors, posts,
-          resource {.*, __typename: labels(resource)[0], author: authors[0], post: posts[0]} AS finalResource
-          RETURN notification {.*, from: finalResource, to: properties(user)}
+          [(resource)-[:COMMENTS]->(post:Post)<-[:WROTE]-(author:User) | post {.*, author: properties(author)} ] AS posts
+          WITH resource, user, notification, authors, posts, relatedUser, membership,
+          resource {.*,
+            __typename: labels(resource)[0],
+            author: authors[0],
+            post: posts[0],
+            myRole: membership.role } AS finalResource
+          RETURN notification {.*,
+            from: finalResource,
+            to: properties(user),
+            relatedUser: properties(relatedUser)
+          }
           ${orderByClause}
           ${offset} ${limit}
           `,
diff --git a/backend/src/schema/types/type/NOTIFIED.gql b/backend/src/schema/types/type/NOTIFIED.gql
index ea02ee87e..213e4c512 100644
--- a/backend/src/schema/types/type/NOTIFIED.gql
+++ b/backend/src/schema/types/type/NOTIFIED.gql
@@ -6,6 +6,7 @@ type NOTIFIED {
   updatedAt: String!
   read: Boolean
   reason: NotificationReason
+  relatedUser: User
 }
 
 union NotificationSource = Post | Comment | Group

From ab58c569d057b909a1f63950f1d8af82a1c0ae65 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Wed, 15 Mar 2023 17:49:52 +0100
Subject: [PATCH 24/91] related user for group notifications

---
 webapp/components/Notification/Notification.vue            | 7 ++-----
 .../components/NotificationsTable/NotificationsTable.vue   | 4 ++--
 webapp/graphql/User.js                                     | 3 +++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/webapp/components/Notification/Notification.vue b/webapp/components/Notification/Notification.vue
index 931295c35..3566be6d8 100644
--- a/webapp/components/Notification/Notification.vue
+++ b/webapp/components/Notification/Notification.vue
@@ -1,12 +1,12 @@
 <template>
   <article :class="{ '--read': notification.read, notification: true }">
     <client-only>
-      <user-teaser :user="isGroup ? to : from.author" :date-time="from.createdAt" />
+      <user-teaser :user="isGroup ? notification.relatedUser : from.author" :date-time="from.createdAt" />
     </client-only>
     <p class="description">{{ $t(`notifications.reason.${notification.reason}`) }}</p>
     <nuxt-link
       class="link"
-      :to="{ name: isGroup ? 'group' : 'post-id-slug', params, hashParam }"
+      :to="{ name: isGroup ? 'group-id-slug' : 'post-id-slug', params, hashParam }"
       @click.native="$emit('read')"
     >
       <base-card wideContent>
@@ -38,9 +38,6 @@ export default {
     from() {
       return this.notification.from
     },
-    to() {
-      return this.notification.to
-    },
     isComment() {
       return this.from.__typename === 'Comment'
     },
diff --git a/webapp/components/NotificationsTable/NotificationsTable.vue b/webapp/components/NotificationsTable/NotificationsTable.vue
index 70d187d04..5b043e9e5 100644
--- a/webapp/components/NotificationsTable/NotificationsTable.vue
+++ b/webapp/components/NotificationsTable/NotificationsTable.vue
@@ -40,7 +40,7 @@
                       <client-only>
                         <user-teaser
                           :user="
-                            isGroup(notification.from) ? notification.to : notification.from.author
+                            isGroup(notification.from) ? notification.relatedUser : notification.from.author
                           "
                           :date-time="notification.from.createdAt"
                           :class="{ 'notification-status': notification.read }"
@@ -63,7 +63,7 @@
                     class="notification-mention-post"
                     :class="{ 'notification-status': notification.read }"
                     :to="{
-                      name: isGroup(notification.from) ? 'group' : 'post-id-slug',
+                      name: isGroup(notification.from) ? 'group-id-slug' : 'post-id-slug',
                       params: params(notification.from),
                       hash: hashParam(notification.from),
                     }"
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index 4aff0baaf..1432cd31c 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -150,6 +150,9 @@ export const notificationQuery = (_i18n) => {
             ...group
           }
         }
+        relatedUser {
+          ...user
+        }
       }
     }
   `

From ed76f69a8c4ea38dc6c1e03a0a81f4133b2769dc Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Wed, 15 Mar 2023 20:25:06 +0100
Subject: [PATCH 25/91] use access token to trigger build on external repo

---
 .github/workflows/publish.yml | 79 +----------------------------------
 1 file changed, 2 insertions(+), 77 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 94e3ffe66..18ff7a379 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -303,82 +303,7 @@ jobs:
       - name: Repository Dispatch stage.ocelot.social
         uses: peter-evans/repository-dispatch@v2
         with:
-          token: ${{ github.token }}
+          token: ${{ secrets.OCELOT_PUBLISH_EVENT_PAT }} # this token is required to access the other repository
           event-type: trigger-build-success
           repository: 'Ocelot-Social-Community/stage.ocelot.social'
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
-
-  # ##############################################################################
-  # # JOB: KUBERNETES DEPLOY ACTUAL/LATEST VERSION ######################################
-  # ##############################################################################
-  # kubernetes_deploy:
-  #   # see example https://github.com/do-community/example-doctl-action
-  #   # see example https://github.com/do-community/example-doctl-action/blob/main/.github/workflows/workflow.yaml
-  #   name: Kubernetes deploy of latest version to stage.ocelot.social cluster at DigitalOcean
-  #   runs-on: ubuntu-latest
-  #   needs: [upload_to_dockerhub]
-  #   steps:
-  #     ##########################################################################
-  #     # CHECKOUT CODE ##########################################################
-  #     ##########################################################################
-  #     - name: Checkout code
-  #       uses: actions/checkout@v3
-  #     ##########################################################################
-  #     # SET ENVS ###############################################################
-  #     ##########################################################################
-  #     - name: ENV - VERSION
-  #       run: echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV
-  #     - name: ENV - BUILD_VERSION
-  #       run: echo "BUILD_VERSION=${VERSION}-${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
-  #     ##########################################################################
-  #     # Install DigitalOceans doctl and set kubeconfig #########################
-  #     ##########################################################################
-  #     - name: Install doctl
-  #       uses: digitalocean/action-doctl@v2
-  #       with:
-  #         token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
-  #     - name: Save DigitalOcean kubeconfig with short-lived credentials
-  #       run: doctl kubernetes cluster kubeconfig save --expiry-seconds 600 cluster-stage-ocelot-social
-  #     ##########################################################################
-  #     # Deploy new Docker images to DigitalOcean Kubernetes cluster ############
-  #     ##########################################################################
-  #     # - name: Deploy 'latest' to DigitalOcean Kubernetes
-  #     #   run: |
-  #     #     kubectl -n default set image deployment/ocelot-webapp container-ocelot-webapp=ocelotsocialnetwork/webapp:latest
-  #     #     kubectl -n default rollout restart deployment/ocelot-webapp
-  #     #     kubectl -n default set image deployment/ocelot-backend container-ocelot-backend=ocelotsocialnetwork/backend:latest
-  #     #     kubectl -n default rollout restart deployment/ocelot-backend
-  #     #     kubectl -n default set image deployment/ocelot-maintenance container-ocelot-maintenance=ocelotsocialnetwork/maintenance:latest
-  #     #     kubectl -n default rollout restart deployment/ocelot-maintenance
-  #     #     kubectl -n default set image deployment/ocelot-neo4j container-ocelot-neo4j=ocelotsocialnetwork/neo4j-community:latest
-  #     #     kubectl -n default rollout restart deployment/ocelot-neo4j
-  #     - name: Deploy actual version '$BUILD_VERSION' to DigitalOcean Kubernetes
-  #       run: |
-  #         kubectl -n default set image deployment/ocelot-webapp container-ocelot-webapp=ocelotsocialnetwork/webapp:$BUILD_VERSION
-  #         kubectl -n default rollout restart deployment/ocelot-webapp
-  #         kubectl -n default set image deployment/ocelot-backend container-ocelot-backend=ocelotsocialnetwork/backend:$BUILD_VERSION
-  #         kubectl -n default rollout restart deployment/ocelot-backend
-  #         kubectl -n default set image deployment/ocelot-maintenance container-ocelot-maintenance=ocelotsocialnetwork/maintenance:$BUILD_VERSION
-  #         kubectl -n default rollout restart deployment/ocelot-maintenance
-  #         kubectl -n default set image deployment/ocelot-neo4j container-ocelot-neo4j=ocelotsocialnetwork/neo4j-community:$BUILD_VERSION
-  #         kubectl -n default rollout restart deployment/ocelot-neo4j
-  #     # because this step 'kubectl -n default rollout status deployment/* --timeout=600s' does not work as expected
-  #     #   and we need the pods to be up again for cleaning and seeding the Neo4j database and the backend.
-  #     #   !!! this is not a perfect solution !!!
-  #     # deployments are regularly up again after 3 minutes and 10 seconds
-  #     - name: Sleep for 4 minutes, means 240 seconds
-  #       run: sleep 240s
-  #       shell: bash
-  #     - name: Verify deployment and wait for the pods of each deployment to get ready for cleaning and seeding of the database
-  #       run: |
-  #         kubectl -n default rollout status deployment/ocelot-backend --timeout=600s
-  #         kubectl -n default rollout status deployment/ocelot-neo4j --timeout=600s
-  #         kubectl -n default rollout status deployment/ocelot-maintenance --timeout=600s
-  #         kubectl -n default rollout status deployment/ocelot-webapp --timeout=600s
-  #     - name: Run migrations for Neo4j database via backend for staging
-  #       run: |
-  #         kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-backend | awk '{ print $1 }') -- /bin/sh -c "yarn prod:migrate up"
-  #     - name: Reset and seed Neo4j database via backend for staging
-  #       # db cleaning and seeding is only possible in production if env 'PRODUCTION_DB_CLEAN_ALLOW=true' is set in deployment
-  #       run: |
-  #         kubectl -n default exec -it $(kubectl -n default get pods | grep ocelot-backend | awk '{ print $1 }') -- /bin/sh -c "node --experimental-repl-await dist/db/clean.js && node --experimental-repl-await dist/db/seed.js"
\ No newline at end of file
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
\ No newline at end of file

From 945f076d6d728edb019f56e8eddb17b39d255db6 Mon Sep 17 00:00:00 2001
From: mahula <lenzmath@posteo.de>
Date: Thu, 16 Mar 2023 08:37:12 +0100
Subject: [PATCH 26/91] linting

---
 webapp/components/Button/JoinLeaveButton.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/webapp/components/Button/JoinLeaveButton.vue b/webapp/components/Button/JoinLeaveButton.vue
index cd91a029e..152039eb0 100644
--- a/webapp/components/Button/JoinLeaveButton.vue
+++ b/webapp/components/Button/JoinLeaveButton.vue
@@ -49,7 +49,9 @@ export default {
     label() {
       if (this.isMember) {
         if (this.isNonePendingMember) {
-          return this.hovered ? this.$t('group.joinLeaveButton.leave') : this.$t('group.joinLeaveButton.iAmMember')
+          return this.hovered
+            ? this.$t('group.joinLeaveButton.leave')
+            : this.$t('group.joinLeaveButton.iAmMember')
         } else {
           return this.$t('group.joinLeaveButton.pendingMember')
         }
@@ -61,9 +63,9 @@ export default {
         content: this.$t('group.joinLeaveButton.tooltip'),
         placement: 'right',
         show: this.isMember && !this.isNonePendingMember && this.hovered,
-        trigger: this.isMember && !this.isNonePendingMember ? 'hover' : 'manual'
+        trigger: this.isMember && !this.isNonePendingMember ? 'hover' : 'manual',
       }
-    }
+    },
   },
   watch: {
     isMember() {

From 9259615a342ec4220e7a42f4f812eb9e0d63de4b Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Thu, 16 Mar 2023 12:08:56 +0100
Subject: [PATCH 27/91] Style changes for the action buttons

---
 .../ContributionForm/ContributionForm.vue     | 44 ++++++++++++++++---
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 5757d72b5..6114106dc 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -74,8 +74,8 @@
             />
             <!-- eslint-enable vue/no-v-text-v-html-on-component -->
           </ds-flex-item>
-          <ds-flex-item width="0.25" />
-          <ds-flex-item style="align-self: flex-end">
+          <ds-flex-item width="0.15" />
+          <ds-flex-item class="action-buttons-group" width="2">
             <base-button
               data-test="cancel-button"
               :disabled="loading"
@@ -84,8 +84,6 @@
             >
               {{ $t('actions.cancel') }}
             </base-button>
-          </ds-flex-item>
-          <ds-flex-item style="align-self: flex-end">
             <base-button type="submit" icon="check" :loading="loading" :disabled="errors" filled>
               {{ $t('actions.save') }}
             </base-button>
@@ -310,9 +308,45 @@ export default {
   }
 
   > .buttons-footer {
+    justify-content: flex-end;
     align-self: flex-end;
-    width: 85%;
+    width: 100%;
     margin-top: $space-base;
+
+    > .action-buttons-group {
+      margin-left: auto; 
+      display: flex; 
+      justify-content: flex-end;
+
+      > button {
+        margin-left: 1em;
+        min-width: fit-content;
+      }
+    }
+  }
+
+  @media screen and (max-width: 656px) {
+    > .buttons-footer {
+      flex-direction: column;
+      margin-top: 5px;
+
+      > .action-buttons-group {
+        > button {
+          margin-left: 1em;
+        }
+      }
+    }
+  }
+
+  @media screen and (max-width: 280px) {
+    > .buttons-footer {
+      > .action-buttons-group {
+        flex-direction: column;
+        > button {
+          margin-bottom: 5px;
+        }
+      }
+    }
   }
 
   .blur-toggle {

From 1d277e96a707c512795b0106c2f101b424513199 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 16 Mar 2023 14:39:55 +0100
Subject: [PATCH 28/91] locales for left group mutation

---
 webapp/locales/de.json | 3 ++-
 webapp/locales/en.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index b5651675e..c64030be5 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -650,7 +650,8 @@
       "commented_on_post": "Hat Deinen Beitrag kommentiert …",
       "mentioned_in_comment": "Hat Dich in einem Kommentar erwähnt …",
       "mentioned_in_post": "Hat Dich in einem Beitrag erwähnt …",
-      "user_joined_group": "Ist Deiner Gruppe beigetreten …"
+      "user_joined_group": "Ist Deiner Gruppe beigetreten …",
+      "user_left_group": "Left your group …"
     },
     "title": "Benachrichtigungen",
     "user": "Nutzer"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index ff5be4470..bb6e47fb1 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -650,7 +650,8 @@
       "commented_on_post": "Commented on your post …",
       "mentioned_in_comment": "Mentioned you in a comment …",
       "mentioned_in_post": "Mentioned you in a post …",
-      "user_joined_group": "Joined your group …"
+      "user_joined_group": "Joined your group …",
+      "user_left_group": "Left your group …"
     },
     "title": "Notifications",
     "user": "User"

From a25e6eb326d5da3a703b7821154cd443177704b0 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 16 Mar 2023 15:09:19 +0100
Subject: [PATCH 29/91] notify leave group

---
 .../notifications/notificationsMiddleware.js  | 12 ++++
 .../notificationsMiddleware.spec.js           | 61 ++++++++++++++++++-
 backend/src/schema/resolvers/notifications.js |  3 +-
 backend/src/schema/types/type/NOTIFIED.gql    |  1 +
 4 files changed, 75 insertions(+), 2 deletions(-)

diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js
index 80c78cfeb..efe363b24 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.js
@@ -62,6 +62,17 @@ const handleJoinGroup = async (resolve, root, args, context, resolveInfo) => {
   return user
 }
 
+const handleLeaveGroup = async (resolve, root, args, context, resolveInfo) => {
+  const { groupId, userId } = args
+  const user = await resolve(root, args, context, resolveInfo)
+  if (user) {
+    await publishNotifications(context, [
+      notifyOwnersOfGroup(groupId, userId, 'user_left_group', context),
+    ])
+  }
+  return user
+}
+
 const handleContentDataOfPost = async (resolve, root, args, context, resolveInfo) => {
   const idsOfUsers = extractMentionedUsers(args.content)
   const post = await resolve(root, args, context, resolveInfo)
@@ -232,5 +243,6 @@ export default {
     CreateComment: handleContentDataOfComment,
     UpdateComment: handleContentDataOfComment,
     JoinGroup: handleJoinGroup,
+    LeaveGroup: handleLeaveGroup,
   },
 }
diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
index cca84df0e..2a609dc55 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
@@ -6,7 +6,7 @@ import createServer, { pubsub } from '../../server'
 import {
   createGroupMutation,
   joinGroupMutation,
-  //  leaveGroupMutation,
+  leaveGroupMutation,
   //  changeGroupMemberRoleMutation,
   //  removeUserFromGroupMutation,
 } from '../../graphql/groups'
@@ -704,5 +704,64 @@ describe('notifications', () => {
         })
       })
     })
+
+    describe('user leaves group', () => {
+      beforeEach(async () => {
+        authenticatedUser = await notifiedUser.toJson()
+        await mutate({
+          mutation: joinGroupMutation(),
+          variables: {
+            groupId: 'closed-group',
+            userId: authenticatedUser.id,
+          },
+        })
+        await mutate({
+          mutation: leaveGroupMutation(),
+          variables: {
+            groupId: 'closed-group',
+            userId: authenticatedUser.id,
+          },
+        })
+        authenticatedUser = await groupOwner.toJson()
+      })
+
+      it('has two the notification in database', async () => {
+        await expect(
+          query({
+            query: notificationQuery,
+          }),
+        ).resolves.toMatchObject({
+          data: {
+            notifications: [
+              {
+                read: false,
+                reason: 'user_left_group',
+                createdAt: expect.any(String),
+                from: {
+                  __typename: 'Group',
+                  id: 'closed-group',
+                },
+                relatedUser: {
+                  id: 'you',
+                },
+              },
+              {
+                read: false,
+                reason: 'user_joined_group',
+                createdAt: expect.any(String),
+                from: {
+                  __typename: 'Group',
+                  id: 'closed-group',
+                },
+                relatedUser: {
+                  id: 'you',
+                },
+              },
+            ],
+          },
+          errors: undefined,
+        })
+      })
+    })
   })
 })
diff --git a/backend/src/schema/resolvers/notifications.js b/backend/src/schema/resolvers/notifications.js
index 042a55c13..37b40846e 100644
--- a/backend/src/schema/resolvers/notifications.js
+++ b/backend/src/schema/resolvers/notifications.js
@@ -47,7 +47,8 @@ export default {
           ` 
           MATCH (resource {deleted: false, disabled: false})-[notification:NOTIFIED]->(user:User {id:$id})
           ${whereClause}
-          OPTIONAL MATCH (resource)<-[membership:MEMBER_OF]-(relatedUser:User { id: notification.relatedUserId })
+          OPTIONAL MATCH (relatedUser:User { id: notification.relatedUserId })
+          OPTIONAL MATCH (resource)<-[membership:MEMBER_OF]-(relatedUser)
           WITH user, notification, resource, membership, relatedUser,
           [(resource)<-[:WROTE]-(author:User) | author {.*}] AS authors,
           [(resource)-[:COMMENTS]->(post:Post)<-[:WROTE]-(author:User) | post {.*, author: properties(author)} ] AS posts
diff --git a/backend/src/schema/types/type/NOTIFIED.gql b/backend/src/schema/types/type/NOTIFIED.gql
index 213e4c512..61bdd5141 100644
--- a/backend/src/schema/types/type/NOTIFIED.gql
+++ b/backend/src/schema/types/type/NOTIFIED.gql
@@ -23,6 +23,7 @@ enum NotificationReason {
   mentioned_in_comment
   commented_on_post
   user_joined_group
+  user_left_group
 }
 
 type Query {

From 1501bcb06cb14181828c26cf91b1e6d7cbad5965 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 16 Mar 2023 15:14:27 +0100
Subject: [PATCH 30/91] linting

---
 webapp/components/Notification/Notification.vue             | 5 ++++-
 webapp/components/NotificationsTable/NotificationsTable.vue | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/webapp/components/Notification/Notification.vue b/webapp/components/Notification/Notification.vue
index 3566be6d8..06f99ae7c 100644
--- a/webapp/components/Notification/Notification.vue
+++ b/webapp/components/Notification/Notification.vue
@@ -1,7 +1,10 @@
 <template>
   <article :class="{ '--read': notification.read, notification: true }">
     <client-only>
-      <user-teaser :user="isGroup ? notification.relatedUser : from.author" :date-time="from.createdAt" />
+      <user-teaser
+        :user="isGroup ? notification.relatedUser : from.author"
+        :date-time="from.createdAt"
+      />
     </client-only>
     <p class="description">{{ $t(`notifications.reason.${notification.reason}`) }}</p>
     <nuxt-link
diff --git a/webapp/components/NotificationsTable/NotificationsTable.vue b/webapp/components/NotificationsTable/NotificationsTable.vue
index 5b043e9e5..c59cc5a67 100644
--- a/webapp/components/NotificationsTable/NotificationsTable.vue
+++ b/webapp/components/NotificationsTable/NotificationsTable.vue
@@ -40,7 +40,9 @@
                       <client-only>
                         <user-teaser
                           :user="
-                            isGroup(notification.from) ? notification.relatedUser : notification.from.author
+                            isGroup(notification.from)
+                              ? notification.relatedUser
+                              : notification.from.author
                           "
                           :date-time="notification.from.createdAt"
                           :class="{ 'notification-status': notification.read }"

From 35f3da9984590854b46b99bfaba203ca0a91fcc1 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 16 Mar 2023 15:31:09 +0100
Subject: [PATCH 31/91] notify user when role in group changed

---
 .../notifications/notificationsMiddleware.js  | 43 ++++++++++++++++
 .../notificationsMiddleware.spec.js           | 51 ++++++++++++++++++-
 backend/src/schema/types/type/NOTIFIED.gql    |  1 +
 3 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js
index efe363b24..9f594a1f7 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.js
@@ -73,6 +73,17 @@ const handleLeaveGroup = async (resolve, root, args, context, resolveInfo) => {
   return user
 }
 
+const handleChangeGroupMemberRole = async (resolve, root, args, context, resolveInfo) => {
+  const { groupId, userId } = args
+  const user = await resolve(root, args, context, resolveInfo)
+  if (user) {
+    await publishNotifications(context, [
+      notifyMemberOfGroup(groupId, userId, 'changed_group_member_role', context),
+    ])
+  }
+  return user
+}
+
 const handleContentDataOfPost = async (resolve, root, args, context, resolveInfo) => {
   const idsOfUsers = extractMentionedUsers(args.content)
   const post = await resolve(root, args, context, resolveInfo)
@@ -148,6 +159,37 @@ const notifyOwnersOfGroup = async (groupId, userId, reason, context) => {
   }
 }
 
+const notifyMemberOfGroup = async (groupId, userId, reason, context) => {
+  const cypher = `
+    MATCH (group:Group { id: $groupId })<-[membership:MEMBER_OF]-(user:User { id: $userId })
+    WITH user, group
+    MERGE (group)-[notification:NOTIFIED {reason: $reason}]->(user)
+    WITH group, user, notification
+    SET notification.read = FALSE
+    SET notification.createdAt = COALESCE(notification.createdAt, toString(datetime()))
+    SET notification.updatedAt = toString(datetime())
+    SET notification.relatedUserId = $userId
+    RETURN notification {.*, from: group, to: properties(user)}
+  `
+  const session = context.driver.session()
+  const writeTxResultPromise = session.writeTransaction(async (transaction) => {
+    const notificationTransactionResponse = await transaction.run(cypher, {
+      groupId,
+      reason,
+      userId,
+    })
+    return notificationTransactionResponse.records.map((record) => record.get('notification'))
+  })
+  try {
+    const notifications = await writeTxResultPromise
+    return notifications
+  } catch (error) {
+    throw new Error(error)
+  } finally {
+    session.close()
+  }
+}
+
 const notifyUsersOfMention = async (label, id, idsOfUsers, reason, context) => {
   if (!(idsOfUsers && idsOfUsers.length)) return []
   await validateNotifyUsers(label, reason)
@@ -244,5 +286,6 @@ export default {
     UpdateComment: handleContentDataOfComment,
     JoinGroup: handleJoinGroup,
     LeaveGroup: handleLeaveGroup,
+    ChangeGroupMemberRole: handleChangeGroupMemberRole,
   },
 }
diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
index 2a609dc55..851c76f9c 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
@@ -7,7 +7,7 @@ import {
   createGroupMutation,
   joinGroupMutation,
   leaveGroupMutation,
-  //  changeGroupMemberRoleMutation,
+  changeGroupMemberRoleMutation,
   //  removeUserFromGroupMutation,
 } from '../../graphql/groups'
 
@@ -763,5 +763,54 @@ describe('notifications', () => {
         })
       })
     })
+
+    describe('user role in group changes', () => {
+      beforeEach(async () => {
+        authenticatedUser = await notifiedUser.toJson()
+        await mutate({
+          mutation: joinGroupMutation(),
+          variables: {
+            groupId: 'closed-group',
+            userId: authenticatedUser.id,
+          },
+        })
+        authenticatedUser = await groupOwner.toJson()
+        await mutate({
+          mutation: changeGroupMemberRoleMutation(),
+          variables: {
+            groupId: 'closed-group',
+            userId: 'you',
+            roleInGroup: 'admin',
+          },
+        })
+        authenticatedUser = await notifiedUser.toJson()
+      })
+
+      it('has notification in database', async () => {
+        await expect(
+          query({
+            query: notificationQuery,
+          }),
+        ).resolves.toMatchObject({
+          data: {
+            notifications: [
+              {
+                read: false,
+                reason: 'changed_group_member_role',
+                createdAt: expect.any(String),
+                from: {
+                  __typename: 'Group',
+                  id: 'closed-group',
+                },
+                relatedUser: {
+                  id: 'you',
+                },
+              },
+            ],
+          },
+          errors: undefined,
+        })
+      })
+    })
   })
 })
diff --git a/backend/src/schema/types/type/NOTIFIED.gql b/backend/src/schema/types/type/NOTIFIED.gql
index 61bdd5141..8173fc8f7 100644
--- a/backend/src/schema/types/type/NOTIFIED.gql
+++ b/backend/src/schema/types/type/NOTIFIED.gql
@@ -24,6 +24,7 @@ enum NotificationReason {
   commented_on_post
   user_joined_group
   user_left_group
+  changed_group_member_role
 }
 
 type Query {

From ed217a0c141d662bfec7ead41a82497c80989d9d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 16 Mar 2023 15:34:08 +0100
Subject: [PATCH 32/91] locales for change group member role notification

---
 webapp/locales/de.json | 3 ++-
 webapp/locales/en.json | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index c64030be5..efd4eb670 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -647,11 +647,12 @@
     "pageLink": "Alle Benachrichtigungen",
     "post": "Beitrag oder Gruppe",
     "reason": {
+      "changed_group_member_role": "Deine Rolle in der Group wurde geändert …",
       "commented_on_post": "Hat Deinen Beitrag kommentiert …",
       "mentioned_in_comment": "Hat Dich in einem Kommentar erwähnt …",
       "mentioned_in_post": "Hat Dich in einem Beitrag erwähnt …",
       "user_joined_group": "Ist Deiner Gruppe beigetreten …",
-      "user_left_group": "Left your group …"
+      "user_left_group": "Hat deine Gruppe verlassen …"
     },
     "title": "Benachrichtigungen",
     "user": "Nutzer"
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index bb6e47fb1..72c5e869b 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -647,6 +647,7 @@
     "pageLink": "All notifications",
     "post": "Post or Group",
     "reason": {
+      "changed_group_member_role": "Your role in group changed …",
       "commented_on_post": "Commented on your post …",
       "mentioned_in_comment": "Mentioned you in a comment …",
       "mentioned_in_post": "Mentioned you in a post …",

From 424f5c41722bd1e132ede9c77921248d747856d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 16 Mar 2023 15:49:13 +0100
Subject: [PATCH 33/91] Refine style of contribution (post) form hint text for
 group post

---
 .../ContributionForm/ContributionForm.vue     | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 6114106dc..3bc648cba 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -65,11 +65,10 @@
           <base-icon v-if="errors && errors.categoryIds" name="warning" />
         </ds-chip>
         <ds-flex class="buttons-footer" gutter="xxx-small">
-          <ds-flex-item width="3.5">
+          <ds-flex-item width="3.5" style="margin-right: 16px; margin-bottom: 6px">
             <!-- eslint-disable vue/no-v-text-v-html-on-component -->
             <ds-text
               v-if="groupId"
-              class="info-text"
               v-html="$t('contribution.visibleOnlyForMembersOfGroup', { name: groupName })"
             />
             <!-- eslint-enable vue/no-v-text-v-html-on-component -->
@@ -314,8 +313,8 @@ export default {
     margin-top: $space-base;
 
     > .action-buttons-group {
-      margin-left: auto; 
-      display: flex; 
+      margin-left: auto;
+      display: flex;
       justify-content: flex-end;
 
       > button {
@@ -325,6 +324,15 @@ export default {
     }
   }
 
+  .blur-toggle {
+    text-align: right;
+    margin-bottom: $space-base;
+
+    > .link {
+      display: block;
+    }
+  }
+
   @media screen and (max-width: 656px) {
     > .buttons-footer {
       flex-direction: column;
@@ -342,25 +350,12 @@ export default {
     > .buttons-footer {
       > .action-buttons-group {
         flex-direction: column;
+
         > button {
           margin-bottom: 5px;
         }
       }
     }
   }
-
-  .blur-toggle {
-    text-align: right;
-    margin-bottom: $space-base;
-
-    > .link {
-      display: block;
-    }
-  }
-
-  .info-text {
-    display: inline;
-    vertical-align: middle;
-  }
 }
 </style>

From 5c634ca688bc0d45790d1d4fdad139e89033ed31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 16 Mar 2023 15:51:16 +0100
Subject: [PATCH 34/91] Update
 webapp/components/ContributionForm/ContributionForm.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 webapp/components/ContributionForm/ContributionForm.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 6114106dc..2abb5845e 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -172,6 +172,9 @@ export default {
     groupId() {
       return this.group && this.group.id
     },
+    showGroupHint() {
+      return this.grouupId && ['closed', 'hidden'].includes(this.group.groupType)
+    },
     groupName() {
       return this.group && this.group.name
     },

From 4f6c9319fbc8f764a3dace5320039d5a75ad05ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 16 Mar 2023 15:52:31 +0100
Subject: [PATCH 35/91] Update
 webapp/components/ContributionForm/ContributionForm.vue

Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
---
 webapp/components/ContributionForm/ContributionForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 2abb5845e..84d47eebb 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -68,7 +68,7 @@
           <ds-flex-item width="3.5">
             <!-- eslint-disable vue/no-v-text-v-html-on-component -->
             <ds-text
-              v-if="groupId"
+              v-if="showGroupHint"
               class="info-text"
               v-html="$t('contribution.visibleOnlyForMembersOfGroup', { name: groupName })"
             />

From 04b6dc440765d8a026a57afcd21c69b1a293515c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 16 Mar 2023 15:56:40 +0100
Subject: [PATCH 36/91] Merge branch
 '6068-on-create-edit-group-page-have-additional-hint' of
 github.com:Ocelot-Social-Community/Ocelot-Social into
 6068-on-create-edit-group-page-have-additional-hint

# Conflicts:
#	webapp/components/ContributionForm/ContributionForm.vue
---
 webapp/components/ContributionForm/ContributionForm.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 3bc648cba..70a98649a 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -68,7 +68,7 @@
           <ds-flex-item width="3.5" style="margin-right: 16px; margin-bottom: 6px">
             <!-- eslint-disable vue/no-v-text-v-html-on-component -->
             <ds-text
-              v-if="groupId"
+              v-if="showGroupHint"
               v-html="$t('contribution.visibleOnlyForMembersOfGroup', { name: groupName })"
             />
             <!-- eslint-enable vue/no-v-text-v-html-on-component -->
@@ -171,6 +171,9 @@ export default {
     groupId() {
       return this.group && this.group.id
     },
+    showGroupHint() {
+      return this.grouupId && ['closed', 'hidden'].includes(this.group.groupType)
+    },
     groupName() {
       return this.group && this.group.name
     },

From 6adfac1c7b1729e38b59fa3a925078943d6256f8 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 16 Mar 2023 16:01:46 +0100
Subject: [PATCH 37/91] notify user when removed from group

---
 .../notifications/notificationsMiddleware.js  | 19 ++++++-
 .../notificationsMiddleware.spec.js           | 52 ++++++++++++++++++-
 backend/src/schema/types/type/NOTIFIED.gql    |  1 +
 3 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/backend/src/middleware/notifications/notificationsMiddleware.js b/backend/src/middleware/notifications/notificationsMiddleware.js
index 9f594a1f7..1c97e9591 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.js
@@ -84,6 +84,17 @@ const handleChangeGroupMemberRole = async (resolve, root, args, context, resolve
   return user
 }
 
+const handleRemoveUserFromGroup = async (resolve, root, args, context, resolveInfo) => {
+  const { groupId, userId } = args
+  const user = await resolve(root, args, context, resolveInfo)
+  if (user) {
+    await publishNotifications(context, [
+      notifyMemberOfGroup(groupId, userId, 'removed_user_from_group', context),
+    ])
+  }
+  return user
+}
+
 const handleContentDataOfPost = async (resolve, root, args, context, resolveInfo) => {
   const idsOfUsers = extractMentionedUsers(args.content)
   const post = await resolve(root, args, context, resolveInfo)
@@ -160,15 +171,17 @@ const notifyOwnersOfGroup = async (groupId, userId, reason, context) => {
 }
 
 const notifyMemberOfGroup = async (groupId, userId, reason, context) => {
+  const { user: owner } = context
   const cypher = `
-    MATCH (group:Group { id: $groupId })<-[membership:MEMBER_OF]-(user:User { id: $userId })
+    MATCH (user:User { id: $userId })
+    MATCH (group:Group { id: $groupId })
     WITH user, group
     MERGE (group)-[notification:NOTIFIED {reason: $reason}]->(user)
     WITH group, user, notification
     SET notification.read = FALSE
     SET notification.createdAt = COALESCE(notification.createdAt, toString(datetime()))
     SET notification.updatedAt = toString(datetime())
-    SET notification.relatedUserId = $userId
+    SET notification.relatedUserId = $ownerId
     RETURN notification {.*, from: group, to: properties(user)}
   `
   const session = context.driver.session()
@@ -177,6 +190,7 @@ const notifyMemberOfGroup = async (groupId, userId, reason, context) => {
       groupId,
       reason,
       userId,
+      ownerId: owner.id,
     })
     return notificationTransactionResponse.records.map((record) => record.get('notification'))
   })
@@ -287,5 +301,6 @@ export default {
     JoinGroup: handleJoinGroup,
     LeaveGroup: handleLeaveGroup,
     ChangeGroupMemberRole: handleChangeGroupMemberRole,
+    RemoveUserFromGroup: handleRemoveUserFromGroup,
   },
 }
diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
index 851c76f9c..50c423275 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
@@ -8,7 +8,7 @@ import {
   joinGroupMutation,
   leaveGroupMutation,
   changeGroupMemberRoleMutation,
-  //  removeUserFromGroupMutation,
+  removeUserFromGroupMutation,
 } from '../../graphql/groups'
 
 let server, query, mutate, notifiedUser, authenticatedUser
@@ -803,7 +803,7 @@ describe('notifications', () => {
                   id: 'closed-group',
                 },
                 relatedUser: {
-                  id: 'you',
+                  id: 'group-owner',
                 },
               },
             ],
@@ -812,5 +812,53 @@ describe('notifications', () => {
         })
       })
     })
+
+    describe('user is removed from group', () => {
+      beforeEach(async () => {
+        authenticatedUser = await notifiedUser.toJson()
+        await mutate({
+          mutation: joinGroupMutation(),
+          variables: {
+            groupId: 'closed-group',
+            userId: authenticatedUser.id,
+          },
+        })
+        authenticatedUser = await groupOwner.toJson()
+        await mutate({
+          mutation: removeUserFromGroupMutation(),
+          variables: {
+            groupId: 'closed-group',
+            userId: 'you',
+          },
+        })
+        authenticatedUser = await notifiedUser.toJson()
+      })
+
+      it('has notification in database', async () => {
+        await expect(
+          query({
+            query: notificationQuery,
+          }),
+        ).resolves.toMatchObject({
+          data: {
+            notifications: [
+              {
+                read: false,
+                reason: 'removed_user_from_group',
+                createdAt: expect.any(String),
+                from: {
+                  __typename: 'Group',
+                  id: 'closed-group',
+                },
+                relatedUser: {
+                  id: 'group-owner',
+                },
+              },
+            ],
+          },
+          errors: undefined,
+        })
+      })
+    })    
   })
 })
diff --git a/backend/src/schema/types/type/NOTIFIED.gql b/backend/src/schema/types/type/NOTIFIED.gql
index 8173fc8f7..62a1f3696 100644
--- a/backend/src/schema/types/type/NOTIFIED.gql
+++ b/backend/src/schema/types/type/NOTIFIED.gql
@@ -25,6 +25,7 @@ enum NotificationReason {
   user_joined_group
   user_left_group
   changed_group_member_role
+  removed_user_from_group
 }
 
 type Query {

From da93e7ff83a677aa02f8e62c1f6b5967bdeb0a56 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 16 Mar 2023 16:02:17 +0100
Subject: [PATCH 38/91] locales for remove user from group notification

---
 webapp/locales/de.json | 3 ++-
 webapp/locales/en.json | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index efd4eb670..382294db2 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -647,10 +647,11 @@
     "pageLink": "Alle Benachrichtigungen",
     "post": "Beitrag oder Gruppe",
     "reason": {
-      "changed_group_member_role": "Deine Rolle in der Group wurde geändert …",
+      "changed_group_member_role": "Hat Deine Rolle in der Gruppe geändert …",
       "commented_on_post": "Hat Deinen Beitrag kommentiert …",
       "mentioned_in_comment": "Hat Dich in einem Kommentar erwähnt …",
       "mentioned_in_post": "Hat Dich in einem Beitrag erwähnt …",
+      "removed_user_from_group": "Hat Dich aus der Gruppe entfernt …",
       "user_joined_group": "Ist Deiner Gruppe beigetreten …",
       "user_left_group": "Hat deine Gruppe verlassen …"
     },
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 72c5e869b..2b5c3d7c4 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -647,10 +647,11 @@
     "pageLink": "All notifications",
     "post": "Post or Group",
     "reason": {
-      "changed_group_member_role": "Your role in group changed …",
+      "changed_group_member_role": "Changed your role in group …",
       "commented_on_post": "Commented on your post …",
       "mentioned_in_comment": "Mentioned you in a comment …",
       "mentioned_in_post": "Mentioned you in a post …",
+      "removed_user_from_group": "Removed you from group …",
       "user_joined_group": "Joined your group …",
       "user_left_group": "Left your group …"
     },

From 84e483a450b5ac2f0040f56c275b9525b018577d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 16 Mar 2023 16:03:51 +0100
Subject: [PATCH 39/91] Fix variable name

---
 webapp/components/ContributionForm/ContributionForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 70a98649a..8863fbc8a 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -172,7 +172,7 @@ export default {
       return this.group && this.group.id
     },
     showGroupHint() {
-      return this.grouupId && ['closed', 'hidden'].includes(this.group.groupType)
+      return this.groupId && ['closed', 'hidden'].includes(this.group.groupType)
     },
     groupName() {
       return this.group && this.group.name

From 5f38c74d82ac0c91a9985f652b634da8239b7a99 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 16 Mar 2023 16:08:33 +0100
Subject: [PATCH 40/91] fix flaky test

---
 .../notificationsMiddleware.spec.js           |  2 +-
 .../schema/resolvers/notifications.spec.js    | 26 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/backend/src/middleware/notifications/notificationsMiddleware.spec.js b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
index 50c423275..a9046b09f 100644
--- a/backend/src/middleware/notifications/notificationsMiddleware.spec.js
+++ b/backend/src/middleware/notifications/notificationsMiddleware.spec.js
@@ -859,6 +859,6 @@ describe('notifications', () => {
           errors: undefined,
         })
       })
-    })    
+    })
   })
 })
diff --git a/backend/src/schema/resolvers/notifications.spec.js b/backend/src/schema/resolvers/notifications.spec.js
index 47134aea6..9deaea457 100644
--- a/backend/src/schema/resolvers/notifications.spec.js
+++ b/backend/src/schema/resolvers/notifications.spec.js
@@ -397,18 +397,20 @@ describe('given some notifications', () => {
 
         it('returns all as read', async () => {
           const response = await mutate({ mutation: markAllAsReadMutation(), variables })
-          expect(response.data.markAllAsRead).toEqual([
-            {
-              createdAt: '2019-08-30T19:33:48.651Z',
-              from: { __typename: 'Comment', content: 'You have been mentioned in a comment' },
-              read: true,
-            },
-            {
-              createdAt: '2019-08-31T17:33:48.651Z',
-              from: { __typename: 'Post', content: 'You have been mentioned in a post' },
-              read: true,
-            },
-          ])
+          expect(response.data.markAllAsRead).toEqual(
+            expect.arrayContaining([
+              {
+                createdAt: '2019-08-30T19:33:48.651Z',
+                from: { __typename: 'Comment', content: 'You have been mentioned in a comment' },
+                read: true,
+              },
+              {
+                createdAt: '2019-08-31T17:33:48.651Z',
+                from: { __typename: 'Post', content: 'You have been mentioned in a post' },
+                read: true,
+              },
+            ]),
+          )
           expect(response.errors).toBeUndefined()
         })
       })

From 9ded9105a3a5641a2a7ba40b27f6a84f0b21320c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 16 Mar 2023 16:09:18 +0100
Subject: [PATCH 41/91] Left over of merge conflict

---
 webapp/components/ContributionForm/ContributionForm.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 0fe21a6ef..8863fbc8a 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -172,11 +172,7 @@ export default {
       return this.group && this.group.id
     },
     showGroupHint() {
-<<<<<<< HEAD
       return this.groupId && ['closed', 'hidden'].includes(this.group.groupType)
-=======
-      return this.grouupId && ['closed', 'hidden'].includes(this.group.groupType)
->>>>>>> 4f6c9319fbc8f764a3dace5320039d5a75ad05ac
     },
     groupName() {
       return this.group && this.group.name

From d8df95d093965e81d0e8b887d973eb0f79fb8604 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 16 Mar 2023 16:54:40 +0100
Subject: [PATCH 42/91] notifications as read with myRole for groups

---
 backend/src/schema/resolvers/notifications.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/backend/src/schema/resolvers/notifications.js b/backend/src/schema/resolvers/notifications.js
index 37b40846e..117b9b530 100644
--- a/backend/src/schema/resolvers/notifications.js
+++ b/backend/src/schema/resolvers/notifications.js
@@ -91,8 +91,9 @@ export default {
             WITH user, notification, resource,
             [(resource)<-[:WROTE]-(author:User) | author {.*}] AS authors,
             [(resource)-[:COMMENTS]->(post:Post)<-[:WROTE]-(author:User) | post{.*, author: properties(author)} ] AS posts
-            WITH resource, user, notification, authors, posts,
-            resource {.*, __typename: labels(resource)[0], author: authors[0], post: posts[0]} AS finalResource
+            OPTIONAL MATCH (resource)<-[membership:MEMBER_OF]-(user)
+            WITH resource, user, notification, authors, posts, membership,
+            resource {.*, __typename: labels(resource)[0], author: authors[0], post: posts[0], myRole: membership.role } AS finalResource
             RETURN notification {.*, from: finalResource, to: properties(user)}
           `,
           { resourceId: args.id, id: currentUser.id },
@@ -120,8 +121,9 @@ export default {
             WITH user, notification, resource,
             [(resource)<-[:WROTE]-(author:User) | author {.*}] AS authors,
             [(resource)-[:COMMENTS]->(post:Post)<-[:WROTE]-(author:User) | post{.*, author: properties(author)} ] AS posts
-            WITH resource, user, notification, authors, posts,
-            resource {.*, __typename: labels(resource)[0], author: authors[0], post: posts[0]} AS finalResource
+            OPTIONAL MATCH (resource)<-[membership:MEMBER_OF]-(user)
+            WITH resource, user, notification, authors, posts, membership,
+            resource {.*, __typename: labels(resource)[0], author: authors[0], post: posts[0], myRole: membership.role} AS finalResource
             RETURN notification {.*, from: finalResource, to: properties(user)}
           `,
           { id: currentUser.id },

From 033630e8e39ee96ea08abc0a1de42628fbf5677b Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 16 Mar 2023 16:55:30 +0100
Subject: [PATCH 43/91] add group type for mark notifications as read

---
 webapp/graphql/User.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index 1432cd31c..f7fd3c940 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -163,6 +163,7 @@ export const markAsReadMutation = (_i18n) => {
     ${userFragment}
     ${commentFragment}
     ${postFragment}
+    ${groupFragment}
 
     mutation ($id: ID!) {
       markAsRead(id: $id) {
@@ -188,6 +189,9 @@ export const markAsReadMutation = (_i18n) => {
               }
             }
           }
+          ... on Group {
+            ...group
+          }
         }
       }
     }
@@ -199,6 +203,7 @@ export const markAllAsReadMutation = (_i18n) => {
     ${userFragment}
     ${commentFragment}
     ${postFragment}
+    ${groupFragment}
 
     mutation {
       markAllAsRead {
@@ -224,6 +229,9 @@ export const markAllAsReadMutation = (_i18n) => {
               }
             }
           }
+          ... on Group {
+            ...group
+          }
         }
       }
     }

From 282fc347f133c4ddef0e29e04e51900f72a470be Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Thu, 16 Mar 2023 16:58:52 +0100
Subject: [PATCH 44/91] remove unused enum type

---
 backend/src/schema/types/enum/ReasonNotification.gql | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 backend/src/schema/types/enum/ReasonNotification.gql

diff --git a/backend/src/schema/types/enum/ReasonNotification.gql b/backend/src/schema/types/enum/ReasonNotification.gql
deleted file mode 100644
index e5a348398..000000000
--- a/backend/src/schema/types/enum/ReasonNotification.gql
+++ /dev/null
@@ -1,6 +0,0 @@
-enum ReasonNotification {
-  mentioned_in_post
-  mentioned_in_comment
-  commented_on_post
-  user_joined_group
-}

From 49288750cf4e9b9874712115387d97cee6ad3160 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 17 Mar 2023 11:10:23 +0100
Subject: [PATCH 45/91] try fixing join group button

---
 webapp/pages/group/_id/_slug.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/pages/group/_id/_slug.vue b/webapp/pages/group/_id/_slug.vue
index 641b8802e..0437681d7 100644
--- a/webapp/pages/group/_id/_slug.vue
+++ b/webapp/pages/group/_id/_slug.vue
@@ -564,7 +564,7 @@ export default {
     // },
     prepareJoinLeave() {
       // "membersCountStartValue" is updated to avoid counting from 0 when join/leave
-      this.membersCountStartValue = this.GroupMembers.length
+      this.membersCountStartValue = (this.GroupMembers && this.GroupMembers.length) || 0
     },
     updateJoinLeave({ myRoleInGroup }) {
       this.Group[0].myRole = myRoleInGroup

From c18617fc2202b7b8f4b51548b8f2dbe55779b260 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 17 Mar 2023 11:37:19 +0100
Subject: [PATCH 46/91] group description in notification

---
 webapp/components/Notification/Notification.vue | 2 ++
 webapp/locales/de.json                          | 1 +
 webapp/locales/en.json                          | 1 +
 3 files changed, 4 insertions(+)

diff --git a/webapp/components/Notification/Notification.vue b/webapp/components/Notification/Notification.vue
index 06f99ae7c..a9cd75f4e 100644
--- a/webapp/components/Notification/Notification.vue
+++ b/webapp/components/Notification/Notification.vue
@@ -17,6 +17,8 @@
         <p>
           <strong v-if="isComment" class="comment">{{ $t(`notifications.comment`) }}:</strong>
           {{ from.contentExcerpt | removeHtml }}
+          <strong v-if="isGroup" class="comment">{{ $t(`notifications.group`) }}:</strong>
+          {{ from.descriptionExcerpt | removeHtml }}
         </p>
       </base-card>
     </nuxt-link>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 382294db2..d82d3bcde 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -643,6 +643,7 @@
       "read": "Gelesen",
       "unread": "Ungelesen"
     },
+    "group": "Beschreibung",
     "markAllAsRead": "Markiere alle als gelesen",
     "pageLink": "Alle Benachrichtigungen",
     "post": "Beitrag oder Gruppe",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 2b5c3d7c4..6ddfe7cd0 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -643,6 +643,7 @@
       "read": "Read",
       "unread": "Unread"
     },
+    "group": "Description",
     "markAllAsRead": "Mark all as read",
     "pageLink": "All notifications",
     "post": "Post or Group",

From 0c4a6ca5c72f2397b222b85159abc3a7ec6ca0ba Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 17 Mar 2023 11:42:23 +0100
Subject: [PATCH 47/91] add group description to notifications

---
 webapp/components/NotificationsTable/NotificationsTable.vue | 5 ++++-
 webapp/locales/de.json                                      | 2 +-
 webapp/locales/en.json                                      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/webapp/components/NotificationsTable/NotificationsTable.vue b/webapp/components/NotificationsTable/NotificationsTable.vue
index c59cc5a67..41d593a23 100644
--- a/webapp/components/NotificationsTable/NotificationsTable.vue
+++ b/webapp/components/NotificationsTable/NotificationsTable.vue
@@ -84,7 +84,10 @@
               <ds-flex-item>
                 <base-card :wide-content="true">
                   <b :class="{ 'notification-status': notification.read }">
-                    {{ notification.from.contentExcerpt | removeHtml }}
+                    {{
+                      notification.from.contentExcerpt ||
+                      notification.from.descriptionExcerpt | removeHtml
+                    }}
                   </b>
                 </base-card>
               </ds-flex-item>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index d82d3bcde..b72070ee2 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -636,7 +636,7 @@
   },
   "notifications": {
     "comment": "Kommentar",
-    "content": "Inhalt",
+    "content": "Inhalt oder Beschreibung",
     "empty": "Bedaure, Du hast momentan keinerlei Benachrichtigungen.",
     "filterLabel": {
       "all": "Alle",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 6ddfe7cd0..9e6ac227f 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -636,7 +636,7 @@
   },
   "notifications": {
     "comment": "Comment",
-    "content": "Content",
+    "content": "Content or Description",
     "empty": "Sorry, you don't have any notifications at the moment.",
     "filterLabel": {
       "all": "All",

From e91ad99f567cb742a2cbbce5008b9503536162ea Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 17 Mar 2023 13:25:59 +0100
Subject: [PATCH 48/91] fix(webapp): join leave button for pending members

---
 webapp/components/Button/JoinLeaveButton.vue | 16 ++++++++--------
 webapp/pages/group/_id/_slug.vue             |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/webapp/components/Button/JoinLeaveButton.vue b/webapp/components/Button/JoinLeaveButton.vue
index 152039eb0..c2836a149 100644
--- a/webapp/components/Button/JoinLeaveButton.vue
+++ b/webapp/components/Button/JoinLeaveButton.vue
@@ -58,14 +58,6 @@ export default {
       }
       return this.$t('group.joinLeaveButton.join')
     },
-    tooltip() {
-      return {
-        content: this.$t('group.joinLeaveButton.tooltip'),
-        placement: 'right',
-        show: this.isMember && !this.isNonePendingMember && this.hovered,
-        trigger: this.isMember && !this.isNonePendingMember ? 'hover' : 'manual',
-      }
-    },
   },
   watch: {
     isMember() {
@@ -80,6 +72,14 @@ export default {
     ...mapMutations({
       commitModalData: 'modal/SET_OPEN',
     }),
+    tooltip() {
+      return {
+        content: this.$t('group.joinLeaveButton.tooltip'),
+        placement: 'right',
+        show: this.isMember && !this.isNonePendingMember && this.hovered,
+        trigger: this.isMember && !this.isNonePendingMember ? 'hover' : 'manual',
+      }
+    },
     onHover() {
       if (!this.disabled && !this.localLoading) {
         this.hovered = true
diff --git a/webapp/pages/group/_id/_slug.vue b/webapp/pages/group/_id/_slug.vue
index 1eda842d3..27b6a3cbc 100644
--- a/webapp/pages/group/_id/_slug.vue
+++ b/webapp/pages/group/_id/_slug.vue
@@ -565,7 +565,7 @@ export default {
     // },
     prepareJoinLeave() {
       // "membersCountStartValue" is updated to avoid counting from 0 when join/leave
-      this.membersCountStartValue = this.GroupMembers.length
+      this.membersCountStartValue = (this.GroupMembers && this.GroupMembers.length) || 0
     },
     updateJoinLeave({ myRoleInGroup }) {
       this.Group[0].myRole = myRoleInGroup

From 15391991f26addd0c972f13daa3ddee13e6a54e5 Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Sat, 18 Mar 2023 12:28:28 +0100
Subject: [PATCH 49/91] get the tooltip working

---
 webapp/components/Button/JoinLeaveButton.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Button/JoinLeaveButton.vue b/webapp/components/Button/JoinLeaveButton.vue
index c2836a149..f4cc2c009 100644
--- a/webapp/components/Button/JoinLeaveButton.vue
+++ b/webapp/components/Button/JoinLeaveButton.vue
@@ -58,6 +58,14 @@ export default {
       }
       return this.$t('group.joinLeaveButton.join')
     },
+    tooltip() {
+      return {
+        content: this.$t('group.joinLeaveButton.tooltip'),
+        placement: 'right',
+        show: this.isMember && !this.isNonePendingMember && this.hovered,
+        trigger: 'manual',
+      }
+    },
   },
   watch: {
     isMember() {
@@ -72,14 +80,6 @@ export default {
     ...mapMutations({
       commitModalData: 'modal/SET_OPEN',
     }),
-    tooltip() {
-      return {
-        content: this.$t('group.joinLeaveButton.tooltip'),
-        placement: 'right',
-        show: this.isMember && !this.isNonePendingMember && this.hovered,
-        trigger: this.isMember && !this.isNonePendingMember ? 'hover' : 'manual',
-      }
-    },
     onHover() {
       if (!this.disabled && !this.localLoading) {
         this.hovered = true

From 1b41d3bb7c7268c2e69d250b2f68bca782d6c2a6 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 10:53:00 +0100
Subject: [PATCH 50/91] stage.ocelot.social as submodule

---
 .gitmodules                                   | 3 +++
 deployment/configurations/stage.ocelot.social | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 deployment/configurations/stage.ocelot.social

diff --git a/.gitmodules b/.gitmodules
index 24249a28e..b2aae2ea3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "styleguide"]
 	path = styleguide
 	url = https://github.com/Human-Connection/Nitro-Styleguide.git
+[submodule "deployment/configurations/stage.ocelot.social"]
+	path = deployment/configurations/stage.ocelot.social
+	url = git@github.com:Ocelot-Social-Community/stage.ocelot.social.git
diff --git a/deployment/configurations/stage.ocelot.social b/deployment/configurations/stage.ocelot.social
new file mode 160000
index 000000000..9053fec28
--- /dev/null
+++ b/deployment/configurations/stage.ocelot.social
@@ -0,0 +1 @@
+Subproject commit 9053fec28b94333d1a58cfa7398b281e2d1e6eb9

From 61b5112b8b547a7491d644c7c4dbfead39b61d79 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 10:59:49 +0100
Subject: [PATCH 51/91] moved example into stage.ocelot.social

---
 .../configurations/example/branding/README.md |    5 -
 .../example/branding/assets/fonts/.gitkeep    |    0
 .../assets/styles/imports/_branding.scss      |    5 -
 .../example/branding/constants/donation.js    |    1 -
 .../example/branding/constants/emails.js      |    8 -
 .../example/branding/constants/groups.js      |    5 -
 .../example/branding/constants/headerMenu.js  |   13 -
 .../example/branding/constants/links.js       |  152 ---
 .../example/branding/constants/logos.js       |   24 -
 .../example/branding/constants/metadata.js    |    9 -
 .../example/branding/email/.gitkeep           |    1 -
 .../branding/email/templates/de/.gitkeep      |    1 -
 .../branding/email/templates/en/.gitkeep      |    1 -
 .../example/branding/locales/de.json          |    2 -
 .../example/branding/locales/en.json          |    2 -
 .../locales/html/de/code-of-conduct.html      |   60 -
 .../locales/html/de/data-privacy.html         |   60 -
 .../branding/locales/html/de/donate.html      |   60 -
 .../example/branding/locales/html/de/faq.html |   67 --
 .../branding/locales/html/de/imprint.html     |   60 -
 .../locales/html/de/organization.html         |   60 -
 .../branding/locales/html/de/support.html     |   60 -
 .../locales/html/de/terms-and-conditions.html |   61 -
 .../locales/html/en/code-of-conduct.html      |   60 -
 .../locales/html/en/data-privacy.html         |   60 -
 .../branding/locales/html/en/donate.html      |   60 -
 .../example/branding/locales/html/en/faq.html |   67 --
 .../branding/locales/html/en/imprint.html     |   60 -
 .../locales/html/en/organization.html         |   60 -
 .../branding/locales/html/en/support.html     |   60 -
 .../locales/html/en/terms-and-conditions.html |   60 -
 .../example/branding/static/favicon.ico       |  Bin 5558 -> 0 bytes
 .../example/branding/static/icon.png          |  Bin 21631 -> 0 bytes
 .../static/img/custom/logo-horizontal.svg     |   80 --
 .../static/img/custom/logo-squared.svg        |   82 --
 .../locales/html/general/de/faq.html          |   62 -
 .../locales/html/general/en/faq.html          |   62 -
 .../html/hc-y2020/de/code-of-conduct.html     |  163 ---
 .../html/hc-y2020/de/data-privacy.html        | 1010 -----------------
 .../hc-y2020/de/terms-and-conditions.html     |  136 ---
 .../html/hc-y2020/en/code-of-conduct.html     |  163 ---
 .../hc-y2020/en/terms-and-conditions.html     |  135 ---
 .../kubernetes/dns.values.template.yaml       |   12 -
 .../example/kubernetes/values.template.yaml   |  120 --
 44 files changed, 3229 deletions(-)
 delete mode 100644 deployment/configurations/example/branding/README.md
 delete mode 100644 deployment/configurations/example/branding/assets/fonts/.gitkeep
 delete mode 100644 deployment/configurations/example/branding/assets/styles/imports/_branding.scss
 delete mode 100644 deployment/configurations/example/branding/constants/donation.js
 delete mode 100644 deployment/configurations/example/branding/constants/emails.js
 delete mode 100644 deployment/configurations/example/branding/constants/groups.js
 delete mode 100644 deployment/configurations/example/branding/constants/headerMenu.js
 delete mode 100644 deployment/configurations/example/branding/constants/links.js
 delete mode 100644 deployment/configurations/example/branding/constants/logos.js
 delete mode 100644 deployment/configurations/example/branding/constants/metadata.js
 delete mode 100644 deployment/configurations/example/branding/email/.gitkeep
 delete mode 100644 deployment/configurations/example/branding/email/templates/de/.gitkeep
 delete mode 100644 deployment/configurations/example/branding/email/templates/en/.gitkeep
 delete mode 100644 deployment/configurations/example/branding/locales/de.json
 delete mode 100644 deployment/configurations/example/branding/locales/en.json
 delete mode 100644 deployment/configurations/example/branding/locales/html/de/code-of-conduct.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/de/data-privacy.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/de/donate.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/de/faq.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/de/imprint.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/de/organization.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/de/support.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/de/terms-and-conditions.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/en/code-of-conduct.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/en/data-privacy.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/en/donate.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/en/faq.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/en/imprint.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/en/organization.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/en/support.html
 delete mode 100644 deployment/configurations/example/branding/locales/html/en/terms-and-conditions.html
 delete mode 100644 deployment/configurations/example/branding/static/favicon.ico
 delete mode 100644 deployment/configurations/example/branding/static/icon.png
 delete mode 100644 deployment/configurations/example/branding/static/img/custom/logo-horizontal.svg
 delete mode 100644 deployment/configurations/example/branding/static/img/custom/logo-squared.svg
 delete mode 100644 deployment/configurations/example/branding/templates/locales/html/general/de/faq.html
 delete mode 100644 deployment/configurations/example/branding/templates/locales/html/general/en/faq.html
 delete mode 100644 deployment/configurations/example/branding/templates/locales/html/hc-y2020/de/code-of-conduct.html
 delete mode 100644 deployment/configurations/example/branding/templates/locales/html/hc-y2020/de/data-privacy.html
 delete mode 100644 deployment/configurations/example/branding/templates/locales/html/hc-y2020/de/terms-and-conditions.html
 delete mode 100644 deployment/configurations/example/branding/templates/locales/html/hc-y2020/en/code-of-conduct.html
 delete mode 100644 deployment/configurations/example/branding/templates/locales/html/hc-y2020/en/terms-and-conditions.html
 delete mode 100644 deployment/configurations/example/kubernetes/dns.values.template.yaml
 delete mode 100644 deployment/configurations/example/kubernetes/values.template.yaml

diff --git a/deployment/configurations/example/branding/README.md b/deployment/configurations/example/branding/README.md
deleted file mode 100644
index dd2a3b1fc..000000000
--- a/deployment/configurations/example/branding/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Configure And Branding
-
-In this folder you will find all configuration files and logo images to customise the configuration and branding of the [ocelot.social](https://github.com/Ocelot-Social-Community/Ocelot-Social) network code to your own needs.
-
-Please change these and they will be used automatically as part of the [deployment](/deployment/README.md) process.
diff --git a/deployment/configurations/example/branding/assets/fonts/.gitkeep b/deployment/configurations/example/branding/assets/fonts/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/deployment/configurations/example/branding/assets/styles/imports/_branding.scss b/deployment/configurations/example/branding/assets/styles/imports/_branding.scss
deleted file mode 100644
index 75058595d..000000000
--- a/deployment/configurations/example/branding/assets/styles/imports/_branding.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-/* 
-    *
-    * Here, all SCSS variables and classes can be adapted to your custom design. 
-    *
-*/
\ No newline at end of file
diff --git a/deployment/configurations/example/branding/constants/donation.js b/deployment/configurations/example/branding/constants/donation.js
deleted file mode 100644
index 3e36ae9a8..000000000
--- a/deployment/configurations/example/branding/constants/donation.js
+++ /dev/null
@@ -1 +0,0 @@
-export const PROGRESS_BAR_COLOR_TYPE = 'gradient' // 'uni' is the other option
diff --git a/deployment/configurations/example/branding/constants/emails.js b/deployment/configurations/example/branding/constants/emails.js
deleted file mode 100644
index f5bd9a4a6..000000000
--- a/deployment/configurations/example/branding/constants/emails.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// this file is duplicated in `backend/src/config/` and `webapp/constants/` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
-export default {
-  SUPPORT_EMAIL: 'hello@ocelot.social',
-  MODERATION_EMAIL: 'hello@ocelot.social',
-  // ATTENTION: the following links have to be defined even for internal pages with full URLs as example like 'https://staging.ocelot.social/support', because they are used in e-mails!
-  ORGANIZATION_LINK: 'https://ocelot.social',
-  SUPPORT_LINK: 'https://ocelot.social',
-}
diff --git a/deployment/configurations/example/branding/constants/groups.js b/deployment/configurations/example/branding/constants/groups.js
deleted file mode 100644
index 1c49d3ff3..000000000
--- a/deployment/configurations/example/branding/constants/groups.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// this file is duplicated in `backend/src/constants/group.js` and `webapp/constants/group.js`
-export const NAME_LENGTH_MIN = 3
-export const NAME_LENGTH_MAX = 50
-export const DESCRIPTION_WITHOUT_HTML_LENGTH_MIN = 100 // with removed HTML tags
-export const SHOW_GROUP_BUTTON_IN_HEADER = true
diff --git a/deployment/configurations/example/branding/constants/headerMenu.js b/deployment/configurations/example/branding/constants/headerMenu.js
deleted file mode 100644
index aa87a598c..000000000
--- a/deployment/configurations/example/branding/constants/headerMenu.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export default {
-  MENU: [
-    // {
-    //   nameIdent: 'nameIdent',
-    //   path: '/',
-    // },
-    // {
-    //   nameIdent: 'nameIdent',
-    //   url: 'https://ocelot.social',
-    //   target: '_blank',
-    // },
-  ],
-}
diff --git a/deployment/configurations/example/branding/constants/links.js b/deployment/configurations/example/branding/constants/links.js
deleted file mode 100644
index 7efac159f..000000000
--- a/deployment/configurations/example/branding/constants/links.js
+++ /dev/null
@@ -1,152 +0,0 @@
-// this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
-
-import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'
-
-const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
-  // if defined it's dominating
-  externalLink: {
-    url: 'https://ocelot.social',
-    target: '_blank',
-  },
-
-  internalPage: {
-    // footerIdent: 'site.made', // localized string identifier, if undefined default is used
-    // headTitleIdent: 'site.made', // localized string identifier, if undefined default is used
-    // headlineIdent: 'site.made', // localized string identifier, on null it's hidden, if undefined default is used
-    hasContainer: true,
-    hasBaseCard: true,
-    hasLoginInHeader: true,
-    // in case internal page content is here 'branding/locales/html/'
-  },
-})
-const DONATE = defaultPageParamsPages.DONATE.overwrite({
-  // if defined it's dominating
-  externalLink: {
-    // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-    url: 'https://ocelot-social.herokuapp.com/donations',
-    target: '_blank',
-  },
-
-  internalPage: {
-    // footerIdent: 'site.donate', // localized string identifier, if undefined default is used
-    // headTitleIdent: 'site.donate', // localized string identifier, if undefined default is used
-    // headlineIdent: 'site.donate', // localized string identifier, on null it's hidden, if undefined default is used
-    hasContainer: true,
-    hasBaseCard: true,
-    hasLoginInHeader: true,
-    // in case internal page content is here 'branding/locales/html/'
-  },
-})
-const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
-  // if defined it's dominating
-  externalLink: {
-    // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-    url: 'https://ocelot-social.herokuapp.com/imprint',
-    target: '_blank',
-  },
-
-  internalPage: {
-    // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used
-    // headTitleIdent: 'site.imprint', // localized string identifier, if undefined default is used
-    // headlineIdent: 'site.imprint', // localized string identifier, on null it's hidden, if undefined default is used
-    hasContainer: true,
-    hasBaseCard: true,
-    hasLoginInHeader: true,
-    // in case internal page content is here 'branding/locales/html/'
-  },
-})
-const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwrite({
-  // externalLink: null, // if defined it's dominating
-
-  internalPage: {
-    // footerIdent: 'site.termsAndConditions', // localized string identifier, if undefined default is used
-    // headTitleIdent: 'site.termsAndConditions', // localized string identifier, if undefined default is used
-    // headlineIdent: 'site.termsAndConditions', // localized string identifier, on null it's hidden, if undefined default is used
-    hasContainer: true,
-    hasBaseCard: true,
-    hasLoginInHeader: true,
-    // in case internal page content is here 'branding/locales/html/'
-  },
-})
-const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({
-  // externalLink: null, // if defined it's dominating
-
-  internalPage: {
-    // footerIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used
-    // headTitleIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used
-    // headlineIdent: 'site.code-of-conduct', // localized string identifier, on null it's hidden, if undefined default is used
-    hasContainer: true,
-    hasBaseCard: true,
-    hasLoginInHeader: true,
-    // in case internal page content is here 'branding/locales/html/'
-  },
-})
-const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({
-  // externalLink: null, // if defined it's dominating
-
-  internalPage: {
-    // footerIdent: 'site.data-privacy', // localized string identifier, if undefined default is used
-    // headTitleIdent: 'site.data-privacy', // localized string identifier, if undefined default is used
-    // headlineIdent: 'site.data-privacy', // localized string identifier, on null it's hidden, if undefined default is used
-    hasContainer: true,
-    hasBaseCard: true,
-    hasLoginInHeader: true,
-    // in case internal page content is here 'branding/locales/html/'
-  },
-})
-const FAQ = defaultPageParamsPages.FAQ.overwrite({
-  // externalLink: null, // if defined it's dominating
-
-  internalPage: {
-    // footerIdent: 'site.faq', // localized string identifier, if undefined default is used
-    // headTitleIdent: 'site.faq', // localized string identifier, if undefined default is used
-    // headlineIdent: 'site.faq', // on null default is used, on empty string it's hidden
-    hasContainer: true,
-    hasBaseCard: true,
-    hasLoginInHeader: true,
-    // in case internal page content is here 'branding/locales/html/'
-  },
-})
-const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
-  // if defined it's dominating
-  externalLink: {
-    url: 'https://ocelot.social',
-    target: '_blank',
-  },
-
-  internalPage: {
-    // footerIdent: 'site.support', // localized string identifier, if undefined default is used
-    // headTitleIdent: 'site.support', // localized string identifier, if undefined default is used
-    // headlineIdent: 'site.support', // on null default is used, on empty string it's hidden
-    hasContainer: true,
-    hasBaseCard: true,
-    hasLoginInHeader: true,
-    // in case internal page content is here 'branding/locales/html/'
-  },
-})
-
-export default {
-  LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
-
-  // you can find and store templates for 👇🏼 at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/
-
-  ORGANIZATION,
-  DONATE,
-  IMPRINT,
-  TERMS_AND_CONDITIONS,
-  CODE_OF_CONDUCT,
-  DATA_PRIVACY,
-  FAQ,
-  SUPPORT,
-
-  FOOTER_LINK_LIST: [
-    ORGANIZATION,
-    TERMS_AND_CONDITIONS,
-    CODE_OF_CONDUCT,
-    DATA_PRIVACY,
-    FAQ,
-    DONATE,
-    IMPRINT,
-    SUPPORT,
-  ],
-}
diff --git a/deployment/configurations/example/branding/constants/logos.js b/deployment/configurations/example/branding/constants/logos.js
deleted file mode 100644
index 714e78a2c..000000000
--- a/deployment/configurations/example/branding/constants/logos.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// this file is duplicated in `backend/src/config/logos.js` and `webapp/constants/logos.js` and replaced on rebranding
-// this are the paths in the webapp
-export default {
-  LOGO_HEADER_PATH: '/img/custom/logo-horizontal.svg',
-  LOGO_HEADER_WIDTH: '130px',
-  LOGO_HEADER_CLICK: {
-    // externalLink: {
-    //   url: 'https://ocelot.social',
-    //   target: '_blank',
-    // },
-    externalLink: null,
-    internalPath: {
-      to: {
-        name: 'index',
-      },
-      scrollTo: '.main-navigation',
-    },
-  },
-  LOGO_SIGNUP_PATH: '/img/custom/logo-squared.svg',
-  LOGO_WELCOME_PATH: '/img/custom/logo-squared.svg',
-  LOGO_LOGOUT_PATH: '/img/custom/logo-squared.svg',
-  LOGO_PASSWORD_RESET_PATH: '/img/custom/logo-squared.svg',
-  LOGO_MAINTENACE_RESET_PATH: '/img/custom/logo-squared.svg',
-}
diff --git a/deployment/configurations/example/branding/constants/metadata.js b/deployment/configurations/example/branding/constants/metadata.js
deleted file mode 100644
index 3d09066d5..000000000
--- a/deployment/configurations/example/branding/constants/metadata.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// this file is duplicated in `backend/src/config/metadata.js` and `webapp/constants/metadata.js` and replaced on rebranding
-export default {
-  APPLICATION_NAME: 'ocelot.social',
-  APPLICATION_SHORT_NAME: 'ocelot.social',
-  APPLICATION_DESCRIPTION: 'Ocelot Social Community',
-  COOKIE_NAME: 'ocelot-social-token',
-  ORGANIZATION_NAME: 'busFaktor e.V.',
-  ORGANIZATION_JURISDICTION: 'Deutschland',
-}
diff --git a/deployment/configurations/example/branding/email/.gitkeep b/deployment/configurations/example/branding/email/.gitkeep
deleted file mode 100644
index afe8c26c9..000000000
--- a/deployment/configurations/example/branding/email/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-we can put multilanguage e-mails and a layout.html in here
\ No newline at end of file
diff --git a/deployment/configurations/example/branding/email/templates/de/.gitkeep b/deployment/configurations/example/branding/email/templates/de/.gitkeep
deleted file mode 100644
index 5b414a0c8..000000000
--- a/deployment/configurations/example/branding/email/templates/de/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-we can put translated e-mails in here
\ No newline at end of file
diff --git a/deployment/configurations/example/branding/email/templates/en/.gitkeep b/deployment/configurations/example/branding/email/templates/en/.gitkeep
deleted file mode 100644
index 5b414a0c8..000000000
--- a/deployment/configurations/example/branding/email/templates/en/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-we can put translated e-mails in here
\ No newline at end of file
diff --git a/deployment/configurations/example/branding/locales/de.json b/deployment/configurations/example/branding/locales/de.json
deleted file mode 100644
index 2c63c0851..000000000
--- a/deployment/configurations/example/branding/locales/de.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/deployment/configurations/example/branding/locales/en.json b/deployment/configurations/example/branding/locales/en.json
deleted file mode 100644
index 2c63c0851..000000000
--- a/deployment/configurations/example/branding/locales/en.json
+++ /dev/null
@@ -1,2 +0,0 @@
-{
-}
diff --git a/deployment/configurations/example/branding/locales/html/de/code-of-conduct.html b/deployment/configurations/example/branding/locales/html/de/code-of-conduct.html
deleted file mode 100644
index c4538e37d..000000000
--- a/deployment/configurations/example/branding/locales/html/de/code-of-conduct.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
-  </h2>
-  <h3>
-    Präambel
-  </h3>
-  <p>
-    Ich bin der Inhalt vom Verhaltenskodex.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/de/data-privacy.html b/deployment/configurations/example/branding/locales/html/de/data-privacy.html
deleted file mode 100644
index 104d18300..000000000
--- a/deployment/configurations/example/branding/locales/html/de/data-privacy.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
-  </h2>
-  <h3>
-    Information über die Erhebung personenbezogener Daten
-  </h3>
-  <p>
-    Das hier wäre der Inhalt der Datenschutzbestimmungen.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/de/donate.html b/deployment/configurations/example/branding/locales/html/de/donate.html
deleted file mode 100644
index 71f1027ef..000000000
--- a/deployment/configurations/example/branding/locales/html/de/donate.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
-  </h2>
-  <h3>
-    Wohin kann ich spenden?
-  </h3>
-  <p>
-    Hier steht was zu den Spenden.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/de/faq.html b/deployment/configurations/example/branding/locales/html/de/faq.html
deleted file mode 100644
index 15a9d976d..000000000
--- a/deployment/configurations/example/branding/locales/html/de/faq.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
-  </h2>
-  <h3>
-    Wie bediene ich dieses Netzwerk?
-  </h3>
-  <p>
-    Hier findest Du die
-    <a href="https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki" target="_blank" >Bedienungsanleitung</a>.<br>
-  </p>
-  <h3>
-    Betreiberspezifische FAQs
-  </h3>
-  <p>
-    Hier steht was zu den betreiberspezifischen FAQs.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/de/imprint.html b/deployment/configurations/example/branding/locales/html/de/imprint.html
deleted file mode 100644
index ad3c93562..000000000
--- a/deployment/configurations/example/branding/locales/html/de/imprint.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
-  </h2>
-  <h3>
-    Betreiber
-  </h3>
-  <p>
-    Ich bin das Impressum.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/de/organization.html b/deployment/configurations/example/branding/locales/html/de/organization.html
deleted file mode 100644
index 089d72fa4..000000000
--- a/deployment/configurations/example/branding/locales/html/de/organization.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
-  </h2>
-  <h3>
-    Das Entwicklernetzwerk
-  </h3>
-  <p>
-    Hier wird das Netzwerk beschrieben.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/de/support.html b/deployment/configurations/example/branding/locales/html/de/support.html
deleted file mode 100644
index f4dcb537e..000000000
--- a/deployment/configurations/example/branding/locales/html/de/support.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
-  </h2>
-  <h3>
-    Ansprechpartner
-  </h3>
-  <p>
-    Ich bin der Inhalt vom Support.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/de/terms-and-conditions.html b/deployment/configurations/example/branding/locales/html/de/terms-and-conditions.html
deleted file mode 100644
index 74057ada1..000000000
--- a/deployment/configurations/example/branding/locales/html/de/terms-and-conditions.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-
-<div class="info-page">
-  <h2>
-    Für das soziale Netzwerk Ocelot.Social Staging
-  </h2>
-  <h3>
-    Nutzung und Lizenz
-  </h3>
-  <p>
-    Ich bin der Inhalt der Seite "Nutzungsbedingungen".
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/en/code-of-conduct.html b/deployment/configurations/example/branding/locales/html/en/code-of-conduct.html
deleted file mode 100644
index 714cad330..000000000
--- a/deployment/configurations/example/branding/locales/html/en/code-of-conduct.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    For the social network Ocelot.Social Staging
-  </h2>
-  <h3>
-    Präambel
-  </h3>
-  <p>
-    I am the content of the code of conduct.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/en/data-privacy.html b/deployment/configurations/example/branding/locales/html/en/data-privacy.html
deleted file mode 100644
index c4b718fe0..000000000
--- a/deployment/configurations/example/branding/locales/html/en/data-privacy.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    For the social network Ocelot.Social Staging
-  </h2>
-  <h3>
-    Information about the collection of personal data
-  </h3>
-  <p>
-    This would be our data privacy section.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/en/donate.html b/deployment/configurations/example/branding/locales/html/en/donate.html
deleted file mode 100644
index d25e9f419..000000000
--- a/deployment/configurations/example/branding/locales/html/en/donate.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    For the social network Ocelot.Social Staging
-  </h2>
-  <h3>
-    Where can I donate?
-  </h3>
-  <p>
-    Here's what it says about donations.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/en/faq.html b/deployment/configurations/example/branding/locales/html/en/faq.html
deleted file mode 100644
index a5998db78..000000000
--- a/deployment/configurations/example/branding/locales/html/en/faq.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    For the social network Ocelot.Social Staging
-  </h2>
-    <h3>
-    How do I operate this network?
-  </h3>
-  <p>
-    Here you can find the
-    <a href="https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki" target="_blank" >user manual</a>.<br>
-  </p>
-  <h3>
-    Operator-Specific FAQs
-  </h3>
-  <p>
-    Here are the operator-specific FAQs.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/en/imprint.html b/deployment/configurations/example/branding/locales/html/en/imprint.html
deleted file mode 100644
index 6a7489a06..000000000
--- a/deployment/configurations/example/branding/locales/html/en/imprint.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    For the social network Ocelot.Social Staging
-  </h2>
-  <h3>
-    Operator
-  </h3>
-  <p>
-    I am the imprint.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/en/organization.html b/deployment/configurations/example/branding/locales/html/en/organization.html
deleted file mode 100644
index e5a6d0f93..000000000
--- a/deployment/configurations/example/branding/locales/html/en/organization.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    For the social network Ocelot.Social Staging
-  </h2>
-  <h3>
-    The Developers Network
-  </h3>
-  <p>
-    Here the network is described.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/en/support.html b/deployment/configurations/example/branding/locales/html/en/support.html
deleted file mode 100644
index 118328b06..000000000
--- a/deployment/configurations/example/branding/locales/html/en/support.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    For the social network Ocelot.Social Staging
-  </h2>
-  <h3>
-    Contact
-  </h3>
-  <p>
-    I am the content of the support.
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/locales/html/en/terms-and-conditions.html b/deployment/configurations/example/branding/locales/html/en/terms-and-conditions.html
deleted file mode 100644
index 44e3fe3cd..000000000
--- a/deployment/configurations/example/branding/locales/html/en/terms-and-conditions.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
-<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
-
-<div class="info-page">
-  <h2>
-    For the social network Ocelot.Social Staging
-  </h2>
-  <h3>
-    Use and License
-  </h3>
-  <p>
-    I am the content of the page "Terms And Conditions".
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/static/favicon.ico b/deployment/configurations/example/branding/static/favicon.ico
deleted file mode 100644
index 430cef437289d45eaceaa1d096a3674fccbf62cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5558
zcmeHLc~q5U8vnTWa=rV)UAXtMT^0cqT-a4&Q6K~q7nE>Z*hEnT1;R2>2r;zG934B;
zX{P10%t6no>5uA+nbT;EnrkjuIVmogXr?(fPIEfX{GJysvT0NOJKs6a`QG<?pZD3{
z=Xu^wlDs6D<aSGVyQN68B!x?oWHNQl7bzrZ3cf|+8&IS)0OQ^7Ie743^#1+(M|p5C
z_ujpGHz?in3BpP~U>0CHAO{cv_(jj5Lx&#x_~Vb6o_KhE`0(L4&z#>UPo7lXzJ1%N
z*XxVzcKg+&q_LEel18biX_T0lL^hl42GDAI@A+TGtS9*W2K**5KJ&r681jtoy`P8_
z8#ivK^fBsxC@U$U`uYZ%S6o8#F|Mm?patdSq*W__G#a%T!1e0A_kQD#KKjT9ycZog
zawL=SjvYH@$9OS(kl1@)n4gco)nY!R^ou2ZP&_GQ5+#JjP-0jd$t8(&&InS4q>;B$
zc>?={FL&<TX$0+w2M!z<-QS-)XI;T-G;o$O9`oZ^0MuYld@ue^FSY5YA@><_uKb!D
z4IO06f0jbRQ^*|<Mf!<NWM6iQT&uq&^URk>rt`hbGTgj*GZC~FL#JTSb9m_O+qZ8h
z?3)1yfvp#SccsVP7-wKlH6W%N-&c|=-!kPrLym{flJC-^<b14??3MdSIeZ$)ony#a
z@-DtzA$!$fa@3wC^R(wkQVcoP*4DQ4{Q2__L01)c`ZGO@b)a1iKEg)ezYyax$QaSy
z-Y$n6Mfg?$9|i(_tU@OHT&}T@HhuwVVoS)F-A1m)Z%93|kgzVm+c}z?k6a|vl&z$V
zD<y4WCCT*;(rQ$<v$C?D04*hWGClTh1n5_RC!Zk+??spwV%-UU_^>>Xc}iSdT)x$6
z?VOfBm6YZ{GELqhz*g}$_~0^WMiuq&R|X`JqwaIq<nLt6c}mEkw1(2;ygag4EdNre
zRP!N&5A!>E^k_18R)U|E=XfuM&Y64m>@i~;dHVF}%GTD_d0MUhTy^y_Dl1z+!R{dN
zk`wD`nZ2FtOOKE;Fp1RBGof#p7+dDNLDtfpqzp(T$xBJWL4h=XehF1qFDIQ&{~cH*
zGe78;2YzK2E?iLaocTkZQHVp+C!c(hx_9s1DyP%=X;IM}YHNFv)~#Dljg4!_KQNdK
z`OlGS&38h7jzjhX$DDKJ6%m)NH8;sP^HuT-45d}8R*St%W6qp;B$vz2sMTse*th`v
z=7OIaazwGcF?St5e%$xcrAzraIXN#UBqY-M^-obt%Q|XpZKIaQ*U{`*vq=S?TFc%e
z*Q#seeDte6;97N+tQC7mX>d{D^jXy0w6<$6XfUm$q;V|6R`4hU&&hnw*$*rWa)26s
z3CH)6prD{HYHDh+XQPmxb4y@IAlYN|q;bed;fN9Ek7MAj3>ZIhiM;*C1ILSOV|3&U
za0uJ8{g{7U-NR%yo3HKIv7;7tP62;^*q+aw$h&9GoEf)e%a+G%Hv65GD;tIHS{`qu
z2`QQ6U+hicHF}C}HjyDhBGc5DgzY{2*&gP?9b_CKqo_3|fy;Zw#wSzj+9#;ExD-BY
zBE&OQRaO1=`t|FaV<Or2;2*(pfOwcxQ&Y1ULz<ADP9~#)!a_o5cvv`v*Qv>ttfGiz
z2C~FUWXO8D%kSMj;5aZ&d4cT75`|ak$u@on4XsgAL{JC~iyX%1kTNqe#d*oi&E1Z(
z5DdNvu=f%^^O(!eojW&UX=TM$g>Mw{mxJU6C*tk*q>U{nU6`2+;Sw2#Nu&xJN50EH
z6Y=KJpMBwY_#A0Q=8+*%BK=T_v>|5Xj0!Rqyi5v9D9N-o^7f0PK!5*c@N+}=WYpYX
z_`=Kp`;TvISYDwDN&UfEwoBwUj%@~O>2Bz}fsDD^$TI)!uK4d4e|!e4rSHKvF92_=
z*yGvH=has60jVPM*anlpU&eZ~-TOUmZ&%E15#PwMJ^Eqn*Ze*CJoGwr2}6$Ur~ji}
z@yE5vn7y9-9{*nC=)3!`K#v<VBshinXY}LgnW`{&%`jngpV;c60s1R0kir@c9dfaL
z{jO}D7yy0UxN4HAjO4rQWMBUPhhxN)y9v2T{yzAiTN>~*YhsJZCG_rnws6k5wk$b7
zUfyal&-lY2@_{~|f7BtyvCRGR;5h;^=pU$O8$1u_-6I6Z&F<^MuHe;UH;<2z>wK4g
ziu^l@e5;QMc?RIH4_2Hf_z%8Djp*&aUUUSGZ`6Olzju9~%k_<YG>~pro@4u|B63JK
zc4?op=fUS#Gv;gr|1sS(`q|LqC*<gE8?5f-fks1S%TMsXPCm0<A(`4|pbhx^p(j!J
zgy5XCqDI`jw;qsF#6g!2JR(%6hGq?JGnSj_qrN&}WA*{Z8SC4lJK~XP%Joj*ebF6%
z_s}1?Qaxfi$3Sy8b3TW!>eC(_G-jBG>oLSu@jIfnn+sk<ZgP>M{vSdHJ_{Us-pE^q
z%(Y~m{=7J+gViWOYZY?kqzxp=<gb9Q3=pZX4g0}?*y&qSy8JG5Wc};EB)QR_ltJS~
zj2kAdAxlv^`4qk;bocVs&=B_nuz`zwYfgaHAaN{W0Cqt<D+3b#&Ab8Ws_;pJo~a)D
zuDL-zGhZezrRGiGPX%lMybfpw?C2gpf%jy|OR>w8|GWFgK;yTfcL9DnAVwKD_Q%2H
zy)10ZHkE12M}g}G{M0kdOR4+Jl(!i=af}R%1NPUD(2O5Jh<jX<Ol!aBTXVdx&0ur(
zE$34&h3W&~xqgaquk~O_uGnutU+#jx+1?&oivAt3EH?#SWZvC-UNj<pd(I8#Ab>8p
z7IEsuHph+fXFoRVcw3jWxXT9J`G|82+Y@Uq_M#Yz8hM9p;A*-h>WezMfN`D$a9#MN
zj|Ll`QxD5W{>1%+X+w8!NAw+hkL^cvnYSbA4)^a0>(HxMtL?Y`Yo>K_bI4WAn7N!k
znD?@K5aW2r0|eY-{nvbEnoOH{{Qv2;04E?m1a83n{*!dy8$;2zd82pM0$t)h%HiWP
z-0gN(x<f-3YPHH}{yx}){@xG$W)k;&==sInGdDdkHgb6M*SQZ)qC9{*Wat&8Bn{_&
z6!###hYs@r-z?l&;+e*^Yu8w8UtN5~AxruDWJ@R~%gC9yo9rT0Y{kjyh2{C3ot<Nv
znwn(5599j{_u7ESj*gDZl6mv;OjhR+ZORI=FZz&_!KuW3uWi9!Nt^Nr`3HwzO-)Un
z489ul$=ol>v3LI2vuEAgwr#7($;th)w4{_QBeKbgdpO^Tx%OBWen^(6Tq>SlOzG(p
zIua5R;&7kL#@*Y%_YBAsR!~r|tGRhCHLPf$$i&fPdgxE$T)LY6N#@x*C?a7r{;kxD
zyH`p|%C1wVPNhKa{1YcmjM~0^ds;$#eCM>uQz<4Zf&z*p^2x|Se&PGrH)PG8PX2`w
zjhYxn)2B?Mm@%VoZQi^&8+W@|kYDr88{5+?BQn3zWvwU6j7?-p$tBCoZOC<31z3vy
zNT$>&SbK&HIh#looO-#owl*BSxg9p}LLzdTa-O{CYQBwJc?)%RJ8ClSBIu1oe~Eu0
z<{7vfVU2N+Q?J2K{CkccnR@uNcK(OKb=I}IE4N$by(Q{5_iMKDU1Z2;7I|OPV)VS4
zk+a^#Uj7$nHe|J2zMG>v#eLiO;JR-9+=D!g-t)~adfYdlZW^;%Z(=Xkj-eRe=;@u2
z-`U@q(Q`z-cGRCC&QI3Tzlhu~dIhdOlb*UINy<pM)-u<&a4*(yFA(y7OS+VX4w>4t
zNfnmat_sg?M{o8t`ol}2Hv*36n-}j#zv4efQm8USU(CH3Xc#kFIwZAzEad9@C{z#V
z(;F{vJ!W04#cz`|#K`}~w3^t`gZ8RJq#Ivz81oT*H};uDYsW4*VqbC)|6&#$<h|Xi
cp}5!0#aR6N=(A(s#46X?88>v`($D|$U!W%c=Kufz

diff --git a/deployment/configurations/example/branding/static/icon.png b/deployment/configurations/example/branding/static/icon.png
deleted file mode 100644
index 1c81fa5fca1a415323627f025eb8a68fbc2a6b79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21631
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%0AO(paI3yEj85llB4xW#YW{eNjX}4%q0mCvD8DzIw
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
M8hYyGh{qBC2c-T4vj6}9

diff --git a/deployment/configurations/example/branding/static/img/custom/logo-horizontal.svg b/deployment/configurations/example/branding/static/img/custom/logo-horizontal.svg
deleted file mode 100644
index d821c8329..000000000
--- a/deployment/configurations/example/branding/static/img/custom/logo-horizontal.svg
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 828 260" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(20.1687,-2.56346,1.16905,9.19781,-4871.51,-1187.23)">
-        <g transform="matrix(19.367,0,0,42.4673,232.904,227.313)">
-            <path d="M0.033,-0.722L0.01,-0.722C0.006,-0.724 0.004,-0.726 0.004,-0.728C0.004,-0.73 0.006,-0.732 0.01,-0.734L0.161,-0.734C0.163,-0.734 0.164,-0.734 0.165,-0.733C0.166,-0.732 0.167,-0.73 0.167,-0.728C0.167,-0.726 0.166,-0.725 0.165,-0.723C0.164,-0.722 0.163,-0.722 0.161,-0.722L0.135,-0.722L0.181,-0.229L0.228,-0.677L0.223,-0.722L0.199,-0.722C0.197,-0.722 0.196,-0.722 0.195,-0.723C0.193,-0.725 0.193,-0.726 0.193,-0.728C0.193,-0.73 0.193,-0.732 0.195,-0.733C0.196,-0.734 0.197,-0.734 0.199,-0.734L0.352,-0.734C0.356,-0.732 0.357,-0.73 0.357,-0.728C0.357,-0.726 0.356,-0.724 0.352,-0.722L0.324,-0.722L0.371,-0.229L0.418,-0.667C0.419,-0.671 0.419,-0.676 0.419,-0.68C0.419,-0.691 0.417,-0.7 0.414,-0.707C0.411,-0.714 0.406,-0.718 0.4,-0.721L0.385,-0.723C0.383,-0.724 0.382,-0.725 0.382,-0.728C0.382,-0.73 0.384,-0.732 0.388,-0.734L0.469,-0.734C0.472,-0.732 0.474,-0.73 0.474,-0.728C0.474,-0.726 0.474,-0.725 0.473,-0.724C0.472,-0.723 0.471,-0.722 0.469,-0.722C0.46,-0.721 0.453,-0.716 0.446,-0.707C0.437,-0.695 0.432,-0.68 0.43,-0.662L0.365,-0.054C0.361,-0.025 0.359,-0.009 0.356,-0.004C0.354,-0.001 0.351,-0 0.347,-0L0.312,-0C0.307,-0 0.303,-0.002 0.301,-0.006L0.295,-0.06L0.233,-0.62L0.175,-0.054C0.172,-0.023 0.169,-0.007 0.168,-0.005C0.166,-0.002 0.162,-0 0.156,-0L0.121,-0C0.117,-0 0.114,-0.001 0.112,-0.004C0.111,-0.006 0.109,-0.021 0.106,-0.048L0.033,-0.722Z" style="fill:rgb(204,204,204);fill-opacity:0.4;fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(19.367,0,0,42.4673,243.638,227.313)">
-            <path d="M0.122,-0.734L0.122,-0.484C0.135,-0.502 0.147,-0.514 0.157,-0.52C0.168,-0.527 0.18,-0.53 0.194,-0.53C0.216,-0.53 0.231,-0.524 0.24,-0.513C0.253,-0.497 0.26,-0.473 0.26,-0.441L0.26,-0.013L0.277,-0.013C0.281,-0.01 0.282,-0.008 0.282,-0.006C0.282,-0.004 0.281,-0.002 0.277,-0L0.161,-0C0.158,-0.002 0.157,-0.004 0.157,-0.006C0.157,-0.009 0.158,-0.011 0.161,-0.013L0.172,-0.013L0.172,-0.467C0.172,-0.479 0.17,-0.487 0.167,-0.491C0.165,-0.494 0.161,-0.496 0.157,-0.496C0.149,-0.496 0.142,-0.492 0.136,-0.482C0.126,-0.469 0.122,-0.45 0.122,-0.427L0.122,-0.013L0.135,-0.013C0.138,-0.01 0.14,-0.008 0.14,-0.006C0.14,-0.004 0.138,-0.002 0.135,-0L0.014,-0L0.012,-0.001L0.01,-0.006C0.01,-0.009 0.012,-0.011 0.014,-0.013L0.036,-0.013L0.036,-0.722L0.014,-0.722C0.011,-0.724 0.009,-0.726 0.009,-0.728C0.009,-0.73 0.011,-0.732 0.014,-0.734L0.122,-0.734Z" style="fill:rgb(204,204,204);fill-opacity:0.4;fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(19.367,0,0,42.4673,250.732,227.313)">
-            <path d="M0.025,-0.689C0.025,-0.703 0.03,-0.715 0.04,-0.725C0.05,-0.735 0.062,-0.74 0.076,-0.74C0.09,-0.74 0.103,-0.735 0.113,-0.725C0.123,-0.715 0.128,-0.703 0.128,-0.689C0.128,-0.675 0.123,-0.662 0.113,-0.652C0.103,-0.642 0.09,-0.637 0.076,-0.637C0.062,-0.637 0.05,-0.642 0.04,-0.652C0.03,-0.662 0.025,-0.675 0.025,-0.689ZM0.032,-0.511L0.013,-0.511C0.011,-0.511 0.01,-0.512 0.009,-0.513C0.007,-0.514 0.007,-0.516 0.007,-0.518C0.007,-0.52 0.007,-0.521 0.009,-0.522C0.01,-0.523 0.011,-0.524 0.013,-0.524L0.119,-0.524L0.119,-0.013L0.14,-0.013C0.142,-0.013 0.144,-0.012 0.145,-0.011C0.146,-0.01 0.146,-0.008 0.146,-0.006C0.146,-0.004 0.146,-0.003 0.145,-0.002C0.144,-0.001 0.142,-0 0.14,-0L0.013,-0C0.01,-0.002 0.008,-0.004 0.008,-0.006C0.008,-0.009 0.01,-0.011 0.013,-0.013L0.032,-0.013L0.032,-0.511Z" style="fill:rgb(204,204,204);fill-opacity:0.4;fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(19.367,0,0,42.4673,255.217,227.313)">
-            <path d="M0.043,-0.511L0.021,-0.511C0.018,-0.511 0.015,-0.512 0.014,-0.513C0.012,-0.514 0.011,-0.516 0.011,-0.518C0.011,-0.52 0.013,-0.523 0.016,-0.525C0.043,-0.547 0.063,-0.568 0.075,-0.589C0.088,-0.61 0.098,-0.634 0.108,-0.662C0.115,-0.682 0.118,-0.696 0.119,-0.704L0.12,-0.727C0.121,-0.728 0.122,-0.729 0.124,-0.729C0.126,-0.729 0.128,-0.729 0.129,-0.728C0.13,-0.727 0.13,-0.725 0.13,-0.724L0.13,-0.524L0.203,-0.524C0.206,-0.524 0.208,-0.523 0.209,-0.522C0.211,-0.521 0.211,-0.519 0.211,-0.518C0.211,-0.516 0.211,-0.514 0.209,-0.513C0.208,-0.512 0.206,-0.511 0.203,-0.511L0.13,-0.511L0.13,-0.057C0.13,-0.043 0.132,-0.033 0.136,-0.028C0.139,-0.024 0.143,-0.022 0.148,-0.022C0.159,-0.022 0.169,-0.028 0.177,-0.041C0.19,-0.06 0.196,-0.089 0.196,-0.128L0.196,-0.199C0.196,-0.204 0.197,-0.207 0.199,-0.21C0.201,-0.212 0.202,-0.212 0.204,-0.212C0.206,-0.212 0.208,-0.212 0.209,-0.21C0.211,-0.207 0.212,-0.204 0.212,-0.199L0.212,-0.145C0.212,-0.09 0.203,-0.051 0.186,-0.028C0.168,-0.006 0.147,0.006 0.121,0.006C0.096,0.006 0.078,-0.001 0.067,-0.014C0.051,-0.032 0.043,-0.057 0.043,-0.09L0.043,-0.511Z" style="fill:rgb(204,204,204);fill-opacity:0.4;fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(19.367,0,0,42.4673,260.939,227.313)">
-            <path d="M0.101,-0.26L0.101,-0.079C0.101,-0.05 0.104,-0.032 0.11,-0.022C0.115,-0.016 0.123,-0.012 0.134,-0.012C0.153,-0.012 0.169,-0.022 0.183,-0.043C0.207,-0.077 0.22,-0.125 0.221,-0.184C0.222,-0.204 0.222,-0.215 0.224,-0.217C0.225,-0.22 0.227,-0.221 0.23,-0.221C0.232,-0.221 0.234,-0.22 0.235,-0.218C0.237,-0.216 0.238,-0.209 0.238,-0.2C0.238,-0.142 0.228,-0.093 0.207,-0.053C0.187,-0.014 0.16,0.006 0.125,0.006C0.093,0.006 0.066,-0.009 0.045,-0.04C0.024,-0.07 0.013,-0.136 0.013,-0.238L0.013,-0.31C0.013,-0.387 0.028,-0.446 0.056,-0.487C0.077,-0.515 0.101,-0.53 0.13,-0.53C0.165,-0.53 0.191,-0.511 0.21,-0.475C0.229,-0.438 0.238,-0.393 0.238,-0.34L0.238,-0.26L0.101,-0.26ZM0.151,-0.273L0.151,-0.481C0.151,-0.495 0.149,-0.505 0.144,-0.512C0.14,-0.517 0.135,-0.519 0.127,-0.519C0.12,-0.519 0.114,-0.516 0.109,-0.51C0.103,-0.504 0.101,-0.494 0.101,-0.481L0.101,-0.273L0.151,-0.273Z" style="fill:rgb(204,204,204);fill-opacity:0.4;fill-rule:nonzero;"/>
-        </g>
-    </g>
-    <g transform="matrix(2.95533,0,0,2.95533,-18.4944,-17.8011)">
-        <path d="M50.078,80.683C50.078,83.106 55.132,85.274 56.169,85.541C57.205,85.809 56.888,86.99 59.656,86.414C62.423,85.837 65.412,83.181 68.261,79.517C71.11,75.853 69.025,73.224 66.9,70.435C64.775,67.646 60.169,64.412 59.656,58.155C59.252,53.234 63.3,53.047 64.996,52.876C66.693,52.705 69.497,54.85 70.654,54.602C71.76,54.366 76.418,58.834 76.929,57.234C76.642,55.298 77.838,54.264 79.448,54.2C81.057,54.136 81.623,56.773 82.356,58.155C83.259,59.861 83.998,58.66 84.146,57.229C84.538,53.415 83.26,49.493 83.911,46.972C84.277,45.555 85.282,45.386 86.792,43.731C90.77,39.372 90.818,32.915 89.923,29.827C90.954,28.574 92.317,28.571 92.521,21.538C92.726,14.505 87.451,8.531 86.038,7.721C84.624,6.91 80.605,7.633 79.555,8.51C78.506,9.387 66.486,19.391 64.996,21.1C63.507,22.81 62.752,23.616 63.556,27.206C60.728,24.559 56.073,22.692 50.078,23.64C44.083,22.692 39.427,24.559 36.6,27.206C37.403,23.616 36.649,22.81 35.159,21.1C33.669,19.391 21.65,9.387 20.6,8.51C19.551,7.633 15.532,6.91 14.118,7.721C12.704,8.531 7.43,14.505 7.634,21.538C7.838,28.571 9.201,28.574 10.233,29.827C9.337,32.915 9.385,39.372 13.363,43.731C14.874,45.386 15.878,45.555 16.245,46.972C16.896,49.493 15.617,53.415 16.01,57.229C16.157,58.66 16.896,59.861 17.8,58.155C18.532,56.773 19.099,54.136 20.708,54.2C22.317,54.264 23.514,55.298 23.227,57.234C23.737,58.834 28.396,54.366 29.502,54.602C30.659,54.85 33.462,52.705 35.159,52.876C36.856,53.047 40.904,53.234 40.5,58.155C39.987,64.412 35.381,67.646 33.256,70.435C31.13,73.224 29.046,75.853 31.894,79.517C34.743,83.181 37.732,85.837 40.5,86.414C43.268,86.99 42.951,85.809 43.987,85.541C45.023,85.274 50.078,83.106 50.078,80.683C50.078,78.259 50.078,78.259 50.078,80.683Z" style="fill:rgb(230,121,25);"/>
-        <path d="M50,86.57C52.004,86.57 56.013,85.541 56.013,85.541C57.049,85.809 56.732,86.99 59.5,86.414C59.5,86.414 60.917,86.187 61.043,87.1C61.17,88.013 60.255,90.034 57.757,91.5C55.258,92.966 52.642,92.872 50,92.901C47.358,92.872 44.742,92.966 42.243,91.5C39.745,90.034 38.83,88.013 38.957,87.1C39.083,86.187 40.5,86.414 40.5,86.414C43.268,86.99 42.951,85.809 43.987,85.541C43.987,85.541 47.996,86.57 50,86.57Z" style="fill:rgb(134,131,131);"/>
-        <path d="M43.987,85.541C45.023,85.274 50.078,83.106 50.078,80.683C50.078,78.259 50.078,78.259 50.078,80.683C50.078,83.106 55.132,85.274 56.169,85.541" style="fill:rgb(214,183,14);"/>
-        <g transform="matrix(-1,0,0,1,100.127,0)">
-            <path d="M68.261,79.517C71.11,75.853 69.025,73.224 66.9,70.435C64.775,67.646 60.169,64.412 59.656,58.155C59.252,53.234 63.3,53.047 64.996,52.876C66.693,52.705 69.497,54.85 70.654,54.602C71.76,54.366 76.418,58.834 76.929,57.234C76.642,55.298 77.838,54.264 79.448,54.2C81.057,54.136 81.653,56.677 82.356,58.155C84.324,62.293 81.847,65.747 79.773,68.892C77.424,72.452 68.261,79.517 68.261,79.517Z" style="fill:rgb(134,131,131);"/>
-        </g>
-        <path d="M68.261,79.517C71.11,75.853 69.025,73.224 66.9,70.435C64.775,67.646 60.169,64.412 59.656,58.155C59.252,53.234 63.3,53.047 64.996,52.876C66.693,52.705 69.497,54.85 70.654,54.602C71.76,54.366 76.418,58.834 76.929,57.234C76.642,55.298 77.838,54.264 79.448,54.2C81.057,54.136 81.653,56.677 82.356,58.155C84.324,62.293 81.847,65.747 79.773,68.892C77.424,72.452 68.261,79.517 68.261,79.517Z" style="fill:rgb(134,131,131);"/>
-        <path d="M43.987,85.541C45.023,85.274 50.078,83.106 50.078,80.683C50.078,78.259 50.078,78.259 50.078,80.683C50.078,83.106 55.132,85.274 56.169,85.541C56.169,85.541 52.03,86.57 50,86.57C47.996,86.57 43.987,85.541 43.987,85.541Z" style="fill:rgb(232,163,236);"/>
-        <g>
-            <g transform="matrix(-1,0,0,1,100.127,0)">
-                <path d="M60.195,60.954C59.927,60.092 59.738,59.163 59.656,58.155C59.252,53.234 63.3,53.047 64.996,52.876C66.693,52.705 69.497,54.85 70.654,54.602C70.654,54.602 69.967,56.613 70.404,58.155C70.842,59.696 70.041,63.351 65.402,63.351C60.762,63.351 60.195,60.954 60.195,60.954Z" style="fill:rgb(23,181,63);"/>
-            </g>
-            <path d="M60.195,60.954C59.927,60.092 59.738,59.163 59.656,58.155C59.252,53.234 63.3,53.047 64.996,52.876C66.693,52.705 69.497,54.85 70.654,54.602C70.654,54.602 69.967,56.613 70.404,58.155C70.842,59.696 70.041,63.351 65.402,63.351C60.762,63.351 60.195,60.954 60.195,60.954Z" style="fill:rgb(23,181,63);"/>
-        </g>
-    </g>
-    <g transform="matrix(2.95533,0,0,2.95533,-92.3776,-41.0148)">
-        <path d="M114.4,17.155C111,12.755 107.7,13.855 105.9,14.455C105.6,14.555 105.4,14.655 105.1,14.655C104,14.855 101.1,16.955 90,27.055L89.4,27.555C87.7,29.055 87,30.655 86.7,31.855C85.3,31.155 83,30.455 79.7,30.155C77.8,29.955 75.6,30.055 74.9,30.155C74.2,30.155 72,29.955 70.1,30.155C66.8,30.455 64.5,31.155 63.1,31.855C62.8,30.555 62.1,29.055 60.4,27.555L59.8,27.055C48.9,16.955 46,14.855 44.9,14.655C44.7,14.655 44.4,14.555 44.1,14.455C42.3,13.855 39,12.755 35.6,17.155C32,21.855 29.3,32.155 33.1,36.755C33.5,37.155 33.8,37.555 34,37.855L33.9,38.155C33.8,38.355 32.2,43.155 35.3,49.155C36.6,51.755 37.9,52.955 38.9,53.855C40,54.955 40.5,55.355 40.4,57.455C40.2,60.555 39.7,62.655 39.7,62.655L39.7,63.055C39.7,63.355 39.9,71.455 44.7,77.455C49.1,82.955 52,86.055 55.6,87.655C56.9,90.055 59.2,92.555 61.8,94.155C61.9,94.255 62.1,94.355 62.4,94.555C63.3,97.455 66,101.855 71.4,101.855L74.4,101.855C74.4,101.855 76.1,101.855 79.1,101.755C84.6,101.655 87.3,97.255 88.1,94.455C88.3,94.355 88.5,94.155 88.6,94.155C91.2,92.655 93.6,90.055 94.9,87.655C98.5,86.055 101.4,82.955 105.8,77.455C110.6,71.455 110.8,63.455 110.8,63.055L110.8,62.655C110.8,62.655 110.3,60.855 110.1,57.455C110,55.355 110.4,54.955 111.5,53.855C112.4,52.955 113.7,51.655 115.1,49.155C118.2,43.155 116.5,38.355 116.5,38.155L116,37.855C116.2,37.555 116.5,37.155 116.9,36.655C120.7,32.155 118,21.855 114.4,17.155ZM78.8,99.255C75.9,99.355 74.2,99.355 74.2,99.355C73.6,99.255 72.6,99.255 71.2,99.255C68.2,99.255 66.5,97.455 65.5,95.855L65.9,95.855C66.4,95.855 66.9,95.755 67.5,95.555C68,95.355 68.4,95.155 68.9,94.955C69.9,95.455 72,96.155 75.1,95.955L76.2,95.955C78.7,95.955 80.4,95.355 81.3,94.955C81.8,95.155 82.3,95.355 82.7,95.555C83.3,95.855 84,95.855 84.6,95.855C83.5,97.455 81.8,99.155 78.8,99.255ZM75,91.255C75.3,91.655 75.6,91.955 75.9,92.155C76.4,92.455 77.1,92.855 77.8,93.255C77,93.355 76.1,93.455 75.1,93.355L74.9,93.355C73.8,93.455 72.9,93.355 72.2,93.255C72.9,92.855 73.6,92.455 74.1,92.155C74.4,91.955 74.7,91.655 75,91.255ZM115,35.155C113.4,37.055 112.4,38.555 113.3,39.655C113.4,39.755 113.6,40.055 114,40.155C114.2,41.655 114.4,44.655 112.6,48.155C111.5,50.355 110.4,51.355 109.5,52.255C108.2,53.455 107.1,54.555 107.3,57.855C107.5,60.855 107.9,62.755 108,63.355C107.2,62.455 106.4,61.655 105.8,60.855C104.2,58.655 103.3,60.255 100.9,61.955C98.4,63.555 101.1,64.555 98.1,62.655C97.1,62.055 96,61.655 95,61.455C94.6,60.955 94.2,60.555 93.7,60.255L93.4,60.155C93.1,60.055 86.8,58.155 84.1,62.455C83.3,63.155 81.3,65.455 83.9,70.255C84.9,72.055 86.6,74.055 88.2,75.955C89,76.955 89.9,77.955 90.6,78.955C90.1,78.755 89.5,78.555 88.9,78.555C84.8,78.055 85.5,80.955 85.5,80.955C86,82.855 86.7,82.555 87.4,81.955C88.1,81.355 89.9,81.755 92,81.955C92.2,81.955 92.4,81.955 92.5,81.855C92.9,82.655 93.1,83.355 93.2,84.055C92.3,84.155 90.8,84.555 88.9,84.455C86,84.355 84.2,85.355 84.2,85.355C84.8,88.255 87.8,85.955 90.1,86.255C91.2,86.455 92.2,86.255 92.9,85.855C92,87.855 89.8,90.555 87.1,92.055L86.9,92.155C86.9,92.155 85.1,93.755 83.7,93.155C81.6,92.255 78.9,90.855 77.5,89.955C77,89.655 76.7,88.555 76.5,87.555L76.5,87.455C77.7,87.655 79.2,87.655 79.8,87.155C80.8,86.455 81.1,84.455 81.1,84.455C81.1,84.455 80.2,85.455 79.7,84.455C79.1,83.455 80.1,81.355 80.6,81.355C81,81.355 82.7,81.355 81.7,79.355C80.7,77.455 76,79.355 75.3,79.555C74.6,79.255 69.8,77.455 68.9,79.355C67.9,81.355 69.6,81.355 70,81.355C70.4,81.355 71.4,83.455 70.9,84.455C70.3,85.455 69.5,84.455 69.5,84.455C69.5,84.455 69.7,86.355 70.8,87.155C71.4,87.655 73,87.655 74.1,87.455L74.1,87.555C73.9,88.555 73.6,89.655 73.1,89.955C71.7,90.855 69,92.255 66.9,93.155C65.8,93.655 64.1,92.455 63.6,92.055L63,91.955C60.3,90.355 58.1,87.755 57.3,85.755C58,86.155 58.9,86.255 60.1,86.155C62.4,85.855 65.4,88.155 66,85.255C66,85.255 64.2,84.255 61.3,84.355C59.4,84.455 57.9,83.955 57,83.955C57.1,83.255 57.3,82.555 57.7,81.755C57.9,81.755 58,81.855 58.2,81.855C60.3,81.755 62.1,81.255 62.8,81.855C63.5,82.455 64.2,82.755 64.7,80.855C64.7,80.855 65.4,78.055 61.3,78.455C60.6,78.555 60.1,78.655 59.6,78.855C60.4,77.855 61.2,76.855 62,75.855C63.6,73.955 65.3,71.955 66.3,70.155C68.9,65.355 66.9,63.055 66.1,62.355C63.4,57.955 57,59.955 56.8,60.055L56.5,60.155C56,60.455 55.6,60.855 55.2,61.355C54.2,61.555 53.1,61.855 52.1,62.555C49.1,64.455 51.7,63.455 49.3,61.855C46.8,60.255 46,58.555 44.4,60.755C43.8,61.555 43,62.455 42.2,63.255C42.3,62.655 42.8,60.655 42.9,57.755C43.1,54.455 42,53.455 40.7,52.155C39.8,51.355 38.8,50.255 37.6,48.055C35.8,44.555 35.9,41.555 36.2,40.055C36.6,39.955 36.8,39.755 36.9,39.555C37.8,38.455 36.8,37.055 35.2,35.055C32.5,31.755 34.4,23.055 37.8,18.655C40.1,15.655 41.9,16.255 43.5,16.855C43.9,16.955 44.3,17.155 44.5,17.155C45.2,17.455 48.2,19.655 58.4,28.955L59,29.455C61.5,31.655 60.9,33.755 60.9,33.855L59.4,38.855L63,35.155C63,35.155 64,34.255 66.5,33.455C66.4,34.355 66,35.555 65.1,37.255C62.8,41.655 59.5,48.655 60.7,52.455C61.9,56.255 64.7,58.755 64.7,58.755C64.7,58.755 67.4,57.555 66.3,56.155C65.1,54.655 65.5,51.755 63.9,49.755C62.3,47.755 63.7,47.755 65.3,44.255C66.7,41.155 70.2,35.355 69.9,32.955C70.1,32.955 70.4,32.855 70.6,32.855C72.3,32.655 74.6,32.855 75.1,32.855L75.3,32.855C75.8,32.855 78,32.755 79.8,32.855C80,32.855 80.3,32.855 80.5,32.955C80.2,35.355 83.7,41.155 85.1,44.255C86.7,47.755 88.1,47.755 86.5,49.755C84.9,51.755 85.3,54.755 84.1,56.155C82.9,57.655 85.7,58.755 85.7,58.755C85.7,58.755 88.5,56.255 89.7,52.455C90.9,48.655 87.6,41.655 85.3,37.255C84.4,35.555 84,34.355 83.9,33.455C86.4,34.155 87.3,35.055 87.3,35.055L91.1,39.255L89.3,33.855C89.3,33.855 88.7,31.655 91.2,29.455L91.8,28.955C101.9,19.655 104.9,17.455 105.6,17.155C105.9,17.055 106.3,16.955 106.7,16.855C108.3,16.355 110.1,15.755 112.4,18.655C115.8,23.055 117.6,31.855 115,35.155ZM56.06,79.387C55.244,79.454 55.398,79.149 54.605,78.853C54.046,78.644 53.628,78.813 53.425,79.29C53.232,79.741 53.334,80.31 53.76,80.637C54.172,80.954 54.58,81.199 55.014,81.387C54.626,82.321 54.4,83.246 54.4,84.155C52,82.455 49.7,79.855 46.5,75.855C44.5,73.355 43.4,70.455 42.8,68.055C43.3,67.755 43.8,67.155 44.1,66.055C44.8,62.955 47.4,63.655 46.7,65.355C46,67.055 47.1,68.655 49.4,66.855C50.5,65.955 52.1,64.655 53.8,63.555C53.2,65.055 53.1,66.755 53.5,68.255C54.2,70.855 56.2,72.355 59.1,72.555L59.7,72.555C60.4,72.555 61,72.455 61.6,72.355C61.1,72.955 60.6,73.555 60,74.255C58.559,75.953 57.119,77.677 56.06,79.387ZM95.08,81.413C95.537,81.222 95.964,80.969 96.396,80.637C96.822,80.31 96.923,79.741 96.731,79.29C96.527,78.813 96.11,78.644 95.55,78.853C94.727,79.161 94.925,79.477 93.998,79.378C92.926,77.671 91.487,75.95 90.1,74.255C89.6,73.655 89,72.955 88.6,72.355C89.2,72.455 89.8,72.555 90.5,72.555L91.1,72.555C94,72.455 96,70.855 96.7,68.255C97.1,66.755 96.9,65.055 96.4,63.555C98.1,64.655 99.7,66.055 100.8,66.855C103,68.555 104.2,66.955 103.5,65.355C102.8,63.655 105.4,62.955 106.1,66.055C106.3,67.155 106.8,67.755 107.4,68.055C106.6,70.455 105.5,73.355 103.5,75.855C100.3,79.855 98,82.455 95.7,84.155C95.7,83.254 95.47,82.338 95.08,81.413ZM89.8,68.755C90.7,68.755 91.4,67.155 91.4,65.255C91.4,63.755 91,62.555 90.4,62.055C91.3,62.155 92.1,62.255 92.4,62.355C93.7,63.255 94.5,65.755 94.1,67.555C93.7,69.055 92.6,69.855 90.9,69.955C88.5,70.055 86.7,69.355 85.9,68.055C85.1,66.855 85.2,65.355 86,63.855C86.7,62.655 87.9,62.155 89.1,62.055C88.5,62.555 88.1,63.855 88.1,65.255C88.2,67.255 88.9,68.755 89.8,68.755ZM60.2,68.755C61.1,68.755 61.8,67.155 61.8,65.255C61.8,63.755 61.4,62.555 60.8,62.055C62,62.155 63.3,62.555 63.9,63.855C64.7,65.355 64.8,66.955 64.1,68.055C63.3,69.355 61.5,70.055 59.1,69.955C57.4,69.855 56.3,69.055 55.9,67.555C55.4,65.755 56.2,63.255 57.6,62.355C57.9,62.255 58.7,62.055 59.6,62.055C59,62.555 58.6,63.855 58.6,65.255C58.6,67.255 59.3,68.755 60.2,68.755Z" style="fill-rule:nonzero;"/>
-    </g>
-    <g transform="matrix(2.02739,-9.13054e-18,-3.88347e-18,2.06058,125.785,-110.531)">
-        <g transform="matrix(76.453,0,0,75.2214,73.1023,176.391)">
-            <path d="M0.384,-0.55C0.363,-0.607 0.322,-0.636 0.263,-0.636C0.232,-0.636 0.207,-0.627 0.188,-0.609C0.169,-0.591 0.159,-0.57 0.159,-0.546C0.159,-0.521 0.167,-0.501 0.182,-0.486C0.197,-0.47 0.215,-0.456 0.238,-0.443C0.261,-0.43 0.285,-0.418 0.311,-0.407C0.337,-0.395 0.361,-0.381 0.384,-0.364C0.407,-0.347 0.426,-0.326 0.441,-0.302C0.456,-0.277 0.463,-0.246 0.463,-0.208C0.463,-0.175 0.457,-0.144 0.444,-0.117C0.431,-0.089 0.413,-0.065 0.39,-0.046C0.367,-0.026 0.339,-0.011 0.307,-0.001C0.274,0.01 0.238,0.015 0.198,0.015C0.162,0.015 0.13,0.011 0.102,0.004C0.073,-0.004 0.052,-0.014 0.037,-0.025C0.044,-0.048 0.049,-0.07 0.054,-0.089C0.059,-0.108 0.063,-0.129 0.066,-0.152L0.085,-0.152C0.088,-0.137 0.093,-0.124 0.1,-0.111C0.107,-0.097 0.117,-0.086 0.128,-0.076C0.139,-0.066 0.153,-0.058 0.169,-0.053C0.185,-0.047 0.203,-0.044 0.223,-0.044C0.263,-0.044 0.293,-0.054 0.312,-0.074C0.331,-0.094 0.34,-0.118 0.34,-0.146C0.34,-0.171 0.333,-0.192 0.318,-0.208C0.303,-0.224 0.285,-0.238 0.263,-0.251C0.241,-0.263 0.217,-0.275 0.191,-0.287C0.165,-0.298 0.141,-0.312 0.119,-0.329C0.097,-0.346 0.079,-0.366 0.064,-0.391C0.049,-0.415 0.042,-0.446 0.042,-0.484C0.042,-0.519 0.048,-0.549 0.061,-0.576C0.073,-0.603 0.089,-0.625 0.11,-0.643C0.131,-0.661 0.155,-0.675 0.182,-0.684C0.209,-0.693 0.237,-0.698 0.267,-0.698C0.303,-0.698 0.335,-0.694 0.362,-0.685C0.389,-0.676 0.412,-0.664 0.431,-0.649C0.425,-0.634 0.42,-0.619 0.416,-0.605C0.411,-0.59 0.406,-0.572 0.399,-0.55L0.384,-0.55Z" style="fill:rgb(134,131,131);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(76.453,0,0,75.2214,112.464,176.391)">
-            <path d="M0.634,-0.362C0.634,-0.405 0.629,-0.444 0.618,-0.479C0.607,-0.513 0.592,-0.542 0.574,-0.566C0.555,-0.59 0.532,-0.608 0.505,-0.622C0.478,-0.635 0.448,-0.641 0.416,-0.641C0.382,-0.641 0.352,-0.633 0.325,-0.617C0.298,-0.6 0.275,-0.578 0.256,-0.55C0.237,-0.522 0.223,-0.489 0.214,-0.452C0.204,-0.414 0.199,-0.374 0.199,-0.331C0.199,-0.278 0.205,-0.233 0.216,-0.196C0.227,-0.159 0.243,-0.13 0.262,-0.108C0.281,-0.085 0.304,-0.069 0.329,-0.059C0.354,-0.049 0.381,-0.044 0.409,-0.044C0.439,-0.044 0.468,-0.05 0.495,-0.063C0.522,-0.076 0.546,-0.095 0.567,-0.121C0.587,-0.147 0.603,-0.18 0.616,-0.22C0.628,-0.26 0.634,-0.307 0.634,-0.362ZM0.035,-0.34C0.035,-0.389 0.044,-0.436 0.063,-0.479C0.081,-0.522 0.107,-0.56 0.14,-0.593C0.173,-0.626 0.214,-0.651 0.261,-0.67C0.308,-0.689 0.361,-0.698 0.419,-0.698C0.472,-0.698 0.522,-0.691 0.568,-0.676C0.614,-0.661 0.654,-0.639 0.688,-0.61C0.722,-0.581 0.749,-0.544 0.769,-0.499C0.788,-0.454 0.798,-0.401 0.798,-0.341C0.798,-0.291 0.789,-0.244 0.77,-0.201C0.751,-0.158 0.724,-0.12 0.691,-0.088C0.657,-0.055 0.617,-0.03 0.57,-0.012C0.523,0.006 0.472,0.015 0.416,0.015C0.363,0.015 0.314,0.008 0.268,-0.005C0.221,-0.018 0.181,-0.039 0.147,-0.068C0.112,-0.096 0.085,-0.133 0.065,-0.179C0.045,-0.224 0.035,-0.277 0.035,-0.34Z" style="fill:rgb(134,131,131);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(76.453,0,0,75.2214,177.285,176.391)">
-            <path d="M0.63,-0.111C0.625,-0.097 0.62,-0.083 0.616,-0.069C0.612,-0.054 0.609,-0.04 0.608,-0.026C0.554,0.001 0.486,0.015 0.404,0.015C0.346,0.015 0.294,0.007 0.249,-0.01C0.203,-0.026 0.164,-0.049 0.133,-0.079C0.101,-0.108 0.077,-0.143 0.06,-0.184C0.043,-0.225 0.035,-0.269 0.035,-0.316C0.035,-0.385 0.046,-0.444 0.068,-0.493C0.089,-0.541 0.118,-0.58 0.155,-0.611C0.191,-0.641 0.233,-0.663 0.281,-0.677C0.329,-0.691 0.379,-0.698 0.432,-0.698C0.449,-0.698 0.468,-0.697 0.487,-0.694C0.506,-0.691 0.525,-0.688 0.543,-0.684C0.561,-0.679 0.578,-0.674 0.595,-0.668C0.611,-0.662 0.625,-0.656 0.636,-0.649C0.629,-0.632 0.624,-0.616 0.621,-0.599C0.617,-0.582 0.614,-0.564 0.613,-0.547L0.599,-0.547C0.574,-0.579 0.548,-0.602 0.521,-0.616C0.494,-0.629 0.463,-0.636 0.427,-0.636C0.4,-0.636 0.374,-0.63 0.347,-0.618C0.32,-0.606 0.295,-0.588 0.273,-0.563C0.251,-0.538 0.233,-0.507 0.22,-0.469C0.206,-0.43 0.199,-0.384 0.199,-0.331C0.199,-0.28 0.206,-0.236 0.22,-0.2C0.234,-0.163 0.252,-0.133 0.275,-0.111C0.297,-0.088 0.322,-0.071 0.351,-0.06C0.379,-0.049 0.407,-0.044 0.436,-0.044C0.452,-0.044 0.468,-0.046 0.485,-0.05C0.502,-0.053 0.518,-0.058 0.534,-0.065C0.55,-0.071 0.565,-0.079 0.58,-0.088C0.594,-0.097 0.606,-0.108 0.617,-0.119L0.63,-0.111Z" style="fill:rgb(134,131,131);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(76.453,0,0,75.2214,229.414,176.391)">
-            <path d="M0.093,-0.408C0.093,-0.463 0.092,-0.513 0.091,-0.556C0.09,-0.599 0.088,-0.642 0.085,-0.685C0.096,-0.684 0.109,-0.683 0.122,-0.682C0.135,-0.681 0.15,-0.68 0.167,-0.68C0.184,-0.68 0.199,-0.681 0.212,-0.682C0.225,-0.683 0.238,-0.684 0.249,-0.685C0.246,-0.642 0.244,-0.599 0.243,-0.556C0.242,-0.513 0.241,-0.463 0.241,-0.408L0.241,-0.272C0.241,-0.217 0.242,-0.167 0.243,-0.125C0.244,-0.082 0.246,-0.039 0.249,0.002C0.238,0.001 0.225,-0 0.212,-0L0.122,-0C0.109,-0 0.096,0.001 0.085,0.002C0.088,-0.039 0.09,-0.082 0.091,-0.125C0.092,-0.167 0.093,-0.217 0.093,-0.272L0.093,-0.408Z" style="fill:rgb(134,131,131);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(76.453,0,0,75.2214,256.008,176.391)">
-            <path d="M0.299,-0.497C0.282,-0.457 0.265,-0.418 0.25,-0.379C0.235,-0.339 0.22,-0.3 0.205,-0.259L0.388,-0.259C0.373,-0.3 0.359,-0.339 0.345,-0.379C0.33,-0.418 0.315,-0.457 0.299,-0.497ZM0.653,0.002C0.637,0.001 0.622,-0 0.608,-0L0.523,-0C0.508,-0 0.494,0.001 0.48,0.002C0.469,-0.031 0.458,-0.064 0.447,-0.098C0.436,-0.132 0.424,-0.166 0.411,-0.2C0.39,-0.201 0.368,-0.201 0.347,-0.202C0.326,-0.202 0.304,-0.202 0.283,-0.202C0.266,-0.202 0.248,-0.202 0.231,-0.202C0.214,-0.201 0.196,-0.201 0.179,-0.2C0.166,-0.166 0.153,-0.132 0.142,-0.098C0.131,-0.064 0.12,-0.031 0.111,0.002C0.103,0.001 0.095,-0 0.088,-0L0.04,-0C0.032,-0 0.023,0.001 0.014,0.002C0.022,-0.015 0.033,-0.039 0.046,-0.07C0.059,-0.101 0.074,-0.135 0.09,-0.174C0.106,-0.213 0.123,-0.254 0.142,-0.299C0.16,-0.343 0.178,-0.388 0.197,-0.433C0.215,-0.478 0.233,-0.523 0.251,-0.567C0.268,-0.611 0.284,-0.652 0.299,-0.69C0.306,-0.689 0.312,-0.688 0.318,-0.687C0.324,-0.686 0.33,-0.685 0.337,-0.685C0.344,-0.685 0.35,-0.686 0.356,-0.687C0.362,-0.688 0.368,-0.689 0.375,-0.69C0.396,-0.633 0.419,-0.573 0.444,-0.508C0.468,-0.443 0.492,-0.38 0.517,-0.318C0.542,-0.255 0.566,-0.196 0.589,-0.14C0.612,-0.084 0.634,-0.037 0.653,0.002Z" style="fill:rgb(134,131,131);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(76.453,0,0,75.2214,308.138,176.391)">
-            <path d="M0.089,-0.408C0.089,-0.463 0.088,-0.513 0.087,-0.556C0.086,-0.599 0.084,-0.642 0.081,-0.685C0.092,-0.684 0.105,-0.683 0.118,-0.682C0.131,-0.681 0.146,-0.68 0.163,-0.68C0.18,-0.68 0.195,-0.681 0.208,-0.682C0.221,-0.683 0.234,-0.684 0.245,-0.685C0.242,-0.642 0.24,-0.599 0.239,-0.556C0.238,-0.513 0.237,-0.463 0.237,-0.408L0.237,-0.272C0.237,-0.234 0.237,-0.197 0.238,-0.162C0.238,-0.127 0.238,-0.096 0.239,-0.07C0.277,-0.07 0.315,-0.071 0.353,-0.073C0.391,-0.075 0.429,-0.078 0.468,-0.083C0.467,-0.076 0.466,-0.069 0.465,-0.063C0.464,-0.057 0.464,-0.049 0.464,-0.038C0.464,-0.027 0.464,-0.019 0.465,-0.013C0.466,-0.007 0.467,-0.002 0.468,0.002C0.45,0.001 0.428,0.001 0.402,0.001C0.375,0 0.339,-0 0.293,-0L0.135,-0C0.12,-0 0.108,0 0.101,0.001C0.093,0.001 0.086,0.001 0.081,0.002C0.084,-0.039 0.086,-0.082 0.087,-0.125C0.088,-0.167 0.089,-0.217 0.089,-0.272L0.089,-0.408Z" style="fill:rgb(134,131,131);fill-rule:nonzero;"/>
-        </g>
-    </g>
-    <g transform="matrix(2.02739,-8.33676e-18,-3.88347e-18,1.88144,125.785,-222.444)">
-        <g transform="matrix(73.9867,0,0,79.726,73.1023,179.779)">
-            <path d="M0.634,-0.362C0.634,-0.405 0.629,-0.444 0.618,-0.479C0.607,-0.513 0.592,-0.542 0.574,-0.566C0.555,-0.59 0.532,-0.608 0.505,-0.622C0.478,-0.635 0.448,-0.641 0.416,-0.641C0.382,-0.641 0.352,-0.633 0.325,-0.617C0.298,-0.6 0.275,-0.578 0.256,-0.55C0.237,-0.522 0.223,-0.489 0.214,-0.452C0.204,-0.414 0.199,-0.374 0.199,-0.331C0.199,-0.278 0.205,-0.233 0.216,-0.196C0.227,-0.159 0.243,-0.13 0.262,-0.108C0.281,-0.085 0.304,-0.069 0.329,-0.059C0.354,-0.049 0.381,-0.044 0.409,-0.044C0.439,-0.044 0.468,-0.05 0.495,-0.063C0.522,-0.076 0.546,-0.095 0.567,-0.121C0.587,-0.147 0.603,-0.18 0.616,-0.22C0.628,-0.26 0.634,-0.307 0.634,-0.362ZM0.035,-0.34C0.035,-0.389 0.044,-0.436 0.063,-0.479C0.081,-0.522 0.107,-0.56 0.14,-0.593C0.173,-0.626 0.214,-0.651 0.261,-0.67C0.308,-0.689 0.361,-0.698 0.419,-0.698C0.472,-0.698 0.522,-0.691 0.568,-0.676C0.614,-0.661 0.654,-0.639 0.688,-0.61C0.722,-0.581 0.749,-0.544 0.769,-0.499C0.788,-0.454 0.798,-0.401 0.798,-0.341C0.798,-0.291 0.789,-0.244 0.77,-0.201C0.751,-0.158 0.724,-0.12 0.691,-0.088C0.657,-0.055 0.617,-0.03 0.57,-0.012C0.523,0.006 0.472,0.015 0.416,0.015C0.363,0.015 0.314,0.008 0.268,-0.005C0.221,-0.018 0.181,-0.039 0.147,-0.068C0.112,-0.096 0.085,-0.133 0.065,-0.179C0.045,-0.224 0.035,-0.277 0.035,-0.34Z" style="fill:rgb(23,181,63);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(73.9867,0,0,79.726,134.206,179.779)">
-            <path d="M0.63,-0.111C0.625,-0.097 0.62,-0.083 0.616,-0.069C0.612,-0.054 0.609,-0.04 0.608,-0.026C0.554,0.001 0.486,0.015 0.404,0.015C0.346,0.015 0.294,0.007 0.249,-0.01C0.203,-0.026 0.164,-0.049 0.133,-0.079C0.101,-0.108 0.077,-0.143 0.06,-0.184C0.043,-0.225 0.035,-0.269 0.035,-0.316C0.035,-0.385 0.046,-0.444 0.068,-0.493C0.089,-0.541 0.118,-0.58 0.155,-0.611C0.191,-0.641 0.233,-0.663 0.281,-0.677C0.329,-0.691 0.379,-0.698 0.432,-0.698C0.449,-0.698 0.468,-0.697 0.487,-0.694C0.506,-0.691 0.525,-0.688 0.543,-0.684C0.561,-0.679 0.578,-0.674 0.595,-0.668C0.611,-0.662 0.625,-0.656 0.636,-0.649C0.629,-0.632 0.624,-0.616 0.621,-0.599C0.617,-0.582 0.614,-0.564 0.613,-0.547L0.599,-0.547C0.574,-0.579 0.548,-0.602 0.521,-0.616C0.494,-0.629 0.463,-0.636 0.427,-0.636C0.4,-0.636 0.374,-0.63 0.347,-0.618C0.32,-0.606 0.295,-0.588 0.273,-0.563C0.251,-0.538 0.233,-0.507 0.22,-0.469C0.206,-0.43 0.199,-0.384 0.199,-0.331C0.199,-0.28 0.206,-0.236 0.22,-0.2C0.234,-0.163 0.252,-0.133 0.275,-0.111C0.297,-0.088 0.322,-0.071 0.351,-0.06C0.379,-0.049 0.407,-0.044 0.436,-0.044C0.452,-0.044 0.468,-0.046 0.485,-0.05C0.502,-0.053 0.518,-0.058 0.534,-0.065C0.55,-0.071 0.565,-0.079 0.58,-0.088C0.594,-0.097 0.606,-0.108 0.617,-0.119L0.63,-0.111Z" style="fill:rgb(23,181,63);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(73.9867,0,0,79.726,181.549,179.779)">
-            <path d="M0.08,-0.408C0.08,-0.463 0.079,-0.513 0.078,-0.556C0.077,-0.599 0.075,-0.642 0.072,-0.685C0.102,-0.684 0.132,-0.683 0.161,-0.682C0.19,-0.681 0.22,-0.68 0.25,-0.68C0.299,-0.68 0.343,-0.681 0.382,-0.682C0.42,-0.683 0.446,-0.684 0.459,-0.685C0.456,-0.674 0.455,-0.66 0.455,-0.643C0.455,-0.632 0.455,-0.624 0.456,-0.618C0.457,-0.612 0.458,-0.605 0.459,-0.598C0.44,-0.599 0.419,-0.601 0.396,-0.602C0.373,-0.603 0.35,-0.605 0.329,-0.606C0.307,-0.607 0.287,-0.608 0.27,-0.609C0.253,-0.61 0.24,-0.61 0.233,-0.61C0.23,-0.573 0.229,-0.537 0.229,-0.501C0.228,-0.465 0.228,-0.429 0.228,-0.392C0.271,-0.393 0.311,-0.394 0.346,-0.395C0.381,-0.396 0.417,-0.398 0.455,-0.4C0.453,-0.389 0.452,-0.38 0.451,-0.374C0.45,-0.368 0.45,-0.362 0.45,-0.355C0.45,-0.35 0.451,-0.344 0.452,-0.339C0.452,-0.333 0.454,-0.325 0.455,-0.314C0.379,-0.32 0.303,-0.323 0.228,-0.323C0.228,-0.302 0.228,-0.28 0.228,-0.259C0.227,-0.238 0.227,-0.216 0.227,-0.195C0.227,-0.152 0.228,-0.11 0.23,-0.07C0.268,-0.07 0.306,-0.071 0.344,-0.073C0.382,-0.075 0.42,-0.078 0.459,-0.083C0.458,-0.076 0.457,-0.069 0.456,-0.063C0.455,-0.057 0.455,-0.049 0.455,-0.038C0.455,-0.027 0.455,-0.019 0.456,-0.013C0.457,-0.007 0.458,-0.002 0.459,0.002C0.441,0.001 0.419,0.001 0.393,0.001C0.366,0 0.33,-0 0.284,-0L0.126,-0C0.111,-0 0.099,0 0.092,0.001C0.084,0.001 0.077,0.001 0.072,0.002C0.075,-0.039 0.077,-0.082 0.078,-0.125C0.079,-0.167 0.08,-0.217 0.08,-0.272L0.08,-0.408Z" style="fill:rgb(23,181,63);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(73.9867,0,0,79.726,218.015,179.779)">
-            <path d="M0.089,-0.408C0.089,-0.463 0.088,-0.513 0.087,-0.556C0.086,-0.599 0.084,-0.642 0.081,-0.685C0.092,-0.684 0.105,-0.683 0.118,-0.682C0.131,-0.681 0.146,-0.68 0.163,-0.68C0.18,-0.68 0.195,-0.681 0.208,-0.682C0.221,-0.683 0.234,-0.684 0.245,-0.685C0.242,-0.642 0.24,-0.599 0.239,-0.556C0.238,-0.513 0.237,-0.463 0.237,-0.408L0.237,-0.272C0.237,-0.234 0.237,-0.197 0.238,-0.162C0.238,-0.127 0.238,-0.096 0.239,-0.07C0.277,-0.07 0.315,-0.071 0.353,-0.073C0.391,-0.075 0.429,-0.078 0.468,-0.083C0.467,-0.076 0.466,-0.069 0.465,-0.063C0.464,-0.057 0.464,-0.049 0.464,-0.038C0.464,-0.027 0.464,-0.019 0.465,-0.013C0.466,-0.007 0.467,-0.002 0.468,0.002C0.45,0.001 0.428,0.001 0.402,0.001C0.375,0 0.339,-0 0.293,-0L0.135,-0C0.12,-0 0.108,0 0.101,0.001C0.093,0.001 0.086,0.001 0.081,0.002C0.084,-0.039 0.086,-0.082 0.087,-0.125C0.088,-0.167 0.089,-0.217 0.089,-0.272L0.089,-0.408Z" style="fill:rgb(23,181,63);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(73.9867,0,0,79.726,249.303,179.779)">
-            <path d="M0.634,-0.362C0.634,-0.405 0.629,-0.444 0.618,-0.479C0.607,-0.513 0.592,-0.542 0.574,-0.566C0.555,-0.59 0.532,-0.608 0.505,-0.622C0.478,-0.635 0.448,-0.641 0.416,-0.641C0.382,-0.641 0.352,-0.633 0.325,-0.617C0.298,-0.6 0.275,-0.578 0.256,-0.55C0.237,-0.522 0.223,-0.489 0.214,-0.452C0.204,-0.414 0.199,-0.374 0.199,-0.331C0.199,-0.278 0.205,-0.233 0.216,-0.196C0.227,-0.159 0.243,-0.13 0.262,-0.108C0.281,-0.085 0.304,-0.069 0.329,-0.059C0.354,-0.049 0.381,-0.044 0.409,-0.044C0.439,-0.044 0.468,-0.05 0.495,-0.063C0.522,-0.076 0.546,-0.095 0.567,-0.121C0.587,-0.147 0.603,-0.18 0.616,-0.22C0.628,-0.26 0.634,-0.307 0.634,-0.362ZM0.035,-0.34C0.035,-0.389 0.044,-0.436 0.063,-0.479C0.081,-0.522 0.107,-0.56 0.14,-0.593C0.173,-0.626 0.214,-0.651 0.261,-0.67C0.308,-0.689 0.361,-0.698 0.419,-0.698C0.472,-0.698 0.522,-0.691 0.568,-0.676C0.614,-0.661 0.654,-0.639 0.688,-0.61C0.722,-0.581 0.749,-0.544 0.769,-0.499C0.788,-0.454 0.798,-0.401 0.798,-0.341C0.798,-0.291 0.789,-0.244 0.77,-0.201C0.751,-0.158 0.724,-0.12 0.691,-0.088C0.657,-0.055 0.617,-0.03 0.57,-0.012C0.523,0.006 0.472,0.015 0.416,0.015C0.363,0.015 0.314,0.008 0.268,-0.005C0.221,-0.018 0.181,-0.039 0.147,-0.068C0.112,-0.096 0.085,-0.133 0.065,-0.179C0.045,-0.224 0.035,-0.277 0.035,-0.34Z" style="fill:rgb(23,181,63);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(73.9867,0,0,79.726,305.228,179.779)">
-            <path d="M0.207,-0.522C0.207,-0.541 0.207,-0.559 0.207,-0.575C0.206,-0.591 0.205,-0.603 0.204,-0.61C0.194,-0.61 0.182,-0.61 0.167,-0.609C0.152,-0.608 0.137,-0.608 0.12,-0.607C0.103,-0.606 0.086,-0.604 0.069,-0.603C0.052,-0.601 0.036,-0.599 0.021,-0.597C0.022,-0.604 0.024,-0.612 0.025,-0.619C0.026,-0.626 0.026,-0.634 0.026,-0.641C0.026,-0.648 0.026,-0.656 0.025,-0.663C0.024,-0.67 0.022,-0.678 0.021,-0.685C0.044,-0.684 0.064,-0.684 0.083,-0.683C0.101,-0.682 0.12,-0.682 0.139,-0.682C0.158,-0.681 0.178,-0.681 0.201,-0.681C0.223,-0.68 0.25,-0.68 0.281,-0.68C0.312,-0.68 0.339,-0.68 0.362,-0.681C0.384,-0.681 0.404,-0.681 0.423,-0.682C0.442,-0.682 0.46,-0.682 0.478,-0.683C0.495,-0.684 0.514,-0.684 0.535,-0.685C0.534,-0.678 0.533,-0.67 0.532,-0.663C0.531,-0.656 0.53,-0.648 0.53,-0.641C0.53,-0.634 0.531,-0.626 0.532,-0.619C0.533,-0.612 0.534,-0.604 0.535,-0.597C0.522,-0.599 0.507,-0.601 0.49,-0.603C0.473,-0.604 0.457,-0.606 0.441,-0.607C0.424,-0.608 0.409,-0.608 0.394,-0.609C0.379,-0.61 0.367,-0.61 0.357,-0.61C0.356,-0.607 0.356,-0.602 0.356,-0.596C0.355,-0.59 0.355,-0.583 0.355,-0.575L0.355,-0.272C0.355,-0.217 0.356,-0.167 0.357,-0.125C0.358,-0.082 0.36,-0.039 0.363,0.002C0.352,0.001 0.339,-0 0.326,-0L0.236,-0C0.223,-0 0.21,0.001 0.199,0.002C0.202,-0.039 0.204,-0.082 0.205,-0.125C0.206,-0.167 0.207,-0.217 0.207,-0.272L0.207,-0.522Z" style="fill:rgb(23,181,63);fill-rule:nonzero;"/>
-        </g>
-    </g>
-</svg>
diff --git a/deployment/configurations/example/branding/static/img/custom/logo-squared.svg b/deployment/configurations/example/branding/static/img/custom/logo-squared.svg
deleted file mode 100644
index 15f420c79..000000000
--- a/deployment/configurations/example/branding/static/img/custom/logo-squared.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 600 570" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
-    <g transform="matrix(19.3864,-2.46403,1.12371,8.84107,-4780.51,-981.139)">
-        <g transform="matrix(19.367,0,0,42.4673,232.904,227.313)">
-            <path d="M0.033,-0.722L0.01,-0.722C0.006,-0.724 0.004,-0.726 0.004,-0.728C0.004,-0.73 0.006,-0.732 0.01,-0.734L0.161,-0.734C0.163,-0.734 0.164,-0.734 0.165,-0.733C0.166,-0.732 0.167,-0.73 0.167,-0.728C0.167,-0.726 0.166,-0.725 0.165,-0.723C0.164,-0.722 0.163,-0.722 0.161,-0.722L0.135,-0.722L0.181,-0.229L0.228,-0.677L0.223,-0.722L0.199,-0.722C0.197,-0.722 0.196,-0.722 0.195,-0.723C0.193,-0.725 0.193,-0.726 0.193,-0.728C0.193,-0.73 0.193,-0.732 0.195,-0.733C0.196,-0.734 0.197,-0.734 0.199,-0.734L0.352,-0.734C0.356,-0.732 0.357,-0.73 0.357,-0.728C0.357,-0.726 0.356,-0.724 0.352,-0.722L0.324,-0.722L0.371,-0.229L0.418,-0.667C0.419,-0.671 0.419,-0.676 0.419,-0.68C0.419,-0.691 0.417,-0.7 0.414,-0.707C0.411,-0.714 0.406,-0.718 0.4,-0.721L0.385,-0.723C0.383,-0.724 0.382,-0.725 0.382,-0.728C0.382,-0.73 0.384,-0.732 0.388,-0.734L0.469,-0.734C0.472,-0.732 0.474,-0.73 0.474,-0.728C0.474,-0.726 0.474,-0.725 0.473,-0.724C0.472,-0.723 0.471,-0.722 0.469,-0.722C0.46,-0.721 0.453,-0.716 0.446,-0.707C0.437,-0.695 0.432,-0.68 0.43,-0.662L0.365,-0.054C0.361,-0.025 0.359,-0.009 0.356,-0.004C0.354,-0.001 0.351,-0 0.347,-0L0.312,-0C0.307,-0 0.303,-0.002 0.301,-0.006L0.295,-0.06L0.233,-0.62L0.175,-0.054C0.172,-0.023 0.169,-0.007 0.168,-0.005C0.166,-0.002 0.162,-0 0.156,-0L0.121,-0C0.117,-0 0.114,-0.001 0.112,-0.004C0.111,-0.006 0.109,-0.021 0.106,-0.048L0.033,-0.722Z" style="fill:rgb(204,204,204);fill-opacity:0.4;fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(19.367,0,0,42.4673,243.638,227.313)">
-            <path d="M0.122,-0.734L0.122,-0.484C0.135,-0.502 0.147,-0.514 0.157,-0.52C0.168,-0.527 0.18,-0.53 0.194,-0.53C0.216,-0.53 0.231,-0.524 0.24,-0.513C0.253,-0.497 0.26,-0.473 0.26,-0.441L0.26,-0.013L0.277,-0.013C0.281,-0.01 0.282,-0.008 0.282,-0.006C0.282,-0.004 0.281,-0.002 0.277,-0L0.161,-0C0.158,-0.002 0.157,-0.004 0.157,-0.006C0.157,-0.009 0.158,-0.011 0.161,-0.013L0.172,-0.013L0.172,-0.467C0.172,-0.479 0.17,-0.487 0.167,-0.491C0.165,-0.494 0.161,-0.496 0.157,-0.496C0.149,-0.496 0.142,-0.492 0.136,-0.482C0.126,-0.469 0.122,-0.45 0.122,-0.427L0.122,-0.013L0.135,-0.013C0.138,-0.01 0.14,-0.008 0.14,-0.006C0.14,-0.004 0.138,-0.002 0.135,-0L0.014,-0L0.012,-0.001L0.01,-0.006C0.01,-0.009 0.012,-0.011 0.014,-0.013L0.036,-0.013L0.036,-0.722L0.014,-0.722C0.011,-0.724 0.009,-0.726 0.009,-0.728C0.009,-0.73 0.011,-0.732 0.014,-0.734L0.122,-0.734Z" style="fill:rgb(204,204,204);fill-opacity:0.4;fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(19.367,0,0,42.4673,250.732,227.313)">
-            <path d="M0.025,-0.689C0.025,-0.703 0.03,-0.715 0.04,-0.725C0.05,-0.735 0.062,-0.74 0.076,-0.74C0.09,-0.74 0.103,-0.735 0.113,-0.725C0.123,-0.715 0.128,-0.703 0.128,-0.689C0.128,-0.675 0.123,-0.662 0.113,-0.652C0.103,-0.642 0.09,-0.637 0.076,-0.637C0.062,-0.637 0.05,-0.642 0.04,-0.652C0.03,-0.662 0.025,-0.675 0.025,-0.689ZM0.032,-0.511L0.013,-0.511C0.011,-0.511 0.01,-0.512 0.009,-0.513C0.007,-0.514 0.007,-0.516 0.007,-0.518C0.007,-0.52 0.007,-0.521 0.009,-0.522C0.01,-0.523 0.011,-0.524 0.013,-0.524L0.119,-0.524L0.119,-0.013L0.14,-0.013C0.142,-0.013 0.144,-0.012 0.145,-0.011C0.146,-0.01 0.146,-0.008 0.146,-0.006C0.146,-0.004 0.146,-0.003 0.145,-0.002C0.144,-0.001 0.142,-0 0.14,-0L0.013,-0C0.01,-0.002 0.008,-0.004 0.008,-0.006C0.008,-0.009 0.01,-0.011 0.013,-0.013L0.032,-0.013L0.032,-0.511Z" style="fill:rgb(204,204,204);fill-opacity:0.4;fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(19.367,0,0,42.4673,255.217,227.313)">
-            <path d="M0.043,-0.511L0.021,-0.511C0.018,-0.511 0.015,-0.512 0.014,-0.513C0.012,-0.514 0.011,-0.516 0.011,-0.518C0.011,-0.52 0.013,-0.523 0.016,-0.525C0.043,-0.547 0.063,-0.568 0.075,-0.589C0.088,-0.61 0.098,-0.634 0.108,-0.662C0.115,-0.682 0.118,-0.696 0.119,-0.704L0.12,-0.727C0.121,-0.728 0.122,-0.729 0.124,-0.729C0.126,-0.729 0.128,-0.729 0.129,-0.728C0.13,-0.727 0.13,-0.725 0.13,-0.724L0.13,-0.524L0.203,-0.524C0.206,-0.524 0.208,-0.523 0.209,-0.522C0.211,-0.521 0.211,-0.519 0.211,-0.518C0.211,-0.516 0.211,-0.514 0.209,-0.513C0.208,-0.512 0.206,-0.511 0.203,-0.511L0.13,-0.511L0.13,-0.057C0.13,-0.043 0.132,-0.033 0.136,-0.028C0.139,-0.024 0.143,-0.022 0.148,-0.022C0.159,-0.022 0.169,-0.028 0.177,-0.041C0.19,-0.06 0.196,-0.089 0.196,-0.128L0.196,-0.199C0.196,-0.204 0.197,-0.207 0.199,-0.21C0.201,-0.212 0.202,-0.212 0.204,-0.212C0.206,-0.212 0.208,-0.212 0.209,-0.21C0.211,-0.207 0.212,-0.204 0.212,-0.199L0.212,-0.145C0.212,-0.09 0.203,-0.051 0.186,-0.028C0.168,-0.006 0.147,0.006 0.121,0.006C0.096,0.006 0.078,-0.001 0.067,-0.014C0.051,-0.032 0.043,-0.057 0.043,-0.09L0.043,-0.511Z" style="fill:rgb(204,204,204);fill-opacity:0.4;fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(19.367,0,0,42.4673,260.939,227.313)">
-            <path d="M0.101,-0.26L0.101,-0.079C0.101,-0.05 0.104,-0.032 0.11,-0.022C0.115,-0.016 0.123,-0.012 0.134,-0.012C0.153,-0.012 0.169,-0.022 0.183,-0.043C0.207,-0.077 0.22,-0.125 0.221,-0.184C0.222,-0.204 0.222,-0.215 0.224,-0.217C0.225,-0.22 0.227,-0.221 0.23,-0.221C0.232,-0.221 0.234,-0.22 0.235,-0.218C0.237,-0.216 0.238,-0.209 0.238,-0.2C0.238,-0.142 0.228,-0.093 0.207,-0.053C0.187,-0.014 0.16,0.006 0.125,0.006C0.093,0.006 0.066,-0.009 0.045,-0.04C0.024,-0.07 0.013,-0.136 0.013,-0.238L0.013,-0.31C0.013,-0.387 0.028,-0.446 0.056,-0.487C0.077,-0.515 0.101,-0.53 0.13,-0.53C0.165,-0.53 0.191,-0.511 0.21,-0.475C0.229,-0.438 0.238,-0.393 0.238,-0.34L0.238,-0.26L0.101,-0.26ZM0.151,-0.273L0.151,-0.481C0.151,-0.495 0.149,-0.505 0.144,-0.512C0.14,-0.517 0.135,-0.519 0.127,-0.519C0.12,-0.519 0.114,-0.516 0.109,-0.51C0.103,-0.504 0.101,-0.494 0.101,-0.481L0.101,-0.273L0.151,-0.273Z" style="fill:rgb(204,204,204);fill-opacity:0.4;fill-rule:nonzero;"/>
-        </g>
-    </g>
-    <g transform="matrix(1.04809,0,0,1.04809,274.036,-174.508)">
-        <g transform="matrix(2.95533,0,0,2.95533,-122.994,148.699)">
-            <path d="M50.078,80.683C50.078,83.106 55.132,85.274 56.169,85.541C57.205,85.809 56.888,86.99 59.656,86.414C62.423,85.837 65.412,83.181 68.261,79.517C71.11,75.853 69.025,73.224 66.9,70.435C64.775,67.646 60.169,64.412 59.656,58.155C59.252,53.234 63.3,53.047 64.996,52.876C66.693,52.705 69.497,54.85 70.654,54.602C71.76,54.366 76.418,58.834 76.929,57.234C76.642,55.298 77.838,54.264 79.448,54.2C81.057,54.136 81.623,56.773 82.356,58.155C83.259,59.861 83.998,58.66 84.146,57.229C84.538,53.415 83.26,49.493 83.911,46.972C84.277,45.555 85.282,45.386 86.792,43.731C90.77,39.372 90.818,32.915 89.923,29.827C90.954,28.574 92.317,28.571 92.521,21.538C92.726,14.505 87.451,8.531 86.038,7.721C84.624,6.91 80.605,7.633 79.555,8.51C78.506,9.387 66.486,19.391 64.996,21.1C63.507,22.81 62.752,23.616 63.556,27.206C60.728,24.559 56.073,22.692 50.078,23.64C44.083,22.692 39.427,24.559 36.6,27.206C37.403,23.616 36.649,22.81 35.159,21.1C33.669,19.391 21.65,9.387 20.6,8.51C19.551,7.633 15.532,6.91 14.118,7.721C12.704,8.531 7.43,14.505 7.634,21.538C7.838,28.571 9.201,28.574 10.233,29.827C9.337,32.915 9.385,39.372 13.363,43.731C14.874,45.386 15.878,45.555 16.245,46.972C16.896,49.493 15.617,53.415 16.01,57.229C16.157,58.66 16.896,59.861 17.8,58.155C18.532,56.773 19.099,54.136 20.708,54.2C22.317,54.264 23.514,55.298 23.227,57.234C23.737,58.834 28.396,54.366 29.502,54.602C30.659,54.85 33.462,52.705 35.159,52.876C36.856,53.047 40.904,53.234 40.5,58.155C39.987,64.412 35.381,67.646 33.256,70.435C31.13,73.224 29.046,75.853 31.894,79.517C34.743,83.181 37.732,85.837 40.5,86.414C43.268,86.99 42.951,85.809 43.987,85.541C45.023,85.274 50.078,83.106 50.078,80.683C50.078,78.259 50.078,78.259 50.078,80.683Z" style="fill:rgb(230,121,25);"/>
-            <path d="M50,86.57C52.004,86.57 56.013,85.541 56.013,85.541C57.049,85.809 56.732,86.99 59.5,86.414C59.5,86.414 60.917,86.187 61.043,87.1C61.17,88.013 60.255,90.034 57.757,91.5C55.258,92.966 52.642,92.872 50,92.901C47.358,92.872 44.742,92.966 42.243,91.5C39.745,90.034 38.83,88.013 38.957,87.1C39.083,86.187 40.5,86.414 40.5,86.414C43.268,86.99 42.951,85.809 43.987,85.541C43.987,85.541 47.996,86.57 50,86.57Z" style="fill:rgb(134,131,131);"/>
-            <path d="M43.987,85.541C45.023,85.274 50.078,83.106 50.078,80.683C50.078,78.259 50.078,78.259 50.078,80.683C50.078,83.106 55.132,85.274 56.169,85.541" style="fill:rgb(214,183,14);"/>
-            <g transform="matrix(-1,0,0,1,100.127,0)">
-                <path d="M68.261,79.517C71.11,75.853 69.025,73.224 66.9,70.435C64.775,67.646 60.169,64.412 59.656,58.155C59.252,53.234 63.3,53.047 64.996,52.876C66.693,52.705 69.497,54.85 70.654,54.602C71.76,54.366 76.418,58.834 76.929,57.234C76.642,55.298 77.838,54.264 79.448,54.2C81.057,54.136 81.653,56.677 82.356,58.155C84.324,62.293 81.847,65.747 79.773,68.892C77.424,72.452 68.261,79.517 68.261,79.517Z" style="fill:rgb(134,131,131);"/>
-            </g>
-            <path d="M68.261,79.517C71.11,75.853 69.025,73.224 66.9,70.435C64.775,67.646 60.169,64.412 59.656,58.155C59.252,53.234 63.3,53.047 64.996,52.876C66.693,52.705 69.497,54.85 70.654,54.602C71.76,54.366 76.418,58.834 76.929,57.234C76.642,55.298 77.838,54.264 79.448,54.2C81.057,54.136 81.653,56.677 82.356,58.155C84.324,62.293 81.847,65.747 79.773,68.892C77.424,72.452 68.261,79.517 68.261,79.517Z" style="fill:rgb(134,131,131);"/>
-            <path d="M43.987,85.541C45.023,85.274 50.078,83.106 50.078,80.683C50.078,78.259 50.078,78.259 50.078,80.683C50.078,83.106 55.132,85.274 56.169,85.541C56.169,85.541 52.03,86.57 50,86.57C47.996,86.57 43.987,85.541 43.987,85.541Z" style="fill:rgb(232,163,236);"/>
-            <g>
-                <g transform="matrix(-1,0,0,1,100.127,0)">
-                    <path d="M60.195,60.954C59.927,60.092 59.738,59.163 59.656,58.155C59.252,53.234 63.3,53.047 64.996,52.876C66.693,52.705 69.497,54.85 70.654,54.602C70.654,54.602 69.967,56.613 70.404,58.155C70.842,59.696 70.041,63.351 65.402,63.351C60.762,63.351 60.195,60.954 60.195,60.954Z" style="fill:rgb(23,181,63);"/>
-                </g>
-                <path d="M60.195,60.954C59.927,60.092 59.738,59.163 59.656,58.155C59.252,53.234 63.3,53.047 64.996,52.876C66.693,52.705 69.497,54.85 70.654,54.602C70.654,54.602 69.967,56.613 70.404,58.155C70.842,59.696 70.041,63.351 65.402,63.351C60.762,63.351 60.195,60.954 60.195,60.954Z" style="fill:rgb(23,181,63);"/>
-            </g>
-        </g>
-        <g transform="matrix(2.95533,0,0,2.95533,-196.878,125.485)">
-            <path d="M114.4,17.155C111,12.755 107.7,13.855 105.9,14.455C105.6,14.555 105.4,14.655 105.1,14.655C104,14.855 101.1,16.955 90,27.055L89.4,27.555C87.7,29.055 87,30.655 86.7,31.855C85.3,31.155 83,30.455 79.7,30.155C77.8,29.955 75.6,30.055 74.9,30.155C74.2,30.155 72,29.955 70.1,30.155C66.8,30.455 64.5,31.155 63.1,31.855C62.8,30.555 62.1,29.055 60.4,27.555L59.8,27.055C48.9,16.955 46,14.855 44.9,14.655C44.7,14.655 44.4,14.555 44.1,14.455C42.3,13.855 39,12.755 35.6,17.155C32,21.855 29.3,32.155 33.1,36.755C33.5,37.155 33.8,37.555 34,37.855L33.9,38.155C33.8,38.355 32.2,43.155 35.3,49.155C36.6,51.755 37.9,52.955 38.9,53.855C40,54.955 40.5,55.355 40.4,57.455C40.2,60.555 39.7,62.655 39.7,62.655L39.7,63.055C39.7,63.355 39.9,71.455 44.7,77.455C49.1,82.955 52,86.055 55.6,87.655C56.9,90.055 59.2,92.555 61.8,94.155C61.9,94.255 62.1,94.355 62.4,94.555C63.3,97.455 66,101.855 71.4,101.855L74.4,101.855C74.4,101.855 76.1,101.855 79.1,101.755C84.6,101.655 87.3,97.255 88.1,94.455C88.3,94.355 88.5,94.155 88.6,94.155C91.2,92.655 93.6,90.055 94.9,87.655C98.5,86.055 101.4,82.955 105.8,77.455C110.6,71.455 110.8,63.455 110.8,63.055L110.8,62.655C110.8,62.655 110.3,60.855 110.1,57.455C110,55.355 110.4,54.955 111.5,53.855C112.4,52.955 113.7,51.655 115.1,49.155C118.2,43.155 116.5,38.355 116.5,38.155L116,37.855C116.2,37.555 116.5,37.155 116.9,36.655C120.7,32.155 118,21.855 114.4,17.155ZM78.8,99.255C75.9,99.355 74.2,99.355 74.2,99.355C73.6,99.255 72.6,99.255 71.2,99.255C68.2,99.255 66.5,97.455 65.5,95.855L65.9,95.855C66.4,95.855 66.9,95.755 67.5,95.555C68,95.355 68.4,95.155 68.9,94.955C69.9,95.455 72,96.155 75.1,95.955L76.2,95.955C78.7,95.955 80.4,95.355 81.3,94.955C81.8,95.155 82.3,95.355 82.7,95.555C83.3,95.855 84,95.855 84.6,95.855C83.5,97.455 81.8,99.155 78.8,99.255ZM75,91.255C75.3,91.655 75.6,91.955 75.9,92.155C76.4,92.455 77.1,92.855 77.8,93.255C77,93.355 76.1,93.455 75.1,93.355L74.9,93.355C73.8,93.455 72.9,93.355 72.2,93.255C72.9,92.855 73.6,92.455 74.1,92.155C74.4,91.955 74.7,91.655 75,91.255ZM115,35.155C113.4,37.055 112.4,38.555 113.3,39.655C113.4,39.755 113.6,40.055 114,40.155C114.2,41.655 114.4,44.655 112.6,48.155C111.5,50.355 110.4,51.355 109.5,52.255C108.2,53.455 107.1,54.555 107.3,57.855C107.5,60.855 107.9,62.755 108,63.355C107.2,62.455 106.4,61.655 105.8,60.855C104.2,58.655 103.3,60.255 100.9,61.955C98.4,63.555 101.1,64.555 98.1,62.655C97.1,62.055 96,61.655 95,61.455C94.6,60.955 94.2,60.555 93.7,60.255L93.4,60.155C93.1,60.055 86.8,58.155 84.1,62.455C83.3,63.155 81.3,65.455 83.9,70.255C84.9,72.055 86.6,74.055 88.2,75.955C89,76.955 89.9,77.955 90.6,78.955C90.1,78.755 89.5,78.555 88.9,78.555C84.8,78.055 85.5,80.955 85.5,80.955C86,82.855 86.7,82.555 87.4,81.955C88.1,81.355 89.9,81.755 92,81.955C92.2,81.955 92.4,81.955 92.5,81.855C92.9,82.655 93.1,83.355 93.2,84.055C92.3,84.155 90.8,84.555 88.9,84.455C86,84.355 84.2,85.355 84.2,85.355C84.8,88.255 87.8,85.955 90.1,86.255C91.2,86.455 92.2,86.255 92.9,85.855C92,87.855 89.8,90.555 87.1,92.055L86.9,92.155C86.9,92.155 85.1,93.755 83.7,93.155C81.6,92.255 78.9,90.855 77.5,89.955C77,89.655 76.7,88.555 76.5,87.555L76.5,87.455C77.7,87.655 79.2,87.655 79.8,87.155C80.8,86.455 81.1,84.455 81.1,84.455C81.1,84.455 80.2,85.455 79.7,84.455C79.1,83.455 80.1,81.355 80.6,81.355C81,81.355 82.7,81.355 81.7,79.355C80.7,77.455 76,79.355 75.3,79.555C74.6,79.255 69.8,77.455 68.9,79.355C67.9,81.355 69.6,81.355 70,81.355C70.4,81.355 71.4,83.455 70.9,84.455C70.3,85.455 69.5,84.455 69.5,84.455C69.5,84.455 69.7,86.355 70.8,87.155C71.4,87.655 73,87.655 74.1,87.455L74.1,87.555C73.9,88.555 73.6,89.655 73.1,89.955C71.7,90.855 69,92.255 66.9,93.155C65.8,93.655 64.1,92.455 63.6,92.055L63,91.955C60.3,90.355 58.1,87.755 57.3,85.755C58,86.155 58.9,86.255 60.1,86.155C62.4,85.855 65.4,88.155 66,85.255C66,85.255 64.2,84.255 61.3,84.355C59.4,84.455 57.9,83.955 57,83.955C57.1,83.255 57.3,82.555 57.7,81.755C57.9,81.755 58,81.855 58.2,81.855C60.3,81.755 62.1,81.255 62.8,81.855C63.5,82.455 64.2,82.755 64.7,80.855C64.7,80.855 65.4,78.055 61.3,78.455C60.6,78.555 60.1,78.655 59.6,78.855C60.4,77.855 61.2,76.855 62,75.855C63.6,73.955 65.3,71.955 66.3,70.155C68.9,65.355 66.9,63.055 66.1,62.355C63.4,57.955 57,59.955 56.8,60.055L56.5,60.155C56,60.455 55.6,60.855 55.2,61.355C54.2,61.555 53.1,61.855 52.1,62.555C49.1,64.455 51.7,63.455 49.3,61.855C46.8,60.255 46,58.555 44.4,60.755C43.8,61.555 43,62.455 42.2,63.255C42.3,62.655 42.8,60.655 42.9,57.755C43.1,54.455 42,53.455 40.7,52.155C39.8,51.355 38.8,50.255 37.6,48.055C35.8,44.555 35.9,41.555 36.2,40.055C36.6,39.955 36.8,39.755 36.9,39.555C37.8,38.455 36.8,37.055 35.2,35.055C32.5,31.755 34.4,23.055 37.8,18.655C40.1,15.655 41.9,16.255 43.5,16.855C43.9,16.955 44.3,17.155 44.5,17.155C45.2,17.455 48.2,19.655 58.4,28.955L59,29.455C61.5,31.655 60.9,33.755 60.9,33.855L59.4,38.855L63,35.155C63,35.155 64,34.255 66.5,33.455C66.4,34.355 66,35.555 65.1,37.255C62.8,41.655 59.5,48.655 60.7,52.455C61.9,56.255 64.7,58.755 64.7,58.755C64.7,58.755 67.4,57.555 66.3,56.155C65.1,54.655 65.5,51.755 63.9,49.755C62.3,47.755 63.7,47.755 65.3,44.255C66.7,41.155 70.2,35.355 69.9,32.955C70.1,32.955 70.4,32.855 70.6,32.855C72.3,32.655 74.6,32.855 75.1,32.855L75.3,32.855C75.8,32.855 78,32.755 79.8,32.855C80,32.855 80.3,32.855 80.5,32.955C80.2,35.355 83.7,41.155 85.1,44.255C86.7,47.755 88.1,47.755 86.5,49.755C84.9,51.755 85.3,54.755 84.1,56.155C82.9,57.655 85.7,58.755 85.7,58.755C85.7,58.755 88.5,56.255 89.7,52.455C90.9,48.655 87.6,41.655 85.3,37.255C84.4,35.555 84,34.355 83.9,33.455C86.4,34.155 87.3,35.055 87.3,35.055L91.1,39.255L89.3,33.855C89.3,33.855 88.7,31.655 91.2,29.455L91.8,28.955C101.9,19.655 104.9,17.455 105.6,17.155C105.9,17.055 106.3,16.955 106.7,16.855C108.3,16.355 110.1,15.755 112.4,18.655C115.8,23.055 117.6,31.855 115,35.155ZM56.06,79.387C55.244,79.454 55.398,79.149 54.605,78.853C54.046,78.644 53.628,78.813 53.425,79.29C53.232,79.741 53.334,80.31 53.76,80.637C54.172,80.954 54.58,81.199 55.014,81.387C54.626,82.321 54.4,83.246 54.4,84.155C52,82.455 49.7,79.855 46.5,75.855C44.5,73.355 43.4,70.455 42.8,68.055C43.3,67.755 43.8,67.155 44.1,66.055C44.8,62.955 47.4,63.655 46.7,65.355C46,67.055 47.1,68.655 49.4,66.855C50.5,65.955 52.1,64.655 53.8,63.555C53.2,65.055 53.1,66.755 53.5,68.255C54.2,70.855 56.2,72.355 59.1,72.555L59.7,72.555C60.4,72.555 61,72.455 61.6,72.355C61.1,72.955 60.6,73.555 60,74.255C58.559,75.953 57.119,77.677 56.06,79.387ZM95.08,81.413C95.537,81.222 95.964,80.969 96.396,80.637C96.822,80.31 96.923,79.741 96.731,79.29C96.527,78.813 96.11,78.644 95.55,78.853C94.727,79.161 94.925,79.477 93.998,79.378C92.926,77.671 91.487,75.95 90.1,74.255C89.6,73.655 89,72.955 88.6,72.355C89.2,72.455 89.8,72.555 90.5,72.555L91.1,72.555C94,72.455 96,70.855 96.7,68.255C97.1,66.755 96.9,65.055 96.4,63.555C98.1,64.655 99.7,66.055 100.8,66.855C103,68.555 104.2,66.955 103.5,65.355C102.8,63.655 105.4,62.955 106.1,66.055C106.3,67.155 106.8,67.755 107.4,68.055C106.6,70.455 105.5,73.355 103.5,75.855C100.3,79.855 98,82.455 95.7,84.155C95.7,83.254 95.47,82.338 95.08,81.413ZM89.8,68.755C90.7,68.755 91.4,67.155 91.4,65.255C91.4,63.755 91,62.555 90.4,62.055C91.3,62.155 92.1,62.255 92.4,62.355C93.7,63.255 94.5,65.755 94.1,67.555C93.7,69.055 92.6,69.855 90.9,69.955C88.5,70.055 86.7,69.355 85.9,68.055C85.1,66.855 85.2,65.355 86,63.855C86.7,62.655 87.9,62.155 89.1,62.055C88.5,62.555 88.1,63.855 88.1,65.255C88.2,67.255 88.9,68.755 89.8,68.755ZM60.2,68.755C61.1,68.755 61.8,67.155 61.8,65.255C61.8,63.755 61.4,62.555 60.8,62.055C62,62.155 63.3,62.555 63.9,63.855C64.7,65.355 64.8,66.955 64.1,68.055C63.3,69.355 61.5,70.055 59.1,69.955C57.4,69.855 56.3,69.055 55.9,67.555C55.4,65.755 56.2,63.255 57.6,62.355C57.9,62.255 58.7,62.055 59.6,62.055C59,62.555 58.6,63.855 58.6,65.255C58.6,67.255 59.3,68.755 60.2,68.755Z" style="fill-rule:nonzero;"/>
-        </g>
-    </g>
-    <g transform="matrix(2.17737,-9.80598e-18,-4.17075e-18,2.21302,-156.666,173.644)">
-        <g transform="matrix(76.453,0,0,75.2214,73.1023,176.391)">
-            <path d="M0.384,-0.55C0.363,-0.607 0.322,-0.636 0.263,-0.636C0.232,-0.636 0.207,-0.627 0.188,-0.609C0.169,-0.591 0.159,-0.57 0.159,-0.546C0.159,-0.521 0.167,-0.501 0.182,-0.486C0.197,-0.47 0.215,-0.456 0.238,-0.443C0.261,-0.43 0.285,-0.418 0.311,-0.407C0.337,-0.395 0.361,-0.381 0.384,-0.364C0.407,-0.347 0.426,-0.326 0.441,-0.302C0.456,-0.277 0.463,-0.246 0.463,-0.208C0.463,-0.175 0.457,-0.144 0.444,-0.117C0.431,-0.089 0.413,-0.065 0.39,-0.046C0.367,-0.026 0.339,-0.011 0.307,-0.001C0.274,0.01 0.238,0.015 0.198,0.015C0.162,0.015 0.13,0.011 0.102,0.004C0.073,-0.004 0.052,-0.014 0.037,-0.025C0.044,-0.048 0.049,-0.07 0.054,-0.089C0.059,-0.108 0.063,-0.129 0.066,-0.152L0.085,-0.152C0.088,-0.137 0.093,-0.124 0.1,-0.111C0.107,-0.097 0.117,-0.086 0.128,-0.076C0.139,-0.066 0.153,-0.058 0.169,-0.053C0.185,-0.047 0.203,-0.044 0.223,-0.044C0.263,-0.044 0.293,-0.054 0.312,-0.074C0.331,-0.094 0.34,-0.118 0.34,-0.146C0.34,-0.171 0.333,-0.192 0.318,-0.208C0.303,-0.224 0.285,-0.238 0.263,-0.251C0.241,-0.263 0.217,-0.275 0.191,-0.287C0.165,-0.298 0.141,-0.312 0.119,-0.329C0.097,-0.346 0.079,-0.366 0.064,-0.391C0.049,-0.415 0.042,-0.446 0.042,-0.484C0.042,-0.519 0.048,-0.549 0.061,-0.576C0.073,-0.603 0.089,-0.625 0.11,-0.643C0.131,-0.661 0.155,-0.675 0.182,-0.684C0.209,-0.693 0.237,-0.698 0.267,-0.698C0.303,-0.698 0.335,-0.694 0.362,-0.685C0.389,-0.676 0.412,-0.664 0.431,-0.649C0.425,-0.634 0.42,-0.619 0.416,-0.605C0.411,-0.59 0.406,-0.572 0.399,-0.55L0.384,-0.55Z" style="fill:rgb(134,131,131);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(76.453,0,0,75.2214,112.464,176.391)">
-            <path d="M0.634,-0.362C0.634,-0.405 0.629,-0.444 0.618,-0.479C0.607,-0.513 0.592,-0.542 0.574,-0.566C0.555,-0.59 0.532,-0.608 0.505,-0.622C0.478,-0.635 0.448,-0.641 0.416,-0.641C0.382,-0.641 0.352,-0.633 0.325,-0.617C0.298,-0.6 0.275,-0.578 0.256,-0.55C0.237,-0.522 0.223,-0.489 0.214,-0.452C0.204,-0.414 0.199,-0.374 0.199,-0.331C0.199,-0.278 0.205,-0.233 0.216,-0.196C0.227,-0.159 0.243,-0.13 0.262,-0.108C0.281,-0.085 0.304,-0.069 0.329,-0.059C0.354,-0.049 0.381,-0.044 0.409,-0.044C0.439,-0.044 0.468,-0.05 0.495,-0.063C0.522,-0.076 0.546,-0.095 0.567,-0.121C0.587,-0.147 0.603,-0.18 0.616,-0.22C0.628,-0.26 0.634,-0.307 0.634,-0.362ZM0.035,-0.34C0.035,-0.389 0.044,-0.436 0.063,-0.479C0.081,-0.522 0.107,-0.56 0.14,-0.593C0.173,-0.626 0.214,-0.651 0.261,-0.67C0.308,-0.689 0.361,-0.698 0.419,-0.698C0.472,-0.698 0.522,-0.691 0.568,-0.676C0.614,-0.661 0.654,-0.639 0.688,-0.61C0.722,-0.581 0.749,-0.544 0.769,-0.499C0.788,-0.454 0.798,-0.401 0.798,-0.341C0.798,-0.291 0.789,-0.244 0.77,-0.201C0.751,-0.158 0.724,-0.12 0.691,-0.088C0.657,-0.055 0.617,-0.03 0.57,-0.012C0.523,0.006 0.472,0.015 0.416,0.015C0.363,0.015 0.314,0.008 0.268,-0.005C0.221,-0.018 0.181,-0.039 0.147,-0.068C0.112,-0.096 0.085,-0.133 0.065,-0.179C0.045,-0.224 0.035,-0.277 0.035,-0.34Z" style="fill:rgb(134,131,131);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(76.453,0,0,75.2214,177.285,176.391)">
-            <path d="M0.63,-0.111C0.625,-0.097 0.62,-0.083 0.616,-0.069C0.612,-0.054 0.609,-0.04 0.608,-0.026C0.554,0.001 0.486,0.015 0.404,0.015C0.346,0.015 0.294,0.007 0.249,-0.01C0.203,-0.026 0.164,-0.049 0.133,-0.079C0.101,-0.108 0.077,-0.143 0.06,-0.184C0.043,-0.225 0.035,-0.269 0.035,-0.316C0.035,-0.385 0.046,-0.444 0.068,-0.493C0.089,-0.541 0.118,-0.58 0.155,-0.611C0.191,-0.641 0.233,-0.663 0.281,-0.677C0.329,-0.691 0.379,-0.698 0.432,-0.698C0.449,-0.698 0.468,-0.697 0.487,-0.694C0.506,-0.691 0.525,-0.688 0.543,-0.684C0.561,-0.679 0.578,-0.674 0.595,-0.668C0.611,-0.662 0.625,-0.656 0.636,-0.649C0.629,-0.632 0.624,-0.616 0.621,-0.599C0.617,-0.582 0.614,-0.564 0.613,-0.547L0.599,-0.547C0.574,-0.579 0.548,-0.602 0.521,-0.616C0.494,-0.629 0.463,-0.636 0.427,-0.636C0.4,-0.636 0.374,-0.63 0.347,-0.618C0.32,-0.606 0.295,-0.588 0.273,-0.563C0.251,-0.538 0.233,-0.507 0.22,-0.469C0.206,-0.43 0.199,-0.384 0.199,-0.331C0.199,-0.28 0.206,-0.236 0.22,-0.2C0.234,-0.163 0.252,-0.133 0.275,-0.111C0.297,-0.088 0.322,-0.071 0.351,-0.06C0.379,-0.049 0.407,-0.044 0.436,-0.044C0.452,-0.044 0.468,-0.046 0.485,-0.05C0.502,-0.053 0.518,-0.058 0.534,-0.065C0.55,-0.071 0.565,-0.079 0.58,-0.088C0.594,-0.097 0.606,-0.108 0.617,-0.119L0.63,-0.111Z" style="fill:rgb(134,131,131);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(76.453,0,0,75.2214,229.414,176.391)">
-            <path d="M0.093,-0.408C0.093,-0.463 0.092,-0.513 0.091,-0.556C0.09,-0.599 0.088,-0.642 0.085,-0.685C0.096,-0.684 0.109,-0.683 0.122,-0.682C0.135,-0.681 0.15,-0.68 0.167,-0.68C0.184,-0.68 0.199,-0.681 0.212,-0.682C0.225,-0.683 0.238,-0.684 0.249,-0.685C0.246,-0.642 0.244,-0.599 0.243,-0.556C0.242,-0.513 0.241,-0.463 0.241,-0.408L0.241,-0.272C0.241,-0.217 0.242,-0.167 0.243,-0.125C0.244,-0.082 0.246,-0.039 0.249,0.002C0.238,0.001 0.225,-0 0.212,-0L0.122,-0C0.109,-0 0.096,0.001 0.085,0.002C0.088,-0.039 0.09,-0.082 0.091,-0.125C0.092,-0.167 0.093,-0.217 0.093,-0.272L0.093,-0.408Z" style="fill:rgb(134,131,131);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(76.453,0,0,75.2214,256.008,176.391)">
-            <path d="M0.299,-0.497C0.282,-0.457 0.265,-0.418 0.25,-0.379C0.235,-0.339 0.22,-0.3 0.205,-0.259L0.388,-0.259C0.373,-0.3 0.359,-0.339 0.345,-0.379C0.33,-0.418 0.315,-0.457 0.299,-0.497ZM0.653,0.002C0.637,0.001 0.622,-0 0.608,-0L0.523,-0C0.508,-0 0.494,0.001 0.48,0.002C0.469,-0.031 0.458,-0.064 0.447,-0.098C0.436,-0.132 0.424,-0.166 0.411,-0.2C0.39,-0.201 0.368,-0.201 0.347,-0.202C0.326,-0.202 0.304,-0.202 0.283,-0.202C0.266,-0.202 0.248,-0.202 0.231,-0.202C0.214,-0.201 0.196,-0.201 0.179,-0.2C0.166,-0.166 0.153,-0.132 0.142,-0.098C0.131,-0.064 0.12,-0.031 0.111,0.002C0.103,0.001 0.095,-0 0.088,-0L0.04,-0C0.032,-0 0.023,0.001 0.014,0.002C0.022,-0.015 0.033,-0.039 0.046,-0.07C0.059,-0.101 0.074,-0.135 0.09,-0.174C0.106,-0.213 0.123,-0.254 0.142,-0.299C0.16,-0.343 0.178,-0.388 0.197,-0.433C0.215,-0.478 0.233,-0.523 0.251,-0.567C0.268,-0.611 0.284,-0.652 0.299,-0.69C0.306,-0.689 0.312,-0.688 0.318,-0.687C0.324,-0.686 0.33,-0.685 0.337,-0.685C0.344,-0.685 0.35,-0.686 0.356,-0.687C0.362,-0.688 0.368,-0.689 0.375,-0.69C0.396,-0.633 0.419,-0.573 0.444,-0.508C0.468,-0.443 0.492,-0.38 0.517,-0.318C0.542,-0.255 0.566,-0.196 0.589,-0.14C0.612,-0.084 0.634,-0.037 0.653,0.002Z" style="fill:rgb(134,131,131);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(76.453,0,0,75.2214,308.138,176.391)">
-            <path d="M0.089,-0.408C0.089,-0.463 0.088,-0.513 0.087,-0.556C0.086,-0.599 0.084,-0.642 0.081,-0.685C0.092,-0.684 0.105,-0.683 0.118,-0.682C0.131,-0.681 0.146,-0.68 0.163,-0.68C0.18,-0.68 0.195,-0.681 0.208,-0.682C0.221,-0.683 0.234,-0.684 0.245,-0.685C0.242,-0.642 0.24,-0.599 0.239,-0.556C0.238,-0.513 0.237,-0.463 0.237,-0.408L0.237,-0.272C0.237,-0.234 0.237,-0.197 0.238,-0.162C0.238,-0.127 0.238,-0.096 0.239,-0.07C0.277,-0.07 0.315,-0.071 0.353,-0.073C0.391,-0.075 0.429,-0.078 0.468,-0.083C0.467,-0.076 0.466,-0.069 0.465,-0.063C0.464,-0.057 0.464,-0.049 0.464,-0.038C0.464,-0.027 0.464,-0.019 0.465,-0.013C0.466,-0.007 0.467,-0.002 0.468,0.002C0.45,0.001 0.428,0.001 0.402,0.001C0.375,0 0.339,-0 0.293,-0L0.135,-0C0.12,-0 0.108,0 0.101,0.001C0.093,0.001 0.086,0.001 0.081,0.002C0.084,-0.039 0.086,-0.082 0.087,-0.125C0.088,-0.167 0.089,-0.217 0.089,-0.272L0.089,-0.408Z" style="fill:rgb(134,131,131);fill-rule:nonzero;"/>
-        </g>
-    </g>
-    <g transform="matrix(2.17737,-8.95348e-18,-4.17075e-18,2.02063,-156.666,53.4524)">
-        <g transform="matrix(73.9867,0,0,79.726,73.1023,179.779)">
-            <path d="M0.634,-0.362C0.634,-0.405 0.629,-0.444 0.618,-0.479C0.607,-0.513 0.592,-0.542 0.574,-0.566C0.555,-0.59 0.532,-0.608 0.505,-0.622C0.478,-0.635 0.448,-0.641 0.416,-0.641C0.382,-0.641 0.352,-0.633 0.325,-0.617C0.298,-0.6 0.275,-0.578 0.256,-0.55C0.237,-0.522 0.223,-0.489 0.214,-0.452C0.204,-0.414 0.199,-0.374 0.199,-0.331C0.199,-0.278 0.205,-0.233 0.216,-0.196C0.227,-0.159 0.243,-0.13 0.262,-0.108C0.281,-0.085 0.304,-0.069 0.329,-0.059C0.354,-0.049 0.381,-0.044 0.409,-0.044C0.439,-0.044 0.468,-0.05 0.495,-0.063C0.522,-0.076 0.546,-0.095 0.567,-0.121C0.587,-0.147 0.603,-0.18 0.616,-0.22C0.628,-0.26 0.634,-0.307 0.634,-0.362ZM0.035,-0.34C0.035,-0.389 0.044,-0.436 0.063,-0.479C0.081,-0.522 0.107,-0.56 0.14,-0.593C0.173,-0.626 0.214,-0.651 0.261,-0.67C0.308,-0.689 0.361,-0.698 0.419,-0.698C0.472,-0.698 0.522,-0.691 0.568,-0.676C0.614,-0.661 0.654,-0.639 0.688,-0.61C0.722,-0.581 0.749,-0.544 0.769,-0.499C0.788,-0.454 0.798,-0.401 0.798,-0.341C0.798,-0.291 0.789,-0.244 0.77,-0.201C0.751,-0.158 0.724,-0.12 0.691,-0.088C0.657,-0.055 0.617,-0.03 0.57,-0.012C0.523,0.006 0.472,0.015 0.416,0.015C0.363,0.015 0.314,0.008 0.268,-0.005C0.221,-0.018 0.181,-0.039 0.147,-0.068C0.112,-0.096 0.085,-0.133 0.065,-0.179C0.045,-0.224 0.035,-0.277 0.035,-0.34Z" style="fill:rgb(23,181,63);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(73.9867,0,0,79.726,134.206,179.779)">
-            <path d="M0.63,-0.111C0.625,-0.097 0.62,-0.083 0.616,-0.069C0.612,-0.054 0.609,-0.04 0.608,-0.026C0.554,0.001 0.486,0.015 0.404,0.015C0.346,0.015 0.294,0.007 0.249,-0.01C0.203,-0.026 0.164,-0.049 0.133,-0.079C0.101,-0.108 0.077,-0.143 0.06,-0.184C0.043,-0.225 0.035,-0.269 0.035,-0.316C0.035,-0.385 0.046,-0.444 0.068,-0.493C0.089,-0.541 0.118,-0.58 0.155,-0.611C0.191,-0.641 0.233,-0.663 0.281,-0.677C0.329,-0.691 0.379,-0.698 0.432,-0.698C0.449,-0.698 0.468,-0.697 0.487,-0.694C0.506,-0.691 0.525,-0.688 0.543,-0.684C0.561,-0.679 0.578,-0.674 0.595,-0.668C0.611,-0.662 0.625,-0.656 0.636,-0.649C0.629,-0.632 0.624,-0.616 0.621,-0.599C0.617,-0.582 0.614,-0.564 0.613,-0.547L0.599,-0.547C0.574,-0.579 0.548,-0.602 0.521,-0.616C0.494,-0.629 0.463,-0.636 0.427,-0.636C0.4,-0.636 0.374,-0.63 0.347,-0.618C0.32,-0.606 0.295,-0.588 0.273,-0.563C0.251,-0.538 0.233,-0.507 0.22,-0.469C0.206,-0.43 0.199,-0.384 0.199,-0.331C0.199,-0.28 0.206,-0.236 0.22,-0.2C0.234,-0.163 0.252,-0.133 0.275,-0.111C0.297,-0.088 0.322,-0.071 0.351,-0.06C0.379,-0.049 0.407,-0.044 0.436,-0.044C0.452,-0.044 0.468,-0.046 0.485,-0.05C0.502,-0.053 0.518,-0.058 0.534,-0.065C0.55,-0.071 0.565,-0.079 0.58,-0.088C0.594,-0.097 0.606,-0.108 0.617,-0.119L0.63,-0.111Z" style="fill:rgb(23,181,63);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(73.9867,0,0,79.726,181.549,179.779)">
-            <path d="M0.08,-0.408C0.08,-0.463 0.079,-0.513 0.078,-0.556C0.077,-0.599 0.075,-0.642 0.072,-0.685C0.102,-0.684 0.132,-0.683 0.161,-0.682C0.19,-0.681 0.22,-0.68 0.25,-0.68C0.299,-0.68 0.343,-0.681 0.382,-0.682C0.42,-0.683 0.446,-0.684 0.459,-0.685C0.456,-0.674 0.455,-0.66 0.455,-0.643C0.455,-0.632 0.455,-0.624 0.456,-0.618C0.457,-0.612 0.458,-0.605 0.459,-0.598C0.44,-0.599 0.419,-0.601 0.396,-0.602C0.373,-0.603 0.35,-0.605 0.329,-0.606C0.307,-0.607 0.287,-0.608 0.27,-0.609C0.253,-0.61 0.24,-0.61 0.233,-0.61C0.23,-0.573 0.229,-0.537 0.229,-0.501C0.228,-0.465 0.228,-0.429 0.228,-0.392C0.271,-0.393 0.311,-0.394 0.346,-0.395C0.381,-0.396 0.417,-0.398 0.455,-0.4C0.453,-0.389 0.452,-0.38 0.451,-0.374C0.45,-0.368 0.45,-0.362 0.45,-0.355C0.45,-0.35 0.451,-0.344 0.452,-0.339C0.452,-0.333 0.454,-0.325 0.455,-0.314C0.379,-0.32 0.303,-0.323 0.228,-0.323C0.228,-0.302 0.228,-0.28 0.228,-0.259C0.227,-0.238 0.227,-0.216 0.227,-0.195C0.227,-0.152 0.228,-0.11 0.23,-0.07C0.268,-0.07 0.306,-0.071 0.344,-0.073C0.382,-0.075 0.42,-0.078 0.459,-0.083C0.458,-0.076 0.457,-0.069 0.456,-0.063C0.455,-0.057 0.455,-0.049 0.455,-0.038C0.455,-0.027 0.455,-0.019 0.456,-0.013C0.457,-0.007 0.458,-0.002 0.459,0.002C0.441,0.001 0.419,0.001 0.393,0.001C0.366,0 0.33,-0 0.284,-0L0.126,-0C0.111,-0 0.099,0 0.092,0.001C0.084,0.001 0.077,0.001 0.072,0.002C0.075,-0.039 0.077,-0.082 0.078,-0.125C0.079,-0.167 0.08,-0.217 0.08,-0.272L0.08,-0.408Z" style="fill:rgb(23,181,63);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(73.9867,0,0,79.726,218.015,179.779)">
-            <path d="M0.089,-0.408C0.089,-0.463 0.088,-0.513 0.087,-0.556C0.086,-0.599 0.084,-0.642 0.081,-0.685C0.092,-0.684 0.105,-0.683 0.118,-0.682C0.131,-0.681 0.146,-0.68 0.163,-0.68C0.18,-0.68 0.195,-0.681 0.208,-0.682C0.221,-0.683 0.234,-0.684 0.245,-0.685C0.242,-0.642 0.24,-0.599 0.239,-0.556C0.238,-0.513 0.237,-0.463 0.237,-0.408L0.237,-0.272C0.237,-0.234 0.237,-0.197 0.238,-0.162C0.238,-0.127 0.238,-0.096 0.239,-0.07C0.277,-0.07 0.315,-0.071 0.353,-0.073C0.391,-0.075 0.429,-0.078 0.468,-0.083C0.467,-0.076 0.466,-0.069 0.465,-0.063C0.464,-0.057 0.464,-0.049 0.464,-0.038C0.464,-0.027 0.464,-0.019 0.465,-0.013C0.466,-0.007 0.467,-0.002 0.468,0.002C0.45,0.001 0.428,0.001 0.402,0.001C0.375,0 0.339,-0 0.293,-0L0.135,-0C0.12,-0 0.108,0 0.101,0.001C0.093,0.001 0.086,0.001 0.081,0.002C0.084,-0.039 0.086,-0.082 0.087,-0.125C0.088,-0.167 0.089,-0.217 0.089,-0.272L0.089,-0.408Z" style="fill:rgb(23,181,63);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(73.9867,0,0,79.726,249.303,179.779)">
-            <path d="M0.634,-0.362C0.634,-0.405 0.629,-0.444 0.618,-0.479C0.607,-0.513 0.592,-0.542 0.574,-0.566C0.555,-0.59 0.532,-0.608 0.505,-0.622C0.478,-0.635 0.448,-0.641 0.416,-0.641C0.382,-0.641 0.352,-0.633 0.325,-0.617C0.298,-0.6 0.275,-0.578 0.256,-0.55C0.237,-0.522 0.223,-0.489 0.214,-0.452C0.204,-0.414 0.199,-0.374 0.199,-0.331C0.199,-0.278 0.205,-0.233 0.216,-0.196C0.227,-0.159 0.243,-0.13 0.262,-0.108C0.281,-0.085 0.304,-0.069 0.329,-0.059C0.354,-0.049 0.381,-0.044 0.409,-0.044C0.439,-0.044 0.468,-0.05 0.495,-0.063C0.522,-0.076 0.546,-0.095 0.567,-0.121C0.587,-0.147 0.603,-0.18 0.616,-0.22C0.628,-0.26 0.634,-0.307 0.634,-0.362ZM0.035,-0.34C0.035,-0.389 0.044,-0.436 0.063,-0.479C0.081,-0.522 0.107,-0.56 0.14,-0.593C0.173,-0.626 0.214,-0.651 0.261,-0.67C0.308,-0.689 0.361,-0.698 0.419,-0.698C0.472,-0.698 0.522,-0.691 0.568,-0.676C0.614,-0.661 0.654,-0.639 0.688,-0.61C0.722,-0.581 0.749,-0.544 0.769,-0.499C0.788,-0.454 0.798,-0.401 0.798,-0.341C0.798,-0.291 0.789,-0.244 0.77,-0.201C0.751,-0.158 0.724,-0.12 0.691,-0.088C0.657,-0.055 0.617,-0.03 0.57,-0.012C0.523,0.006 0.472,0.015 0.416,0.015C0.363,0.015 0.314,0.008 0.268,-0.005C0.221,-0.018 0.181,-0.039 0.147,-0.068C0.112,-0.096 0.085,-0.133 0.065,-0.179C0.045,-0.224 0.035,-0.277 0.035,-0.34Z" style="fill:rgb(23,181,63);fill-rule:nonzero;"/>
-        </g>
-        <g transform="matrix(73.9867,0,0,79.726,305.228,179.779)">
-            <path d="M0.207,-0.522C0.207,-0.541 0.207,-0.559 0.207,-0.575C0.206,-0.591 0.205,-0.603 0.204,-0.61C0.194,-0.61 0.182,-0.61 0.167,-0.609C0.152,-0.608 0.137,-0.608 0.12,-0.607C0.103,-0.606 0.086,-0.604 0.069,-0.603C0.052,-0.601 0.036,-0.599 0.021,-0.597C0.022,-0.604 0.024,-0.612 0.025,-0.619C0.026,-0.626 0.026,-0.634 0.026,-0.641C0.026,-0.648 0.026,-0.656 0.025,-0.663C0.024,-0.67 0.022,-0.678 0.021,-0.685C0.044,-0.684 0.064,-0.684 0.083,-0.683C0.101,-0.682 0.12,-0.682 0.139,-0.682C0.158,-0.681 0.178,-0.681 0.201,-0.681C0.223,-0.68 0.25,-0.68 0.281,-0.68C0.312,-0.68 0.339,-0.68 0.362,-0.681C0.384,-0.681 0.404,-0.681 0.423,-0.682C0.442,-0.682 0.46,-0.682 0.478,-0.683C0.495,-0.684 0.514,-0.684 0.535,-0.685C0.534,-0.678 0.533,-0.67 0.532,-0.663C0.531,-0.656 0.53,-0.648 0.53,-0.641C0.53,-0.634 0.531,-0.626 0.532,-0.619C0.533,-0.612 0.534,-0.604 0.535,-0.597C0.522,-0.599 0.507,-0.601 0.49,-0.603C0.473,-0.604 0.457,-0.606 0.441,-0.607C0.424,-0.608 0.409,-0.608 0.394,-0.609C0.379,-0.61 0.367,-0.61 0.357,-0.61C0.356,-0.607 0.356,-0.602 0.356,-0.596C0.355,-0.59 0.355,-0.583 0.355,-0.575L0.355,-0.272C0.355,-0.217 0.356,-0.167 0.357,-0.125C0.358,-0.082 0.36,-0.039 0.363,0.002C0.352,0.001 0.339,-0 0.326,-0L0.236,-0C0.223,-0 0.21,0.001 0.199,0.002C0.202,-0.039 0.204,-0.082 0.205,-0.125C0.206,-0.167 0.207,-0.217 0.207,-0.272L0.207,-0.522Z" style="fill:rgb(23,181,63);fill-rule:nonzero;"/>
-        </g>
-    </g>
-</svg>
diff --git a/deployment/configurations/example/branding/templates/locales/html/general/de/faq.html b/deployment/configurations/example/branding/templates/locales/html/general/de/faq.html
deleted file mode 100644
index b06c7e039..000000000
--- a/deployment/configurations/example/branding/templates/locales/html/general/de/faq.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- this file is a template for rebranding of 'branding/locales/html/de/faq.html' -->
-
-<!-- template for the 'FAQ' in general -->
-
-<div class="info-page">
-  <h2>
-    Für das soziale Netzwerk {{ organization }}
-  </h2>
-  <h3>
-    Wie bediene ich dieses Netzwerk?
-  </h3>
-  <p>
-    Hier findest Du die
-    <a href="https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki" target="_blank" >Bedienungsanleitung</a>.<br>
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/templates/locales/html/general/en/faq.html b/deployment/configurations/example/branding/templates/locales/html/general/en/faq.html
deleted file mode 100644
index 4a01a4540..000000000
--- a/deployment/configurations/example/branding/templates/locales/html/general/en/faq.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!-- this file is a template for rebranding of 'branding/locales/html/de/faq.html' -->
-
-<!-- template for the 'FAQ' in general -->
-
-<div class="info-page">
-  <h2>
-    For the social network of {{ organization }}
-  </h2>
-  <h3>
-    How do I operate this network?
-  </h3>
-  <p>
-    Here you can find the
-    <a href="https://github.com/Ocelot-Social-Community/Ocelot-Social/wiki" target="_blank" >user manual</a>.<br>
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/templates/locales/html/hc-y2020/de/code-of-conduct.html b/deployment/configurations/example/branding/templates/locales/html/hc-y2020/de/code-of-conduct.html
deleted file mode 100644
index f0fd19a4f..000000000
--- a/deployment/configurations/example/branding/templates/locales/html/hc-y2020/de/code-of-conduct.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!-- this file is a template for rebranding of 'branding/locales/html/en/code-of-conduct.html' -->
-
-<!-- template for the 'Code Of Conduct' from the old HC network. in the old repo you will find other languages as well -->
-
-<div class="info-page">
-  <h2>
-    Für das soziale Netzwerk {{ organization }}
-  </h2>
-  <h3>
-    Präambel
-  </h3>
-  <p>
-    {{ networkName}} ist ein gemeinnütziges soziales Wissens- und Aktionsnetzwerk der nächsten Generation.
-    Von Menschen – für Menschen.
-    Free-Software, Open-Source, fair und transparent.
-    Für positiven lokalen und globalen Wandel in allen Lebensbereichen.
-    Wir gestalten den öffentlichen Austausch von Wissen, Ideen und Projekten völlig neu.
-    Die Funktionen von {{ networkName }} bringen die Menschen zusammen – offline und online – so dass wir die Welt zu einem besseren Ort machen können.<br>
-  </p>
-  <h3>
-    Zweck
-  </h3>
-  <p>
-    Mit diesen Verhaltensregeln regeln wir die wesentlichen Grundsätze für das Verhalten in unserem Sozialen Netzwerk.
-    Dabei ist die Menschenrechtscharta der Vereinten Nationen unsere Orientierung und bildet das Herz unseres Werteverständnisses.
-    Die Verhaltensregeln dienen als Leitsätze für den persönlichen Auftritt und den Umgang untereinander.
-    Wer als Nutzer im {{ networkName }} Netzwerk aktiv ist, Beiträge verfasst, kommentiert oder mit anderen Nutzern, auch außerhalb des Netzwerkes, Kontakt aufnimmt, erkennt diese Verhaltensregeln als verbindlich an.<br>
-  </p>
-  <h3>
-    Erwartetes Verhalten
-  </h3>
-  <p>
-    Die folgenden Verhaltensweisen werden von allen Community-Mitgliedern erwartet und gefordert:<br>
-  </p>
-  <ul>
-    <li>
-      Sei rücksichtsvoll und respektvoll, bei dem, was Du schreibst und tust.
-    </li>
-    <li>
-      Versuche auf andere zuzugehen, bevor ein Konflikt entsteht.
-    </li>
-    <li>
-      Vermeide erniedrigende, diskriminierende oder belästigende Verhaltensweisen und Ausdrücke.
-    </li>
-    <li>
-      Achte Dein Umfeld und Deine Mitmenschen. Warne die Verantwortlichen der Community, falls Du eine gefährliche Situation, jemanden in Not oder Verstöße gegen diesen Verhaltenskodex bemerkst, auch wenn diese unbedeutend erscheinen.
-    </li>
-  </ul>
-  <h3>
-    Nichtakzeptables Verhalten
-  </h3>
-  <p>
-    Die folgenden Verhaltensweisen sind in unserer Community inakzeptabel:<br>
-  </p>
-  <ul>
-    <li>
-      Diskriminierende Beiträge, Kommentare, Äußerungen oder Beleidigungen, insbesondere solche, die sich auf Geschlecht, sexuelle Orientierung, Rasse, Religion, politische oder weltanschauliche Ausrichtung oder Behinderung beziehen
-    </li>
-    <li>
-      Das Senden oder Verlinken eindeutig pornografischen Materials
-    </li>
-    <li>
-      Verherrlichung oder Verharmlosung grausamer oder unmenschlicher Gewalttätigkeiten
-    </li>
-    <li>
-      Das Veröffentlichen von personenbezogenen Daten anderer ohne deren Einverständnis oder das Androhen dessen („Doxing“)
-    </li>
-    <li>
-      Absichtliche Einschüchterung, Stalking oder Verfolgung
-    </li>
-    <li>
-      Bewerben von Produkten und Dienstleistungen mit kommerzieller Absicht
-    </li>
-    <li>
-      Strafbares Verhalten bzw. Verstoß gegen deutsches Recht
-    </li>
-    <li>
-      Befürworten oder Ermutigen zu diesen Verhaltensweisen
-    </li>
-  </ul>
-  <h3>
-    Konsequenzen inakzeptablen Verhaltens
-  </h3>
-  <p>
-    Wenn ein Gemeinschaftsmitglied inakzeptables Verhalten an den Tag legt, können die verantwortlichen Betreiber, Moderatoren und Administratoren des Netzwerks angemessene Maßnahmen ergreifen, u.a.:<br>
-  </p>
-  <ul>
-    <li>
-      Auffordern zum sofortigen Abstellen des inakzeptablen Verhaltens
-    </li>
-    <li>
-      Sperren oder Löschen von Kommentaren
-    </li>
-    <li>
-      Vorübergehender Ausschluss aus dem jeweiligen Beitrag
-    </li>
-    <li>
-      Sperren bzw. Löschen von Inhalten
-    </li>
-    <li>
-      Vorübergehender Entzug von Schreibrechten
-    </li>
-    <li>
-      Vorübergehender Ausschluss aus dem Netzwerk
-    </li>
-    <li>
-      Endgültiger Ausschluss aus dem Netzwerk
-    </li>
-    <li>
-      Verstöße gegen deutsches Recht können zur Anzeige gebracht werden.
-    </li>
-  </ul>
-  <p>
-    Wenn Du einem inakzeptablen Verhalten ausgesetzt bist, es miterlebst oder andere Bedenken hast, melde bitte so schnell wie möglich den oder die entsprechenden Inhalte an die Moderatoren.
-    Bitte klicke beim Beitrag, Kommentar oder Benutzer auf die drei Punkte und melde ihn über das aufgeklappte Menü.<br>
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/templates/locales/html/hc-y2020/de/data-privacy.html b/deployment/configurations/example/branding/templates/locales/html/hc-y2020/de/data-privacy.html
deleted file mode 100644
index 9109840fd..000000000
--- a/deployment/configurations/example/branding/templates/locales/html/hc-y2020/de/data-privacy.html
+++ /dev/null
@@ -1,1010 +0,0 @@
-<!-- this file is a template for rebranding of 'branding/locales/html/en/terms-and-conditions.html' -->
-
-<!-- template for the 'Terms And Conditions' from the old HC network. in the old repo you will find other languages as well -->
-
-<div class="info-page">
-  <h2>
-    Für das soziale Netzwerk {{ organization }}
-  </h2>
-  <h3>
-    Information über die Erhebung personenbezogener Daten
-  </h3>
-  <p>
-    Wir freuen uns, dass Du unsere Website besuchst und bedanken uns für Dein Interesse.
-    Im Folgenden informieren wir Dich über den Umgang mit Deinen personenbezogenen Daten bei Nutzung unserer Website, unsere Netzwerkes oder der Uhr des Wandels.
-    Diese Website nutzt aus Sicherheitsgründen und zum Schutz der Übertragung personenbezogene Daten und anderer vertraulicher Inhalte (z.B. Bestellungen oder Anfragen an den Verantwortlichen) eine SSL-bzw. TLS-Verschlüsselung.
-    Du kannst eine verschlüsselte Verbindung an der Zeichenfolge „https://“ und dem Schloss-Symbol in Deiner Browserzeile erkennen.<br>
-  </p>
-  <h3>
-    Kontaktdaten des Verantwortlichen
-  </h3>
-  <p>
-    Verantwortlich für die Datenverarbeitung auf dieser Website im Sinne der Datenschutz-Grundverordnung (DSGVO) ist<br>
-  </p>
-  <p>
-    <b>{{ organization }}</b><br>
-    Musterstraße 11<br>
-    53487 Musterort<br>
-    Deutschland<br>
-  </p>
-  <p>
-    Tel.: +49 151 / 43 80 42 22<br>
-    E-Mail: <a href="mailto:info@example.org">info@example.org</a><br>
-  </p>
-  <h4>
-    Datenschutzbeauftragter
-  </h4>
-  <p>
-    Unser Datenschutzbeauftragter ist erreichbar unter folgender E-Mail-Adresse: <a href="mailto:datenschutz@@example.org">datenschutz@@example.org</a><br>
-  </p>
-  <p>
-    Diese Website nutzt aus Sicherheitsgründen und zum Schutz der Übertragung personenbezogene Daten und anderer vertraulicher Inhalte (z.B. Bestellungen oder Anfragen an den Verantwortlichen) eine SSL-bzw. TLS-Verschlüsselung. Du kannst eine verschlüsselte Verbindung an der Zeichenfolge „https://“ und dem Schloss-Symbol in Deiner Browserzeile erkennen.<br>
-  </p>
-  <h3>
-    Datenerfassung beim Besuch unserer Website
-  </h3>
-  <p>
-    Bei der bloß informatorischen Nutzung unserer Website, also wenn Du Dich nicht registrierst oder uns anderweitig Informationen übermittelst, erheben wir nur solche Daten, die Dein Browser an unseren Server übermittelt (sog. „Server-Logfiles“). Wenn Du unsere Website aufrufst, erheben wir die folgenden Daten, die für uns technisch erforderlich sind, um Dir die Website anzuzeigen:<br>
-  </p>
-  <ul>
-    <li>
-      unsere besuchte Website
-    </li>
-    <li>
-      Datum und Uhrzeit zum Zeitpunkt des Zugriffes
-    </li>
-    <li>
-      Menge der gesendeten Daten in Byte
-    </li>
-    <li>
-      Quelle/Verweis, von welchem Du auf die Seite gelangst
-    </li>
-    <li>
-      verwendeter Browser
-    </li>
-    <li>
-      verwendetes Betriebssystem
-    </li>
-    <li>
-      verwendete IP-Adresse (ggf.: in anonymisierter Form)
-    </li>
-  </ul>
-  <p>
-    Die Verarbeitung erfolgt gemäß Art. 6 Abs. 1 lit. f DSGVO auf Basis unseres berechtigten Interesses an der Verbesserung der Stabilität und Funktionalität unserer Website. Empfänger dieser Daten sind nur wir und unser Provider Netcup, mit welchem wir einen Auftragsverarbeitungsvertrag haben, um Deine Rechte schützen zu können.
-    Eine Weitergabe oder anderweitige Verwendung der Daten findet nicht statt.
-    Wir behalten uns allerdings vor, die Server-Logfiles nachträglich zu überprüfen, sollten konkrete Anhaltspunkte auf eine rechtswidrige Nutzung hinweisen.<br>
-  </p>
-  <h3>
-    Dauer der Speicherung personenbezogener Daten
-  </h3>
-  <p>
-    Die Dauer der Speicherung von personenbezogenen Daten bemisst sich anhand der jeweiligen gesetzlichen Aufbewahrungsfrist (z.B. handels- und steuerrechtliche Aufbewahrungsfristen). Nach Ablauf der Frist werden die entsprechenden Daten routinemäßig gelöscht, sofern sie nicht mehr zur Vertragserfüllung oder Vertragsanbahnung erforderlich sind und/oder unsererseits kein berechtigtes Interesse an der Weiterspeicherung fortbesteht.<br>
-  </p>
-  <h3>
-    Cookies
-  </h3>
-  <p>
-    Um den Besuch unserer Website attraktiv zu gestalten und die Nutzung bestimmter Funktionen zu ermöglichen, verwenden wir auf verschiedenen Seiten sogenannte Cookies. Hierbei handelt es sich um kleine Textdateien, die auf Deinem Endgerät abgelegt werden. Einige der von uns verwendeten Cookies werden nach dem Ende der Browser-Sitzung, also nach Schließen Deines Browsers, wieder gelöscht (sog. Sitzungs-Cookies). Andere Cookies verbleiben auf Deinem Endgerät und ermöglichen uns oder unseren Partnerunternehmen (Cookies von Drittanbietern), Deinen Browser beim nächsten Besuch wiederzuerkennen (persistente Cookies). Werden Cookies gesetzt, erheben und verarbeiten diese im individuellen Umfang bestimmte Nutzerinformationen wie Browser- und Standortdaten sowie IP-Adresswerte. Persistente Cookies werden automatisiert nach einer vorgegebenen Dauer gelöscht, die sich je nach Cookie unterscheiden kann.<br>
-  </p>
-  <p>
-    Sofern durch einzelne von uns implementierte Cookies auch personenbezogene Daten verarbeitet werden, erfolgt die Verarbeitung gemäß Art. 6 Abs. 1 lit. f DSGVO zur Wahrung unserer berechtigten Interessen an der bestmöglichen Funktionalität der Website sowie einer kundenfreundlichen und effektiven Ausgestaltung des Seitenbesuchs.<br>
-  </p>
-  <p>
-    Wir arbeiten unter Umständen mit Werbepartnern zusammen, die uns helfen, unser Internetangebot interessanter zu gestalten. Zu diesem Zweck werden für diesen Fall bei Deinem Besuch unserer Website auch Cookies von Partnerunternehmen in Deinem Browser gespeichert (Cookies von Drittanbietern). Wenn wir mit vorbenannten Werbepartnern zusammenarbeiten, wirst Du über den Einsatz derartiger Cookies und den Umfang der jeweils erhobenen Informationen innerhalb der nachstehenden Absätze individuell und gesondert informiert.<br>
-  </p>
-  <p>
-    Bitte beachte, dass Du Deinen Browser so einstellen kannst, dass Du über das Setzen von Cookies informiert wirst und einzeln über deren Annahme entscheiden oder die Annahme von Cookies für bestimmte Fälle oder generell ausschließen kannst. Jeder Browser unterscheidet sich in der Art, wie er die Cookie-Einstellungen verwaltet. Diese ist in dem Hilfemenü jedes Browsers beschrieben, welches Dir erläutert, wie Du Deine Cookie-Einstellungen ändern kannst. Diese findest Du für die jeweiligen Browser unter den folgenden Links:<br>
-  </p>
-  <ul>
-    <li>
-      Internet Explorer: <a href="http://windows.microsoft.com/de-DE/windows-vista/Block-or-allow-cookies">http://windows.microsoft.com/de-DE/windows-vista/Block-or-allow-cookies</a>
-    </li>
-    <li>
-      Firefox: <a href="https://support.mozilla.org/de/kb/cookies-erlauben-und-ablehnen">https://support.mozilla.org/de/kb/cookies-erlauben-und-ablehnen</a>
-    </li>
-    <li>
-      Chrome: <a href="http://support.google.com/chrome/bin/answer.py?hl=de&hlrm=en&answer=95647">http://support.google.com/chrome/bin/answer.py?hl=de&hlrm=en&answer=95647</a>
-    </li>
-    <li>
-      Safari: <a href="https://support.apple.com/kb/ph21411?locale=de_DE">https://support.apple.com/kb/ph21411?locale=de_DE</a>
-    </li>
-    <li>
-      Opera: <a href="http://help.opera.com/Windows/10.20/de/cookies.html">http://help.opera.com/Windows/10.20/de/cookies.html</a>
-    </li>
-  </ul>
-  <p>
-    Bitte beachte auch, dass bei Nichtannahme von Cookies die Funktionalität unserer Website eingeschränkt sein kann.<br>
-  </p>
-  <h3>
-    Spendenformular
-  </h3>
-  <p>
-    Wenn Du unsere Fundraisingbox (Spendenformular) auf unserer Webseite nutzt, dann benötigen wir von Dir folgende <b>personenbezogene Daten</b>:
-    Deinen Vor- und Nachnamen, Deine E-Mail-Adresse und Deine Bankverbindung mit Kontoinhaber, IBAN und BIC. Solltest Du uns durch eine einfache Überweisung spenden, bekommen wir alle diese Daten auch, bis auf die E-Mail-Adresse.
-    Wenn Du uns diese in der Überweisung mitteilst, wäre das gut.
-    Gleichzeitig speichern wir folgende, von Dir eingegebene Daten (Name, E-Mail, Anschrift und Betrag) zur Ausstellung einer Spendenbescheinigung.<br>
-  </p>
-  <p>
-    Deine E-Mail-Adresse und die Höhe deiner Spende wird ebenfalls von uns gespeichert, um später die Möglichkeit zu schaffen, Deine Unterstützung durch eine Spende über eine sogenannte Badge-Anzeige in unserem Netzwerk öffentlich zu honorieren.
-    Solltest Du uns nicht nur finanziell unterstützen, sondern auch Nutzer unseres Netzwerkes sein, wirst Du nach dem Go-Live unseres Netzwerkes selber entscheiden können, ob diese Badges angezeigt werden sollen, oder nicht.
-    Dieser Punkt wird, sobald vollständig implementiert, näher in den Datenschutzbedingungen unseres Netzwerkes beschrieben sein.<br>
-  </p>
-  <p>
-    Als gemeinnützige Organisation haben wir ein berechtigtes Interesse gem. Art. 6 Abs. 1 lit. f) DSGVO, unseren Spendern eine einfache und sichere Zahlungsmöglichkeit zu bieten, welches die <b>Rechtsgrundlage</b> für diese Verarbeitung ist.
-    Der <b>Zweck</b> ist die finanzielle Unterstützung unserer gemeinnützigen Organisation.<br>
-  </p>
-  <p>
-    Die <b>Speicherdauer</b> Deiner Daten beträgt aus steuerrechtlichen Gründen 10 Jahre.
-    Wir löschen diese Daten spätestens 12 Monate danach.<br>
-  </p>
-  <p>
-    Für unser Spendenformular auf der Webseite nutzen wir den Finanzdienstleister Fundraisingbox, mit welchem wir einen entsprechenden Auftragsdatenverarbeitungsvertrag abgeschlossen haben, um Deine <b>Rechte</b>, wie unten angegegeben, im Zusammenhang mit Deiner Spende auch durchsetzen zu können.
-    FundraisingBox und wir sind <b>Empfänger</b> dieser Daten.<br>
-  </p>
-  <p>
-    Alle weiteren Finanzdienstleister bzw. Banken, die Du angeben kannst, arbeiten nicht im Auftrag von uns bzw. nach unseren Vorgaben, sondern eigenverantwortlich.
-    Diese sind, je nachdem, auf welchem Weg Du spendest, die GLS Bank, Paypal, VISA, Klarna, Stripe und Deine Bank, von der Du spendest.
-    FundraisingBox selber liefert dabei keine personenbezogenen Daten in ein <b>Drittland</b>.
-    Bei von Dir angegebenen bzw. genutzten Finanzdienstleistern kann dies unter Umständen der Fall sein.
-    Von den oben angegebenen sind hier die Datenschutzinformationen noch einmal gesondert aufgeführt:<br>
-  </p>
-  <ul>
-    <li>
-      GLS Bank – <a href="https://www.gls.de/privatkunden/datenschutz/">https://www.gls.de/privatkunden/datenschutz/</a>
-    </li>
-    <li>
-      Paypal – <a href="https://www.paypal.com/de/webapps/mpp/ua/privacy-full">https://www.paypal.com/de/webapps/mpp/ua/privacy-full</a>
-    </li>
-    <li>
-      VISA – <a href="https://www.visa.de/legal/global-privacy-notice.html">https://www.visa.de/legal/global-privacy-notice.html</a>
-    </li>
-    <li>
-      Klarna – <a href="https://www.klarna.com/de/datenschutz/">https://www.klarna.com/de/datenschutz/</a>
-    </li>
-    <li>
-      Stripe – <a href="https://stripe.com/de/privacy#translation">https://stripe.com/de/privacy#translation</a>
-    </li>
-  </ul>
-  <p>
-    Das Spendenformular ist auf unserer Webseite über einen sogenannten iFrame eingebunden und die Inhalte werden verschlüsselt zu FundraisingBox übertragen.
-    Dies bedeutet, dass niemand außer Dir und FundraisingBox bei dieser Übertragung Daten zu sehen bekommt.
-    Zu Fundraisingbox werden entsprechend Daten übertragen, die Dein Webbrowser liefert, also Deine IP-Adresse und, je nachdem, welchen Browser Du nutzt und wie er eingestellt ist, in der Regel Dein Betriebssystem, die Browserversion und einige andere Daten.
-    Zum Datenschutz von Fundraisingbox kannst Du hier die Details lesen: <a href="https://www.fundraisingbox.com/datensicherheit/">https://www.fundraisingbox.com/datensicherheit/</a>.<br>
-  </p>
-  <h3>
-    Support
-  </h3>
-  <h4>
-    Zweck
-  </h4>
-  <p>
-    Wir stellen Dir zum Zweck der Problemlösung einen Support zur Verfügung, wenn Du Probleme mit unserem Netzwerk, unserer Webseite oder der Clock-of-Change hast oder generell etwas von und mit uns geklärt haben willst.
-    Ebenso kannst Du den Support über das Senden einer E-Mail erreichen.
-    Optional kannst Du, wenn Du Dich bei uns registriert hast, Deine vergangenen Support-Tickets betrachten.<br>
-  </p>
-  <p>
-    Personenbezogene Daten:
-    Um Dir kommunizieren zu können, benötigen wir von Dir Deine E-Mail-Adresse und einen Namen oder ein Pseudonym, damit wir Dich ansprechen können.
-    Optional kannst Du uns eine Telefonnummer angeben, unter welcher wir Dich erreichen können, wenn Du das möchtest.
-    Weitere personenbezogene Daten können im Text Deiner Support-Anfrage enthalten sein.<br>
-  </p>
-  <p>
-    Ebenfalls werden bei Deiner Anfrage, wenn sie über unsere Support-Website stattfindet, Deine IP-Adresse und weitere Daten übertragen, die Dein Browser uns liefert.
-    Diese Daten werden von uns nicht gespeichert (kein Logging).<br>
-  </p>
-  <h4>
-    Speicherdauer
-  </h4>
-  <p>
-    Wir speichern Deine Supportanfragen für Dich, bis Du deinen Account löscht oder uns Bescheid gibst, dass Du sie gelöscht haben möchtest.
-    Wir löschen allerdings jede Supportanfrage spätestens nach 12 Monaten, nachdem sie geschlossen wurde.<br>
-  </p>
-  <h4>
-    Rechtsgrundlage
-  </h4>
-  <p>
-    Als gemeinnützige Organisation haben wir ein berechtigtes Interesse gem. Art. 6 Abs. 1 lit. f) DSGVO, unseren Spendern eine einfache und sichere Support-Möglichkeit für die von uns zur Verfügung gestellten Dienste und damit zusammenhängenden Fragen zu bieten.
-    Nutzer sind unter Umständen mit Herausforderungen oder Fragestellungen konfrontiert, die sie nicht alleine lösen können.
-    Mit dem Support bieten wir dafür eine notwendige Kommunikationsschnittstelle, die auch für den Nutzer transparent einsehbar ist.<br>
-  </p>
-  <h4>
-    Empfänger
-  </h4>
-  <p>
-    Deine personenbezogenen Daten können nur wir sehen und prinzipiell auch unser Provider, mit welchem wir einen Auftragsdatenverarbeitungsvertrag haben, der unsere Durchgriffsmöglichkeiten und Verantwortlichkeiten regelt.<br>
-  </p>
-  <h4>
-    Drittlandtransfer
-  </h4>
-  <p>
-    Unsere Support-Daten werden nicht in einem Drittland gespeichert oder verarbeitet.<br>
-  </p>
-  <h3>
-    Nutzung deiner Daten zur Direktwerbung
-  </h3>
-  <h4>
-    Anmeldung zu unserem E-Mail-Newsletter
-  </h4>
-  <p>
-    Wenn Du Dich zu unserem E-Mail Newsletter anmeldest, übersenden wir Dir regelmäßig Informationen zu unseren Angeboten.
-    Pflichtangabe für die Übersendung des Newsletters ist allein Deine E-Mail-Adresse.
-    Die Angabe weiterer evtl. Daten ist freiwillig und wird verwendet, um Dich persönlich ansprechen zu können.
-    Für den Versand des Newsletters verwenden wir das sog. Double Opt-in Verfahren.
-    Dies bedeutet, dass wir Dir erst dann einen E-Mail-Newsletter übermitteln werden, wenn Du uns ausdrücklich bestätigt hast, dass Du dem Versand des Newsletters einwilligst.
-    Wir schicken Dir dann eine Bestätigungsmail, mit der Du gebeten wirst, durch Anklicken eines entsprechenden Links zu bestätigen, dass Du künftig unseren Newsletter erhalten willst.<br>
-  </p>
-  <p>
-    Mit der Aktivierung des Bestätigungslinks erteilst Du uns Deine Einwilligung für die Nutzung Deiner personenbezogenen Daten gemäß Art. 6 Abs. 1 lit. a DSGVO.
-    Bei der Anmeldung zum Newsletter speichern wir Deine vom Internet Service-Provider (ISP) eingetragene IP-Adresse sowie das Datum und die Uhrzeit der Anmeldung, um einen möglichen Missbrauch Deiner E-Mailadresse zu einem späteren Zeitpunkt nachvollziehen zu können.
-    Die von uns bei der Anmeldung zum Newsletter erhobenen Daten werden ausschließlich für Zwecke der werblichen Ansprache im Wege des Newsletters benutzt.
-    Du kannst den Newsletter jederzeit über den dafür vorgesehenen Link im Newsletter selbst oder durch entsprechende Nachricht an den Support (siehe Formular) abbestellen.
-    Nach erfolgter Abmeldung wird Deine E-Mailadresse unverzüglich in unserem Newsletter-Verteiler gelöscht, soweit Du nicht ausdrücklich zu einer weiteren Nutzung Deiner Daten eingewilligt hast oder wir uns eine darüberhinausgehende Datenverwendung vorbehalten, die gesetzlich erlaubt ist und über die wir Dich in dieser Erklärung informieren.<br>
-  </p>
-  <h3>
-    Verwendung von Videos
-  </h3>
-  <h4>
-    Verwendung von Youtube-Videos
-  </h4>
-  <p>
-    Diese Website nutzt die Youtube-Einbettungsfunktion zur Anzeige und Wiedergabe von Videos des Anbieters „Youtube“, der zu der Google LLC., 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA („Google“) gehört.<br>
-  </p>
-  <p>
-    Hierbei wird der erweiterte Datenschutzmodus verwendet, der nach Anbieterangaben eine Speicherung von Nutzerinformationen erst bei Wiedergabe des/der Videos in Gang setzt.
-    Wird die Wiedergabe eingebetteter Youtube-Videos gestartet, setzt der Anbieter „Youtube“ Cookies ein, um Informationen über das Nutzerverhalten zu sammeln.
-    Hinweisen von „Youtube“ zufolge dienen diese unter anderem dazu, Videostatistiken zu erfassen, die Nutzerfreundlichkeit zu verbessern und missbräuchliche Handlungsweisen zu unterbinden.
-    Wenn Du bei Google eingeloggt bist, werden Deine Daten direkt Deinem Konto zugeordnet, wenn Du ein Video anklickst.
-    Wenn Du die Zuordnung zu Deinen Profil bei YouTube nicht wünscht, muss Du Dich vor Aktivierung des Buttons ausloggen.
-    Google speichert Deine Daten (selbst für nicht eingeloggte Nutzer) als Nutzungsprofile und wertet diese aus.
-    Eine solche Auswertung erfolgt insbesondere gemäß Art. 6 Abs. 1 lit.f DSGVO auf Basis der berechtigten Interessen von Google an der Einblendung personalisierter Werbung, Marktforschung und/oder bedarfsgerechten Gestaltung seiner Website.
-    Dir steht ein Widerspruchsrecht gegen die Bildung dieser Nutzerprofile zu, wobei Du Dich zur Ausübung dessen an YouTube richten musst.<br>
-  </p>
-  <p>
-    Unabhängig von einer Wiedergabe der eingebetteten Videos wird bei jedem Aufruf dieser Website eine Verbindung zum Google-Netzwerk „DoubleClick“ aufgenommen, was ohne unseren Einfluss weitere Datenverarbeitungsvorgänge auslösen kann.<br>
-  </p>
-  <p>
-    Google LLC mit Sitz in den USA ist für das us-europäische Datenschutzübereinkommen „Privacy Shield“ zertifiziert, welches die Einhaltung des in der EU geltenden Datenschutzniveaus gewährleistet.<br>
-  </p>
-  <p>
-    Weitere Informationen zum Datenschutz bei „YouTube“ findest Du in der Datenschutzerklärung des Anbieters unter: <a href="https://www.google.de/intl/de/policies/privacy">https://www.google.de/intl/de/policies/privacy</a>.<br>
-  </p>
-  <h3>
-    Netzwerk
-  </h3>
-  <p>
-    Wir betreiben ein gemeinnütziges soziales Wissens- und Aktionsnetzwerks, um den Herausforderungen unserer Zeit gemeinsam zu begegnen, die Würde des Menschen zu wahren und eine lebenswerte Zukunft für alle Menschen und zukünftigen Generationen zu schaffen.<br>
-  </p>
-  <p>
-    Im Folgenden sind die Einzelnen Datenverarbeitungen aufgeführt, die im Rahmen des Betriebs unseres Netzwerkes notwendig sind.<br>
-  </p>
-  <h3>
-    Anmeldedaten
-  </h3>
-  <h4>
-    Zweck
-  </h4>
-  <p>
-    Die Anmeldedaten werden für die Anmeldung am Netzwerk benötigt.<br>
-  </p>
-  <h4>
-    Personenbezogene Daten
-  </h4>
-  <p>
-    Im Sinne der Datenminimierung registrierst Du Dich für unser Netzwerk einzig mit Deiner E-Mail-Adresse.
-    Weitere personenbezogene Daten sind für die Registrierung nicht nötig.
-    Über diese E-Mail-Adresse stellen wir Deine Identität fest.<br>
-  </p>
-  <p>
-    In der Kommunikation mit uns spielt die von Dir verwendete E-Mail-Adresse also eine zentrale Rolle.
-    Daher werden wir alle von Dir ausgeübten Rechte und ggf. Wünsche, die Du an uns richtest, immer über Deine E-Mail-Adresse verifizieren.
-    Niemals werden wir auf Basis eines Anrufes oder einer sonstigen Information an Deinem Account etwas ändern, ihn z.B. löschen oder stillegen, ohne diese Verifizierung – außer, wir sind durch ein Gesetz dazu gezwungen.
-    Gesichert ist Dein Account in unserem Netzwerk über ein Passwort, was von Dir selbst vergeben werden muss und jederzeit geändert werden kann.<br>
-  </p>
-  <h4>
-    Speicherdauer
-  </h4>
-  <p>
-    Wir speichern Deine Anmeldedaten, bis Du deinen Account löschst oder uns via E-Mail Bescheid gibst, dass Du sie gelöscht haben möchtest.<br>
-  </p>
-  <h4>
-    Rechtsgrundlage
-  </h4>
-  <p>
-    Die Einwilligung durch Registrierung am Netzwerk gem. Art. 6 Abs. 1 lit. a) DSGVO.
-    Die Einwilligung kann jederzeit durch Löschen des Accounts samt aller Daten Widerrufen werden.
-    Beim Löschen ist da Löschen der Beiträge und Kommentare vorgegeben, aber optional.
-    Sollen Beiträge und Kommentare nicht gelöscht werden, werden diese anonymisiert.
-    Dadurch sind sie nicht mehr zuordenbar, weswegen auch anschließend kein Recht auf Löschung mehr geltend gemacht werden kann.<br>
-  </p>
-  <p>
-    Die E-Mail-Adresse kann jederzeit selber geändert werden.
-    Durch den Widerruf der Einwilligung wird die Rechtmäßigkeit der aufgrund der Einwilligung bis zum Widerruf erfolgten Verarbeitung nicht berührt.<br>
-  </p>
-  <h4>
-    Empfänger
-  </h4>
-  <p>
-    Deine personenbezogenen Daten können nur wir und unser Provider einsehen, mit welchem wir einen Auftragsdatenverarbeitungsvertrag haben, der unsere Durchgriffsmöglichkeiten und Verantwortlichkeiten regelt.<br>
-  </p>
-  <h4>
-    Weitergabe an Dritte
-  </h4>
-  <p>
-    Die Anmeldedaten werden nicht an Dritte weitergegeben, außer ein Gesetz zwingt uns dazu.<br>
-  </p>
-  <h4>
-    Drittlandtransfer
-  </h4>
-  <p>
-    Die Daten werden nicht in einem Drittland gespeichert.<br>
-  </p>
-  <h3>
-    Profildaten
-  </h3>
-  <h4>
-    Zweck
-  </h4>
-  <p>
-    Die Profildaten ermöglichen es Nutzern, freiwillig weitere Informationen über sich weltweit und frei abrufbar zu veröffentlichen.<br>
-  </p>
-  <h4>
-    Personenbezogene Daten
-  </h4>
-  <p>
-    Angaben, wie Dein Pseudonym, ein Avatar-Bildchen oder weitere Angaben, die ggf. auch personenbezogene Daten sein können, vergibst Du selbst.<br>
-  </p>
-  <h4>
-    Speicherdauer
-  </h4>
-  <p>
-    Wir speichern Deine Profildaten, bis Du sie löscht. Da die Daten öffentlich sind, können sie von Dritten kopiert worden sein und sind daher ggf. nicht zurückholbar.<br>
-  </p>
-  <h4>
-    Rechtsgrundlage
-  </h4>
-  <p>
-    Die Einwilligung gem. Art. 6 Abs. 1 lit. a), diese Profildaten öffentlich zu machen.
-    Die Veröffentlichung geschieht mit der Eingabe.
-    Die Einwilligung kann jederzeit durch Löschen der Daten widerrufen werden.
-    Die Profildaten können jederzeit selber geändert werden.<br>
-  </p>
-  <h4>
-    Empfänger
-  </h4>
-  <p>
-    Deine Profildaten sind öffentlich und können weltweit von jedem, der zugreift, gesehen werden.<br>
-  </p>
-  <h4>
-    Dritte
-  </h4>
-  <p>
-    Deine Profildaten sind öffentlich und können weltweit von jedem, der zugreift, gesehen werden.<br>
-  </p>
-  <h4>
-    Drittlandtransfer
-  </h4>
-  <p>
-    Die Daten werden von uns nicht in einem Drittland gespeichert oder an ein solches übertragen.<br>
-  </p>
-  <h3>
-    Session-Daten
-  </h3>
-  <h4>
-    Zweck
-  </h4>
-  <p>
-    Speicherung der Anmeldung im Browser, damit nicht jeder Seitenaufruf eine neue Anmeldung erfordert.<br>
-  </p>
-  <h4>
-    Personenbezogene Daten
-  </h4>
-  <p>
-    Ein Session-Cookie, der in Deinem Webbrowser gespeichert wird.<br>
-  </p>
-  <h4>
-    Speicherdauer
-  </h4>
-  <p>
-    Wir speichern Diesen Cookie einen Tag lang.<br>
-  </p>
-  <h4>
-    Cookies
-  </h4>
-  <p>
-    Dieser Cookie wird gespeichert:<br>
-  </p>
-  <table>
-    <thead>
-      <tr>
-        <th>
-          Name
-        </th>
-        <th>
-          Zweck
-        </th>
-        <th>
-          Speicherdauer
-        </th>
-        <th>
-          Typ
-        </th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>
-          ocelot-social-token
-        </td>
-        <td>
-          Merken der Anmeldung am Netzwerk.
-          Mit diesem Cookie bleibst Du bis zu einem Tag in unserem Netzwerk angemeldet.
-        </td>
-        <td>
-          730 Tage, ca. 2 Jahre
-        </td>
-        <td>
-          HTTP-Cookie
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <h4>
-    Rechtsgrundlage
-  </h4>
-  <p>
-    Das berechtigtes Interesse gem. Art. 6 Abs. 1 lit. f), unseren Nutzern das Login auf unser Netzwerk technisch zu ermöglichen.<br>
-  </p>
-  <h4>
-    Empfänger
-  </h4>
-  <p>
-    Deine personenbezogenen Daten können nur wir und unser Provider, mit welchem wir einen Auftragsdatenverarbeitungsvertrag haben, der unsere Durchgriffsmöglichkeiten und Verantwortlichkeiten regelt.<br>
-  </p>
-  <h4>
-    Drittlandtransfer
-  </h4>
-  <p>
-    Die Daten werden nicht in einem Drittland gespeichert.<br>
-  </p>
-  <h3>
-    Browser-Zugriffsdaten
-  </h3>
-  <h4>
-    Zweck
-  </h4>
-  <p>
-    Technische Funktionsfähigkeit der Webanwendung inkl. korrekter Darstellung in der jeweiligen Landessprache.<br>
-  </p>
-  <h4>
-    Personenbezogene Daten
-  </h4>
-  <p>
-    Übertragen werden u.a., je nach verwendetem Browser und dessen Einstellungen:
-    Datum und Uhrzeit des Zugriffes, Menge der gesendeten Daten in Byte, ggf. Quelle/Verweis, von welcher Seite Du auf unsere jeweilige gelangst, verwendeter Browser, verwendetes Betriebssystem, Sprachinformation, Größe des Browserfensters, verwendete IP-Adresse.<br>
-  </p>
-  <h4>
-    Speicherdauer
-  </h4>
-  <p>
-    Diese Daten werden von uns nicht gespeichert, sondern nur zur Beantwortung der konkreten Anfrage verwendet.<br>
-  </p>
-  <h4>
-    Rechtsgrundlage
-  </h4>
-  <p>
-    Das berechtigtes Interesse gem. Art. 6 Abs. 1 lit. f), unseren Nutzern die Nutzung unseres netzwerkes technisch zu ermöglichen.<br>
-  </p>
-  <h4>
-    Empfänger
-  </h4>
-  <p>
-    Deine personenbezogenen Daten können nur wir und unser Provider, mit welchem wir einen Auftragsdatenverarbeitungsvertrag haben, der unsere Durchgriffsmöglichkeiten und Verantwortlichkeiten regelt.<br>
-  </p>
-  <h4>
-    Drittlandtransfer
-  </h4>
-  <p>
-    Die Daten werden nicht in einem Drittland gespeichert.<br>
-  </p>
-  <h3>
-    Inhalte
-  </h3>
-  <h4>
-    Zweck
-  </h4>
-  <p>
-    Veröffentlichung von Inhalten in unserem weltweit offenen sozialen Wissens- und Aktionsnetzwerk.<br>
-  </p>
-  <h4>
-    Personenbezogene Daten
-  </h4>
-  <p>
-    Alle Beiträge und Kommentare<br>
-  </p>
-  <h4>
-    Speicherdauer
-  </h4>
-  <p>
-    Wir speichern Deine Beiträge und Kommentare, bis Du sie löscht.
-    Da die Daten öffentlich sind, können sie von Dritten kopiert worden sein und sind daher ggf. nicht zurückholbar.<br>
-  </p>
-  <h4>
-    Rechtsgrundlage
-  </h4>
-  <p>
-    Die Einwilligung zur Veröffentlichung gem. Art. 6 Abs. 1 lit. a). Die Veröffentlichung geschieht mit der Eingabe.
-    Die Einwilligung kann jederzeit durch Löschen der Beiträge und Kommentare widerrufen werden.
-    Die Beiträge und Kommentare können jederzeit selber geändert werden.
-    Durch den Widerruf der Einwilligung wird die Rechtmäßigkeit der aufgrund der Einwilligung bis zum Widerruf erfolgten Verarbeitung nicht berührt.<br>
-  </p>
-  <h4>
-    Empfänger
-  </h4>
-  <p>
-    Deine Beiträge und Kommentare sind öffentlich und können weltweit von jedem, der zugreift, gesehen werden.<br>
-  </p>
-  <h4>
-    Dritte
-  </h4>
-  <p>
-    Deine Beiträge und Kommentare sind öffentlich und können weltweit von jedem, der zugreift, gesehen werden.<br>
-  </p>
-  <h4>
-    Drittlandtransfer
-  </h4>
-  <p>
-    Die Daten werden von uns nicht in einem Drittland gespeichert oder an ein solches übertragen.<br>
-  </p>
-  <h3>
-    Einbettung von Inhalten von Drittanbietern
-  </h3>
-  <p>
-    Der Nutzer kann einwilligen, dass Inhalte von Drittanbietern, wie Facebook, Twitter oder Vimeo nicht als Link dargestellt werden, sondern optional in der Webseite angezeigt bzw. abgespielt werden.
-    Wir empfehlen, darauf zu verzichten.
-    Die Grundeinstellung in unserem Netzwerk ist, dass Inhalte von Drittanbietern nicht eingebunden werden.<br>
-  </p>
-  <h4>
-    Zweck
-  </h4>
-  <p>
-    Darstellung der Inhalte von Drittanbietern, wie Facebook, Twitter im Kontext des jeweiligen Artikels oder Beitrags im Browser des Nutzers.<br>
-  </p>
-  <h4>
-    Personenbezogene Daten, Speicherdauer, Empfänger und Drittlandtransfer
-  </h4>
-  <p>
-    Man kann prinzipiell davon ausgehen, dass Dienste von Drittanbietern durch das Sammeln von Daten über Dich bzw. den damit möglichen Gewinnen finanziert werden.
-    Daher raten wir davon ab, das Einbinden von Drittanbieterinhalten einzuschalten.<br>
-  </p>
-  <p>
-    Die von den Drittanbietern gesammelten personenbezogenen Daten und deren Verwendung können wir letztendlich nicht kontrollieren.
-    Sie sind auch keine Auftragsverarbeiter von uns oder funktionaler Bestandteil unseres Netzwerkes, sondern eigenständig Verantwortliche.
-    Ein Nutzer kann sich entscheiden, von anderen Nutzern eingestellte Links bzw. deren Inhalte Inhalte eingebettet anzuzeigen.
-    Die dabei preisgegebenen personenbezogenen daten entsprechen im Großen und Ganzen denen eines Aufrufes des jeweiligen Links.
-    Dies sind, abhängig vom jeweiligen Browser des Nutzers und seiner Einstellung zum Beispiel:<br>
-  </p>
-  <ul>
-    <li>
-      unsere besuchte Website
-    </li>
-    <li>
-      Datum und Uhrzeit zum Zeitpunkt des Zugriffes
-    </li>
-    <li>
-      Menge der gesendeten Daten in Byte
-    </li>
-    <li>
-      Quelle/Verweis, von welchem Du auf die Seite gelangst
-    </li>
-    <li>
-      verwendeter Browser
-    </li>
-    <li>
-      verwendetes Betriebssystem
-    </li>
-    <li>
-      verwendete IP-Adresse (ggf.: in anonymisierter Form)
-    </li>
-  </ul>
-  <p>
-    Ebenso können Cookies von Drittanbietern gesetzt und gespeichert werden, wenn Du dies in Deinem Browser zugelassen hast.<br>
-  </p>
-  <p>
-    Drittanbieter ändern ihre Geschäftsbedingungen in der Regel häufiger.
-    Daher sind hier die jeweiligen Nutzungsbedingungen und Datenschutzbestimmungen mit genauen und stets aktuellen Details verlinkt:<br>
-  </p>
-  <ul>
-    <li>
-      <a href="https://blog.codepen.io/legal/terms-of-service/">AGBs</a> und <a href="https://blog.codepen.io/legal/privacy/">Datenschutz</a> von <a href="https://codepen.io/">Codepen</a>
-    </li>
-    <li>
-      <a href="https://about.d.tube/">AGBs</a> und <a href="https://paper.dropbox.com/doc/D.TUBE-PRIVACY-POLICY-JevATMoSw0NfTU7ZuHM1Y">Datenschutz</a> von <a href="https://d.tube/">D.Tube</a>
-    </li>
-    <li>
-      <a href="https://www.facebook.com/legal/terms?ref=pf">AGBs</a> und <a href="https://www.facebook.com/privacy/explanation">Datenschutz</a> von <a href="https://www.facebook.com/">Facebook</a>
-    </li>
-    <li>
-      <a href="https://www.flickr.com/help/terms">AGBs</a> und <a href="https://www.flickr.com/help/privacy">Datenschutz</a> von <a href="https://www.flickr.com/">Flickr</a>
-    </li>
-    <li>
-      <a href="https://support.giphy.com/hc/en-us/articles/360020027752-GIPHY-Terms-of-Service">AGBs</a> und <a href="https://support.giphy.com/hc/en-us/articles/360032872931">Datenschutz</a> von <a href="https://giphy.com/">GIPHY</a>
-    </li>
-    <li>
-      <a href="https://help.meetup.com/hc/de/articles/360027447252">AGBs</a> und <a href="https://www.meetup.com/de-DE/privacy/">Datenschutz</a> von <a href="https://www.meetup.com/">Meetup</a>
-    </li>
-    <li>
-      <a href="https://www.mixcloud.com/terms/">AGBs</a> und <a href="https://www.mixcloud.com/privacy/">Datenschutz</a> von <a href="https://mixcloud.com/">MixCloud</a>
-    </li>
-    <li>
-      <a href="https://www.redditinc.com/policies/user-agreement">AGBs</a> und <a href="https://www.redditinc.com/policies/privacy-policy">Datenschutz</a> von <a href="https://reddit.com/">Reddit</a>
-    </li>
-    <li>
-      <a href="https://www.linkedin.com/legal/user-agreement">AGBs</a> und <a href="https://www.linkedin.com/legal/privacy-policy">Datenschutz</a> von <a href="https://www.slideshare.net/">SlideShare</a>
-    </li>
-    <li>
-      <a href="https://soundcloud.com/terms-of-use">AGBs</a> und <a href="https://soundcloud.com/pages/privacy">Datenschutz</a> von <a href="https://soundcloud.com/">SoundCloud</a>
-    </li>
-    <li>
-      <a href="https://www.twitch.tv/p/legal/terms-of-service/">AGBs</a> und <a href="https://www.twitch.tv/p/legal/privacy-notice/">Datenschutz</a> von <a href="https://www.twitch.tv/">Twitch</a>
-    </li>
-    <li>
-      <a href="https://twitter.com/de/tos">AGBs</a> und <a href="https://twitter.com/de/privacy">Datenschutz</a> von <a href="https://www.twitter.com/">Twitter</a>
-    </li>
-    <li>
-      <a href="https://vimeo.com/terms">AGBs</a> und <a href="https://vimeo.com/de/features/video-privacy">Datenschutz</a> von <a href="https://vimeo.com/">Vimeo</a>
-    </li>
-    <li>
-      <a href="#sec-youtube">YouTube</a> ist gesondert aufgeführt.
-    </li>
-  </ul>
-  <h4>
-    Rechtsgrundlage
-  </h4>
-  <p>
-    Einwilligung des Nutzers gem. Art. 6 Abs. 1 lit. a) durch Freischalten der Einbettung in den Benutzereinstellungen.
-    Die Einwilligung kann jederzeit in den Benutzereinstellungen widerrufen werden.
-    Durch den Widerruf der Einwilligung wird die Rechtmäßigkeit der aufgrund der Einwilligung bis zum Widerruf erfolgten Verarbeitung nicht berührt.<br>
-  </p>
-  <h3 name="sec-youtube">
-    Youtube-Videos
-  </h3>
-  <h4>
-    Zweck
-  </h4>
-  <p>
-    Freiwillige Einbettung von Youtube-Videos auf unserer Webseite um Videos in der Webseite und nicht in einem neuen Browserfenster darzustellen.<br>
-  </p>
-  <p>
-    Marketing-Cookies werden von Google genutzt, um Nutzer zu tracken. Der Hintergrund ist die Anzeige von personalisierter Werbung, wofür entsprechende Daten gesammelt werden.
-    Wir empfehlen das Netzwerk in den Benutzereinstellungen so zu konfigurieren, dass eingebettete Objekte nicht verwendet werden.
-    Die Inhalte werden dann nicht dargestellt und keine Cookies gespeichert und personenbezogene Daten übertragen.<br>
-  </p>
-  <p>
-    Hier die aktuellsten mitgeltenden <a href="https://policies.google.com/privacy?hl=de&gl=de">Google-Datenschutzbestimmungen</a>.<br>
-  </p>
-  <h4>
-    Personenbezogene Daten
-  </h4>
-  <p>
-    Oben angegebene Daten zum Browserzugriff und die hier folgenden Cookie-Daten mit Details:<br>
-  </p>
-  <table>
-    <thead>
-      <tr>
-        <th>
-          Name
-        </th>
-        <th>
-          Zweck
-        </th>
-        <th>
-          Speicherdauer
-        </th>
-        <th>
-          Typ
-        </th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr>
-        <td>
-          GPS
-        </td>
-        <td>
-          Registriert eine eindeutige ID auf mobilen Geräten, um Tracking basierend auf dem geografischen GPS-Standort zu ermöglichen.
-        </td>
-        <td>
-          30 Minuten
-        </td>
-        <td>
-          HTTP-Cookie
-        </td>
-      </tr>
-      <tr>
-        <td>
-          PREF
-        </td>
-        <td>
-          Registriert eine eindeutige ID, die von Google verwendet wird, um Statistiken dazu, wie der Besucher YouTube-Videos auf verschiedenen Websites nutzt, zu behalten.
-        </td>
-        <td>
-          8 Monate
-        </td>
-        <td>
-          HTTP-Cookie
-        </td>
-      </tr>
-      <tr>
-        <td>
-          VISITOR_INFO1_LIVE
-        </td>
-        <td>
-          Versucht, die Benutzerbandbreite auf Seiten mit integrierten YouTube-Videos zu schätzen.
-        </td>
-        <td>
-          6 Monate
-        </td>
-        <td>
-          HTTP-Cookie
-        </td>
-      </tr>
-      <tr>
-        <td>
-          YSC
-        </td>
-        <td>
-          Registriert eine eindeutige ID, die das Gerät eines wiederkehrenden Benutzers identifiziert. Die ID wird für gezielte Werbung genutzt.
-        </td>
-        <td>
-          Sitzungsende
-        </td>
-        <td>
-          HTTP-Cookie
-        </td>
-      </tr>
-      <tr>
-        <td>
-          yt-player-bandwith
-        </td>
-        <td>
-          Wird verwendet, um die optimale Videoqualität basierend auf den Geräte- und Netzwerkeinstellungen des Besuchers zu bestimmen.
-        </td>
-        <td>
-          Dauerhaft
-        </td>
-        <td>
-          Local Storage
-        </td>
-      </tr>
-      <tr>
-        <td>
-          yt-player-headers-readable
-        </td>
-        <td>
-          Sammelt Daten zur Besucherinteraktion mit dem Video-Inhalt der Webseite – Diese Daten werden verwendet, um den Video-Inhalt der Webseite für den Besucher relevanter zu machen.
-        </td>
-        <td>
-          Dauerhaft
-        </td>
-        <td>
-          Local Storage
-        </td>
-      </tr>
-      <tr>
-        <td>
-          yt-remote-connected-devices
-        </td>
-        <td>
-          Speichert die Benutzereinstellungen beim Abruf eines auf anderen Webseiten integrierten Youtube-Videos.
-        </td>
-        <td>
-          Dauerhaft
-        </td>
-        <td>
-          Local Storage
-        </td>
-      </tr>
-      <tr>
-        <td>
-          yt-remote-device-id
-        </td>
-        <td>
-          Speichert die Benutzereinstellungen beim Abruf eines auf anderen Webseiten integrierten Youtube-Videos.
-        </td>
-        <td>
-          Dauerhaft
-        </td>
-        <td>
-          Local Storage
-        </td>
-      </tr>
-      <tr>
-        <td>
-          yt-remote-fast-check-period
-        </td>
-        <td>
-          Speichert die Benutzereinstellungen beim Abruf eines auf anderen Webseiten integrierten Youtube-Videos.
-        </td>
-        <td>
-          Sitzungsende
-        </td>
-        <td>
-          Session Storage
-        </td>
-      </tr>
-      <tr>
-        <td>
-          yt-remote-session-app
-        </td>
-        <td>
-          Speichert die Benutzereinstellungen beim Abruf eines auf anderen Webseiten integrierten Youtube-Videos.
-        </td>
-        <td>
-          Sitzungsende
-        </td>
-        <td>
-          Session Storage
-        </td>
-      </tr>
-      <tr>
-        <td>
-          yt-remote-session-name
-        </td>
-        <td>
-          Speichert die Benutzereinstellungen beim Abruf eines auf anderen Webseiten integrierten Youtube-Videos.
-        </td>
-        <td>
-          Sitzungsende
-        </td>
-        <td>
-          Session Storage
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <h4>
-    Speicherdauer
-  </h4>
-  <p>
-    Datails siehe oben.<br>
-  </p>
-  <h4>
-    Rechtsgrundlage
-  </h4>
-  <p>
-    Die Einwilligung gem. Art. 6 Abs. 1 lit. a) durch Freischalten der Einbettung in den Benutzereinstellungen.
-    Die Einwilligung kann jederzeit in den Benutzereinstellungen widerrufen werden.
-    Durch den Widerruf der Einwilligung wird die Rechtmäßigkeit der aufgrund der Einwilligung bis zum Widerruf erfolgten Verarbeitung nicht berührt.<br>
-  </p>
-  <h4>
-    Empfänger
-  </h4>
-  <p>
-    Der Drittanbieter „Youtube“, der zu der Google LLC., 1600 Amphitheatre Parkway, Mountain View, CA 94043, USA („Google“) gehört.<br>
-  </p>
-  <h4>
-    Drittlandtransfer
-  </h4>
-  <p>
-    Die Daten werden nicht in einem Drittland gespeichert.<br>
-  </p>
-  <h3 name="sec-youtube">
-    Rechte des Betroffenen
-  </h3>
-  <p>
-    Das geltende Datenschutzrecht gewährt Dir gegenüber dem Verantwortlichen hinsichtlich der Verarbeitung Deiner personenbezogenen Daten umfassende Betroffenenrechte (Auskunfts- und Interventionsrechte), über die wir Dich nachstehend informieren:<br>
-  </p>
-  <h4>
-    Auskunftsrecht gemäß Art. 15 DSGVO:
-  </h4>
-  <p>
-    Du hast insbesondere ein Recht auf Auskunft über Deine von uns verarbeiteten personenbezogenen Daten, die Verarbeitungszwecke, die Kategorien der verarbeiteten personenbezogenen Daten, die Empfänger oder Kategorien von Empfängern, gegenüber denen Deine Daten offengelegt wurden oder werden, die geplante Speicherdauer bzw. die Kriterien für die Festlegung der Speicherdauer, das Bestehen eines Rechts auf Berichtigung, Löschung, Einschränkung der Verarbeitung, Widerspruch gegen die Verarbeitung, Beschwerde bei einer Aufsichtsbehörde, die Herkunft Deiner Daten, wenn diese nicht durch uns bei Dir erhoben wurden, das Bestehen einer automatisierten Entscheidungsfindung einschließlich Profiling und ggf. aussagekräftige Informationen über die involvierte Logik und die Dich betreffende Tragweite und die angestrebten Auswirkungen einer solchen Verarbeitung, sowie Dein Recht auf Unterrichtung, welche Garantien gemäß Art. 46 DSGVO bei Weiterleitung Deiner Daten in Drittländer bestehen;<br>
-  </p>
-  <h4>
-    Recht auf Berichtigung gemäß Art. 16 DSGVO:
-  </h4>
-  <p>
-    Du hast ein Recht auf unverzügliche Berichtigung Dich betreffender unrichtiger Daten und/oder Vervollständigung Deiner bei uns gespeicherten unvollständigen Daten;<br>
-  </p>
-  <h4>
-    Recht auf Löschung gemäß Art. 17 DSGVO:
-  </h4>
-  <p>
-    Du hast das Recht, die Löschung Deiner personenbezogenen Daten bei Vorliegen der Voraussetzungen des Art. 17 Abs. 1 DSGVO zu verlangen.
-    Dieses Recht besteht jedoch insbesondere dann nicht, wenn die Verarbeitung zur Ausübung des Rechts auf freie Meinungsäußerung und Information, zur Erfüllung einer rechtlichen Verpflichtung, aus Gründen des öffentlichen Interesses oder zur Geltendmachung, Ausübung oder Verteidigung von Rechtsansprüchen erforderlich ist.<br>
-  </p>
-  <h4>
-    Recht auf Einschränkung der Verarbeitung gemäß Art. 18 DSGVO:
-  </h4>
-  <p>
-    Du hast das Recht, die Einschränkung der Verarbeitung Deiner personenbezogenen Daten zu verlangen, solange die von Dir bestrittene Richtigkeit Deiner Daten überprüft wird, wenn Du eine Löschung Deiner Daten wegen unzulässiger Datenverarbeitung ablehnst und stattdessen die Einschränkung der Verarbeitung Deiner Daten verlangst, wenn Du Deine Daten zur Geltendmachung, Ausübung oder Verteidigung von Rechtsansprüchen benötigst, nachdem wir diese Daten nach Zweckerreichung nicht mehr benötigen oder wenn Du Widerspruch aus Gründen Deiner besonderen Situation eingelegt habst, solange noch nicht feststeht, ob unsere berechtigten Gründe überwiegen.<br>
-  </p>
-  <h4>
-    Recht auf Unterrichtung gemäß Art. 19 DSGVO:
-  </h4>
-  <p>
-    Hast Du das Recht auf Berichtigung, Löschung oder Einschränkung der Verarbeitung gegenüber dem Verantwortlichen geltend gemacht, ist dieser verpflichtet, allen Empfängern, denen die Dich betreffenden personenbezogenen Daten offengelegt wurden, diese Berichtigung oder Löschung der Daten oder Einschränkung der Verarbeitung mitzuteilen, es sei denn, dies erweist sich als unmöglich oder ist mit einem unverhältnismäßigen Aufwand verbunden.
-    Dir steht das Recht zu, über diese Empfänger unterrichtet zu werden.<br>
-  </p>
-  <h4>
-    Recht auf Datenübertragbarkeit gemäß Art. 20 DSGVO:
-  </h4>
-  <p>
-    Du hast das Recht, Deine personenbezogenen Daten, die Du uns bereitgestellt habst, in einem strukturierten, gängigen und maschinenlesebaren Format zu erhalten oder die Übermittlung an einen anderen Verantwortlichen zu verlangen, soweit dies technisch machbar is.<br>
-  </p>
-  <h4>
-    Recht auf Widerruf erteilter Einwilligungen gemäß Art. 7 Abs. 3 DSGVO:
-  </h4>
-  <p>
-    Du hast das Recht, eine einmal erteilte Einwilligung in die Verarbeitung von Daten jederzeit mit Wirkung für die Zukunft zu widerrufen.
-    Im Falle des Widerrufs werden wir die betroffenen Daten unverzüglich löschen, sofern eine weitere Verarbeitung nicht auf eine Rechtsgrundlage zur einwilligungslosen Verarbeitung gestützt werden kann.
-    Durch den Widerruf der Einwilligung wird die Rechtmäßigkeit der aufgrund der Einwilligung bis zum Widerruf erfolgten Verarbeitung nicht berührt.<br>
-  </p>
-  <h4>
-    Recht auf Beschwerde gemäß Art. 77 DSGVO:
-  </h4>
-  <p>
-    Wenn Du der Ansicht bist, dass die Verarbeitung der Dich betreffenden personenbezogenen Daten gegen die DSGVO verstößt, hast Du – unbeschadet eines anderweitigen verwaltungsrechtlichen oder gerichtlichen Rechtsbehelfs – das Recht auf Beschwerde bei einer Aufsichtsbehörde, insbesondere in dem Mitgliedstaat Deines Aufenthaltsortes, Deines Arbeitsplatzes oder des Ortes des mutmaßlichen Verstoßes.<br>
-  </p>
-  <h4>
-    WIDERSPRUCHSRECHT
-  </h4>
-  <p>
-    WENN WIR IM RAHMEN EINER INTERESSENABWÄGUNG IHRE PERSONENBEZOGENEN DATEN AUFGRUND UNSERES ÜBERWIEGENDEN BERECHTIGTEN INTERESSES VERARBEITEN, HAST DU DAS JEDERZEITIGE RECHT, AUS GRÜNDEN, DIE SICH AUS DEINER BESONDEREN SITUATION ERGEBEN, GEGEN DIESE VERARBEITUNG WIDERSPRUCH MIT WIRKUNG FÜR DIE ZUKUNFT EINZULEGEN.<br>
-    MACHST DU VON DEINEM WIDERSPRUCHSRECHT GEBRAUCH, BEENDEN WIR DIE VERARBEITUNG DER BETROFFENEN DATEN.
-    EINE WEITERVERARBEITUNG BLEIBT ABER VORBEHALTEN, WENN WIR ZWINGENDE SCHUTZWÜRDIGE GRÜNDE FÜR DIE VERARBEITUNG NACHWEISEN KÖNNEN, DIE DEINE INTERESSEN, GRUNDRECHTE UND GRUNDFREIHEITEN ÜBERWIEGEN, ODER WENN DIE VERARBEITUNG DER GELTENDMACHUNG, AUSÜBUNG ODER VERTEIDIGUNG VON RECHTSANSPRÜCHEN DIENT.<br>
-  </p>
-  <p>
-    WERDEN DEINE PERSONENBEZOGENEN DATEN VON UNS VERARBEITET, UM DIREKTWERBUNG ZU BETREIBEN, HAST DU DAS RECHT, JEDERZEIT WIDERSPRUCH GEGEN DIE VERARBEITUNG SIE BETREFFENDER PERSONENBEZOGENER DATEN ZUM ZWECKE DERARTIGER WERBUNG EINZULEGEN.
-    DU KANNST DEN WIDERSPRUCH WIE OBEN BESCHRIEBEN AUSÜBEN.<br>
-  </p>
-  <p>
-    MACHST DU VON DEINEM WIDERSPRUCHSRECHT GEBRAUCH, BEENDEN WIR DIE VERARBEITUNG DER BETROFFENEN DATEN ZU DIREKTWERBEZWECKEN.<br>
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/templates/locales/html/hc-y2020/de/terms-and-conditions.html b/deployment/configurations/example/branding/templates/locales/html/hc-y2020/de/terms-and-conditions.html
deleted file mode 100644
index fe02cdab5..000000000
--- a/deployment/configurations/example/branding/templates/locales/html/hc-y2020/de/terms-and-conditions.html
+++ /dev/null
@@ -1,136 +0,0 @@
-<!-- this file is a template for rebranding of 'branding/locales/html/de/terms-and-conditions.html' -->
-
-<!-- template for the 'Terms And Conditions' from the old HC network. in the old repo you will find other languages as well -->
-
-<div class="info-page">
-  <h2>
-    Für das soziale Netzwerk {{ organization }}
-  </h2>
-  <h3>
-    Nutzungsbedingungen
-  </h3>
-  <p>
-    Die folgenden Nutzungsbedingungen sind Basis für die Nutzung unseres {{ networkName }} Netzwerkes.
-    Beim Registrieren musst Du diese anerkennen und wir werden Dich auch später über ggf. stattfindende Änderungen informieren.
-    Unser Netzwerk wird in der {{ organizationLocation }} betrieben und unterliegt daher {{ organizationLocation2 }} Recht.
-    Gerichtsstand ist {{ legacyLocation }}.
-    Zu Details schau in unser Impressum: <a href="https://{{ networkURL }}/imprint/" target="_blank" >https://{{ networkURL }}/imprint/</a>.<br>
-  </p>
-  <h3>
-    Nutzung und Lizenz
-  </h3>
-  <p>
-    Sind Inhalte, die Du bei uns einstellst, durch Rechte am geistigen Eigentum geschützt, erteilst Du uns eine nicht-exklusive, übertragbare, unterlizenzierbare und weltweite Lizenz für die Nutzung dieser Inhalte für die Bereitstellung in unserem Netzwerk.
-    Diese Lizenz endet, sobald Du Deine Inhalte oder Deinen ganzen Account löscht.
-    Bedenke, dass andere Deine Inhalte weiter teilen können und wir diese nicht löschen können.<br>
-  </p>
-  <h3>
-    Datenschutz
-  </h3>
-  <p>
-    Unser Netzwerk ist ein soziales Wissens- und Aktionsnetzwerk.
-    Daher ist es uns besonders wichtig, dass möglichst viele Inhalte öffentlich zugänglich sind.
-    Im Laufe der Entwicklung unseres Netzwerkes wird es mehr und mehr die Möglichkeit geben, über die Sichtbarkeit der selbst angegebenen bzw. persönlichen Daten zu entscheiden.
-    Über diese neuen Funktionen werden wir Euch informieren.
-    Ansonsten gilt, dass Du immer darüber nachdenken solltest, welche persönlichen Daten Du über Dich (oder andere) preisgibst.
-    Dies gilt insbesondere für Inhalte von Beiträgen und Kommentaren, da diese einen weitgehend öffentlichen Charakter haben.
-    Später wird es Möglichkeiten geben, die Sichtbarkeit Deines Profils einzuschränken.
-    Teil der Nutzungsbedingungen ist unsere Datenschutzerklärung, die Dich über die einzelnen Datenverarbeitungen in unserem Netzwerk informiert: <a href="https://{{ networkURL }}/data-privacy" target="_blank">https://{{ networkURL }}/data-privacy</a>.
-    Unsere Datenschutzerklärung ist an die Gesetzeslage und die Charakteristika unseres Netzwerks angepasst und gilt immer in der aktuellsten Version.<br>
-  </p>
-  <h3>
-    Verhaltenscodex
-  </h3>
-  <p>
-    Unser Verhaltenskodex dient als Leitfaden für das persönliche Auftreten und den Umgang miteinander.
-    Wer als Nutzer im {{ networkName }} Netzwerk aktiv ist, Beiträge verfasst, kommentiert oder mit anderen Nutzern, auch außerhalb des Netzwerkes, Kontakt aufnimmt, erkennt diese Verhaltensregeln als verbindlich an. <a href="https://{{ networkURL }}/code-of-conduct" target="_blank">https://{{ networkURL }}/code-of-conduct</a><br>
-  </p>
-  <h3>
-    Moderation
-  </h3>
-  <p>
-    Bis unsere finanziellen Möglichkeiten uns erlauben, das Community-Moderationssystem zu implementieren, moderieren wir mit einem vereinfachten System und eigenen bzw. ggf. ehrenamtlichen Mitarbeitern.
-    Wir schulen diese Moderatoren und aus diesem Grund treffen auch nur diese entsprechende Entscheidungen.
-    Diese Moderatoren führen Ihre Tätigkeit anonym aus.
-    Du kannst uns Beiträge, Kommentare und auch Nutzer melden (wenn diese zum Beispiel in ihrem Profil Angaben machen oder Bilder haben, die diese Nutzungsbedingungen verletzen).
-    Wenn Du uns etwas meldest, kannst Du einen Meldegrund angeben und noch eine kurze Erläuterung mitgeben.
-    Wir schauen uns dann das Gemeldete an und sanktionieren ggf., z.B. indem wir Beiträge, Kommentare oder Nutzer sperren.
-    Du und auch der Betroffene erhalten derzeitig von uns leider noch keine Rückmeldung, das ist aber in Planung.
-    Unabhängig davon behalten wir uns prinzipiell Sanktionen vor aus Gründen, die unter Umständen nicht oder noch nicht in unserem Verhaltenscodex oder diesen Nutzungsbedingungen aufgeführt sind.<br>
-  </p>
-  <h3>
-    Fehler und Rückmeldungen
-  </h3>
-  <p>
-    Wir sind sehr bemüht, unser Netzwerk und unsere Daten sicher und abrufbar zu erhalten.
-    Jede neue Version der Software durchläuft sowohl automatisierte als auch manuelle Tests.
-    Es können jedoch unvorhergesehene Fehler auftreten.
-    Deshalb sind wir dankbar für jeden gemeldeten Fehler.
-    Du kannst gerne jeden von Dir entdeckten Fehler dem Support/der Hilfe-Assistenz mitteilen: <a href="https://{{ networkURL }}/support" target="_blank">https://{{ networkURL }}/support</a>.<br>
-  </p>
-  <h3>
-    Keine kommerzielle Nutzung
-  </h3>
-  <p>
-    Die Nutzung des {{ networkName }} Netzwerkes ist nicht für kommerzielle Zwecke gestattet.
-    Darunter fällt unter anderem das Bewerben von Produkten mit kommerzieller Absicht, das Einstellen von Affiliate-Links (Geschäftspartner-Links), direkter Aufruf zu Spenden oder finanzieller Unterstützung für Zwecke, die steuerlich nicht als gemeinnützig anerkannt sind.<br>
-  </p>
-  <h3>
-    Keine politische Nutzung
-  </h3>
-  <p>
-    Nutzerkonten von politischen Parteien oder offizielle Nutzerkonten eines politischen Vertreters sind unzulässig.<br>
-  </p>
-  <h3>
-    Hilfe und Fragen
-  </h3>
-  <p>
-    Für Hilfe und Fragen haben wir Dir eine umfassende Sammlung an häufig gestellten Fragen und Antworten (FAQ) zusammengestellt; Du findest diese auf <a href="https://{{ networkURL }}/faq" target="_blank">https://{{ networkURL }}/faq</a>.<br>
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/templates/locales/html/hc-y2020/en/code-of-conduct.html b/deployment/configurations/example/branding/templates/locales/html/hc-y2020/en/code-of-conduct.html
deleted file mode 100644
index 682b8d491..000000000
--- a/deployment/configurations/example/branding/templates/locales/html/hc-y2020/en/code-of-conduct.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!-- this file is a template for rebranding of 'branding/locales/html/en/code-of-conduct.html' -->
-
-<!-- template for the 'Code Of Conduct' from the old HC network. in the old repo you will find other languages as well -->
-
-<div class="info-page">
-  <h2>
-    For the social network of {{ organization }}
-  </h2>
-  <h3>
-    Präambel
-  </h3>
-  <p>
-    {{ networkName }} is a non-profit social knowledge and action network of the next generation.
-    By people - for people. Free software, open source, fair and transparent.
-    For positive local and global change in all areas of life.
-    We completely redesign the public exchange of knowledge, ideas and projects.
-    The functions of {{ networkName }} bring people together - offline and online - so that we can make the  world a better place.<br>
-  </p>
-  <h3>
-    Purpose
-  </h3>
-  <p>
-    With these code of conduct we regulate the essential principles for behavior in our social network.
-    The United Nations Charter of Human Rights is our orientation and forms the heart of our understanding of values.
-    The code of conduct serves as guiding principles for our personal appearance and interaction with one another.
-    Anyone who is active as a user in the {{ networkName }} Network, writes articles, comments or contacts other users, including those outside the network,acknowledges these rules of conduct as binding.<br>
-  </p>
-  <h3>
-    Expected Behaviour
-  </h3>
-  <p>
-    The following behaviors are expected and requested of all community members:<br>
-  </p>
-  <ul>
-    <li>
-      Exercise consideration and respect in your speech and actions.
-    </li>
-    <li>
-      Attempt collaboration before conflict.
-    </li>
-    <li>
-      Refrain from demeaning, discriminatory, or harassing behavior and speech.
-    </li>
-    <li>
-      Be mindful of your surroundings and of your fellow participants.
-      Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
-    </li>
-  </ul>
-  <h3>
-    Unacceptable Behavior
-  </h3>
-  <p>
-    The following behaviors are unacceptable within our community:<br>
-  </p>
-  <ul>
-    <li>
-      Discriminatory posts, comments, utterances or insults, particularly those relating to gender, sexual orientation, race, religion, political or philosophical orientation or disability.
-    </li>
-    <li>
-      Posting or linking of clearly pornographic material.
-    </li>
-    <li>
-      Glorification or trivialization of cruel or inhuman acts of violence.
-    </li>
-    <li>
-      The disclosure of others' personal information without their consent or threat there of ("doxing").
-    </li>
-    <li>
-      Intentional intimidation, stalking or persecution.
-    </li>
-    <li>
-      Advertising products and services with commercial intent.
-    </li>
-    <li>
-      Criminal behavior or violation of German law.
-    </li>
-    <li>
-      Endorse or encourage such conduct.
-    </li>
-  </ul>
-  <h3>
-    Consequences of Unacceptable Behavior
-  </h3>
-  <p>
-    If a community member exhibits unacceptable behaviour, the responsible operators, moderators and administrators of the network may take appropriate measures, including but not limited to:<br>
-  </p>
-  <ul>
-    <li>
-      Request for immediate cessation of unacceptable conduct
-    </li>
-    <li>
-      Locking or deleting comments
-    </li>
-    <li>
-      Temporary exclusion from the respective post or contribution
-    </li>
-    <li>
-      Blocking or deleting of content
-    </li>
-    <li>
-      Temporary withdrawal of write permissions
-    </li>
-    <li>
-      Temporary exclusion from the network
-    </li>
-    <li>
-      Final exclusion from the network
-    </li>
-    <li>
-      Violations of German law can be reported.
-    </li>
-  </ul>
-  <p>
-    If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible and link or refer to the corresponding content.
-    Please click on the three dots on the post, comment or user and report it using the drop-down menu.<br>
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/branding/templates/locales/html/hc-y2020/en/terms-and-conditions.html b/deployment/configurations/example/branding/templates/locales/html/hc-y2020/en/terms-and-conditions.html
deleted file mode 100644
index 4687b8c45..000000000
--- a/deployment/configurations/example/branding/templates/locales/html/hc-y2020/en/terms-and-conditions.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!-- this file is a template for rebranding of 'branding/locales/html/en/terms-and-conditions.html' -->
-
-<!-- template for the 'Terms And Conditions' from the old HC network. in the old repo you will find other languages as well -->
-
-<div class="info-page">
-  <h2>
-    For the social network of {{ organization }}
-  </h2>
-  <h3>
-    Terms of Service
-  </h3>
-  <p>
-    The following terms of use form the basis for the use of our network.
-    When you register, you must accept them and we will inform you later about any changes that may take place.
-    The {{ networkName }} Network is operated in Germany and is therefore subject to German law.
-    Place of jurisdiction is {{ organizationLocation }}.
-    For details see our imprint: <a href="https://{{ networkURL }}/imprint/" target="_blank" >https://{{ networkURL }}/imprint/</a><br>
-  </p>
-  <h3>
-    Use and License
-  </h3>
-  <p>
-    If any content you post to us is protected by intellectual property rights, you grant us a non-exclusive, transferable, sublicensable, worldwide license to use such content for posting to our network.
-    This license expires when you delete your content or your entire account.
-    Remember that others may share your content and we cannot delete it.<br>
-  </p>
-  <h3>
-    Privacy Statement
-  </h3>
-  <p>
-    Our network is a social knowledge and action network.
-    It is therefore particularly important to us that as much content as possible is publicly accessible.
-    In the course of the development of our network there will be more and more the possibility to decide about the visibility of the personal data.
-    We will inform you about these new features.
-    Otherwise, you should always think about which personal data you disclose about yourself (or others).
-    This applies in particular to the content of posts and comments, as these have a largely public character.
-    Later there will be possibilities to limit the visibility of your profile.
-    Part of the terms of service is our privacy statement, which informs you about the individual data processing operations in our network: <a href="https://{{ networkURL }}/data-privacy" target="_blank">https://{{ networkURL }}/data-privacy</a>.
-    Our privacy statement is adapted to the legal situation and characteristics of our network and is always valid in the most current version.<br>
-  </p>
-  <h3>
-    Code of Conduct
-  </h3>
-  <p>
-    Our code of conduct serves as a handbook for personal appearance and interaction with each other.
-    Whoever is active as a user in the {{ networkName }} network, writes articles, comments or makes contact with other users, even outside the network, acknowledges these rules of conduct as binding. <a href="https://{{ networkURL }}/code-of-conduct" target="_blank">https://{{ networkURL }}/code-of-conduct</a><br>
-  </p>
-  <h3>
-    Moderation
-  </h3>
-  <p>
-    Until our financial possibilities allow us to implement the community moderation system, we moderate with a simplified system and with our own or possibly volunteer staff.
-    We train these moderators and for this reason only they make the appropriate decisions.
-    These moderators carry out their work anonymously.
-    You can report posts, comments and users to us (for example, if they provide information in their profile or have images that violate these Terms of Use).
-    If you report something to us, you can give us a reason and a short explanation.
-    We will then take a look at what you have reported and sanction you if necessary, e.g. by blocking contributions, comments or users.
-    Unfortunately, you and the person concerned will not receive any feedback from us at this time, but this is in the planning stage.
-    Irrespective of this, we reserve the right to impose sanctions in principle for reasons that may not or not yet be listed in our Code of Conduct or these terms of service.<br>
-  </p>
-  <h3>
-    Errors and Feedback
-  </h3>
-  <p>
-    We make every effort to keep our network and data secure and available.
-    Each new release of the software goes through both automated and manual testing.
-    However, unforeseen errors may occur. Therefore, we are grateful for any reported bugs.
-    You are welcome to report any bugs you discover by emailing Support at <a href="https://{{ networkURL }}/support" target="_blank">https://{{ networkURL }}/support</a><br>
-  </p>
-  <h3>
-    No Commercial Use
-  </h3>
-  <p>
-    The use of the {{ networkName }} Network is not permitted for commercial purposes.
-    This includes, but is not limited to, advertising products with commercial intent, posting affiliate links, directly soliciting donations, or providing financial support for purposes that are not recognized as charitable for tax purposes.<br>
-  </p>
-  <h3>
-    No Political Use
-  </h3>
-  <p>
-    User accounts of political parties or official user accounts of a political representative are not permitted.<br>
-  </p>
-  <h3>
-    Help and Questions
-  </h3>
-  <p>
-    For help and questions we have compiled a comprehensive collection of frequently asked questions and answers (FAQ) for you. You can find them here: <a href="https://{{ networkURL }}/faq" target="_blank">https://{{ networkURL }}/faq</a><br>
-  </p>
-</div>
-
-<style type="text/css">
-  .info-page {
-    margin-bottom: 48px;
-  }
-
-  .info-page h2 {
-    margin: 24px 0;
-  }
-
-  .info-page h3 {
-    margin: 24px 0 16px 0;
-  }
-
-  .info-page h4 {
-    margin: 16px 0 8px 0;
-  }
-
-  .info-page p {
-    margin: 8px 0;
-  }
-
-  .info-page ul {
-    list-style-type: disc;
-    margin: 16px 0 16px 14px;
-  }
-
-  .info-page table {
-    background-color: #fff;
-    border: 1px solid #e0dede;
-    border-collapse: collapse;
-    box-shadow: 0 1px 3px rgba(0,0,0,.08),inset 0 0 0 1px rgba(255,255,255,.5);
-    margin: 16px 0;
-    max-width: 100%;
-  }
-
-  .info-page table thead {
-    background-color: #f0f0f0;
-  }
-
-  .info-page table td,
-  .info-page table th {
-    border: 1px solid #e0dede;
-    padding: 10px;
-  }
-</style>
diff --git a/deployment/configurations/example/kubernetes/dns.values.template.yaml b/deployment/configurations/example/kubernetes/dns.values.template.yaml
deleted file mode 100644
index 09539e37e..000000000
--- a/deployment/configurations/example/kubernetes/dns.values.template.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-# please duplicate template file and rename to "dns.values.yaml" and fill in your value
-
-provider: digitalocean
-digitalocean:
-  # create the API token at https://cloud.digitalocean.com/account/api/tokens
-  # needs read + write
-  apiToken: "TODO"
-domainFilters:
-  # domains you want external-dns to be able to edit
-  - TODO.TODO
-rbac:
-  create: true
\ No newline at end of file
diff --git a/deployment/configurations/example/kubernetes/values.template.yaml b/deployment/configurations/example/kubernetes/values.template.yaml
deleted file mode 100644
index 86c02310c..000000000
--- a/deployment/configurations/example/kubernetes/values.template.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-# please duplicate template file and rename to "values.yaml" and fill in your value
-
-# change all the below if needed
-MAPBOX_TOKEN: "pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g"
-PRODUCTION_DB_CLEAN_ALLOW: false # only true for production environments on staging servers
-PUBLIC_REGISTRATION: false
-INVITE_REGISTRATION: false
-COOKIE_EXPIRE_TIME: 730 # days (730 days, two years is the default in main code)
-CATEGORIES_ACTIVE: false
-
-BACKEND:
-  # change all the below if needed
-  # DOCKER_IMAGE_REPO - change that to your branded docker image
-  #  label is appended based on .Chart.appVersion
-  DOCKER_IMAGE_REPO: "ocelotsocialnetwork/backend-branded"
-  CLIENT_URI: "https://staging.ocelot.social"
-  # create a new one for your network
-  JWT_SECRET: "b/&&7b78BF&fv/Vd"
-  PRIVATE_KEY_PASSPHRASE: "a7dsf78sadg87ad87sfagsadg78"
-  # ocelot.social mail dummy
-  EMAIL_DEFAULT_SENDER: "devops@ocelot.social"
-  SMTP_HOST: "mail.ocelot.social"
-  SMTP_USERNAME: "devops@ocelot.social"
-  SMTP_PASSWORD: "devops@ocelot.social"
-  SMTP_PORT: "587"
-  SMTP_IGNORE_TLS: 'false'
-  SMTP_SECURE: 'false' # true for 465, false for other ports
-  # or
-  # SMTP_PORT: "465"
-  # SMTP_IGNORE_TLS: 'true'
-  # SMTP_SECURE: 'true' # true for 465, false for other ports
-
-  # most likely you don't need to change this
-  MIN_READY_SECONDS: "15"
-  PROGRESS_DEADLINE_SECONDS: "60"
-  REVISIONS_HISTORY_LIMIT: "25"
-  CONTAINER_RESTART_POLICY: "Always"
-  CONTAINER_TERMINATION_GRACE_PERIOD_SECONDS: "30"
-  DOCKER_IMAGE_PULL_POLICY: "Always"
-  STORAGE_UPLOADS: "25Gi"
-
-WEBAPP:
-  # change all the below if needed
-  # DOCKER_IMAGE_REPO - change that to your branded docker image
-  #  label is appended based on .Chart.appVersion
-  DOCKER_IMAGE_REPO: "ocelotsocialnetwork/webapp-branded"
-  WEBSOCKETS_URI: "wss://staging.ocelot.social/api/graphql"
-
-  # Most likely you don't need to change this
-  REPLICAS: "2"
-  MIN_READY_SECONDS: "15"
-  PROGRESS_DEADLINE_SECONDS: "60"
-  REVISIONS_HISTORY_LIMIT: "25"
-  CONTAINER_RESTART_POLICY: "Always"
-  CONTAINER_TERMINATION_GRACE_PERIOD_SECONDS: "30"
-  DOCKER_IMAGE_PULL_POLICY: "Always"
-
-NEO4J:
-  # most likely you don't need to change this
-  REVISIONS_HISTORY_LIMIT: "25"
-  DOCKER_IMAGE_REPO: "ocelotsocialnetwork/neo4j-community-branded"
-  DOCKER_IMAGE_PULL_POLICY: "Always"
-  CONTAINER_RESTART_POLICY: "Always"
-  CONTAINER_TERMINATION_GRACE_PERIOD_SECONDS: "30"
-  STORAGE: "5Gi"
-  # RESOURCE_REQUESTS_MEMORY configures the memory available for requests.
-  RESOURCE_REQUESTS_MEMORY: "2G"
-  # RESOURCE_LIMITS_MEMORY configures the memory limits available.
-  RESOURCE_LIMITS_MEMORY: "4G"
-  # required for Neo4j Enterprice version
-  #ACCEPT_LICENSE_AGREEMENT: "yes"
-  ACCEPT_LICENSE_AGREEMENT: "no"
-  AUTH: "none"
-  #DBMS_CONNECTOR_BOLT_THREAD_POOL_MAX_SIZE: "10000" # hc value
-  DBMS_CONNECTOR_BOLT_THREAD_POOL_MAX_SIZE: "400" # default value
-  #DBMS_MEMORY_HEAP_INITIAL_SIZE: "500MB" # HC value
-  DBMS_MEMORY_HEAP_INITIAL_SIZE: "" # default
-  #DBMS_MEMORY_HEAP_MAX_SIZE: "500MB" # HC value
-  DBMS_MEMORY_HEAP_MAX_SIZE: "" # default
-  #DBMS_MEMORY_PAGECACHE_SIZE: "490M" # HC value
-  DBMS_MEMORY_PAGECACHE_SIZE: "" # default
-  #APOC_IMPORT_FILE_ENABLED: "true" # HC value
-  APOC_IMPORT_FILE_ENABLED: "false" # default
-  DBMS_SECURITY_PROCEDURES_UNRESTRICTED: "algo.*,apoc.*"
-
-MAINTENANCE:
-  # change all the below if needed
-  # DOCKER_IMAGE_REPO - change that to your branded docker image
-  #  label is appended based on .Chart.appVersion
-  DOCKER_IMAGE_REPO: "ocelotsocialnetwork/maintenance-branded"
-
-  # Most likely you don't need to change this
-  REVISIONS_HISTORY_LIMIT: "25"
-  CONTAINER_RESTART_POLICY: "Always"
-  CONTAINER_TERMINATION_GRACE_PERIOD_SECONDS: "30"
-  DOCKER_IMAGE_PULL_POLICY: "Always"
-
-LETSENCRYPT:
-  # change all the below if needed
-  # ISSUER is used by cert-manager to set up certificates with the given provider.
-  #  change it to "letsencrypt-production" once you are ready to have valid cetrificates.
-  #  Be aware that the is an issuing limit with letsencrypt, so a dry run with staging might be wise
-  ISSUER: "letsencrypt-staging"
-  EMAIL: "devops@ocelot.social"
-  DOMAINS:
-    - "staging.ocelot.social"
-    - "www.staging.ocelot.social"
-
-NGINX:
-  # most likely you don't need to change this
-  PROXY_BODY_SIZE: "10m"
-
-STORAGE:
-  # change all the below if needed
-  PROVISIONER: "dobs.csi.digitalocean.com"
-
-  # most likely you don't need to change this
-  RECLAIM_POLICY: "Retain"
-  VOLUME_BINDING_MODE: "Immediate"
-  ALLOW_VOLUME_EXPANSION: true
\ No newline at end of file

From 36f4e89b80f9dc3e1c9daeac4983f17f5d24ffe9 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 11:01:13 +0100
Subject: [PATCH 52/91] updated stage.ocelot.social submodule reference

---
 deployment/configurations/stage.ocelot.social | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/configurations/stage.ocelot.social b/deployment/configurations/stage.ocelot.social
index 9053fec28..07cafff7f 160000
--- a/deployment/configurations/stage.ocelot.social
+++ b/deployment/configurations/stage.ocelot.social
@@ -1 +1 @@
-Subproject commit 9053fec28b94333d1a58cfa7398b281e2d1e6eb9
+Subproject commit 07cafff7f47547befc74a536caad28e73621c4dd

From 49ed4437f4d84bba2f2e2c09b353e568cf8ba3f9 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 11:01:53 +0100
Subject: [PATCH 53/91] make configuration a mandatory variable

---
 deployment/scripts/branded-images.build.sh | 7 ++++++-
 deployment/scripts/cluster.backup.sh       | 7 ++++++-
 deployment/scripts/cluster.maintenance.sh  | 7 ++++++-
 deployment/scripts/cluster.reseed.sh       | 7 ++++++-
 deployment/scripts/cluster.upgrade.sh      | 7 ++++++-
 deployment/scripts/secret.generate.sh      | 7 ++++++-
 deployment/scripts/secrets.decrypt.sh      | 7 ++++++-
 deployment/scripts/secrets.encrypt.sh      | 7 ++++++-
 8 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/deployment/scripts/branded-images.build.sh b/deployment/scripts/branded-images.build.sh
index 099ba460a..62d2eb4af 100755
--- a/deployment/scripts/branded-images.build.sh
+++ b/deployment/scripts/branded-images.build.sh
@@ -9,8 +9,13 @@
 SCRIPT_PATH=$(realpath $0)
 SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 
+# check CONFIGURATION
+if [ -z ${CONFIGURATION} ]; then
+  echo "You must provide a `CONFIGURATION` via environment variable"
+  exit 1
+fi
+
 # configuration
-CONFIGURATION=${CONFIGURATION:-"example"}
 DOCKERHUB_ORGANISATION=${DOCKERHUB_ORGANISATION:-"ocelotsocialnetwork"}
 OCELOT_VERSION=${OCELOT_VERSION:-$(node -p -e "require('${SCRIPT_DIR}/../../package.json').version")}
 BRANDED_VERSION=${BRANDED_VERSION:-${GITHUB_RUN_NUMBER:-"local"}}
diff --git a/deployment/scripts/cluster.backup.sh b/deployment/scripts/cluster.backup.sh
index b83bab198..7d9cbd44d 100755
--- a/deployment/scripts/cluster.backup.sh
+++ b/deployment/scripts/cluster.backup.sh
@@ -4,8 +4,13 @@
 SCRIPT_PATH=$(realpath $0)
 SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 
+# check CONFIGURATION
+if [ -z ${CONFIGURATION} ]; then
+  echo "You must provide a `CONFIGURATION` via environment variable"
+  exit 1
+fi
+
 # configuration
-CONFIGURATION=${CONFIGURATION:-"example"}
 KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
 BACKUP_DATE=$(date "+%F_%H-%M-%S")
 BACKUP_FOLDER=${BACKUP_FOLDER:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/backup/${BACKUP_DATE}}
diff --git a/deployment/scripts/cluster.maintenance.sh b/deployment/scripts/cluster.maintenance.sh
index 3a558d7bb..1d2d4ecea 100755
--- a/deployment/scripts/cluster.maintenance.sh
+++ b/deployment/scripts/cluster.maintenance.sh
@@ -4,8 +4,13 @@
 SCRIPT_PATH=$(realpath $0)
 SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 
+# check CONFIGURATION
+if [ -z ${CONFIGURATION} ]; then
+  echo "You must provide a `CONFIGURATION` via environment variable"
+  exit 1
+fi
+
 # configuration
-CONFIGURATION=${CONFIGURATION:-"example"}
 KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
 
 case $1 in
diff --git a/deployment/scripts/cluster.reseed.sh b/deployment/scripts/cluster.reseed.sh
index 705e1880a..0f366bec8 100755
--- a/deployment/scripts/cluster.reseed.sh
+++ b/deployment/scripts/cluster.reseed.sh
@@ -4,8 +4,13 @@
 SCRIPT_PATH=$(realpath $0)
 SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 
+# check CONFIGURATION
+if [ -z ${CONFIGURATION} ]; then
+  echo "You must provide a `CONFIGURATION` via environment variable"
+  exit 1
+fi
+
 # configuration
-CONFIGURATION=${CONFIGURATION:-"example"}
 KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
 
 # clean & seed
diff --git a/deployment/scripts/cluster.upgrade.sh b/deployment/scripts/cluster.upgrade.sh
index 1aec2cf18..9374d6955 100755
--- a/deployment/scripts/cluster.upgrade.sh
+++ b/deployment/scripts/cluster.upgrade.sh
@@ -4,8 +4,13 @@
 SCRIPT_PATH=$(realpath $0)
 SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 
+# check CONFIGURATION
+if [ -z ${CONFIGURATION} ]; then
+  echo "You must provide a `CONFIGURATION` via environment variable"
+  exit 1
+fi
+
 # configuration
-CONFIGURATION=${CONFIGURATION:-"example"}
 KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
 VALUES=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubernetes/values.
 DOCKERHUB_OCELOT_TAG=${DOCKERHUB_OCELOT_TAG:-"latest"}
diff --git a/deployment/scripts/secret.generate.sh b/deployment/scripts/secret.generate.sh
index dba958c34..7e8e011d0 100755
--- a/deployment/scripts/secret.generate.sh
+++ b/deployment/scripts/secret.generate.sh
@@ -7,8 +7,13 @@
 SCRIPT_PATH=$(realpath $0)
 SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 
+# check CONFIGURATION
+if [ -z ${CONFIGURATION} ]; then
+  echo "You must provide a `CONFIGURATION` via environment variable"
+  exit 1
+fi
+
 # configuration
-CONFIGURATION=${CONFIGURATION:-"example"}
 SECRET_FILE=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/SECRET
 
 openssl rand -base64 32 > ${SECRET_FILE}
\ No newline at end of file
diff --git a/deployment/scripts/secrets.decrypt.sh b/deployment/scripts/secrets.decrypt.sh
index 283768ad0..f98f77917 100755
--- a/deployment/scripts/secrets.decrypt.sh
+++ b/deployment/scripts/secrets.decrypt.sh
@@ -7,8 +7,13 @@
 SCRIPT_PATH=$(realpath $0)
 SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 
+# check CONFIGURATION
+if [ -z ${CONFIGURATION} ]; then
+  echo "You must provide a `CONFIGURATION` via environment variable"
+  exit 1
+fi
+
 # configuration
-CONFIGURATION=${CONFIGURATION:-"example"}
 SECRET=${SECRET}
 SECRET_FILE=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/SECRET
 FILES=(\
diff --git a/deployment/scripts/secrets.encrypt.sh b/deployment/scripts/secrets.encrypt.sh
index ef6c87e85..fabd91e98 100755
--- a/deployment/scripts/secrets.encrypt.sh
+++ b/deployment/scripts/secrets.encrypt.sh
@@ -7,8 +7,13 @@
 SCRIPT_PATH=$(realpath $0)
 SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 
+# check CONFIGURATION
+if [ -z ${CONFIGURATION} ]; then
+  echo "You must provide a `CONFIGURATION` via environment variable"
+  exit 1
+fi
+
 # configuration
-CONFIGURATION=${CONFIGURATION:-"example"}
 SECRET=${SECRET}
 SECRET_FILE=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/SECRET
 FILES=(\

From f63881060619b2408834ae0d64404c0658bd1b82 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 11:34:33 +0100
Subject: [PATCH 54/91] remove publish-branded workflow, rename build trigger

---
 .github/workflows/publish-branded.yml | 79 ---------------------------
 .github/workflows/publish.yml         | 16 +++---
 2 files changed, 8 insertions(+), 87 deletions(-)
 delete mode 100644 .github/workflows/publish-branded.yml

diff --git a/.github/workflows/publish-branded.yml b/.github/workflows/publish-branded.yml
deleted file mode 100644
index 869eb6302..000000000
--- a/.github/workflows/publish-branded.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-name: publish-branded
-on:
-  repository_dispatch:
-    types: [trigger-build-success]
-jobs:
-  build_branded:
-    name: Docker Build Branded
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.client_payload.ref }}
-      - name: Setup env
-        run: echo "OCELOT_VERSION=${{ github.event.client_payload.BUILD_VERSION }}" >> $GITHUB_ENV
-      - name: Build branded images
-        run: |
-          deployment/scripts/branded-images.build.sh
-          docker save "ocelotsocialnetwork/backend-branded" > /tmp/backend-branded.tar
-          docker save "ocelotsocialnetwork/webapp-branded" > /tmp/webapp-branded.tar
-          docker save "ocelotsocialnetwork/maintenance-branded" > /tmp/maintenance-branded.tar
-
-      - name: Upload Artifact (Backend)
-        uses: actions/upload-artifact@v2
-        with:
-          name: docker-backend-branded
-          path: /tmp/backend-branded.tar
-
-      - name: Upload Artifact (Webapp)
-        uses: actions/upload-artifact@v2
-        with:
-          name: docker-webapp-branded
-          path: /tmp/webapp-branded.tar
-
-      - name: Upload Artifact (Maintenance)
-        uses: actions/upload-artifact@v2
-        with:
-          name: docker-maintenance-branded
-          path: /tmp/maintenance-branded.tar
-
-  upload_to_dockerhub:
-    name: Upload to Dockerhub
-    runs-on: ubuntu-latest
-    needs: [build_branded]
-    env:
-      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ github.event.client_payload.ref }}
-
-      - name: Download Docker Image (Backend)
-        uses: actions/download-artifact@v2
-        with:
-          name: docker-backend-branded
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/backend-branded.tar
-
-      - name: Download Docker Image (Webapp)
-        uses: actions/download-artifact@v2
-        with:
-          name: docker-webapp-branded
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/webapp-branded.tar
-
-      - name: Download Docker Image (Maintenance)
-        uses: actions/download-artifact@v2
-        with:
-          name: docker-maintenance-branded
-          path: /tmp
-      - name: Load Docker Image
-        run: docker load < /tmp/maintenance-branded.tar
-
-      - name: Upload to dockerhub
-        run: deployment/scripts/branded-images.upload.sh
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 18ff7a379..179951fba 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -292,18 +292,18 @@ jobs:
           echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
           echo "BUILD_COMMIT=${GITHUB_SHA}" >> $GITHUB_ENV
       - run: echo "BUILD_VERSION=${VERSION}-${GITHUB_RUN_NUMBER}" >> $GITHUB_ENV
-      - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ github.token }}
-          event-type: trigger-build-success
-          repository: ${{ github.repository }}
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
+      #- name: Repository Dispatch
+      #  uses: peter-evans/repository-dispatch@v2
+      #  with:
+      #    token: ${{ github.token }}
+      #    event-type: trigger-ocelot-build-success
+      #    repository: ${{ github.repository }}
+      #    client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
 
       - name: Repository Dispatch stage.ocelot.social
         uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.OCELOT_PUBLISH_EVENT_PAT }} # this token is required to access the other repository
-          event-type: trigger-build-success
+          event-type: trigger-ocelot-build-success
           repository: 'Ocelot-Social-Community/stage.ocelot.social'
           client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
\ No newline at end of file

From c837e3354a7fe49f16aa22077d517123f7c6bed3 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 11:35:26 +0100
Subject: [PATCH 55/91] update stage.ocelot.social submodule

---
 deployment/configurations/stage.ocelot.social | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/configurations/stage.ocelot.social b/deployment/configurations/stage.ocelot.social
index 07cafff7f..7d2297a98 160000
--- a/deployment/configurations/stage.ocelot.social
+++ b/deployment/configurations/stage.ocelot.social
@@ -1 +1 @@
-Subproject commit 07cafff7f47547befc74a536caad28e73621c4dd
+Subproject commit 7d2297a98ca2d349fd46a365e004a6ca0dbd2114

From 4cfbf772a0251ff5590cf2d51fc8453289e3fd92 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 20 Mar 2023 11:43:51 +0100
Subject: [PATCH 56/91] fix(webapp): small buttons in notifications menu

---
 .../NotificationMenu/NotificationMenu.vue           | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index 7fcfabe82..14441f4cf 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -19,15 +19,15 @@
       <ds-flex class="notifications-link-container">
         <ds-flex-item :width="{ base: 'auto' }" centered>
           <nuxt-link :to="{ name: 'notifications' }">
-            <ds-button ghost primary>
+            <base-button ghost primary>
               {{ $t('notifications.pageLink') }}
-            </ds-button>
+            </base-button>
           </nuxt-link>
         </ds-flex-item>
         <ds-flex-item :width="{ base: 'auto' }" centered>
-          <ds-button ghost primary @click="markAllAsRead" data-test="markAllAsRead-button">
+          <base-button ghost primary @click="markAllAsRead" data-test="markAllAsRead-button">
             {{ $t('notifications.markAllAsRead') }}
-          </ds-button>
+          </base-button>
         </ds-flex-item>
       </ds-flex>
     </template>
@@ -144,16 +144,15 @@ export default {
 <style lang="scss">
 .notifications-menu-popover {
   max-width: 500px;
-  margin-bottom: $size-height-base;
 }
 .notifications-link-container {
   background-color: $background-color-softer-active;
   justify-content: center;
-  position: fixed;
   bottom: 0;
   left: 0;
   right: 0;
-  height: $size-height-base;
+  height: 62px;
   padding: $space-x-small;
+  flex-direction: column;
 }
 </style>

From 76f7362a0a00807d14999d67acb80d37e458e95c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 13:29:19 +0100
Subject: [PATCH 57/91] upgrade script correction

---
 deployment/scripts/cluster.upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/scripts/cluster.upgrade.sh b/deployment/scripts/cluster.upgrade.sh
index 9374d6955..152e76e30 100755
--- a/deployment/scripts/cluster.upgrade.sh
+++ b/deployment/scripts/cluster.upgrade.sh
@@ -12,7 +12,7 @@ fi
 
 # configuration
 KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
-VALUES=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubernetes/values.
+VALUES=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubernetes/values.yaml
 DOCKERHUB_OCELOT_TAG=${DOCKERHUB_OCELOT_TAG:-"latest"}
 
 # upgrade with helm

From a1b12568ef1d486c08e10a1f6892d897d56015d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 20 Mar 2023 13:36:02 +0100
Subject: [PATCH 58/91] Revert PR 'feat(webapp): on newsfeed add bigger y-gap
 between posts' #6121

---
 webapp/components/MasonryGrid/MasonryGrid.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/MasonryGrid/MasonryGrid.vue b/webapp/components/MasonryGrid/MasonryGrid.vue
index f95c0e16e..00afa31af 100644
--- a/webapp/components/MasonryGrid/MasonryGrid.vue
+++ b/webapp/components/MasonryGrid/MasonryGrid.vue
@@ -30,7 +30,7 @@ export default {
 /* dirty fix to override broken styleguide inline-styles */
 .ds-grid {
   grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr)) !important;
-  gap: 32px 16px !important;
+  gap: 16px !important;
   grid-auto-rows: 20px;
 }
 

From e5b8aadbbee40628ae2a7a8a507bc47798db1994 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 13:38:19 +0100
Subject: [PATCH 59/91] missing trailing slash

---
 deployment/scripts/cluster.upgrade.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/scripts/cluster.upgrade.sh b/deployment/scripts/cluster.upgrade.sh
index 152e76e30..f0ae14ba6 100755
--- a/deployment/scripts/cluster.upgrade.sh
+++ b/deployment/scripts/cluster.upgrade.sh
@@ -18,7 +18,7 @@ DOCKERHUB_OCELOT_TAG=${DOCKERHUB_OCELOT_TAG:-"latest"}
 # upgrade with helm
 helm --kubeconfig=${KUBECONFIG} upgrade ocelot \
   --values ${VALUES} \
-  --set appVersion="${DOCKERHUB_OCELOT_TAG}"
+  --set appVersion="${DOCKERHUB_OCELOT_TAG}" \
   ${SCRIPT_DIR}/../src/kubernetes/ \
   --debug \
   --timeout 10m
\ No newline at end of file

From 4f6184401c5cb8409729e6e136c2a18b31adcee8 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 13:38:37 +0100
Subject: [PATCH 60/91] updated stage.ocelot.social repo reference

---
 deployment/configurations/stage.ocelot.social | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/configurations/stage.ocelot.social b/deployment/configurations/stage.ocelot.social
index 7d2297a98..0167a6a7e 160000
--- a/deployment/configurations/stage.ocelot.social
+++ b/deployment/configurations/stage.ocelot.social
@@ -1 +1 @@
-Subproject commit 7d2297a98ca2d349fd46a365e004a6ca0dbd2114
+Subproject commit 0167a6a7eead617cfe832fa7f0df731c3759c48a

From b3f5bf4e6a7e4d0a923de80cbb00b1093db38c3b Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 14:06:10 +0100
Subject: [PATCH 61/91] new migration to create search indexes

---
 backend/src/db/migrate/store.js               |  7 ---
 .../20230320130345-fulltext-search-indexes.js | 54 +++++++++++++++++++
 2 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100644 backend/src/db/migrations/20230320130345-fulltext-search-indexes.js

diff --git a/backend/src/db/migrate/store.js b/backend/src/db/migrate/store.js
index ac762647b..0c0b63943 100644
--- a/backend/src/db/migrate/store.js
+++ b/backend/src/db/migrate/store.js
@@ -86,13 +86,6 @@ class Store {
     if (CONFIG.CATEGORIES_ACTIVE) await createCategories(session)
     const writeTxResultPromise = session.writeTransaction(async (txc) => {
       await txc.run('CALL apoc.schema.assert({},{},true)') // drop all indices and constraints
-      return Promise.all(
-        [
-          'CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"])',
-          'CALL db.index.fulltext.createNodeIndex("post_fulltext_search",["Post"],["title", "content"])',
-          'CALL db.index.fulltext.createNodeIndex("tag_fulltext_search",["Tag"],["id"])',
-        ].map((statement) => txc.run(statement)),
-      )
     })
     try {
       await writeTxResultPromise
diff --git a/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js b/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js
new file mode 100644
index 000000000..3e4866618
--- /dev/null
+++ b/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js
@@ -0,0 +1,54 @@
+import { getDriver } from '../../db/neo4j'
+
+export const description = ''
+
+export async function up(next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+
+  try {
+    // Drop all indexes because due to legacy code they might be set already
+    await transaction.run(`CALL db.index.fulltext.drop("user_fulltext_search")`)
+    await transaction.run(`CALL db.index.fulltext.drop("post_fulltext_search")`)
+    await transaction.run(`CALL db.index.fulltext.drop("tag_fulltext_search")`)
+    // Create indexes
+    await transaction.run(`CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"])`)
+    await transaction.run(`CALL db.index.fulltext.createNodeIndex("post_fulltext_search",["Post"],["title", "content"])`)
+    await transaction.run(`CALL db.index.fulltext.createNodeIndex("tag_fulltext_search",["Tag"],["id"])`)
+    await transaction.commit()
+    next()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+    throw new Error(error)
+  } finally {
+    session.close()
+  }
+}
+
+export async function down(next) {
+  const driver = getDriver()
+  const session = driver.session()
+  const transaction = session.beginTransaction()
+
+  try {
+    await transaction.run(`CALL db.index.fulltext.drop("user_fulltext_search")`)
+    await transaction.run(`CALL db.index.fulltext.drop("post_fulltext_search")`)
+    await transaction.run(`CALL db.index.fulltext.drop("tag_fulltext_search")`)
+    await transaction.commit()
+    next()
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.log(error)
+    await transaction.rollback()
+    // eslint-disable-next-line no-console
+    console.log('rolled back')
+    throw new Error(error)
+  } finally {
+    session.close()
+  }
+}

From 393c657e27baca3b8334e3bf2ca630ffc8eb1b19 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 20 Mar 2023 14:08:32 +0100
Subject: [PATCH 62/91] Add class for the flex items

---
 webapp/components/Dropdown.vue                     |  2 +-
 .../NotificationMenu/NotificationMenu.vue          | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/components/Dropdown.vue b/webapp/components/Dropdown.vue
index 7e4d21223..0dfff3736 100644
--- a/webapp/components/Dropdown.vue
+++ b/webapp/components/Dropdown.vue
@@ -33,7 +33,7 @@ export default {
   data() {
     return {
       isPopoverOpen: false,
-      developerNoAutoClosing: false, // stops automatic closing of menu for developer purposes: default is 'false'
+      developerNoAutoClosing: true, // stops automatic closing of menu for developer purposes: default is 'false'
     }
   },
   computed: {
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index 14441f4cf..d777cfe5f 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -17,14 +17,14 @@
         <notification-list :notifications="notifications" @markAsRead="markAsRead" />
       </div>
       <ds-flex class="notifications-link-container">
-        <ds-flex-item :width="{ base: 'auto' }" centered>
+        <ds-flex-item class="notifications-link-container-item" :width="{ base: '100%' }" centered>
           <nuxt-link :to="{ name: 'notifications' }">
             <base-button ghost primary>
               {{ $t('notifications.pageLink') }}
             </base-button>
           </nuxt-link>
         </ds-flex-item>
-        <ds-flex-item :width="{ base: 'auto' }" centered>
+        <ds-flex-item class="notifications-link-container-item" :width="{ base: '100%' }" centered>
           <base-button ghost primary @click="markAllAsRead" data-test="markAllAsRead-button">
             {{ $t('notifications.markAllAsRead') }}
           </base-button>
@@ -148,11 +148,11 @@ export default {
 .notifications-link-container {
   background-color: $background-color-softer-active;
   justify-content: center;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  height: 62px;
   padding: $space-x-small;
-  flex-direction: column;
+  flex-direction: row;
+}
+.notifications-link-container-item {
+  justify-content: center;
+  display: flex;
 }
 </style>

From 593b81c501a720dd1db674c742329fcc342326f6 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Mon, 20 Mar 2023 14:44:24 +0100
Subject: [PATCH 63/91] fix(webapp): close popover notification menu

---
 webapp/components/NotificationMenu/NotificationMenu.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index 7fcfabe82..ceac606b0 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -12,7 +12,7 @@
         <counter-icon icon="bell" :count="unreadNotificationsCount" danger />
       </base-button>
     </template>
-    <template #popover>
+    <template #popover="{ closeMenu }">
       <div class="notifications-menu-popover">
         <notification-list :notifications="notifications" @markAsRead="markAsRead" />
       </div>
@@ -25,7 +25,7 @@
           </nuxt-link>
         </ds-flex-item>
         <ds-flex-item :width="{ base: 'auto' }" centered>
-          <ds-button ghost primary @click="markAllAsRead" data-test="markAllAsRead-button">
+          <ds-button ghost primary @click="markAllAsRead(closeMenu)" data-test="markAllAsRead-button">
             {{ $t('notifications.markAllAsRead') }}
           </ds-button>
         </ds-flex-item>
@@ -74,11 +74,12 @@ export default {
         this.$toast.error(error.message)
       }
     },
-    async markAllAsRead() {
+    async markAllAsRead(closeMenu) {
       if (!this.hasNotifications) {
         return
       }
 
+      closeMenu()
       try {
         await this.$apollo.mutate({
           mutation: markAllAsReadMutation(this.$i18n),

From e7d6afbc2636e3aa9c963d2fe181d201e4acf65c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 20 Mar 2023 14:44:53 +0100
Subject: [PATCH 64/91] Fix by setting 'developerNoAutoClosing: false'

---
 webapp/components/Dropdown.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Dropdown.vue b/webapp/components/Dropdown.vue
index 0dfff3736..7e4d21223 100644
--- a/webapp/components/Dropdown.vue
+++ b/webapp/components/Dropdown.vue
@@ -33,7 +33,7 @@ export default {
   data() {
     return {
       isPopoverOpen: false,
-      developerNoAutoClosing: true, // stops automatic closing of menu for developer purposes: default is 'false'
+      developerNoAutoClosing: false, // stops automatic closing of menu for developer purposes: default is 'false'
     }
   },
   computed: {

From 54f216078014f15084523d27860567dab186392f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 20 Mar 2023 15:03:24 +0100
Subject: [PATCH 65/91] Fix linting

---
 webapp/components/NotificationMenu/NotificationMenu.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index ceac606b0..47087e0d6 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -25,7 +25,12 @@
           </nuxt-link>
         </ds-flex-item>
         <ds-flex-item :width="{ base: 'auto' }" centered>
-          <ds-button ghost primary @click="markAllAsRead(closeMenu)" data-test="markAllAsRead-button">
+          <ds-button
+            ghost
+            primary
+            @click="markAllAsRead(closeMenu)"
+            data-test="markAllAsRead-button"
+          >
             {{ $t('notifications.markAllAsRead') }}
           </ds-button>
         </ds-flex-item>

From 2f0b2f63df9ee6585cb0748931c1fd5ebfedd57f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 16:50:46 +0100
Subject: [PATCH 66/91] echo current configuration when running scripts

---
 deployment/scripts/branded-images.build.sh | 1 +
 deployment/scripts/cluster.maintenance.sh  | 1 +
 deployment/scripts/cluster.reseed.sh       | 1 +
 deployment/scripts/cluster.upgrade.sh      | 1 +
 deployment/scripts/secret.generate.sh      | 1 +
 deployment/scripts/secrets.decrypt.sh      | 1 +
 deployment/scripts/secrets.encrypt.sh      | 1 +
 7 files changed, 7 insertions(+)

diff --git a/deployment/scripts/branded-images.build.sh b/deployment/scripts/branded-images.build.sh
index 62d2eb4af..84b656253 100755
--- a/deployment/scripts/branded-images.build.sh
+++ b/deployment/scripts/branded-images.build.sh
@@ -14,6 +14,7 @@ if [ -z ${CONFIGURATION} ]; then
   echo "You must provide a `CONFIGURATION` via environment variable"
   exit 1
 fi
+echo "Using CONFIGURATION=${CONFIGURATION}"
 
 # configuration
 DOCKERHUB_ORGANISATION=${DOCKERHUB_ORGANISATION:-"ocelotsocialnetwork"}
diff --git a/deployment/scripts/cluster.maintenance.sh b/deployment/scripts/cluster.maintenance.sh
index 1d2d4ecea..b64994e9b 100755
--- a/deployment/scripts/cluster.maintenance.sh
+++ b/deployment/scripts/cluster.maintenance.sh
@@ -9,6 +9,7 @@ if [ -z ${CONFIGURATION} ]; then
   echo "You must provide a `CONFIGURATION` via environment variable"
   exit 1
 fi
+echo "Using CONFIGURATION=${CONFIGURATION}"
 
 # configuration
 KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
diff --git a/deployment/scripts/cluster.reseed.sh b/deployment/scripts/cluster.reseed.sh
index 0f366bec8..9aba0a353 100755
--- a/deployment/scripts/cluster.reseed.sh
+++ b/deployment/scripts/cluster.reseed.sh
@@ -9,6 +9,7 @@ if [ -z ${CONFIGURATION} ]; then
   echo "You must provide a `CONFIGURATION` via environment variable"
   exit 1
 fi
+echo "Using CONFIGURATION=${CONFIGURATION}"
 
 # configuration
 KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
diff --git a/deployment/scripts/cluster.upgrade.sh b/deployment/scripts/cluster.upgrade.sh
index f0ae14ba6..44c905549 100755
--- a/deployment/scripts/cluster.upgrade.sh
+++ b/deployment/scripts/cluster.upgrade.sh
@@ -9,6 +9,7 @@ if [ -z ${CONFIGURATION} ]; then
   echo "You must provide a `CONFIGURATION` via environment variable"
   exit 1
 fi
+echo "Using CONFIGURATION=${CONFIGURATION}"
 
 # configuration
 KUBECONFIG=${KUBECONFIG:-${SCRIPT_DIR}/../configurations/${CONFIGURATION}/kubeconfig.yaml}
diff --git a/deployment/scripts/secret.generate.sh b/deployment/scripts/secret.generate.sh
index 7e8e011d0..cb788a7bd 100755
--- a/deployment/scripts/secret.generate.sh
+++ b/deployment/scripts/secret.generate.sh
@@ -12,6 +12,7 @@ if [ -z ${CONFIGURATION} ]; then
   echo "You must provide a `CONFIGURATION` via environment variable"
   exit 1
 fi
+echo "Using CONFIGURATION=${CONFIGURATION}"
 
 # configuration
 SECRET_FILE=${SCRIPT_DIR}/../configurations/${CONFIGURATION}/SECRET
diff --git a/deployment/scripts/secrets.decrypt.sh b/deployment/scripts/secrets.decrypt.sh
index f98f77917..a7a1328b1 100755
--- a/deployment/scripts/secrets.decrypt.sh
+++ b/deployment/scripts/secrets.decrypt.sh
@@ -12,6 +12,7 @@ if [ -z ${CONFIGURATION} ]; then
   echo "You must provide a `CONFIGURATION` via environment variable"
   exit 1
 fi
+echo "Using CONFIGURATION=${CONFIGURATION}"
 
 # configuration
 SECRET=${SECRET}
diff --git a/deployment/scripts/secrets.encrypt.sh b/deployment/scripts/secrets.encrypt.sh
index fabd91e98..57be1c16e 100755
--- a/deployment/scripts/secrets.encrypt.sh
+++ b/deployment/scripts/secrets.encrypt.sh
@@ -12,6 +12,7 @@ if [ -z ${CONFIGURATION} ]; then
   echo "You must provide a `CONFIGURATION` via environment variable"
   exit 1
 fi
+echo "Using CONFIGURATION=${CONFIGURATION}"
 
 # configuration
 SECRET=${SECRET}

From d3c9a9ade9b88f3d7c580faf3c1457e91953ae2c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 20:55:34 +0100
Subject: [PATCH 67/91] dont use debug mode to prevent exposing secrets

---
 deployment/scripts/cluster.upgrade.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/deployment/scripts/cluster.upgrade.sh b/deployment/scripts/cluster.upgrade.sh
index 1aec2cf18..1dfb674e4 100755
--- a/deployment/scripts/cluster.upgrade.sh
+++ b/deployment/scripts/cluster.upgrade.sh
@@ -15,5 +15,4 @@ helm --kubeconfig=${KUBECONFIG} upgrade ocelot \
   --values ${VALUES} \
   --set appVersion="${DOCKERHUB_OCELOT_TAG}"
   ${SCRIPT_DIR}/../src/kubernetes/ \
-  --debug \
   --timeout 10m
\ No newline at end of file

From 6e2b65e124996f6799216f511df986df47cda387 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 21:40:57 +0100
Subject: [PATCH 68/91] lint fixes

---
 .../20230320130345-fulltext-search-indexes.js        | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js b/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js
index 3e4866618..27fcc7db5 100644
--- a/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js
+++ b/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js
@@ -13,9 +13,15 @@ export async function up(next) {
     await transaction.run(`CALL db.index.fulltext.drop("post_fulltext_search")`)
     await transaction.run(`CALL db.index.fulltext.drop("tag_fulltext_search")`)
     // Create indexes
-    await transaction.run(`CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"])`)
-    await transaction.run(`CALL db.index.fulltext.createNodeIndex("post_fulltext_search",["Post"],["title", "content"])`)
-    await transaction.run(`CALL db.index.fulltext.createNodeIndex("tag_fulltext_search",["Tag"],["id"])`)
+    await transaction.run(
+      `CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"])`,
+    )
+    await transaction.run(
+      `CALL db.index.fulltext.createNodeIndex("post_fulltext_search",["Post"],["title", "content"])`,
+    )
+    await transaction.run(
+      `CALL db.index.fulltext.createNodeIndex("tag_fulltext_search",["Tag"],["id"])`,
+    )
     await transaction.commit()
     next()
   } catch (error) {

From bfca086e7be335a44fb129a61837b7186380c2d7 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 22:17:07 +0100
Subject: [PATCH 69/91] only drop indexes if they exist

---
 .../20230320130345-fulltext-search-indexes.js   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js b/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js
index 27fcc7db5..73040adf7 100644
--- a/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js
+++ b/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js
@@ -8,10 +8,19 @@ export async function up(next) {
   const transaction = session.beginTransaction()
 
   try {
-    // Drop all indexes because due to legacy code they might be set already
-    await transaction.run(`CALL db.index.fulltext.drop("user_fulltext_search")`)
-    await transaction.run(`CALL db.index.fulltext.drop("post_fulltext_search")`)
-    await transaction.run(`CALL db.index.fulltext.drop("tag_fulltext_search")`)
+    // Drop indexes if they exist because due to legacy code they might be set already
+    const indexesResponse = await transaction.run(`CALL db.indexes()`)
+    const indexes = indexesResponse.records.map((record) => record.get('indexName'))
+    console.log(indexes)
+    if(indexes.indexOf('user_fulltext_search') > -1){
+      await transaction.run(`CALL db.index.fulltext.drop("user_fulltext_search")`)
+    }
+    if(indexes.indexOf('post_fulltext_search') > -1){
+      await transaction.run(`CALL db.index.fulltext.drop("post_fulltext_search")`)
+    }
+    if(indexes.indexOf('tag_fulltext_search') > -1){
+      await transaction.run(`CALL db.index.fulltext.drop("tag_fulltext_search")`)
+    }
     // Create indexes
     await transaction.run(
       `CALL db.index.fulltext.createNodeIndex("user_fulltext_search",["User"],["name", "slug"])`,

From ceed23893ad8c495021ec407c713cd52b7673c38 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Mon, 20 Mar 2023 22:36:43 +0100
Subject: [PATCH 70/91] remove console statement, lint fixes

---
 .../migrations/20230320130345-fulltext-search-indexes.js   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js b/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js
index 73040adf7..11029bea6 100644
--- a/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js
+++ b/backend/src/db/migrations/20230320130345-fulltext-search-indexes.js
@@ -11,14 +11,13 @@ export async function up(next) {
     // Drop indexes if they exist because due to legacy code they might be set already
     const indexesResponse = await transaction.run(`CALL db.indexes()`)
     const indexes = indexesResponse.records.map((record) => record.get('indexName'))
-    console.log(indexes)
-    if(indexes.indexOf('user_fulltext_search') > -1){
+    if (indexes.indexOf('user_fulltext_search') > -1) {
       await transaction.run(`CALL db.index.fulltext.drop("user_fulltext_search")`)
     }
-    if(indexes.indexOf('post_fulltext_search') > -1){
+    if (indexes.indexOf('post_fulltext_search') > -1) {
       await transaction.run(`CALL db.index.fulltext.drop("post_fulltext_search")`)
     }
-    if(indexes.indexOf('tag_fulltext_search') > -1){
+    if (indexes.indexOf('tag_fulltext_search') > -1) {
       await transaction.run(`CALL db.index.fulltext.drop("tag_fulltext_search")`)
     }
     // Create indexes

From 3a4f7b40b68205f43503c614fb9eae3f41a8c476 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 21 Mar 2023 10:57:05 +0100
Subject: [PATCH 71/91] supply github run number via json payload, tag branded
 images with ocelot build number

---
 .github/workflows/publish.yml               |  2 +-
 deployment/scripts/branded-images.build.sh  | 11 ++++++++++-
 deployment/scripts/branded-images.upload.sh | 11 ++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 179951fba..690184acf 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -306,4 +306,4 @@ jobs:
           token: ${{ secrets.OCELOT_PUBLISH_EVENT_PAT }} # this token is required to access the other repository
           event-type: trigger-ocelot-build-success
           repository: 'Ocelot-Social-Community/stage.ocelot.social'
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
\ No newline at end of file
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "GITHUB_RUN_NUMBER": "${GITHUB_RUN_NUMBER}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
\ No newline at end of file
diff --git a/deployment/scripts/branded-images.build.sh b/deployment/scripts/branded-images.build.sh
index 84b656253..bb86b29a6 100755
--- a/deployment/scripts/branded-images.build.sh
+++ b/deployment/scripts/branded-images.build.sh
@@ -19,15 +19,20 @@ echo "Using CONFIGURATION=${CONFIGURATION}"
 # configuration
 DOCKERHUB_ORGANISATION=${DOCKERHUB_ORGANISATION:-"ocelotsocialnetwork"}
 OCELOT_VERSION=${OCELOT_VERSION:-$(node -p -e "require('${SCRIPT_DIR}/../../package.json').version")}
+OCELOT_GITHUB_RUN_NUMBER=${OCELOT_GITHUB_RUN_NUMBER:-master}
+OCELOT_VERSION_BUILD=${OCELOT_VERSION_BUILD:-${OCELOT_VERSION}-${OCELOT_GITHUB_RUN_NUMBER}}
 BRANDED_VERSION=${BRANDED_VERSION:-${GITHUB_RUN_NUMBER:-"local"}}
 BUILD_DATE=${BUILD_DATE:-$(date -u +'%Y-%m-%dT%H:%M:%SZ')}
-BUILD_VERSION=${BRANDED_VERSION}-ocelot.social${OCELOT_VERSION}
+BUILD_VERSION_BASE=${BRANDED_VERSION}-ocelot.social${OCELOT_VERSION}
+BUILD_VERSION=${BRANDED_VERSION}-ocelot.social${OCELOT_VERSION_BUILD}
 BUILD_COMMIT=${GITHUB_SHA:-"0000000"}
 
 # backend
 docker build --target branded \
     -t "${DOCKERHUB_ORGANISATION}/backend-branded:latest" \
     -t "${DOCKERHUB_ORGANISATION}/backend-branded:${OCELOT_VERSION}" \
+    -t "${DOCKERHUB_ORGANISATION}/backend-branded:${OCELOT_VERSION_BUILD}" \
+    -t "${DOCKERHUB_ORGANISATION}/backend-branded:${BUILD_VERSION_BASE}" \
     -t "${DOCKERHUB_ORGANISATION}/backend-branded:${BUILD_VERSION}" \
     -f "${SCRIPT_DIR}/../src/docker/backend.Dockerfile" \
     --build-arg "CONFIGURATION=${CONFIGURATION}" \
@@ -39,6 +44,8 @@ docker build --target branded \
 docker build --target branded \
     -t "${DOCKERHUB_ORGANISATION}/webapp-branded:latest" \
     -t "${DOCKERHUB_ORGANISATION}/webapp-branded:${OCELOT_VERSION}" \
+    -t "${DOCKERHUB_ORGANISATION}/webapp-branded:${OCELOT_VERSION_BUILD}" \
+    -t "${DOCKERHUB_ORGANISATION}/webapp-branded:${BUILD_VERSION_BASE}" \
     -t "${DOCKERHUB_ORGANISATION}/webapp-branded:${BUILD_VERSION}" \
     -f "${SCRIPT_DIR}/../src/docker/webapp.Dockerfile" \
     --build-arg "CONFIGURATION=${CONFIGURATION}" \
@@ -50,6 +57,8 @@ docker build --target branded \
 docker build --target branded \
     -t "${DOCKERHUB_ORGANISATION}/maintenance-branded:latest" \
     -t "${DOCKERHUB_ORGANISATION}/maintenance-branded:${OCELOT_VERSION}" \
+    -t "${DOCKERHUB_ORGANISATION}/maintenance-branded:${OCELOT_VERSION_BUILD}" \
+    -t "${DOCKERHUB_ORGANISATION}/maintenance-branded:${BUILD_VERSION_BASE}" \
     -t "${DOCKERHUB_ORGANISATION}/maintenance-branded:${BUILD_VERSION}" \
     -f "${SCRIPT_DIR}/../src/docker/maintenance.Dockerfile" \
     --build-arg "CONFIGURATION=${CONFIGURATION}" \
diff --git a/deployment/scripts/branded-images.upload.sh b/deployment/scripts/branded-images.upload.sh
index 3891fe474..0d3fdb6d6 100755
--- a/deployment/scripts/branded-images.upload.sh
+++ b/deployment/scripts/branded-images.upload.sh
@@ -13,8 +13,11 @@ SCRIPT_DIR=$(dirname $SCRIPT_PATH)
 # configuration
 DOCKERHUB_ORGANISATION=${DOCKERHUB_ORGANISATION:-"ocelotsocialnetwork"}
 OCELOT_VERSION=${OCELOT_VERSION:-$(node -p -e "require('${SCRIPT_DIR}/../../package.json').version")}
+OCELOT_GITHUB_RUN_NUMBER=${OCELOT_GITHUB_RUN_NUMBER:-master}
+OCELOT_VERSION_BUILD=${OCELOT_VERSION_BUILD:-${OCELOT_VERSION}-${OCELOT_GITHUB_RUN_NUMBER}}
 BRANDED_VERSION=${BRANDED_VERSION:-${GITHUB_RUN_NUMBER:-"local"}}
-BUILD_VERSION=${BRANDED_VERSION}-ocelot.social${OCELOT_VERSION}
+BUILD_VERSION_BASE=${BRANDED_VERSION}-ocelot.social${OCELOT_VERSION}
+BUILD_VERSION=${BRANDED_VERSION}-ocelot.social${OCELOT_VERSION_BUILD}
 
 # login to dockerhub
 echo "${DOCKERHUB_TOKEN}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin
@@ -22,14 +25,20 @@ echo "${DOCKERHUB_TOKEN}" | docker login -u "${DOCKERHUB_USERNAME}" --password-s
 # push backend images
 docker push ${DOCKERHUB_ORGANISATION}/backend-branded:latest
 docker push ${DOCKERHUB_ORGANISATION}/backend-branded:${OCELOT_VERSION}
+docker push ${DOCKERHUB_ORGANISATION}/backend-branded:${OCELOT_VERSION_BUILD}
+docker push ${DOCKERHUB_ORGANISATION}/backend-branded:${BUILD_VERSION_BASE}
 docker push ${DOCKERHUB_ORGANISATION}/backend-branded:${BUILD_VERSION}
 
 # push webapp images
 docker push ${DOCKERHUB_ORGANISATION}/webapp-branded:latest
 docker push ${DOCKERHUB_ORGANISATION}/webapp-branded:${OCELOT_VERSION}
+docker push ${DOCKERHUB_ORGANISATION}/webapp-branded:${OCELOT_VERSION_BUILD}
+docker push ${DOCKERHUB_ORGANISATION}/webapp-branded:${BUILD_VERSION_BASE}
 docker push ${DOCKERHUB_ORGANISATION}/webapp-branded:${BUILD_VERSION}
 
 # push maintenance images
 docker push ${DOCKERHUB_ORGANISATION}/maintenance-branded:latest
 docker push ${DOCKERHUB_ORGANISATION}/maintenance-branded:${OCELOT_VERSION}
+docker push ${DOCKERHUB_ORGANISATION}/maintenance-branded:${OCELOT_VERSION_BUILD}
+docker push ${DOCKERHUB_ORGANISATION}/maintenance-branded:${BUILD_VERSION_BASE}
 docker push ${DOCKERHUB_ORGANISATION}/maintenance-branded:${BUILD_VERSION}
\ No newline at end of file

From 6db246b3d9c947732bf949dd0606c2c64cc4e00f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 21 Mar 2023 10:57:15 +0100
Subject: [PATCH 72/91] updated stage.ocelot.social reference

---
 deployment/configurations/stage.ocelot.social | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/configurations/stage.ocelot.social b/deployment/configurations/stage.ocelot.social
index 0167a6a7e..540bd503b 160000
--- a/deployment/configurations/stage.ocelot.social
+++ b/deployment/configurations/stage.ocelot.social
@@ -1 +1 @@
-Subproject commit 0167a6a7eead617cfe832fa7f0df731c3759c48a
+Subproject commit 540bd503b9401c1608ccda77bdd23fe47ba008fb

From 69cf9c65107d6c0a8b84bf7aa67ca51dc509ed3f Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 21 Mar 2023 12:18:09 +0100
Subject: [PATCH 73/91] fix publish

---
 .github/workflows/publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 690184acf..ca5e52945 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -306,4 +306,4 @@ jobs:
           token: ${{ secrets.OCELOT_PUBLISH_EVENT_PAT }} # this token is required to access the other repository
           event-type: trigger-ocelot-build-success
           repository: 'Ocelot-Social-Community/stage.ocelot.social'
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "GITHUB_RUN_NUMBER": "${GITHUB_RUN_NUMBER}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
\ No newline at end of file
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "GITHUB_RUN_NUMBER": "${{ env.GITHUB_RUN_NUMBER }}", "VERSION": "${VERSION}", "BUILD_DATE": "${BUILD_DATE}", "BUILD_COMMIT": "${BUILD_COMMIT}", "BUILD_VERSION": "${BUILD_VERSION}"}'
\ No newline at end of file

From 6524239f5953b26e5c607659eca04ff304de8085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 21 Mar 2023 13:23:27 +0100
Subject: [PATCH 74/91] Release v2.5.0

---
 CHANGELOG.md                           | 122 +++++++++++++++++++++++++
 backend/package.json                   |   2 +-
 package.json                           |   2 +-
 webapp/maintenance/source/package.json |   2 +-
 webapp/package.json                    |   2 +-
 5 files changed, 126 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac1cf7e02..ccbb7156a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,130 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [2.5.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/2.4.0...2.5.0)
+
+- fix(other): publish transmit github run number properly [`#6171`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6171)
+- feat(other): deployment include GitHub run number on branded images [`#6170`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6170)
+- fix(backend): new migration to create search indexes [`#6167`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6167)
+- fix(other): prevent exposing secrets in the github actions by not setting debug mode on cluster deploy [`#6168`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6168)
+- feat(other): echo current configuration when running scripts [`#6169`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6169)
+- refactor(other): build & deployment of branded images on stage.ocelot.social [`#6163`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6163)
+- fix(webapp): close popover notification menu [`#6166`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6166)
+- fix(webapp): small buttons in notifications menu [`#6162`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6162)
+- fix(webapp): revert pr `on newsfeed add bigger y-gap between posts #6121` [`#6164`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6164)
+- fix(webapp): join leave button for pending members [`#6152`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6152)
+- feat(backend): notifications for groups [`#6150`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6150)
+- feat(webapp): add hint text to create and edit a post of a group aside of the save and abort buttons [`#6114`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6114)
+- fix(other): use access token to trigger build on external repo [`#6145`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6145)
+- feat(webapp):  set different icon and text on join leave button, when member is pending [`#6124`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6124)
+- refactor(other): deployment upgrade to specific version, trigger build on stage [`#6143`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6143)
+- feat(webapp): show 2 GroupItem per row in GroupList [`#6135`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6135)
+- fix(backend): do not delete migrations on db reset [`#6136`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6136)
+- feat(other): deployment reseed [`#6129`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6129)
+- feat(other): deployment secrets [`#6120`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6120)
+- feat(webapp): refactor notification page [`#6116`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6116)
+- fix(webapp): fix ribbons position  [`#6130`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6130)
+- fix(webapp): fix donation bar blink [`#6107`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6107)
+- feat(webapp): change order of groups to new first [`#6122`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6122)
+- fix(webapp): error in user profil on the 'show x more' button  [`#6093`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6093)
+- feat(webapp): filter button style change [`#6109`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6109)
+- refactor(other): deactivate video recording & only upload screenshots, if tests fail for e2e tests [`#6125`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6125)
+- fix(webapp): change icon color of active topics (categories) of post teaser [`#6112`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6112)
+- docs(other): correct **/README.md [`#6059`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6059)
+- fix(webapp): fix `viewport``width=device-width` by removing it [`#6110`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6110)
+- feat(webapp): on newsfeed add bigger y-gap between posts [`#6121`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6121)
+- Bump peter-evans/repository-dispatch from 1 to 2 [`#6117`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6117)
+- fix(webapp): fix gap news feed [`#6065`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6065)
+- feat(webapp): change shout icon `bullhorn` to `heart-o` [`#6115`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6115)
+- refactor(webapp): change invite code button and menu to copy invite link [`#6108`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6108)
+- feat(webapp): change group filter button text [`#6105`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6105)
+- feat(webapp): 🍰 allows mark all notifications as read [`#3922`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/3922)
+- fix(other): deploy branded - upload to dockerhub [`#6099`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6099)
+- feat(webapp): remove user from group [`#6072`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6072)
+- chore(other): remove apple m1 docker overrides [`#6056`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6056)
+- refactor(other): ocelot publish workflows [`#6083`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6083)
+- fix(other): lint pr only on pullrequest [`#6088`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6088)
+- fix(other): dependabot do not rebase [`#6096`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6096)
+- feat(backend): filter posts in my groups [`#6091`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6091)
+- refactor(backend): withdraw mock of gql and replace with graphql-tag function [`#6022`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6022)
+- docs(other): update readme.md [`#6090`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6090)
+- feat(webapp): adjust and create branding possibilities [`#6063`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6063)
+- fix(other): exclude dependabot from pr title linting [`#6085`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6085)
+- feat(webapp): change ``Benutzer`` to ``Nutzer`` [`#6027`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6027)
+- docs(webapp): change the used nvm version [`#6023`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6023)
+- feat(other): backup script [`#6051`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6051)
+- fix(backend): user or group has null as description [`#5996`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5996)
+- feat(other): script to set a cluster in maintenance mode [`#6042`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6042)
+- feat(other): fix dependabot [`#6035`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6035)
+- fix(other): fix maintenance page & maintenance build [`#6032`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6032)
+- refactor(webapp): upgrade jest and vue test util [`#5968`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5968)
+- refactor(other): deployment [`#5975`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5975)
+- fix(webapp): remove additional markers from map [`#6021`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6021)
+- feat(webapp): add align center to the user profile slug [`#6012`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6012)
+- chore(other): update github actions for node 16 [`#5971`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5971)
+- refactor(backend): update jest [`#5964`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5964)
+- Revert "V2.3.0" [`#95`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/95)
+- V2.3.0 [`#94`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/94)
+- v2.3.0-281 [`#93`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/93)
+- rebranding for yunite [`#26`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/26)
+- feat(webapp): copy fonts from assets [`#25`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/25)
+- feat(webapp): copy fonts from assets [`#92`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/92)
+- chore: 🍰 Release v2.2.0-267 – Fixes And Groups Page Etc. [`#19`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/19)
+- fix: 🍰 Change Hasttag Menu Search Color To `#17b53f` [`#21`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/21)
+- chore: 🍰 Release v2.2.0-267 [`#90`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/90)
+- Docu Updates [`#86`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/86)
+- chore: 🍰 Release v2.1.0-253 – Merge Groups Into master – Epic Groups [`#12`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/12)
+- chore: 🍰 Release v2.1.0-253 [`#87`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/87)
+- chore: [WIP] 🍰 Release v2.0.0-250 – Groups – Configurable Header Menu Is Translatable Etc. [`#16`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/16)
+- chore: 🍰 Release v2.0.0 – Groups Etc. – Extend Rebranding And Deployment [`#83`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/83)
+- fix: 🍰 Fix Implementation Of Overwriting Locales [`#80`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/80)
+- feat: 🍰 Merge Locales [`#77`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/77)
+- chore: 🍰 Groups Release v1.1.1-231 - Show New Features [`#14`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/14)
+- chore: 🍰 Release v1.1.1 – First Design Rebranding [`#10`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/10)
+- chore: [WIP] 🍰 Refine Rebanding And Deployment [`#8`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8)
+- chore: 🍰 Fix Folder Name From `branding/assets/styles/import` To `branding/assets/styles/imports` [`#71`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/71)
+- chore: 🍰 Release v1.1.1-228 – Refactor Rebranding [`#68`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/68)
+- chore: 🍰 Release v1.1.0-205 [`#6`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6)
+- chore: 🍰 Release v1.1.0-225 [`#66`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/66)
+- chore: [WIP] 🍰 Refine Deployment Setup And Documentation [`#46`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/46)
+- chore: [WIP] 🍰 Release v1.1.0 - Implement Categories Again [`#63`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/63)
+- Update issue templates [`#3`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/3)
+- chore: 🍰 Release v1.0.9-199 [`#59`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/59)
+- chore: 🍰 Implement `PRODUCTION_DB_CLEAN_ALLOW` for Staging Production Environments [`#56`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/56)
+- chore: 🍰 Add Docker Compose Override For Apple M1 And Docu [`#57`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/57)
+- Chore: 🍰 Fix `apiVersion: cert-manager.io/v1alpha2` To `*/v1` [`#53`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/53)
+- chore: 🍰 Adjust `maintenance` Container Name In Deployment With Helm [`#50`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/50)
+- chore: 🍰 Release New Build Version `v1.0.8-184` [`#51`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/51)
+- chore: 🍰 Rename Neo4j Docker Image In General To `neo4j-community:*` [`#49`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/49)
+- feat: 🍰 Release v1.0.8 – Configure Cookie Expire Time – second run [`#44`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/44)
+- feat: 🍰 Configure Cookie Expire Time [`#43`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/43)
+- docs: 🍰 Add Docs For Backups, Rollbacks, And Release v1.0.7-171 [`#40`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/40)
+- chore: 🍰 Realease v1.0.6-170 [`#37`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/37)
+- chore: 🍰 Refactor FAQ Link To Use Internal Page Which Was Implemented Before [`#36`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/36)
+- chore: 🍰 Add Branding Templates For Terms And Conditions Etc. [`#32`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/32)
+- feat: 🍰 Add Rebranded E-Mails For Sending Notifications [`#29`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/29)
+- bug: 🍰 Fix Minor Errors And Clarify Docs [`#28`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/28)
+- chore: 🍰 Implement New Internal Pages – Main Release v1.0.5 [`#25`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/25)
+- feat: [WIP] 🍰 Add Landing Page Etc. [`#22`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/22)
+- docs: 🍰 [WIP] Add Configure And Rebranding Readme.md [`#20`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/20)
+- chore: [WIP] 🍰 New Deployment With 'base' And 'code' Docker Images [`#15`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/15)
+- feat: [WIP] 🍰 Flexible Footer Links [`#17`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/17)
+- 💥 Release v1.0.3 [`#12`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/12)
+- 🛠 [Refactor] Add README And LICENSE [`#11`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/11)
+- chore: 🍰 Implement Use Of package.json 'Version' Etc. For Build And Refine Helm Chart [`#8`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/8)
+- chore: 🍰 Replace Ocelot Logos 619x593 With 600x570 [`#6`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6)
+- brand_as_default [`#4`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4)
+- limit_replicasets [`#3`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/3)
+- Deployment [`#2`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/2)
+- moved example into stage.ocelot.social [`61b5112`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/61b5112b8b547a7491d644c7c4dbfead39b61d79)
+- feat(backand): upgrade jest to 29.4 [`4390d72`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/4390d72477fb941f69bc9bdc24ac7713ef06e827)
+- pages tests nearly working [`4850e45`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/4850e456fe5b7c158f23acc7f153576472604300)
+
 #### [2.4.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/2.3.0...2.4.0)
 
+> 10 February 2023
+
+- chore(release): v2.4.0 [`#5961`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5961)
 - fix(webapp): post teaser width in mobile view [`#5958`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5958)
 - fix(webapp): navbar disappears when scrolling to top [`#5957`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5957)
 - fix(webapp): close mobile menu on all links [`#5956`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/5956)
diff --git a/backend/package.json b/backend/package.json
index 3f7098206..79a2640cd 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-backend",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "GraphQL Backend for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",
diff --git a/package.json b/package.json
index ba1e67eec..7bcdce3a8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Free and open source software program code available to run social networks.",
   "author": "ocelot.social Community",
   "license": "MIT",
diff --git a/webapp/maintenance/source/package.json b/webapp/maintenance/source/package.json
index 9441f005d..8c4ee7da9 100644
--- a/webapp/maintenance/source/package.json
+++ b/webapp/maintenance/source/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ocelot-social/maintenance",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "Maintenance page for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",
diff --git a/webapp/package.json b/webapp/package.json
index 9b9dbdf72..fb8dceed7 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-webapp",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "description": "ocelot.social Frontend",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",

From c4699c4e2ae6496872cd8a0737b6940296d5a38c Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 22 Mar 2023 10:43:18 +0100
Subject: [PATCH 75/91] fix(webapp): Popup filter max-width

---
 webapp/pages/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 0094f5706..490b1ec8f 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -355,6 +355,7 @@ export default {
   }
 }
 #my-filter {
+  max-width: 1028px;
   background-color: white;
   box-shadow: rgb(189 189 189) 1px 9px 15px 1px;
   max-height: 950px;

From 4c0469f61a3c2fae23e50c6a5a2a91b63fac149a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 23 Mar 2023 07:51:19 +0100
Subject: [PATCH 76/91] Add tooltip to header avatar menu

- Add 'showProfileNameTitle' to profile avatar.
---
 webapp/components/AvatarMenu/AvatarMenu.vue            | 10 +++++++++-
 .../_new/generic/ProfileAvatar/ProfileAvatar.vue       |  6 +++++-
 webapp/locales/de.json                                 |  3 +++
 webapp/locales/en.json                                 |  3 +++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/webapp/components/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue
index 5ec031e61..284e33509 100644
--- a/webapp/components/AvatarMenu/AvatarMenu.vue
+++ b/webapp/components/AvatarMenu/AvatarMenu.vue
@@ -11,7 +11,15 @@
         "
         @click.prevent="toggleMenu"
       >
-        <profile-avatar :profile="user" size="small" />
+        <profile-avatar
+          :profile="user"
+          size="small"
+          :showProfileNameTitle="false"
+          v-tooltip="{
+            content: $t('header.avatarMenu.button.tooltip'),
+            placement: 'bottom-start',
+          }"
+        />
         <base-icon class="dropdown-arrow" name="angle-down" />
       </a>
     </template>
diff --git a/webapp/components/_new/generic/ProfileAvatar/ProfileAvatar.vue b/webapp/components/_new/generic/ProfileAvatar/ProfileAvatar.vue
index 46e3968fc..d681276b5 100644
--- a/webapp/components/_new/generic/ProfileAvatar/ProfileAvatar.vue
+++ b/webapp/components/_new/generic/ProfileAvatar/ProfileAvatar.vue
@@ -8,7 +8,7 @@
       :src="profile.avatar | proxyApiUrl"
       class="image"
       :alt="profile.name"
-      :title="profile.name"
+      :title="showProfileNameTitle ? profile.name : ''"
       @error="$event.target.style.display = 'none'"
     />
   </div>
@@ -29,6 +29,10 @@ export default {
       type: Object,
       default: null,
     },
+    showProfileNameTitle: {
+      type: Boolean,
+      default: true,
+    },
   },
   computed: {
     isAnonymous() {
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index a4398df4c..e70a33a1e 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -510,6 +510,9 @@
   },
   "header": {
     "avatarMenu": {
+      "button": {
+        "tooltip": "Mein Profil"
+      },
       "Groups": "Gruppen",
       "myProfile": "Mein Profil"
     }
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index b6afbfa96..79e9011fb 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -510,6 +510,9 @@
   },
   "header": {
     "avatarMenu": {
+      "button": {
+        "tooltip": "My profile"
+      },
       "Groups": "Groups",
       "myProfile": "My profile"
     }

From 1a1561ce14e0159a540a6d38d80377c268af73fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 23 Mar 2023 07:55:10 +0100
Subject: [PATCH 77/91] Fix locale identifier from 'avatarMenu.Groups' to
 'avatarMenu.groups'

---
 webapp/components/AvatarMenu/AvatarMenu.vue | 2 +-
 webapp/locales/de.json                      | 2 +-
 webapp/locales/en.json                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/components/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue
index 284e33509..977996092 100644
--- a/webapp/components/AvatarMenu/AvatarMenu.vue
+++ b/webapp/components/AvatarMenu/AvatarMenu.vue
@@ -88,7 +88,7 @@ export default {
           icon: 'user',
         },
         {
-          name: this.$t('header.avatarMenu.Groups'),
+          name: this.$t('header.avatarMenu.groups'),
           path: '/groups',
           icon: 'users',
         },
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index e70a33a1e..7a22de72a 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -513,7 +513,7 @@
       "button": {
         "tooltip": "Mein Profil"
       },
-      "Groups": "Gruppen",
+      "groups": "Gruppen",
       "myProfile": "Mein Profil"
     }
   },
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 79e9011fb..d928f1f57 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -513,7 +513,7 @@
       "button": {
         "tooltip": "My profile"
       },
-      "Groups": "Groups",
+      "groups": "Groups",
       "myProfile": "My profile"
     }
   },

From f542ab3052a84fc6723fd3daa691e728bfc239e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 23 Mar 2023 08:00:51 +0100
Subject: [PATCH 78/91] Change text of invite friends header menu button

---
 webapp/locales/de.json | 2 +-
 webapp/locales/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 7a22de72a..ed6800d98 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -523,7 +523,7 @@
   },
   "invite-codes": {
     "button": {
-      "tooltip": "Lade deine Freunde ein"
+      "tooltip": "Freunde einladen"
     },
     "copy-code": "Einladungslink kopieren",
     "copy-success": "Einladungscode erfolgreich in die Zwischenablage kopiert",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index d928f1f57..08397ec1a 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -523,7 +523,7 @@
   },
   "invite-codes": {
     "button": {
-      "tooltip": "Invite your friends"
+      "tooltip": "Invite friends"
     },
     "copy-code": "Copy Invite Link",
     "copy-success": "Invite code copied to clipboard",

From 28505a5b181008ebcde6fa58b7a4a8459a492018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 23 Mar 2023 08:11:30 +0100
Subject: [PATCH 79/91] Add tooltip to header notifications menu

---
 .../NotificationMenu/NotificationMenu.vue     | 20 +++++++++++++++++--
 webapp/locales/de.json                        |  3 +++
 webapp/locales/en.json                        |  3 +++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index 0cc643516..a8609f582 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -4,11 +4,27 @@
     class="notifications-menu"
     :to="{ name: 'notifications' }"
   >
-    <base-button icon="bell" ghost circle />
+    <base-button
+      icon="bell"
+      ghost
+      circle
+      v-tooltip="{
+        content: $t('notifications.headerMenuButton.tooltip'),
+        placement: 'bottom-start',
+      }"
+    />
   </nuxt-link>
   <dropdown v-else class="notifications-menu" offset="8" :placement="placement">
     <template #default="{ toggleMenu }">
-      <base-button @click="toggleMenu" ghost circle>
+      <base-button
+        ghost
+        circle
+        v-tooltip="{
+          content: $t('notifications.headerMenuButton.tooltip'),
+          placement: 'bottom-start',
+        }"
+        @click="toggleMenu"
+      >
         <counter-icon icon="bell" :count="unreadNotificationsCount" danger />
       </base-button>
     </template>
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index ed6800d98..cead1ab5e 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -651,6 +651,9 @@
       "unread": "Ungelesen"
     },
     "group": "Beschreibung",
+    "headerMenuButton": {
+      "tooltip": "Meine Benachrichtigungen"
+    },
     "markAllAsRead": "Markiere alle als gelesen",
     "pageLink": "Alle Benachrichtigungen",
     "post": "Beitrag oder Gruppe",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 08397ec1a..4590f8955 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -651,6 +651,9 @@
       "unread": "Unread"
     },
     "group": "Description",
+    "headerMenuButton": {
+      "tooltip": "My notifications"
+    },
     "markAllAsRead": "Mark all as read",
     "pageLink": "All notifications",
     "post": "Post or Group",

From 26b90fce4704e537126fd15ad950ea04e14890ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 23 Mar 2023 08:21:46 +0100
Subject: [PATCH 80/91] Add tooltip to locale switch menu

---
 webapp/components/LocaleSwitch/LocaleSwitch.vue | 10 +++++++++-
 webapp/locales/de.json                          |  3 +++
 webapp/locales/en.json                          |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue
index 12a37e237..11ecb3c2f 100644
--- a/webapp/components/LocaleSwitch/LocaleSwitch.vue
+++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue
@@ -2,7 +2,15 @@
   <client-only>
     <dropdown ref="menu" :placement="placement" :offset="offset">
       <template #default="{ toggleMenu }">
-        <a class="locale-menu" href="#" @click.prevent="toggleMenu()">
+        <a
+          class="locale-menu"
+          href="#"
+          v-tooltip="{
+            content: $t('localeSwitch.tooltip'),
+            placement: 'bottom-start',
+          }"
+          @click.prevent="toggleMenu()"
+        >
           <!-- <base-icon name="globe" /> -->
           <span class="label">{{ current.code.toUpperCase() }}</span>
           <base-icon class="dropdown-arrow" name="angle-down" />
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index cead1ab5e..fe39eed69 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -530,6 +530,9 @@
     "not-available": "Du hast keinen Einladungscode zur Verfügung!",
     "your-code": "Sende diesen Link per E-Mail oder in sozialen Medien, um deine Freunde einzuladen:"
   },
+  "localeSwitch": {
+    "tooltip": "Sprache wählen"
+  },
   "login": {
     "email": "Deine E-Mail",
     "failure": "Fehlerhafte E-Mail-Adresse oder Passwort.",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 4590f8955..92f5687c2 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -530,6 +530,9 @@
     "not-available": "You have no valid invite code available!",
     "your-code": "Send this link per e-mail or in social media to invite your friends:"
   },
+  "localeSwitch": {
+    "tooltip": "Choose language"
+  },
   "login": {
     "email": "Your E-mail",
     "failure": "Incorrect email address or password.",

From 08def14cafef7816d8e43f1896430400bda9635d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 23 Mar 2023 09:03:59 +0100
Subject: [PATCH 81/91] Release v2.5.1 - fix filter menu width

---
 CHANGELOG.md                           | 11 +++++++++++
 backend/package.json                   |  2 +-
 package.json                           |  2 +-
 webapp/maintenance/source/package.json |  2 +-
 webapp/package.json                    |  2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccbb7156a..361ccb183 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,19 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [2.5.1](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/2.5.0...2.5.1)
+
+- feat(webapp): add tooltips to all menu icons [`#6185`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6185)
+- fix(webapp): popup filter max-width [`#6177`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6177)
+- Add tooltip to header notifications menu [`28505a5`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/28505a5b181008ebcde6fa58b7a4a8459a492018)
+- Add tooltip to header avatar menu [`4c0469f`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/4c0469f61a3c2fae23e50c6a5a2a91b63fac149a)
+- Add tooltip to locale switch menu [`26b90fc`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/26b90fce4704e537126fd15ad950ea04e14890ba)
+
 #### [2.5.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/2.4.0...2.5.0)
 
+> 21 March 2023
+
+- chore(other): release v2.5.0 [`#6172`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6172)
 - fix(other): publish transmit github run number properly [`#6171`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6171)
 - feat(other): deployment include GitHub run number on branded images [`#6170`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6170)
 - fix(backend): new migration to create search indexes [`#6167`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6167)
diff --git a/backend/package.json b/backend/package.json
index 79a2640cd..0b6e6beb7 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-backend",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "GraphQL Backend for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",
diff --git a/package.json b/package.json
index 7bcdce3a8..df3ba2a81 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Free and open source software program code available to run social networks.",
   "author": "ocelot.social Community",
   "license": "MIT",
diff --git a/webapp/maintenance/source/package.json b/webapp/maintenance/source/package.json
index 8c4ee7da9..c069f09bf 100644
--- a/webapp/maintenance/source/package.json
+++ b/webapp/maintenance/source/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ocelot-social/maintenance",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Maintenance page for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",
diff --git a/webapp/package.json b/webapp/package.json
index fb8dceed7..0e999cdc2 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-webapp",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "ocelot.social Frontend",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",

From 155563331891b47193e3002adaa3c3009f6cf883 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Apr 2023 01:57:17 +0000
Subject: [PATCH 82/91] Bump expect from 25.3.0 to 29.5.0

Bumps [expect](https://github.com/facebook/jest/tree/HEAD/packages/expect) from 25.3.0 to 29.5.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.5.0/packages/expect)

---
updated-dependencies:
- dependency-name: expect
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 270 ++++++++++++++++++++++++++++++++-------------------
 2 files changed, 171 insertions(+), 101 deletions(-)

diff --git a/package.json b/package.json
index df3ba2a81..9092a996e 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "cypress-file-upload": "^3.5.3",
     "date-fns": "^2.25.0",
     "dotenv": "^8.2.0",
-    "expect": "^25.3.0",
+    "expect": "^29.5.0",
     "graphql-request": "^2.0.0",
     "import": "^0.0.6",
     "jsonwebtoken": "^8.5.1",
diff --git a/yarn.lock b/yarn.lock
index 51e44fa78..5aeaf647f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,6 +16,13 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
+"@babel/code-frame@^7.12.13":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
+  integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
+  dependencies:
+    "@babel/highlight" "^7.18.6"
+
 "@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
@@ -386,6 +393,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
   integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
 
+"@babel/helper-validator-identifier@^7.18.6":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+
 "@babel/helper-validator-option@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9"
@@ -419,6 +431,15 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
+  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.18.6"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/highlight@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
@@ -1285,15 +1306,31 @@
   dependencies:
     "@hapi/hoek" "8.x.x"
 
-"@jest/types@^25.3.0":
-  version "25.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.3.0.tgz#88f94b277a1d028fd7117bc1f74451e0fc2131e7"
-  integrity sha512-UkaDNewdqXAmCDbN2GlUM6amDKS78eCqiw/UmF5nE0mmLTd6moJkiZJML/X52Ke3LH7Swhw883IRXq8o9nWjVw==
+"@jest/expect-utils@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.5.0.tgz#f74fad6b6e20f924582dc8ecbf2cb800fe43a036"
+  integrity sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==
   dependencies:
+    jest-get-type "^29.4.3"
+
+"@jest/schemas@^29.4.3":
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.3.tgz#39cf1b8469afc40b6f5a2baaa146e332c4151788"
+  integrity sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==
+  dependencies:
+    "@sinclair/typebox" "^0.25.16"
+
+"@jest/types@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593"
+  integrity sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==
+  dependencies:
+    "@jest/schemas" "^29.4.3"
     "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^15.0.0"
-    chalk "^3.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
 
 "@samverschueren/stream-to-observable@^0.3.0":
   version "0.3.0"
@@ -1302,6 +1339,11 @@
   dependencies:
     any-observable "^0.3.0"
 
+"@sinclair/typebox@^0.25.16":
+  version "0.25.24"
+  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.24.tgz#8c7688559979f7079aacaf31aa881c3aa410b718"
+  integrity sha512-XJfwUVUKDHF5ugKwIcxEgc9k8b7HbznCp6eUfWgu710hMPNIO4aw4/zB5RogDQz8nd6gyCDpU9O/m6qYEWY6yQ==
+
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -1319,14 +1361,18 @@
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
-"@types/istanbul-reports@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
-  integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
+"@types/istanbul-reports@^3.0.0":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
+  integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
   dependencies:
-    "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
+"@types/node@*":
+  version "18.15.11"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.11.tgz#b3b790f09cb1696cffcec605de025b088fa4225f"
+  integrity sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==
+
 "@types/node@^14.14.31":
   version "14.14.37"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e"
@@ -1342,20 +1388,20 @@
   resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
   integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==
 
-"@types/stack-utils@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
-  integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
+"@types/stack-utils@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
+  integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
 "@types/yargs-parser@*":
   version "13.1.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228"
   integrity sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==
 
-"@types/yargs@^15.0.0":
-  version "15.0.1"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.1.tgz#9266a9d7be68cfcc982568211085a49a277f7c96"
-  integrity sha512-sYlwNU7zYi6eZbMzFvG6eHD7VsEvFdoDtlD7eI1JTg7YNnuguzmiGsc6MPSq5l8n+h21AsNof0je+9sgOe4+dg==
+"@types/yargs@^17.0.8":
+  version "17.0.24"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902"
+  integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==
   dependencies:
     "@types/yargs-parser" "*"
 
@@ -1446,7 +1492,7 @@ ansi-styles@^3.2.1:
   dependencies:
     color-convert "^1.9.0"
 
-ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+ansi-styles@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359"
   integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==
@@ -1454,6 +1500,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
+ansi-styles@^5.0.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
+  integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
+
 any-observable@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b"
@@ -1755,7 +1806,7 @@ braces@^2.3.1, braces@^2.3.2:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-braces@^3.0.1:
+braces@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
@@ -2010,10 +2061,10 @@ chalk@^2.0.0, chalk@^2.4.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
-  integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
+chalk@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
@@ -2065,6 +2116,11 @@ ci-info@^3.1.1:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.1.1.tgz#9a32fcefdf7bcdb6f0a7e1c0f8098ec57897b80a"
   integrity sha512-kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ==
 
+ci-info@^3.2.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
+  integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
+
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
@@ -2749,10 +2805,10 @@ detective@^5.0.2:
     defined "^1.0.0"
     minimist "^1.1.1"
 
-diff-sequences@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd"
-  integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==
+diff-sequences@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2"
+  integrity sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==
 
 diff@^3.0.0:
   version "3.5.0"
@@ -2997,17 +3053,16 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^25.3.0:
-  version "25.3.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-25.3.0.tgz#5fd36e51befd05afb7184bc954f8a4792d184c71"
-  integrity sha512-buboTXML2h/L0Kh44Ys2Cx49mX20ISc5KDirkxIs3Q9AJv0kazweUAbukegr+nHDOvFRKmxdojjIHCjqAceYfg==
+expect@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.5.0.tgz#68c0509156cb2a0adb8865d413b137eeaae682f7"
+  integrity sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==
   dependencies:
-    "@jest/types" "^25.3.0"
-    ansi-styles "^4.0.0"
-    jest-get-type "^25.2.6"
-    jest-matcher-utils "^25.3.0"
-    jest-message-util "^25.3.0"
-    jest-regex-util "^25.2.6"
+    "@jest/expect-utils" "^29.5.0"
+    jest-get-type "^29.4.3"
+    jest-matcher-utils "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-util "^29.5.0"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
@@ -3312,6 +3367,11 @@ graceful-fs@^4.2.0:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
+graceful-fs@^4.2.9:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
 graphql-request@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-2.0.0.tgz#8dd12cf1eb2ce0c80f4114fd851741e091134862"
@@ -3828,48 +3888,57 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-jest-diff@^25.3.0:
-  version "25.3.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.3.0.tgz#0d7d6f5d6171e5dacde9e05be47b3615e147c26f"
-  integrity sha512-vyvs6RPoVdiwARwY4kqFWd4PirPLm2dmmkNzKqo38uZOzJvLee87yzDjIZLmY1SjM3XR5DwsUH+cdQ12vgqi1w==
+jest-diff@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.5.0.tgz#e0d83a58eb5451dcc1fa61b1c3ee4e8f5a290d63"
+  integrity sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==
   dependencies:
-    chalk "^3.0.0"
-    diff-sequences "^25.2.6"
-    jest-get-type "^25.2.6"
-    pretty-format "^25.3.0"
+    chalk "^4.0.0"
+    diff-sequences "^29.4.3"
+    jest-get-type "^29.4.3"
+    pretty-format "^29.5.0"
 
-jest-get-type@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877"
-  integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==
+jest-get-type@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5"
+  integrity sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==
 
-jest-matcher-utils@^25.3.0:
-  version "25.3.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-25.3.0.tgz#76765788a26edaa8bc5f0100aea52ae383559648"
-  integrity sha512-ZBUJ2fchNIZt+fyzkuCFBb8SKaU//Rln45augfUtbHaGyVxCO++ANARdBK9oPGXU3hEDgyy7UHnOP/qNOJXFUg==
+jest-matcher-utils@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz#d957af7f8c0692c5453666705621ad4abc2c59c5"
+  integrity sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==
   dependencies:
-    chalk "^3.0.0"
-    jest-diff "^25.3.0"
-    jest-get-type "^25.2.6"
-    pretty-format "^25.3.0"
+    chalk "^4.0.0"
+    jest-diff "^29.5.0"
+    jest-get-type "^29.4.3"
+    pretty-format "^29.5.0"
 
-jest-message-util@^25.3.0:
-  version "25.3.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-25.3.0.tgz#e3836826fe5ca538a337b87d9bd2648190867f85"
-  integrity sha512-5QNy9Id4WxJbRITEbA1T1kem9bk7y2fD0updZMSTNHtbEDnYOGLDPAuFBhFgVmOZpv0n6OMdVkK+WhyXEPCcOw==
+jest-message-util@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.5.0.tgz#1f776cac3aca332ab8dd2e3b41625435085c900e"
+  integrity sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^25.3.0"
-    "@types/stack-utils" "^1.0.1"
-    chalk "^3.0.0"
-    micromatch "^4.0.2"
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^29.5.0"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^29.5.0"
     slash "^3.0.0"
-    stack-utils "^1.0.1"
+    stack-utils "^2.0.3"
 
-jest-regex-util@^25.2.6:
-  version "25.2.6"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-25.2.6.tgz#d847d38ba15d2118d3b06390056028d0f2fd3964"
-  integrity sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==
+jest-util@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f"
+  integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==
+  dependencies:
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
 
 js-levenshtein@^1.1.3:
   version "1.1.6"
@@ -4268,13 +4337,13 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+micromatch@^4.0.4:
+  version "4.0.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
   dependencies:
-    braces "^3.0.1"
-    picomatch "^2.0.5"
+    braces "^3.0.2"
+    picomatch "^2.3.1"
 
 miller-rabin@^4.0.0:
   version "4.0.1"
@@ -4904,10 +4973,10 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.5:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a"
-  integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==
+picomatch@^2.2.3, picomatch@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
 pidtree@^0.3.0:
   version "0.3.0"
@@ -4953,15 +5022,14 @@ pretty-bytes@^5.6.0:
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
-pretty-format@^25.3.0:
-  version "25.3.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.3.0.tgz#d0a4f988ff4a6cd350342fdabbb809aeb4d49ad5"
-  integrity sha512-wToHwF8bkQknIcFkBqNfKu4+UZqnrLn/Vr+wwKQwwvPzkBfDDKp/qIabFqdgtoi5PEnM8LFByVsOrHoa3SpTVA==
+pretty-format@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.5.0.tgz#283134e74f70e2e3e7229336de0e4fce94ccde5a"
+  integrity sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==
   dependencies:
-    "@jest/types" "^25.3.0"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^16.12.0"
+    "@jest/schemas" "^29.4.3"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
 
 private@^0.1.8:
   version "0.1.8"
@@ -5073,10 +5141,10 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-is@^16.12.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
-  integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
+react-is@^18.0.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
+  integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
 read-only-stream@^2.0.0:
   version "2.0.0"
@@ -5565,10 +5633,12 @@ stack-generator@^2.0.1:
   dependencies:
     stackframe "^1.0.4"
 
-stack-utils@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
-  integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
+stack-utils@^2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.6.tgz#aaf0748169c02fc33c8232abccf933f54a1cc34f"
+  integrity sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==
+  dependencies:
+    escape-string-regexp "^2.0.0"
 
 stackframe@^1.0.4:
   version "1.0.4"

From 578d7f47ef1c3d4c6d1c15d1900d2501009a57f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 21:09:27 +0000
Subject: [PATCH 83/91] Bump @babel/preset-env from 7.12.7 to 7.21.4

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.12.7 to 7.21.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.21.4/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |    2 +-
 yarn.lock    | 1504 +++++++++++++++++++++++++++-----------------------
 2 files changed, 821 insertions(+), 685 deletions(-)

diff --git a/package.json b/package.json
index 9092a996e..77ba5e674 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.9.0",
-    "@babel/preset-env": "^7.12.7",
+    "@babel/preset-env": "^7.21.4",
     "@babel/register": "^7.12.10",
     "@faker-js/faker": "5.1.0",
     "auto-changelog": "^2.3.0",
diff --git a/yarn.lock b/yarn.lock
index 5aeaf647f..3b9a18568 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,24 +9,17 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/code-frame@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
-  integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
-"@babel/code-frame@^7.12.13":
+"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
   integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
-  integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f"
+  integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==
 
 "@babel/core@7.4.5":
   version "7.4.5"
@@ -70,14 +63,15 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
-  integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
+"@babel/generator@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc"
+  integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==
   dependencies:
-    "@babel/types" "^7.12.5"
+    "@babel/types" "^7.21.4"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
-    source-map "^0.5.0"
 
 "@babel/generator@^7.4.4", "@babel/generator@^7.9.0":
   version "7.9.4"
@@ -89,20 +83,20 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/helper-annotate-as-pure@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
-  integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==
+"@babel/helper-annotate-as-pure@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
+  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
-  integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
+  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/helper-explode-assignable-expression" "^7.18.6"
+    "@babel/types" "^7.18.9"
 
 "@babel/helper-builder-react-jsx@^7.3.0":
   version "7.3.0"
@@ -112,26 +106,30 @@
     "@babel/types" "^7.3.0"
     esutils "^2.0.0"
 
-"@babel/helper-compilation-targets@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
-  integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656"
+  integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==
   dependencies:
-    "@babel/compat-data" "^7.12.5"
-    "@babel/helper-validator-option" "^7.12.1"
-    browserslist "^4.14.5"
-    semver "^5.5.0"
+    "@babel/compat-data" "^7.21.4"
+    "@babel/helper-validator-option" "^7.21.0"
+    browserslist "^4.21.3"
+    lru-cache "^5.1.1"
+    semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e"
-  integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz#3a017163dc3c2ba7deb9a7950849a9586ea24c18"
+  integrity sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==
   dependencies:
-    "@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-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.21.0"
+    "@babel/helper-member-expression-to-functions" "^7.21.0"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.20.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/helper-split-export-declaration" "^7.18.6"
 
 "@babel/helper-create-class-features-plugin@^7.3.0":
   version "7.5.5"
@@ -145,29 +143,37 @@
     "@babel/helper-replace-supers" "^7.5.5"
     "@babel/helper-split-export-declaration" "^7.4.4"
 
-"@babel/helper-create-regexp-features-plugin@^7.12.1":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f"
-  integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz#40411a8ab134258ad2cf3a3d987ec6aa0723cee5"
+  integrity sha512-M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    regexpu-core "^4.7.1"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    regexpu-core "^5.3.1"
 
-"@babel/helper-define-map@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
-  integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==
+"@babel/helper-define-polyfill-provider@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
+  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
   dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/types" "^7.10.5"
-    lodash "^4.17.19"
+    "@babel/helper-compilation-targets" "^7.17.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
+    debug "^4.1.1"
+    lodash.debounce "^4.0.8"
+    resolve "^1.14.2"
+    semver "^6.1.2"
 
-"@babel/helper-explode-assignable-expression@^7.10.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633"
-  integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==
+"@babel/helper-environment-visitor@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
+  integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
+
+"@babel/helper-explode-assignable-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
+  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
   dependencies:
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.18.6"
 
 "@babel/helper-function-name@^7.1.0":
   version "7.1.0"
@@ -178,14 +184,13 @@
     "@babel/template" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@babel/helper-function-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
-  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
+  integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
   dependencies:
-    "@babel/helper-get-function-arity" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/template" "^7.20.7"
+    "@babel/types" "^7.21.0"
 
 "@babel/helper-function-name@^7.8.3":
   version "7.8.3"
@@ -203,13 +208,6 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-get-function-arity@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
-  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
-  dependencies:
-    "@babel/types" "^7.10.4"
-
 "@babel/helper-get-function-arity@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
@@ -217,19 +215,19 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-hoist-variables@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
-  integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==
+"@babel/helper-hoist-variables@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
+  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
   dependencies:
-    "@babel/types" "^7.10.4"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-member-expression-to-functions@^7.12.1":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.7.tgz#aa77bd0396ec8114e5e30787efa78599d874a855"
-  integrity sha512-DCsuPyeWxeHgh1Dus7APn7iza42i/qXqiFPWyBDdOFtvS581JQePsc1F/nD+fHrcswhLlRc2UpYS1NwERxZhHw==
+"@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5"
+  integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==
   dependencies:
-    "@babel/types" "^7.12.7"
+    "@babel/types" "^7.21.0"
 
 "@babel/helper-member-expression-to-functions@^7.5.5":
   version "7.5.5"
@@ -245,27 +243,26 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5", "@babel/helper-module-imports@^7.8.3":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
-  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.8.3":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af"
+  integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==
   dependencies:
-    "@babel/types" "^7.12.5"
+    "@babel/types" "^7.21.4"
 
-"@babel/helper-module-transforms@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
-  integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2":
+  version "7.21.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
+  integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
   dependencies:
-    "@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/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
-    lodash "^4.17.19"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.2"
+    "@babel/types" "^7.21.2"
 
 "@babel/helper-module-transforms@^7.9.0":
   version "7.9.0"
@@ -287,12 +284,12 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-optimise-call-expression@^7.10.4":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.7.tgz#7f94ae5e08721a49467346aa04fd22f750033b9c"
-  integrity sha512-I5xc9oSJ2h59OwyUqjv95HRyzxj53DAubUERgQMrpcCEYQyToeHA+NEcUEsVWB4j53RDeskeBJ0SgRAYHDBckw==
+"@babel/helper-optimise-call-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
+  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
   dependencies:
-    "@babel/types" "^7.12.7"
+    "@babel/types" "^7.18.6"
 
 "@babel/helper-optimise-call-expression@^7.8.3":
   version "7.8.3"
@@ -301,29 +298,32 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
-  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
+  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
 
-"@babel/helper-remap-async-to-generator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
-  integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==
+"@babel/helper-remap-async-to-generator@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
+  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-wrap-function" "^7.10.4"
-    "@babel/types" "^7.12.1"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-wrap-function" "^7.18.9"
+    "@babel/types" "^7.18.9"
 
-"@babel/helper-replace-supers@^7.12.1":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9"
-  integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==
+"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331"
+  integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==
   dependencies:
-    "@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"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-member-expression-to-functions" "^7.20.7"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.7"
+    "@babel/types" "^7.20.7"
 
 "@babel/helper-replace-supers@^7.5.5":
   version "7.5.5"
@@ -345,12 +345,12 @@
     "@babel/traverse" "^7.8.6"
     "@babel/types" "^7.8.6"
 
-"@babel/helper-simple-access@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136"
-  integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==
+"@babel/helper-simple-access@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
+  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
   dependencies:
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.20.2"
 
 "@babel/helper-simple-access@^7.8.3":
   version "7.8.3"
@@ -360,19 +360,19 @@
     "@babel/template" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
-  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
+  integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
   dependencies:
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.20.0"
 
-"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
-  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
+"@babel/helper-split-export-declaration@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
+  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
   dependencies:
-    "@babel/types" "^7.11.0"
+    "@babel/types" "^7.18.6"
 
 "@babel/helper-split-export-declaration@^7.4.4":
   version "7.4.4"
@@ -388,30 +388,30 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-validator-identifier@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
-  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
+"@babel/helper-string-parser@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
+  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
-"@babel/helper-validator-identifier@^7.18.6":
+"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
-"@babel/helper-validator-option@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9"
-  integrity sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==
+"@babel/helper-validator-option@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
+  integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
 
-"@babel/helper-wrap-function@^7.10.4":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9"
-  integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==
+"@babel/helper-wrap-function@^7.18.9":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3"
+  integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==
   dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
 
 "@babel/helpers@^7.4.4", "@babel/helpers@^7.9.0":
   version "7.9.2"
@@ -422,15 +422,6 @@
     "@babel/traverse" "^7.9.0"
     "@babel/types" "^7.9.0"
 
-"@babel/highlight@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
-  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
 "@babel/highlight@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
@@ -449,24 +440,41 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
-  integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
+"@babel/parser@^7.20.7", "@babel/parser@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17"
+  integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
 
 "@babel/parser@^7.4.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
   version "7.9.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
   integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
 
-"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e"
-  integrity sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
+  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.12.1"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1"
+  integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.20.7"
+
+"@babel/plugin-proposal-async-generator-functions@^7.2.0", "@babel/plugin-proposal-async-generator-functions@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
+  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-remap-async-to-generator" "^7.18.9"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
 
 "@babel/plugin-proposal-class-properties@7.3.0":
   version "7.3.0"
@@ -476,60 +484,69 @@
     "@babel/helper-create-class-features-plugin" "^7.3.0"
     "@babel/helper-plugin-utils" "^7.0.0"
 
-"@babel/plugin-proposal-class-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de"
-  integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==
+"@babel/plugin-proposal-class-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-dynamic-import@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"
-  integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==
+"@babel/plugin-proposal-class-static-block@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
+  integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-export-namespace-from@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"
-  integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==
+"@babel/plugin-proposal-dynamic-import@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
+  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
+
+"@babel/plugin-proposal-export-namespace-from@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
+  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.12.1", "@babel/plugin-proposal-json-strings@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c"
-  integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==
+"@babel/plugin-proposal-json-strings@^7.18.6", "@babel/plugin-proposal-json-strings@^7.2.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
+  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751"
-  integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==
+"@babel/plugin-proposal-logical-assignment-operators@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
+  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c"
-  integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b"
-  integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==
+"@babel/plugin-proposal-numeric-separator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
+  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
 "@babel/plugin-proposal-object-rest-spread@7.3.2":
@@ -540,66 +557,85 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
 
-"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
-  integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==
+"@babel/plugin-proposal-object-rest-spread@^7.20.7", "@babel/plugin-proposal-object-rest-spread@^7.4.4":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
+  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-transform-parameters" "^7.12.1"
+    "@babel/compat-data" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-transform-parameters" "^7.20.7"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.12.1", "@babel/plugin-proposal-optional-catch-binding@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942"
-  integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==
+"@babel/plugin-proposal-optional-catch-binding@^7.18.6", "@babel/plugin-proposal-optional-catch-binding@^7.2.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
+  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
-  integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
+"@babel/plugin-proposal-optional-chaining@^7.20.7", "@babel/plugin-proposal-optional-chaining@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
+  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389"
-  integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==
+"@babel/plugin-proposal-private-methods@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
+  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072"
-  integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==
+"@babel/plugin-proposal-private-property-in-object@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc"
+  integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-syntax-async-generators@^7.2.0", "@babel/plugin-syntax-async-generators@^7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.0.tgz#e6c3dba5a61ecf72ba00a3f3f5f1234989a58e6a"
-  integrity sha512-a8w8k7pK8nYhem07rXdAq03T+DlTX8LFojUptrh9JEx80AgLqGiuoFIyQOGTWif39kFnDOQqbzl1s6KQqrfV+A==
+"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
+  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-syntax-async-generators@^7.2.0", "@babel/plugin-syntax-async-generators@^7.8.4":
+  version "7.8.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978"
-  integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==
+"@babel/plugin-syntax-class-properties@^7.12.13":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.12.13"
 
-"@babel/plugin-syntax-dynamic-import@^7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.0.tgz#3a6c1cd36af923db602df83c5aa72e08bb14353a"
-  integrity sha512-Mx2RzpCHJaBfmFdA2abXDKRHVJdzJ6R0Wqwb6TxCgM7NRR5wcC4cyiAsRL7Ga+lwG8GG1cKvb+4ENjic8y15jA==
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-syntax-dynamic-import@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
@@ -610,10 +646,17 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-json-strings@^7.2.0", "@babel/plugin-syntax-json-strings@^7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.0.tgz#7f798eb7e8cfd3821388120679d23d530bae6e53"
-  integrity sha512-LPykaAbH86L5NnDfCRSpNxtEHZk+6GaFzXfWEFU/6R4v69EXQr6GOp7hwH+Uw0QlYVN++s6TukTJ3flFcspahA==
+"@babel/plugin-syntax-import-assertions@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
+  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.19.0"
+
+"@babel/plugin-syntax-json-strings@^7.2.0", "@babel/plugin-syntax-json-strings@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
@@ -631,10 +674,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.0.tgz#5d8f24ecffa4ae74164e53264953c5ea8ba6d149"
-  integrity sha512-Rv2hnBToN6rbA9hO2a4vtwXZLzNa+TWkoSIMMvUezFz5+D9NPeX7SFrArwtFzzbwndmWiqboTr5rNpzAz0MPpA==
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
@@ -645,217 +688,225 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-object-rest-spread@^7.2.0", "@babel/plugin-syntax-object-rest-spread@^7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.0.tgz#9b37d580d459682364d8602494c69145b394fd4c"
-  integrity sha512-dt89fDlkfkTrQcy5KavMQPyF2A6tR0kYp8HAnIoQv5hO34iAUffHghP/hMGd7Gf/+uYTmLQO0ar7peX1SUWyIA==
+"@babel/plugin-syntax-object-rest-spread@^7.2.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.2.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.0.tgz#180c7bdd6b7fd81cc6d18269de12d5ddd60cabce"
-  integrity sha512-EIgJVy+u1RvR2gJfX4ReLwAupO/twllUue1wPrRxhu18+eC3bGTEcOSXLQdaE9ya9NG1rE0eQs0GSiloUGFEwg==
+"@babel/plugin-syntax-optional-catch-binding@^7.2.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-chaining@^7.8.0":
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.0.tgz#c40f4d4d6a4f5e71d2bfd949b0a7f1e1e6792fe0"
-  integrity sha512-LV1c+TTAO8Vawe3t+WXBHYWbS7endP8MSlqKPKEZOyWPEJX2akl3jfvFG828/OE7RpyoC3JXfLJDFj/jN7A8hg==
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0"
-  integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.12.1", "@babel/plugin-transform-arrow-functions@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"
-  integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==
+"@babel/plugin-syntax-top-level-await@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-async-to-generator@^7.12.1", "@babel/plugin-transform-async-to-generator@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1"
-  integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==
+"@babel/plugin-transform-arrow-functions@^7.2.0", "@babel/plugin-transform-arrow-functions@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551"
+  integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==
   dependencies:
-    "@babel/helper-module-imports" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-block-scoped-functions@^7.12.1", "@babel/plugin-transform-block-scoped-functions@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"
-  integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==
+"@babel/plugin-transform-async-to-generator@^7.20.7", "@babel/plugin-transform-async-to-generator@^7.4.4":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354"
+  integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-remap-async-to-generator" "^7.18.9"
 
-"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1"
-  integrity sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==
+"@babel/plugin-transform-block-scoped-functions@^7.18.6", "@babel/plugin-transform-block-scoped-functions@^7.2.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
+  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6"
-  integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==
+"@babel/plugin-transform-block-scoping@^7.21.0", "@babel/plugin-transform-block-scoping@^7.4.4":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02"
+  integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==
   dependencies:
-    "@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.12.1"
-    "@babel/helper-split-export-declaration" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.20.2"
+
+"@babel/plugin-transform-classes@^7.21.0", "@babel/plugin-transform-classes@^7.4.4":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665"
+  integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.21.0"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-replace-supers" "^7.20.7"
+    "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.12.1", "@babel/plugin-transform-computed-properties@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852"
-  integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==
+"@babel/plugin-transform-computed-properties@^7.2.0", "@babel/plugin-transform-computed-properties@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa"
+  integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/template" "^7.20.7"
 
-"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847"
-  integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==
+"@babel/plugin-transform-destructuring@^7.21.3", "@babel/plugin-transform-destructuring@^7.4.4":
+  version "7.21.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401"
+  integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975"
-  integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==
+"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
+  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-duplicate-keys@^7.12.1", "@babel/plugin-transform-duplicate-keys@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228"
-  integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==
+"@babel/plugin-transform-duplicate-keys@^7.18.9", "@babel/plugin-transform-duplicate-keys@^7.2.0":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
+  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-exponentiation-operator@^7.12.1", "@babel/plugin-transform-exponentiation-operator@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"
-  integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==
+"@babel/plugin-transform-exponentiation-operator@^7.18.6", "@babel/plugin-transform-exponentiation-operator@^7.2.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
+  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa"
-  integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==
+"@babel/plugin-transform-for-of@^7.21.0", "@babel/plugin-transform-for-of@^7.4.4":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e"
+  integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-function-name@^7.12.1", "@babel/plugin-transform-function-name@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667"
-  integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==
+"@babel/plugin-transform-function-name@^7.18.9", "@babel/plugin-transform-function-name@^7.4.4":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
+  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
   dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-compilation-targets" "^7.18.9"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-literals@^7.12.1", "@babel/plugin-transform-literals@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"
-  integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==
+"@babel/plugin-transform-literals@^7.18.9", "@babel/plugin-transform-literals@^7.2.0":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
+  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-member-expression-literals@^7.12.1", "@babel/plugin-transform-member-expression-literals@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad"
-  integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==
+"@babel/plugin-transform-member-expression-literals@^7.18.6", "@babel/plugin-transform-member-expression-literals@^7.2.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
+  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9"
-  integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==
+"@babel/plugin-transform-modules-amd@^7.2.0", "@babel/plugin-transform-modules-amd@^7.20.11":
+  version "7.20.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a"
+  integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==
   dependencies:
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.20.11"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648"
-  integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==
+"@babel/plugin-transform-modules-commonjs@^7.21.2", "@babel/plugin-transform-modules-commonjs@^7.4.4":
+  version "7.21.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7"
+  integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-simple-access" "^7.12.1"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.21.2"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-simple-access" "^7.20.2"
 
-"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086"
-  integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==
+"@babel/plugin-transform-modules-systemjs@^7.20.11", "@babel/plugin-transform-modules-systemjs@^7.4.4":
+  version "7.20.11"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e"
+  integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.10.4"
-    "@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"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.20.11"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-validator-identifier" "^7.19.1"
 
-"@babel/plugin-transform-modules-umd@^7.12.1", "@babel/plugin-transform-modules-umd@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"
-  integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==
+"@babel/plugin-transform-modules-umd@^7.18.6", "@babel/plugin-transform-modules-umd@^7.2.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
+  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.4.5":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753"
-  integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.20.5", "@babel/plugin-transform-named-capturing-groups-regex@^7.4.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
+  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
+    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-new-target@^7.12.1", "@babel/plugin-transform-new-target@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0"
-  integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==
+"@babel/plugin-transform-new-target@^7.18.6", "@babel/plugin-transform-new-target@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
+  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-object-super@^7.12.1", "@babel/plugin-transform-object-super@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e"
-  integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==
+"@babel/plugin-transform-object-super@^7.18.6", "@babel/plugin-transform-object-super@^7.2.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
+  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d"
-  integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==
+"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3", "@babel/plugin-transform-parameters@^7.4.4":
+  version "7.21.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db"
+  integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-property-literals@^7.12.1", "@babel/plugin-transform-property-literals@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd"
-  integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==
+"@babel/plugin-transform-property-literals@^7.18.6", "@babel/plugin-transform-property-literals@^7.2.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
+  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-react-display-name@^7.0.0":
   version "7.2.0"
@@ -889,19 +940,20 @@
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
-"@babel/plugin-transform-regenerator@^7.12.1", "@babel/plugin-transform-regenerator@^7.4.5":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753"
-  integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==
+"@babel/plugin-transform-regenerator@^7.20.5", "@babel/plugin-transform-regenerator@^7.4.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d"
+  integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
   dependencies:
-    regenerator-transform "^0.14.2"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    regenerator-transform "^0.15.1"
 
-"@babel/plugin-transform-reserved-words@^7.12.1", "@babel/plugin-transform-reserved-words@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"
-  integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==
+"@babel/plugin-transform-reserved-words@^7.18.6", "@babel/plugin-transform-reserved-words@^7.2.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
+  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-runtime@7.2.0":
   version "7.2.0"
@@ -913,56 +965,56 @@
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3"
-  integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==
+"@babel/plugin-transform-shorthand-properties@^7.18.6", "@babel/plugin-transform-shorthand-properties@^7.2.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
+  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"
-  integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==
+"@babel/plugin-transform-spread@^7.2.0", "@babel/plugin-transform-spread@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e"
+  integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
 
-"@babel/plugin-transform-sticky-regex@^7.12.7", "@babel/plugin-transform-sticky-regex@^7.2.0":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad"
-  integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==
+"@babel/plugin-transform-sticky-regex@^7.18.6", "@babel/plugin-transform-sticky-regex@^7.2.0":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
+  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843"
-  integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==
+"@babel/plugin-transform-template-literals@^7.18.9", "@babel/plugin-transform-template-literals@^7.4.4":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
+  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-typeof-symbol@^7.12.1", "@babel/plugin-transform-typeof-symbol@^7.2.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a"
-  integrity sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==
+"@babel/plugin-transform-typeof-symbol@^7.18.9", "@babel/plugin-transform-typeof-symbol@^7.2.0":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
+  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-escapes@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
-  integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==
+"@babel/plugin-transform-unicode-escapes@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
+  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-regex@^7.12.1", "@babel/plugin-transform-unicode-regex@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb"
-  integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==
+"@babel/plugin-transform-unicode-regex@^7.18.6", "@babel/plugin-transform-unicode-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
+  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/preset-env@7.4.5":
   version "7.4.5"
@@ -1018,82 +1070,91 @@
     js-levenshtein "^1.1.3"
     semver "^5.5.0"
 
-"@babel/preset-env@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz#54ea21dbe92caf6f10cb1a0a576adc4ebf094b55"
-  integrity sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==
+"@babel/preset-env@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.4.tgz#a952482e634a8dd8271a3fe5459a16eb10739c58"
+  integrity sha512-2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw==
   dependencies:
-    "@babel/compat-data" "^7.12.7"
-    "@babel/helper-compilation-targets" "^7.12.5"
-    "@babel/helper-module-imports" "^7.12.5"
-    "@babel/helper-plugin-utils" "^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.7"
-    "@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.7"
-    "@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.12.1"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
+    "@babel/compat-data" "^7.21.4"
+    "@babel/helper-compilation-targets" "^7.21.4"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-validator-option" "^7.21.0"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7"
+    "@babel/plugin-proposal-async-generator-functions" "^7.20.7"
+    "@babel/plugin-proposal-class-properties" "^7.18.6"
+    "@babel/plugin-proposal-class-static-block" "^7.21.0"
+    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
+    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
+    "@babel/plugin-proposal-json-strings" "^7.18.6"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.20.7"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
+    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
+    "@babel/plugin-proposal-object-rest-spread" "^7.20.7"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
+    "@babel/plugin-proposal-optional-chaining" "^7.21.0"
+    "@babel/plugin-proposal-private-methods" "^7.18.6"
+    "@babel/plugin-proposal-private-property-in-object" "^7.21.0"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
+    "@babel/plugin-syntax-async-generators" "^7.8.4"
+    "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+    "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
+    "@babel/plugin-syntax-import-assertions" "^7.20.0"
+    "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
+    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@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.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.7"
-    "@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.12.7"
-    core-js-compat "^3.7.0"
-    semver "^5.5.0"
+    "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+    "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
+    "@babel/plugin-syntax-optional-chaining" "^7.8.3"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-transform-arrow-functions" "^7.20.7"
+    "@babel/plugin-transform-async-to-generator" "^7.20.7"
+    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
+    "@babel/plugin-transform-block-scoping" "^7.21.0"
+    "@babel/plugin-transform-classes" "^7.21.0"
+    "@babel/plugin-transform-computed-properties" "^7.20.7"
+    "@babel/plugin-transform-destructuring" "^7.21.3"
+    "@babel/plugin-transform-dotall-regex" "^7.18.6"
+    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
+    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
+    "@babel/plugin-transform-for-of" "^7.21.0"
+    "@babel/plugin-transform-function-name" "^7.18.9"
+    "@babel/plugin-transform-literals" "^7.18.9"
+    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
+    "@babel/plugin-transform-modules-amd" "^7.20.11"
+    "@babel/plugin-transform-modules-commonjs" "^7.21.2"
+    "@babel/plugin-transform-modules-systemjs" "^7.20.11"
+    "@babel/plugin-transform-modules-umd" "^7.18.6"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5"
+    "@babel/plugin-transform-new-target" "^7.18.6"
+    "@babel/plugin-transform-object-super" "^7.18.6"
+    "@babel/plugin-transform-parameters" "^7.21.3"
+    "@babel/plugin-transform-property-literals" "^7.18.6"
+    "@babel/plugin-transform-regenerator" "^7.20.5"
+    "@babel/plugin-transform-reserved-words" "^7.18.6"
+    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
+    "@babel/plugin-transform-spread" "^7.20.7"
+    "@babel/plugin-transform-sticky-regex" "^7.18.6"
+    "@babel/plugin-transform-template-literals" "^7.18.9"
+    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
+    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
+    "@babel/plugin-transform-unicode-regex" "^7.18.6"
+    "@babel/preset-modules" "^0.1.5"
+    "@babel/types" "^7.21.4"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
+    core-js-compat "^3.25.1"
+    semver "^6.3.0"
 
-"@babel/preset-modules@^0.1.3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
-  integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
+"@babel/preset-modules@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
+  integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
     "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -1123,6 +1184,11 @@
     pirates "^4.0.0"
     source-map-support "^0.5.16"
 
+"@babel/regjsgen@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
+  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
+
 "@babel/runtime-corejs2@^7.2.0":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime-corejs2/-/runtime-corejs2-7.7.4.tgz#b9c2b1b5882762005785bc47740195a0ac780888"
@@ -1154,29 +1220,30 @@
     "@babel/parser" "^7.8.6"
     "@babel/types" "^7.8.6"
 
-"@babel/template@^7.10.4":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
-  integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
+"@babel/template@^7.18.10", "@babel/template@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
+  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
   dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/parser" "^7.12.7"
-    "@babel/types" "^7.12.7"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
 
-"@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.7.tgz#572a722408681cef17d6b0bef69ef2e728ca69f1"
-  integrity sha512-nMWaqsQEeSvMNypswUDzjqQ+0rR6pqCtoQpsqGJC4/Khm9cISwPTSpai57F6/jDaOoEGz8yE/WxcO3PV6tKSmQ==
+"@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.2":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36"
+  integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==
   dependencies:
-    "@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.7"
-    "@babel/types" "^7.12.7"
+    "@babel/code-frame" "^7.21.4"
+    "@babel/generator" "^7.21.4"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.21.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.21.4"
+    "@babel/types" "^7.21.4"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.19"
 
 "@babel/traverse@^7.4.5", "@babel/traverse@^7.5.5", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
   version "7.9.0"
@@ -1193,13 +1260,13 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
-  integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
+"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4"
+  integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.19"
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
 "@cypress/browserify-preprocessor@^2.1.1":
@@ -1332,6 +1399,38 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
+"@jridgewell/gen-mapping@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/resolve-uri@3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+
+"@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+
+"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+
+"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
+  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+  dependencies:
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
+
 "@samverschueren/stream-to-observable@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
@@ -1697,12 +1796,29 @@ babel-plugin-add-module-exports@1.0.0:
   optionalDependencies:
     chokidar "^2.0.4"
 
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
+babel-plugin-polyfill-corejs2@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
+  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
   dependencies:
-    object.assign "^4.1.0"
+    "@babel/compat-data" "^7.17.7"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    semver "^6.1.1"
+
+babel-plugin-polyfill-corejs3@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
+  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    core-js-compat "^3.25.1"
+
+babel-plugin-polyfill-regenerator@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
+  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
+  dependencies:
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
 
 babel-runtime@^6.11.6:
   version "6.26.0"
@@ -1950,16 +2066,15 @@ browserify@16.2.3, browserify@^16.1.0:
     vm-browserify "^1.0.0"
     xtend "^4.0.0"
 
-browserslist@^4.14.5, browserslist@^4.14.6, browserslist@^4.6.0:
-  version "4.14.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
-  integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
+browserslist@^4.21.3, browserslist@^4.21.5, browserslist@^4.6.0:
+  version "4.21.5"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
+  integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
   dependencies:
-    caniuse-lite "^1.0.30001157"
-    colorette "^1.2.1"
-    electron-to-chromium "^1.3.591"
-    escalade "^3.1.1"
-    node-releases "^1.1.66"
+    caniuse-lite "^1.0.30001449"
+    electron-to-chromium "^1.4.284"
+    node-releases "^2.0.8"
+    update-browserslist-db "^1.0.10"
 
 buffer-crc32@~0.2.3:
   version "0.2.13"
@@ -2019,10 +2134,10 @@ cachedir@^2.3.0:
   resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
   integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
 
-caniuse-lite@^1.0.30001157:
-  version "1.0.30001458"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001458.tgz"
-  integrity sha512-lQ1VlUUq5q9ro9X+5gOEyH7i3vm+AYVT1WDCVB69XOZ17KZRhnZ9J0Sqz7wTHQaLBJccNCHq8/Ww5LlOIZbB0w==
+caniuse-lite@^1.0.30001449:
+  version "1.0.30001474"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001474.tgz#13b6fe301a831fe666cce8ca4ef89352334133d5"
+  integrity sha512-iaIZ8gVrWfemh5DG3T9/YqarVZoYf0r188IjaGwx68j4Pf0SGY6CQkmJUIE+NZHkkecQGohzXmBGEwWDr9aM3Q==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -2249,11 +2364,6 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colorette@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
-  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
-
 colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
@@ -2365,13 +2475,12 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js-compat@^3.1.1, core-js-compat@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.7.0.tgz#8479c5d3d672d83f1f5ab94cf353e57113e065ed"
-  integrity sha512-V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==
+core-js-compat@^3.1.1, core-js-compat@^3.25.1:
+  version "3.30.0"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.30.0.tgz#99aa2789f6ed2debfa1df3232784126ee97f4d80"
+  integrity sha512-P5A2h/9mRYZFIAP+5Ab8ns6083IyVpSclU74UNvbGVQ8VM7n3n3/g2yF3AkKQ9NXz2O+ioxLbEWKnDtgsFamhg==
   dependencies:
-    browserslist "^4.14.6"
-    semver "7.0.0"
+    browserslist "^4.21.5"
 
 core-js@^2.4.0, core-js@^2.6.5:
   version "2.6.10"
@@ -2712,6 +2821,13 @@ debug@^3.0.1, debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
+debug@^4.1.1:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -2874,10 +2990,10 @@ ecdsa-sig-formatter@1.0.11:
   dependencies:
     safe-buffer "^5.0.1"
 
-electron-to-chromium@^1.3.591:
-  version "1.3.603"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.603.tgz#1b71bec27fb940eccd79245f6824c63d5f7e8abf"
-  integrity sha512-J8OHxOeJkoSLgBXfV9BHgKccgfLMHh+CoeRo6wJsi6m0k3otaxS/5vrHpMNSEYY4MISwewqanPOuhAtuE8riQQ==
+electron-to-chromium@^1.4.284:
+  version "1.4.351"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.351.tgz#949144993f3ed5c18601e37c786bb72540dbf9e9"
+  integrity sha512-W35n4jAsyj6OZGxeWe+gA6+2Md4jDO19fzfsRKEt3DBwIdlVTT8O9Uv8ojgUAoQeXASdgG9zMU+8n8Xg/W6dRQ==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -3678,6 +3794,13 @@ is-ci@^3.0.0:
   dependencies:
     ci-info "^3.1.1"
 
+is-core-module@^2.9.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
+  dependencies:
+    has "^1.0.3"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -4193,6 +4316,11 @@ lodash.clonedeep@4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
+lodash.debounce@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
+
 lodash.includes@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
@@ -4279,6 +4407,13 @@ lower-case@^1.1.1:
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
   integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
 make-dir@^2.0.0, make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -4608,10 +4743,10 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-node-releases@^1.1.66:
-  version "1.1.67"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
-  integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
+node-releases@^2.0.8:
+  version "2.0.10"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f"
+  integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==
 
 nopt@^4.0.1:
   version "4.0.1"
@@ -4712,11 +4847,6 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.11:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
 object-keys@^1.0.12:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"
@@ -4729,16 +4859,6 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -4935,6 +5055,11 @@ path-parse@^1.0.6:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
+path-parse@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
+
 path-platform@~0.11.15:
   version "0.11.15"
   resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2"
@@ -4973,6 +5098,11 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
 picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -5031,11 +5161,6 @@ pretty-format@^29.5.0:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
-private@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
-  integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
-
 process-nextick-args@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
@@ -5184,17 +5309,17 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-regenerate-unicode-properties@^8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec"
-  integrity sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
   dependencies:
-    regenerate "^1.4.0"
+    regenerate "^1.4.2"
 
-regenerate@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
-  integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
+regenerate@^1.4.2:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
@@ -5211,13 +5336,12 @@ regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
   integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
 
-regenerator-transform@^0.14.2:
-  version "0.14.2"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.2.tgz#949d9d87468ff88d5a7e4734ebb994a892de1ff2"
-  integrity sha512-V4+lGplCM/ikqi5/mkkpJ06e9Bujq1NFmNLvsCs56zg3ZbzrnUzAtizZ24TXxtRX/W2jcdScwQCnbL0CICTFkQ==
+regenerator-transform@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
+  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
   dependencies:
     "@babel/runtime" "^7.8.4"
-    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -5227,27 +5351,22 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexpu-core@^4.7.1:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
-  integrity sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==
+regexpu-core@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.3.2.tgz#11a2b06884f3527aec3e93dbbf4a3b958a95546b"
+  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
   dependencies:
-    regenerate "^1.4.0"
-    regenerate-unicode-properties "^8.2.0"
-    regjsgen "^0.5.1"
-    regjsparser "^0.6.4"
-    unicode-match-property-ecmascript "^1.0.4"
-    unicode-match-property-value-ecmascript "^1.2.0"
+    "@babel/regjsgen" "^0.8.0"
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsparser "^0.9.1"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.1.0"
 
-regjsgen@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz#92ff295fb1deecbf6ecdab2543d207e91aa33733"
-  integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
-
-regjsparser@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.4.tgz#a769f8684308401a66e9b529d2436ff4d0666272"
-  integrity sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -5300,6 +5419,15 @@ resolve@^1.1.4, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0,
   dependencies:
     path-parse "^1.0.6"
 
+resolve@^1.14.2:
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
+  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
+  dependencies:
+    is-core-module "^2.9.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 restore-cursor@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
@@ -5387,12 +5515,7 @@ seed-random@~2.2.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
-semver@^6.3.0:
+semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -5845,6 +5968,11 @@ supports-color@^8.1.1:
   dependencies:
     has-flag "^4.0.0"
 
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
 symbol-observable@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
@@ -6051,28 +6179,28 @@ undeclared-identifiers@^1.1.2:
     simple-concat "^1.0.0"
     xtend "^4.0.1"
 
-unicode-canonical-property-names-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
-  integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
+unicode-canonical-property-names-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+  integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
-unicode-match-property-ecmascript@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
-  integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
+unicode-match-property-ecmascript@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+  integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
   dependencies:
-    unicode-canonical-property-names-ecmascript "^1.0.4"
-    unicode-property-aliases-ecmascript "^1.0.4"
+    unicode-canonical-property-names-ecmascript "^2.0.0"
+    unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz#0d91f600eeeb3096aa962b1d6fc88876e64ea531"
-  integrity sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==
+unicode-match-property-value-ecmascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
+  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
 
-unicode-property-aliases-ecmascript@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
-  integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
+unicode-property-aliases-ecmascript@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
+  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
 union-value@^1.0.0:
   version "1.0.0"
@@ -6112,6 +6240,14 @@ upath@^1.1.1:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
   integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
 
+update-browserslist-db@^1.0.10:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
+  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 upper-case@^1.0.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"

From 2d3b6331bb283399031d735ed9010440d4629aab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Apr 2023 22:55:44 +0000
Subject: [PATCH 84/91] Bump @babel/core from 7.9.0 to 7.21.4

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.9.0 to 7.21.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.21.4/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json |   2 +-
 yarn.lock    | 255 +++++++++++++--------------------------------------
 2 files changed, 65 insertions(+), 192 deletions(-)

diff --git a/package.json b/package.json
index 77ba5e674..d217d5b1d 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "release": "yarn version --no-git-tag-version --no-commit-hooks --no-commit && auto-changelog --latest-version $(node -p -e \"require('./package.json').version\") && cd backend && yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version $(node -p -e \"require('./../package.json').version\") && cd ../webapp && yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version $(node -p -e \"require('./../package.json').version\") && cd ../webapp/maintenance/source && yarn version --no-git-tag-version --no-commit-hooks --no-commit --new-version $(node -p -e \"require('./../../../package.json').version\")"
   },
   "devDependencies": {
-    "@babel/core": "^7.9.0",
+    "@babel/core": "^7.21.4",
     "@babel/preset-env": "^7.21.4",
     "@babel/register": "^7.12.10",
     "@faker-js/faker": "5.1.0",
diff --git a/yarn.lock b/yarn.lock
index 3b9a18568..fb030bd08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,14 +2,15 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e"
-  integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==
+"@ampproject/remapping@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
+  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
   dependencies:
-    "@babel/highlight" "^7.8.3"
+    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
   integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
@@ -41,29 +42,28 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
-  integrity sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==
+"@babel/core@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659"
+  integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==
   dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.0"
-    "@babel/helper-module-transforms" "^7.9.0"
-    "@babel/helpers" "^7.9.0"
-    "@babel/parser" "^7.9.0"
-    "@babel/template" "^7.8.6"
-    "@babel/traverse" "^7.9.0"
-    "@babel/types" "^7.9.0"
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.21.4"
+    "@babel/generator" "^7.21.4"
+    "@babel/helper-compilation-targets" "^7.21.4"
+    "@babel/helper-module-transforms" "^7.21.2"
+    "@babel/helpers" "^7.21.0"
+    "@babel/parser" "^7.21.4"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.4"
+    "@babel/types" "^7.21.4"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.13"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.2"
+    semver "^6.3.0"
 
-"@babel/generator@^7.21.4":
+"@babel/generator@^7.21.4", "@babel/generator@^7.4.4":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc"
   integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==
@@ -73,16 +73,6 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.4.4", "@babel/generator@^7.9.0":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz#12441e90c3b3c4159cdecf312075bf1a8ce2dbce"
-  integrity sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==
-  dependencies:
-    "@babel/types" "^7.9.0"
-    jsesc "^2.5.1"
-    lodash "^4.17.13"
-    source-map "^0.5.0"
-
 "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
@@ -192,15 +182,6 @@
     "@babel/template" "^7.20.7"
     "@babel/types" "^7.21.0"
 
-"@babel/helper-function-name@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
-  integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.8.3"
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-get-function-arity@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
@@ -208,13 +189,6 @@
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@babel/helper-get-function-arity@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5"
-  integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
@@ -236,14 +210,7 @@
   dependencies:
     "@babel/types" "^7.5.5"
 
-"@babel/helper-member-expression-to-functions@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c"
-  integrity sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.8.3":
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.18.6":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af"
   integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==
@@ -264,19 +231,6 @@
     "@babel/traverse" "^7.21.2"
     "@babel/types" "^7.21.2"
 
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5"
-  integrity sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.8.3"
-    "@babel/helper-replace-supers" "^7.8.6"
-    "@babel/helper-simple-access" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/template" "^7.8.6"
-    "@babel/types" "^7.9.0"
-    lodash "^4.17.13"
-
 "@babel/helper-optimise-call-expression@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
@@ -291,13 +245,6 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-optimise-call-expression@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9"
-  integrity sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
@@ -335,16 +282,6 @@
     "@babel/traverse" "^7.5.5"
     "@babel/types" "^7.5.5"
 
-"@babel/helper-replace-supers@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8"
-  integrity sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.8.3"
-    "@babel/helper-optimise-call-expression" "^7.8.3"
-    "@babel/traverse" "^7.8.6"
-    "@babel/types" "^7.8.6"
-
 "@babel/helper-simple-access@^7.20.2":
   version "7.20.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
@@ -352,14 +289,6 @@
   dependencies:
     "@babel/types" "^7.20.2"
 
-"@babel/helper-simple-access@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
-  integrity sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==
-  dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
   version "7.20.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
@@ -381,13 +310,6 @@
   dependencies:
     "@babel/types" "^7.4.4"
 
-"@babel/helper-split-export-declaration@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
-  integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==
-  dependencies:
-    "@babel/types" "^7.8.3"
-
 "@babel/helper-string-parser@^7.19.4":
   version "7.19.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
@@ -413,14 +335,14 @@
     "@babel/traverse" "^7.20.5"
     "@babel/types" "^7.20.5"
 
-"@babel/helpers@^7.4.4", "@babel/helpers@^7.9.0":
-  version "7.9.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"
-  integrity sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==
+"@babel/helpers@^7.21.0", "@babel/helpers@^7.4.4":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e"
+  integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
   dependencies:
-    "@babel/template" "^7.8.3"
-    "@babel/traverse" "^7.9.0"
-    "@babel/types" "^7.9.0"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.0"
+    "@babel/types" "^7.21.0"
 
 "@babel/highlight@^7.18.6":
   version "7.18.6"
@@ -431,25 +353,11 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797"
-  integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==
-  dependencies:
-    chalk "^2.0.0"
-    esutils "^2.0.2"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.20.7", "@babel/parser@^7.21.4":
+"@babel/parser@^7.20.7", "@babel/parser@^7.21.4", "@babel/parser@^7.4.5":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17"
   integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
 
-"@babel/parser@^7.4.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0":
-  version "7.9.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8"
-  integrity sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==
-
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -1211,16 +1119,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.1.0", "@babel/template@^7.4.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b"
-  integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/parser" "^7.8.6"
-    "@babel/types" "^7.8.6"
-
-"@babel/template@^7.18.10", "@babel/template@^7.20.7":
+"@babel/template@^7.1.0", "@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.4.4":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
   integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
@@ -1229,7 +1128,7 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.2":
+"@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4", "@babel/traverse@^7.4.5", "@babel/traverse@^7.5.5":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36"
   integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==
@@ -1245,22 +1144,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.4.5", "@babel/traverse@^7.5.5", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0":
-  version "7.9.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz#d3882c2830e513f4fe4cec9fe76ea1cc78747892"
-  integrity sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.9.0"
-    "@babel/helper-function-name" "^7.8.3"
-    "@babel/helper-split-export-declaration" "^7.8.3"
-    "@babel/parser" "^7.9.0"
-    "@babel/types" "^7.9.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.13"
-
-"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0":
+"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.5.5":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4"
   integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==
@@ -1399,6 +1283,14 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
+"@jridgewell/gen-mapping@^0.1.0":
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
+  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
@@ -1413,7 +1305,7 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
-"@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
@@ -2793,7 +2685,14 @@ dayjs@^1.10.4:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.4.tgz#8e544a9b8683f61783f570980a8a80eaf54ab1e2"
   integrity sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw==
 
-debug@4, debug@4.1.1, debug@^4.1.0:
+debug@4, debug@^4.1.0, debug@^4.1.1:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+debug@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
@@ -2821,13 +2720,6 @@ debug@^3.0.1, debug@^3.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.1:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -3390,10 +3282,10 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gensync@^1.0.0-beta.1:
-  version "1.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
-  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+gensync@^1.0.0-beta.2:
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
 get-assigned-identifiers@^1.2.0:
   version "1.2.0"
@@ -4128,12 +4020,10 @@ json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
-json5@^2.1.0, json5@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz#43ef1f0af9835dd624751a6b7fa48874fb2d608e"
-  integrity sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==
-  dependencies:
-    minimist "^1.2.5"
+json5@^2.1.0, json5@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 jsonfile@^4.0.0:
   version "4.0.0"
@@ -4361,12 +4251,7 @@ lodash.once@^4.0.0, lodash.once@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
   integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
 
-lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.4:
-  version "4.17.20"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
-  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
-
-lodash@^4.17.21:
+lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.4:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -5050,11 +4935,6 @@ path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3"
   integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==
 
-path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
-
 path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
@@ -5412,14 +5292,7 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.4, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.8.1:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
-  integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.14.2:
+resolve@^1.1.4, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.8.1:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==

From 180c363f9cb25f8965111f0277fad5a1418145c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Apr 2023 17:04:02 +0000
Subject: [PATCH 85/91] Bump node from 19.4.0-alpine3.17 to 19.8.1-alpine3.17
 in /backend

Bumps node from 19.4.0-alpine3.17 to 19.8.1-alpine3.17.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 backend/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index c04cd9bc9..dd8237a4e 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,7 +1,7 @@
 ##################################################################################
 # BASE (Is pushed to DockerHub for rebranding) ###################################
 ##################################################################################
-FROM node:19.4.0-alpine3.17 as base
+FROM node:19.8.1-alpine3.17 as base
 
 # ENVs
 ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame

From a8da88acd28586f7091c3739166f97fe0c8d6a73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Apr 2023 10:24:41 +0000
Subject: [PATCH 86/91] Bump node from 19.4.0-alpine3.17 to 19.8.1-alpine3.17
 in /webapp

Bumps node from 19.4.0-alpine3.17 to 19.8.1-alpine3.17.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 webapp/Dockerfile             | 2 +-
 webapp/Dockerfile.maintenance | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 7952d02c1..067dc58e3 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -1,7 +1,7 @@
 ##################################################################################
 # BASE (Is pushed to DockerHub for rebranding) ###################################
 ##################################################################################
-FROM node:19.4.0-alpine3.17 as base
+FROM node:19.8.1-alpine3.17 as base
 
 # ENVs
 ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame
diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance
index e148da555..e285ca40e 100644
--- a/webapp/Dockerfile.maintenance
+++ b/webapp/Dockerfile.maintenance
@@ -1,7 +1,7 @@
 ##################################################################################
 # BASE ###########################################################################
 ##################################################################################
-FROM node:19.4.0-alpine3.17 as base
+FROM node:19.8.1-alpine3.17 as base
 
 # ENVs
 ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame

From 1958d5a342f38fb37c8a114779e2c83f8b78fe3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Apr 2023 13:42:21 +0000
Subject: [PATCH 87/91] Bump neode from 0.4.8 to 0.4.9 in /backend

Bumps [neode](https://github.com/adam-cowley/neode) from 0.4.8 to 0.4.9.
- [Release notes](https://github.com/adam-cowley/neode/releases)
- [Commits](https://github.com/adam-cowley/neode/commits/v0.4.9)

---
updated-dependencies:
- dependency-name: neode
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 27 ++++++---------------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 0b6e6beb7..ff847a784 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -87,7 +87,7 @@
     "mustache": "^4.2.0",
     "neo4j-driver": "^4.0.2",
     "neo4j-graphql-js": "^2.11.5",
-    "neode": "^0.4.8",
+    "neode": "^0.4.9",
     "node-fetch": "~2.6.1",
     "nodemailer": "^6.4.4",
     "nodemailer-html-to-text": "^3.2.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index c2fb0d28c..683b69973 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -8034,17 +8034,7 @@ neo4j-driver-core@^4.4.7:
   resolved "https://registry.yarnpkg.com/neo4j-driver-core/-/neo4j-driver-core-4.4.7.tgz#d2475e107b3fea2b9d1c36b0c273da5c5a291c37"
   integrity sha512-NhvVuQYgG7eO/vXxRaoJfkWUNkjvIpmCIS9UWU9Bbhb4V+wCOyX/MVOXqD0Yizhs4eyIkD7x90OXb79q+vi+oA==
 
-neo4j-driver@^4.0.1, neo4j-driver@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-4.0.2.tgz#78de3b91e91572bcbd9d2e02554322fe1ab399ea"
-  integrity sha512-xQN4BZZsweaNNac7FDYAV6f/JybghwY3lk4fwblS8V5KQ+DBMPe4Pthh672mp+wEYZGyzPalq5CfpcBrWaZ4Gw==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    rxjs "^6.5.2"
-    text-encoding-utf-8 "^1.0.2"
-    uri-js "^4.2.2"
-
-neo4j-driver@^4.2.2:
+neo4j-driver@^4.0.1, neo4j-driver@^4.0.2, neo4j-driver@^4.2.2:
   version "4.4.7"
   resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-4.4.7.tgz#51b3fb48241e66eb3be94e90032cc494c44e59f3"
   integrity sha512-N7GddPhp12gVJe4eB84u5ik5SmrtRv8nH3rK47Qy7IUKnJkVEos/F1QjOJN6zt1jLnDXwDcGzCKK8XklYpzogw==
@@ -8067,10 +8057,10 @@ neo4j-graphql-js@^2.11.5:
     lodash "^4.17.15"
     neo4j-driver "^4.0.1"
 
-neode@^0.4.8:
-  version "0.4.8"
-  resolved "https://registry.yarnpkg.com/neode/-/neode-0.4.8.tgz#0889b4fc7f1bf0b470b01fa5b8870373b5d47ad6"
-  integrity sha512-pb91NfCOg4Fj5o+98H+S2XYC+ByQfbdhwcc1UVuzuUQ0Ezzj+jWz8NmKWU8ZfCH6l4plk71yDAPd2eTwpt+Xvg==
+neode@^0.4.9:
+  version "0.4.9"
+  resolved "https://registry.yarnpkg.com/neode/-/neode-0.4.9.tgz#11c46c50d0348751dc6db828f3ca59252e7c247f"
+  integrity sha512-3RufLD2cmTXrPpvsgkEAqS3maRjXJ89vjbyYmyqJMJl5uv6gcUa32N6hRwHcqfjWRWUaFKaoGLEJLaOQobs4eA==
   dependencies:
     "@hapi/joi" "^15.1.1"
     dotenv "^4.0.0"
@@ -9496,7 +9486,7 @@ run-parallel@^1.1.9:
   resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
   integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
 
-rxjs@^6.4.0, rxjs@^6.5.2, rxjs@^6.5.4:
+rxjs@^6.4.0, rxjs@^6.5.4:
   version "6.5.4"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
   integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
@@ -10311,11 +10301,6 @@ test-exclude@^6.0.0:
     glob "^7.1.4"
     minimatch "^3.0.4"
 
-text-encoding-utf-8@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13"
-  integrity sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg==
-
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"

From 4156babe4b097f3160ae62be9c22d6fb81a8653b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Apr 2023 15:53:46 +0000
Subject: [PATCH 88/91] Bump babel-jest from 29.4.2 to 29.5.0 in /webapp

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 29.4.2 to 29.5.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.5.0/packages/babel-jest)

---
updated-dependencies:
- dependency-name: babel-jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 138 +++++++++++++++++++++++++++++---------------
 2 files changed, 91 insertions(+), 49 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 0e999cdc2..a431e78b8 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -81,7 +81,7 @@
     "async-validator": "^3.2.4",
     "babel-core": "~7.0.0-bridge.0",
     "babel-eslint": "~10.1.0",
-    "babel-jest": "29.4",
+    "babel-jest": "29.5",
     "babel-loader": "~8.1.0",
     "babel-plugin-require-context-hook": "^1.0.0",
     "babel-preset-vue": "~2.0.2",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 8ee3e501f..e7e9427bf 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -3331,6 +3331,13 @@
   dependencies:
     "@sinclair/typebox" "^0.25.16"
 
+"@jest/schemas@^29.4.3":
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.3.tgz#39cf1b8469afc40b6f5a2baaa146e332c4151788"
+  integrity sha512-VLYKXQmtmuEz6IxJsrZwzG9NvtkQsWNnWMsKxqWNu3+CnfzJQhp0WDDKWLVV9hLKr0l3SLLFRqcYHjhtyuDVxg==
+  dependencies:
+    "@sinclair/typebox" "^0.25.16"
+
 "@jest/source-map@^29.4.2":
   version "29.4.2"
   resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.4.2.tgz#f9815d59e25cd3d6828e41489cd239271018d153"
@@ -3360,22 +3367,22 @@
     jest-haste-map "^29.4.2"
     slash "^3.0.0"
 
-"@jest/transform@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.4.2.tgz#b24b72dbab4c8675433a80e222d6a8ef4656fb81"
-  integrity sha512-kf1v5iTJHn7p9RbOsBuc/lcwyPtJaZJt5885C98omWz79NIeD3PfoiiaPSu7JyCyFzNOIzKhmMhQLUhlTL9BvQ==
+"@jest/transform@^29.4.2", "@jest/transform@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.5.0.tgz#cf9c872d0965f0cbd32f1458aa44a2b1988b00f9"
+  integrity sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==
   dependencies:
     "@babel/core" "^7.11.6"
-    "@jest/types" "^29.4.2"
+    "@jest/types" "^29.5.0"
     "@jridgewell/trace-mapping" "^0.3.15"
     babel-plugin-istanbul "^6.1.1"
     chalk "^4.0.0"
     convert-source-map "^2.0.0"
     fast-json-stable-stringify "^2.1.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.4.2"
-    jest-regex-util "^29.4.2"
-    jest-util "^29.4.2"
+    jest-haste-map "^29.5.0"
+    jest-regex-util "^29.4.3"
+    jest-util "^29.5.0"
     micromatch "^4.0.4"
     pirates "^4.0.4"
     slash "^3.0.0"
@@ -3393,6 +3400,18 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
+"@jest/types@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593"
+  integrity sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==
+  dependencies:
+    "@jest/schemas" "^29.4.3"
+    "@types/istanbul-lib-coverage" "^2.0.0"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
+    "@types/yargs" "^17.0.8"
+    chalk "^4.0.0"
+
 "@jridgewell/gen-mapping@^0.1.0":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
@@ -7571,15 +7590,15 @@ babel-helper-vue-jsx-merge-props@^2.0.2:
   resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6"
   integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==
 
-babel-jest@29.4, babel-jest@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.4.2.tgz#b17b9f64be288040877cbe2649f91ac3b63b2ba6"
-  integrity sha512-vcghSqhtowXPG84posYkkkzcZsdayFkubUgbE3/1tuGbX7AQtwCkkNA/wIbB0BMjuCPoqTkiDyKN7Ty7d3uwNQ==
+babel-jest@29.5, babel-jest@^29.4.2:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.5.0.tgz#3fe3ddb109198e78b1c88f9ebdecd5e4fc2f50a5"
+  integrity sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==
   dependencies:
-    "@jest/transform" "^29.4.2"
+    "@jest/transform" "^29.5.0"
     "@types/babel__core" "^7.1.14"
     babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^29.4.2"
+    babel-preset-jest "^29.5.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     slash "^3.0.0"
@@ -7700,10 +7719,10 @@ babel-plugin-istanbul@^6.1.1:
     istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.4.2.tgz#22aa43e255230f02371ffef1cac7eedef58f60bc"
-  integrity sha512-5HZRCfMeWypFEonRbEkwWXtNS1sQK159LhRVyRuLzyfVBxDy/34Tr/rg4YVi0SScSJ4fqeaR/OIeceJ/LaQ0pQ==
+babel-plugin-jest-hoist@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.5.0.tgz#a97db437936f441ec196990c9738d4b88538618a"
+  integrity sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
@@ -7869,12 +7888,12 @@ babel-preset-current-node-syntax@^1.0.0:
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-top-level-await" "^7.8.3"
 
-babel-preset-jest@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.4.2.tgz#f0b20c6a79a9f155515e72a2d4f537fe002a4e38"
-  integrity sha512-ecWdaLY/8JyfUDr0oELBMpj3R5I1L6ZqG+kRJmwqfHtLWuPrJStR0LUkvUhfykJWTsXXMnohsayN/twltBbDrQ==
+babel-preset-jest@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.5.0.tgz#57bc8cc88097af7ff6a5ab59d1cd29d52a5916e2"
+  integrity sha512-JOMloxOqdiBSxMAzjRaH023/vvcaSaec49zvg+2LmNsktC7ei39LTJGw02J+9uUtTZUq6xbLyJ4dxe9sSmIuAg==
   dependencies:
-    babel-plugin-jest-hoist "^29.4.2"
+    babel-plugin-jest-hoist "^29.5.0"
     babel-preset-current-node-syntax "^1.0.0"
 
 babel-preset-vue@~2.0.2:
@@ -8638,15 +8657,7 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chalk@^4.1.0:
+chalk@^4.0.0, chalk@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad"
   integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==
@@ -12426,22 +12437,7 @@ graceful-fs@4.1.11:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
   integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
-  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
-
-graceful-fs@^4.1.9:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
-  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
-
-graceful-fs@^4.2.0, graceful-fs@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
-  integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
-
-graceful-fs@^4.2.9:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
@@ -14186,6 +14182,25 @@ jest-haste-map@^29.4.2:
   optionalDependencies:
     fsevents "^2.3.2"
 
+jest-haste-map@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.5.0.tgz#69bd67dc9012d6e2723f20a945099e972b2e94de"
+  integrity sha512-IspOPnnBro8YfVYSw6yDRKh/TiCdRngjxeacCps1cQ9cgVN6+10JUcuJ1EabrgYLOATsIAigxA0rLR9x/YlrSA==
+  dependencies:
+    "@jest/types" "^29.5.0"
+    "@types/graceful-fs" "^4.1.3"
+    "@types/node" "*"
+    anymatch "^3.0.3"
+    fb-watchman "^2.0.0"
+    graceful-fs "^4.2.9"
+    jest-regex-util "^29.4.3"
+    jest-util "^29.5.0"
+    jest-worker "^29.5.0"
+    micromatch "^4.0.4"
+    walker "^1.0.8"
+  optionalDependencies:
+    fsevents "^2.3.2"
+
 jest-leak-detector@^29.4.2:
   version "29.4.2"
   resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.4.2.tgz#8f05c6680e0cb46a1d577c0d3da9793bed3ea97b"
@@ -14238,6 +14253,11 @@ jest-regex-util@^29.4.2:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.4.2.tgz#19187cca35d301f8126cf7a021dd4dcb7b58a1ca"
   integrity sha512-XYZXOqUl1y31H6VLMrrUL1ZhXuiymLKPz0BO1kEeR5xER9Tv86RZrjTm74g5l9bPJQXA/hyLdaVPN/sdqfteig==
 
+jest-regex-util@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.4.3.tgz#a42616141e0cae052cfa32c169945d00c0aa0bb8"
+  integrity sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==
+
 jest-resolve-dependencies@^29.4.2:
   version "29.4.2"
   resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.2.tgz#6359db606f5967b68ca8bbe9dbc07a4306c12bf7"
@@ -14359,6 +14379,18 @@ jest-util@^29.4.2:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
+jest-util@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.5.0.tgz#24a4d3d92fc39ce90425311b23c27a6e0ef16b8f"
+  integrity sha512-RYMgG/MTadOr5t8KdhejfvUU82MxsCu5MF6KuDUHl+NuwzUt+Sm6jJWxTJVrDR1j5M/gJVCPKQEpWXY+yIQ6lQ==
+  dependencies:
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    chalk "^4.0.0"
+    ci-info "^3.2.0"
+    graceful-fs "^4.2.9"
+    picomatch "^2.2.3"
+
 jest-validate@^29.4.2:
   version "29.4.2"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.4.2.tgz#3b3f8c4910ab9a3442d2512e2175df6b3f77b915"
@@ -14412,6 +14444,16 @@ jest-worker@^29.4.2:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
+jest-worker@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.5.0.tgz#bdaefb06811bd3384d93f009755014d8acb4615d"
+  integrity sha512-NcrQnevGoSp4b5kg+akIpthoAFHxPBcb5P6mYPY0fUNT+sSvmtu6jlkEle3anczUKIKEbMxFimk9oTP/tpIPgA==
+  dependencies:
+    "@types/node" "*"
+    jest-util "^29.5.0"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
 jest@29.4:
   version "29.4.2"
   resolved "https://registry.yarnpkg.com/jest/-/jest-29.4.2.tgz#4c2127d03a71dc187f386156ef155dbf323fb7be"

From 1d2a2abb9f229bc3fcee97e371218645f3bfd813 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Apr 2023 18:42:49 +0000
Subject: [PATCH 89/91] Bump jest from 29.4.2 to 29.5.0 in /webapp

Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) from 29.4.2 to 29.5.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v29.5.0/packages/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 643 ++++++++++++++++++++++----------------------
 2 files changed, 329 insertions(+), 316 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index a431e78b8..c1ffa8896 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -100,7 +100,7 @@
     "eslint-plugin-vue": "~6.2.2",
     "flush-promises": "^1.0.2",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "29.4",
+    "jest": "29.5",
     "jest-environment-jsdom": "^29.4.2",
     "mutation-observer": "^1.0.3",
     "prettier": "~2.7.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index e7e9427bf..ee0f3693d 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -3201,49 +3201,49 @@
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jest/console@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.4.2.tgz#f78374905c2454764152904a344a2d5226b0ef09"
-  integrity sha512-0I/rEJwMpV9iwi9cDEnT71a5nNGK9lj8Z4+1pRAU2x/thVXCDnaTGrvxyK+cAqZTFVFCiR+hfVrP4l2m+dCmQg==
+"@jest/console@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.5.0.tgz#593a6c5c0d3f75689835f1b3b4688c4f8544cb57"
+  integrity sha512-NEpkObxPwyw/XxZVLPmAGKE89IQRp4puc6IQRPru6JKd1M3fW9v1xM1AnzIJE65hbCkzQAdnL8P47e9hzhiYLQ==
   dependencies:
-    "@jest/types" "^29.4.2"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^29.4.2"
-    jest-util "^29.4.2"
+    jest-message-util "^29.5.0"
+    jest-util "^29.5.0"
     slash "^3.0.0"
 
-"@jest/core@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.4.2.tgz#6e999b67bdc2df9d96ba9b142465bda71ee472c2"
-  integrity sha512-KGuoQah0P3vGNlaS/l9/wQENZGNKGoWb+OPxh3gz+YzG7/XExvYu34MzikRndQCdM2S0tzExN4+FL37i6gZmCQ==
+"@jest/core@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.5.0.tgz#76674b96904484e8214614d17261cc491e5f1f03"
+  integrity sha512-28UzQc7ulUrOQw1IsN/kv1QES3q2kkbl/wGslyhAclqZ/8cMdB5M68BffkIdSJgKBUt50d3hbwJ92XESlE7LiQ==
   dependencies:
-    "@jest/console" "^29.4.2"
-    "@jest/reporters" "^29.4.2"
-    "@jest/test-result" "^29.4.2"
-    "@jest/transform" "^29.4.2"
-    "@jest/types" "^29.4.2"
+    "@jest/console" "^29.5.0"
+    "@jest/reporters" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     exit "^0.1.2"
     graceful-fs "^4.2.9"
-    jest-changed-files "^29.4.2"
-    jest-config "^29.4.2"
-    jest-haste-map "^29.4.2"
-    jest-message-util "^29.4.2"
-    jest-regex-util "^29.4.2"
-    jest-resolve "^29.4.2"
-    jest-resolve-dependencies "^29.4.2"
-    jest-runner "^29.4.2"
-    jest-runtime "^29.4.2"
-    jest-snapshot "^29.4.2"
-    jest-util "^29.4.2"
-    jest-validate "^29.4.2"
-    jest-watcher "^29.4.2"
+    jest-changed-files "^29.5.0"
+    jest-config "^29.5.0"
+    jest-haste-map "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-regex-util "^29.4.3"
+    jest-resolve "^29.5.0"
+    jest-resolve-dependencies "^29.5.0"
+    jest-runner "^29.5.0"
+    jest-runtime "^29.5.0"
+    jest-snapshot "^29.5.0"
+    jest-util "^29.5.0"
+    jest-validate "^29.5.0"
+    jest-watcher "^29.5.0"
     micromatch "^4.0.4"
-    pretty-format "^29.4.2"
+    pretty-format "^29.5.0"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
@@ -3257,20 +3257,30 @@
     "@types/node" "*"
     jest-mock "^29.4.2"
 
-"@jest/expect-utils@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.4.2.tgz#cd0065dfdd8e8a182aa350cc121db97b5eed7b3f"
-  integrity sha512-Dd3ilDJpBnqa0GiPN7QrudVs0cczMMHtehSo2CSTjm3zdHx0RcpmhFNVEltuEFeqfLIyWKFI224FsMSQ/nsJQA==
+"@jest/environment@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.5.0.tgz#9152d56317c1fdb1af389c46640ba74ef0bb4c65"
+  integrity sha512-5FXw2+wD29YU1d4I2htpRX7jYnAyTRjP2CsXQdo9SAM8g3ifxWPSV0HnClSn71xwctr0U3oZIIH+dtbfmnbXVQ==
   dependencies:
-    jest-get-type "^29.4.2"
+    "@jest/fake-timers" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    jest-mock "^29.5.0"
 
-"@jest/expect@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.4.2.tgz#2d4a6a41b29380957c5094de19259f87f194578b"
-  integrity sha512-NUAeZVApzyaeLjfWIV/64zXjA2SS+NuUPHpAlO7IwVMGd5Vf9szTl9KEDlxY3B4liwLO31os88tYNHl6cpjtKQ==
+"@jest/expect-utils@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.5.0.tgz#f74fad6b6e20f924582dc8ecbf2cb800fe43a036"
+  integrity sha512-fmKzsidoXQT2KwnrwE0SQq3uj8Z763vzR8LnLBwC2qYWEFpjX8daRsk6rHUM1QvNlEW/UJXNXm59ztmJJWs2Mg==
   dependencies:
-    expect "^29.4.2"
-    jest-snapshot "^29.4.2"
+    jest-get-type "^29.4.3"
+
+"@jest/expect@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.5.0.tgz#80952f5316b23c483fbca4363ce822af79c38fba"
+  integrity sha512-PueDR2HGihN3ciUNGr4uelropW7rqUfTiOn+8u0leg/42UhblPxHkfoh0Ruu3I9Y1962P3u2DY4+h7GVTSVU6g==
+  dependencies:
+    expect "^29.5.0"
+    jest-snapshot "^29.5.0"
 
 "@jest/fake-timers@^29.4.2":
   version "29.4.2"
@@ -3284,26 +3294,38 @@
     jest-mock "^29.4.2"
     jest-util "^29.4.2"
 
-"@jest/globals@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.4.2.tgz#73f85f5db0e17642258b25fd0b9fc89ddedb50eb"
-  integrity sha512-zCk70YGPzKnz/I9BNFDPlK+EuJLk21ur/NozVh6JVM86/YYZtZHqxFFQ62O9MWq7uf3vIZnvNA0BzzrtxD9iyg==
+"@jest/fake-timers@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.5.0.tgz#d4d09ec3286b3d90c60bdcd66ed28d35f1b4dc2c"
+  integrity sha512-9ARvuAAQcBwDAqOnglWq2zwNIRUDtk/SCkp/ToGEhFv5r86K21l+VEs0qNTaXtyiY0lEePl3kylijSYJQqdbDg==
   dependencies:
-    "@jest/environment" "^29.4.2"
-    "@jest/expect" "^29.4.2"
-    "@jest/types" "^29.4.2"
-    jest-mock "^29.4.2"
+    "@jest/types" "^29.5.0"
+    "@sinonjs/fake-timers" "^10.0.2"
+    "@types/node" "*"
+    jest-message-util "^29.5.0"
+    jest-mock "^29.5.0"
+    jest-util "^29.5.0"
 
-"@jest/reporters@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.4.2.tgz#6abfa923941daae0acc76a18830ee9e79a22042d"
-  integrity sha512-10yw6YQe75zCgYcXgEND9kw3UZZH5tJeLzWv4vTk/2mrS1aY50A37F+XT2hPO5OqQFFnUWizXD8k1BMiATNfUw==
+"@jest/globals@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.5.0.tgz#6166c0bfc374c58268677539d0c181f9c1833298"
+  integrity sha512-S02y0qMWGihdzNbUiqSAiKSpSozSuHX5UYc7QbnHP+D9Lyw8DgGGCinrN9uSuHPeKgSSzvPom2q1nAtBvUsvPQ==
+  dependencies:
+    "@jest/environment" "^29.5.0"
+    "@jest/expect" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    jest-mock "^29.5.0"
+
+"@jest/reporters@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.5.0.tgz#985dfd91290cd78ddae4914ba7921bcbabe8ac9b"
+  integrity sha512-D05STXqj/M8bP9hQNSICtPqz97u7ffGzZu+9XLucXhkOFBqKcXe04JLZOgIekOxdb73MAoBUFnqvf7MCpKk5OA==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^29.4.2"
-    "@jest/test-result" "^29.4.2"
-    "@jest/transform" "^29.4.2"
-    "@jest/types" "^29.4.2"
+    "@jest/console" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@jridgewell/trace-mapping" "^0.3.15"
     "@types/node" "*"
     chalk "^4.0.0"
@@ -3316,9 +3338,9 @@
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.1.3"
-    jest-message-util "^29.4.2"
-    jest-util "^29.4.2"
-    jest-worker "^29.4.2"
+    jest-message-util "^29.5.0"
+    jest-util "^29.5.0"
+    jest-worker "^29.5.0"
     slash "^3.0.0"
     string-length "^4.0.1"
     strip-ansi "^6.0.0"
@@ -3338,36 +3360,36 @@
   dependencies:
     "@sinclair/typebox" "^0.25.16"
 
-"@jest/source-map@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.4.2.tgz#f9815d59e25cd3d6828e41489cd239271018d153"
-  integrity sha512-tIoqV5ZNgYI9XCKXMqbYe5JbumcvyTgNN+V5QW4My033lanijvCD0D4PI9tBw4pRTqWOc00/7X3KVvUh+qnF4Q==
+"@jest/source-map@^29.4.3":
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.4.3.tgz#ff8d05cbfff875d4a791ab679b4333df47951d20"
+  integrity sha512-qyt/mb6rLyd9j1jUts4EQncvS6Yy3PM9HghnNv86QBlV+zdL2inCdK1tuVlL+J+lpiw2BI67qXOrX3UurBqQ1w==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.15"
     callsites "^3.0.0"
     graceful-fs "^4.2.9"
 
-"@jest/test-result@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.4.2.tgz#34b0ba069f2e3072261e4884c8fb6bd15ed6fb8d"
-  integrity sha512-HZsC3shhiHVvMtP+i55MGR5bPcc3obCFbA5bzIOb8pCjwBZf11cZliJncCgaVUbC5yoQNuGqCkC0Q3t6EItxZA==
+"@jest/test-result@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.5.0.tgz#7c856a6ca84f45cc36926a4e9c6b57f1973f1408"
+  integrity sha512-fGl4rfitnbfLsrfx1uUpDEESS7zM8JdgZgOCQuxQvL1Sn/I6ijeAVQWGfXI9zb1i9Mzo495cIpVZhA0yr60PkQ==
   dependencies:
-    "@jest/console" "^29.4.2"
-    "@jest/types" "^29.4.2"
+    "@jest/console" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.4.2.tgz#8b48e5bc4af80b42edacaf2a733d4f295edf28fb"
-  integrity sha512-9Z2cVsD6CcObIVrWigHp2McRJhvCxL27xHtrZFgNC1RwnoSpDx6fZo8QYjJmziFlW9/hr78/3sxF54S8B6v8rg==
+"@jest/test-sequencer@^29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.5.0.tgz#34d7d82d3081abd523dbddc038a3ddcb9f6d3cc4"
+  integrity sha512-yPafQEcKjkSfDXyvtgiV4pevSeyuA6MQr6ZIdVkWJly9vkqjnFfcfhRQqpD5whjoU8EORki752xQmjaqoFjzMQ==
   dependencies:
-    "@jest/test-result" "^29.4.2"
+    "@jest/test-result" "^29.5.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.4.2"
+    jest-haste-map "^29.5.0"
     slash "^3.0.0"
 
-"@jest/transform@^29.4.2", "@jest/transform@^29.5.0":
+"@jest/transform@^29.5.0":
   version "29.5.0"
   resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.5.0.tgz#cf9c872d0965f0cbd32f1458aa44a2b1988b00f9"
   integrity sha512-8vbeZWqLJOvHaDfeMuoHITGKSz5qWc9u04lnWrQE3VyuSw604PzQM824ZeX9XSjUCeDiE3GuxZe5UKa8J61NQw==
@@ -3388,19 +3410,7 @@
     slash "^3.0.0"
     write-file-atomic "^4.0.2"
 
-"@jest/types@^29.4.2":
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.4.2.tgz#8f724a414b1246b2bfd56ca5225d9e1f39540d82"
-  integrity sha512-CKlngyGP0fwlgC1BRUtPZSiWLBhyS9dKwKmyGxk8Z6M82LBEGB2aLQSg+U1MyLsU+M7UjnlLllBM2BLWKVm/Uw==
-  dependencies:
-    "@jest/schemas" "^29.4.2"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^17.0.8"
-    chalk "^4.0.0"
-
-"@jest/types@^29.5.0":
+"@jest/types@^29.4.2", "@jest/types@^29.5.0":
   version "29.5.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.5.0.tgz#f59ef9b031ced83047c67032700d8c807d6e1593"
   integrity sha512-qbu7kN6czmVRc3xWFQcAN03RAUamgppVUdXrvl1Wr3jlNF93o9mJbGcDWrwGB6ht44u7efB1qCFgVQmca24Uog==
@@ -7590,7 +7600,7 @@ babel-helper-vue-jsx-merge-props@^2.0.2:
   resolved "https://registry.yarnpkg.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz#22aebd3b33902328e513293a8e4992b384f9f1b6"
   integrity sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==
 
-babel-jest@29.5, babel-jest@^29.4.2:
+babel-jest@29.5, babel-jest@^29.5.0:
   version "29.5.0"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.5.0.tgz#3fe3ddb109198e78b1c88f9ebdecd5e4fc2f50a5"
   integrity sha512-mA4eCDh5mSo2EcA9xQjVTpmbbNk32Zb3Q3QFQsNhaK56Q+yoXowzFodLux30HRgyOho5rsQ6B0P9QpMkvvnJ0Q==
@@ -10274,10 +10284,10 @@ dicer@0.3.0:
   dependencies:
     streamsearch "0.1.2"
 
-diff-sequences@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.2.tgz#711fe6bd8a5869fe2539cee4a5152425ff671fda"
-  integrity sha512-R6P0Y6PrsH3n4hUXxL3nns0rbRk6Q33js3ygJBeEpbzLzgcNuJ61+u0RXasFpTKISw99TxUzFnumSnRLsjhLaw==
+diff-sequences@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.4.3.tgz#9314bc1fabe09267ffeca9cbafc457d8499a13f2"
+  integrity sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA==
 
 diff@^4.0.1:
   version "4.0.1"
@@ -11285,16 +11295,16 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-29.4.2.tgz#2ae34eb88de797c64a1541ad0f1e2ea8a7a7b492"
-  integrity sha512-+JHYg9O3hd3RlICG90OPVjRkPBoiUH7PxvDVMnRiaq1g6JUgZStX514erMl0v2Dc5SkfVbm7ztqbd6qHHPn+mQ==
+expect@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.5.0.tgz#68c0509156cb2a0adb8865d413b137eeaae682f7"
+  integrity sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==
   dependencies:
-    "@jest/expect-utils" "^29.4.2"
-    jest-get-type "^29.4.2"
-    jest-matcher-utils "^29.4.2"
-    jest-message-util "^29.4.2"
-    jest-util "^29.4.2"
+    "@jest/expect-utils" "^29.5.0"
+    jest-get-type "^29.4.3"
+    jest-matcher-utils "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-util "^29.5.0"
 
 express@^4.16.3, express@^4.17.1, express@~4.17.1:
   version "4.17.1"
@@ -14025,112 +14035,113 @@ javascript-detect-element-resize@^0.5.3:
   resolved "https://registry.yarnpkg.com/javascript-detect-element-resize/-/javascript-detect-element-resize-0.5.3.tgz#1a71cd51dfe565907f299012fe73a294104025de"
   integrity sha1-GnHNUd/lZZB/KZAS/nOilBBAJd4=
 
-jest-changed-files@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.4.2.tgz#bee1fafc8b620d6251423d1978a0080546bc4376"
-  integrity sha512-Qdd+AXdqD16PQa+VsWJpxR3kN0JyOCX1iugQfx5nUgAsI4gwsKviXkpclxOK9ZnwaY2IQVHz+771eAvqeOlfuw==
+jest-changed-files@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.5.0.tgz#e88786dca8bf2aa899ec4af7644e16d9dcf9b23e"
+  integrity sha512-IFG34IUMUaNBIxjQXF/iu7g6EcdMrGRRxaUSw92I/2g2YC6vCdTltl4nHvt7Ci5nSJwXIkCu8Ka1DKF+X7Z1Ag==
   dependencies:
     execa "^5.0.0"
     p-limit "^3.1.0"
 
-jest-circus@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.4.2.tgz#2d00c04baefd0ee2a277014cd494d4b5970663ed"
-  integrity sha512-wW3ztp6a2P5c1yOc1Cfrt5ozJ7neWmqeXm/4SYiqcSriyisgq63bwFj1NuRdSR5iqS0CMEYwSZd89ZA47W9zUg==
+jest-circus@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.5.0.tgz#b5926989449e75bff0d59944bae083c9d7fb7317"
+  integrity sha512-gq/ongqeQKAplVxqJmbeUOJJKkW3dDNPY8PjhJ5G0lBRvu0e3EWGxGy5cI4LAGA7gV2UHCtWBI4EMXK8c9nQKA==
   dependencies:
-    "@jest/environment" "^29.4.2"
-    "@jest/expect" "^29.4.2"
-    "@jest/test-result" "^29.4.2"
-    "@jest/types" "^29.4.2"
+    "@jest/environment" "^29.5.0"
+    "@jest/expect" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
     dedent "^0.7.0"
     is-generator-fn "^2.0.0"
-    jest-each "^29.4.2"
-    jest-matcher-utils "^29.4.2"
-    jest-message-util "^29.4.2"
-    jest-runtime "^29.4.2"
-    jest-snapshot "^29.4.2"
-    jest-util "^29.4.2"
+    jest-each "^29.5.0"
+    jest-matcher-utils "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-runtime "^29.5.0"
+    jest-snapshot "^29.5.0"
+    jest-util "^29.5.0"
     p-limit "^3.1.0"
-    pretty-format "^29.4.2"
+    pretty-format "^29.5.0"
+    pure-rand "^6.0.0"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-cli@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.4.2.tgz#94a2f913a0a7a49d11bee98ad88bf48baae941f4"
-  integrity sha512-b+eGUtXq/K2v7SH3QcJvFvaUaCDS1/YAZBYz0m28Q/Ppyr+1qNaHmVYikOrbHVbZqYQs2IeI3p76uy6BWbXq8Q==
+jest-cli@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.5.0.tgz#b34c20a6d35968f3ee47a7437ff8e53e086b4a67"
+  integrity sha512-L1KcP1l4HtfwdxXNFCL5bmUbLQiKrakMUriBEcc1Vfz6gx31ORKdreuWvmQVBit+1ss9NNR3yxjwfwzZNdQXJw==
   dependencies:
-    "@jest/core" "^29.4.2"
-    "@jest/test-result" "^29.4.2"
-    "@jest/types" "^29.4.2"
+    "@jest/core" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/types" "^29.5.0"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.9"
     import-local "^3.0.2"
-    jest-config "^29.4.2"
-    jest-util "^29.4.2"
-    jest-validate "^29.4.2"
+    jest-config "^29.5.0"
+    jest-util "^29.5.0"
+    jest-validate "^29.5.0"
     prompts "^2.0.1"
     yargs "^17.3.1"
 
-jest-config@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.4.2.tgz#15386dd9ed2f7059516915515f786b8836a98f07"
-  integrity sha512-919CtnXic52YM0zW4C1QxjG6aNueX1kBGthuMtvFtRTAxhKfJmiXC9qwHmi6o2josjbDz8QlWyY55F1SIVmCWA==
+jest-config@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.5.0.tgz#3cc972faec8c8aaea9ae158c694541b79f3748da"
+  integrity sha512-kvDUKBnNJPNBmFFOhDbm59iu1Fii1Q6SxyhXfvylq3UTHbg6o7j/g8k2dZyXWLvfdKB1vAPxNZnMgtKJcmu3kA==
   dependencies:
     "@babel/core" "^7.11.6"
-    "@jest/test-sequencer" "^29.4.2"
-    "@jest/types" "^29.4.2"
-    babel-jest "^29.4.2"
+    "@jest/test-sequencer" "^29.5.0"
+    "@jest/types" "^29.5.0"
+    babel-jest "^29.5.0"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     deepmerge "^4.2.2"
     glob "^7.1.3"
     graceful-fs "^4.2.9"
-    jest-circus "^29.4.2"
-    jest-environment-node "^29.4.2"
-    jest-get-type "^29.4.2"
-    jest-regex-util "^29.4.2"
-    jest-resolve "^29.4.2"
-    jest-runner "^29.4.2"
-    jest-util "^29.4.2"
-    jest-validate "^29.4.2"
+    jest-circus "^29.5.0"
+    jest-environment-node "^29.5.0"
+    jest-get-type "^29.4.3"
+    jest-regex-util "^29.4.3"
+    jest-resolve "^29.5.0"
+    jest-runner "^29.5.0"
+    jest-util "^29.5.0"
+    jest-validate "^29.5.0"
     micromatch "^4.0.4"
     parse-json "^5.2.0"
-    pretty-format "^29.4.2"
+    pretty-format "^29.5.0"
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.4.2.tgz#b88502d5dc02d97f6512d73c37da8b36f49b4871"
-  integrity sha512-EK8DSajVtnjx9sa1BkjZq3mqChm2Cd8rIzdXkQMA8e0wuXq53ypz6s5o5V8HRZkoEt2ywJ3eeNWFKWeYr8HK4g==
+jest-diff@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.5.0.tgz#e0d83a58eb5451dcc1fa61b1c3ee4e8f5a290d63"
+  integrity sha512-LtxijLLZBduXnHSniy0WMdaHjmQnt3g5sa16W4p0HqukYTTsyTW3GD1q41TyGl5YFXj/5B2U6dlh5FM1LIMgxw==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^29.4.2"
-    jest-get-type "^29.4.2"
-    pretty-format "^29.4.2"
+    diff-sequences "^29.4.3"
+    jest-get-type "^29.4.3"
+    pretty-format "^29.5.0"
 
-jest-docblock@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.4.2.tgz#c78a95eedf9a24c0a6cc16cf2abdc4b8b0f2531b"
-  integrity sha512-dV2JdahgClL34Y5vLrAHde3nF3yo2jKRH+GIYJuCpfqwEJZcikzeafVTGAjbOfKPG17ez9iWXwUYp7yefeCRag==
+jest-docblock@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.4.3.tgz#90505aa89514a1c7dceeac1123df79e414636ea8"
+  integrity sha512-fzdTftThczeSD9nZ3fzA/4KkHtnmllawWrXO69vtI+L9WjEIuXWs4AmyME7lN5hU7dB0sHhuPfcKofRsUb/2Fg==
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.4.2.tgz#e1347aff1303f4c35470827a62c029d389c5d44a"
-  integrity sha512-trvKZb0JYiCndc55V1Yh0Luqi7AsAdDWpV+mKT/5vkpnnFQfuQACV72IoRV161aAr6kAVIBpmYzwhBzm34vQkA==
+jest-each@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.5.0.tgz#fc6e7014f83eac68e22b7195598de8554c2e5c06"
+  integrity sha512-HM5kIJ1BTnVt+DQZ2ALp3rzXEl+g726csObrW/jpEGl+CDSSQpOJJX2KE/vEg8cxcMXdyEPu6U4QX5eruQv5hA==
   dependencies:
-    "@jest/types" "^29.4.2"
+    "@jest/types" "^29.5.0"
     chalk "^4.0.0"
-    jest-get-type "^29.4.2"
-    jest-util "^29.4.2"
-    pretty-format "^29.4.2"
+    jest-get-type "^29.4.3"
+    jest-util "^29.5.0"
+    pretty-format "^29.5.0"
 
 jest-environment-jsdom@^29.4.2:
   version "29.4.2"
@@ -14146,41 +14157,22 @@ jest-environment-jsdom@^29.4.2:
     jest-util "^29.4.2"
     jsdom "^20.0.0"
 
-jest-environment-node@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.4.2.tgz#0eab835b41e25fd0c1a72f62665fc8db08762ad2"
-  integrity sha512-MLPrqUcOnNBc8zTOfqBbxtoa8/Ee8tZ7UFW7hRDQSUT+NGsvS96wlbHGTf+EFAT9KC3VNb7fWEM6oyvmxtE/9w==
+jest-environment-node@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.5.0.tgz#f17219d0f0cc0e68e0727c58b792c040e332c967"
+  integrity sha512-ExxuIK/+yQ+6PRGaHkKewYtg6hto2uGCgvKdb2nfJfKXgZ17DfXjvbZ+jA1Qt9A8EQSfPnt5FKIfnOO3u1h9qw==
   dependencies:
-    "@jest/environment" "^29.4.2"
-    "@jest/fake-timers" "^29.4.2"
-    "@jest/types" "^29.4.2"
+    "@jest/environment" "^29.5.0"
+    "@jest/fake-timers" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
-    jest-mock "^29.4.2"
-    jest-util "^29.4.2"
+    jest-mock "^29.5.0"
+    jest-util "^29.5.0"
 
-jest-get-type@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.2.tgz#7cb63f154bca8d8f57364d01614477d466fa43fe"
-  integrity sha512-vERN30V5i2N6lqlFu4ljdTqQAgrkTFMC9xaIIfOPYBw04pufjXRty5RuXBiB1d72tGbURa/UgoiHB90ruOSivg==
-
-jest-haste-map@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.4.2.tgz#9112df3f5121e643f1b2dcbaa86ab11b0b90b49a"
-  integrity sha512-WkUgo26LN5UHPknkezrBzr7lUtV1OpGsp+NfXbBwHztsFruS3gz+AMTTBcEklvi8uPzpISzYjdKXYZQJXBnfvw==
-  dependencies:
-    "@jest/types" "^29.4.2"
-    "@types/graceful-fs" "^4.1.3"
-    "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.9"
-    jest-regex-util "^29.4.2"
-    jest-util "^29.4.2"
-    jest-worker "^29.4.2"
-    micromatch "^4.0.4"
-    walker "^1.0.8"
-  optionalDependencies:
-    fsevents "^2.3.2"
+jest-get-type@^29.4.3:
+  version "29.4.3"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.4.3.tgz#1ab7a5207c995161100b5187159ca82dd48b3dd5"
+  integrity sha512-J5Xez4nRRMjk8emnTpWrlkyb9pfRQQanDrvWHhsR1+VUfbwxi30eVcZFlcdGInRibU4G5LwHXpI7IRHU0CY+gg==
 
 jest-haste-map@^29.5.0:
   version "29.5.0"
@@ -14201,23 +14193,23 @@ jest-haste-map@^29.5.0:
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-leak-detector@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.4.2.tgz#8f05c6680e0cb46a1d577c0d3da9793bed3ea97b"
-  integrity sha512-Wa62HuRJmWXtX9F00nUpWlrbaH5axeYCdyRsOs/+Rb1Vb6+qWTlB5rKwCCRKtorM7owNwKsyJ8NRDUcZ8ghYUA==
+jest-leak-detector@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.5.0.tgz#cf4bdea9615c72bac4a3a7ba7e7930f9c0610c8c"
+  integrity sha512-u9YdeeVnghBUtpN5mVxjID7KbkKE1QU4f6uUwuxiY0vYRi9BUCLKlPEZfDGR67ofdFmDz9oPAy2G92Ujrntmow==
   dependencies:
-    jest-get-type "^29.4.2"
-    pretty-format "^29.4.2"
+    jest-get-type "^29.4.3"
+    pretty-format "^29.5.0"
 
-jest-matcher-utils@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.4.2.tgz#08d0bf5abf242e3834bec92c7ef5071732839e85"
-  integrity sha512-EZaAQy2je6Uqkrm6frnxBIdaWtSYFoR8SVb2sNLAtldswlR/29JAgx+hy67llT3+hXBaLB0zAm5UfeqerioZyg==
+jest-matcher-utils@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.5.0.tgz#d957af7f8c0692c5453666705621ad4abc2c59c5"
+  integrity sha512-lecRtgm/rjIK0CQ7LPQwzCs2VwW6WAahA55YBuI+xqmhm7LAaxokSB8C97yJeYyT+HvQkH741StzpU41wohhWw==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^29.4.2"
-    jest-get-type "^29.4.2"
-    pretty-format "^29.4.2"
+    jest-diff "^29.5.0"
+    jest-get-type "^29.4.3"
+    pretty-format "^29.5.0"
 
 jest-message-util@^29.4.2:
   version "29.4.2"
@@ -14234,6 +14226,21 @@ jest-message-util@^29.4.2:
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
+jest-message-util@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.5.0.tgz#1f776cac3aca332ab8dd2e3b41625435085c900e"
+  integrity sha512-Kijeg9Dag6CKtIDA7O21zNTACqD5MD/8HfIV8pdD94vFyFuer52SigdC3IQMhab3vACxXMiFk+yMHNdbqtyTGA==
+  dependencies:
+    "@babel/code-frame" "^7.12.13"
+    "@jest/types" "^29.5.0"
+    "@types/stack-utils" "^2.0.0"
+    chalk "^4.0.0"
+    graceful-fs "^4.2.9"
+    micromatch "^4.0.4"
+    pretty-format "^29.5.0"
+    slash "^3.0.0"
+    stack-utils "^2.0.3"
+
 jest-mock@^29.4.2:
   version "29.4.2"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.4.2.tgz#e1054be66fb3e975d26d4528fcde6979e4759de8"
@@ -14243,104 +14250,107 @@ jest-mock@^29.4.2:
     "@types/node" "*"
     jest-util "^29.4.2"
 
+jest-mock@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.5.0.tgz#26e2172bcc71d8b0195081ff1f146ac7e1518aed"
+  integrity sha512-GqOzvdWDE4fAV2bWQLQCkujxYWL7RxjCnj71b5VhDAGOevB3qj3Ovg26A5NI84ZpODxyzaozXLOh2NCgkbvyaw==
+  dependencies:
+    "@jest/types" "^29.5.0"
+    "@types/node" "*"
+    jest-util "^29.5.0"
+
 jest-pnp-resolver@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-jest-regex-util@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.4.2.tgz#19187cca35d301f8126cf7a021dd4dcb7b58a1ca"
-  integrity sha512-XYZXOqUl1y31H6VLMrrUL1ZhXuiymLKPz0BO1kEeR5xER9Tv86RZrjTm74g5l9bPJQXA/hyLdaVPN/sdqfteig==
-
 jest-regex-util@^29.4.3:
   version "29.4.3"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.4.3.tgz#a42616141e0cae052cfa32c169945d00c0aa0bb8"
   integrity sha512-O4FglZaMmWXbGHSQInfXewIsd1LMn9p3ZXB/6r4FOkyhX2/iP/soMG98jGvk/A3HAN78+5VWcBGO0BJAPRh4kg==
 
-jest-resolve-dependencies@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.4.2.tgz#6359db606f5967b68ca8bbe9dbc07a4306c12bf7"
-  integrity sha512-6pL4ptFw62rjdrPk7rRpzJYgcRqRZNsZTF1VxVTZMishbO6ObyWvX57yHOaNGgKoADtAHRFYdHQUEvYMJATbDg==
+jest-resolve-dependencies@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.5.0.tgz#f0ea29955996f49788bf70996052aa98e7befee4"
+  integrity sha512-sjV3GFr0hDJMBpYeUuGduP+YeCRbd7S/ck6IvL3kQ9cpySYKqcqhdLLC2rFwrcL7tz5vYibomBrsFYWkIGGjOg==
   dependencies:
-    jest-regex-util "^29.4.2"
-    jest-snapshot "^29.4.2"
+    jest-regex-util "^29.4.3"
+    jest-snapshot "^29.5.0"
 
-jest-resolve@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.4.2.tgz#8831f449671d08d161fe493003f61dc9b55b808e"
-  integrity sha512-RtKWW0mbR3I4UdkOrW7552IFGLYQ5AF9YrzD0FnIOkDu0rAMlA5/Y1+r7lhCAP4nXSBTaE7ueeqj6IOwZpgoqw==
+jest-resolve@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.5.0.tgz#b053cc95ad1d5f6327f0ac8aae9f98795475ecdc"
+  integrity sha512-1TzxJ37FQq7J10jPtQjcc+MkCkE3GBpBecsSUWJ0qZNJpmg6m0D9/7II03yJulm3H/fvVjgqLh/k2eYg+ui52w==
   dependencies:
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.4.2"
+    jest-haste-map "^29.5.0"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^29.4.2"
-    jest-validate "^29.4.2"
+    jest-util "^29.5.0"
+    jest-validate "^29.5.0"
     resolve "^1.20.0"
     resolve.exports "^2.0.0"
     slash "^3.0.0"
 
-jest-runner@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.4.2.tgz#2bcecf72303369df4ef1e6e983c22a89870d5125"
-  integrity sha512-wqwt0drm7JGjwdH+x1XgAl+TFPH7poowMguPQINYxaukCqlczAcNLJiK+OLxUxQAEWMdy+e6nHZlFHO5s7EuRg==
+jest-runner@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.5.0.tgz#6a57c282eb0ef749778d444c1d758c6a7693b6f8"
+  integrity sha512-m7b6ypERhFghJsslMLhydaXBiLf7+jXy8FwGRHO3BGV1mcQpPbwiqiKUR2zU2NJuNeMenJmlFZCsIqzJCTeGLQ==
   dependencies:
-    "@jest/console" "^29.4.2"
-    "@jest/environment" "^29.4.2"
-    "@jest/test-result" "^29.4.2"
-    "@jest/transform" "^29.4.2"
-    "@jest/types" "^29.4.2"
+    "@jest/console" "^29.5.0"
+    "@jest/environment" "^29.5.0"
+    "@jest/test-result" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
     chalk "^4.0.0"
     emittery "^0.13.1"
     graceful-fs "^4.2.9"
-    jest-docblock "^29.4.2"
-    jest-environment-node "^29.4.2"
-    jest-haste-map "^29.4.2"
-    jest-leak-detector "^29.4.2"
-    jest-message-util "^29.4.2"
-    jest-resolve "^29.4.2"
-    jest-runtime "^29.4.2"
-    jest-util "^29.4.2"
-    jest-watcher "^29.4.2"
-    jest-worker "^29.4.2"
+    jest-docblock "^29.4.3"
+    jest-environment-node "^29.5.0"
+    jest-haste-map "^29.5.0"
+    jest-leak-detector "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-resolve "^29.5.0"
+    jest-runtime "^29.5.0"
+    jest-util "^29.5.0"
+    jest-watcher "^29.5.0"
+    jest-worker "^29.5.0"
     p-limit "^3.1.0"
     source-map-support "0.5.13"
 
-jest-runtime@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.4.2.tgz#d86b764c5b95d76cb26ed1f32644e99de5d5c134"
-  integrity sha512-3fque9vtpLzGuxT9eZqhxi+9EylKK/ESfhClv4P7Y9sqJPs58LjVhTt8jaMp/pRO38agll1CkSu9z9ieTQeRrw==
+jest-runtime@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.5.0.tgz#c83f943ee0c1da7eb91fa181b0811ebd59b03420"
+  integrity sha512-1Hr6Hh7bAgXQP+pln3homOiEZtCDZFqwmle7Ew2j8OlbkIu6uE3Y/etJQG8MLQs3Zy90xrp2C0BRrtPHG4zryw==
   dependencies:
-    "@jest/environment" "^29.4.2"
-    "@jest/fake-timers" "^29.4.2"
-    "@jest/globals" "^29.4.2"
-    "@jest/source-map" "^29.4.2"
-    "@jest/test-result" "^29.4.2"
-    "@jest/transform" "^29.4.2"
-    "@jest/types" "^29.4.2"
+    "@jest/environment" "^29.5.0"
+    "@jest/fake-timers" "^29.5.0"
+    "@jest/globals" "^29.5.0"
+    "@jest/source-map" "^29.4.3"
+    "@jest/test-result" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
     chalk "^4.0.0"
     cjs-module-lexer "^1.0.0"
     collect-v8-coverage "^1.0.0"
     glob "^7.1.3"
     graceful-fs "^4.2.9"
-    jest-haste-map "^29.4.2"
-    jest-message-util "^29.4.2"
-    jest-mock "^29.4.2"
-    jest-regex-util "^29.4.2"
-    jest-resolve "^29.4.2"
-    jest-snapshot "^29.4.2"
-    jest-util "^29.4.2"
-    semver "^7.3.5"
+    jest-haste-map "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-mock "^29.5.0"
+    jest-regex-util "^29.4.3"
+    jest-resolve "^29.5.0"
+    jest-snapshot "^29.5.0"
+    jest-util "^29.5.0"
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-snapshot@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.4.2.tgz#ba1fb9abb279fd2c85109ff1757bc56b503bbb3a"
-  integrity sha512-PdfubrSNN5KwroyMH158R23tWcAXJyx4pvSvWls1dHoLCaUhGul9rsL3uVjtqzRpkxlkMavQjGuWG1newPgmkw==
+jest-snapshot@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.5.0.tgz#c9c1ce0331e5b63cd444e2f95a55a73b84b1e8ce"
+  integrity sha512-x7Wolra5V0tt3wRs3/ts3S6ciSQVypgGQlJpz2rsdQYoUKxMxPNaoHMGJN6qAuPJqS+2iQ1ZUn5kl7HCyls84g==
   dependencies:
     "@babel/core" "^7.11.6"
     "@babel/generator" "^7.7.2"
@@ -14348,23 +14358,22 @@ jest-snapshot@^29.4.2:
     "@babel/plugin-syntax-typescript" "^7.7.2"
     "@babel/traverse" "^7.7.2"
     "@babel/types" "^7.3.3"
-    "@jest/expect-utils" "^29.4.2"
-    "@jest/transform" "^29.4.2"
-    "@jest/types" "^29.4.2"
+    "@jest/expect-utils" "^29.5.0"
+    "@jest/transform" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/babel__traverse" "^7.0.6"
     "@types/prettier" "^2.1.5"
     babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    expect "^29.4.2"
+    expect "^29.5.0"
     graceful-fs "^4.2.9"
-    jest-diff "^29.4.2"
-    jest-get-type "^29.4.2"
-    jest-haste-map "^29.4.2"
-    jest-matcher-utils "^29.4.2"
-    jest-message-util "^29.4.2"
-    jest-util "^29.4.2"
+    jest-diff "^29.5.0"
+    jest-get-type "^29.4.3"
+    jest-matcher-utils "^29.5.0"
+    jest-message-util "^29.5.0"
+    jest-util "^29.5.0"
     natural-compare "^1.4.0"
-    pretty-format "^29.4.2"
+    pretty-format "^29.5.0"
     semver "^7.3.5"
 
 jest-util@^29.4.2:
@@ -14391,30 +14400,30 @@ jest-util@^29.5.0:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-validate@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.4.2.tgz#3b3f8c4910ab9a3442d2512e2175df6b3f77b915"
-  integrity sha512-tto7YKGPJyFbhcKhIDFq8B5od+eVWD/ySZ9Tvcp/NGCvYA4RQbuzhbwYWtIjMT5W5zA2W0eBJwu4HVw34d5G6Q==
+jest-validate@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.5.0.tgz#8e5a8f36178d40e47138dc00866a5f3bd9916ffc"
+  integrity sha512-pC26etNIi+y3HV8A+tUGr/lph9B18GnzSRAkPaaZJIE1eFdiYm6/CewuiJQ8/RlfHd1u/8Ioi8/sJ+CmbA+zAQ==
   dependencies:
-    "@jest/types" "^29.4.2"
+    "@jest/types" "^29.5.0"
     camelcase "^6.2.0"
     chalk "^4.0.0"
-    jest-get-type "^29.4.2"
+    jest-get-type "^29.4.3"
     leven "^3.1.0"
-    pretty-format "^29.4.2"
+    pretty-format "^29.5.0"
 
-jest-watcher@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.4.2.tgz#09c0f4c9a9c7c0807fcefb1445b821c6f7953b7c"
-  integrity sha512-onddLujSoGiMJt+tKutehIidABa175i/Ays+QvKxCqBwp7fvxP3ZhKsrIdOodt71dKxqk4sc0LN41mWLGIK44w==
+jest-watcher@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.5.0.tgz#cf7f0f949828ba65ddbbb45c743a382a4d911363"
+  integrity sha512-KmTojKcapuqYrKDpRwfqcQ3zjMlwu27SYext9pt4GlF5FUgB+7XE1mcCnSm6a4uUpFyQIkb6ZhzZvHl+jiBCiA==
   dependencies:
-    "@jest/test-result" "^29.4.2"
-    "@jest/types" "^29.4.2"
+    "@jest/test-result" "^29.5.0"
+    "@jest/types" "^29.5.0"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     emittery "^0.13.1"
-    jest-util "^29.4.2"
+    jest-util "^29.5.0"
     string-length "^4.0.1"
 
 jest-worker@^25.1.0:
@@ -14434,16 +14443,6 @@ jest-worker@^26.5.0:
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest-worker@^29.4.2:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.4.2.tgz#d9b2c3bafc69311d84d94e7fb45677fc8976296f"
-  integrity sha512-VIuZA2hZmFyRbchsUCHEehoSf2HEl0YVF8SDJqtPnKorAaBuh42V8QsLnde0XP5F6TyCynGPEGgBOn3Fc+wZGw==
-  dependencies:
-    "@types/node" "*"
-    jest-util "^29.4.2"
-    merge-stream "^2.0.0"
-    supports-color "^8.0.0"
-
 jest-worker@^29.5.0:
   version "29.5.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.5.0.tgz#bdaefb06811bd3384d93f009755014d8acb4615d"
@@ -14454,15 +14453,15 @@ jest-worker@^29.5.0:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@29.4:
-  version "29.4.2"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-29.4.2.tgz#4c2127d03a71dc187f386156ef155dbf323fb7be"
-  integrity sha512-+5hLd260vNIHu+7ZgMIooSpKl7Jp5pHKb51e73AJU3owd5dEo/RfVwHbA/na3C/eozrt3hJOLGf96c7EWwIAzg==
+jest@29.5:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-29.5.0.tgz#f75157622f5ce7ad53028f2f8888ab53e1f1f24e"
+  integrity sha512-juMg3he2uru1QoXX078zTa7pO85QyB9xajZc6bU+d9yEGwrKX6+vGmJQ3UdVZsvTEUARIdObzH68QItim6OSSQ==
   dependencies:
-    "@jest/core" "^29.4.2"
-    "@jest/types" "^29.4.2"
+    "@jest/core" "^29.5.0"
+    "@jest/types" "^29.5.0"
     import-local "^3.0.2"
-    jest-cli "^29.4.2"
+    jest-cli "^29.5.0"
 
 jimp-compact@^0.8.0:
   version "0.8.4"
@@ -18021,6 +18020,15 @@ pretty-format@^29.4.2:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
+pretty-format@^29.5.0:
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.5.0.tgz#283134e74f70e2e3e7229336de0e4fce94ccde5a"
+  integrity sha512-V2mGkI31qdttvTFX7Mt4efOqHXqJWMu4/r66Xh3Z3BwZaPfPJgp6/gbwoujRpPUtfEF6AUUWx3Jim3GCw5g/Qw==
+  dependencies:
+    "@jest/schemas" "^29.4.3"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
+
 pretty-hrtime@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
@@ -18497,6 +18505,11 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+pure-rand@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.1.tgz#31207dddd15d43f299fdcdb2f572df65030c19af"
+  integrity sha512-t+x1zEHDjBwkDGY5v5ApnZ/utcd4XYDiJsaQQoptTXgUXX95sDg1elCdJghzicm7n2mbCBJ3uYWr6M22SO19rg==
+
 q@^1.1.2:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"

From 3040002643386085cffcef8a860e6925d78ad428 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Apr 2023 10:25:50 +0000
Subject: [PATCH 90/91] Bump jsonwebtoken from 8.5.1 to 9.0.0 in /webapp

Bumps [jsonwebtoken](https://github.com/auth0/node-jsonwebtoken) from 8.5.1 to 9.0.0.
- [Release notes](https://github.com/auth0/node-jsonwebtoken/releases)
- [Changelog](https://github.com/auth0/node-jsonwebtoken/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/node-jsonwebtoken/compare/v8.5.1...v9.0.0)

---
updated-dependencies:
- dependency-name: jsonwebtoken
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 webapp/package.json |  2 +-
 webapp/yarn.lock    | 69 +++++----------------------------------------
 2 files changed, 8 insertions(+), 63 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index c1ffa8896..d3074e0e0 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -38,7 +38,7 @@
     "express": "~4.17.1",
     "graphql": "~14.7.0",
     "intersection-observer": "^0.12.0",
-    "jsonwebtoken": "~8.5.1",
+    "jsonwebtoken": "~9.0.0",
     "linkify-it": "~3.0.2",
     "mapbox-gl": "1.13.2",
     "node-fetch": "^2.6.1",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index ee0f3693d..90c674e72 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -14727,21 +14727,15 @@ jsonify@~0.0.0:
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
   integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
-jsonwebtoken@~8.5.1:
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
-  integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==
+jsonwebtoken@~9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
+  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
   dependencies:
     jws "^3.2.2"
-    lodash.includes "^4.3.0"
-    lodash.isboolean "^3.0.3"
-    lodash.isinteger "^4.0.4"
-    lodash.isnumber "^3.0.3"
-    lodash.isplainobject "^4.0.6"
-    lodash.isstring "^4.0.1"
-    lodash.once "^4.0.0"
+    lodash "^4.17.21"
     ms "^2.1.1"
-    semver "^5.6.0"
+    semver "^7.3.8"
 
 jsprim@^1.2.2:
   version "1.4.1"
@@ -15098,36 +15092,6 @@ lodash.identity@3.0.0:
   resolved "https://registry.yarnpkg.com/lodash.identity/-/lodash.identity-3.0.0.tgz#ad7bc6a4e647d79c972e1b80feef7af156267876"
   integrity sha1-rXvGpOZH15yXLhuA/u968VYmeHY=
 
-lodash.includes@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.includes/-/lodash.includes-4.3.0.tgz#60bb98a87cb923c68ca1e51325483314849f553f"
-  integrity sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=
-
-lodash.isboolean@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
-  integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
-
-lodash.isinteger@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
-  integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=
-
-lodash.isnumber@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
-  integrity sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=
-
-lodash.isplainobject@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-  integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-  integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
-
 lodash.kebabcase@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
@@ -15143,11 +15107,6 @@ lodash.merge@^4.6.1:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.once@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-  integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
-
 lodash.pickby@4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
@@ -19770,21 +19729,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semve
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.1.3, semver@^7.3.2:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
-  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.3.4:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^7.3.5:
+semver@^7.1.3, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8:
   version "7.3.8"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
   integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==

From eb29000073ed335ba366ebb8b25726341662aacd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 8 Apr 2023 02:00:55 +0000
Subject: [PATCH 91/91] Bump @babel/core from 7.12.17 to 7.21.4 in /webapp

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.12.17 to 7.21.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.21.4/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 webapp/package.json |   2 +-
 webapp/yarn.lock    | 612 +++++++++++---------------------------------
 2 files changed, 157 insertions(+), 457 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index d3074e0e0..751f91afa 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -65,7 +65,7 @@
     "zxcvbn": "^4.4.2"
   },
   "devDependencies": {
-    "@babel/core": "~7.12.3",
+    "@babel/core": "~7.21.4",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "^7.20.2",
     "@faker-js/faker": "5.1.0",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index 90c674e72..9663e4ecc 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -2,12 +2,12 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@^2.1.0":
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
-  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
+"@ampproject/remapping@^2.2.0":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
   dependencies:
-    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
 "@antfu/utils@^0.4.0":
@@ -95,28 +95,21 @@
   dependencies:
     xss "^1.0.6"
 
-"@babel/code-frame@7.10.4", "@babel/code-frame@^7.0.0":
+"@babel/code-frame@7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
   integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
-  integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
+  integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/code-frame@^7.14.5", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
-  integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
-  dependencies:
-    "@babel/highlight" "^7.14.5"
-
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7":
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7":
   version "7.14.7"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08"
   integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==
@@ -131,7 +124,12 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec"
   integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==
 
-"@babel/compat-data@^7.8.6", "@babel/compat-data@^7.9.0":
+"@babel/compat-data@^7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f"
+  integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==
+
+"@babel/compat-data@^7.9.0":
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz#04815556fc90b0c174abd2c0c1bb966faa036a6c"
   integrity sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==
@@ -162,91 +160,27 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.1.6", "@babel/core@^7.12.10":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.8.tgz#20cdf7c84b5d86d83fac8710a8bc605a7ba3f010"
-  integrity sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==
+"@babel/core@^7.1.6", "@babel/core@^7.11.6", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.16.7", "@babel/core@^7.9.0", "@babel/core@~7.21.4":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659"
+  integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==
   dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/generator" "^7.14.8"
-    "@babel/helper-compilation-targets" "^7.14.5"
-    "@babel/helper-module-transforms" "^7.14.8"
-    "@babel/helpers" "^7.14.8"
-    "@babel/parser" "^7.14.8"
-    "@babel/template" "^7.14.5"
-    "@babel/traverse" "^7.14.8"
-    "@babel/types" "^7.14.8"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
-    source-map "^0.5.0"
-
-"@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.16.7":
-  version "7.20.12"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.12.tgz#7930db57443c6714ad216953d1356dac0eb8496d"
-  integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==
-  dependencies:
-    "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.7"
-    "@babel/helper-compilation-targets" "^7.20.7"
-    "@babel/helper-module-transforms" "^7.20.11"
-    "@babel/helpers" "^7.20.7"
-    "@babel/parser" "^7.20.7"
+    "@ampproject/remapping" "^2.2.0"
+    "@babel/code-frame" "^7.21.4"
+    "@babel/generator" "^7.21.4"
+    "@babel/helper-compilation-targets" "^7.21.4"
+    "@babel/helper-module-transforms" "^7.21.2"
+    "@babel/helpers" "^7.21.0"
+    "@babel/parser" "^7.21.4"
     "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.12"
-    "@babel/types" "^7.20.7"
+    "@babel/traverse" "^7.21.4"
+    "@babel/types" "^7.21.4"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.2"
     semver "^6.3.0"
 
-"@babel/core@^7.9.0":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.3.tgz#1b436884e1e3bff6fb1328dc02b208759de92ad8"
-  integrity sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@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.12.1"
-    "@babel/types" "^7.12.1"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.19"
-    resolve "^1.3.2"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/core@~7.12.3":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.17.tgz#993c5e893333107a2815d8e0d73a2c3755e280b2"
-  integrity sha512-V3CuX1aBywbJvV2yzJScRxeiiw0v2KZZYYE3giywxzFJL13RiyPjaaDwhDnxmgFTTS7FgvM2ijr4QmKNIu0AtQ==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.12.17"
-    "@babel/helper-module-transforms" "^7.12.17"
-    "@babel/helpers" "^7.12.17"
-    "@babel/parser" "^7.12.17"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.12.17"
-    "@babel/types" "^7.12.17"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.19"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
 "@babel/generator@7.6.4":
   version "7.6.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.4.tgz#a4f8437287bf9671b07f483b76e3bb731bc97671"
@@ -257,31 +191,14 @@
     lodash "^4.17.13"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.1", "@babel/generator@^7.12.17", "@babel/generator@^7.12.5", "@babel/generator@^7.7.2":
-  version "7.20.14"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.14.tgz#9fa772c9f86a46c6ac9b321039400712b96f64ce"
-  integrity sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==
+"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.16.8", "@babel/generator@^7.21.4", "@babel/generator@^7.7.2":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc"
+  integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==
   dependencies:
-    "@babel/types" "^7.20.7"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.12.11", "@babel/generator@^7.14.8":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070"
-  integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==
-  dependencies:
-    "@babel/types" "^7.14.8"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.16.8", "@babel/generator@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a"
-  integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==
-  dependencies:
-    "@babel/types" "^7.20.7"
+    "@babel/types" "^7.21.4"
     "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
 "@babel/helper-annotate-as-pure@^7.14.5":
@@ -338,38 +255,17 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.7"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf"
-  integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.4", "@babel/helper-compilation-targets@^7.8.7":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656"
+  integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==
   dependencies:
-    "@babel/compat-data" "^7.14.5"
-    "@babel/helper-validator-option" "^7.14.5"
-    browserslist "^4.16.6"
-    semver "^6.3.0"
-
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb"
-  integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==
-  dependencies:
-    "@babel/compat-data" "^7.20.5"
-    "@babel/helper-validator-option" "^7.18.6"
+    "@babel/compat-data" "^7.21.4"
+    "@babel/helper-validator-option" "^7.21.0"
     browserslist "^4.21.3"
     lru-cache "^5.1.1"
     semver "^6.3.0"
 
-"@babel/helper-compilation-targets@^7.8.7":
-  version "7.8.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
-  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
-  dependencies:
-    "@babel/compat-data" "^7.8.6"
-    browserslist "^4.9.1"
-    invariant "^2.2.4"
-    levenary "^1.1.1"
-    semver "^5.5.0"
-
 "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.14.6":
   version "7.14.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz#a6f8c3de208b1e5629424a9a63567f56501955fc"
@@ -517,14 +413,6 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-function-name@^7.10.4", "@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
-  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
-  dependencies:
-    "@babel/template" "^7.18.10"
-    "@babel/types" "^7.19.0"
-
 "@babel/helper-function-name@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
@@ -534,6 +422,22 @@
     "@babel/template" "^7.14.5"
     "@babel/types" "^7.14.5"
 
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
+  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
+  dependencies:
+    "@babel/template" "^7.18.10"
+    "@babel/types" "^7.19.0"
+
+"@babel/helper-function-name@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
+  integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
+  dependencies:
+    "@babel/template" "^7.20.7"
+    "@babel/types" "^7.21.0"
+
 "@babel/helper-function-name@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"
@@ -606,13 +510,6 @@
   dependencies:
     "@babel/types" "^7.8.3"
 
-"@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
-  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
 "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
@@ -620,10 +517,17 @@
   dependencies:
     "@babel/types" "^7.14.5"
 
-"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.12.17", "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11":
-  version "7.20.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0"
-  integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==
+"@babel/helper-module-imports@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
+  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2", "@babel/helper-module-transforms@^7.9.0":
+  version "7.21.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
+  integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
     "@babel/helper-module-imports" "^7.18.6"
@@ -631,37 +535,8 @@
     "@babel/helper-split-export-declaration" "^7.18.6"
     "@babel/helper-validator-identifier" "^7.19.1"
     "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.10"
-    "@babel/types" "^7.20.7"
-
-"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.14.8":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz#d4279f7e3fd5f4d5d342d833af36d4dd87d7dc49"
-  integrity sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.14.5"
-    "@babel/helper-replace-supers" "^7.14.5"
-    "@babel/helper-simple-access" "^7.14.8"
-    "@babel/helper-split-export-declaration" "^7.14.5"
-    "@babel/helper-validator-identifier" "^7.14.8"
-    "@babel/template" "^7.14.5"
-    "@babel/traverse" "^7.14.8"
-    "@babel/types" "^7.14.8"
-
-"@babel/helper-module-transforms@^7.9.0":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
-  integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==
-  dependencies:
-    "@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/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
-    lodash "^4.17.19"
+    "@babel/traverse" "^7.21.2"
+    "@babel/types" "^7.21.2"
 
 "@babel/helper-optimise-call-expression@^7.14.5":
   version "7.14.5"
@@ -736,7 +611,17 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-replace-supers@^7.12.1", "@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7":
+"@babel/helper-replace-supers@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94"
+  integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.14.5"
+    "@babel/helper-optimise-call-expression" "^7.14.5"
+    "@babel/traverse" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331"
   integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==
@@ -748,16 +633,6 @@
     "@babel/traverse" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/helper-replace-supers@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94"
-  integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.14.5"
-    "@babel/helper-optimise-call-expression" "^7.14.5"
-    "@babel/traverse" "^7.14.5"
-    "@babel/types" "^7.14.5"
-
 "@babel/helper-replace-supers@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz#91192d25f6abbcd41da8a989d4492574fb1530bc"
@@ -778,20 +653,20 @@
     "@babel/traverse" "^7.8.6"
     "@babel/types" "^7.8.6"
 
-"@babel/helper-simple-access@^7.12.1", "@babel/helper-simple-access@^7.20.2":
-  version "7.20.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
-  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
-  dependencies:
-    "@babel/types" "^7.20.2"
-
-"@babel/helper-simple-access@^7.14.5", "@babel/helper-simple-access@^7.14.8":
+"@babel/helper-simple-access@^7.14.5":
   version "7.14.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924"
   integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==
   dependencies:
     "@babel/types" "^7.14.8"
 
+"@babel/helper-simple-access@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
+  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
+  dependencies:
+    "@babel/types" "^7.20.2"
+
 "@babel/helper-simple-access@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae"
@@ -814,13 +689,6 @@
   dependencies:
     "@babel/types" "^7.20.0"
 
-"@babel/helper-split-export-declaration@^7.11.0", "@babel/helper-split-export-declaration@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
-  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
-  dependencies:
-    "@babel/types" "^7.18.6"
-
 "@babel/helper-split-export-declaration@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
@@ -828,6 +696,13 @@
   dependencies:
     "@babel/types" "^7.14.5"
 
+"@babel/helper-split-export-declaration@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
+  integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
 "@babel/helper-split-export-declaration@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9"
@@ -840,16 +715,16 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
   integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
-"@babel/helper-validator-identifier@^7.10.4", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
-  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
-
-"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8":
+"@babel/helper-validator-identifier@^7.14.5":
   version "7.14.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c"
   integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==
 
+"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
+
 "@babel/helper-validator-option@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
@@ -860,6 +735,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
   integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
 
+"@babel/helper-validator-option@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
+  integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
+
 "@babel/helper-wrap-function@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff"
@@ -890,32 +770,14 @@
     "@babel/traverse" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helpers@^7.12.1", "@babel/helpers@^7.12.17":
-  version "7.20.13"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.13.tgz#e3cb731fb70dc5337134cadc24cbbad31cc87ad2"
-  integrity sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==
+"@babel/helpers@^7.12.5", "@babel/helpers@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e"
+  integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
   dependencies:
     "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.13"
-    "@babel/types" "^7.20.7"
-
-"@babel/helpers@^7.12.5", "@babel/helpers@^7.14.8":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.8.tgz#839f88f463025886cff7f85a35297007e2da1b77"
-  integrity sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==
-  dependencies:
-    "@babel/template" "^7.14.5"
-    "@babel/traverse" "^7.14.8"
-    "@babel/types" "^7.14.8"
-
-"@babel/helpers@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce"
-  integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==
-  dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.20.7"
-    "@babel/types" "^7.20.7"
+    "@babel/traverse" "^7.21.0"
+    "@babel/types" "^7.21.0"
 
 "@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6":
   version "7.18.6"
@@ -926,39 +788,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/highlight@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
-  integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.14.5"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.10.4", "@babel/parser@^7.12.17", "@babel/parser@^7.12.3", "@babel/parser@^7.12.5", "@babel/parser@^7.14.7", "@babel/parser@^7.20.13":
-  version "7.20.15"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.15.tgz#eec9f36d8eaf0948bb88c87a46784b5ee9fd0c89"
-  integrity sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==
-
-"@babel/parser@^7.1.3", "@babel/parser@^7.7.0":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
-  integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
-
-"@babel/parser@^7.1.6", "@babel/parser@^7.12.0", "@babel/parser@^7.12.11", "@babel/parser@^7.13.12", "@babel/parser@^7.13.9", "@babel/parser@^7.14.5", "@babel/parser@^7.14.8", "@babel/parser@^7.6.0", "@babel/parser@^7.9.6":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4"
-  integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==
-
-"@babel/parser@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
-  integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
-
-"@babel/parser@^7.16.4", "@babel/parser@^7.16.8", "@babel/parser@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
-  integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
+"@babel/parser@^7.1.0", "@babel/parser@^7.1.3", "@babel/parser@^7.1.6", "@babel/parser@^7.12.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.7", "@babel/parser@^7.13.12", "@babel/parser@^7.13.9", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.16.8", "@babel/parser@^7.20.7", "@babel/parser@^7.21.4", "@babel/parser@^7.6.0", "@babel/parser@^7.7.0", "@babel/parser@^7.9.6":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17"
+  integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
@@ -2741,7 +2574,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.10.4", "@babel/template@^7.12.13", "@babel/template@^7.18.10", "@babel/template@^7.20.7":
+"@babel/template@^7.12.7", "@babel/template@^7.14.5", "@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3", "@babel/template@^7.8.3":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
   integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
@@ -2750,95 +2583,22 @@
     "@babel/parser" "^7.20.7"
     "@babel/types" "^7.20.7"
 
-"@babel/template@^7.12.7", "@babel/template@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
-  integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
+"@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.16.8", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36"
+  integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==
   dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/parser" "^7.14.5"
-    "@babel/types" "^7.14.5"
-
-"@babel/template@^7.3.3":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
-  integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/parser" "^7.12.7"
-    "@babel/types" "^7.12.7"
-
-"@babel/template@^7.8.3":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz#3251996c4200ebc71d1a8fc405fba940f36ba278"
-  integrity sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/parser" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/traverse@^7.12.1", "@babel/traverse@^7.12.17", "@babel/traverse@^7.20.13", "@babel/traverse@^7.20.5", "@babel/traverse@^7.7.2":
-  version "7.20.13"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.13.tgz#817c1ba13d11accca89478bd5481b2d168d07473"
-  integrity sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.7"
+    "@babel/code-frame" "^7.21.4"
+    "@babel/generator" "^7.21.4"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-function-name" "^7.21.0"
     "@babel/helper-hoist-variables" "^7.18.6"
     "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.20.13"
-    "@babel/types" "^7.20.7"
+    "@babel/parser" "^7.21.4"
+    "@babel/types" "^7.21.4"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.12.11", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.8":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce"
-  integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==
-  dependencies:
-    "@babel/code-frame" "^7.14.5"
-    "@babel/generator" "^7.14.8"
-    "@babel/helper-function-name" "^7.14.5"
-    "@babel/helper-hoist-variables" "^7.14.5"
-    "@babel/helper-split-export-declaration" "^7.14.5"
-    "@babel/parser" "^7.14.8"
-    "@babel/types" "^7.14.8"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.16.8", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.12", "@babel/traverse@^7.20.7":
-  version "7.20.12"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.12.tgz#7f0f787b3a67ca4475adef1f56cb94f6abd4a4b5"
-  integrity sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.20.7"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.20.7"
-    "@babel/types" "^7.20.7"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3", "@babel/traverse@^7.8.6":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095"
-  integrity sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==
-  dependencies:
-    "@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@7.6.3":
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.6.3.tgz#3f07d96f854f98e2fbd45c64b0cb942d11e8ba09"
@@ -2848,41 +2608,15 @@
     lodash "^4.17.13"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.12.1", "@babel/types@^7.12.17", "@babel/types@^7.12.5", "@babel/types@^7.16.8", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.3.0":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f"
-  integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==
+"@babel/types@^7.0.0", "@babel/types@^7.12.0", "@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.16.8", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.4", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.6.3", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7", "@babel/types@^7.9.0", "@babel/types@^7.9.6":
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.4.tgz#2d5d6bb7908699b3b416409ffd3b5daa25b030d4"
+  integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==
   dependencies:
     "@babel/helper-string-parser" "^7.19.4"
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.12.0", "@babel/types@^7.12.11", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.6.1", "@babel/types@^7.9.6":
-  version "7.14.8"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz#38109de8fcadc06415fbd9b74df0065d4d41c728"
-  integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.14.8"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.12.7", "@babel/types@^7.3.3":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
-  integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.4.4", "@babel/types@^7.6.3", "@babel/types@^7.7.0", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7", "@babel/types@^7.9.0":
-  version "7.12.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"
-  integrity sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -3422,13 +3156,14 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jridgewell/gen-mapping@^0.1.0":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
-  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
   dependencies:
-    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/set-array" "^1.0.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
 
 "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.2"
@@ -3444,7 +3179,7 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
-"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
@@ -3462,6 +3197,14 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
+"@jridgewell/trace-mapping@^0.3.17":
+  version "0.3.18"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
+  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
+  dependencies:
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
+
 "@mapbox/fusspot@^0.4.0":
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/@mapbox/fusspot/-/fusspot-0.4.0.tgz#5ac625b5ed31695fda465fb0413ee0379bdf553c"
@@ -9357,14 +9100,7 @@ content-type@^1.0.4, content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.5.0, convert-source-map@^1.6.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-convert-source-map@^1.7.0:
+convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
@@ -10057,12 +9793,12 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4.0.1, debug@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
-    ms "^2.1.1"
+    ms "2.1.2"
 
 debug@=3.1.0:
   version "3.1.0"
@@ -10078,13 +9814,6 @@ debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
-  dependencies:
-    ms "2.1.2"
-
 decamelize-keys@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
@@ -13527,13 +13256,6 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.2.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491"
-  integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==
-  dependencies:
-    has "^1.0.3"
-
 is-core-module@^2.9.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
@@ -14687,18 +14409,11 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.2:
+json5@^2.1.2, json5@^2.1.3, json5@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
-json5@^2.1.3:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
-  dependencies:
-    minimist "^1.2.5"
-
 jsonfile@^2.1.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
@@ -16963,7 +16678,7 @@ path-key@^3.0.0, path-key@^3.1.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.0.tgz#99a10d870a803bdd5ee6f0470e58dfcd2f9a54d3"
   integrity sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==
 
-path-parse@^1.0.6, path-parse@^1.0.7:
+path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
@@ -19434,22 +19149,7 @@ resolve.exports@^2.0.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.0.tgz#c1a0028c2d166ec2fbf7d0644584927e76e7400e"
   integrity sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.2.0, resolve@^1.5.0, resolve@^1.8.1:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
-  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.14.2, resolve@^1.15.1, resolve@^1.19.0:
-  version "1.20.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
-  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
-  dependencies:
-    is-core-module "^2.2.0"
-    path-parse "^1.0.6"
-
-resolve@^1.20.0, resolve@^1.3.2:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.19.0, resolve@^1.2.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1:
   version "1.22.1"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==