Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/graphql-14.7.0

# Conflicts: # webapp/package-lock.json
2025-12-13 07:45:56 +00:00 · 2021-07-21 10:18:53 +02:00 · 2021-07-21 10:18:53 +02:00 · d2f2aeeebc
commit d2f2aeeebc
parent d2b8477ca9 deb0bc39e7
49 changed files with 614 additions and 303 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,25 +1,9 @@
 ---
-name: 🐛 Bug report
-about: Create a report to help us improve
+name: 🐛 Bug Report
+about: Create a report to help us to improve.
 labels: bug
 title: 🐛 [Bug] 
 ---

-## :bug: Bugreport
+## :bug: Bug Report
 <!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the bug is.-->
-
-### Steps to reproduce the behavior
-1.
-2.
-3.
-4. ...
-5. Profit
-
-### Expected behavior
-<!-- A clear and concise description of what you expected to happen. -->
-
-### Version & Environment
-<!-- Add context about your environment and used version here. -->
-
-### Additional context
-<!-- Add any other context about the problem here. -->
--- a/.github/ISSUE_TEMPLATE/devops_ticket.md
+++ b/.github/ISSUE_TEMPLATE/devops_ticket.md
@ -1,24 +1,9 @@
 ---
-name: 💥 DevOps ticket
-about: Help us manage our deployed App.
+name: 💥 DevOps Ticket
+about: Help us manage our deployed app.
 labels: devops
 title: 💥 [DevOps]
 ---

-## 💥 DevOps ticket
+## 💥 DevOps Ticket
 <!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->
-
-### Motive
-<!-- Why does this task need to be done? What can we benefit from this? -->
-
-### Related issues
-<!-- Are there any related issues to link to? Please paste them below for reference. -->
-
-### Implementation
-<!-- Please, document any ideas of how the task can be performed. -->
-
-### Validation
-<!-- How can we make sure that this task was successful? -->
-
-### Additional context
-<!-- Add other context or background about the feature request here.-->
--- a/.github/ISSUE_TEMPLATE/epic.md
+++ b/.github/ISSUE_TEMPLATE/epic.md
@ -0,0 +1,12 @@
+---
+name: 🌟 Epic
+about: Define a big development step.
+labels: epic
+title: 🌟 [EPIC] 
+---
+<!-- THIS ISSUE-TYPE IS NOT FOR YOU! -->
+<!-- If you need an answer right away, visit the ocelot.social Discord:
+https://discord.gg/AJSX9DCSUA -->
+
+## 🌟 EPIC
+<!-- Describe your Epic in detail. Include screenshots and drawings -->
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -1,24 +1,9 @@
 ---
-name: 🚀 Feature request
-about: Suggest an idea for this project
+name: 🚀 Feature Request
+about: Suggest an idea for this project.
 labels: feature
 title: 🚀 [Feature] 
 ---

-## :rocket: Feature
+## :rocket: Feature Request
 <!-- Give a short summary of the Feature. Use Screenshots if you want. -->
-
-### User Problem
-<!-- Which problem is this solving? Why do you think this is important? Who will benefit from it and how? -->
-
-### Implementation
-<!-- How do you think this feature should be implemented? How will it be used? Where in the network should it be located? Which steps and screens are involved? -->
-
-### Design & Layout
-<!-- Attach Screenshots and Sketches to illustrate your idea. -->
-
-### Validation
-<!-- How can we make sure that this feature indeed solves the above problem? How do we know if it has been accepted by the users of the network, once released? -->
-
-### Additional context
-<!-- Add other context or background about the feature request here.-->
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@ -8,5 +8,5 @@ title: 💬 [Question]
 <!-- If you need an answer right away, visit the ocelot.social Discord:
 https://discord.gg/AJSX9DCSUA -->

-## :speech_balloon: Question
+## 💬 Question
 <!-- Describe your Question in detail. Include screenshots and drawings if needed. -->
