From fff14e7e389c767031c00b9917c752b37935406c Mon Sep 17 00:00:00 2001 From: Sudhanshu Mishra Date: Fri, 7 Oct 2016 23:26:45 +0530 Subject: [PATCH 1/4] Remove an unused variable --- app/public/js/main.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/public/js/main.js b/app/public/js/main.js index 07ca7c8..d8dbc4b 100644 --- a/app/public/js/main.js +++ b/app/public/js/main.js @@ -23,7 +23,6 @@ var svg_background_color_online = '#0288D1', comment_color = 'rgb(46, 204, 113)' edit_color = '#fff', total_sounds = 51, - total_edits = 0; var celesta = [], clav = [], @@ -32,7 +31,7 @@ var svg_background_color_online = '#0288D1', -var socket = io(document.location.hostname); +var socket = io(document.location.hostname + ":8000"); socket.on('github', function (data) { $('.online-users-count').html(data.connected_users); data.data.forEach(function(event){ From 7e51f39d9a050259381c4444c6bf979544486cc1 Mon Sep 17 00:00:00 2001 From: Sudhanshu Mishra Date: Fri, 7 Oct 2016 23:28:19 +0530 Subject: [PATCH 2/4] Add ref. to ULTIMATE_DREAM_KILLER --- app/public/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/public/js/main.js b/app/public/js/main.js index d8dbc4b..9bc0cf5 100644 --- a/app/public/js/main.js +++ b/app/public/js/main.js @@ -5,7 +5,7 @@ var drawingArea; var width; var height; var volume = 0.6; -var ULTIMATE_DREAM_KILLER = false; +var ULTIMATE_DREAM_KILLER = false; // https://github.com/debugger22/github-audio/pull/19 var scale_factor = 6, note_overlap = 2, From ae5b2032b8b23165110d56ded251ada801667345 Mon Sep 17 00:00:00 2001 From: Sudhanshu Mishra Date: Sat, 8 Oct 2016 00:14:24 +0530 Subject: [PATCH 3/4] Add a feature to filter out events of specified repos/orgs --- app/index.html | 4 ++-- app/public/css/main.css | 16 +++++++++++----- app/public/js/main.js | 27 ++++++++++++++++++--------- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/app/index.html b/app/index.html index b1cba92..ded6612 100644 --- a/app/index.html +++ b/app/index.html @@ -69,8 +69,8 @@

-
- Set events consumption rate
+
+ Enter your organization's or repository's names to filter events 

About

diff --git a/app/public/css/main.css b/app/public/css/main.css index 061d371..d5fec6b 100644 --- a/app/public/css/main.css +++ b/app/public/css/main.css @@ -155,16 +155,21 @@ circle { font-weight: 300; } -#consumption-rate-div{ +#org-repo-filter-div{ width: 50%; margin: 0 auto; margin-bottom: 0px; - visibility: hidden; } -#eventConsumptionSlider{ - margin-top: 20px; - width: 300px; +#org-repo-filter-name{ + width: 20%; + color: gray; + padding: 5px; + padding-left: 10px; + border: none; + background: #F1F1F1; + font-family: 'Josefin Sans', sans-serif; + font-size: 1em; } .site-description{ @@ -172,6 +177,7 @@ circle { line-height: 1.6em; width: 50%; margin: 0 auto; + margin-top: 50px; } footer{ diff --git a/app/public/js/main.js b/app/public/js/main.js index 9bc0cf5..7eb45cb 100644 --- a/app/public/js/main.js +++ b/app/public/js/main.js @@ -6,6 +6,7 @@ var width; var height; var volume = 0.6; var ULTIMATE_DREAM_KILLER = false; // https://github.com/debugger22/github-audio/pull/19 +var orgRepoFilterNames; var scale_factor = 6, note_overlap = 2, @@ -22,7 +23,7 @@ var svg_background_color_online = '#0288D1', pull_request_color = 'rgb(46, 204, 113)', comment_color = 'rgb(46, 204, 113)' edit_color = '#fff', - total_sounds = 51, + total_sounds = 51; var celesta = [], clav = [], @@ -31,12 +32,21 @@ var svg_background_color_online = '#0288D1', -var socket = io(document.location.hostname + ":8000"); +var socket = io(document.location.hostname); socket.on('github', function (data) { $('.online-users-count').html(data.connected_users); data.data.forEach(function(event){ if(!isEventInQueue(event)){ - eventQueue.push(event); + // Filter out events only specified by the user + if(orgRepoFilterNames != null && orgRepoFilterNames != []){ + // Don't consider pushes to github.io repos when org filter is on + if(new RegExp(orgRepoFilterNames.join("|")).test(event.repo_name) + && event.repo_name.indexOf('github.io') == -1){ + eventQueue.push(event); + } + }else{ + eventQueue.push(event); + } } }); // Don't let the eventQueue grow more than 1000 @@ -122,12 +132,6 @@ $(function(){ } }); - $('#eventConsumptionSlider').slider({ - 'min': 1, - 'max': 100 - }); - - // Main drawing area svg = d3.select("#area").append("svg"); svg.attr({width: width, height: height}); @@ -191,6 +195,11 @@ $(function(){ // Make header and footer visible $('body').css('visibility', 'visible'); + $('#org-repo-filter-name').on('input', function() { + orgRepoFilterNames = $('#org-repo-filter-name').val().split(' '); + eventQueue = []; + }); + }); From c4a763a042e72c5cda051d298f457abdb6f670a8 Mon Sep 17 00:00:00 2001 From: Sudhanshu Mishra Date: Sat, 8 Oct 2016 00:15:12 +0530 Subject: [PATCH 4/4] Always draw irrespective of screen visibility --- app/public/js/main.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/public/js/main.js b/app/public/js/main.js index 7eb45cb..5449163 100644 --- a/app/public/js/main.js +++ b/app/public/js/main.js @@ -246,8 +246,8 @@ function playFromQueueExchange1(){ var event = eventQueue.shift(); if(event != null && event.message != null && !shouldEventBeIgnored(event) && svg != null){ playSound(event.message.length*1.1, event.type); - if(!document.hidden) - drawEvent(event, svg); + // if(!document.hidden) + drawEvent(event, svg); } setTimeout(playFromQueueExchange1, Math.floor(Math.random() * 1000) + 500); $('.events-remaining-value').html(eventQueue.length); @@ -257,8 +257,8 @@ function playFromQueueExchange2(){ var event = eventQueue.shift(); if(event != null && event.message != null && !shouldEventBeIgnored(event) && svg != null){ playSound(event.message.length, event.type); - if(!document.hidden) - drawEvent(event, svg); + // if(!document.hidden) + drawEvent(event, svg); } setTimeout(playFromQueueExchange2, Math.floor(Math.random() * 800) + 500); $('.events-remaining-value').html(eventQueue.length);