titles on chart pages

This commit is contained in:
Radek Stepan 2014-09-19 20:33:25 -07:00
parent 4f2bf6ef36
commit 85e947fb87
14 changed files with 227 additions and 196 deletions

View File

@ -15,6 +15,8 @@ GitHub Burndown Chart as a service. Public repos are free, for private access au
### The 20% ### The 20%
- [ ] deal with no due date milestones - always on track
- [ ] be able to go back to homepage
- [ ] calculate left margin based on the total number of points text width - [ ] calculate left margin based on the total number of points text width
- [ ] Do not show login/logged-in state when we are still fetching that information from Firebase - [ ] Do not show login/logged-in state when we are still fetching that information from Firebase
- [ ] Handle 404 on routes; from catch all check if '/' or go 404 controller - [ ] Handle 404 on routes; from catch all check if '/' or go 404 controller
@ -23,6 +25,7 @@ GitHub Burndown Chart as a service. Public repos are free, for private access au
- [ ] Check that we have not run out of requests to make - [ ] Check that we have not run out of requests to make
- [ ] Show loading sign on top of [browser window](https://github.com/buunguyen/topbar) which is unobtrusive enough we can show it immediately. - [ ] Show loading sign on top of [browser window](https://github.com/buunguyen/topbar) which is unobtrusive enough we can show it immediately.
- [ ] show a countdown clock towards the end of the milestone or show overdue - [ ] show a countdown clock towards the end of the milestone or show overdue
- [x] show title on the chart page
- [x] work for `mbostock/d3` - [x] work for `mbostock/d3`
- [x] allow people to go straight to a URL that fetches the repo, if public, for them; to demo our app without adding a repo (add it behind the scenes); *req* cache repos - [x] allow people to go straight to a URL that fetches the repo, if public, for them; to demo our app without adding a repo (add it behind the scenes); *req* cache repos
- [x] closed issues can be moved to a newly created milestone, this messes up the chart since we assume milestone is created first! - [x] closed issues can be moved to a newly created milestone, this messes up the chart since we assume milestone is created first!

View File

@ -474,9 +474,9 @@ ul li{display:inline-block}
#head .right{float:right;margin-right:20px;line-height:64px;color:#e0808d;} #head .right{float:right;margin-right:20px;line-height:64px;color:#e0808d;}
#head .right a{-webkit-border-radius:2px;border-radius:2px;background:#ffbb2a;color:#c1041c;padding:11px 20px} #head .right a{-webkit-border-radius:2px;border-radius:2px;background:#ffbb2a;color:#c1041c;padding:11px 20px}
#title{border-bottom:3px solid #f3f4f8;} #title{border-bottom:3px solid #f3f4f8;}
#title h2{border-bottom:3px solid #aaafbf;margin:30px 0 -3px 0;display:inline-block;padding-bottom:20px} #title .title{border-bottom:3px solid #aaafbf;margin:30px 0 -3px 0;display:inline-block;padding-bottom:20px}
#title .milestone{font-size:16px;font-weight:bold;margin:0 20px} #title .sub{font-size:16px;font-weight:bold;margin:0 20px}
#title .description{display:inline-block;font-family:'MuseoSlab500Regular',serif;color:#b1b6c4} #title .description{display:inline-block;font-family:'MuseoSlab500Regular',serif;white-space:nowrap;color:#b1b6c4}
#content{padding:20px;margin-top:20px;} #content{padding:20px;margin-top:20px;}
#content #hero{background:url("../img/hires/2.jpg") center;-webkit-background-size:cover;-moz-background-size:cover;background-size:cover;-webkit-border-radius:2px;border-radius:2px;margin-bottom:30px;} #content #hero{background:url("../img/hires/2.jpg") center;-webkit-background-size:cover;-moz-background-size:cover;background-size:cover;-webkit-border-radius:2px;border-radius:2px;margin-bottom:30px;}
#content #hero .content{-webkit-border-radius:2px;border-radius:2px;color:#fff;padding:30px;background:rgba(0,0,0,0.3);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.2);box-shadow:inset 0 1px 2px rgba(0,0,0,0.2);} #content #hero .content{-webkit-border-radius:2px;border-radius:2px;color:#fff;padding:30px;background:rgba(0,0,0,0.3);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.2);box-shadow:inset 0 1px 2px rgba(0,0,0,0.2);}

View File

@ -67,9 +67,9 @@ ul li{display:inline-block}
#head .right{float:right;margin-right:20px;line-height:64px;color:#e0808d;} #head .right{float:right;margin-right:20px;line-height:64px;color:#e0808d;}
#head .right a{-webkit-border-radius:2px;border-radius:2px;background:#ffbb2a;color:#c1041c;padding:11px 20px} #head .right a{-webkit-border-radius:2px;border-radius:2px;background:#ffbb2a;color:#c1041c;padding:11px 20px}
#title{border-bottom:3px solid #f3f4f8;} #title{border-bottom:3px solid #f3f4f8;}
#title h2{border-bottom:3px solid #aaafbf;margin:30px 0 -3px 0;display:inline-block;padding-bottom:20px} #title .title{border-bottom:3px solid #aaafbf;margin:30px 0 -3px 0;display:inline-block;padding-bottom:20px}
#title .milestone{font-size:16px;font-weight:bold;margin:0 20px} #title .sub{font-size:16px;font-weight:bold;margin:0 20px}
#title .description{display:inline-block;font-family:'MuseoSlab500Regular',serif;color:#b1b6c4} #title .description{display:inline-block;font-family:'MuseoSlab500Regular',serif;white-space:nowrap;color:#b1b6c4}
#content{padding:20px;margin-top:20px;} #content{padding:20px;margin-top:20px;}
#content #hero{background:url("../img/hires/2.jpg") center;-webkit-background-size:cover;-moz-background-size:cover;background-size:cover;-webkit-border-radius:2px;border-radius:2px;margin-bottom:30px;} #content #hero{background:url("../img/hires/2.jpg") center;-webkit-background-size:cover;-moz-background-size:cover;background-size:cover;-webkit-border-radius:2px;border-radius:2px;margin-bottom:30px;}
#content #hero .content{-webkit-border-radius:2px;border-radius:2px;color:#fff;padding:30px;background:rgba(0,0,0,0.3);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.2);box-shadow:inset 0 1px 2px rgba(0,0,0,0.2);} #content #hero .content{-webkit-border-radius:2px;border-radius:2px;color:#fff;padding:30px;background:rgba(0,0,0,0.3);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.2);box-shadow:inset 0 1px 2px rgba(0,0,0,0.2);}

View File

@ -40452,52 +40452,45 @@ if (typeof exports === 'object') {
}); });
// milestones.coffee // milestone.coffee
root.require.register('burnchart/src/modules/milestones.js', function(exports, require, module) { root.require.register('burnchart/src/modules/milestone.js', function(exports, require, module) {
var request; var request;
request = require('./request'); request = require('./request');
module.exports = function(repo, cb) { module.exports = {
var parse; get: function(repo, cb) {
parse = function(data) { if (repo.milestone) {
if (data.description) { return request.oneMilestone(repo, repo.milestone, function(err, m) {
data.description = marked(data.description).slice(3, -5); if (err) {
} return cb(err);
return data; }
}; if (m.open_issues + m.closed_issues === 0) {
if (repo.milestone) { return cb(null, "No issues for milestone `" + m.title + "`");
return request.oneMilestone(repo, repo.milestone, function(err, m) { }
if (err) { return cb(null, null, m);
return cb(err);
}
if (m.open_issues + m.closed_issues === 0) {
return cb(null, "No issues for milestone `" + m.title + "`");
}
m = parse(m);
return cb(null, null, m);
});
} else {
return request.allMilestones(repo, function(err, data) {
var m;
if (err) {
return cb(err);
}
if (!data.length) {
return cb(null, "No open milestones for repo " + repo.path);
}
m = data[0];
m = _.rest(data, {
'due_on': null
}); });
m = m[0] ? m[0] : data[0]; } else {
if (m.open_issues + m.closed_issues === 0) { return request.allMilestones(repo, function(err, data) {
return cb(null, "No issues for milestone `" + m.title + "`"); var m;
} if (err) {
m = parse(m); return cb(err);
return cb(null, null, m); }
}); if (!data.length) {
return cb(null, "No open milestones for repo " + repo.path);
}
m = data[0];
m = _.rest(data, {
'due_on': null
});
m = m[0] ? m[0] : data[0];
if (m.open_issues + m.closed_issues === 0) {
return cb(null, "No issues for milestone `" + m.title + "`");
}
return cb(null, null, m);
});
}
} }
}; };
@ -40506,9 +40499,7 @@ if (typeof exports === 'object') {
// project.coffee // project.coffee
root.require.register('burnchart/src/modules/project.js', function(exports, require, module) { root.require.register('burnchart/src/modules/project.js', function(exports, require, module) {
var chart, issues, milestones; var chart, issues;
milestones = require('./milestones');
issues = require('./issues'); issues = require('./issues');
@ -40517,17 +40508,6 @@ if (typeof exports === 'object') {
module.exports = function(opts, cb) { module.exports = function(opts, cb) {
return async.waterfall([ return async.waterfall([
function(cb) { function(cb) {
return milestones(opts, function(err, warn, milestone) {
if (err) {
return cb(err);
}
if (warn) {
return cb(warn);
}
opts.milestone = milestone;
return cb(null);
});
}, function(cb) {
return issues.get_all(opts, cb); return issues.get_all(opts, cb);
}, function(all, cb) { }, function(all, cb) {
return async.map(all, function(array, cb) { return async.map(all, function(array, cb) {
@ -40756,19 +40736,19 @@ if (typeof exports === 'object') {
// index.mustache // index.mustache
root.require.register('burnchart/src/templates/pages/index.js', function(exports, require, module) { root.require.register('burnchart/src/templates/pages/index.js', function(exports, require, module) {
module.exports = ["<div id=\"title\">"," <div class=\"wrap\">"," <h2>Disposable Project</h2>"," <span class=\"milestone\">Milestone 1.0</span>"," <p class=\"description\">The one where we deliver all that we promised.</p>"," </div>","</div>","","<div id=\"content\" class=\"wrap\">"," <Hero/>"," <Projects/>","</div>"].join("\n"); module.exports = ["<div id=\"content\" class=\"wrap\">"," <Hero/>"," <Projects/>","</div>"].join("\n");
}); });
// showChart.mustache // showChart.mustache
root.require.register('burnchart/src/templates/pages/showChart.js', function(exports, require, module) { root.require.register('burnchart/src/templates/pages/showChart.js', function(exports, require, module) {
module.exports = ["<div id=\"content\" class=\"wrap\">"," <div id=\"chart\">"," <div id=\"svg\"></div>"," </div>","</div>"].join("\n"); module.exports = ["<div id=\"title\">"," <div class=\"wrap\">"," <h2 class=\"title\">{{ milestone.title }}</h2>"," <span class=\"sub\">{{ format.due(milestone.due_on) }}</span>"," <p class=\"description\">{{{ format.markdown(milestone.description) }}}</p>"," </div>","</div>","","<div id=\"content\" class=\"wrap\">"," <div id=\"chart\">"," <div id=\"svg\"></div>"," </div>","</div>"].join("\n");
}); });
// projects.mustache // projects.mustache
root.require.register('burnchart/src/templates/projects.js', function(exports, require, module) { root.require.register('burnchart/src/templates/projects.js', function(exports, require, module) {
module.exports = ["{{#projects.list.length}}"," <div id=\"projects\">"," <div class=\"header\">"," <a href=\"#\" class=\"sort\"><span class=\"icon sort-alphabet\"></span> Sorted by priority</a>"," <h2>Projects</h2>"," </div>",""," <table>"," {{#projects.list}}"," {{#milestones}}"," <tr>"," <td><a class=\"repo\">{{owner}}/{{name}}</a></td>"," <td>"," <a class=\"milestone\" href=\"#chart/{{owner}}/{{name}}/{{number}}\">{{ title }}</a>"," </td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">{{Math.floor(format.progress(closed_issues, open_issues))}}%</span>"," <span class=\"due\">due {{format.fromNow(due_on)}}</span>"," <div class=\"outer bar\">"," <div class=\"inner bar {{format.onTime(this)}}\" style=\"width:{{format.progress(closed_issues, open_issues)}}%\"></div>"," </div>"," </div>"," </td>"," </tr>"," {{/milestones}}"," {{/projects.list}}",""," <!--"," <tr>"," <td><a class=\"repo\" href=\"#\">radekstepan/disposable</a></td>"," <td><span class=\"milestone\">Milestone 1.0 <span class=\"icon down-open\"></span></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">40%</span>"," <span class=\"due\">due on Friday</span>"," <div class=\"outer bar\">"," <div class=\"inner bar red\" style=\"width:40%\"></div>"," </div>"," </div>"," </td>"," </tr>"," <tr class=\"done\">"," <td><a class=\"repo\" href=\"#\">radekstepan/burnchart</a></td>"," <td><span class=\"milestone\">Beta Milestone <span class=\"icon down-open\"></span></a></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">100%</span>"," <span class=\"due\">due tomorrow</span>"," <div class=\"outer bar\">"," <div class=\"inner bar green\" style=\"width:100%\"></div>"," </div>"," </div>"," </td>"," </tr>"," <tr>"," <td><a class=\"repo\" href=\"#\">intermine/intermine</a></td>"," <td><span class=\"milestone\">Emma Release 96 <span class=\"icon down-open\"></span></a></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">27%</span>"," <span class=\"due\">due in 2 weeks</span>"," <div class=\"outer bar\">"," <div class=\"inner bar red\" style=\"width:27%\"></div>"," </div>"," </div>"," </td>"," </tr>"," <tr>"," <td><a class=\"repo\" href=\"#\">microsoft/windows</a></td>"," <td><span class=\"milestone\">RC 9 <span class=\"icon down-open\"></span></a></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">90%</span>"," <span class=\"due red\">overdue by a month</span>"," <div class=\"outer bar\">"," <div class=\"inner bar red\" style=\"width:90%\"></div>"," </div>"," </div>"," </td>"," </tr>"," -->"," </table>",""," <div class=\"footer\">"," <a href=\"#\"><span class=\"icon cog\"></span> Edit</a>"," </div>"," </div>","{{/projects.list}}"].join("\n"); module.exports = ["{{#projects.list.length}}"," <div id=\"projects\">"," <div class=\"header\">"," <a href=\"#\" class=\"sort\"><span class=\"icon sort-alphabet\"></span> Sorted by priority</a>"," <h2>Projects</h2>"," </div>",""," <table>"," {{#projects.list}}"," {{#milestones}}"," <tr>"," <td><a class=\"repo\">{{owner}}/{{name}}</a></td>"," <td>"," <a class=\"milestone\" href=\"#chart/{{owner}}/{{name}}/{{number}}\">{{ title }}</a>"," </td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">{{Math.floor(format.progress(closed_issues, open_issues))}}%</span>"," <span class=\"due\">{{format.due(due_on)}}</span>"," <div class=\"outer bar\">"," <div class=\"inner bar {{format.onTime(this)}}\" style=\"width:{{format.progress(closed_issues, open_issues)}}%\"></div>"," </div>"," </div>"," </td>"," </tr>"," {{/milestones}}"," {{/projects.list}}",""," <!--"," <tr>"," <td><a class=\"repo\" href=\"#\">radekstepan/disposable</a></td>"," <td><span class=\"milestone\">Milestone 1.0 <span class=\"icon down-open\"></span></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">40%</span>"," <span class=\"due\">due on Friday</span>"," <div class=\"outer bar\">"," <div class=\"inner bar red\" style=\"width:40%\"></div>"," </div>"," </div>"," </td>"," </tr>"," <tr class=\"done\">"," <td><a class=\"repo\" href=\"#\">radekstepan/burnchart</a></td>"," <td><span class=\"milestone\">Beta Milestone <span class=\"icon down-open\"></span></a></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">100%</span>"," <span class=\"due\">due tomorrow</span>"," <div class=\"outer bar\">"," <div class=\"inner bar green\" style=\"width:100%\"></div>"," </div>"," </div>"," </td>"," </tr>"," <tr>"," <td><a class=\"repo\" href=\"#\">intermine/intermine</a></td>"," <td><span class=\"milestone\">Emma Release 96 <span class=\"icon down-open\"></span></a></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">27%</span>"," <span class=\"due\">due in 2 weeks</span>"," <div class=\"outer bar\">"," <div class=\"inner bar red\" style=\"width:27%\"></div>"," </div>"," </div>"," </td>"," </tr>"," <tr>"," <td><a class=\"repo\" href=\"#\">microsoft/windows</a></td>"," <td><span class=\"milestone\">RC 9 <span class=\"icon down-open\"></span></a></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">90%</span>"," <span class=\"due red\">overdue by a month</span>"," <div class=\"outer bar\">"," <div class=\"inner bar red\" style=\"width:90%\"></div>"," </div>"," </div>"," </td>"," </tr>"," -->"," </table>",""," <div class=\"footer\">"," <a href=\"#\"><span class=\"icon cog\"></span> Edit</a>"," </div>"," </div>","{{/projects.list}}"].join("\n");
}); });
// date.coffee // date.coffee
@ -40800,7 +40780,13 @@ if (typeof exports === 'object') {
}), }),
'fromNow': _.memoize(function(jsonDate) { 'fromNow': _.memoize(function(jsonDate) {
return moment(new Date(jsonDate)).fromNow(); return moment(new Date(jsonDate)).fromNow();
}) }),
'due': function(jsonDate) {
return ['due', this.fromNow(jsonDate)].join(' ');
},
'markdown': function(markup) {
return marked(markup);
}
}; };
}); });
@ -40952,15 +40938,40 @@ if (typeof exports === 'object') {
// showChart.coffee // showChart.coffee
root.require.register('burnchart/src/views/pages/showChart.js', function(exports, require, module) { root.require.register('burnchart/src/views/pages/showChart.js', function(exports, require, module) {
var project; var format, milestone, project;
milestone = require('../../modules/milestone');
project = require('../../modules/project'); project = require('../../modules/project');
format = require('../../utils/format');
module.exports = Ractive.extend({ module.exports = Ractive.extend({
'template': require('../../templates/pages/showChart'), 'template': require('../../templates/pages/showChart'),
'adapt': [Ractive.adaptors.Ractive], 'adapt': [Ractive.adaptors.Ractive],
'data': {
format: format
},
init: function() { init: function() {
return project(this.get('route')); var route,
_this = this;
route = this.get('route');
return milestone.get(route, function(err, warn, obj) {
if (err) {
throw err;
}
if (warn) {
throw warn;
}
_this.set('milestone', obj);
route.milestone = obj;
return project(route, function(err) {
if (err) {
throw err;
}
return console.log('Done');
});
});
} }
}); });

View File

@ -486,52 +486,45 @@
}); });
// milestones.coffee // milestone.coffee
root.require.register('burnchart/src/modules/milestones.js', function(exports, require, module) { root.require.register('burnchart/src/modules/milestone.js', function(exports, require, module) {
var request; var request;
request = require('./request'); request = require('./request');
module.exports = function(repo, cb) { module.exports = {
var parse; get: function(repo, cb) {
parse = function(data) { if (repo.milestone) {
if (data.description) { return request.oneMilestone(repo, repo.milestone, function(err, m) {
data.description = marked(data.description).slice(3, -5); if (err) {
} return cb(err);
return data; }
}; if (m.open_issues + m.closed_issues === 0) {
if (repo.milestone) { return cb(null, "No issues for milestone `" + m.title + "`");
return request.oneMilestone(repo, repo.milestone, function(err, m) { }
if (err) { return cb(null, null, m);
return cb(err);
}
if (m.open_issues + m.closed_issues === 0) {
return cb(null, "No issues for milestone `" + m.title + "`");
}
m = parse(m);
return cb(null, null, m);
});
} else {
return request.allMilestones(repo, function(err, data) {
var m;
if (err) {
return cb(err);
}
if (!data.length) {
return cb(null, "No open milestones for repo " + repo.path);
}
m = data[0];
m = _.rest(data, {
'due_on': null
}); });
m = m[0] ? m[0] : data[0]; } else {
if (m.open_issues + m.closed_issues === 0) { return request.allMilestones(repo, function(err, data) {
return cb(null, "No issues for milestone `" + m.title + "`"); var m;
} if (err) {
m = parse(m); return cb(err);
return cb(null, null, m); }
}); if (!data.length) {
return cb(null, "No open milestones for repo " + repo.path);
}
m = data[0];
m = _.rest(data, {
'due_on': null
});
m = m[0] ? m[0] : data[0];
if (m.open_issues + m.closed_issues === 0) {
return cb(null, "No issues for milestone `" + m.title + "`");
}
return cb(null, null, m);
});
}
} }
}; };
@ -540,9 +533,7 @@
// project.coffee // project.coffee
root.require.register('burnchart/src/modules/project.js', function(exports, require, module) { root.require.register('burnchart/src/modules/project.js', function(exports, require, module) {
var chart, issues, milestones; var chart, issues;
milestones = require('./milestones');
issues = require('./issues'); issues = require('./issues');
@ -551,17 +542,6 @@
module.exports = function(opts, cb) { module.exports = function(opts, cb) {
return async.waterfall([ return async.waterfall([
function(cb) { function(cb) {
return milestones(opts, function(err, warn, milestone) {
if (err) {
return cb(err);
}
if (warn) {
return cb(warn);
}
opts.milestone = milestone;
return cb(null);
});
}, function(cb) {
return issues.get_all(opts, cb); return issues.get_all(opts, cb);
}, function(all, cb) { }, function(all, cb) {
return async.map(all, function(array, cb) { return async.map(all, function(array, cb) {
@ -790,19 +770,19 @@
// index.mustache // index.mustache
root.require.register('burnchart/src/templates/pages/index.js', function(exports, require, module) { root.require.register('burnchart/src/templates/pages/index.js', function(exports, require, module) {
module.exports = ["<div id=\"title\">"," <div class=\"wrap\">"," <h2>Disposable Project</h2>"," <span class=\"milestone\">Milestone 1.0</span>"," <p class=\"description\">The one where we deliver all that we promised.</p>"," </div>","</div>","","<div id=\"content\" class=\"wrap\">"," <Hero/>"," <Projects/>","</div>"].join("\n"); module.exports = ["<div id=\"content\" class=\"wrap\">"," <Hero/>"," <Projects/>","</div>"].join("\n");
}); });
// showChart.mustache // showChart.mustache
root.require.register('burnchart/src/templates/pages/showChart.js', function(exports, require, module) { root.require.register('burnchart/src/templates/pages/showChart.js', function(exports, require, module) {
module.exports = ["<div id=\"content\" class=\"wrap\">"," <div id=\"chart\">"," <div id=\"svg\"></div>"," </div>","</div>"].join("\n"); module.exports = ["<div id=\"title\">"," <div class=\"wrap\">"," <h2 class=\"title\">{{ milestone.title }}</h2>"," <span class=\"sub\">{{ format.due(milestone.due_on) }}</span>"," <p class=\"description\">{{{ format.markdown(milestone.description) }}}</p>"," </div>","</div>","","<div id=\"content\" class=\"wrap\">"," <div id=\"chart\">"," <div id=\"svg\"></div>"," </div>","</div>"].join("\n");
}); });
// projects.mustache // projects.mustache
root.require.register('burnchart/src/templates/projects.js', function(exports, require, module) { root.require.register('burnchart/src/templates/projects.js', function(exports, require, module) {
module.exports = ["{{#projects.list.length}}"," <div id=\"projects\">"," <div class=\"header\">"," <a href=\"#\" class=\"sort\"><span class=\"icon sort-alphabet\"></span> Sorted by priority</a>"," <h2>Projects</h2>"," </div>",""," <table>"," {{#projects.list}}"," {{#milestones}}"," <tr>"," <td><a class=\"repo\">{{owner}}/{{name}}</a></td>"," <td>"," <a class=\"milestone\" href=\"#chart/{{owner}}/{{name}}/{{number}}\">{{ title }}</a>"," </td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">{{Math.floor(format.progress(closed_issues, open_issues))}}%</span>"," <span class=\"due\">due {{format.fromNow(due_on)}}</span>"," <div class=\"outer bar\">"," <div class=\"inner bar {{format.onTime(this)}}\" style=\"width:{{format.progress(closed_issues, open_issues)}}%\"></div>"," </div>"," </div>"," </td>"," </tr>"," {{/milestones}}"," {{/projects.list}}",""," <!--"," <tr>"," <td><a class=\"repo\" href=\"#\">radekstepan/disposable</a></td>"," <td><span class=\"milestone\">Milestone 1.0 <span class=\"icon down-open\"></span></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">40%</span>"," <span class=\"due\">due on Friday</span>"," <div class=\"outer bar\">"," <div class=\"inner bar red\" style=\"width:40%\"></div>"," </div>"," </div>"," </td>"," </tr>"," <tr class=\"done\">"," <td><a class=\"repo\" href=\"#\">radekstepan/burnchart</a></td>"," <td><span class=\"milestone\">Beta Milestone <span class=\"icon down-open\"></span></a></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">100%</span>"," <span class=\"due\">due tomorrow</span>"," <div class=\"outer bar\">"," <div class=\"inner bar green\" style=\"width:100%\"></div>"," </div>"," </div>"," </td>"," </tr>"," <tr>"," <td><a class=\"repo\" href=\"#\">intermine/intermine</a></td>"," <td><span class=\"milestone\">Emma Release 96 <span class=\"icon down-open\"></span></a></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">27%</span>"," <span class=\"due\">due in 2 weeks</span>"," <div class=\"outer bar\">"," <div class=\"inner bar red\" style=\"width:27%\"></div>"," </div>"," </div>"," </td>"," </tr>"," <tr>"," <td><a class=\"repo\" href=\"#\">microsoft/windows</a></td>"," <td><span class=\"milestone\">RC 9 <span class=\"icon down-open\"></span></a></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">90%</span>"," <span class=\"due red\">overdue by a month</span>"," <div class=\"outer bar\">"," <div class=\"inner bar red\" style=\"width:90%\"></div>"," </div>"," </div>"," </td>"," </tr>"," -->"," </table>",""," <div class=\"footer\">"," <a href=\"#\"><span class=\"icon cog\"></span> Edit</a>"," </div>"," </div>","{{/projects.list}}"].join("\n"); module.exports = ["{{#projects.list.length}}"," <div id=\"projects\">"," <div class=\"header\">"," <a href=\"#\" class=\"sort\"><span class=\"icon sort-alphabet\"></span> Sorted by priority</a>"," <h2>Projects</h2>"," </div>",""," <table>"," {{#projects.list}}"," {{#milestones}}"," <tr>"," <td><a class=\"repo\">{{owner}}/{{name}}</a></td>"," <td>"," <a class=\"milestone\" href=\"#chart/{{owner}}/{{name}}/{{number}}\">{{ title }}</a>"," </td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">{{Math.floor(format.progress(closed_issues, open_issues))}}%</span>"," <span class=\"due\">{{format.due(due_on)}}</span>"," <div class=\"outer bar\">"," <div class=\"inner bar {{format.onTime(this)}}\" style=\"width:{{format.progress(closed_issues, open_issues)}}%\"></div>"," </div>"," </div>"," </td>"," </tr>"," {{/milestones}}"," {{/projects.list}}",""," <!--"," <tr>"," <td><a class=\"repo\" href=\"#\">radekstepan/disposable</a></td>"," <td><span class=\"milestone\">Milestone 1.0 <span class=\"icon down-open\"></span></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">40%</span>"," <span class=\"due\">due on Friday</span>"," <div class=\"outer bar\">"," <div class=\"inner bar red\" style=\"width:40%\"></div>"," </div>"," </div>"," </td>"," </tr>"," <tr class=\"done\">"," <td><a class=\"repo\" href=\"#\">radekstepan/burnchart</a></td>"," <td><span class=\"milestone\">Beta Milestone <span class=\"icon down-open\"></span></a></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">100%</span>"," <span class=\"due\">due tomorrow</span>"," <div class=\"outer bar\">"," <div class=\"inner bar green\" style=\"width:100%\"></div>"," </div>"," </div>"," </td>"," </tr>"," <tr>"," <td><a class=\"repo\" href=\"#\">intermine/intermine</a></td>"," <td><span class=\"milestone\">Emma Release 96 <span class=\"icon down-open\"></span></a></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">27%</span>"," <span class=\"due\">due in 2 weeks</span>"," <div class=\"outer bar\">"," <div class=\"inner bar red\" style=\"width:27%\"></div>"," </div>"," </div>"," </td>"," </tr>"," <tr>"," <td><a class=\"repo\" href=\"#\">microsoft/windows</a></td>"," <td><span class=\"milestone\">RC 9 <span class=\"icon down-open\"></span></a></td>"," <td>"," <div class=\"progress\">"," <span class=\"percent\">90%</span>"," <span class=\"due red\">overdue by a month</span>"," <div class=\"outer bar\">"," <div class=\"inner bar red\" style=\"width:90%\"></div>"," </div>"," </div>"," </td>"," </tr>"," -->"," </table>",""," <div class=\"footer\">"," <a href=\"#\"><span class=\"icon cog\"></span> Edit</a>"," </div>"," </div>","{{/projects.list}}"].join("\n");
}); });
// date.coffee // date.coffee
@ -834,7 +814,13 @@
}), }),
'fromNow': _.memoize(function(jsonDate) { 'fromNow': _.memoize(function(jsonDate) {
return moment(new Date(jsonDate)).fromNow(); return moment(new Date(jsonDate)).fromNow();
}) }),
'due': function(jsonDate) {
return ['due', this.fromNow(jsonDate)].join(' ');
},
'markdown': function(markup) {
return marked(markup);
}
}; };
}); });
@ -986,15 +972,40 @@
// showChart.coffee // showChart.coffee
root.require.register('burnchart/src/views/pages/showChart.js', function(exports, require, module) { root.require.register('burnchart/src/views/pages/showChart.js', function(exports, require, module) {
var project; var format, milestone, project;
milestone = require('../../modules/milestone');
project = require('../../modules/project'); project = require('../../modules/project');
format = require('../../utils/format');
module.exports = Ractive.extend({ module.exports = Ractive.extend({
'template': require('../../templates/pages/showChart'), 'template': require('../../templates/pages/showChart'),
'adapt': [Ractive.adaptors.Ractive], 'adapt': [Ractive.adaptors.Ractive],
'data': {
format: format
},
init: function() { init: function() {
return project(this.get('route')); var route,
_this = this;
route = this.get('route');
return milestone.get(route, function(err, warn, obj) {
if (err) {
throw err;
}
if (warn) {
throw warn;
}
_this.set('milestone', obj);
route.milestone = obj;
return project(route, function(err) {
if (err) {
throw err;
}
return console.log('Done');
});
});
} }
}); });

View File

@ -0,0 +1,35 @@
#!/usr/bin/env coffee
request = require './request'
module.exports =
# Get current/specified milestone for a repo.
get: (repo, cb) ->
# Get a specific milestone.
if repo.milestone
request.oneMilestone repo, repo.milestone, (err, m) ->
# Errors?
return cb err if err
# Empty milestone?
if m.open_issues + m.closed_issues is 0
return cb null, "No issues for milestone `#{m.title}`"
cb null, null, m
# Get the current milestone out of many.
else
request.allMilestones repo, (err, data) ->
# Errors?
return cb err if err
# Empty warning?
return cb null, "No open milestones for repo #{repo.path}" unless data.length
# The first milestone should be ending soonest.
m = data[0]
# Filter milestones without due date.
m = _.rest data, { 'due_on' : null }
# The first milestone should be ending soonest. Prefer milestones with due dates.
m = if m[0] then m[0] else data[0]
# Empty milestone?
if m.open_issues + m.closed_issues is 0
return cb null, "No issues for milestone `#{m.title}`"
cb null, null, m

View File

@ -1,43 +0,0 @@
#!/usr/bin/env coffee
request = require './request'
# Get current/specified milestone for a repo.
module.exports = (repo, cb) ->
# Has description? Parse GFM.
parse = (data) ->
data.description = marked(data.description)[3...-5] if data.description
data
# Get a specific milestone.
if repo.milestone
request.oneMilestone repo, repo.milestone, (err, m) ->
# Errors?
return cb err if err
# Empty milestone?
if m.open_issues + m.closed_issues is 0
return cb null, "No issues for milestone `#{m.title}`"
# Parse GFM.
m = parse m
cb null, null, m
# Get the current milestone out of many.
else
request.allMilestones repo, (err, data) ->
# Errors?
return cb err if err
# Empty warning?
return cb null, "No open milestones for repo #{repo.path}" unless data.length
# The first milestone should be ending soonest.
m = data[0]
# Filter milestones without due date.
m = _.rest data, { 'due_on' : null }
# The first milestone should be ending soonest. Prefer milestones with due dates.
m = if m[0] then m[0] else data[0]
# Empty milestone?
if m.open_issues + m.closed_issues is 0
return cb null, "No issues for milestone `#{m.title}`"
# Parse GFM.
m = parse m
cb null, null, m

View File

@ -1,21 +1,12 @@
#!/usr/bin/env coffee #!/usr/bin/env coffee
milestones = require './milestones' issues = require './issues'
issues = require './issues' chart = require './chart'
chart = require './chart'
# Setup a project and render it. # Setup a project and render it.
module.exports = (opts, cb) -> module.exports = (opts, cb) ->
# Resolve the milestone.
async.waterfall [ (cb) ->
milestones opts, (err, warn, milestone) ->
return cb err if err
return cb warn if warn
opts.milestone = milestone
cb null
# Get all issues. # Get all issues.
(cb) -> async.waterfall [ (cb) ->
issues.get_all opts, cb issues.get_all opts, cb
# Filter them to labeled ones. # Filter them to labeled ones.

View File

@ -105,13 +105,13 @@ ul
#title #title
border-bottom: 3px solid #F3F4F8 border-bottom: 3px solid #F3F4F8
h2 .title
border-bottom: 3px solid #AAAFBF border-bottom: 3px solid #AAAFBF
margin: 30px 0 -3px 0 margin: 30px 0 -3px 0
display: inline-block display: inline-block
padding-bottom: 20px padding-bottom: 20px
.milestone .sub
font-size: 16px font-size: 16px
font-weight: bold font-weight: bold
margin: 0 20px margin: 0 20px
@ -119,6 +119,7 @@ ul
.description .description
display: inline-block display: inline-block
font-family: $serif_font font-family: $serif_font
white-space: nowrap
color: #B1B6C4 color: #B1B6C4
#content #content

View File

@ -1,11 +1,3 @@
<div id="title">
<div class="wrap">
<h2>Disposable Project</h2>
<span class="milestone">Milestone 1.0</span>
<p class="description">The one where we deliver all that we promised.</p>
</div>
</div>
<div id="content" class="wrap"> <div id="content" class="wrap">
<Hero/> <Hero/>
<Projects/> <Projects/>

View File

@ -1,3 +1,11 @@
<div id="title">
<div class="wrap">
<h2 class="title">{{ milestone.title }}</h2>
<span class="sub">{{ format.due(milestone.due_on) }}</span>
<p class="description">{{{ format.markdown(milestone.description) }}}</p>
</div>
</div>
<div id="content" class="wrap"> <div id="content" class="wrap">
<div id="chart"> <div id="chart">
<div id="svg"></div> <div id="svg"></div>

View File

@ -16,7 +16,7 @@
<td> <td>
<div class="progress"> <div class="progress">
<span class="percent">{{Math.floor(format.progress(closed_issues, open_issues))}}%</span> <span class="percent">{{Math.floor(format.progress(closed_issues, open_issues))}}%</span>
<span class="due">due {{format.fromNow(due_on)}}</span> <span class="due">{{format.due(due_on)}}</span>
<div class="outer bar"> <div class="outer bar">
<div class="inner bar {{format.onTime(this)}}" style="width:{{format.progress(closed_issues, open_issues)}}%"></div> <div class="inner bar {{format.onTime(this)}}" style="width:{{format.progress(closed_issues, open_issues)}}%"></div>
</div> </div>

View File

@ -19,6 +19,14 @@ module.exports =
[ 'red', 'green' ][ +(points > time) ] [ 'red', 'green' ][ +(points > time) ]
# When is this milestone due? # Time from now.
'fromNow': _.memoize (jsonDate) -> 'fromNow': _.memoize (jsonDate) ->
moment(new Date(jsonDate)).fromNow() moment(new Date(jsonDate)).fromNow()
# When is a milestone due?
'due': (jsonDate) ->
[ 'due', @fromNow jsonDate ].join(' ')
# Markdown formatting.
'markdown': (markup) ->
marked markup

View File

@ -1,4 +1,6 @@
project = require '../../modules/project' milestone = require '../../modules/milestone'
project = require '../../modules/project'
format = require '../../utils/format'
module.exports = Ractive.extend module.exports = Ractive.extend
@ -6,5 +8,17 @@ module.exports = Ractive.extend
'adapt': [ Ractive.adaptors.Ractive ] 'adapt': [ Ractive.adaptors.Ractive ]
'data': { format }
init: -> init: ->
project @get 'route' route = @get 'route'
milestone.get route, (err, warn, obj) =>
throw err if err
throw warn if warn
# Save the milestone on the route.
@set 'milestone', obj
route.milestone = obj
project route, (err) ->
throw err if err
console.log 'Done'