Delo na timeline.
This commit is contained in:
2
app.js
2
app.js
@ -15,7 +15,7 @@ var followRouter = require('./routes/follow');
|
||||
var app = express();
|
||||
|
||||
const db = require('./models');
|
||||
//db.sequelize.sync({ force: true });
|
||||
// db.sequelize.sync({ force: true });
|
||||
db.sequelize.sync();
|
||||
|
||||
// view engine setup
|
||||
|
@ -28,7 +28,9 @@ router.post('/add', async function(req, res, next) {
|
||||
var sessionId = req.cookies.sessionid;
|
||||
var user = await lib.getAuthUser(sessionId);
|
||||
if(user) {
|
||||
user.createMessage({ body: req.body.body });
|
||||
var message = await user.createMessage({ body: req.body.body });
|
||||
console.log(message);
|
||||
message.setUser(user);
|
||||
res.redirect('/');
|
||||
} else {
|
||||
res.redirect('/login');
|
||||
@ -68,4 +70,26 @@ router.get('/timeline2', async function(req, res, next) {
|
||||
}
|
||||
});
|
||||
|
||||
router.get('/timeline3', async function(req, res, next) {
|
||||
var sessionId = req.cookies.sessionid;
|
||||
var user = await lib.getAuthUser(sessionId);
|
||||
if(user) {
|
||||
var follows = await user.getFollow();
|
||||
var userList = [];
|
||||
follows.forEach(element => {
|
||||
userList.push(element.id);
|
||||
});
|
||||
var userMessages = await db.Message.findAll({
|
||||
include: User,
|
||||
where: {
|
||||
'$User.id$': '1',
|
||||
}
|
||||
});
|
||||
//console.log(await userMessages[0].getUsers());
|
||||
res.send(userMessages);
|
||||
} else {
|
||||
res.redirect('/login');
|
||||
}
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
|
Reference in New Issue
Block a user