From 0318910488e245c4a1d09181265de63d05a89cf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 31 May 2021 15:48:52 +0200 Subject: [PATCH 1/9] Correct Discord links and divers --- .github/ISSUE_TEMPLATE/question.md | 8 +++--- CONTRIBUTING.md | 39 +++++++++++++++++++----------- README.md | 4 +-- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index aabbc0f0a..677258e6f 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -1,12 +1,12 @@ --- name: 💬 Question -about: If you need help understanding HumanConnection. +about: If you need help understanding ocelot.social. labels: question title: 💬 [Question] --- - - + + ## :speech_balloon: Question diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b5f74d879..aecac8945 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,21 +4,22 @@ Thank you so much for thinking of contributing to the Human Connection project! ## Getting Set Up -Instructions for how to install all the necessary software and some code guidelines can be found in our [documentation](https://docs.human-connection.org/human-connection/). +Instructions for how to install all the necessary software and some code guidelines can be found in our main [Readme](/README.md) or in our [documentation](https://docs.human-connection.org/human-connection/). -To get you started we recommend that you join forces with a regular contributor. Please join [our discord instance](https://human-connection.org/discord) to chat with developers or just get in touch directly on an issue on either [Github](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues) or [Zenhub](https://app.zenhub.com/workspaces/ocelotsocial-5fb21ff922cb410015dd6535/board?filterLogic=any&repos=301151089): +To get you started we recommend that you join forces with a regular contributor. Please join [our Discord instance](https://discord.gg/AJSX9DCSUA) to chat with developers or just get in touch directly on an issue on either [Github](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues) or [Zenhub](https://app.zenhub.com/workspaces/ocelotsocial-5fb21ff922cb410015dd6535/board?filterLogic=any&repos=301151089): ![](https://dl.dropbox.com/s/vbmcihkduy9dhko/Screenshot%202019-01-03%2015.50.11.png?dl=0) -We also have regular pair programming sessions that you are very welcome to join! We feel this is often the best way to get to know both the project and the team. Most developers are also available for spontaneous sessions if the times listed below don't work for you – just ping us on discord. +We also have regular pair programming sessions that you are very welcome to join! We feel this is often the best way to get to know both the project and the team. Most developers are also available for spontaneous sessions if the times listed below don't work for you – just ping us on Discord. ## Development Flow We operate in two week sprints that are planned, estimated and prioritised on [Zenhub](https://app.zenhub.com/workspaces/ocelotsocial-5fb21ff922cb410015dd6535/board?filterLogic=any&repos=301151089). All issues are also linked to and synced with [Github](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues). Look for the `good first issue` label if you're not sure where to start! -We try to discuss all questions directly related to a feature or bug in the respective issue, in order to preserve it for the future and for other developers. We use discord for real-time communication. +We try to discuss all questions directly related to a feature or bug in the respective issue, in order to preserve it for the future and for other developers. We use Discord for real-time communication. This is how we solve bugs and implement features, step by step: + 1. We find an issue we want to work on, usually during the sprint planning but as an open source contributor this can happen at any time. 2. We communicate with the team to see if the issue is still available. (When you comment on an issue but don't get an answer there within 1-2 days try to mention @Human-Connection/hc-dev-team to make sure we check in.) 3. We make sure we understand the issue in detail – what problem is it solving and how should it be implemented? @@ -29,6 +30,7 @@ This is how we solve bugs and implement features, step by step: 8. We then incorporate the suggestions from the reviews into our work and once it has been approved it can be merged into master! Every pull request needs to: + * fix an issue (if there is something you want to work on but there is no issue for it, create one first and discuss it with the team) * include tests for the code that is added or changed * pass all tests (linter, backend, frontend, end-to-end) @@ -39,36 +41,44 @@ Every pull request needs to: There are many volunteers all around the world helping us build this network and without their contributions we wouldn't be where we are today. Big thank you to all of you! You can see the core team behind Human Connection [on our website](https://human-connection.org/en/the-team/). On Github you will mostly run into our developers: -* Robert (@roschaefer) -* Matt (@mattwr18) + +* Ulf (@Tirokk) +* Moriz (@Tirokk) * Wolle (@Tirokk) * Alex (@ogerly) + ## Meetings and Pair Programming Sessions Times below refer to **German Time** – that's CET (GMT+1) in winter and CEST (GMT+2) in summer – because most Human Connection core team members are living in Germany. Daily standup -* every Monday–Friday 11:30 -* in the discord `Conference Room` + +* every Monday–Thursday 11:30 am (german time see above 👆🏼) +* in our Discord `Office Cube` * all contributors welcome! * everybody shares what they are working on and asks for help if they are blocked + ## Philosophy @@ -102,10 +114,9 @@ We use pair programming sessions as a tool for knowledge sharing. We can learn a As a volunteeer you have no commitment except your own self development and your awesomeness by contributing to this free and open-source software project. Cheers to you! - ## Open-Source Bounties -There are so many good reasons to contribute to Human Connection +There are so many good reasons to contribute to ocelot.social * You learn state-of-the-art technologies * You build your portfolio @@ -121,7 +132,7 @@ pull request approved and merged for free**. You can choose something really quick and easy. What's important is starting a working relationship with the team, learning the workflow, and understanding this contribution guide. You can filter issues by 'good first issue', to get an idea where to start. Please join -our our [community chat](https://human-connection.org/discord), too. +our our [Discord community chat](https://discord.gg/AJSX9DCSUA), too. You can filter Github issues with label [bounty](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues?q=is%3Aopen+is%3Aissue+label%3Abounty). These issues should have a second label `€` which indicate their respective financial compensation in Euros. diff --git a/README.md b/README.md index 4e1777c25..e50413a90 100644 --- a/README.md +++ b/README.md @@ -107,12 +107,12 @@ The only deployment method in this repository is `docker-compose` for developmen ## Developer Chat -Join our friendly open-source community on [Discord](https://discordapp.com/invite/DFSjPaX) :heart_eyes_cat: +Join our friendly open-source community on [Discord](https://discord.gg/AJSX9DCSUA) :heart_eyes_cat: Just introduce yourself at `#introduce-yourself` and mention `@@Mentor` to get you onboard :neckbeard: Check out the [contribution guideline](./CONTRIBUTING.md), too! We give write permissions to every developer who asks for it. Just text us on -[Discord](https://discord.gg/6ub73U3). +[Discord](https://discord.gg/AJSX9DCSUA). ## Technology Stack From b824ebb9f51068c40f70f110d6ef8b7ba98f69e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 31 May 2021 15:53:07 +0200 Subject: [PATCH 2/9] Correct GitHub name --- CONTRIBUTING.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aecac8945..e52f34c95 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -42,10 +42,11 @@ There are many volunteers all around the world helping us build this network and You can see the core team behind Human Connection [on our website](https://human-connection.org/en/the-team/). On Github you will mostly run into our developers: -* Ulf (@Tirokk) -* Moriz (@Tirokk) +* Ulf (@ulfgebhardt) +* Moriz (@Mogge) * Wolle (@Tirokk) * Alex (@ogerly) + + + {{ $t('site.made') }} + - - + + {{ $t('site.imprint') }} + + {{ $t('site.imprint') }} + - - {{ $t('site.termsAndConditions') }} + + + {{ $t('site.termsAndConditions') }} + + + {{ $t('site.termsAndConditions') }} + - - {{ $t('site.code-of-conduct') }} + + + {{ $t('site.code-of-conduct') }} + + + {{ $t('site.code-of-conduct') }} + - - + + {{ $t('site.data-privacy') }} + + {{ $t('site.data-privacy') }} + - - + + + {{ $t('site.faq') }} + + {{ $t('site.faq') }} - + import links from '~/constants/links.js' + export default { data() { return { links, version: `v${this.$env.VERSION}` } }, + methods: { + noLinkDefined(link) { + return !link || link.length === 0 + }, + }, } diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 6ef427362..042d76fac 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -771,7 +771,7 @@ "faq": "FAQ", "germany": "Deutschland", "imprint": "Impressum", - "made": "Mit ❤ gemacht", + "made": "Mit ❤️ gemacht", "register": "Registernummer", "responsible": "Verantwortlich für Inhalte dieser Seite (§ 55 Abs. 2 RStV)", "taxident": "Umsatzsteuer-Identifikationsnummer gemäß § 27 a Umsatzsteuergesetz (Deutschland)", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index c5ad5c27f..cdd261700 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -771,7 +771,7 @@ "faq": "FAQ", "germany": "Germany", "imprint": "Imprint", - "made": "Made with ❤", + "made": "Made with ❤️", "register": "Registry number", "responsible": "responsible for contents of this page (§ 55 Abs. 2 RStV)", "taxident": "USt-ID. according to §27a of the German Sales Tax Law:", diff --git a/webapp/locales/es.json b/webapp/locales/es.json index 97f1f247b..1ab09e011 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -694,7 +694,7 @@ "faq": "Preguntas más frecuentes", "germany": "Alemania", "imprint": "Pie de imprenta", - "made": "Hecho con ❤", + "made": "Hecho con ❤️", "register": "Número de registro", "responsible": "Responsable según § 55 Abs. 2 RStV (Alemania)", "taxident": "Número de identificación del impuesto sobre el valor añadido según el § 27 a de la Ley del Impuesto sobre el Valor Añadido (Alemania)", diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index fe4cf4b9b..cb4e96bdc 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -662,7 +662,7 @@ "faq": "FAQ", "germany": "Allemagne", "imprint": "Mentions légales", - "made": "Fabriqué avec ❤", + "made": "Fabriqué avec ❤️", "register": "Numéro de registre", "responsible": "Responsable selon § 55 Abs. 2 RStV (Allemagne)", "taxident": "Numéro d'identification à la taxe sur la valeur ajoutée selon § 27 a de la loi sur la taxe sur la valeur ajoutée (Allemagne)", diff --git a/webapp/locales/html/de/faq.html b/webapp/locales/html/de/faq.html new file mode 100644 index 000000000..d51dbf6c2 --- /dev/null +++ b/webapp/locales/html/de/faq.html @@ -0,0 +1 @@ +

