From 9454b7b541d9216723ba3a8dfd813f0fe2323aa7 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Fri, 17 Mar 2023 18:21:56 +0100
Subject: [PATCH 01/11] [WIP] fixing layout on newsfeed page

---
 .../components/DonationInfo/DonationInfo.vue  |  1 +
 webapp/components/MasonryGrid/MasonryGrid.vue |  2 +-
 webapp/components/PostTeaser/PostTeaser.vue   |  1 +
 webapp/pages/index.vue                        | 51 ++++++++++++-------
 4 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/webapp/components/DonationInfo/DonationInfo.vue b/webapp/components/DonationInfo/DonationInfo.vue
index b66f33305..00b9bf584 100644
--- a/webapp/components/DonationInfo/DonationInfo.vue
+++ b/webapp/components/DonationInfo/DonationInfo.vue
@@ -47,5 +47,6 @@ export default {
   display: flex;
   flex: 1;
   margin-bottom: $space-x-small;
+  margin-top: 16px;
 }
 </style>
diff --git a/webapp/components/MasonryGrid/MasonryGrid.vue b/webapp/components/MasonryGrid/MasonryGrid.vue
index f95c0e16e..d4c58daff 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 16px !important;
   grid-auto-rows: 20px;
 }
 
diff --git a/webapp/components/PostTeaser/PostTeaser.vue b/webapp/components/PostTeaser/PostTeaser.vue
index 228c4c90c..37f471bb8 100644
--- a/webapp/components/PostTeaser/PostTeaser.vue
+++ b/webapp/components/PostTeaser/PostTeaser.vue
@@ -194,6 +194,7 @@ export default {
   display: block;
   height: 100%;
   color: $text-color-base;
+  padding-top: 16px;
 }
 
 .post-user-row {
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 0094f5706..147075093 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -17,13 +17,10 @@
           />
         </nuxt-link>
       </client-only>
-    </div>
-    <masonry-grid>
-      <!--Filter Button-->
-      <ds-grid-item
-        v-if="categoriesActive && SHOW_CONTENT_FILTER_MASONRY_GRID"
-        :row-span="1"
-        column-span="fullWidth"
+    </div>    
+    <div>
+      <div
+        v-if="categoriesActive && SHOW_CONTENT_FILTER_MASONRY_GRID"        
         class="top-filter-menu"
       >
         <div class="filterButtonBox">
@@ -74,17 +71,19 @@
             </div>
           </div>
         </div>
-      </ds-grid-item>
-      <!-- Placeholder/Space Row -->
-      <ds-grid-item :row-span="1" column-span="fullWidth" />
-      <!-- hashtag filter -->
-      <ds-grid-item v-if="hashtag" :row-span="2" column-span="fullWidth">
+      </div>
+    </div>
+
+    <div v-if="hashtag || showDonations" class="newsfeed-controls">      
+      <div v-if="hashtag">
         <hashtags-filter :hashtag="hashtag" @clearSearch="clearSearch" />
-      </ds-grid-item>
-      <!-- donation info -->
-      <ds-grid-item v-if="showDonations" class="top-info-bar" :row-span="1" column-span="fullWidth">
+      </div>
+      <div v-if="showDonations" class="top-info-bar">
         <donation-info :goal="goal" :progress="progress" />
-      </ds-grid-item>
+      </div>
+    </div>
+    <!-- content grid -->
+    <masonry-grid>
       <!-- news feed -->
       <template v-if="hasResults">
         <masonry-grid-item
@@ -336,6 +335,10 @@ export default {
   box-shadow: $box-shadow-x-large;
 }
 
+.top-filter-menu{
+  margin-top: 16px;
+}
+
 .top-info-bar,
 .top-filter-menu {
   display: flex;
@@ -345,10 +348,13 @@ export default {
   width: 95%;
   position: fixed;
   z-index: 6;
-  margin-top: -35px;
-  padding: 20px 10px 20px 10px;
+  margin-top: -45px;
+  padding: 30px 0px 20px 0px;
   background-color: #f5f4f6;
 }
+.newsfeed-controls{
+  margin-top: 46px;
+}
 @media screen and (max-width: 656px) {
   .filterButtonMenu {
     margin-top: -50px;
@@ -415,4 +421,13 @@ export default {
     padding-top: 1em;
   }
 }
+@media screen and (max-width: 650px) {
+//    .top-filter-menu{
+//     margin-top: 24px;
+//   }
+
+.newsfeed-controls{
+  margin-top: 32px;
+}
+}
 </style>

From 335ffcda14b57733707e1177f1b55da6836b0de4 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Mon, 20 Mar 2023 14:17:15 +0100
Subject: [PATCH 02/11] added margin to newsfeed grid if no donation or hastag
 bar is visible

---
 webapp/pages/index.vue | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 147075093..2ef0a954c 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -17,12 +17,9 @@
           />
         </nuxt-link>
       </client-only>
-    </div>    
+    </div>
     <div>
-      <div
-        v-if="categoriesActive && SHOW_CONTENT_FILTER_MASONRY_GRID"        
-        class="top-filter-menu"
-      >
+      <div v-if="categoriesActive && SHOW_CONTENT_FILTER_MASONRY_GRID" class="top-filter-menu">
         <div class="filterButtonBox">
           <div class="filterButtonMenu" :class="{ 'hide-filter': hideByScroll }">
             <base-button
@@ -74,7 +71,7 @@
       </div>
     </div>
 
-    <div v-if="hashtag || showDonations" class="newsfeed-controls">      
+    <div v-if="hashtag || showDonations" class="newsfeed-controls">
       <div v-if="hashtag">
         <hashtags-filter :hashtag="hashtag" @clearSearch="clearSearch" />
       </div>
@@ -83,7 +80,7 @@
       </div>
     </div>
     <!-- content grid -->
-    <masonry-grid>
+    <masonry-grid :class="[!hashtag && !showDonations ? 'grid-margin-top' : '']">
       <!-- news feed -->
       <template v-if="hasResults">
         <masonry-grid-item
@@ -335,7 +332,7 @@ export default {
   box-shadow: $box-shadow-x-large;
 }
 
-.top-filter-menu{
+.top-filter-menu {
   margin-top: 16px;
 }
 
@@ -352,7 +349,7 @@ export default {
   padding: 30px 0px 20px 0px;
   background-color: #f5f4f6;
 }
-.newsfeed-controls{
+.newsfeed-controls {
   margin-top: 46px;
 }
 @media screen and (max-width: 656px) {
@@ -367,6 +364,9 @@ export default {
   overflow: auto;
   padding-bottom: 0px;
 }
+.grid-margin-top {
+  margin-top: 26px;
+}
 @media screen and (min-height: 401px) {
   #my-filter {
     max-height: 330px;
@@ -422,12 +422,16 @@ export default {
   }
 }
 @media screen and (max-width: 650px) {
-//    .top-filter-menu{
-//     margin-top: 24px;
-//   }
+  //    .top-filter-menu{
+  //     margin-top: 24px;
+  //   }
 
-.newsfeed-controls{
-  margin-top: 32px;
-}
+  .newsfeed-controls {
+    margin-top: 32px;
+  }
+
+  .grid-margin-top {
+    margin-top: 6px;
+  }
 }
 </style>

From f828497c961a772d68cfbbdb5df752c2b5f35574 Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Thu, 27 Apr 2023 13:43:04 +0200
Subject: [PATCH 03/11] updated of mobile media querys for top gap of newsfeed

---
 webapp/pages/index.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 2ef0a954c..396c40595 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -417,9 +417,6 @@ export default {
     font-size: 23px;
     z-index: 10;
   }
-  .ds-grid {
-    padding-top: 1em;
-  }
 }
 @media screen and (max-width: 650px) {
   //    .top-filter-menu{
@@ -429,9 +426,5 @@ export default {
   .newsfeed-controls {
     margin-top: 32px;
   }
-
-  .grid-margin-top {
-    margin-top: 6px;
-  }
 }
 </style>

From 95710fd58774c359cf64164571800dd18c13674c Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Mon, 15 May 2023 14:51:23 +0200
Subject: [PATCH 04/11] [fix] added custom css to newsfeed layout if less than
 3 posts are visible

---
 webapp/pages/index.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index dcb35a684..325976aad 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -80,7 +80,12 @@
       </div>
     </div>
     <!-- content grid -->
-    <masonry-grid :class="[!hashtag && !showDonations ? 'grid-margin-top' : '']">
+    <masonry-grid
+      :class="[
+        !hashtag && !showDonations ? 'grid-margin-top' : '',
+        !isMobile && posts.length <= 2 ? 'grid-column-helper' : '',
+      ]"
+    >
       <!-- news feed -->
       <template v-if="hasResults">
         <masonry-grid-item
@@ -129,6 +134,7 @@ import UpdateQuery from '~/components/utils/UpdateQuery'
 import FilterMenuComponent from '~/components/FilterMenu/FilterMenuComponent'
 import { SHOW_CONTENT_FILTER_MASONRY_GRID } from '~/constants/filter.js'
 import { POST_ADD_BUTTON_POSITION_TOP } from '~/constants/posts.js'
+import mobile from '~/mixins/mobile'
 
 export default {
   components: {
@@ -141,7 +147,7 @@ export default {
     FilterMenuComponent,
     HeaderButton,
   },
-  mixins: [postListActions],
+  mixins: [postListActions, mobile()],
   data() {
     const { hashtag = null } = this.$route.query
     return {
@@ -352,6 +358,10 @@ export default {
 .newsfeed-controls {
   margin-top: 46px;
 }
+.main-container .grid-column-helper {
+  grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 357px)) !important;
+}
+
 @media screen and (max-width: 656px) {
   .filterButtonMenu {
     margin-top: -50px;

From dfd84f921cf22c17b122f3b56714ffaf6bf09e4c Mon Sep 17 00:00:00 2001
From: Markus <markus@infinity.labs.ooo>
Date: Fri, 19 May 2023 15:15:41 +0200
Subject: [PATCH 05/11] [fix] adds white space after mention in comment editor

---
 webapp/components/Editor/nodes/Mention.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/Editor/nodes/Mention.js b/webapp/components/Editor/nodes/Mention.js
index dad983ed6..fa1555877 100644
--- a/webapp/components/Editor/nodes/Mention.js
+++ b/webapp/components/Editor/nodes/Mention.js
@@ -17,7 +17,7 @@ export default class Mention extends TipTapMention {
             'data-mention-id': node.attrs.id,
             target: '_blank',
           },
-          `${this.options.matcher.char}${node.attrs.label}`,
+          `${this.options.matcher.char}${node.attrs.label} `,
         ]
       },
       parseDOM: [

From 6edca68fc99f719d33e5db953063306bb76883e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 23 May 2023 13:19:06 +0200
Subject: [PATCH 06/11] Add missing todo in deployment readme
 'TODO-next-update.md'

---
 deployment/TODO-next-update.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/deployment/TODO-next-update.md b/deployment/TODO-next-update.md
index 769fe4d67..8630275b7 100644
--- a/deployment/TODO-next-update.md
+++ b/deployment/TODO-next-update.md
@@ -2,7 +2,9 @@
 
 When you overtake this deploy and rebrand repo to your network you have to recognize the following changes and doings:
 
-## Version >= 2.4.0 with 'ocelotDockerVersionTag' 2.4.0-XXX
+## Version >= 2.4.0 with 'ocelotDockerVersionTag' 2.4.0-298
+
+- You have to set `SHOW_CONTENT_FILTER_HEADER_MENU` and `SHOW_CONTENT_FILTER_MASONRY_GRID` in `branding/constants/filter.js` originally in main code file `webapp/constants/filter.js` to your preferred value.
 
 ### Main Code PR –  feat(webapp): map #5843
 

From 8f9ebd77b25a1bb3909d94bf6be05a516eda20db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 14:24:08 +0000
Subject: [PATCH 07/11] Bump node from 19.9.0-alpine3.17 to 20.2.0-alpine3.17
 in /backend

Bumps node from 19.9.0-alpine3.17 to 20.2.0-alpine3.17.

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

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 cd9bcdd3c..283e6c7fb 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,7 +1,7 @@
 ##################################################################################
 # BASE (Is pushed to DockerHub for rebranding) ###################################
 ##################################################################################
-FROM node:19.9.0-alpine3.17 as base
+FROM node:20.2.0-alpine3.17 as base
 
 # ENVs
 ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame

From 09bfc32d976f994588b3bfc6a10600db94ad785e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 15:34:38 +0000
Subject: [PATCH 08/11] Bump metascraper-audio from 5.33.5 to 5.34.4 in
 /backend

Bumps [metascraper-audio](https://github.com/microlinkhq/metascraper/tree/HEAD/packages/metascraper-audio) from 5.33.5 to 5.34.4.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/packages/metascraper-audio/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/commits/v5.34.4/packages/metascraper-audio)

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

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

diff --git a/backend/package.json b/backend/package.json
index 27c6fb4fc..0d48437eb 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -66,7 +66,7 @@
     "lodash": "~4.17.14",
     "merge-graphql-schemas": "^1.7.8",
     "metascraper": "^5.33.5",
-    "metascraper-audio": "^5.33.5",
+    "metascraper-audio": "^5.34.4",
     "metascraper-author": "^5.33.5",
     "metascraper-clearbit-logo": "^5.3.0",
     "metascraper-date": "^5.33.5",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 18887b92a..3f376b0b2 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -1485,6 +1485,13 @@
   dependencies:
     json-buffer "~3.0.1"
 
+"@keyvhq/core@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@keyvhq/core/-/core-2.0.0.tgz#518311a59dbc4d6b6fd56852c15f483edb9fc7c9"
+  integrity sha512-fi3+F7GNImn1j4r6UFhsHRwN8a05uhUlrbNWZgnkX0h1NzcBEPNNqqMOE4KSASJwH2e9Eh/jm+bEfto58csNgg==
+  dependencies:
+    json-buffer "~3.0.1"
+
 "@keyvhq/memoize@~1.6.14":
   version "1.6.14"
   resolved "https://registry.yarnpkg.com/@keyvhq/memoize/-/memoize-1.6.14.tgz#6a347b81e9be7040c678f8fc4b9046186484b6fc"
@@ -1493,6 +1500,14 @@
     "@keyvhq/core" "^1.6.14"
     mimic-fn "~3.0.0"
 
+"@keyvhq/memoize@~2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@keyvhq/memoize/-/memoize-2.0.0.tgz#58b1118c2972b631aede81040eab6daefce8f5e8"
+  integrity sha512-0vibPmDh7nCWsbdS4A1IJX1G89PyT+nJEDGj1tUYsLPQ5BLnpLwneCudmXIvxD6cUUvMYqmhxKyjpvHd8DpPkA==
+  dependencies:
+    "@keyvhq/core" "^2.0.0"
+    mimic-fn "~3.0.0"
+
 "@metascraper/helpers@^4.10.2":
   version "4.10.2"
   resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-4.10.2.tgz#864e49c71468548441f3a1ab68fdb2913855821b"
@@ -1516,15 +1531,15 @@
     url-regex "~4.1.1"
     video-extensions "~1.1.0"
 
-"@metascraper/helpers@^5.33.5", "@metascraper/helpers@^5.34.2":
-  version "5.34.2"
-  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.34.2.tgz#3c6ef10c1ab7e8b09b67219c91c7b8d30fedd0c1"
-  integrity sha512-7mlQ1uYCUGw5OZU52leHbbjO8UrmmTvLCt6p4E4yWAvEW1oi9t7Pq1AmizX4hNUW+FgMvXCcv4t5BCfxiY8LhA==
+"@metascraper/helpers@^5.33.5", "@metascraper/helpers@^5.34.2", "@metascraper/helpers@^5.34.4":
+  version "5.34.4"
+  resolved "https://registry.yarnpkg.com/@metascraper/helpers/-/helpers-5.34.4.tgz#59faf01466938b26aa8df147f97c7f9f4d739d28"
+  integrity sha512-OZdXkfxJXH5dW+aoptLJzxN56Xj+ABzbqZ9NDuKn908zW4tvLBPD6go3qdd3GXXQZH7TxvWpETn9i1AxzoyKmQ==
   dependencies:
     audio-extensions "0.0.0"
     chrono-node "~2.6.2"
     condense-whitespace "~2.0.0"
-    entities "~4.4.0"
+    entities "~4.5.0"
     file-extension "~4.0.5"
     has-values "~2.0.1"
     image-extensions "~1.1.0"
@@ -1532,7 +1547,7 @@
     is-uri "~1.2.4"
     iso-639-3 "~2.2.0"
     isostring "0.0.1"
-    jsdom "~21.1.1"
+    jsdom "~22.0.0"
     lodash "~4.17.21"
     memoize-one "~6.0.0"
     microsoft-capitalize "~1.0.5"
@@ -2143,34 +2158,16 @@ accepts@^1.3.5, accepts@~1.3.7:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
-acorn-globals@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
-  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
-  dependencies:
-    acorn "^8.1.0"
-    acorn-walk "^8.0.2"
-
 acorn-jsx@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
   integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
 
-acorn-walk@^8.0.2:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
-  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
-
 acorn@^7.1.0:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.1.0, acorn@^8.8.2:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
-  integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
-
 agent-base@5:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
@@ -4386,11 +4383,16 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
   integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
 
-entities@^4.2.0, entities@^4.3.0, entities@^4.4.0, entities@~4.4.0:
+entities@^4.2.0, entities@^4.3.0, entities@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
   integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
 
+entities@~4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
+  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
+
 env-paths@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
@@ -4529,18 +4531,6 @@ escape-string-regexp@^2.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
-escodegen@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
-  integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^5.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
 eslint-config-prettier@~6.15.0:
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9"
@@ -4710,7 +4700,7 @@ espree@^6.1.2:
     acorn-jsx "^5.1.0"
     eslint-visitor-keys "^1.1.0"
 
-esprima@^4.0.0, esprima@^4.0.1:
+esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -4734,11 +4724,6 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
-  integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
-
 esutils@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
@@ -5424,7 +5409,7 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-got@~11.8.0, got@~11.8.5:
+got@~11.8.0, got@~11.8.5, got@~11.8.6:
   version "11.8.6"
   resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
   integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
@@ -6895,25 +6880,22 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
 
-jsdom@~21.1.1:
-  version "21.1.1"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.1.1.tgz#ab796361e3f6c01bcfaeda1fea3c06197ac9d8ae"
-  integrity sha512-Jjgdmw48RKcdAIQyUD1UdBh2ecH7VqwaXPN3ehoZN6MqgVbMn+lRm1aAT1AsdJRAJpwfa4IpwgzySn61h2qu3w==
+jsdom@~22.0.0:
+  version "22.0.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-22.0.0.tgz#3295c6992c70089c4b8f5cf060489fddf7ee9816"
+  integrity sha512-p5ZTEb5h+O+iU02t0GfEjAnkdYPrQSkfuTSMkMYyIoMvUNEHsbG0bHHbfXIcfTqD2UfvjQX7mmgiFsyRwGscVw==
   dependencies:
     abab "^2.0.6"
-    acorn "^8.8.2"
-    acorn-globals "^7.0.0"
     cssstyle "^3.0.0"
     data-urls "^4.0.0"
     decimal.js "^10.4.3"
     domexception "^4.0.0"
-    escodegen "^2.0.0"
     form-data "^4.0.0"
     html-encoding-sniffer "^3.0.0"
     http-proxy-agent "^5.0.0"
     https-proxy-agent "^5.0.1"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.2"
+    nwsapi "^2.2.4"
     parse5 "^7.1.2"
     rrweb-cssom "^0.6.0"
     saxes "^6.0.0"
@@ -7435,14 +7417,14 @@ merge2@^1.3.0:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz#5b366ee83b2f1582c48f87e47cf1a9352103ca81"
   integrity sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==
 
-metascraper-audio@^5.33.5:
-  version "5.33.5"
-  resolved "https://registry.yarnpkg.com/metascraper-audio/-/metascraper-audio-5.33.5.tgz#5400fab5154636f166aff10e205a429c9e75d9a2"
-  integrity sha512-zO2PyRIVH10RTZlphYXVOAn8U17ZaH/JkY95h1BJ9eMBWfnziuWCtN0tIUUysQ+Ci8vcci65tasYqdG7jfcHKQ==
+metascraper-audio@^5.34.4:
+  version "5.34.4"
+  resolved "https://registry.yarnpkg.com/metascraper-audio/-/metascraper-audio-5.34.4.tgz#84437c3962a9186cda69510229f6b68e6a25563a"
+  integrity sha512-Z/BzT0KLq8H6Zc0wm4PqKlSeI7O54ZsD2QhV9GgkJNz5jGj0Rs4P3OOvoa+FEtDyRKGfIzYuldAuhQMVmo1WMA==
   dependencies:
-    "@keyvhq/memoize" "~1.6.14"
-    "@metascraper/helpers" "^5.33.5"
-    got "~11.8.5"
+    "@keyvhq/memoize" "~2.0.0"
+    "@metascraper/helpers" "^5.34.4"
+    got "~11.8.6"
     p-reflect "~2.1.0"
 
 metascraper-author@^5.33.5:
@@ -8217,10 +8199,10 @@ numeral@^2.0.6:
   resolved "https://registry.yarnpkg.com/numeral/-/numeral-2.0.6.tgz#4ad080936d443c2561aed9f2197efffe25f4e506"
   integrity sha1-StCAk21EPCVhrtnyGX7//iX05QY=
 
-nwsapi@^2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
-  integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
+nwsapi@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5"
+  integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g==
 
 oauth-sign@~0.9.0:
   version "0.9.0"
@@ -8339,7 +8321,7 @@ optimism@^0.10.0:
   dependencies:
     "@wry/context" "^0.4.0"
 
-optionator@^0.8.1, optionator@^0.8.3:
+optionator@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@@ -9737,7 +9719,7 @@ source-map@^0.5.0, source-map@^0.5.6:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==

From 69a01e2bf9d10d8f18eb54ac97736a29c90aca32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 17:55:17 +0000
Subject: [PATCH 09/11] Bump metascraper-soundcloud from 5.34.2 to 5.34.4 in
 /backend

Bumps [metascraper-soundcloud](https://github.com/microlinkhq/metascraper/tree/HEAD/packages/metascraper-soundcloud) from 5.34.2 to 5.34.4.
- [Release notes](https://github.com/microlinkhq/metascraper/releases)
- [Changelog](https://github.com/microlinkhq/metascraper/blob/master/packages/metascraper-soundcloud/CHANGELOG.md)
- [Commits](https://github.com/microlinkhq/metascraper/commits/v5.34.4/packages/metascraper-soundcloud)

---
updated-dependencies:
- dependency-name: metascraper-soundcloud
  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    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index 0d48437eb..d6e4f805d 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -76,7 +76,7 @@
     "metascraper-lang-detector": "^4.10.2",
     "metascraper-logo": "^5.33.5",
     "metascraper-publisher": "^5.33.5",
-    "metascraper-soundcloud": "^5.34.2",
+    "metascraper-soundcloud": "^5.34.4",
     "metascraper-title": "^5.33.5",
     "metascraper-url": "^5.34.2",
     "metascraper-video": "^5.33.5",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 3f376b0b2..0eb4548ff 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -7493,12 +7493,12 @@ metascraper-publisher@^5.33.5:
   dependencies:
     "@metascraper/helpers" "^5.33.5"
 
-metascraper-soundcloud@^5.34.2:
-  version "5.34.2"
-  resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.34.2.tgz#ee1077b4836321ccfb22bcab4bfae7360dd571a3"
-  integrity sha512-1VafeFnlzJaYUlq8XbppQauz0i9xM8QycJU8k4ONftZwRtikQBIjRe5BMXr/s5n32831vBooRz8ksz0CXkjVlQ==
+metascraper-soundcloud@^5.34.4:
+  version "5.34.4"
+  resolved "https://registry.yarnpkg.com/metascraper-soundcloud/-/metascraper-soundcloud-5.34.4.tgz#f5e154e20ddad8902630b6f128f0928e7475ef83"
+  integrity sha512-EO17QYd7HOEGFHgKjC68x5fp8j+V+iYeGO0IgWY53olOfIrxBMG6gG1IIqcOjhbZFVHNX1uBz4BVmNtTvHvcjw==
   dependencies:
-    "@metascraper/helpers" "^5.34.2"
+    "@metascraper/helpers" "^5.34.4"
 
 metascraper-title@^5.33.5:
   version "5.33.5"

From 49d959d7a5f680dc3266c2560fad708e78f889ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 18:53:30 +0000
Subject: [PATCH 10/11] Bump validator from 13.0.0 to 13.9.0 in /backend

Bumps [validator](https://github.com/validatorjs/validator.js) from 13.0.0 to 13.9.0.
- [Release notes](https://github.com/validatorjs/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/validatorjs/validator.js/compare/13.0.0...13.9.0)

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

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

diff --git a/backend/package.json b/backend/package.json
index d6e4f805d..0c380d660 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -98,7 +98,7 @@
     "subscriptions-transport-ws": "^0.9.19",
     "trunc-html": "~1.1.2",
     "uuid": "~8.3.2",
-    "validator": "^13.0.0",
+    "validator": "^13.9.0",
     "wait-on": "~4.0.1",
     "xregexp": "^4.3.0"
   },
diff --git a/backend/yarn.lock b/backend/yarn.lock
index 0eb4548ff..fbb356cf2 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -10723,10 +10723,10 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-validator@^13.0.0:
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-13.0.0.tgz#0fb6c6bb5218ea23d368a8347e6d0f5a70e3bcab"
-  integrity sha512-anYx5fURbgF04lQV18nEQWZ/3wHGnxiKdG4aL8J+jEDsm98n/sU/bey+tYk6tnGJzm7ioh5FoqrAiQ6m03IgaA==
+validator@^13.9.0:
+  version "13.9.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.9.0.tgz#33e7b85b604f3bbce9bb1a05d5c3e22e1c2ff855"
+  integrity sha512-B+dGG8U3fdtM0/aNK4/X8CXq/EcxU2WPrPEkJGslb47qyHsxmbggTWK0yEA4qnYVNF+nxNlN88o14hIcPmSIEA==
 
 vary@^1, vary@~1.1.2:
   version "1.1.2"

From b4d8affec07e406a6e2f14f91d9d343912f72860 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 24 May 2023 11:50:42 +0200
Subject: [PATCH 11/11] Add description for script usage in deployment readme

---
 deployment/README.deployment.md | 59 +++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/deployment/README.deployment.md b/deployment/README.deployment.md
index 5335c11ad..f085b48d0 100644
--- a/deployment/README.deployment.md
+++ b/deployment/README.deployment.md
@@ -17,7 +17,62 @@ You have the following options for a deployment:
 
 After the first deployment of the new network on your server, the database is initialized with the default administrator:
 
-- E-mail: admin@example.org
-- Password: 1234
+- E-mail: `admin@example.org`
+- Password: `1234`
 
 ***ATTENTION:*** When you are logged in for the first time, please change your (the admin's) e-mail to an existing one and change your password to a secure one !!!
+
+## Use the Scripts
+
+To use all the scripts you have to set the variable `CONFIGURATION` in your terminal by entering:
+
+```bash
+# in deployment folder
+
+# set configuration name to folder name in 'configurations' folder (network name)
+$ export CONFIGURATION=`<your-configuration-name>`
+# to check this
+$ echo $CONFIGURATION
+```
+
+### Secrets Encrypt/Decrypt
+
+To encrypt and decrypt the secrets of your network in your terminal set a correct password in a (new) file `configurations/<your-configuration-name>/SECRET`.
+If done please enter:
+
+```bash
+# in deployment folder
+
+# encrypt secrets
+$ scripts/secrets.encrypt.sh
+
+# decrypt secrets
+$ scripts/secrets.decrypt.sh
+```
+
+### Maintenance Mode On/Off
+
+Activate or deactivate maintenance mode in your terminal:
+
+```bash
+# in deployment folder
+
+# activate maintenance mode
+$ scripts/cluster.maintenance.sh on
+
+# deactivate maintenance mode
+$ scripts/cluster.maintenance.sh off
+```
+
+### Backup Script
+
+To save a locale backup of the database and uploaded images:
+
+```bash
+# in deployment folder
+
+# save backup
+$ scripts/cluster.backup.sh
+```
+
+The backup will be saved into your network folders `backup` folder in a new folder with the date and time.