From 5cd07f73b71818a0ab60fbdc17b113ca894e2ce4 Mon Sep 17 00:00:00 2001 From: Giacomo Lanza <37865804+Zack-83@users.noreply.github.com> Date: Wed, 6 Dec 2023 10:24:02 +0100 Subject: [PATCH 01/35] Create Roadmap.md --- Roadmap.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 Roadmap.md diff --git a/Roadmap.md b/Roadmap.md new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/Roadmap.md @@ -0,0 +1 @@ + From 7f2a28825686bac2a3ee29855f3df05b3f56c1a8 Mon Sep 17 00:00:00 2001 From: Jochen Klar Date: Tue, 12 Dec 2023 12:28:21 +0100 Subject: [PATCH 02/35] Add mastodon validation link to footer --- _includes/footer.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_includes/footer.html b/_includes/footer.html index 68710005..55e50dab 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -6,6 +6,9 @@

Kontakt

rdmo-contact@listserv.dfn.de

+

+ @rdmo@openbiblio.social +

' milestone.append(html) }) + }).catch(error => { + milestones.append('
The roadmap is currently not available. Please try again later.') + console.error('[error] ' + error) }) } @@ -38,8 +41,6 @@ function time_diff(pref, dat, postf, defr) { } var date1 = new Date(dat) var date2 = new Date() - console.log(date1) - console.log(date2) if (!(date1 instanceof Date && date2 instanceof Date)) { throw new RangeError('Invalid date arguments') } From 4aa5aa23449d53a6b1144ed61e6b3798ec808b6f Mon Sep 17 00:00:00 2001 From: olaf michaelis Date: Tue, 27 Feb 2024 15:30:44 +0100 Subject: [PATCH 33/35] Add milestone state to roadmap --- css/roadmap.css | 38 ++++++++++++++++++++++++++++++++++++++ js/roadmap.js | 22 ++++++++++++++-------- 2 files changed, 52 insertions(+), 8 deletions(-) diff --git a/css/roadmap.css b/css/roadmap.css index d6d68165..f6d87844 100644 --- a/css/roadmap.css +++ b/css/roadmap.css @@ -1,3 +1,12 @@ +#milestones .fl { + float: left; + margin-right: 20px; +} + +#milestones .fl:last-child:after { + margin-right: 4px; +} + .milestone { display: inline-block; width: 100%; @@ -6,6 +15,20 @@ padding: 15px; } +.milestone .header { + display: flex; + width: 100% +} + +.milestone .header h2 { + float: left; + margin: 0 10px 10px 0; +} + +.milestone .header h3 { + margin: 5px; +} + .milestone span { margin-right: 20px; } @@ -21,3 +44,18 @@ .milestone-meta { float: left; } + +.milestone-meta div:first-of-type { + margin-left: 5px; +} + + +.milestone-meta .fl { + float: left; + margin: 0px 20px 0px 0px; +} + +.milestone-stats div:last-of-type { + float: right; + margin-right: 5px; +} diff --git a/js/roadmap.js b/js/roadmap.js index 3317579f..573bb695 100644 --- a/js/roadmap.js +++ b/js/roadmap.js @@ -5,8 +5,9 @@ async function fetch_json(url) { } function render_milestones() { + var api_url = 'https://api.github.com/repos/rdmorganiser/rdmo/milestones' var milestones = $('#milestones') - fetch_json('https://api.github.com/repos/rdmorganiser/rdmo/milestones') + fetch_json(api_url) .then(res => { res.sort((a, b) => parseFloat(a.updated_at) - parseFloat(b.updated_at)) return res @@ -16,15 +17,20 @@ function render_milestones() { milestones.append('
') var sel = '.milestone' + '.' + el.id var milestone = $(sel) - var html = '' + + var html = '
' + html += '

' + el.title + '

' + html += '

(' + el.state + ')

' + html += '
' + // var html = '' html += '
' - html += '' + time_diff('due by', el.due_on, '', 'no due date') + '' - html += '' + time_diff('updated', el.updated_at, 'ago', '') + '' + html += '
' + time_diff('due by', el.due_on, '', 'no due date') + '
' + html += '
' + time_diff('updated', el.updated_at, 'ago', '') + '
' html += '
' - html += '
' - html += 'open issues ' + el.open_issues + '' - html += 'closed issues ' + el.closed_issues + '' + html += '
' + html += '
open issues ' + el.open_issues + '
' + html += '
closed issues ' + el.closed_issues + '
' html += '
' html += '
' milestone.append(html) From 7452a9f1629aba020b0a7b43e73e2a4c6ca29de5 Mon Sep 17 00:00:00 2001 From: olaf michaelis Date: Tue, 27 Feb 2024 17:22:34 +0100 Subject: [PATCH 34/35] Add milestones links --- js/roadmap.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/js/roadmap.js b/js/roadmap.js index 573bb695..590acf1f 100644 --- a/js/roadmap.js +++ b/js/roadmap.js @@ -19,11 +19,9 @@ function render_milestones() { var milestone = $(sel) var html = '
' - html += '

' + el.title + '

' + html += '

' + el.title + '

' html += '

(' + el.state + ')

' html += '
' - // var html = '' html += '
' html += '
' + time_diff('due by', el.due_on, '', 'no due date') + '
' html += '
' + time_diff('updated', el.updated_at, 'ago', '') + '
' From 9a489dddc36af8174f17c19a53075036c7362ff5 Mon Sep 17 00:00:00 2001 From: olaf michaelis Date: Tue, 27 Feb 2024 17:40:12 +0100 Subject: [PATCH 35/35] Reduce tile margin --- css/roadmap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/roadmap.css b/css/roadmap.css index f6d87844..09d0573d 100644 --- a/css/roadmap.css +++ b/css/roadmap.css @@ -11,7 +11,7 @@ display: inline-block; width: 100%; border: 1px solid #ccc; - margin: 20px 0px; + margin: 14px 0px; padding: 15px; }