Hier stehen die FAQs

diff --git a/webapp/locales/html/de/index.js b/webapp/locales/html/de/index.js index 498bbb866..a97b217d6 100644 --- a/webapp/locales/html/de/index.js +++ b/webapp/locales/html/de/index.js @@ -1,11 +1,13 @@ import termsAndConditions from './terms-and-conditions.html' import codeOfConduct from './code-of-conduct.html' import dataPrivacy from './data-privacy.html' +import faq from './faq.html' import imprint from './imprint.html' export default { termsAndConditions, codeOfConduct, dataPrivacy, + faq, imprint, } diff --git a/webapp/locales/html/en/faq.html b/webapp/locales/html/en/faq.html new file mode 100644 index 000000000..cb019e96e --- /dev/null +++ b/webapp/locales/html/en/faq.html @@ -0,0 +1 @@ +

Here are the FAQs

diff --git a/webapp/locales/html/en/index.js b/webapp/locales/html/en/index.js index 498bbb866..a97b217d6 100644 --- a/webapp/locales/html/en/index.js +++ b/webapp/locales/html/en/index.js @@ -1,11 +1,13 @@ import termsAndConditions from './terms-and-conditions.html' import codeOfConduct from './code-of-conduct.html' import dataPrivacy from './data-privacy.html' +import faq from './faq.html' import imprint from './imprint.html' export default { termsAndConditions, codeOfConduct, dataPrivacy, + faq, imprint, } diff --git a/webapp/locales/it.json b/webapp/locales/it.json index 0832da2cc..a9121d184 100644 --- a/webapp/locales/it.json +++ b/webapp/locales/it.json @@ -612,7 +612,7 @@ "faq": null, "germany": "Germania", "imprint": "Impressum", - "made": "Con ❤ fatto", + "made": "Con ❤️ fatto", "register": "numero di registro", "responsible": "Responsabile ai sensi del § 55 Abs. 2 RStV (Germania)", "taxident": "Numero di identificazione dell'imposta sul valore aggiunto ai sensi del § 27 a Legge sull'imposta sul valore aggiunto (Germania)", diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json index dc5670e9f..3bf453655 100644 --- a/webapp/locales/nl.json +++ b/webapp/locales/nl.json @@ -165,7 +165,7 @@ "director": "Directeur", "germany": "Duitsland", "imprint": "Afdruk", - "made": "Met ❤ gemaakt", + "made": "Met ❤️ gemaakt", "register": "inschrijfnummer", "responsible": "Verantwoordelijk volgens § 55 Abs. 2 RStV (Duitsland).", "taxident": "Identificatienummer voor de belasting over de toegevoegde waarde overeenkomstig § 27 a Wet op de belasting over de toegevoegde waarde (Duitsland).", diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json index d38a62573..7cb3ee3dc 100644 --- a/webapp/locales/pl.json +++ b/webapp/locales/pl.json @@ -350,7 +350,7 @@ "director": "Dyrektor zarządzający", "germany": "Niemcy", "imprint": "Nadruk", - "made": "Z ❤ zrobiony", + "made": "Z ❤️ zrobiony", "register": "numer rejestracyjny", "responsible": "Odpowiedzialny zgodnie z § 55 Abs. 2 RStV (Niemcy)", "taxident": "Numer identyfikacyjny podatku od wartości dodanej zgodnie z § 27 a Ustawa o podatku od wartości dodanej (Niemcy)", diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json index 5f8101c66..277fb9e0b 100644 --- a/webapp/locales/pt.json +++ b/webapp/locales/pt.json @@ -647,7 +647,7 @@ "faq": "FAQ", "germany": "Alemanha", "imprint": "Impressão", - "made": "Feito com ❤", + "made": "Feito com ❤️", "register": "número de registo", "responsible": "Responsável segundo § 55 Abs. 2 RStV (Alemanha) ", "taxident": "Número de identificação do imposto sobre o valor acrescentado de acordo com o § 27 da Lei do Imposto sobre o Valor Acrescentado (Alemanha)", diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json index 95d26690d..72a8deb54 100644 --- a/webapp/locales/ru.json +++ b/webapp/locales/ru.json @@ -694,7 +694,7 @@ "faq": "ЧаВо (FAQ)", "germany": "Германия", "imprint": "Импрессум", - "made": "Сделано с ❤", + "made": "Сделано с ❤️", "register": "Регистрационный номер", "responsible": "ответственный за содержание этой страницы (§ 55 Abs. 2 RStV)", "taxident": "UST-ID. в соответствии с §27a Закона о налоге с продаж Германии:", diff --git a/webapp/pages/code-of-conduct.vue b/webapp/pages/code-of-conduct.vue index 7b3455934..c3cf3bf54 100644 --- a/webapp/pages/code-of-conduct.vue +++ b/webapp/pages/code-of-conduct.vue @@ -1,6 +1,6 @@