diff --git a/BuildServer/app.js b/BuildServer/app.js index 1734324..8207c47 100644 --- a/BuildServer/app.js +++ b/BuildServer/app.js @@ -40,7 +40,7 @@ app.get('/', routes.index); app.post('/github/postreceive', routes.postreceive); app.get('/manual', routes.manual.get); app.post('/manual', routes.manual.post); -app.get('/status/:owner/:reponame/:branch/:rev', routes.status.image); +app.get('/status/:owner/:reponame/:branch/:rev', routes.status.page); app.get('/status.svg', routes.status.image); http.createServer(app).listen(app.get('port'), function(){ diff --git a/BuildServer/routes/status.js b/BuildServer/routes/status.js index 1004a98..abc95a7 100644 --- a/BuildServer/routes/status.js +++ b/BuildServer/routes/status.js @@ -104,4 +104,17 @@ exports.image = function(req, res) { }; exports.page = function(req, res) { +// console.log(req); + var options = { + owner: req.params.owner, + reponame: req.params.reponame, + branchName: req.params.branch, + branch: "/refs/heads/" + req.params.branch, + rev: req.params.rev + }; + loadReport(req.app, options, function (err, options) { + options.err = err; + console.log(options); + res.render('status', options); + }); }; diff --git a/BuildServer/views/status.jade b/BuildServer/views/status.jade new file mode 100644 index 0000000..70399e1 --- /dev/null +++ b/BuildServer/views/status.jade @@ -0,0 +1,23 @@ +extends layout + +block content + h1 Build status + p + b Owner: + | #{owner} + p + b Repository name: + | #{reponame} + p + b Branch: + | #{branch} + p + b Commit: + | #{rev} + if err + h2 Error + pre #{err} + if report + h2 Result + pre + = JSON.stringify(report, null, 4)