From dd1de99ae5af0c7a8d5f5e824a19ca9daef55056 Mon Sep 17 00:00:00 2001 From: Artyom Abubakirov Date: Mon, 16 Jul 2018 12:14:27 +0500 Subject: [PATCH] Load initial streams --- static/css/dashboard.css | 2 +- static/css/dashboard.css.map | 2 +- static/css/dashboard.less | 4 ++++ static/dashboard.html | 8 ++++---- static/js/dashboard.js | 30 ++++++++++++++++++++++++++++++ static/js/index.js | 2 -- 6 files changed, 40 insertions(+), 8 deletions(-) diff --git a/static/css/dashboard.css b/static/css/dashboard.css index 7b6e606..22f6b66 100755 --- a/static/css/dashboard.css +++ b/static/css/dashboard.css @@ -1,2 +1,2 @@ -.dashboard{min-height:100vh;min-width:100%}.dashboard--elem{position:relative;border:1px dashed gainsboro;width:50%;float:left;height:50vh;background-image:url('../img/dragdrop.png');background-repeat:no-repeat;background-position:center center;background-size:100px 100px}.dashboard--elem.small{display:none}.dashboard--elem.small--panel{display:none}.dashboard--elem.fullscreen{display:block !important;height:100vh !important;width:100% !important}.dashboard--elem--panel{z-index:999;position:absolute;left:15px;top:15px;background-color:black;border-radius:15px;color:white;text-align:center;padding:10px}.dashboard--elem--panel span{cursor:pointer;margin-left:10px}.dashboard--elem--panel span:first-child{margin-left:0} +.dashboard{min-height:100vh;min-width:100%}.dashboard--elem{position:relative;border:1px dashed gainsboro;width:50%;float:left;height:50vh;background-image:url('../img/dragdrop.png');background-repeat:no-repeat;background-position:center center;background-size:100px 100px}.dashboard--elem iframe{border:none}.dashboard--elem.small{display:none}.dashboard--elem.small--panel{display:none}.dashboard--elem.fullscreen{display:block !important;height:100vh !important;width:100% !important}.dashboard--elem--panel{z-index:999;position:absolute;left:15px;top:15px;background-color:black;border-radius:15px;color:white;text-align:center;padding:10px}.dashboard--elem--panel span{cursor:pointer;margin-left:10px}.dashboard--elem--panel span:first-child{margin-left:0} /*# sourceMappingURL=dashboard.css.map */ \ No newline at end of file diff --git a/static/css/dashboard.css.map b/static/css/dashboard.css.map index b26b41b..45506b3 100755 --- a/static/css/dashboard.css.map +++ b/static/css/dashboard.css.map @@ -1 +1 @@ -{"version":3,"sources":["dashboard.less"],"names":[],"mappings":"AAEA,WACI,iBACA,cAAA,CACA,iBACI,kBACA,4BACA,UACA,WACA,YACA,4CACA,4BACA,kCACA,2BAAA,CAEA,uBACI,YAAA,CACA,8BACI,YAAA,CAIR,4BACI,yBACA,wBACA,qBAAA,CAGJ,wBACI,YACA,kBACA,UACA,SACA,uBACA,mBACA,YACA,kBACA,YAAA,CATJ,6BAcQ,eACA,gBAAA,CAJA,yCACI,aAAA,CAAA","file":"to.css"} \ No newline at end of file +{"version":3,"sources":["dashboard.less"],"names":[],"mappings":"AAEA,WACI,iBACA,cAAA,CACA,iBACI,kBACA,4BACA,UACA,WACA,YACA,4CACA,4BACA,kCACA,2BAAA,CATJ,wBAYQ,WAAA,CAGJ,uBACI,YAAA,CACA,8BACI,YAAA,CAIR,4BACI,yBACA,wBACA,qBAAA,CAGJ,wBACI,YACA,kBACA,UACA,SACA,uBACA,mBACA,YACA,kBACA,YAAA,CATJ,6BAcQ,eACA,gBAAA,CAJA,yCACI,aAAA,CAAA","file":"to.css"} \ No newline at end of file diff --git a/static/css/dashboard.less b/static/css/dashboard.less index 3ad8ced..41e4b3d 100755 --- a/static/css/dashboard.less +++ b/static/css/dashboard.less @@ -14,6 +14,10 @@ background-position: center center; background-size: 100px 100px; + iframe { + border: none; + } + &.small { display: none; &--panel{ diff --git a/static/dashboard.html b/static/dashboard.html index 981016c..59403dc 100755 --- a/static/dashboard.html +++ b/static/dashboard.html @@ -16,10 +16,10 @@
-
-
-
-
+
+
+
+
\ No newline at end of file diff --git a/static/js/dashboard.js b/static/js/dashboard.js index 0687d4d..1d4f226 100755 --- a/static/js/dashboard.js +++ b/static/js/dashboard.js @@ -2,6 +2,36 @@ $( document ).ready(() => { var counter = 0; + + + let url_string = window.location.href; + let url = new URL(url_string); + let r = url.searchParams.get('r'); + + if(r){ + init(r.split('|')); + } + + function init(arr) { + let blocks = ['r4', 'r3', 'r2', 'r1']; + + for(let i = 0; i< arr.length; i++){ + if(blocks.length > 0 ){ + let id = blocks.pop(); + let panel = generatePanel(counter); + + + $( '#' + id ).append( panel + '' ); + bindEvents(counter); + counter++; + } else { + break; + } + } + } + function generatePanel(i) { return '
' + ' ' + diff --git a/static/js/index.js b/static/js/index.js index b0cc687..d9c40c4 100755 --- a/static/js/index.js +++ b/static/js/index.js @@ -32,8 +32,6 @@ $(function() { let url = new URL(url_string); room = url.searchParams.get('r'); - console.log(room); - socket = io('https://gto.to/'); $('#call').on('click', function(e) { presenter(); e.preventDefault(); } );