From d1297f43fd97483215e2bb2ce9a1707ffaedab0a Mon Sep 17 00:00:00 2001
From: davidescapolan01 <davidescapolan01@gmail.com>
Date: Wed, 16 Apr 2025 20:25:26 +0200
Subject: [PATCH] feat: Implement suggestions to issue and PR templates

---
 .github/ISSUE_TEMPLATE/bug-report.md   | 22 +++++++++--------
 .github/ISSUE_TEMPLATE/lab-proposal.md |  2 +-
 .github/PULL_REQUEST_TEMPLATE.md       | 34 +++++++++++++++++---------
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 394cff0..67ae5e7 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -15,6 +15,18 @@ Why does it bother you, and how could it be harmful for the user?
 
 -->
 
+## Environment (please complete the following):
+
+<!--
+
+- OS: [e.g. Ubuntu 22.04, Windows 11]
+- Browser: [e.g. Chrome 112]
+- CK-X Version: [e.g. v1.2.0 or commit SHA]
+- Docker version: `docker version`
+- How did you install CK-X? [installer script / manual / other]
+
+-->
+
 ## Report in Depth
 
 <!-- Please describe the bug clearly.
@@ -86,16 +98,6 @@ Or use a code block if you prefer:
 
 -->
 
-## Environment (please complete the following):
-
-<!--
-- OS: [e.g. Ubuntu 22.04, Windows 11]
-- Browser: [e.g. Chrome 112]
-- CK-X Version: [e.g. v1.2.0 or commit SHA]
-- Docker version: `docker version`
-- How did you install CK-X? [installer script / manual / other]
--->
-
 ## Additional context
 
 <!-- Add any other context or details here. -->
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/lab-proposal.md b/.github/ISSUE_TEMPLATE/lab-proposal.md
index 5d0fdbf..2c9c455 100644
--- a/.github/ISSUE_TEMPLATE/lab-proposal.md
+++ b/.github/ISSUE_TEMPLATE/lab-proposal.md
@@ -21,7 +21,7 @@ What skills or concepts should the user learn or demonstrate?
 <!--
 Who is this lab designed for?
 
-- CKA / CKS / KCNA / Custom?
+- CKA / CKS / Custom...?
 - Beginner, Intermediate, Advanced?
 - Any specific professional roles in mind (e.g. DevOps, SRE, Security Engineer)?
 -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f6ca9a7..fd8867c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -45,9 +45,14 @@ Feel free to add or remove items depending on what your PR changes.
 -->
 
 - [ ] Pod starts without errors  
-- [ ] Nginx logs are available  
+- [ ] Docker Compose logs are available  
 - [ ] All relevant tests pass  
-- [ ] Documentation is updated (if needed)
+- [ ] Documentation is updated (if needed - usually it is)
+
+<!-- If you are adding labs, please, also add the following -->
+
+- [ ] New labs pass  
+- [ ] Answers work as expected  
 
 ---
 
@@ -71,20 +76,25 @@ Example: "I also tweaked the wording of the exercise to explicitly define contai
 
 ---
 
-#### 📸 Screenshots / Logs (if applicable)
-
-<!--
-
-Include screenshots or log excerpts to help illustrate the problem or verify the fix.
-
--->
-
----
-
 #### 🧠 Additional Context
 
 <!--
 
 Add any background or technical context that might help reviewers understand the motivation or constraints of the PR.
 
+-->
+
+---
+
+#### 📄 Attachments
+
+<!-- Add any relevant attachments such as:  
+
+- Screenshots of the labs list showing the the newly added labs
+- Screenshots of the labs running
+- Screenshots of the labs passing
+- E2E test results (screenshots or, preferably, logs/human-readable reports)
+- Static code analysis reports
+- Any other supporting material (e.g. logs, error traces, terminal output)
+
 -->
\ No newline at end of file