From 0c6912d2c344253dc116d17a78ae364c53cb1eaa Mon Sep 17 00:00:00 2001 From: kanadeko Date: Sun, 15 Jan 2017 03:15:08 -0300 Subject: stuff --- public/css/style.css | 2 +- public/js/.DS_Store | Bin 0 -> 6148 bytes public/js/panel.js | 0 public/js/upload.js | 43 +++++++++++++++++++++++++++++++++---------- 4 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 public/js/.DS_Store create mode 100644 public/js/panel.js (limited to 'public') diff --git a/public/css/style.css b/public/css/style.css index 324bb9d..fcd4923 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -50,7 +50,7 @@ div#dropzone:hover { color: #fff; } -div#uploads, p#tokenContainer { display: none; } +div#uploads, p#tokenContainer, a#panel { display: none; } img.logo { height: 200px; margin-top: 20px; } .dz-preview .dz-details { display: flex; } diff --git a/public/js/.DS_Store b/public/js/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/public/js/.DS_Store differ diff --git a/public/js/panel.js b/public/js/panel.js new file mode 100644 index 0000000..e69de29 diff --git a/public/js/upload.js b/public/js/upload.js index 488ca3a..be15ace 100644 --- a/public/js/upload.js +++ b/public/js/upload.js @@ -1,15 +1,33 @@ window.onload = function () { + var USINGTOKEN; var maxSize = '512'; - if(!localStorage.token){ - document.getElementById('tokenContainer').style.display = 'flex' - document.getElementById("tokenSubmit").addEventListener("click", function(){ - getInfo(document.getElementById("token").value) - }); - }else{ - getInfo(localStorage.token); + // First check to see if the service is using token or not + var xhr = new XMLHttpRequest(); + xhr.onreadystatechange = function() { + if (xhr.readyState == XMLHttpRequest.DONE) { + USINGTOKEN = JSON.parse(xhr.responseText).token; + prepareTokenThing(); + } + } + xhr.open('GET', '/api/check', true); + xhr.send(null); + + function prepareTokenThing(){ + + if(!USINGTOKEN) return getInfo(); + + if(!localStorage.token){ + document.getElementById('tokenContainer').style.display = 'flex' + document.getElementById("tokenSubmit").addEventListener("click", function(){ + getInfo(document.getElementById("token").value) + }); + }else{ + getInfo(localStorage.token); + } + } function prepareDropzone(){ @@ -73,15 +91,20 @@ window.onload = function () { document.getElementById('btnGithub').style.display = 'none'; document.getElementById('tokenContainer').style.display = 'none'; document.getElementById('uploadContainer').appendChild(div); - - if(xhr.responseText.maxFileSize) maxSize = xhr.responseText.maxFileSize; + document.getElementById('panel').style.display = 'block'; + + if(xhr.responseText.maxFileSize) maxSize = JSON.parse(xhr.responseText).maxFileSize; if(token) localStorage.token = token; + prepareDropzone(); } } } xhr.open('GET', '/api/info', true); - xhr.setRequestHeader('auth', token); + + if(token !== undefined) + xhr.setRequestHeader('auth', token); + xhr.send(null); } }; \ No newline at end of file -- cgit v1.2.3