From 855e47474c163bd353594a1e88772b73684cd03c Mon Sep 17 00:00:00 2001 From: Thomas Bui Date: Thu, 23 Dec 2021 16:10:43 -0800 Subject: [PATCH 1/8] Update issue templates --- .github/ISSUE_TEMPLATE/feature_request.yml | 15 ++++----------- .github/ISSUE_TEMPLATE/icon_request.yml | 2 +- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index a637b86e5..6915c315d 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -7,23 +7,16 @@ body: id: currentproblem attributes: label: Problem - description: Tell us about the current problem that you face that this feature might help you with. + description: Tell us about the problem and its impacts on the you/Devicon. validations: required: true - type: textarea - id: suggestedfeat + id: possiblesolution attributes: - label: Suggested feature - description: Tell us about the feature that might solve the above problem. + label: Possible Solution + description: If you have one, tell us about the feature(s) that might solve the above problem. validations: required: true - - type: textarea - id: why - attributes: - label: Why should we have this feature? - description: List any extra benefits, other than solving your problem, that this feature will bring to the repository. If none, leave blank. - validations: - required: false - type: textarea id: extrainformation attributes: diff --git a/.github/ISSUE_TEMPLATE/icon_request.yml b/.github/ISSUE_TEMPLATE/icon_request.yml index 04e3a29f0..32637c145 100644 --- a/.github/ISSUE_TEMPLATE/icon_request.yml +++ b/.github/ISSUE_TEMPLATE/icon_request.yml @@ -1,6 +1,6 @@ name: Icon Request description: Requesting a new icon or changes to an existing icon -title: 'Icon request: [NAME]' +title: '[ICON REQUEST]: ' labels: ["request:icon"] body: - type: input From b33c7193637db7b8b87d7eed91f73bca9d291fe3 Mon Sep 17 00:00:00 2001 From: Thomas Bui Date: Fri, 24 Dec 2021 10:53:06 -0800 Subject: [PATCH 2/8] Add pr templates --- .../PULL_REQUEST_TEMPLATE/new_feature.md | 6 --- .../PULL_REQUEST_TEMPLATE/new_icon.md | 4 +- .../pull_request_template.md | 2 + .github/pull_request_template.md | 38 ------------------- 4 files changed, 3 insertions(+), 47 deletions(-) rename .github/{drafts => }/PULL_REQUEST_TEMPLATE/new_feature.md (82%) rename .github/{drafts => }/PULL_REQUEST_TEMPLATE/new_icon.md (90%) create mode 100644 .github/PULL_REQUEST_TEMPLATE/pull_request_template.md delete mode 100644 .github/pull_request_template.md diff --git a/.github/drafts/PULL_REQUEST_TEMPLATE/new_feature.md b/.github/PULL_REQUEST_TEMPLATE/new_feature.md similarity index 82% rename from .github/drafts/PULL_REQUEST_TEMPLATE/new_feature.md rename to .github/PULL_REQUEST_TEMPLATE/new_feature.md index 2dc712b29..f0814296a 100644 --- a/.github/drafts/PULL_REQUEST_TEMPLATE/new_feature.md +++ b/.github/PULL_REQUEST_TEMPLATE/new_feature.md @@ -3,11 +3,7 @@ name: New Feature about: Add a new feature to the repository. title: 'New Feature: [NAME]' labels: 'enhancement' -assignees: '' - --- - - ## Double check these details before you open a PR** @@ -16,9 +12,7 @@ assignees: '' ## This PR adds/fixes... - ## Notes - diff --git a/.github/drafts/PULL_REQUEST_TEMPLATE/new_icon.md b/.github/PULL_REQUEST_TEMPLATE/new_icon.md similarity index 90% rename from .github/drafts/PULL_REQUEST_TEMPLATE/new_icon.md rename to .github/PULL_REQUEST_TEMPLATE/new_icon.md index 57f046f78..013246585 100644 --- a/.github/drafts/PULL_REQUEST_TEMPLATE/new_icon.md +++ b/.github/PULL_REQUEST_TEMPLATE/new_icon.md @@ -3,10 +3,8 @@ name: New Icon about: Add a new icon to the repository. title: 'new icon: [NAME] (versions)' labels: 'feature:icon' -assignees: '' - --- - + ## Double check these details before you open a PR diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md new file mode 100644 index 000000000..fee29325d --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md @@ -0,0 +1,2 @@ +Adding a New Icon? Go to https://github.com/devicons/devicon/compare/master...develop?quick_pull=1&template=new_icon.md +Adding a New Feature/Bug Fix? Go to https://github.com/devicons/devicon/compare/master...develop?quick_pull=1&template=new_feature.md \ No newline at end of file diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md deleted file mode 100644 index b71188187..000000000 --- a/.github/pull_request_template.md +++ /dev/null @@ -1,38 +0,0 @@ -# **New icon section** - - - -## Double check these details before you open a PR - - -- [ ] PR does not match another non-stale PR currently opened -- [ ] PR name matches the format *new icon: Icon name (versions separated by comma)*. More details [here](https://github.com/devicons/devicon/blob/develop/CONTRIBUTING.md#overview) -- [ ] The PR's base is the `develop` branch. -- [ ] Your icons are inside a folder as seen [here](https://github.com/devicons/devicon/blob/develop/CONTRIBUTING.md#organizational-guidelines) -- [ ] SVG matches the standards laid out [here](https://github.com/devicons/devicon/blob/develop/CONTRIBUTING.md#svgStandards) -- [ ] A new object is added in the `devicon.json` file as seen [here](https://github.com/devicons/devicon/blob/develop/CONTRIBUTING.md#-updating-the-deviconjson-) - - - -## Link to prove your SVG is correct and up-to-date - - - ---- -# **New feature section** - - - -## Double check these details before you open a PR - - -- [ ] PR does not match another non-stale PR currently opened -- [ ] PR name matches the format *New Feature: a brief description of feature* - -## This PR adds/fixes - - - -## Notes - - From 48a904af69a1dab12ef7d1d2877d1a4b0a0e571c Mon Sep 17 00:00:00 2001 From: Thomas Bui Date: Fri, 24 Dec 2021 18:18:27 -0800 Subject: [PATCH 3/8] Update templates --- .github/ISSUE_TEMPLATE/feature_request.yml | 4 ++-- .github/PULL_REQUEST_TEMPLATE/new_icon.md | 23 +++++++------------ .../pull_request_template.md | 2 -- .github/pull_request_template.md | 5 ++++ 4 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 .github/PULL_REQUEST_TEMPLATE/pull_request_template.md create mode 100644 .github/pull_request_template.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 6915c315d..d0815fbe0 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -7,14 +7,14 @@ body: id: currentproblem attributes: label: Problem - description: Tell us about the problem and its impacts on the you/Devicon. + description: Tell us about the problem. validations: required: true - type: textarea id: possiblesolution attributes: label: Possible Solution - description: If you have one, tell us about the feature(s) that might solve the above problem. + description: If you have an idea, please tell us what might solve the above problem. validations: required: true - type: textarea diff --git a/.github/PULL_REQUEST_TEMPLATE/new_icon.md b/.github/PULL_REQUEST_TEMPLATE/new_icon.md index 013246585..56daabdb7 100644 --- a/.github/PULL_REQUEST_TEMPLATE/new_icon.md +++ b/.github/PULL_REQUEST_TEMPLATE/new_icon.md @@ -1,21 +1,14 @@ ---- -name: New Icon -about: Add a new icon to the repository. -title: 'new icon: [NAME] (versions)' -labels: 'feature:icon' ---- - ## Double check these details before you open a PR - [] PR does not match another non-stale PR currently opened -- [] PR name matches the format *new icon: Icon name (versions separated by comma)*. More details [here](https://github.com/devicons/devicon/blob/develop/CONTRIBUTING.md#overview) -- [] PR's base is the `develop` branch. -- [] Your icons are inside a folder as seen [here](https://github.com/devicons/devicon/blob/develop/CONTRIBUTING.md#organizational-guidelines) -- [] SVG matches the standards laid out [here](https://github.com/devicons/devicon/blob/develop/CONTRIBUTING.md#svgStandards) -- [] A new object is added in the `devicon.json` file as seen [here](https://github.com/devicons/devicon/blob/develop/CONTRIBUTING.md#-updating-the-deviconjson-) - +## Features + + +**This PR closes...** + + +## Notes + -## Link to prove your SVG is correct and up-to-date. - diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md deleted file mode 100644 index fee29325d..000000000 --- a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md +++ /dev/null @@ -1,2 +0,0 @@ -Adding a New Icon? Go to https://github.com/devicons/devicon/compare/master...develop?quick_pull=1&template=new_icon.md -Adding a New Feature/Bug Fix? Go to https://github.com/devicons/devicon/compare/master...develop?quick_pull=1&template=new_feature.md \ No newline at end of file diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 000000000..90c2d9867 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,5 @@ +Adding a New Icon? +- Add `?quick_pull=1&template=new_icon.md` to the end of your current URL. + +Adding a New Feature/Bug Fix? +- Add `?quick_pull=1&template=new_feature.md` to the end of your current URL. \ No newline at end of file From 77a9551c2b60285954df7d97eab852880680ef4c Mon Sep 17 00:00:00 2001 From: Thomas Bui Date: Fri, 24 Dec 2021 18:22:59 -0800 Subject: [PATCH 4/8] Update pr templates --- .github/PULL_REQUEST_TEMPLATE/new_feature.md | 15 +++++---------- .github/PULL_REQUEST_TEMPLATE/new_icon.md | 13 ++++++++----- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/new_feature.md b/.github/PULL_REQUEST_TEMPLATE/new_feature.md index f0814296a..55e6d4112 100644 --- a/.github/PULL_REQUEST_TEMPLATE/new_feature.md +++ b/.github/PULL_REQUEST_TEMPLATE/new_feature.md @@ -1,18 +1,13 @@ ---- -name: New Feature -about: Add a new feature to the repository. -title: 'New Feature: [NAME]' -labels: 'enhancement' ---- -## Double check these details before you open a PR** +## Double check these details before you open a PR - [] PR does not match another non-stale PR currently opened -- [] PR name matches the format *New Feature: brief description of feature* +## Features + -## This PR adds/fixes... - +**This PR closes...** + ## Notes diff --git a/.github/PULL_REQUEST_TEMPLATE/new_icon.md b/.github/PULL_REQUEST_TEMPLATE/new_icon.md index 56daabdb7..1c0474b4b 100644 --- a/.github/PULL_REQUEST_TEMPLATE/new_icon.md +++ b/.github/PULL_REQUEST_TEMPLATE/new_icon.md @@ -2,13 +2,16 @@ - [] PR does not match another non-stale PR currently opened +- [] PR name matches the format *new icon: Icon name (versions separated by comma)*. More details [here](https://github.com/devicons/devicon/blob/develop/CONTRIBUTING.md#overview) +- [] PR's base is the `develop` branch. +- [] Your icons are inside a folder as seen [here](https://github.com/devicons/devicon/blob/develop/CONTRIBUTING.md#organizational-guidelines) +- [] SVG matches the standards laid out [here](https://github.com/devicons/devicon/blob/develop/CONTRIBUTING.md#svgStandards) +- [] A new object is added in the `devicon.json` file as seen [here](https://github.com/devicons/devicon/blob/develop/CONTRIBUTING.md#-updating-the-deviconjson-) -## Features - + **This PR closes...** -## Notes - - +## Link to prove your SVG is correct and up-to-date. + From f426415c969db70695a21a75b0accb129a80a057 Mon Sep 17 00:00:00 2001 From: Thomas Bui Date: Fri, 24 Dec 2021 18:25:26 -0800 Subject: [PATCH 5/8] Update default pr template --- .github/pull_request_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 90c2d9867..4d7efb011 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,5 +1,5 @@ Adding a New Icon? -- Add `?quick_pull=1&template=new_icon.md` to the end of your current URL. +- Add `?quick_pull=1&template=new_icon.md` to the end of your current URL and press `Enter` Adding a New Feature/Bug Fix? -- Add `?quick_pull=1&template=new_feature.md` to the end of your current URL. \ No newline at end of file +- Add `?quick_pull=1&template=new_feature.md` to the end of your current URL and press `Enter`. \ No newline at end of file From 92fa962c28929d2479ab5b4a5617649ab38c6372 Mon Sep 17 00:00:00 2001 From: Thomas Bui Date: Fri, 24 Dec 2021 22:59:01 -0800 Subject: [PATCH 6/8] Clarify pr closing statement --- .github/PULL_REQUEST_TEMPLATE/new_feature.md | 4 ++-- .github/PULL_REQUEST_TEMPLATE/new_icon.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/new_feature.md b/.github/PULL_REQUEST_TEMPLATE/new_feature.md index 55e6d4112..6b1f22c17 100644 --- a/.github/PULL_REQUEST_TEMPLATE/new_feature.md +++ b/.github/PULL_REQUEST_TEMPLATE/new_feature.md @@ -6,8 +6,8 @@ ## Features -**This PR closes...** - +**This PR closes NONE** + ## Notes diff --git a/.github/PULL_REQUEST_TEMPLATE/new_icon.md b/.github/PULL_REQUEST_TEMPLATE/new_icon.md index 1c0474b4b..58e458ef8 100644 --- a/.github/PULL_REQUEST_TEMPLATE/new_icon.md +++ b/.github/PULL_REQUEST_TEMPLATE/new_icon.md @@ -10,8 +10,8 @@ -**This PR closes...** - +**This PR closes NONE** + ## Link to prove your SVG is correct and up-to-date. From add62d716189224624ca4820b5885a8f84e2ab61 Mon Sep 17 00:00:00 2001 From: Thomas Bui <43018778+Thomas-Boi@users.noreply.github.com> Date: Sun, 26 Dec 2021 19:33:38 -0800 Subject: [PATCH 7/8] Apply suggestions from code review Co-authored-by: David Leal --- .github/pull_request_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 4d7efb011..99a2cb900 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,5 +1,5 @@ -Adding a New Icon? +### Adding a New Icon? - Add `?quick_pull=1&template=new_icon.md` to the end of your current URL and press `Enter` -Adding a New Feature/Bug Fix? +### Adding a New Feature or fixing a bug? - Add `?quick_pull=1&template=new_feature.md` to the end of your current URL and press `Enter`. \ No newline at end of file From 6c8e9c850aa8672e7e3fe94f4f6315cc3fa5ff91 Mon Sep 17 00:00:00 2001 From: Thomas Bui <43018778+Thomas-Boi@users.noreply.github.com> Date: Sun, 26 Dec 2021 20:24:39 -0800 Subject: [PATCH 8/8] Update .github/PULL_REQUEST_TEMPLATE/new_feature.md Co-authored-by: David Leal --- .github/PULL_REQUEST_TEMPLATE/new_feature.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/new_feature.md b/.github/PULL_REQUEST_TEMPLATE/new_feature.md index 6b1f22c17..9df58fd52 100644 --- a/.github/PULL_REQUEST_TEMPLATE/new_feature.md +++ b/.github/PULL_REQUEST_TEMPLATE/new_feature.md @@ -1,7 +1,7 @@ ## Double check these details before you open a PR -- [] PR does not match another non-stale PR currently opened +- [ ] PR does not match another non-stale PR currently opened ## Features