--- a/.github/ISSUE_TEMPLATE/refactor_tickets.md
+++ b/.github/ISSUE_TEMPLATE/refactor_tickets.md
@ -1,21 +1,10 @@
 ---
-name: 🔧 Refactor ticket
+name: 🔧 Refactor
 about: Help us improve our code by refactoring it.
 labels: refactor
 title: 🔧 [Refactor]
 ---

-## :zap: Refactor ticket
+## 🔧 Refactor
 <!-- Describe your issue in detail. Include screenshots if needed. Give us as much information as possible. Use a clear and concise description of what the problem is.-->

-### Motive
-<!-- What is the purpose of this refactoring? If it's removing depcrecated code, please link to the deprecation notice. -->
-
-### Related issues
-<!-- Are there any related issues to link to? Please paste them below for reference. -->
-
-### Implementation
-<!-- Please, document any ideas of how the code should be refactored. -->
-
-### Additional context
-<!-- Add other context or background about the feature request here.-->
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -0,0 +1,179 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: cypress
+    versions:
+    - 6.3.0
+    - 6.4.0
+    - 6.5.0
+    - 6.6.0
+    - 6.7.1
+    - 6.8.0
+    - 7.0.0
+    - 7.0.1
+    - 7.1.0
+  - dependency-name: cypress-cucumber-preprocessor
+    versions:
+    - 4.0.0
+    - 4.0.1
+    - 4.0.3
+  - dependency-name: date-fns
+    versions:
+    - 2.16.1
+    - 2.17.0
+    - 2.18.0
+    - 2.19.0
+    - 2.20.0
+    - 2.20.1
+    - 2.20.2
+    - 2.20.3
+    - 2.21.0
+  - dependency-name: cypress-file-upload
+    versions:
+    - 5.0.2
+    - 5.0.3
+    - 5.0.4
+    - 5.0.5
+  - dependency-name: neo4j-driver
+    versions:
+    - 4.2.2
+- package-ecosystem: npm
+  directory: "/backend"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: y18n
+    versions:
+    - 4.0.1
+    - 4.0.2
+  - dependency-name: metascraper-publisher
+    versions:
+    - 5.16.16
+    - 5.18.1
+    - 5.18.12
+    - 5.18.2
+    - 5.18.4
+    - 5.18.5
+    - 5.18.6
+    - 5.18.9
+    - 5.20.0
+    - 5.21.0
+    - 5.21.2
+    - 5.21.3
+    - 5.21.4
+    - 5.21.5
+  - dependency-name: metascraper-author
+    versions:
+    - 5.16.16
+    - 5.18.1
+    - 5.18.12
+    - 5.18.2
+    - 5.18.4
+    - 5.18.5
+    - 5.18.6
+    - 5.18.9
+    - 5.20.0
+    - 5.21.0
+    - 5.21.2
+    - 5.21.3
+    - 5.21.4
+    - 5.21.5
+  - dependency-name: neo4j-driver
+    versions:
+    - 4.2.2
+  - dependency-name: neo4j-graphql-js
+    versions:
+    - 2.19.1
+  - dependency-name: mustache
+    versions:
+    - 4.1.0
+- package-ecosystem: npm
+  directory: "/webapp"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: nuxt
+    versions:
+    - 2.14.12
+    - 2.15.0
+    - 2.15.1
+    - 2.15.2
+    - 2.15.3
+  - dependency-name: v-tooltip
+    versions:
+    - 2.1.2
+  - dependency-name: "@vue/server-test-utils"
+    versions:
+    - 1.1.2
+    - 1.1.3
+  - dependency-name: node-notifier
+    versions:
+    - 8.0.1
+- package-ecosystem: docker
+  directory: "/webapp"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: node
+    versions:
+    - ">= 15.5.a, < 15.6"
+  - dependency-name: node
+    versions:
+    - 15.10.0.pre.alpine3.10
+    - 15.11.0.pre.alpine3.10
+    - 15.12.0.pre.alpine3.10
+    - 15.13.0.pre.alpine3.10
+    - 15.7.0.pre.alpine3.10
+    - 15.8.0.pre.alpine3.10
+    - 15.9.0.pre.alpine3.10
+- package-ecosystem: docker
+  directory: "/backend"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: node
+    versions:
+    - ">= 15.4.a, < 15.5"
+  - dependency-name: node
+    versions:
+    - ">= 15.5.a, < 15.6"
+  - dependency-name: node
+    versions:
+    - 15.10.0.pre.alpine3.10
+    - 15.11.0.pre.alpine3.10
+    - 15.12.0.pre.alpine3.10
+    - 15.13.0.pre.alpine3.10
+    - 15.7.0.pre.alpine3.10
+    - 15.8.0.pre.alpine3.10
+    - 15.9.0.pre.alpine3.10
+- package-ecosystem: docker
+  directory: "/neo4j"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: neo4j
+    versions:
+    - 4.2.3
+    - 4.2.4
+- package-ecosystem: docker
+  directory: "/deployment/legacy-migration/maintenance-worker"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
--- a/backend/package.json
+++ b/backend/package.json
@ -81,7 +81,7 @@
    "languagedetect": "^2.0.0",
    "linkifyjs": "~2.1.8",
    "lodash": "~4.17.14",
