Skip to content

Commit

Permalink
controller/web/user.js to koa
Browse files Browse the repository at this point in the history
  • Loading branch information
dead-horse authored and fengmk2 committed Feb 27, 2014
1 parent fb74417 commit 3e8ecda
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 25 deletions.
39 changes: 16 additions & 23 deletions controllers/web/user.js
Expand Up @@ -15,31 +15,24 @@
*/
var Module = require('../../proxy/module');
var User = require('../../proxy/user');
var eventproxy = require('eventproxy');

exports.display = function (req, res, next) {
var name = req.params.name;
exports.display = function *(next) {
var name = this.params.name;

var ep = eventproxy.create();
ep.fail(next);
Module.listByAuthor(name, ep.done('packages'));
User.get(name, ep.done('user'));
var r = yield [Module.listByAuthor(name), User.get(name)];
var packages = r[0];
var user = r[1];
if (!user && !packages.length) {
return yield next;
}
user = {
name: name,
email: user && user.email
};

ep.all('packages', 'user', function (packages, user) {
//because of sync, maybe no this user in database,
//but his packages in this registry
if (!user && !packages.length) {
return next();
}
user = {
name: name,
email: user && user.email
};

return res.render('profile', {
title: 'User - ' + name,
packages: packages || [],
user: user
});
yield this.render('profile', {
title: 'User - ' + name,
packages: packages || [],
user: user
});
};
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -29,7 +29,7 @@
"humanize-number": "0.0.2",
"koa": "0.5.0",
"koa-bodyparser": "0.0.1",
"koa-ejs": "0.0.0",
"koa-ejs": "0.0.1",
"koa-jsonp": "0.0.3",
"koa-markdown": "0.0.2",
"koa-redis": "0.0.5",
Expand Down
2 changes: 1 addition & 1 deletion routes/web.js
Expand Up @@ -26,7 +26,7 @@ function routes(app) {
// app.get('/package/:name/:version', pkg.display);
// app.get('/browse/keyword/:word', pkg.search);

// app.get('/~:name', user.display);
app.get('/~:name', user.display);

// app.get('/sync/:name', pkg.displaySync);
// app.put('/sync/:name', sync.sync);
Expand Down

0 comments on commit 3e8ecda

Please sign in to comment.