diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 9b6b0c6..f316bd0 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ openshift # Private files Private.js + +log.txt +static/uploaded diff --git a/LICENSE.md b/LICENSE.md old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/lib/get.js b/lib/get.js old mode 100644 new mode 100755 diff --git a/lib/log.js b/lib/log.js old mode 100644 new mode 100755 diff --git a/lib/socket.js b/lib/socket.js old mode 100644 new mode 100755 diff --git a/package.json b/package.json old mode 100644 new mode 100755 diff --git a/routes/index/index.js b/routes/index/index.js old mode 100644 new mode 100755 diff --git a/routes/index/urls.js b/routes/index/urls.js old mode 100644 new mode 100755 diff --git a/routes/index/views/index.pug b/routes/index/views/index.pug old mode 100644 new mode 100755 diff --git a/routes/speaker/index.js b/routes/speaker/index.js old mode 100644 new mode 100755 diff --git a/routes/speaker/urls.js b/routes/speaker/urls.js old mode 100644 new mode 100755 diff --git a/routes/speaker/views/index.pug b/routes/speaker/views/index.pug old mode 100644 new mode 100755 index 58bb16f..0e07e6a --- a/routes/speaker/views/index.pug +++ b/routes/speaker/views/index.pug @@ -7,7 +7,7 @@ block append css block content .row - .col-md-8 + .col-md-10 #canvases canvas#canvas-pdf(style={"border" : "1px solid #000000", position:'absolute'}) canvas#canvas-paint.noselect(onmousedown="sio.onMouseDown(event);", onmousemove="sio.onMouseMove(event);", onmouseup="sio.onMouseUp(event);", onmouseout="sio.onMouseUp(event);", style={position:'absolute'}) @@ -32,7 +32,7 @@ block content .btn-group button.btn.btn-default#viewer-laser(onclick="sio.switchAudienceLaser();") Audience laser is disabled - .col-md-4 + .col-md-2 .btn-group button.btn.btn-default#start(onclick="sio.startPresentation();") span.glyphicon.glyphicon-play diff --git a/routes/viewer/index.js b/routes/viewer/index.js old mode 100644 new mode 100755 diff --git a/routes/viewer/urls.js b/routes/viewer/urls.js old mode 100644 new mode 100755 diff --git a/routes/viewer/views/index.pug b/routes/viewer/views/index.pug old mode 100644 new mode 100755 diff --git a/server.js b/server.js old mode 100644 new mode 100755 index 4a2c7b4..1f5fc36 --- a/server.js +++ b/server.js @@ -13,7 +13,7 @@ var http = require('http').Server(app); var io = require('socket.io')(http); require('./lib/socket.js')(io); -var isDev = app.get('env') === 'development'; +var isDev = false; // app.get('env') === 'development'; app.set('view engine', 'pug'); app.set('trust proxy', 1); @@ -62,7 +62,7 @@ if ( isDev ) { serverIpAddress = 'localhost'; } else { // Openhift conf - serverPort = process.env.OPENSHIFT_NODEJS_PORT || 8080; + serverPort = process.env.OPENSHIFT_NODEJS_PORT || 4001; serverIpAddress = process.env.OPENSHIFT_NODEJS_IP || '127.0.0.1'; } diff --git a/static/css/signin.css b/static/css/signin.css old mode 100644 new mode 100755 diff --git a/static/css/speaker.css b/static/css/speaker.css old mode 100644 new mode 100755 diff --git a/static/css/style.css b/static/css/style.css old mode 100644 new mode 100755 diff --git a/static/css/viewer.css b/static/css/viewer.css old mode 100644 new mode 100755 diff --git a/static/js/jquery.min.js b/static/js/jquery.min.js old mode 100644 new mode 100755 diff --git a/static/js/pdf.js b/static/js/pdf.js old mode 100644 new mode 100755 diff --git a/static/js/pdf.worker.js b/static/js/pdf.worker.js old mode 100644 new mode 100755 diff --git a/static/js/speaker.js b/static/js/speaker.js old mode 100644 new mode 100755 index 841ea50..135c82d --- a/static/js/speaker.js +++ b/static/js/speaker.js @@ -25,7 +25,7 @@ $(function() { sio = (function() { var lasers = {}; var drawAudienceLasers = false; - PDFJS.getDocument('/static/uploaded/' + filename + '.pdf').then(function getPdf(_pdf) { + PDFJS.getDocument('/static/uploaded/' + filename + '.pdf?' + (Math.floor(Math.random() * 10000))).then(function getPdf(_pdf) { pdf = _pdf; updateUI(); }); diff --git a/static/js/viewer.js b/static/js/viewer.js old mode 100644 new mode 100755 index 4708e32..b5d2f00 --- a/static/js/viewer.js +++ b/static/js/viewer.js @@ -18,7 +18,7 @@ $(function() { sio = (function() { var lasers = {}; - PDFJS.getDocument('/static/uploaded/' + filename + '.pdf').then(function getPdfHelloWorld(_pdf) { + PDFJS.getDocument('/static/uploaded/' + filename + '.pdf?' + (Math.floor(Math.random() * 10000))).then(function getPdfHelloWorld(_pdf) { pdf = _pdf; update(); diff --git a/static/uploaded/last_slides.pdf b/static/uploaded/last_slides.pdf deleted file mode 100644 index 0e3d24e..0000000 Binary files a/static/uploaded/last_slides.pdf and /dev/null differ diff --git a/static/uploaded/main.pdf b/static/uploaded/main.pdf deleted file mode 100644 index 99bb721..0000000 Binary files a/static/uploaded/main.pdf and /dev/null differ diff --git a/views/base.pug b/views/base.pug old mode 100644 new mode 100755 diff --git a/views/main.pug b/views/main.pug old mode 100644 new mode 100755 index 15cbb20..5a0b153 --- a/views/main.pug +++ b/views/main.pug @@ -4,7 +4,7 @@ block css meta( name='viewport', content='width=device-width, initial-scale=1.0' ) meta( name='description', content='Baking Bootstrap Snippets with Jade' ) //- Bootswatch Theme - link(href="https://bootswatch.com/cerulean/bootstrap.min.css", rel="stylesheet") + link(href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css", rel="stylesheet") block base_content nav.navbar.navbar-default( role="navigation" ) @@ -25,4 +25,4 @@ block base_content block content block prepend js - script( src='http://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js' ) + script( src='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js' )