-    "merge-graphql-schemas": "^1.7.7",
+    "merge-graphql-schemas": "^1.7.8",
    "metascraper": "^5.11.8",
    "metascraper-audio": "^5.14.26",
    "metascraper-author": "^5.14.22",
@ -134,7 +134,7 @@
    "eslint-plugin-standard": "~4.0.1",
    "jest": "~25.3.0",
    "nodemon": "~2.0.2",
-    "prettier": "~2.2.0",
+    "prettier": "~2.3.2",
    "rosie": "^2.0.1",
    "supertest": "~4.0.2"
  },
--- a/backend/src/db/seed.js
+++ b/backend/src/db/seed.js
@ -137,15 +137,8 @@ const languages = ['de', 'en', 'es', 'fr', 'it', 'pt', 'pl']
      }),
    ])

-    const [
-      peterLustig,
-      bobDerBaumeister,
-      jennyRostock,
-      huey,
-      dewey,
-      louie,
-      dagobert,
-    ] = await Promise.all([
+    const [peterLustig, bobDerBaumeister, jennyRostock, huey, dewey, louie, dagobert] =
+      await Promise.all([
        Factory.build(
          'user',
          {
--- a/backend/src/schema/resolvers/embeds.spec.js
+++ b/backend/src/schema/resolvers/embeds.spec.js
@ -37,8 +37,7 @@ const babyLovesCatEmbedResponse = new Response(
    thumbnail_height: 360,
    provider_url: 'https://www.youtube.com/',
    thumbnail_width: 480,
-    html:
-      '<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?start=18&feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
+    html: '<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?start=18&feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
    thumbnail_url: 'https://i.ytimg.com/vi/qkdXAtO40Fo/hqdefault.jpg',
    version: '1.0',
    author_name: 'Merkley Family',
@ -204,8 +203,7 @@ Have all the information for the brand in separate config files. Set these defau
              video: null,
              lang: 'de',
              sources: ['resource', 'oembed'],
-              html:
-                '<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?start=18&feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
+              html: '<iframe width="480" height="270" src="https://www.youtube.com/embed/qkdXAtO40Fo?start=18&feature=oembed" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>',
            },
          },
          errors: undefined,
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@ -910,6 +910,13 @@
  dependencies:
    regenerator-runtime "^0.13.4"

+"@babel/runtime@^7.9.2":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
+  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.7.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"
@ -956,32 +963,32 @@
    exec-sh "^0.3.2"
    minimist "^1.2.0"

-"@graphql-toolkit/common@0.9.12":
-  version "0.9.12"
-  resolved "https://registry.yarnpkg.com/@graphql-toolkit/common/-/common-0.9.12.tgz#a3bf91d00130100cfa0a72be718b16cc1011ab45"
-  integrity sha512-NjBVxeM1GB0bldiBm4UQoxKtbu/hjRfcqDEt1JPia+uXgFde3qTxtF5IZkworRFNCp+8KPSVrwcreQHSfFW63w==
+"@graphql-toolkit/common@0.10.4":
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/@graphql-toolkit/common/-/common-0.10.4.tgz#7785f2a3f14559d0778859c49f4442078c196695"
+  integrity sha512-HQ3HaxCqX+UE8y/0h7LMDBBGSIKJxY/gaQesaksvE2Y+N4NpSWdiW6HpOcgXfC2HGf9yM0hEdsERzzL8z3mbHQ==
  dependencies:
    aggregate-error "3.0.1"
    camel-case "4.1.1"
-    graphql-tools-fork "9.0.1"
+    graphql-tools "5.0.0"
    lodash "4.17.15"

-"@graphql-toolkit/file-loading@0.9.12":
-  version "0.9.12"
-  resolved "https://registry.yarnpkg.com/@graphql-toolkit/file-loading/-/file-loading-0.9.12.tgz#f7d5d7e042df59c4e6c8fe3417c67dd1cddf9043"
-  integrity sha512-xEmKkbWI5FXQARTN3dbPzshwcmduOJUvx1QGsfcuryVDdQJZynUEaPF7IxYaFpvQF7vwxGIRdff/jC/a5ypDrA==
+"@graphql-toolkit/file-loading@0.10.4":
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/@graphql-toolkit/file-loading/-/file-loading-0.10.4.tgz#50e8933e44b17853544c1fe63350df93f33a5e80"
+  integrity sha512-oUmy/sO3BJfax85pVKI7FZ6TWrViNuWXoJkRM293YV9bKGuYU9TgqZoHyM+oEqWO5ruXCL/nCdw3cIBau+rSNA==
  dependencies:
    globby "11.0.0"
    unixify "1.0.0"

-"@graphql-toolkit/schema-merging@0.9.12":
-  version "0.9.12"
-  resolved "https://registry.yarnpkg.com/@graphql-toolkit/schema-merging/-/schema-merging-0.9.12.tgz#f058a7d256a4ed0e61e9874f90ae03326b81668e"
-  integrity sha512-ciqxLeMw7KPbJcq/xgnPbGyJGRO6bO1zQcdWCUSssyw8VDRHj5PFqEOAzT88eZQkEtg3qLN/wQEypeyFyNTHzw==
+"@graphql-toolkit/schema-merging@0.10.4":
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/@graphql-toolkit/schema-merging/-/schema-merging-0.10.4.tgz#2428590a531a33e9fe03be27cce9030f1c4c044b"
+  integrity sha512-naL6reYBuILLMrkMfKz0lOLL0kl6gGYnaaywnO/Dgp9F4NeAxDdAs5CV6Fy9NO5OzePFP58Dnc4sh2RyYrrFJg==
  dependencies:
-    "@graphql-toolkit/common" "0.9.12"
+    "@graphql-toolkit/common" "0.10.4"
    deepmerge "4.2.2"
-    graphql-tools-fork "9.0.1"
+    graphql-tools "5.0.0"
    tslib "1.11.1"

 "@hapi/address@2.x.x":
@ -2036,7 +2043,7 @@ apollo-link-context@~1.0.20:
    apollo-link "^1.2.14"
    tslib "^1.9.3"

-apollo-link-http-common@^0.2.15, apollo-link-http-common@^0.2.16:
+apollo-link-http-common@^0.2.14, apollo-link-http-common@^0.2.16:
  version "0.2.16"
  resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.16.tgz#756749dafc732792c8ca0923f9a40564b7c59ecc"
  integrity sha512-2tIhOIrnaF4UbQHf7kjeQA/EmSorB7+HyJIIrUjJOKBgnXwuexi8aMecRlqTIDWcyVXCeqLhUnztMa6bOH/jTg==
@ -2054,7 +2061,7 @@ apollo-link-http@~1.5.17:
    apollo-link-http-common "^0.2.16"
    tslib "^1.9.3"

-apollo-link@^1.0.0, apollo-link@^1.2.13, apollo-link@^1.2.14:
+apollo-link@^1.0.0, apollo-link@^1.2.12, apollo-link@^1.2.14:
  version "1.2.14"
  resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.14.tgz#3feda4b47f9ebba7f4160bef8b977ba725b684d9"
  integrity sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg==
@ -2211,6 +2218,16 @@ apollo-tracing@^0.12.0:
    apollo-server-env "^2.4.5"
    apollo-server-plugin-base "^0.10.2"

+apollo-upload-client@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/apollo-upload-client/-/apollo-upload-client-13.0.0.tgz#146d1ddd85d711fcac8ca97a72d3ca6787f2b71b"
+  integrity sha512-lJ9/bk1BH1lD15WhWRha2J3+LrXrPIX5LP5EwiOUHv8PCORp4EUrcujrA3rI5hZeZygrTX8bshcuMdpqpSrvtA==
+  dependencies:
+    "@babel/runtime" "^7.9.2"
+    apollo-link "^1.2.12"
+    apollo-link-http-common "^0.2.14"
+    extract-files "^8.0.0"
+
 apollo-utilities@1.3.3, apollo-utilities@^1.3.3:
  version "1.3.3"
  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.3.tgz#f1854715a7be80cd810bc3ac95df085815c0787c"
@ -4299,10 +4316,10 @@ extglob@^2.0.4:
    snapdragon "^0.8.1"
    to-regex "^3.0.1"

-extract-files@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-7.0.0.tgz#3dc7853320ff7876ec62d6e98f2f4e6f3e6282f6"
-  integrity sha512-3AUlT7TD+DbQXNe3t70QrgJU6Wgcp7rk1Zm0vqWz8OYnw4vxihgG0TgZ2SIGrVqScc4WfOu7B4a0BezGJ0YqvQ==
+extract-files@^8.0.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-8.1.0.tgz#46a0690d0fe77411a2e3804852adeaa65cd59288"
+  integrity sha512-PTGtfthZK79WUMk+avLmwx3NGdU8+iVFXC2NMGxKsn0MnihOG2lvumj+AZo8CTwTrwjXDgZ5tztbRlEdRjBonQ==

 extsprintf@1.3.0:
  version "1.3.0"
@ -4849,19 +4866,19 @@ graphql-tag@^2.9.2, graphql-tag@~2.10.3:
  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.3.tgz#ea1baba5eb8fc6339e4c4cf049dabe522b0edf03"
  integrity sha512-4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA==

-graphql-tools-fork@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/graphql-tools-fork/-/graphql-tools-fork-9.0.1.tgz#fc8df40c108bdba3268999dea355cc614c765038"
-  integrity sha512-kM6mUNVekgnWKtVqLGQ9HvQqQ3zZVPZRg1esltBoohsbUMaChl+9QkjBjoMxnZPnbTGOOGGagopNBQALIBysNg==
+graphql-tools@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-5.0.0.tgz#67281c834a0e29f458adba8018f424816fa627e9"
+  integrity sha512-5zn3vtn//382b7G3Wzz3d5q/sh+f7tVrnxeuhTMTJ7pWJijNqLxH7VEzv8VwXCq19zAzHYEosFHfXiK7qzvk7w==
  dependencies:
-    apollo-link "^1.2.13"
-    apollo-link-http-common "^0.2.15"
+    apollo-link "^1.2.14"
+    apollo-upload-client "^13.0.0"
    deprecated-decorator "^0.1.6"
-    extract-files "^7.0.0"
    form-data "^3.0.0"
    iterall "^1.3.0"
    node-fetch "^2.6.0"
-    uuid "^7.0.2"
+    tslib "^1.11.1"
+    uuid "^7.0.3"

 graphql-tools@^4.0.0, graphql-tools@^4.0.4, graphql-tools@^4.0.5:
  version "4.0.8"
@ -6606,13 +6623,13 @@ merge-descriptors@1.0.1:
  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=

-merge-graphql-schemas@^1.7.7:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/merge-graphql-schemas/-/merge-graphql-schemas-1.7.7.tgz#673898f97c384d88fd66e49359b2f604e5864441"
-  integrity sha512-3mjFHXpsF+bnsnSy/FlZiWCcNo7AULuG8kEBE+YVX8qbzNrEPJVhSg7ANr5LjQZbGtSlTz7fa3Wqw0bfbQ5R5Q==
+merge-graphql-schemas@^1.7.8:
+  version "1.7.8"
+  resolved "https://registry.yarnpkg.com/merge-graphql-schemas/-/merge-graphql-schemas-1.7.8.tgz#11a0a672a38a61d988c09ffdebe1bd4f8418de48"
+  integrity sha512-C3EJ1i86OjmbcCT524wVPRl17M5VZzgyh9kIGYAlYnAILX+7xfh8cCbMKfehh9n4opZg6CtcPogCiVZ6PB2NyQ==
  dependencies:
-    "@graphql-toolkit/file-loading" "0.9.12"
-    "@graphql-toolkit/schema-merging" "0.9.12"
+    "@graphql-toolkit/file-loading" "0.10.4"
+    "@graphql-toolkit/schema-merging" "0.10.4"
    tslib "1.11.1"

 merge-stream@^2.0.0:
@ -7816,10 +7833,10 @@ prettier-linter-helpers@^1.0.0:
  dependencies:
    fast-diff "^1.1.2"

-prettier@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.0.tgz#8a03c7777883b29b37fb2c4348c66a78e980418b"
-  integrity sha512-yYerpkvseM4iKD/BXLYUkQV5aKt4tQPqaGW6EsZjzyu0r7sVZZNPJW4Y8MyKmicp6t42XUPcBVA+H6sB3gqndw==
+prettier@~2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d"
+  integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==

 pretty-format@^25.3.0:
  version "25.3.0"
@ -9406,15 +9423,15 @@ ts-invariant@^0.4.0:
  dependencies:
    tslib "^1.9.3"

-tslib@1.11.1, tslib@^1.9.0:
+tslib@1.11.1:
  version "1.11.1"
  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
  integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==

-tslib@^1.10.0, tslib@^1.9.3:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
-  integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
+tslib@^1.10.0, tslib@^1.11.1, tslib@^1.9.0, tslib@^1.9.3:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==

 tunnel-agent@^0.6.0:
  version "0.6.0"
@ -9689,7 +9706,7 @@ uuid@^3.1.0, uuid@^3.3.2:
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==

-uuid@^7.0.2:
+uuid@^7.0.3:
  version "7.0.3"
  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
  integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
--- a/package.json
+++ b/package.json
@ -49,5 +49,6 @@
  },
  "resolutions": {
    "set-value": "^2.0.1"
-  }
+  },
+  "dependencies": {}
 }
--- a/webapp/components/Editor/MenuBar.vue
+++ b/webapp/components/Editor/MenuBar.vue
@ -59,6 +59,8 @@
        :onClick="commands.horizontal_rule"
        icon="minus"
      />
+
+      <menu-legend class="legend-button" />
    </div>
  </editor-menu-bar>
 </template>
@ -66,11 +68,13 @@
 <script>
 import { EditorMenuBar } from 'tiptap'
 import MenuBarButton from './MenuBarButton'
+import MenuLegend from './MenuLegend.vue'

 export default {
  components: {
    EditorMenuBar,
    MenuBarButton,
+    MenuLegend,
  },
  props: {
    editor: Object,
@ -78,3 +82,10 @@ export default {
  },
 }
 </script>
+
+<style lang="scss">
+.legend-button {
+  display: inline;
+  position: relative;
+}
+</style>
--- a/webapp/components/Editor/MenuBarButton.vue
+++ b/webapp/components/Editor/MenuBarButton.vue
@ -10,7 +10,7 @@ export default {
    isActive: Boolean,
    icon: String,
    label: String,
-    onClick: Function,
+    onClick: { type: Function, default: () => {} },
  },
 }
 </script>
--- a/webapp/components/Editor/MenuLegend.vue
+++ b/webapp/components/Editor/MenuLegend.vue
@ -0,0 +1,115 @@
+<template>
+  <dropdown :placement="placement" offset="5">
+    <template #default="{ openMenu, closeMenu }">
+      <slot name="button">
+        <menu-bar-button
+          icon="question-circle"
+          circle
+          ghost
+          class="legend-question-button"
+          @mouseover.native="openMenu()"
+          @mouseleave.native="closeMenu()"
+        />
+      </slot>
+    </template>
+    <template #popover="" class="legend">
+      <div class="legend-container">
+        <div class="legend-header">{{ $t(`editor.legend.legendTitle`) }}</div>
+        <div
+          :class="['legend-table', index < legendItems.length - 1 && 'legend-table-split-line']"
+          v-for="(item, index) in legendItems"
+          :key="item.name"
+        >
+          <div>
+            <base-button size="small" circle ghost :icon="item.iconName" class="legend-icon">
+              <span v-if="item.label">{{ item.label }}</span>
+            </base-button>
+            <span>{{ $t(item.name) }}</span>
+          </div>
+          <span class="tool-shortcut">{{ item.shortcut }}</span>
+        </div>
+      </div>
+    </template>
+  </dropdown>
+</template>
+
+<script>
+import Dropdown from '~/components/Dropdown'
+import MenuBarButton from './MenuBarButton'
+
+export default {
+  components: {
+    Dropdown,
+    MenuBarButton,
+  },
+  props: {
+    placement: { type: String, default: 'bottom-start' },
+  },
+  data() {
+    return {
+      legendItems: [
+        { iconName: 'bold', name: `editor.legend.bold`, shortcut: 'ctrl + b' },
+        { iconName: 'italic', name: `editor.legend.italic`, shortcut: 'ctrl + i' },
+        { iconName: 'underline', name: `editor.legend.underline`, shortcut: 'ctrl + u' },
+        { iconName: 'link', name: `editor.legend.link`, shortcut: '' },
+        { iconName: 'paragraph', name: `editor.legend.paragraph`, shortcut: '' },
+        { label: 'H3', name: `editor.legend.heading3`, shortcut: '### + space' },
+        { label: 'H4', name: `editor.legend.heading4`, shortcut: '#### + space' },
+        { iconName: 'list-ul', name: `editor.legend.unorderedList`, shortcut: '* + space' },
+        { iconName: 'list-ol', name: `editor.legend.orderedList`, shortcut: '1. + space' },
+        { iconName: 'quote-right', name: `editor.legend.quote`, shortcut: '> + space' },
+        { iconName: 'minus', name: `editor.legend.ruler`, shortcut: '---' },
+      ],
+    }
+  },
+}
+</script>
+
+<style lang="scss">
+.legend-question-button {
+  color: $color-neutral-40;
+  font-size: 1.2rem !important;
+}
+.legend-question-button:hover {
+  background: none !important;
+  color: $color-neutral-40 !important;
+}
+.legend-question-button:focus {
+  outline: none !important;
+}
+.legend {
+  padding: 0rem;
+  border: 1px solid #e5e3e8;
+}
+.legend-container {
+  display: flex;
+  width: 18rem !important;
+  flex-direction: column;
+}
+.legend-header {
+  margin-bottom: 0.5em;
+  text-align: center;
+}
+
+.legend-table {
+  display: grid;
+  align-items: center;
+  grid-template-columns: 1fr 1fr;
+  padding: 0.2em;
+}
+.legend-table-split-line {
+  border-bottom: 0.5px solid grey;
+}
+
+.legend-table > div {
+  display: flex;
+  align-items: center;
+}
+.tool-shortcut {
+  padding-left: 2rem;
+}
+.legend-icon {
+  pointer-events: none;
+  margin-right: 1rem;
+}
+</style>
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@ -313,6 +313,20 @@
      "addLetter": "Tippe einen Buchstaben",
      "noHashtagsFound": "Keine Hashtags gefunden"
    },
+    "legend": {
+      "bold": "Fett",
+      "heading3": "Überschrift 3",
+      "heading4": "Überschrift 4",
+      "italic": "Kursiv",
+      "legendTitle": "Tastaturkürzel und Markdown-Code",
+      "link": "Verlinkung",
+      "orderedList": "Geordnete Liste",
+      "paragraph": "Absatz",
+      "quote": "Zitat",
+      "ruler": "Linie",
+      "underline": "Unterstrichen",
+      "unorderedList": "Ungeordnete Liste"
+    },
    "mention": {
      "noUsersFound": "Keine Benutzer gefunden"
    },
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@ -313,6 +313,20 @@
      "addLetter": "Type a letter",
      "noHashtagsFound": "No hashtags found"
    },
