From 78a37600e334414e139b8cf02eb45d50c708b169 Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Mon, 7 Nov 2022 08:15:05 +0800 Subject: [PATCH 1/9] Fix indentation of SVG --- docs/_includes/icons/git-merge.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/icons/git-merge.svg b/docs/_includes/icons/git-merge.svg index e7cae4f7443..4b53af81ebe 100644 --- a/docs/_includes/icons/git-merge.svg +++ b/docs/_includes/icons/git-merge.svg @@ -1,4 +1,4 @@ - + From c9db0c576e0483df22cdbe24827c93b9a3fe6d88 Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Mon, 7 Nov 2022 08:15:22 +0800 Subject: [PATCH 2/9] Add Octicons asset --- docs/_includes/icons/issue-closed.svg | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/_includes/icons/issue-closed.svg diff --git a/docs/_includes/icons/issue-closed.svg b/docs/_includes/icons/issue-closed.svg new file mode 100644 index 00000000000..f9e069e03c9 --- /dev/null +++ b/docs/_includes/icons/issue-closed.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From e2c9a3d8fecb32d12cb8250dc0c511799b88d978 Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Mon, 7 Nov 2022 08:18:56 +0800 Subject: [PATCH 3/9] Extend PPP parser for Issues badge --- docs/_includes/ppp-badges.liquid | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/_includes/ppp-badges.liquid b/docs/_includes/ppp-badges.liquid index 01844cfa36c..883e5d60573 100644 --- a/docs/_includes/ppp-badges.liquid +++ b/docs/_includes/ppp-badges.liquid @@ -19,6 +19,12 @@ {%- for tail in data offset:1 -%} {{ tail }} {%- endfor -%} + {% elsif type == 'Issue' %} + + {% include icons/issue-closed.svg class="icon" %} + Issue#{{ number }} + Issue #{{ number }}
View on GitHub + {%-else -%} [[{{ node }} {%- endif -%} From 5aa303e9da81c75456f6cfba1620bd6c796e9fca Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Mon, 7 Nov 2022 08:20:40 +0800 Subject: [PATCH 4/9] Open GitHub links in new tab --- docs/_includes/ppp-badges.liquid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_includes/ppp-badges.liquid b/docs/_includes/ppp-badges.liquid index 883e5d60573..fde8e9579a7 100644 --- a/docs/_includes/ppp-badges.liquid +++ b/docs/_includes/ppp-badges.liquid @@ -13,7 +13,7 @@ {%- if type == 'PR' -%} {% include icons/git-merge.svg class="icon" %} - PR#{{ number }} + PR#{{ number }} Pull Request #{{ number }}
View on GitHub {%- for tail in data offset:1 -%} @@ -22,7 +22,7 @@ {% elsif type == 'Issue' %} {% include icons/issue-closed.svg class="icon" %} - Issue#{{ number }} + Issue#{{ number }} Issue #{{ number }}
View on GitHub {%-else -%} From b6215a565af478782956434cb0e6e1cc2977aa29 Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Mon, 7 Nov 2022 08:21:28 +0800 Subject: [PATCH 5/9] Rename CSS class --- docs/_includes/ppp-badges.liquid | 4 ++-- docs/_sass/ppp.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/_includes/ppp-badges.liquid b/docs/_includes/ppp-badges.liquid index fde8e9579a7..664062ca238 100644 --- a/docs/_includes/ppp-badges.liquid +++ b/docs/_includes/ppp-badges.liquid @@ -11,7 +11,7 @@ {%- for node in nodes offset:1 -%} {% assign data = node | split: ']]' %}{% assign tag = data | first | strip | split: '#' %}{% assign type = tag | first | strip %}{% assign number = tag | last | strip %} {%- if type == 'PR' -%} - + {% include icons/git-merge.svg class="icon" %} PR#{{ number }} Pull Request #{{ number }}
View on GitHub @@ -20,7 +20,7 @@ {{ tail }} {%- endfor -%} {% elsif type == 'Issue' %} - + {% include icons/issue-closed.svg class="icon" %} Issue#{{ number }} Issue #{{ number }}
View on GitHub diff --git a/docs/_sass/ppp.scss b/docs/_sass/ppp.scss index c2bd9d5befa..c9efc66584d 100644 --- a/docs/_sass/ppp.scss +++ b/docs/_sass/ppp.scss @@ -1,4 +1,4 @@ -.pr-badge { +.ppp-badge { $color: #8250df; $border-color: #d0d7de; From 703e2c6b6d207f32805b67d97fe872c11613e88d Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Mon, 7 Nov 2022 08:27:24 +0800 Subject: [PATCH 6/9] Fix missing styling bug --- docs/_includes/icons/issue-closed.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/icons/issue-closed.svg b/docs/_includes/icons/issue-closed.svg index f9e069e03c9..c31b3df2b2a 100644 --- a/docs/_includes/icons/issue-closed.svg +++ b/docs/_includes/icons/issue-closed.svg @@ -1,5 +1,5 @@ - + \ No newline at end of file From 65cce9afcb4ba5c946fd26d510cce57688fb4c81 Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Mon, 7 Nov 2022 08:33:29 +0800 Subject: [PATCH 7/9] Fix missing tail not rendered --- docs/_includes/ppp-badges.liquid | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/_includes/ppp-badges.liquid b/docs/_includes/ppp-badges.liquid index 664062ca238..96514cb5a80 100644 --- a/docs/_includes/ppp-badges.liquid +++ b/docs/_includes/ppp-badges.liquid @@ -25,6 +25,9 @@ Issue#{{ number }} Issue #{{ number }}
View on GitHub + {%- for tail in data offset:1 -%} + {{ tail }} + {%- endfor -%} {%-else -%} [[{{ node }} {%- endif -%} From 3ead1f896a2a6eff13acdbe4b4fccc00cbad69e4 Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Mon, 7 Nov 2022 08:34:15 +0800 Subject: [PATCH 8/9] Use Issue badges for yixiann's PPP --- docs/team/yixiann.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/team/yixiann.md b/docs/team/yixiann.md index adc9cbe1548..29ace30e8ce 100644 --- a/docs/team/yixiann.md +++ b/docs/team/yixiann.md @@ -75,11 +75,11 @@ Given below are my contributions to the project. * **Community**: * Reported bugs and suggestions for other teams in the class: - * Stats command do not calculate amount wasted by performing qty * price [[Issue#449]] (https://github.com/AY2223S1-CS2103T-W16-2/tp/issues/449) - * Stats command expiry date do not count items that expire today [Issue#448](https://github.com/AY2223S1-CS2103T-W16-2/tp/issues/448) - * Stats command fail on FoodRem having less than 3 items [Issue#447](https://github.com/AY2223S1-CS2103T-W16-2/tp/issues/447) - * Rename tag does not modify tags in items [Issue#293](https://github.com/AY2223S1-CS2103T-W16-2/tp/issues/293) - * Rename tag to same name is possible [Issue#273](https://github.com/AY2223S1-CS2103T-W16-2/tp/issues/273) + * Stats command do not calculate amount wasted by performing qty * price [[Issue#449]] + * Stats command expiry date do not count items that expire today [[Issue#448]] + * Stats command fail on FoodRem having less than 3 items [[Issue#447]] + * Rename tag does not modify tags in items [[Issue#293]] + * Rename tag to same name is possible [[Issue#273]] Other PRs: From 6b5174a614e24f885ce419e1685add043348e6f6 Mon Sep 17 00:00:00 2001 From: Richard Dominick <34370238+RichDom2185@users.noreply.github.com> Date: Mon, 7 Nov 2022 08:37:18 +0800 Subject: [PATCH 9/9] Add newline to EOF --- docs/_includes/icons/issue-closed.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/icons/issue-closed.svg b/docs/_includes/icons/issue-closed.svg index c31b3df2b2a..08f66571afc 100644 --- a/docs/_includes/icons/issue-closed.svg +++ b/docs/_includes/icons/issue-closed.svg @@ -2,4 +2,4 @@ - \ No newline at end of file +