KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +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

7
gulpfile.js
View File

@@ -3,12 +3,6 @@ var gulp = require('gulp'),
uglify = require('gulp-uglifyjs'), uglify = require('gulp-uglifyjs'),
concat = require('gulp-concat'); concat = require('gulp-concat');
gulp.task('server', function() {
gulp.src(['server/handlers/db.js', 'server/handlers/server.js', 'server/handlers/io.js', 'server/handlers/frontpage.js', 'server/handlers/functions.js', 'server/handlers/chat.js', 'server/handlers/list_change.js', 'server/handlers/list_settings.js', 'server/handlers/list.js', 'server/handlers/suggestions.js'])
.pipe(concat('index.js'))
.pipe(gulp.dest('server/'));
});
gulp.task('js', function () { gulp.task('js', function () {
gulp.src(['server/public/assets/js/*.js', '!server/public/assets/js/embed*', '!server/public/assets/js/remotecontroller.js', '!server/public/assets/js/callback.js']) gulp.src(['server/public/assets/js/*.js', '!server/public/assets/js/embed*', '!server/public/assets/js/remotecontroller.js', '!server/public/assets/js/callback.js'])
.pipe(uglify({ .pipe(uglify({
@@ -66,7 +60,6 @@ gulp.task('remotecontroller', function () {
}); });
gulp.task('default', function(){ gulp.task('default', function(){
gulp.watch(['server/handlers/*.js', 'router/*.js'], ['server']);
gulp.watch('server/public/assets/js/*.js', ['js']); gulp.watch('server/public/assets/js/*.js', ['js']);
gulp.watch('server/public/assets/js/*.js', ['embed']); gulp.watch('server/public/assets/js/*.js', ['embed']);
gulp.watch(['server/public/assets/js/callback.js', 'server/public/assets/js/helpers.js'], ['callback']); gulp.watch(['server/public/assets/js/callback.js', 'server/public/assets/js/helpers.js'], ['callback']);

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("Frontpage fetch");
Helper.log(msg); Helper.log(msg);
Helper.log("------------"); Helper.log("------------");
Frontpage.all_channels = msg; Frontpage.all_channels = msg.channels;
Frontpage.populate_channels(msg, true); Frontpage.populate_channels(msg.channels, true);
//Frontpage.set_viewers(msg.viewers); Frontpage.set_viewers(msg.viewers);
}, },
populate_channels: function(lists, popular) 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) { router.route('/api/frontpages').get(function(req, res) {
db.collection("frontpage_lists").find({frontpage: true, count: {$gt: 0}}, function(err, docs) { db.collection("frontpage_lists").find({frontpage: true, count: {$gt: 0}}, function(err, docs) {
res.setHeader('Content-Type', 'application/json'); db.collection("connected_users").find({"_id": "total_users"}, function(err, tot) {
res.send(JSON.stringify(docs)); res.setHeader('Content-Type', 'application/json');
res.send(JSON.stringify({channels: docs, viewers: tot[0].total_users}));
});
}); });
}); });