From 0700bb2c1a101eece973d71cdd4537c19a6884c0 Mon Sep 17 00:00:00 2001
From: Jeroen Oudshoorn <oudshoorn.jeroen@gmail.com>
Date: Wed, 11 Dec 2024 19:31:20 +0100
Subject: [PATCH] Update to bug report

---
 .github/ISSUE_TEMPLATE.yml        |  6 +--
 .github/PULL_REQUEST_TEMPLATE.md  | 30 --------------
 .github/PULL_REQUEST_TEMPLATE.yml | 67 +++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 33 deletions(-)
 delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.yml

diff --git a/.github/ISSUE_TEMPLATE.yml b/.github/ISSUE_TEMPLATE.yml
index 9773e3e9..51f8012c 100644
--- a/.github/ISSUE_TEMPLATE.yml
+++ b/.github/ISSUE_TEMPLATE.yml
@@ -35,9 +35,9 @@ body:
       options:
         - 2.9.2 (64bit)
         - 2.9.2 (32bit)
-        default: 0
-      validations:
-        required: true
+      default: 0
+    validations:
+      required: true
   - type: textarea
     id: logs
     attributes:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 60efcd47..00000000
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--- Provide a general summary of your changes in the Title above -->
-
-## Description
-<!--- 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. -->
-- [ ] I have raised an issue to propose this change ([required](https://github.com/evilsocket/pwnagotchi/blob/master/CONTRIBUTING.md))
-
-
-## How Has This Been Tested?
-<!--- Please describe in detail how you tested your changes. -->
-<!--- Include details of your testing environment, and the tests you ran to -->
-<!--- see how your change affects other areas of the code, etc. -->
-
-## 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 change)
-
-## 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.
-- [ ] My change requires a change to the documentation.
-- [ ] I have updated the documentation accordingly.
-- [ ] I've read the [CONTRIBUTION](https://github.com/evilsocket/pwnagotchi/blob/master/CONTRIBUTING.md) guide
-- [ ] I have signed-off my commits with `git commit -s`
diff --git a/.github/PULL_REQUEST_TEMPLATE.yml b/.github/PULL_REQUEST_TEMPLATE.yml
new file mode 100644
index 00000000..0d04b9ba
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.yml
@@ -0,0 +1,67 @@
+name: Pull Request
+description: File a Pull Request
+title: "[PR]: "
+labels: ["bug", "triage"]
+projects: ["pwnagotchi"]
+branch: ["noai"]
+assignees:
+  - jayofelony
+body:
+  - type: markdown
+    id: explanation
+    attributes:
+      label: explanation
+      description: Describe the changes you have made
+      value: |
+        <!--- Describe your changes in detail -->
+    validations:
+      required: true
+  - type: input
+    id: contact
+    attributes:
+      label: Contact Details
+      description: How can we get in touch with you if we need more info?
+      placeholder: ex. email@example.com
+    validations:
+      required: false
+  - type: textarea
+    id: tested
+    attributes:
+      label: Has this been tested?
+      description: How Has This Been Tested?
+      placeholder: Tell us how you tested it
+      value: |
+        <!--- Please describe in detail how you tested your changes. -->
+        <!--- Include details of your testing environment, and the tests you ran to -->
+        <!--- see how your change affects other areas of the code, etc. -->
+    validations:
+      required: true
+  - type: checkboxes
+    id: changes-box
+    attributes:
+      label: changes
+      description: What changes does this imply
+      options:
+        - label: Bug fix (non-breaking change which fixes an issue)
+        - label: New feature (non-breaking change which adds functionality)
+        - label: Breaking change (fix or feature that would cause existing functionality to change)
+      default: 0
+    validations:
+      required: true
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/jayofelony/pwnagotchi/blob/noai/CODE_OF_CONDUCT.md).
+      options:
+        - label: My code follows the code style of this project.
+          required: true
+        - label: My change requires a change to the documentation.
+          required: true
+        - label: I have updated the documentation accordingly.
+          required: true
+        - label: I've read the [CONTRIBUTION](https://github.com/evilsocket/pwnagotchi/blob/master/CONTRIBUTING.md) guide
+          required: true
+        - label: I have signed-off my commits with `git commit -s`
+          required: true
+