diff --git a/README.md b/README.md index 083ca8f..d815217 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,12 @@ ## TODO **Now** -- [ ] (Derick)Add session chooser to "I am theater" link from portal -- [ ] (Derick)Add session chooser to "I am poet" at the top in case poet needs to rejoin session - [ ] (Derick) update the poet controller UI - [ ] (Jesse) Add audio event for each of the controller buttons, possibly tied to each corpus - [ ] (Jesse) Add sessionName verification for each of the audio events **Soon** +- [ ] Make sure sessions are actually cleared after 60 minutes. - [ ] Allow poet to load in their own poem and corpus - [ ] Add random selection of corpus segments if not enough return. - [ ] (Jesse) hy does loadtext-ish take so long? @@ -22,6 +21,8 @@ - [ ] Replace markov with machine learning **Done** +- [x] (Derick)Add session chooser to "I am theater" link from portal +- [x] (Derick)Add session chooser to "I am poet" at the top in case poet needs to rejoin session - [x] simplify the sesssion chooser - [x] Fix up corpii corpus files. lilghettoqueer-corpus is functional, but the others cause failure. probs bad syntax - [x] Create new portal for audience to find performance currently running diff --git a/diamondsCluster/public/js/namesgenerator.js b/diamondsCluster/public/js/namesgenerator.js index edd1be0..eb00082 100644 --- a/diamondsCluster/public/js/namesgenerator.js +++ b/diamondsCluster/public/js/namesgenerator.js @@ -4,264 +4,264 @@ // MIT License let left = [ - 'admiring', - 'adoring', - 'affectionate', - 'agitated', - 'amazing', - 'angry', - 'awesome', - 'blissful', - 'boring', - 'brave', - 'clever', - 'cocky', - 'compassionate', - 'competent', - 'condescending', - 'confident', - 'cranky', - 'dazzling', - 'determined', - 'distracted', - 'dreamy', - 'eager', - 'ecstatic', - 'elastic', - 'elated', - 'elegant', - 'eloquent', - 'epic', - 'fervent', - 'festive', - 'flamboyant', - 'focused', - 'friendly', - 'frosty', - 'gallant', - 'gifted', - 'goofy', - 'gracious', - 'happy', - 'hardcore', - 'heuristic', - 'hopeful', - 'hungry', - 'infallible', - 'inspiring', - 'jolly', - 'jovial', - 'keen', - 'kind', - 'laughing', - 'loving', - 'lucid', - 'mystifying', - 'modest', - 'musing', - 'naughty', - 'nervous', - 'nifty', - 'nostalgic', - 'objective', - 'optimistic', - 'peaceful', - 'pedantic', - 'pensive', - 'practical', - 'priceless', - 'quirky', - 'quizzical', - 'relaxed', - 'reverent', - 'romantic', - 'sad', - 'serene', - 'sharp', - 'silly', - 'sleepy', - 'stoic', - 'stupefied', - 'suspicious', - 'tender', - 'thirsty', - 'trusting', - 'unruffled', - 'upbeat', - 'vibrant', - 'vigilant', - 'vigorous', - 'wizardly', - 'wonderful', - 'xenodochial', - 'youthful', - 'zealous', - 'zen', + 'Admiring', + 'Adoring', + 'Affectionate', + 'Agitated', + 'Amazing', + 'Angry', + 'Awesome', + 'Blissful', + 'Boring', + 'Brave', + 'Clever', + 'Cocky', + 'Compassionate', + 'Competent', + 'Condescending', + 'Confident', + 'Cranky', + 'Dazzling', + 'Determined', + 'Distracted', + 'Dreamy', + 'Eager', + 'Ecstatic', + 'Elastic', + 'Elated', + 'Elegant', + 'Eloquent', + 'Epic', + 'Fervent', + 'Festive', + 'Flamboyant', + 'Focused', + 'Friendly', + 'Frosty', + 'Gallant', + 'Gifted', + 'Goofy', + 'Gracious', + 'Happy', + 'Hardcore', + 'Heuristic', + 'Hopeful', + 'Hungry', + 'Infallible', + 'Inspiring', + 'Jolly', + 'Jovial', + 'Keen', + 'Kind', + 'Laughing', + 'Loving', + 'Lucid', + 'Mystifying', + 'Modest', + 'Musing', + 'Naughty', + 'Nervous', + 'Nifty', + 'Nostalgic', + 'Objective', + 'Optimistic', + 'Peaceful', + 'Pedantic', + 'Pensive', + 'Practical', + 'Priceless', + 'Quirky', + 'Quizzical', + 'Relaxed', + 'Reverent', + 'Romantic', + 'Sad', + 'Serene', + 'Sharp', + 'Silly', + 'Sleepy', + 'Stoic', + 'Stupefied', + 'Suspicious', + 'Tender', + 'Thirsty', + 'Trusting', + 'Unruffled', + 'Upbeat', + 'Vibrant', + 'Vigilant', + 'Vigorous', + 'Wizardly', + 'Wonderful', + 'Xenodochial', + 'Youthful', + 'Zealous', + 'Zen', ]; let right = [ - 'albattani', - 'allen', - 'almeida', - 'agnesi', - 'archimedes', - 'ardinghelli', - 'aryabhata', - 'austin', - 'babbage', - 'banach', - 'bardeen', - 'bartik', - 'bassi', - 'beaver', - 'bell', - 'benz', - 'bhabha', - 'bhaskara', - 'blackwell', - 'bohr', - 'booth', - 'borg', - 'bose', - 'boyd', - 'brahmagupta', - 'brattain', - 'brown', - 'carson', - 'chandrasekhar', - 'shannon', - 'clarke', - 'colden', - 'cori', - 'cray', - 'curran', - 'curie', - 'darwin', - 'davinci', - 'dijkstra', - 'dubinsky', - 'easley', - 'edison', - 'einstein', - 'elion', - 'engelbart', - 'euclid', - 'euler', - 'fermat', - 'fermi', - 'feynman', - 'franklin', - 'galileo', - 'gates', - 'goldberg', - 'goldstine', - 'goldwasser', - 'golick', - 'goodall', - 'haibt', - 'hamilton', - 'hawking', - 'heisenberg', - 'hermann', - 'heyrovsky', - 'hodgkin', - 'hoover', - 'hopper', - 'hugle', - 'hypatia', - 'jackson', - 'jang', - 'jennings', - 'jepsen', - 'johnson', - 'joliot', - 'jones', - 'kalam', - 'kare', - 'keller', - 'kepler', - 'khorana', - 'kilby', - 'kirch', - 'knuth', - 'kowalevski', - 'lalande', - 'lamarr', - 'lamport', - 'leakey', - 'leavitt', - 'lewin', - 'lichterman', - 'liskov', - 'lovelace', - 'lumiere', - 'mahavira', - 'mayer', - 'mccarthy', - 'mcclintock', - 'mclean', - 'mcnulty', - 'meitner', - 'meninsky', - 'mestorf', - 'minsky', - 'mirzakhani', - 'morse', - 'murdock', - 'neumann', - 'newton', - 'nightingale', - 'nobel', - 'noether', - 'northcutt', - 'noyce', - 'panini', - 'pare', - 'pasteur', - 'payne', - 'perlman', - 'pike', - 'poincare', - 'poitras', - 'ptolemy', - 'raman', - 'ramanujan', - 'ride', - 'montalcini', - 'ritchie', - 'roentgen', - 'rosalind', - 'saha', - 'sammet', - 'shaw', - 'shirley', - 'shockley', - 'sinoussi', - 'snyder', - 'spence', - 'stallman', - 'stonebraker', - 'swanson', - 'swartz', - 'swirles', - 'tesla', - 'thompson', - 'torvalds', - 'turing', - 'varahamihira', - 'visvesvaraya', - 'volhard', - 'wescoff', - 'wiles', - 'williams', - 'wilson', - 'wing', - 'wozniak', - 'wright', - 'yalow', - 'yonath', + 'Albattani', + 'Allen', + 'Almeida', + 'Agnesi', + 'Archimedes', + 'Ardinghelli', + 'Aryabhata', + 'Austin', + 'Babbage', + 'Banach', + 'Bardeen', + 'Bartik', + 'Bassi', + 'Beaver', + 'Bell', + 'Benz', + 'Bhabha', + 'Bhaskara', + 'Blackwell', + 'Bohr', + 'Booth', + 'Borg', + 'Bose', + 'Boyd', + 'Brahmagupta', + 'Brattain', + 'Brown', + 'Carson', + 'Chandrasekhar', + 'Shannon', + 'Clarke', + 'Colden', + 'Cori', + 'Cray', + 'Curran', + 'Curie', + 'Darwin', + 'Davinci', + 'Dijkstra', + 'Dubinsky', + 'Easley', + 'Edison', + 'Einstein', + 'Elion', + 'Engelbart', + 'Euclid', + 'Euler', + 'Fermat', + 'Fermi', + 'Feynman', + 'Franklin', + 'Galileo', + 'Gates', + 'Goldberg', + 'Goldstine', + 'Goldwasser', + 'Golick', + 'Goodall', + 'Haibt', + 'Hamilton', + 'Hawking', + 'Heisenberg', + 'Hermann', + 'Heyrovsky', + 'Hodgkin', + 'Hoover', + 'Hopper', + 'Hugle', + 'Hypatia', + 'Jackson', + 'Jang', + 'Jennings', + 'Jepsen', + 'Johnson', + 'Joliot', + 'Jones', + 'Kalam', + 'Kare', + 'Keller', + 'Kepler', + 'Khorana', + 'Kilby', + 'Kirch', + 'Knuth', + 'Kowalevski', + 'Lalande', + 'Lamarr', + 'Lamport', + 'Leakey', + 'Leavitt', + 'Lewin', + 'Lichterman', + 'Liskov', + 'Lovelace', + 'Lumiere', + 'Mahavira', + 'Mayer', + 'Mccarthy', + 'Mcclintock', + 'Mclean', + 'Mcnulty', + 'Meitner', + 'Meninsky', + 'Mestorf', + 'Minsky', + 'Mirzakhani', + 'Morse', + 'Murdock', + 'Neumann', + 'Newton', + 'Nightingale', + 'Nobel', + 'Noether', + 'Northcutt', + 'Noyce', + 'Panini', + 'Pare', + 'Pasteur', + 'Payne', + 'Perlman', + 'Pike', + 'Poincare', + 'Poitras', + 'Ptolemy', + 'Raman', + 'Ramanujan', + 'Ride', + 'Montalcini', + 'Ritchie', + 'Roentgen', + 'Rosalind', + 'Saha', + 'Sammet', + 'Shaw', + 'Shirley', + 'Shockley', + 'Sinoussi', + 'Snyder', + 'Spence', + 'Stallman', + 'Stonebraker', + 'Swanson', + 'Swartz', + 'Swirles', + 'Tesla', + 'Thompson', + 'Torvalds', + 'Turing', + 'Varahamihira', + 'Visvesvaraya', + 'Volhard', + 'Wescoff', + 'Wiles', + 'Williams', + 'Wilson', + 'Wing', + 'Wozniak', + 'Wright', + 'Yalow', + 'Yonath', ]; let randnum = (n) => Math.floor(Math.random() * (n + 1)); -var unique_name = left[randnum(left.length)] + "_" + right[randnum(right.length)]; \ No newline at end of file +var unique_name = left[randnum(left.length)] + " " + right[randnum(right.length)]; \ No newline at end of file diff --git a/diamondsCluster/public/js/theater.js b/diamondsCluster/public/js/theater.js index baf8df4..8d87491 100644 --- a/diamondsCluster/public/js/theater.js +++ b/diamondsCluster/public/js/theater.js @@ -1,264 +1,267 @@ - let user = { - name: 'theater', - id: 1000, - color: '#3c23ff', - location: [0.5, 0.5], - date: Date.now() +let user = { + name: 'theater', + id: 1000, + color: '#3c23ff', + location: [0.5, 0.5], + date: Date.now() +} +user.sessionName = localStorage.getItem('sessionName') || 'default'; +user.corpus = localStorage.getItem('corpus') || 'horrortech-corpus'; +user.socketID = localStorage.getItem('socketID') || null; +user.color = localStorage.getItem('color') || '#3c23ff'; + +document.getElementsByClassName('sessionName')[0].innerHTML = user.sessionName; +console.log("session is:", user.sessionName); + +document.getElementsByClassName("url")[0].innerHTML = window.location.hostname; +// console.log("url is:", window.location.hostname); + +// function getRandomColor() { +// var letters = '0123456789ABCDEF'.split(''); +// var color = '#'; +// for (var i = 0; i < 6; i++ ) { +// color += letters[Math.floor(Math.random() * 16)]; +// } +// return color; +// } +// var socket = io.connect('http://emdm.io/', { path: '/sio/socket.io' }); +// var socket = io.connect('http://emdm.io/sio'); +// var socket = io.connect('127.0.0.1:8000/'); +// var socket = io.connect('167.96.65.182:8000'); +var socket = io.connect(window.location.origin, { + transports: ['websocket'] +}); + + + +window.onload = function () { + registerWithServer(); + joinSession(); +} + + +function registerWithServer() { + socket.emit('addme', { + username: user.name, + sessionName: user.sessionName, + corpus: user.corpus, + color: user.color + }); +} + +function joinSession() { + socket.emit('joinSession', { + 'username': user.name, + 'sessionName': user.sessionName, + 'color': user.color, + 'date': user.date + }); +} + +// ********************************************************** +// Only for the Overlay/intro page + +socket.on('registerComplete', function (data) { + console.log("registerComplete: " + data); + user.socketID = data.socketID; + localStorage.setItem("socketID", data.socketID); + if (data.corpus) { + user.corpus = data.corpus; + } +}); + + +socket.on('chat', function (data) { + console.log("chat: ", data); +}); + +// var start = null; +// var element = document.getElementById("SomeElementYouWantToAnimate"); +// element.style.position = 'absolute'; + +// function step(timestamp) { +// if (!start) start = timestamp; +// var progress = timestamp - start; +// element.style.left = Math.min(progress/10, 200) + "px"; +// if (progress < 2000) { +// window.requestAnimationFrame(step); +// } +// } + +// window.requestAnimationFrame(step); + +var c = 1; +var n1 = 0; +var n2 = 0; + +var userbars = {}; + +function draw1() { + n1 += 0.05; + // console.log(n); + document.getElementsByClassName('generatedText1')[0].style.opacity = n1; + if (n1 > 1) return; + requestAnimationFrame(draw1); +} + +// function draw2() { +// n2+=0.01; +// // console.log(n); +// document.getElementsByClassName('generatedText2')[0].style.opacity = n2; +// if(n2>1) return; +// requestAnimationFrame(draw2); +// } +var newDivBar; +var w1 = 10; +socket.on('itemback', function (data) { + if (data.sessionName == user.sessionName) { + if (userbars[data.color] > 0) { + userbars[data.color] = userbars[data.color] + 1 + // w1+=1; + console.log(userbars[data.color]); + newDivBar.style.width = userbars[data.color] + "px"; + }; + + if (!userbars[data.color]) { + userbars[data.color] = 10; + // var btn=document.createElement("div"); + // btn.setAttribute("class", "btn_class"); + newDivBar = document.createElement('div'); + newDivBar.setAttribute("class", "singlebar"); + newDivBar.classList.add(data.color); + newDivBar.style.backgroundColor = data.color; + newDivBar.style.width = w1 + "px"; + // newDivBar.style.opactiy= 0.25; + document.getElementsByClassName('theuserbars')[0].appendChild(newDivBar); + } - user.sessionName = localStorage.getItem('sessionName') || 'default'; - user.corpus = localStorage.getItem('corpus') || 'horrortech-corpus'; - user.socketID = localStorage.getItem('socketID') || null; - user.color = localStorage.getItem('color') || '#3c23ff'; - - document.getElementsByClassName('sessionName')[0].innerHTML = user.sessionName; - console.log("session is:", user.sessionName); - - // function getRandomColor() { - // var letters = '0123456789ABCDEF'.split(''); - // var color = '#'; - // for (var i = 0; i < 6; i++ ) { - // color += letters[Math.floor(Math.random() * 16)]; - // } - // return color; - // } - // var socket = io.connect('http://emdm.io/', { path: '/sio/socket.io' }); - // var socket = io.connect('http://emdm.io/sio'); - // var socket = io.connect('127.0.0.1:8000/'); - // var socket = io.connect('167.96.65.182:8000'); - var socket = io.connect(window.location.origin, { - transports: ['websocket'] - }); + console.log(userbars); + document.getElementsByClassName('sw')[0].style.display = "none"; - window.onload = function() { - registerWithServer(); - joinSession(); - } + // setTimeout(function() {alert('hello');},1250); + // console.log("readsd"); + // console.log(c); - function registerWithServer() { - socket.emit('addme', { - username: user.name, - sessionName: user.sessionName, - corpus: user.corpus, - color: user.color - }); + if (c == 1) { + document.getElementsByClassName('generatedText1')[0].innerHTML = data.phrase; + n1 = 0; + draw1(); + // c=2; } - function joinSession() { - socket.emit('joinSession', { - 'username': user.name, - 'sessionName': user.sessionName, - 'color': user.color, - 'date': user.date - }); - } + // if(c==2){ + // document.getElementsByClassName('generatedText2')[0].innerHTML = data.phrase; + // n2 = 0; + // draw2(); + // } - // ********************************************************** - // Only for the Overlay/intro page - - socket.on('registerComplete', function(data) { - console.log("registerComplete: " + data); - user.socketID = data.socketID; - localStorage.setItem("socketID", data.socketID); - if (data.corpus) { - user.corpus = data.corpus; - } - }); - - - socket.on('chat', function(data) { - console.log("chat: ", data); - }); - - // var start = null; - // var element = document.getElementById("SomeElementYouWantToAnimate"); - // element.style.position = 'absolute'; - - // function step(timestamp) { - // if (!start) start = timestamp; - // var progress = timestamp - start; - // element.style.left = Math.min(progress/10, 200) + "px"; - // if (progress < 2000) { - // window.requestAnimationFrame(step); - // } + // document.getElementsByClassName('generatedText')[0].classList.add("visible"); + + console.log("itemback:", data.color, data.phrase); + + var generatedText = document.getElementsByClassName('generatedText')[0]; + // generatedText.classList.add("blurAnimation"); + // generatedText.classList.add("oldgentext"); + var mf = 7; + generatedText.style.webkitFilter = "blur(" + mf + "px)"; + // console.log("COLOROOROROROROR", data.color); + generatedText.style.color = data.color; // } - // window.requestAnimationFrame(step); + // var elements = document.getElementsByClassName(data.phrase); + // // for(var i = elements.length - 1; i >= 0; --i) { + // elements[0].className += " clicked"; + // // elements[i].style.color = data.color; + // // elements[i].style.backgroundColor = data.color; + // // var elem1 = document.getElementById("elemId"); + // var style = window.getComputedStyle(elements[0], null); + // var filter = style.webkitFilter.substr(5, 1); + // console.log(filter); + // var mf = filter - 1; + // elements[0].style.webkitFilter = "blur("+mf+"px)"; + // elements[0].style.borderColor = data.color; + // // } + } +}); + +socket.on('selectedPhrase', function (data) { + console.log("New Phrase: " + data.phrase); + if (data.sessionName == user.sessionName) { + document.getElementsByClassName('newgentext')[0].innerHTML = data.phrase; + var newgentext = document.getElementsByClassName('newgentext')[0]; + + // generatedText.classList.add("blurAnimation"); + // generatedText.classList.add("newgentext"); + // var mf = 0; + // generatedText.style.webkitFilter = "blur("+mf+"px)"; + // console.log("COLOROOROROROROR", data.color); + + // newgentext.style.color = data.color; //MAYBE USE THIS! + + // newgentext.style.classList.add("newgentext"); + + // if(data.title == "Welcome") { + // console.log('yep'); + // scrollto(data.sect); + // } - var c = 1; - var n1 = 0; - var n2 = 0; + // if(data.title !== undefined){ - var userbars = {}; + // var otherClasses = document.querySelectorAll('.sec'), + // i = 0, + // l = otherClasses.length; - function draw1() { - n1 += 0.05; - // console.log(n); - document.getElementsByClassName('generatedText1')[0].style.opacity = n1; - if (n1 > 1) return; - requestAnimationFrame(draw1); - } + // for (i; i < l; i++) { + // otherClasses[i].style.display = 'none'; + // } + + // try{ + // document.getElementsByClassName("s"+data.sect)[0].style.display = 'block'; + // scrollto(data.sect); + // } + + // catch(err){ + // console.log(err.message); + // } - // function draw2() { - // n2+=0.01; - // // console.log(n); - // document.getElementsByClassName('generatedText2')[0].style.opacity = n2; - // if(n2>1) return; - // requestAnimationFrame(draw2); // } - var newDivBar; - var w1 = 10; - socket.on('itemback', function(data) { - if (data.sessionName == user.sessionName) { - if (userbars[data.color] > 0) { - userbars[data.color] = userbars[data.color] + 1 - // w1+=1; - console.log(userbars[data.color]); - newDivBar.style.width = userbars[data.color] + "px"; - }; - - if (!userbars[data.color]) { - userbars[data.color] = 10; - // var btn=document.createElement("div"); - // btn.setAttribute("class", "btn_class"); - newDivBar = document.createElement('div'); - newDivBar.setAttribute("class", "singlebar"); - newDivBar.classList.add(data.color); - newDivBar.style.backgroundColor = data.color; - newDivBar.style.width = w1 + "px"; - // newDivBar.style.opactiy= 0.25; - document.getElementsByClassName('theuserbars')[0].appendChild(newDivBar); - - } - - console.log(userbars); - - document.getElementsByClassName('sw')[0].style.display = "none"; - - // setTimeout(function() {alert('hello');},1250); - // console.log("readsd"); - - // console.log(c); - - if (c == 1) { - document.getElementsByClassName('generatedText1')[0].innerHTML = data.phrase; - n1 = 0; - draw1(); - // c=2; - } - - // if(c==2){ - // document.getElementsByClassName('generatedText2')[0].innerHTML = data.phrase; - // n2 = 0; - // draw2(); - // } - - // document.getElementsByClassName('generatedText')[0].classList.add("visible"); - - console.log("itemback:", data.color, data.phrase); - - var generatedText = document.getElementsByClassName('generatedText')[0]; - // generatedText.classList.add("blurAnimation"); - // generatedText.classList.add("oldgentext"); - var mf = 7; - generatedText.style.webkitFilter = "blur(" + mf + "px)"; - // console.log("COLOROOROROROROR", data.color); - generatedText.style.color = data.color; - // } - - // var elements = document.getElementsByClassName(data.phrase); - // // for(var i = elements.length - 1; i >= 0; --i) { - // elements[0].className += " clicked"; - // // elements[i].style.color = data.color; - // // elements[i].style.backgroundColor = data.color; - // // var elem1 = document.getElementById("elemId"); - // var style = window.getComputedStyle(elements[0], null); - // var filter = style.webkitFilter.substr(5, 1); - // console.log(filter); - // var mf = filter - 1; - // elements[0].style.webkitFilter = "blur("+mf+"px)"; - // elements[0].style.borderColor = data.color; - // // } - } - }); - - socket.on('selectedPhrase', function(data) { - console.log("New Phrase: " + data.phrase); - if (data.sessionName == user.sessionName) { - document.getElementsByClassName('newgentext')[0].innerHTML = data.phrase; - var newgentext = document.getElementsByClassName('newgentext')[0]; - - // generatedText.classList.add("blurAnimation"); - // generatedText.classList.add("newgentext"); - // var mf = 0; - // generatedText.style.webkitFilter = "blur("+mf+"px)"; - // console.log("COLOROOROROROROR", data.color); - - // newgentext.style.color = data.color; //MAYBE USE THIS! - - // newgentext.style.classList.add("newgentext"); - - // if(data.title == "Welcome") { - // console.log('yep'); - // scrollto(data.sect); - // } - - // if(data.title !== undefined){ - - // var otherClasses = document.querySelectorAll('.sec'), - // i = 0, - // l = otherClasses.length; - - // for (i; i < l; i++) { - // otherClasses[i].style.display = 'none'; - // } - - // try{ - // document.getElementsByClassName("s"+data.sect)[0].style.display = 'block'; - // scrollto(data.sect); - // } - - // catch(err){ - // console.log(err.message); - // } - - // } - } - }); - - socket.on('setSection', function(data) { - console.log("the section is now: " + data.sect + ":" + data.title); + } +}); + +socket.on('setSection', function (data) { + console.log("the section is now: " + data.sect + ":" + data.title); + +}); + +// ****** Things you can respond to + + +socket.on('start', function (data) { + console.log("Start: ", data); +}); + +socket.on('excite', function (data) { + console.log("Excite: ", data); +}); + +socket.on('echo', function (data) { + console.log("Echo: ", data.phrase); +}); + +socket.on('kill', function (data) { + console.log("Kill: ", data); +}); - }); +socket.on('volta', function (data) { + console.log("Volta: ", data); +}); - // ****** Things you can respond to - - - socket.on('start', function(data) { - console.log("Start: ", data); - }); - - socket.on('excite', function(data) { - console.log("Excite: ", data); - }); - - socket.on('echo', function(data) { - console.log("Echo: ", data.phrase); - }); - - socket.on('kill', function(data) { - console.log("Kill: ", data); - }); - - socket.on('volta', function(data) { - console.log("Volta: ", data); - }); - - socket.on('end', function(data) { - console.log("End: ", data); - }); +socket.on('end', function (data) { + console.log("End: ", data); +}); // window.onload = function() { diff --git a/diamondsCluster/public/styles/theater.css b/diamondsCluster/public/styles/theater.css index df8efaf..1dd5d42 100755 --- a/diamondsCluster/public/styles/theater.css +++ b/diamondsCluster/public/styles/theater.css @@ -37,14 +37,14 @@ body { right: 0; } -.sessionName { +/* .sessionName { position: absolute; font-size: 0.55em; color: rgba(255, 255, 255, 0.75); padding: 10px; bottom: 0; right: 0; -} +} */ .allText { margin-top: 5%; @@ -110,11 +110,11 @@ small { -webkit-transform: scale3d(.1, .1, .1) translate3d(0, 1000px, 0); transform: scale3d(.1, .1, .1) translate3d(0, 1000px, 0); -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190); - blur(0px); + blur: (0px); animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190); } 60% { - blur(5px); + blur: (5px); opacity: 1; -webkit-transform: scale3d(.475, .475, .475) translate3d(0, -60px, 0); transform: scale3d(.475, .475, .475) translate3d(0, -60px, 0); @@ -122,7 +122,7 @@ small { animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1); } 100% { - blur(10px); + blur: (10px); opacity: 1; } } @@ -133,11 +133,11 @@ small { -webkit-transform: scale3d(.1, .1, .1) translate3d(0, 1000px, 0); transform: scale3d(.1, .1, .1) translate3d(0, 1000px, 0); -webkit-animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190); - blur(0px); + blur: (0px); animation-timing-function: cubic-bezier(0.550, 0.055, 0.675, 0.190); } 60% { - blur(5px); + blur: (5px); opacity: 1; -webkit-transform: scale3d(.475, .475, .475) translate3d(0, -60px, 0); transform: scale3d(.475, .475, .475) translate3d(0, -60px, 0); @@ -145,7 +145,7 @@ small { animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1); } 100% { - blur(10px); + blur: (10px); opacity: 1; } } @@ -240,4 +240,5 @@ video#bgvid { /*position: fixed;*/ /*width: 20px;*/ height: 25px; -} \ No newline at end of file +} + diff --git a/diamondsCluster/public/theater/index.html b/diamondsCluster/public/theater/index.html index f05f277..aea7eb0 100755 --- a/diamondsCluster/public/theater/index.html +++ b/diamondsCluster/public/theater/index.html @@ -12,18 +12,20 @@ +
emdm.io
-

Bound by Digital Countries

+ +

-
+