+    "legend": {
+      "bold": "Bold",
+      "heading3": "Heading 3",
+      "heading4": "Heading 4",
+      "italic": "Italic",
+      "legendTitle": "Keyboard shortcuts and markdown code",
+      "link": "Link",
+      "orderedList": "Ordered list",
+      "paragraph": "Paragraph",
+      "quote": "Quote",
+      "ruler": "Ruler",
+      "underline": "Underline",
+      "unorderedList": "Unordered list"
+    },
    "mention": {
      "noUsersFound": "No users found"
    },
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@ -260,6 +260,20 @@
      "addLetter": "Введите букву",
      "noHashtagsFound": "Хэштеги не найдены"
    },
+    "legend": {
+      "bold": "Полужирный",
+      "heading3": "Заголовок 3",
+      "heading4": "Заголовок 4",
+      "italic": "Курсив",
+      "legendTitle": "Клавиатурные сокращения и код разметки",
+      "link": "Ссылка",
+      "orderedList": "Нумерованный список",
+      "paragraph": "Параграф",
+      "quote": "Кавычки",
+      "ruler": "Горизонтальная линия",
+      "underline": "Подчеркнутый",
+      "unorderedList": "Маркированный список"
+    },
    "mention": {
      "noUsersFound": "Пользователи не найдены"
    },
--- a/webapp/package.json
+++ b/webapp/package.json
@ -133,7 +133,7 @@
    "eslint-plugin-jest": "~24.1.3",
    "eslint-plugin-node": "~11.1.0",
    "eslint-plugin-prettier": "~3.1.4",
-    "eslint-plugin-promise": "~4.2.1",
+    "eslint-plugin-promise": "~4.3.1",
    "eslint-plugin-standard": "~5.0.0",
    "eslint-plugin-vue": "~6.2.2",
    "faker": "^5.1.0",
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@ -8016,10 +8016,10 @@ eslint-plugin-prettier@~3.1.4:
  dependencies:
    prettier-linter-helpers "^1.0.0"

-eslint-plugin-promise@~4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
-  integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
+eslint-plugin-promise@~4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz#61485df2a359e03149fdafc0a68b0e030ad2ac45"
+  integrity sha512-bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ==

 eslint-plugin-standard@~5.0.0:
  version "5.0.0"