diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 35457d215..9bbd6de90 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -5,7 +5,7 @@ before submitting a new issue. Following one of the issue templates will ensure Thanks! --> -## Issue +## 💬 Issue diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 58ca6b387..fbf7173fc 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -1,7 +1,8 @@ --- name: 🐛 Bug report about: Create a report to help us improve - +labels: bug +title: 🐛 [Bug] --- ## :bug: Bugreport diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index ed30ba7ad..1fba3fa58 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -1,22 +1,12 @@ --- name: 🚀 Feature request about: Suggest an idea for this project - +labels: feature +title: 🚀 [Feature] --- ## :rocket: Feature - - - -### Is your feature request related to a problem? Please describe. - - - -### Describe the prefered solution and alternatives you've considered - - + ### Design & Layout diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index eb5a923dd..aabbc0f0a 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -1,6 +1,8 @@ --- name: 💬 Question about: If you need help understanding HumanConnection. +labels: question +title: 💬 [Question] --- +## 🍰 Pullrequest + ### Issues -- [X] None - -### Checklist - -- [X] None - -### How2Test - - -- [X] None +- None ### Todo diff --git a/backend/package.json b/backend/package.json index a97fe7f29..18a73d452 100644 --- a/backend/package.json +++ b/backend/package.json @@ -71,7 +71,7 @@ "lodash": "~4.17.11", "ms": "~2.1.1", "neo4j-driver": "~1.7.4", - "neo4j-graphql-js": "~2.6.0", + "neo4j-graphql-js": "~2.6.1", "node-fetch": "~2.6.0", "npm-run-all": "~4.1.5", "request": "~2.88.0", diff --git a/backend/yarn.lock b/backend/yarn.lock index 6fcfaac93..05393a9fe 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -5588,10 +5588,10 @@ neo4j-driver@^1.7.3, neo4j-driver@~1.7.4: text-encoding "^0.6.4" uri-js "^4.2.1" -neo4j-graphql-js@~2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/neo4j-graphql-js/-/neo4j-graphql-js-2.6.0.tgz#1c418c5e4de384bd0992f99538d3d056d0602669" - integrity sha512-YStuqeBg6sjXQvQjICz+jpG4W58yHz3Fi1Gjw9HsVYeCSr97ARbGn4Sl02970IKpBeRYqKt1N1Xp3QIvO3OMIw== +neo4j-graphql-js@~2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/neo4j-graphql-js/-/neo4j-graphql-js-2.6.1.tgz#fc25d44d875a73114b6df08259985b555704b9bb" + integrity sha512-bPqzKumlCoHtS2qfPoTcZXrTkdXky210Kdu6Ubh5GhT+84wf+mo4Dzj4nxgDP2UgB77uA/caesIUImrSTLM8yQ== dependencies: graphql "^14.2.1" graphql-auth-directives "^2.1.0" diff --git a/deployment/digital-ocean/https/README.md b/deployment/digital-ocean/https/README.md index c30ac958f..d100ba8dd 100644 --- a/deployment/digital-ocean/https/README.md +++ b/deployment/digital-ocean/https/README.md @@ -32,10 +32,10 @@ Once you are done, apply the configuration: $ kubectl apply -f . ``` -By now, your cluster should have an external IP address assigned. If you visit -your dashboard, this is how it should look like: +By now, your cluster should have a load balancer assigned with an external IP +address. On Digital Ocean, this is how it should look like: -![Screenshot of the kubernetes dashboard showing the extrenal ip address](./ip-address.png) +![Screenshot of Digital Ocean dashboard showing external ip address](./ip-address.png) Check the ingress server is working correctly: diff --git a/deployment/digital-ocean/https/ip-address.png b/deployment/digital-ocean/https/ip-address.png index 765177401..db523156a 100644 Binary files a/deployment/digital-ocean/https/ip-address.png and b/deployment/digital-ocean/https/ip-address.png differ diff --git a/package.json b/package.json index 29950b65c..272e7785e 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,8 @@ "devDependencies": { "codecov": "^3.5.0", "cross-env": "^5.2.0", - "cypress": "^3.2.0", - "cypress-cucumber-preprocessor": "^1.11.0", + "cypress": "^3.3.0", + "cypress-cucumber-preprocessor": "^1.11.2", "cypress-plugin-retries": "^1.2.1", "dotenv": "^8.0.0", "faker": "^4.1.0", diff --git a/webapp/components/Category/index.vue b/webapp/components/Category/index.vue index af602d4d0..028d8c4a4 100644 --- a/webapp/components/Category/index.vue +++ b/webapp/components/Category/index.vue @@ -13,7 +13,7 @@ export default { name: 'HcCategory', props: { icon: { type: String, required: true }, - name: { type: String, required: true } + name: { type: String, default: '' } } } diff --git a/webapp/components/Empty.vue b/webapp/components/Empty.vue index 0ae6c1973..082d18f83 100644 --- a/webapp/components/Empty.vue +++ b/webapp/components/Empty.vue @@ -5,8 +5,8 @@ :margin="margin" > - + + diff --git a/webapp/components/User/index.vue b/webapp/components/User/index.vue index 240c9dd6d..105a79f8c 100644 --- a/webapp/components/User/index.vue +++ b/webapp/components/User/index.vue @@ -55,7 +55,7 @@ style="display: inline;" > diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 96f87cd9d..e45bd9cba 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -135,6 +135,14 @@ "takeAction": { "name": "Aktiv werden" }, + "delete": { + "submit": "Löschen", + "cancel": "Abbrechen", + "success": "Beitrag erfolgreich gelöscht", + "title": "Beitrag löschen", + "type": "Beitrag", + "message": "Möchtest Du wirklich den Beitrag \"{name}\" löschen?" + }, "comment": { "submit": "Kommentiere", "submitted": "Kommentar Gesendet" diff --git a/webapp/package.json b/webapp/package.json index 372ad6e1d..616a8a5f0 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -70,8 +70,8 @@ "nuxt-env": "~0.1.0", "stack-utils": "^1.0.2", "string-hash": "^1.1.3", - "tiptap": "1.19.3", - "tiptap-extensions": "1.19.4", + "tiptap": "1.19.8", + "tiptap-extensions": "1.19.10", "v-tooltip": "~2.0.2", "vue-count-to": "~1.0.13", "vue-izitoast": "1.1.2", diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue index 87538eb6d..ad04f8421 100644 --- a/webapp/pages/post/_id/_slug/index.vue +++ b/webapp/pages/post/_id/_slug/index.vue @@ -70,30 +70,6 @@ :is-shouted="post.shoutedByCurrentUser" :post-id="post.id" /> - -   - - - - diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index ecb0baa9d..266a3f9c6 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -18,7 +18,7 @@ :image="user.avatar" :name="userName" class="profile-avatar" - size="120px" + size="x-large" />