Review GitHub issues/pull requests templates (#732)

6 files changed, 33 insertions, 94 deletions

diff --git a/.github/FEATURE_PROPOSAL_TEMPLATE.md b/.github/FEATURE_PROPOSAL_TEMPLATE.md
deleted file mode 100644
index e8cdd41ed..000000000
--- a/.github/FEATURE_PROPOSAL_TEMPLATE.md
+++ /dev/null
@@ -1,14 +0,0 @@
-<!--- Provide a general summary of your changes in the Title above -->
-
-### Feature Description
-<!--- Describe your feature in detail -->
-
-### Motivation and Context
-<!---
-* Why is this change required?
-* How is this improving the Ferdi experience?
-* What problem does it solve?
--->
-
-### Mockups, Screenshots (if available):
-<!--- A picture says more than a thousand words. -->
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index c0ce853ae..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--- Provide a general summary of the issue in the Title above -->
-
-<!-- This repository is only for the Ferdi client. Please use this form ( https://bitly.com/franz-service-request ) for service requests or check out the guide ( https://github.com/meetfranz/plugins ) to create your own service integration. -->
-
-<!--- If you want to propose a feature, use this template: https://raw.githubusercontent.com/meetfranz/franz/master/.github/FEATURE_PROPOSAL_TEMPLATE.md -->
-
-### Expected Behavior
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
-
-### Current Behavior
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from current behavior -->
-
-### Screenshots (if appropriate):
-
-### Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
-
-### Steps to Reproduce (for bugs)
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-### Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-### Your Environment
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-* Ferdi Version used:
-* Operating System and version:
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index e206b128f..efad9f6a2 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,12 +8,11 @@ Please fill our form below, this way we can analyse and fix the problem as fast
 Please keep in mind that any text inside "<!--" and "--\>" are comments from us and won't be
 visible in your bug report, so please don't put any text in them.
 -->
-**Describe the bug**
+**Bug description:**
 <!-- Add a clear and concise description of what the bug is -->
 
-**To Reproduce**
+**Steps to reproduce:**
 <!-- Explain to us how we can reproduce your bug on our computer -->
-Steps to reproduce the behavior:
 
 1. Go to '...'
 2. Click on '....'
@@ -27,27 +26,18 @@ Steps to reproduce the behavior:
 <!-- If applicable, add screenshots to help explain your problem. -->
 <!-- You can simply drag and drop any image file into the editor to add it to the report -->
 
-**Desktop:**
+**Environment:**
 
-- OS: [e.g. macOS, Windows 10 etc.]
-- Ferdi Version [e.g. 5.4.3]
-<!-- ℹ You can find Ferdi's version by opening File > About Ferdi or Help > About Ferdi, depending on your Operating System -->
-- Server Used: [e.g. https://api.getferdi.com]
-<!-- ℹ You can find Ferdi's server in Ferdi's settings under "Server". If you self-host or use Ferdi without an account please say so. -->
+- Operating System: <!-- e.g. macOS Catalina, Windows 10, etc. -->
+- Ferdi Version: <!-- e.g. 5.4.3 -->
+- Server: <!-- e.g. Ferdi, Franz, Using without an account -->
 
+- Debug information:
 <!-- 
-If you are using Ferdi >= 5.4.4-beta.2 please publish your debugging information and share them in your bug report.
-To publish a bug report, inside Ferdi's menu bar click on "Help" > "Publish debug information", accept our terms
-and copy the link given to you.
+Get your debug information via Ferdi "Help" menu ("Copy/Publish Debug Information") then
+share a debug information file or your published link with us.
 -->
-Debug information: https://debug.getferdi.com/...
 
-**Additional context**
-<!-- Add any other context about the problem here. -->
-
-<!-- 
-Love Ferdi? Please consider supporting our open-collective:
-👉  https://opencollective.com/getferdi/donate
-or following us on Twitter:
-👉  https://twitter.com/getferdi
--->
+<!-- Please consider supporting Ferdi!
+👉  https://github.com/sponsors/getferdi
+👉  https://opencollective.com/getferdi/donate -->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 5535496d2..61353797c 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -15,5 +15,6 @@ A clear and concise description of any alternative solutions or features you've
 **Additional context**
 Add any other context or screenshots about the feature request here.
 
-<!-- Love Ferdi? Please consider supporting our collective:
+<!-- Please consider supporting Ferdi!
+👉  https://github.com/sponsors/getferdi
 👉  https://opencollective.com/getferdi/donate -->
diff --git a/.github/ISSUE_TEMPLATE/open_issue.md b/.github/ISSUE_TEMPLATE/open_issue.md
new file mode 100644
index 000000000..c7c279643
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/open_issue.md
@@ -0,0 +1,8 @@
+---
+name: Open issue
+about: For everything that's neither a feature request, nor a bug
+---
+
+<!-- Please consider supporting Ferdi!
+👉  https://github.com/sponsors/getferdi
+👉  https://opencollective.com/getferdi/donate -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index aa6f850de..5a6f95002 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,28 +1,18 @@
-<!--- Provide a general summary of your changes in the Title above -->
+<!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+<!-- Please start by naming your pull request properly e.g. "Add Google Tasks to Todo providers". -->
 
 ### Description
-<!--- Describe your changes in detail -->
+<!-- Describe your changes in detail. -->
 
 ### Motivation and Context
-<!--- Why is this change required? What problem does it solve? -->
-<!--- If it fixes an open issue, please link to the issue here. -->
+<!-- Why is this change required? What problem does it solve? -->
+<!-- If it fixes an open issue, please link to the issue here. -->
 
-### How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, tests ran to see how -->
-<!--- your change affects other areas of the code, etc. -->
-
-### Screenshots (if appropriate):
-
-### Types of changes
-<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+### Screenshots
+<!-- Remove the section if this does not apply. -->
 
 ### Checklist:
-<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
-<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] My code follows the code style of this project (run `$ npm run lint`).
-<!---- [ ] My change requires a change to the documentation.
-- [ ] I have updated the documentation accordingly. -->
+<!-- Go over all the following points, and put an `x` in all the boxes that apply. -->
+- [ ] My pull request is properly named
+- [ ] The changes respect the code style of the project (`$ npm run lint`)
+- [ ] I tested/previewed my changes locally
\ No newline at end of file