From ad149f4d80d3d7617886dab2488b8bc4142b1eb9 Mon Sep 17 00:00:00 2001 From: Pablo Marcos <48572431+MarionMoseby@users.noreply.github.com> Date: Wed, 20 Oct 2021 21:00:17 +0200 Subject: [PATCH 01/24] Fixed absLangURL issue with sections in footer (#442) * Add Blogtrottr as newsletter provider * Fixed absLangURL issue with sections in footer Co-authored-by: Pablo Marcos --- layouts/partials/footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index f21c832..9e1f67d 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -73,7 +73,7 @@ {{ $sectionID = .section.id }} {{ end }}
  • - {{ .section.name }} + {{ .section.name }}
    • {{ end }} {{- end }} From b5c371327751d277a46145c97216f8a25588dbf2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Oct 2021 01:12:40 +0600 Subject: [PATCH 02/24] add vendor specific css prefixes (#444) Co-authored-by: kodiakhq[bot] --- package-lock.json | 48 ++++++++++++++++++++++++++++++----------------- package.json | 2 +- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 63897af..ff8a008 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "license": "MIT", "devDependencies": { "autoprefixer": "^10.3.7", - "postcss": "^8.3.9", + "postcss": "^8.3.10", "postcss-cli": "^8.3.1" } }, @@ -603,9 +603,9 @@ } }, "node_modules/nanoid": { - "version": "3.1.29", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.29.tgz", - "integrity": "sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg==", + "version": "3.1.30", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", + "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", "dev": true, "bin": { "nanoid": "bin/nanoid.cjs" @@ -675,13 +675,13 @@ } }, "node_modules/postcss": { - "version": "8.3.9", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.9.tgz", - "integrity": "sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==", + "version": "8.3.10", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.10.tgz", + "integrity": "sha512-YYfvfUdWx+ECpr5Hgc6XRfsaux8LksL5ey8qTtWiuRXOpOF1YYMwAySdh0nSmwhZAFvvJ6rgiIkKVShu4x2T1Q==", "dev": true, "dependencies": { - "nanoid": "^3.1.28", - "picocolors": "^0.2.1", + "nanoid": "^3.1.30", + "picocolors": "^1.0.0", "source-map-js": "^0.6.2" }, "engines": { @@ -777,6 +777,12 @@ "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", "dev": true }, + "node_modules/postcss/node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, "node_modules/pretty-hrtime": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", @@ -1447,9 +1453,9 @@ } }, "nanoid": { - "version": "3.1.29", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.29.tgz", - "integrity": "sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg==", + "version": "3.1.30", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", + "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", "dev": true }, "node-releases": { @@ -1495,14 +1501,22 @@ "dev": true }, "postcss": { - "version": "8.3.9", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.9.tgz", - "integrity": "sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==", + "version": "8.3.10", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.10.tgz", + "integrity": "sha512-YYfvfUdWx+ECpr5Hgc6XRfsaux8LksL5ey8qTtWiuRXOpOF1YYMwAySdh0nSmwhZAFvvJ6rgiIkKVShu4x2T1Q==", "dev": true, "requires": { - "nanoid": "^3.1.28", - "picocolors": "^0.2.1", + "nanoid": "^3.1.30", + "picocolors": "^1.0.0", "source-map-js": "^0.6.2" + }, + "dependencies": { + "picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + } } }, "postcss-cli": { diff --git a/package.json b/package.json index 68b7cf1..7d72729 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "homepage": "https://github.com/hossainemruz/toha#readme", "devDependencies": { "autoprefixer": "^10.3.7", - "postcss": "^8.3.9", + "postcss": "^8.3.10", "postcss-cli": "^8.3.1" } } From ff86f78b4ddcfe26991f16506e04b28a14a9e93a Mon Sep 17 00:00:00 2001 From: Florian ANCEAU Date: Thu, 21 Oct 2021 11:18:12 +0200 Subject: [PATCH 03/24] Fix badge display when name is too long (#445) --- static/css/sections/about.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/static/css/sections/about.css b/static/css/sections/about.css index 71d4b17..19fd6ce 100644 --- a/static/css/sections/about.css +++ b/static/css/sections/about.css @@ -87,11 +87,14 @@ background: #3c4858; font-size: 1rem; color: #f9fafc; - line-height: 135px; + line-height: initial; text-align: center; position: absolute; top: 5%; left: 5%; + display: flex; + justify-content: center; + align-items: center; } .circular-progress.blue .circular-progress-bar { From 098179ec1ffd0bd9408d145123f0338346e9fa28 Mon Sep 17 00:00:00 2001 From: Emily <734204679@qq.com> Date: Thu, 28 Oct 2021 23:11:25 +0800 Subject: [PATCH 04/24] Add valine comment system support (#446) * feat: add valine support * Adjust the comment config * Adjust the comment config * Make comment section backward compatible with old config Signed-off-by: hossainemruz Co-authored-by: hossainemruz --- layouts/_default/single.html | 20 +++++++++++++++++--- layouts/partials/disqus.html | 7 ++++++- layouts/partials/valine.html | 17 +++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 layouts/partials/valine.html diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 3bd38b5..2423a98 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -155,10 +155,24 @@
    {{ partial "navigators/next-prev-navigator.html" . }}
    - - {{ if site.DisqusShortname }} - {{ partial "disqus.html" . }} + + + {{ with site.Params.features.comment }} + {{ if .enable }} + + {{ if .disqus.shortName }} + {{ partial "disqus.html" . }} + + {{ else if .valine }} + {{ partial "valine.html" . }} + {{ end }} + {{ end }} {{ end }} + + {{ if site.DisqusShortname }} + {{ partial "disqus.html" . }} + {{ end }} + diff --git a/layouts/partials/disqus.html b/layouts/partials/disqus.html index 71fef21..4ccd9e2 100644 --- a/layouts/partials/disqus.html +++ b/layouts/partials/disqus.html @@ -1,3 +1,8 @@ +{{ $disqusShortName := site.DisqusShortname }} +{{ if site.Params.features.disqus.shortName }} + {{ $disqusShortName = site.Params.features.disqus.shortName }} +{{ end }} +
    + + From 2ffc0c7a9c274982b53a687bbdf7b9153fa32198 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Oct 2021 21:30:02 +0600 Subject: [PATCH 05/24] add vendor specific css prefixes (#448) Co-authored-by: kodiakhq[bot] --- package-lock.json | 130 +++++++++++++++++++++------------------------- package.json | 4 +- 2 files changed, 60 insertions(+), 74 deletions(-) diff --git a/package-lock.json b/package-lock.json index ff8a008..5263059 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,8 +8,8 @@ "version": "1.0.0", "license": "MIT", "devDependencies": { - "autoprefixer": "^10.3.7", - "postcss": "^8.3.10", + "autoprefixer": "^10.4.0", + "postcss": "^8.3.11", "postcss-cli": "^8.3.1" } }, @@ -104,16 +104,16 @@ } }, "node_modules/autoprefixer": { - "version": "10.3.7", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.7.tgz", - "integrity": "sha512-EmGpu0nnQVmMhX8ROoJ7Mx8mKYPlcUHuxkwrRYEYMz85lu7H09v8w6R1P0JPdn/hKU32GjpLBFEOuIlDWCRWvg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.0.tgz", + "integrity": "sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==", "dev": true, "dependencies": { - "browserslist": "^4.17.3", - "caniuse-lite": "^1.0.30001264", + "browserslist": "^4.17.5", + "caniuse-lite": "^1.0.30001272", "fraction.js": "^4.1.1", "normalize-range": "^0.1.2", - "picocolors": "^0.2.1", + "picocolors": "^1.0.0", "postcss-value-parser": "^4.1.0" }, "bin": { @@ -152,16 +152,16 @@ } }, "node_modules/browserslist": { - "version": "4.17.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz", - "integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==", + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz", + "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==", "dev": true, "dependencies": { - "caniuse-lite": "^1.0.30001264", - "electron-to-chromium": "^1.3.857", + "caniuse-lite": "^1.0.30001271", + "electron-to-chromium": "^1.3.878", "escalade": "^3.1.1", - "node-releases": "^1.1.77", - "picocolors": "^0.2.1" + "node-releases": "^2.0.1", + "picocolors": "^1.0.0" }, "bin": { "browserslist": "cli.js" @@ -175,9 +175,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001265", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz", - "integrity": "sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==", + "version": "1.0.30001272", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001272.tgz", + "integrity": "sha512-DV1j9Oot5dydyH1v28g25KoVm7l8MTxazwuiH3utWiAS6iL/9Nh//TGwqFEeqqN8nnWYQ8HHhUq+o4QPt9kvYw==", "dev": true, "funding": { "type": "opencollective", @@ -278,9 +278,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.3.861", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.861.tgz", - "integrity": "sha512-GZyflmpMnZRdZ1e2yAyvuFwz1MPSVQelwHX4TJZyXypB8NcxdPvPNwy5lOTxnlkrK13EiQzyTPugRSnj6cBgKg==", + "version": "1.3.883", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.883.tgz", + "integrity": "sha512-goyjNx4wB9j911PBteb+AXNbErug7rJVkmDXWdw5SCVn2JlARBwsqucPkvp1h5mXWxHUbBRK3bwXTrqSxSiAIQ==", "dev": true }, "node_modules/emoji-regex": { @@ -615,9 +615,9 @@ } }, "node_modules/node-releases": { - "version": "1.1.77", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz", - "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", + "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", "dev": true }, "node_modules/normalize-path": { @@ -648,9 +648,9 @@ } }, "node_modules/picocolors": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", - "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", "dev": true }, "node_modules/picomatch": { @@ -675,9 +675,9 @@ } }, "node_modules/postcss": { - "version": "8.3.10", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.10.tgz", - "integrity": "sha512-YYfvfUdWx+ECpr5Hgc6XRfsaux8LksL5ey8qTtWiuRXOpOF1YYMwAySdh0nSmwhZAFvvJ6rgiIkKVShu4x2T1Q==", + "version": "8.3.11", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz", + "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==", "dev": true, "dependencies": { "nanoid": "^3.1.30", @@ -777,12 +777,6 @@ "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==", "dev": true }, - "node_modules/postcss/node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - }, "node_modules/pretty-hrtime": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", @@ -1089,16 +1083,16 @@ "dev": true }, "autoprefixer": { - "version": "10.3.7", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.7.tgz", - "integrity": "sha512-EmGpu0nnQVmMhX8ROoJ7Mx8mKYPlcUHuxkwrRYEYMz85lu7H09v8w6R1P0JPdn/hKU32GjpLBFEOuIlDWCRWvg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.0.tgz", + "integrity": "sha512-7FdJ1ONtwzV1G43GDD0kpVMn/qbiNqyOPMFTX5nRffI+7vgWoFEc6DcXOxHJxrWNDXrZh18eDsZjvZGUljSRGA==", "dev": true, "requires": { - "browserslist": "^4.17.3", - "caniuse-lite": "^1.0.30001264", + "browserslist": "^4.17.5", + "caniuse-lite": "^1.0.30001272", "fraction.js": "^4.1.1", "normalize-range": "^0.1.2", - "picocolors": "^0.2.1", + "picocolors": "^1.0.0", "postcss-value-parser": "^4.1.0" } }, @@ -1118,22 +1112,22 @@ } }, "browserslist": { - "version": "4.17.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.3.tgz", - "integrity": "sha512-59IqHJV5VGdcJZ+GZ2hU5n4Kv3YiASzW6Xk5g9tf5a/MAzGeFwgGWU39fVzNIOVcgB3+Gp+kiQu0HEfTVU/3VQ==", + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.5.tgz", + "integrity": "sha512-I3ekeB92mmpctWBoLXe0d5wPS2cBuRvvW0JyyJHMrk9/HmP2ZjrTboNAZ8iuGqaEIlKguljbQY32OkOJIRrgoA==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001264", - "electron-to-chromium": "^1.3.857", + "caniuse-lite": "^1.0.30001271", + "electron-to-chromium": "^1.3.878", "escalade": "^3.1.1", - "node-releases": "^1.1.77", - "picocolors": "^0.2.1" + "node-releases": "^2.0.1", + "picocolors": "^1.0.0" } }, "caniuse-lite": { - "version": "1.0.30001265", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz", - "integrity": "sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==", + "version": "1.0.30001272", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001272.tgz", + "integrity": "sha512-DV1j9Oot5dydyH1v28g25KoVm7l8MTxazwuiH3utWiAS6iL/9Nh//TGwqFEeqqN8nnWYQ8HHhUq+o4QPt9kvYw==", "dev": true }, "chalk": { @@ -1210,9 +1204,9 @@ } }, "electron-to-chromium": { - "version": "1.3.861", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.861.tgz", - "integrity": "sha512-GZyflmpMnZRdZ1e2yAyvuFwz1MPSVQelwHX4TJZyXypB8NcxdPvPNwy5lOTxnlkrK13EiQzyTPugRSnj6cBgKg==", + "version": "1.3.883", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.883.tgz", + "integrity": "sha512-goyjNx4wB9j911PBteb+AXNbErug7rJVkmDXWdw5SCVn2JlARBwsqucPkvp1h5mXWxHUbBRK3bwXTrqSxSiAIQ==", "dev": true }, "emoji-regex": { @@ -1459,9 +1453,9 @@ "dev": true }, "node-releases": { - "version": "1.1.77", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.77.tgz", - "integrity": "sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz", + "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==", "dev": true }, "normalize-path": { @@ -1483,9 +1477,9 @@ "dev": true }, "picocolors": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", - "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", "dev": true }, "picomatch": { @@ -1501,22 +1495,14 @@ "dev": true }, "postcss": { - "version": "8.3.10", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.10.tgz", - "integrity": "sha512-YYfvfUdWx+ECpr5Hgc6XRfsaux8LksL5ey8qTtWiuRXOpOF1YYMwAySdh0nSmwhZAFvvJ6rgiIkKVShu4x2T1Q==", + "version": "8.3.11", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.11.tgz", + "integrity": "sha512-hCmlUAIlUiav8Xdqw3Io4LcpA1DOt7h3LSTAC4G6JGHFFaWzI6qvFt9oilvl8BmkbBRX1IhM90ZAmpk68zccQA==", "dev": true, "requires": { "nanoid": "^3.1.30", "picocolors": "^1.0.0", "source-map-js": "^0.6.2" - }, - "dependencies": { - "picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - } } }, "postcss-cli": { diff --git a/package.json b/package.json index 7d72729..759c7aa 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,8 @@ }, "homepage": "https://github.com/hossainemruz/toha#readme", "devDependencies": { - "autoprefixer": "^10.3.7", - "postcss": "^8.3.10", + "autoprefixer": "^10.4.0", + "postcss": "^8.3.11", "postcss-cli": "^8.3.1" } } From 232e5d2f3ad3742363bff870e934a20aef37fdd1 Mon Sep 17 00:00:00 2001 From: Emruz Hossain Date: Fri, 29 Oct 2021 05:00:37 +0600 Subject: [PATCH 06/24] Add project automation workflow (#447) * Add project automation workflow Signed-off-by: hossainemruz * Print project_data.json Signed-off-by: hossainemruz * Update project automation Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz --- .../workflows/project-automation-issue.yaml | 75 +++++++++++++++++++ .github/workflows/project-automation-pr.yaml | 75 +++++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 .github/workflows/project-automation-issue.yaml create mode 100644 .github/workflows/project-automation-pr.yaml diff --git a/.github/workflows/project-automation-issue.yaml b/.github/workflows/project-automation-issue.yaml new file mode 100644 index 0000000..79875cd --- /dev/null +++ b/.github/workflows/project-automation-issue.yaml @@ -0,0 +1,75 @@ +name: Project Automation (Issue) +on: + issues: + types: + - opened + - reopened + - closed + - labeled + - unlabeled +jobs: + track_pr: + runs-on: ubuntu-latest + steps: + - name: Get project data + env: + GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}} + ORGANIZATION: hugo-toha + PROJECT_NUMBER: 4 + run: | + gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query=' + query($org: String!, $number: Int!) { + organization(login: $org){ + projectNext(number: $number) { + id + fields(first:20) { + nodes { + id + name + settings + } + } + } + } + }' -f org="$ORGANIZATION" -F number=$PROJECT_NUMBER > project_data.json + + echo 'PROJECT_ID='$(jq -r '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV + echo 'TYPE_ID='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.id' project_data.json) >> $GITHUB_ENV + echo 'OPTION_FR='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Feature Requests") |.id' project_data.json) >> $GITHUB_ENV + echo 'OPTION_BUGS='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Bugs") |.id' project_data.json) >> $GITHUB_ENV + echo 'OPTION_DOC='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Documentation") |.id' project_data.json) >> $GITHUB_ENV + + - name: Add Issue to project + env: + GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}} + ISSUE_ID: ${{ github.event.issue.node_id }} + run: | + item_id="$( gh api graphql -f query=' + mutation($project:ID!, $issue:ID!) { + addProjectNextItem(input: {projectId: $project, contentId: $issue}) { + projectNextItem { + id + } + } + }' -f project="$PROJECT_ID" -f pr="$ISSUE_ID" --jq '.data.addProjectNextItem.projectNextItem.id')" + + echo 'ITEM_ID='$item_id >> $GITHUB_ENV + + - name: Set "Type" to the Issue + env: + GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}} + run: | + OPTION_ID=$OPTION_BUGS + gh api graphql -f query=' + mutation ($project: ID!, $item: ID!, $field: ID!, $opt_id: ID!) { + updateProjectNextItemField(input: { + projectId: $project + itemId: $item + fieldId: $field + value: $opt_id + }) { + projectNextItem { + id + } + } + }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$TYPE_ID" -f opt_id="$OPTION_ID" --silent diff --git a/.github/workflows/project-automation-pr.yaml b/.github/workflows/project-automation-pr.yaml new file mode 100644 index 0000000..9c1b887 --- /dev/null +++ b/.github/workflows/project-automation-pr.yaml @@ -0,0 +1,75 @@ +name: Project Automation (PR) +on: + pull_request: + types: + - opened + - ready_for_review + - reopened + - review_requested + - closed + - labeled + - unlabeled + +jobs: + track_pr: + runs-on: ubuntu-latest + steps: + - name: Get project data + env: + GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}} + ORGANIZATION: hugo-toha + PROJECT_NUMBER: 4 + run: | + gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query=' + query($org: String!, $number: Int!) { + organization(login: $org){ + projectNext(number: $number) { + id + fields(first:20) { + nodes { + id + name + settings + } + } + } + } + }' -f org="$ORGANIZATION" -F number=$PROJECT_NUMBER > project_data.json + + echo 'PROJECT_ID='$(jq -r '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV + echo 'TYPE_ID='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.id' project_data.json) >> $GITHUB_ENV + echo 'OPTION_PR='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Pull Requests") |.id' project_data.json) >> $GITHUB_ENV + + - name: Add PR to project + env: + GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}} + PR_ID: ${{ github.event.pull_request.node_id }} + run: | + item_id="$( gh api graphql -f query=' + mutation($project:ID!, $pr:ID!) { + addProjectNextItem(input: {projectId: $project, contentId: $pr}) { + projectNextItem { + id + } + } + }' -f project="$PROJECT_ID" -f pr="$PR_ID" --jq '.data.addProjectNextItem.projectNextItem.id')" + + echo 'ITEM_ID='$item_id >> $GITHUB_ENV + + - name: Set "Type" to the PR + env: + GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}} + run: | + gh api graphql -f query=' + mutation ($project: ID!, $item: ID!, $field: ID!, $opt_id: ID!) { + updateProjectNextItemField(input: { + projectId: $project + itemId: $item + fieldId: $field + value: $opt_id + }) { + projectNextItem { + id + } + } + }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$TYPE_ID" -f opt_id="$OPTION_PR" --silent From 8e7e195b910476cb1e11af83fb058c1759cbf9d3 Mon Sep 17 00:00:00 2001 From: hossainemruz Date: Fri, 29 Oct 2021 05:02:56 +0600 Subject: [PATCH 07/24] Fix issue workflow Signed-off-by: hossainemruz --- .github/workflows/project-automation-issue.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/project-automation-issue.yaml b/.github/workflows/project-automation-issue.yaml index 79875cd..20ab903 100644 --- a/.github/workflows/project-automation-issue.yaml +++ b/.github/workflows/project-automation-issue.yaml @@ -51,7 +51,7 @@ jobs: id } } - }' -f project="$PROJECT_ID" -f pr="$ISSUE_ID" --jq '.data.addProjectNextItem.projectNextItem.id')" + }' -f project="$PROJECT_ID" -f issue="$ISSUE_ID" --jq '.data.addProjectNextItem.projectNextItem.id')" echo 'ITEM_ID='$item_id >> $GITHUB_ENV From 32837a09380b4a1faa98edf38967417b9f46ddf5 Mon Sep 17 00:00:00 2001 From: Emruz Hossain Date: Fri, 29 Oct 2021 22:37:46 +0600 Subject: [PATCH 08/24] Fix disqus comment not working on new configuration style (#451) * Fix disqus comment not working on new configuration style Signed-off-by: hossainemruz * Fix LOC badge Signed-off-by: hossainemruz --- README.md | 2 +- layouts/partials/disqus.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index abe7f84..38c63ba 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Netlify Status](https://api.netlify.com/api/v1/badges/b1b93b02-f278-440b-ae1b-304e9f4c4ab5/deploy-status)](https://app.netlify.com/sites/toha/deploys) [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Fhugo-toha%2Ftoha%2Fbadge%3Fref%3Dmain&style=flat)](https://actions-badge.atrox.dev/hugo-toha/toha/goto?ref=main) ![Repository Size](https://img.shields.io/github/repo-size/hugo-toha/toha) -![Lines of Codes](https://img.shields.io/tokei/lines/github/hugo-toha/toha) +![Lines of Codes](https://img.shields.io/tokei/lines/github.com/hugo-toha/toha) ![Contributor](https://img.shields.io/github/contributors/hugo-toha/toha) ![Latest Release](https://img.shields.io/github/v/release/hugo-toha/toha?include_prereleases) ![Last Commit](https://img.shields.io/github/last-commit/hugo-toha/toha) diff --git a/layouts/partials/disqus.html b/layouts/partials/disqus.html index 4ccd9e2..7235257 100644 --- a/layouts/partials/disqus.html +++ b/layouts/partials/disqus.html @@ -1,6 +1,6 @@ {{ $disqusShortName := site.DisqusShortname }} -{{ if site.Params.features.disqus.shortName }} - {{ $disqusShortName = site.Params.features.disqus.shortName }} +{{ if site.Params.features.comment.disqus.shortName }} + {{ $disqusShortName = site.Params.features.comment.disqus.shortName }} {{ end }}
    From 0773fe303eb3593452f56f801a2b3b6cc2ddedd1 Mon Sep 17 00:00:00 2001 From: Emruz Hossain Date: Sat, 30 Oct 2021 02:33:40 +0600 Subject: [PATCH 09/24] Update project automation workflow for PR (#452) * Update project automation workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz --- .github/workflows/project-automation-pr.yaml | 99 +++++++++++++++++++- 1 file changed, 94 insertions(+), 5 deletions(-) diff --git a/.github/workflows/project-automation-pr.yaml b/.github/workflows/project-automation-pr.yaml index 9c1b887..9b65697 100644 --- a/.github/workflows/project-automation-pr.yaml +++ b/.github/workflows/project-automation-pr.yaml @@ -37,8 +37,23 @@ jobs: }' -f org="$ORGANIZATION" -F number=$PROJECT_NUMBER > project_data.json echo 'PROJECT_ID='$(jq -r '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV + + # Read the ID of the "Type" field options echo 'TYPE_ID='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.id' project_data.json) >> $GITHUB_ENV - echo 'OPTION_PR='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Pull Requests") |.id' project_data.json) >> $GITHUB_ENV + echo 'PROJECT_ID='$(jq -r '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV + echo 'TYPE_ID='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.id' project_data.json) >> $GITHUB_ENV + echo 'TYPE_BUG='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Bug") |.id' project_data.json) >> $GITHUB_ENV + echo 'TYPE_FEATURE='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Feature") |.id' project_data.json) >> $GITHUB_ENV + echo 'TYPE_ENHANCEMENT='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Enhancement") |.id' project_data.json) >> $GITHUB_ENV + echo 'TYPE_DOCUMENTATION='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Documentation") |.id' project_data.json) >> $GITHUB_ENV + echo 'TYPE_TRANSLATION='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Translation") |.id' project_data.json) >> $GITHUB_ENV + + # Read the id of the "Status" field options + echo 'STATUS_ID='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.id' project_data.json) >> $GITHUB_ENV + echo 'STATUS_TODO='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Todo") |.id' project_data.json) >> $GITHUB_ENV + echo 'STATUS_IN_PROGRESS='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="In Progress") |.id' project_data.json) >> $GITHUB_ENV + echo 'STATUS_READY_FOR_REVIEW='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Ready for Review") |.id' project_data.json) >> $GITHUB_ENV + echo 'STATUS_DONE='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Done") |.id' project_data.json) >> $GITHUB_ENV - name: Add PR to project env: @@ -56,20 +71,94 @@ jobs: echo 'ITEM_ID='$item_id >> $GITHUB_ENV - - name: Set "Type" to the PR + - name: Export Labels + env: + PR_DATA: ${{ toJson(github.event.pull_request) }} + run: | + echo 'LABELS=($(echo "$PR_DATA" | jq '.labels[]' | jq -r '.name'))<> $GITHUB_ENV + + - name: Set "Type" field env: GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}} run: | + # Only execute this step if the PR contains at least one label + if [ "${#LABELS[@]}" -gt 0 ]; then + + # Let by default the type is "Bug" + OPTION_ID=$TYPE_BUG + + # If it has "feature" label then set the type to "Feature" + if [[ "${LABELS[*]}" =~ "feature" ]]; then + OPTION_ID=$TYPE_FEATURE + fi + + # If it has "enhancement" label then set the type to "Enhancement" + if [[ "${LABELS[*]}" =~ "enhancement" ]]; then + OPTION_ID=$TYPE_ENHANCEMENT + fi + + # If it has "documentation" label then set the type to "Documentation" + if [[ "${LABELS[*]}" =~ "documentation" ]]; then + OPTION_ID=$TYPE_DOCUMENTATION + fi + + # If it has "translation" label then set the type to "Translation" + if [[ "${LABELS[*]}" =~ "translation" ]]; then + OPTION_ID=$TYPE_TRANSLATION + fi + + # Set the "Type" field to appropriate option + gh api graphql -f query=' + mutation ($project: ID!, $item: ID!, $field: ID!, $opt_id: ID!) { + updateProjectNextItemField(input: { + projectId: $project + itemId: $item + fieldId: $field + value: $opt_id + }) { + projectNextItem { + id + } + } + }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$TYPE_ID" -f opt_id="$OPTION_ID" --silent + fi + + - name: Set "Status" field + env: + GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}} + run: | + MERGED=${{github.event.pull_request.merged}} + STATE=${{github.event.pull_request.state}} + REVIEWERS=${{github.event.pull_request.requested_reviewers}} + DRAFT=${{github.event.pull_request.draft}} + + echo "Merged: $MERGED" + echo "State: $STATE" + echo "Draft: $DRAFT" + echo "Reviewer: $REVIEWER" + + OPTION_ID=$STATUS_TODO + + if [[ ("${MERGED}" == "true") || ("${STATUS}" == "closed") ]] + then + OPTION_ID=$STATUS_DONE + elif [[ ${#REVIEWERS[@]} -gt 0 ]] + then + OPTION_ID=$STATUS_READY_FOR_REVIEW + else + OPTION_ID=$STATUS_IN_PROGRESS + fi + gh api graphql -f query=' - mutation ($project: ID!, $item: ID!, $field: ID!, $opt_id: ID!) { + mutation ($project: ID!, $item: ID!, $field: ID!, $status_id: ID!) { updateProjectNextItemField(input: { projectId: $project itemId: $item fieldId: $field - value: $opt_id + value: $status_id }) { projectNextItem { id } } - }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$TYPE_ID" -f opt_id="$OPTION_PR" --silent + }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$STATUS_ID" -f status_id="$OPTION_ID" --silent From 9c8b6bd59bde8426a8f22a5600070c73100d188e Mon Sep 17 00:00:00 2001 From: Emruz Hossain Date: Mon, 1 Nov 2021 22:45:05 +0600 Subject: [PATCH 10/24] Update issue automation workflow --- .../workflows/project-automation-issue.yaml | 82 +++++++++++++++---- 1 file changed, 64 insertions(+), 18 deletions(-) diff --git a/.github/workflows/project-automation-issue.yaml b/.github/workflows/project-automation-issue.yaml index 20ab903..a61eb7f 100644 --- a/.github/workflows/project-automation-issue.yaml +++ b/.github/workflows/project-automation-issue.yaml @@ -8,7 +8,7 @@ on: - labeled - unlabeled jobs: - track_pr: + issue_automation: runs-on: ubuntu-latest steps: - name: Get project data @@ -33,11 +33,24 @@ jobs: } }' -f org="$ORGANIZATION" -F number=$PROJECT_NUMBER > project_data.json + echo 'PROJECT_ID='$(jq -r '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV + + # Read the ID of the "Type" field options + echo 'TYPE_ID='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.id' project_data.json) >> $GITHUB_ENV echo 'PROJECT_ID='$(jq -r '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV echo 'TYPE_ID='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.id' project_data.json) >> $GITHUB_ENV - echo 'OPTION_FR='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Feature Requests") |.id' project_data.json) >> $GITHUB_ENV - echo 'OPTION_BUGS='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Bugs") |.id' project_data.json) >> $GITHUB_ENV - echo 'OPTION_DOC='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Documentation") |.id' project_data.json) >> $GITHUB_ENV + echo 'TYPE_BUG='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Bug") |.id' project_data.json) >> $GITHUB_ENV + echo 'TYPE_FEATURE='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Feature") |.id' project_data.json) >> $GITHUB_ENV + echo 'TYPE_ENHANCEMENT='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Enhancement") |.id' project_data.json) >> $GITHUB_ENV + echo 'TYPE_DOCUMENTATION='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Documentation") |.id' project_data.json) >> $GITHUB_ENV + echo 'TYPE_TRANSLATION='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Type") |.settings | fromjson.options[] | select(.name=="Translation") |.id' project_data.json) >> $GITHUB_ENV + + # Read the id of the "Status" field options + echo 'STATUS_ID='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.id' project_data.json) >> $GITHUB_ENV + echo 'STATUS_TODO='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Todo") |.id' project_data.json) >> $GITHUB_ENV + echo 'STATUS_IN_PROGRESS='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="In Progress") |.id' project_data.json) >> $GITHUB_ENV + echo 'STATUS_READY_FOR_REVIEW='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Ready for Review") |.id' project_data.json) >> $GITHUB_ENV + echo 'STATUS_DONE='$(jq -r '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Done") |.id' project_data.json) >> $GITHUB_ENV - name: Add Issue to project env: @@ -55,21 +68,54 @@ jobs: echo 'ITEM_ID='$item_id >> $GITHUB_ENV - - name: Set "Type" to the Issue + - name: Export Labels + env: + ISSUE_DATA: ${{ toJson(github.event.issue) }} + run: | + echo 'LABELS=($(echo "$ISSUE_DATA" | jq '.labels[]' | jq -r '.name'))<> $GITHUB_ENV + + - name: Set "Type" field env: GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}} run: | - OPTION_ID=$OPTION_BUGS - gh api graphql -f query=' - mutation ($project: ID!, $item: ID!, $field: ID!, $opt_id: ID!) { - updateProjectNextItemField(input: { - projectId: $project - itemId: $item - fieldId: $field - value: $opt_id - }) { - projectNextItem { - id + # Only execute this step if the Issue contains at least one label + if [ "${#LABELS[@]}" -gt 0 ]; then + + # Let by default the type is "Bug" + OPTION_ID=$TYPE_BUG + + # If it has "feature" label then set the type to "Feature" + if [[ "${LABELS[*]}" =~ "feature" ]]; then + OPTION_ID=$TYPE_FEATURE + fi + + # If it has "enhancement" label then set the type to "Enhancement" + if [[ "${LABELS[*]}" =~ "enhancement" ]]; then + OPTION_ID=$TYPE_ENHANCEMENT + fi + + # If it has "documentation" label then set the type to "Documentation" + if [[ "${LABELS[*]}" =~ "documentation" ]]; then + OPTION_ID=$TYPE_DOCUMENTATION + fi + + # If it has "translation" label then set the type to "Translation" + if [[ "${LABELS[*]}" =~ "translation" ]]; then + OPTION_ID=$TYPE_TRANSLATION + fi + + # Set the "Type" field to appropriate option + gh api graphql -f query=' + mutation ($project: ID!, $item: ID!, $field: ID!, $opt_id: ID!) { + updateProjectNextItemField(input: { + projectId: $project + itemId: $item + fieldId: $field + value: $opt_id + }) { + projectNextItem { + id + } } - } - }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$TYPE_ID" -f opt_id="$OPTION_ID" --silent + }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$TYPE_ID" -f opt_id="$OPTION_ID" --silent + fi From b28d8e93cf5764c0fdbd29e15ab6f0f37a464388 Mon Sep 17 00:00:00 2001 From: Emruz Hossain Date: Mon, 1 Nov 2021 23:08:17 +0600 Subject: [PATCH 11/24] Add connected event for issues --- .github/workflows/project-automation-issue.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/project-automation-issue.yaml b/.github/workflows/project-automation-issue.yaml index a61eb7f..91db25d 100644 --- a/.github/workflows/project-automation-issue.yaml +++ b/.github/workflows/project-automation-issue.yaml @@ -7,6 +7,7 @@ on: - closed - labeled - unlabeled + - connected jobs: issue_automation: runs-on: ubuntu-latest From 0d1bd1f9f4d21b746ac8919609d8177f2118d344 Mon Sep 17 00:00:00 2001 From: Emruz Hossain Date: Tue, 2 Nov 2021 00:49:36 +0600 Subject: [PATCH 12/24] Update Issue Automation (#454) * Update Issue Automation Signed-off-by: hossainemruz * Add connected event Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflows Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz --- .../workflows/project-automation-issue.yaml | 43 ++++++++++++++++++- .github/workflows/project-automation-pr.yaml | 7 ++- 2 files changed, 44 insertions(+), 6 deletions(-) diff --git a/.github/workflows/project-automation-issue.yaml b/.github/workflows/project-automation-issue.yaml index 91db25d..dfa5a39 100644 --- a/.github/workflows/project-automation-issue.yaml +++ b/.github/workflows/project-automation-issue.yaml @@ -7,7 +7,6 @@ on: - closed - labeled - unlabeled - - connected jobs: issue_automation: runs-on: ubuntu-latest @@ -73,7 +72,7 @@ jobs: env: ISSUE_DATA: ${{ toJson(github.event.issue) }} run: | - echo 'LABELS=($(echo "$ISSUE_DATA" | jq '.labels[]' | jq -r '.name'))<> $GITHUB_ENV + echo 'LABELS='$(echo "$PR_DATA" | jq -r '[.labels[].name] | join(" ")') >> $GITHUB_ENV - name: Set "Type" field env: @@ -120,3 +119,43 @@ jobs: } }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$TYPE_ID" -f opt_id="$OPTION_ID" --silent fi + + # - name: Set "Status" field + # env: + # GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}} + # run: | + # MERGED=${{github.event.issue.merged}} + # STATE=${{github.event.issue.state}} + # REVIEWERS=${{github.event.issue.requested_reviewers}} + # DRAFT=${{github.event.issue.draft}} + + # echo "Merged: $MERGED" + # echo "State: $STATE" + # echo "Draft: $DRAFT" + # echo "Reviewer: $REVIEWER" + + # OPTION_ID=$STATUS_TODO + + # if [[ ("${MERGED}" == "true") || ("${STATUS}" == "closed") ]] + # then + # OPTION_ID=$STATUS_DONE + # elif [[ ${#REVIEWERS[@]} -gt 0 ]] + # then + # OPTION_ID=$STATUS_READY_FOR_REVIEW + # else + # OPTION_ID=$STATUS_IN_PROGRESS + # fi + + # gh api graphql -f query=' + # mutation ($project: ID!, $item: ID!, $field: ID!, $status_id: ID!) { + # updateProjectNextItemField(input: { + # projectId: $project + # itemId: $item + # fieldId: $field + # value: $status_id + # }) { + # projectNextItem { + # id + # } + # } + # }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$STATUS_ID" -f status_id="$OPTION_ID" --silent diff --git a/.github/workflows/project-automation-pr.yaml b/.github/workflows/project-automation-pr.yaml index 9b65697..01ce933 100644 --- a/.github/workflows/project-automation-pr.yaml +++ b/.github/workflows/project-automation-pr.yaml @@ -9,9 +9,8 @@ on: - closed - labeled - unlabeled - jobs: - track_pr: + pr_automation: runs-on: ubuntu-latest steps: - name: Get project data @@ -75,7 +74,7 @@ jobs: env: PR_DATA: ${{ toJson(github.event.pull_request) }} run: | - echo 'LABELS=($(echo "$PR_DATA" | jq '.labels[]' | jq -r '.name'))<> $GITHUB_ENV + echo 'LABELS='$(echo "$PR_DATA" | jq -r '[.labels[].name] | join(" ")') >> $GITHUB_ENV - name: Set "Type" field env: @@ -143,7 +142,7 @@ jobs: then OPTION_ID=$STATUS_DONE elif [[ ${#REVIEWERS[@]} -gt 0 ]] - then + then OPTION_ID=$STATUS_READY_FOR_REVIEW else OPTION_ID=$STATUS_IN_PROGRESS From b9d6b6612cdfff9cad772e8ccdb9f7ac07b7b7fa Mon Sep 17 00:00:00 2001 From: Emruz Hossain Date: Tue, 2 Nov 2021 00:54:53 +0600 Subject: [PATCH 13/24] Update workflow --- .../workflows/project-automation-issue.yaml | 59 ++++++++----------- .github/workflows/project-automation-pr.yaml | 2 +- 2 files changed, 25 insertions(+), 36 deletions(-) diff --git a/.github/workflows/project-automation-issue.yaml b/.github/workflows/project-automation-issue.yaml index dfa5a39..83b0d32 100644 --- a/.github/workflows/project-automation-issue.yaml +++ b/.github/workflows/project-automation-issue.yaml @@ -120,42 +120,31 @@ jobs: }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$TYPE_ID" -f opt_id="$OPTION_ID" --silent fi - # - name: Set "Status" field - # env: - # GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}} - # run: | - # MERGED=${{github.event.issue.merged}} - # STATE=${{github.event.issue.state}} - # REVIEWERS=${{github.event.issue.requested_reviewers}} - # DRAFT=${{github.event.issue.draft}} + - name: Set "Status" field + env: + GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}} + run: | + STATE=${{github.event.issue.state}} - # echo "Merged: $MERGED" - # echo "State: $STATE" - # echo "Draft: $DRAFT" - # echo "Reviewer: $REVIEWER" + echo "State: $STATE" - # OPTION_ID=$STATUS_TODO + OPTION_ID=$STATUS_TODO - # if [[ ("${MERGED}" == "true") || ("${STATUS}" == "closed") ]] - # then - # OPTION_ID=$STATUS_DONE - # elif [[ ${#REVIEWERS[@]} -gt 0 ]] - # then - # OPTION_ID=$STATUS_READY_FOR_REVIEW - # else - # OPTION_ID=$STATUS_IN_PROGRESS - # fi + if [[ "${STATE}" == "closed" ]] + then + OPTION_ID=$STATUS_DONE + fi - # gh api graphql -f query=' - # mutation ($project: ID!, $item: ID!, $field: ID!, $status_id: ID!) { - # updateProjectNextItemField(input: { - # projectId: $project - # itemId: $item - # fieldId: $field - # value: $status_id - # }) { - # projectNextItem { - # id - # } - # } - # }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$STATUS_ID" -f status_id="$OPTION_ID" --silent + gh api graphql -f query=' + mutation ($project: ID!, $item: ID!, $field: ID!, $status_id: ID!) { + updateProjectNextItemField(input: { + projectId: $project + itemId: $item + fieldId: $field + value: $status_id + }) { + projectNextItem { + id + } + } + }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$STATUS_ID" -f status_id="$OPTION_ID" --silent diff --git a/.github/workflows/project-automation-pr.yaml b/.github/workflows/project-automation-pr.yaml index 01ce933..41b026a 100644 --- a/.github/workflows/project-automation-pr.yaml +++ b/.github/workflows/project-automation-pr.yaml @@ -138,7 +138,7 @@ jobs: OPTION_ID=$STATUS_TODO - if [[ ("${MERGED}" == "true") || ("${STATUS}" == "closed") ]] + if [[ ("${MERGED}" == "true") || ("${STATE}" == "closed") ]] then OPTION_ID=$STATUS_DONE elif [[ ${#REVIEWERS[@]} -gt 0 ]] From cac27fc8c40c71e141920470bf708d6319167dda Mon Sep 17 00:00:00 2001 From: Emruz Hossain Date: Tue, 2 Nov 2021 00:57:38 +0600 Subject: [PATCH 14/24] Fix issue automation workflow --- .github/workflows/project-automation-issue.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/project-automation-issue.yaml b/.github/workflows/project-automation-issue.yaml index 83b0d32..31169c6 100644 --- a/.github/workflows/project-automation-issue.yaml +++ b/.github/workflows/project-automation-issue.yaml @@ -72,7 +72,7 @@ jobs: env: ISSUE_DATA: ${{ toJson(github.event.issue) }} run: | - echo 'LABELS='$(echo "$PR_DATA" | jq -r '[.labels[].name] | join(" ")') >> $GITHUB_ENV + echo 'LABELS='$(echo "$ISSUE_DATA" | jq -r '[.labels[].name] | join(" ")') >> $GITHUB_ENV - name: Set "Type" field env: From 8dbe04b95d54358addcdbecbc4f232151c45794c Mon Sep 17 00:00:00 2001 From: Emruz Hossain Date: Wed, 3 Nov 2021 00:09:45 +0600 Subject: [PATCH 15/24] Add issue parser workflow --- .github/workflows/issue_parser.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/workflows/issue_parser.yaml diff --git a/.github/workflows/issue_parser.yaml b/.github/workflows/issue_parser.yaml new file mode 100644 index 0000000..4ffe81f --- /dev/null +++ b/.github/workflows/issue_parser.yaml @@ -0,0 +1,19 @@ +on: + issue_comment: + types: [created, edited] + +jobs: + parse-comment: + runs-on: ubuntu-latest + name: Parse Comment + steps: + - name: Issue Refs Parser Action + uses: FujiHaruka/issue-refs-parser-action@v1.1 + id: action + with: + body: ${{ github.event.comment.body }} + self_slug: hugo-toha/toha + - name: Get The Outputs + run: | + echo "refs: ${{ steps.action.outputs.refs }}" + echo "external_refs: ${{ steps.action.outputs.external_refs }}" From 5d3f195c0017ce8824c5be059e773a3d9e00268e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Nov 2021 11:09:41 +0000 Subject: [PATCH 16/24] Bump actions/checkout from 2.3.5 to 2.4.0 (#458) Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.5 to 2.4.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.3.5...v2.4.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/autoprefixer.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/md-link-checker.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/autoprefixer.yml b/.github/workflows/autoprefixer.yml index 76efe0b..46a0548 100644 --- a/.github/workflows/autoprefixer.yml +++ b/.github/workflows/autoprefixer.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout to latest commit - uses: actions/checkout@v2.3.5 + uses: actions/checkout@v2.4.0 - name: Setup Node uses: actions/setup-node@v2.4.1 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2c0d9df..89971fe 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,7 +39,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2.3.5 + uses: actions/checkout@v2.4.0 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/md-link-checker.yml b/.github/workflows/md-link-checker.yml index 18b6e6a..e8104c0 100644 --- a/.github/workflows/md-link-checker.yml +++ b/.github/workflows/md-link-checker.yml @@ -8,6 +8,6 @@ jobs: runs-on: ubuntu-latest steps: # checkout to latest commit - - uses: actions/checkout@v2.3.5 + - uses: actions/checkout@v2.4.0 # run markdown linter - uses: gaurav-nelson/github-action-markdown-link-check@1.0.13 From a4e30e80a30f1d58985bd2dd346914c4e01fe2ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Nov 2021 11:04:26 +0000 Subject: [PATCH 17/24] Bump peter-evans/create-pull-request from 3.10.1 to 3.11.0 (#460) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.10.1...v3.11.0) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/autoprefixer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autoprefixer.yml b/.github/workflows/autoprefixer.yml index 46a0548..0b65523 100644 --- a/.github/workflows/autoprefixer.yml +++ b/.github/workflows/autoprefixer.yml @@ -21,7 +21,7 @@ jobs: npm run autoprefixer - name: Create Pull Request - uses: peter-evans/create-pull-request@v3.10.1 + uses: peter-evans/create-pull-request@v3.11.0 with: branch: autoprefixer branch-suffix: timestamp From 3cd9c910f72a67c564836abc13e3bd6b2aa91336 Mon Sep 17 00:00:00 2001 From: Emruz Hossain Date: Fri, 5 Nov 2021 03:18:58 +0600 Subject: [PATCH 18/24] Find Linked Issues to a PR (#456) * Find Linked Issues to a PR Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Add issue parser workflow Signed-off-by: hossainemruz * Add custom action Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update linked_issues workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * update workflow Signed-off-by: hossainemruz * update workflow Signed-off-by: hossainemruz * update workflow Signed-off-by: hossainemruz * update workflow Signed-off-by: hossainemruz * update workflow Signed-off-by: hossainemruz * update workflow Signed-off-by: hossainemruz * update workflow Signed-off-by: hossainemruz * update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz * Update workflow Signed-off-by: hossainemruz --- .github/workflows/issue_parser.yaml | 19 ------- .github/workflows/project-automation-pr.yaml | 56 ++++++++++++++++++++ 2 files changed, 56 insertions(+), 19 deletions(-) delete mode 100644 .github/workflows/issue_parser.yaml diff --git a/.github/workflows/issue_parser.yaml b/.github/workflows/issue_parser.yaml deleted file mode 100644 index 4ffe81f..0000000 --- a/.github/workflows/issue_parser.yaml +++ /dev/null @@ -1,19 +0,0 @@ -on: - issue_comment: - types: [created, edited] - -jobs: - parse-comment: - runs-on: ubuntu-latest - name: Parse Comment - steps: - - name: Issue Refs Parser Action - uses: FujiHaruka/issue-refs-parser-action@v1.1 - id: action - with: - body: ${{ github.event.comment.body }} - self_slug: hugo-toha/toha - - name: Get The Outputs - run: | - echo "refs: ${{ steps.action.outputs.refs }}" - echo "external_refs: ${{ steps.action.outputs.external_refs }}" diff --git a/.github/workflows/project-automation-pr.yaml b/.github/workflows/project-automation-pr.yaml index 41b026a..9d80589 100644 --- a/.github/workflows/project-automation-pr.yaml +++ b/.github/workflows/project-automation-pr.yaml @@ -9,6 +9,7 @@ on: - closed - labeled - unlabeled + - synchronize jobs: pr_automation: runs-on: ubuntu-latest @@ -148,6 +149,9 @@ jobs: OPTION_ID=$STATUS_IN_PROGRESS fi + # Expose the OPTION_ID so that it can be used in later steps + echo 'PR_STATUS='$OPTION_ID >> $GITHUB_ENV + gh api graphql -f query=' mutation ($project: ID!, $item: ID!, $field: ID!, $status_id: ID!) { updateProjectNextItemField(input: { @@ -161,3 +165,55 @@ jobs: } } }' -f project="$PROJECT_ID" -f item="$ITEM_ID" -f field="$STATUS_ID" -f status_id="$OPTION_ID" --silent + + - name: Find Linked Issues + id: linked_issues + uses: hossainemruz/linked-issues@main + with: + pr_url: ${{github.event.pull_request.html_url}} + format: IssueNumber + + - name: Update Linked Issues Status + env: + GITHUB_TOKEN: ${{secrets.PROJECT_AUTOMATION}} + run: | + declare -a issues=(${{ steps.linked_issues.outputs.issues }}) + + # Loop through the every issues and update their Status to same as the PR Status + for i in "${issues[@]}" + do + # Find the Issue ID + ISSUE_ID="$(gh api graphql -f query=' + query($owner: String!, $name: String!, $issue_number: Int!) { + repository(owner: $owner, name: $name) { + issue(number: $issue_number) { + id + } + } + }' -f owner="${{github.event.pull_request.head.repo.owner.login}}" -f name="${{github.event.pull_request.head.repo.name}}" -F issue_number=$i --jq='.data.repository.issue.id')" + + # Find the id of the Issue at the project board + item_id="$( gh api graphql -f query=' + mutation($project:ID!, $pr:ID!) { + addProjectNextItem(input: {projectId: $project, contentId: $pr}) { + projectNextItem { + id + } + } + }' -f project="$PROJECT_ID" -f pr="$ISSUE_ID" --jq '.data.addProjectNextItem.projectNextItem.id')" + + # Update the Issue Status + gh api graphql -f query=' + mutation ($project: ID!, $item: ID!, $field: ID!, $status_id: ID!) { + updateProjectNextItemField(input: { + projectId: $project + itemId: $item + fieldId: $field + value: $status_id + }) { + projectNextItem { + id + } + } + }' -f project="$PROJECT_ID" -f item="$item_id" -f field="$STATUS_ID" -f status_id="$PR_STATUS" --silent + done From 4e029b7de8fc432012f2279e4bcbe65727e4f055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E7=BA=A2=E8=B1=86?= <55517494+ormissia@users.noreply.github.com> Date: Fri, 19 Nov 2021 01:17:46 +0800 Subject: [PATCH 19/24] Add utteranc comment plugin (#465) * add comment plugin utteranc(save message to github issue) config.yml # Enable comment feature. There, should be only one of them. comment: enable: true utteranc: repo: ormissia/ormissia.github.io issueTerm: title theme: github-light * Update utteranc.html --- layouts/_default/single.html | 3 +++ layouts/partials/utteranc.html | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 layouts/partials/utteranc.html diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 2423a98..633fe1f 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -165,6 +165,9 @@ {{ else if .valine }} {{ partial "valine.html" . }} + + {{ else if .utteranc }} + {{ partial "utteranc.html" . }} {{ end }} {{ end }} {{ end }} diff --git a/layouts/partials/utteranc.html b/layouts/partials/utteranc.html new file mode 100644 index 0000000..0bbaaad --- /dev/null +++ b/layouts/partials/utteranc.html @@ -0,0 +1,22 @@ +{{ $repo := site.Params.features.comment.utteranc.repo }} +{{ $issueTerm := site.Params.features.comment.utteranc.issueTerm }} +{{ $theme := site.Params.features.comment.utteranc.theme }} + +
    +
    +
    +
    + From fea093c1879151ada5c29196fa131226ffb1cdde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Nov 2021 11:06:13 +0000 Subject: [PATCH 20/24] Bump actions/setup-node from 2.4.1 to 2.5.0 (#469) Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.4.1 to 2.5.0. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2.4.1...v2.5.0) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/autoprefixer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autoprefixer.yml b/.github/workflows/autoprefixer.yml index 0b65523..59b12ba 100644 --- a/.github/workflows/autoprefixer.yml +++ b/.github/workflows/autoprefixer.yml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v2.4.0 - name: Setup Node - uses: actions/setup-node@v2.4.1 + uses: actions/setup-node@v2.5.0 with: node-version: "15.x" From e3c84e0ba18bfa3a51533c71067e560fac388786 Mon Sep 17 00:00:00 2001 From: Fabio Fenoglio Date: Tue, 7 Dec 2021 18:40:34 +0100 Subject: [PATCH 21/24] Fixed "show-more-btn" toggle logic and added optional "collapseAfter" parameter (#473) * fixed "show-more-btn" toggle logic * allow customization of number of items to show in "taken courses" when before collapsing * renamed treshold param to collapseAfter Co-authored-by: Fabio Fenoglio --- layouts/partials/sections/education-alt.html | 7 ++++--- layouts/partials/sections/education.html | 7 ++++--- static/js/main.js | 18 ++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/layouts/partials/sections/education-alt.html b/layouts/partials/sections/education-alt.html index 2994fc5..7b748c7 100644 --- a/layouts/partials/sections/education-alt.html +++ b/layouts/partials/sections/education-alt.html @@ -53,6 +53,7 @@ {{ end }} {{ if .takenCourses }} + {{ $collapseAfter := .takenCourses.collapseAfter | default 2 }}
    {{ i18n "taken_courses" }}
    {{ if .takenCourses.showGrades }} @@ -65,7 +66,7 @@ {{ range $index,$course := .takenCourses.courses }} - + {{ $course.name }} {{ if not $hideScale }}{{ $course.outOf }}{{ end }} {{ $course.achieved }} @@ -76,11 +77,11 @@ {{ else }}
      {{ range $index,$course := .takenCourses.courses }} -
    • {{ $course.name }}
      • +
    • {{ $course.name }}
      • {{ end }}
    {{ end }} - {{ if gt (len .takenCourses.courses) 2 }} + {{ if gt (len .takenCourses.courses) $collapseAfter }}
    From b5c841295c08ab6a010224e333d193e66f0580b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Dec 2021 11:05:21 +0000 Subject: [PATCH 24/24] Bump peter-evans/create-pull-request from 3.11.0 to 3.12.0 (#476) Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3.11.0 to 3.12.0. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.11.0...v3.12.0) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/autoprefixer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/autoprefixer.yml b/.github/workflows/autoprefixer.yml index 59b12ba..9fcc81c 100644 --- a/.github/workflows/autoprefixer.yml +++ b/.github/workflows/autoprefixer.yml @@ -21,7 +21,7 @@ jobs: npm run autoprefixer - name: Create Pull Request - uses: peter-evans/create-pull-request@v3.11.0 + uses: peter-evans/create-pull-request@v3.12.0 with: branch: autoprefixer branch-suffix: timestamp