KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2026-01-06 17:45:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated gulpfile, and sending total # of users

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-09-18 14:51:09 +02:00
parent 77c374f9b7
commit 5f1c6549c9
5 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/public/assets/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
server/public/assets/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
server/public/assets/js/frontpage.js
View File

@@ -22,9 +22,9 @@ var Frontpage = {
Helper.log("Frontpage fetch");
Helper.log(msg);
Helper.log("------------");
Frontpage.all_channels = msg;
Frontpage.populate_channels(msg, true);
//Frontpage.set_viewers(msg.viewers);
Frontpage.all_channels = msg.channels;
Frontpage.populate_channels(msg.channels, true);
Frontpage.set_viewers(msg.viewers);
},
populate_channels: function(lists, popular)

6
server/routing/router.js
View File

@@ -48,8 +48,10 @@ router.route('/:channel_name').get(function(req, res, next){
router.route('/api/frontpages').get(function(req, res) {
db.collection("frontpage_lists").find({frontpage: true, count: {$gt: 0}}, function(err, docs) {
res.setHeader('Content-Type', 'application/json');
res.send(JSON.stringify(docs));
db.collection("connected_users").find({"_id": "total_users"}, function(err, tot) {
res.setHeader('Content-Type', 'application/json');
res.send(JSON.stringify({channels: docs, viewers: tot[0].total_users}));
});
});
});