From 66f4961c38effa408a48d6d801787958b0a5e6fe Mon Sep 17 00:00:00 2001 From: Pitu Date: Tue, 17 Jan 2017 19:35:18 -0300 Subject: [PATCH] Better link display on homepage --- pages/home.html | 10 +++++++--- public/js/upload.js | 8 +++++--- routes/api.js | 5 ++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/pages/home.html b/pages/home.html index aa1434b..50ad9d3 100644 --- a/pages/home.html +++ b/pages/home.html @@ -27,8 +27,6 @@ Check

- View on Github -
@@ -41,7 +39,13 @@
- +
diff --git a/public/js/upload.js b/public/js/upload.js index f5e8427..8f36fa5 100644 --- a/public/js/upload.js +++ b/public/js/upload.js @@ -2,12 +2,14 @@ var upload = {}; upload.isPrivate = true; upload.token = localStorage.token; +upload.maxFileSize; upload.checkIfPublic = function(){ var xhr = new XMLHttpRequest(); xhr.onreadystatechange = function() { if (xhr.readyState == XMLHttpRequest.DONE) { upload.isPublic = JSON.parse(xhr.responseText).private; + upload.maxFileSize = JSON.parse(xhr.responseText).maxFileSize; upload.preparePage(); } } @@ -62,7 +64,6 @@ upload.prepareUpload = function(){ div.innerHTML = 'Click here or drag and drop files'; div.style.display = 'flex'; - document.getElementById('btnGithub').style.display = 'none'; document.getElementById('tokenContainer').style.display = 'none'; document.getElementById('uploadContainer').appendChild(div); document.getElementById('panel').style.display = 'block'; @@ -81,6 +82,7 @@ upload.prepareDropzone = function(){ var dropzone = new Dropzone('div#dropzone', { url: '/api/upload', paramName: 'files[]', + maxFilesize: upload.maxFileSize.slice(0, -2), parallelUploads: 2, uploadMultiple: false, previewsContainer: 'div#uploads', @@ -89,13 +91,13 @@ upload.prepareDropzone = function(){ maxFiles: 1000, autoProcessQueue: true, headers: { - 'auth': localStorage.token + 'auth': upload.token }, init: function() { this.on('addedfile', function(file) { document.getElementById('uploads').style.display = 'block'; }); - } + } }); // Update the total progress bar diff --git a/routes/api.js b/routes/api.js index c2ce8a8..ca9c7c0 100644 --- a/routes/api.js +++ b/routes/api.js @@ -5,7 +5,10 @@ const albumsController = require('../controllers/albumsController') const tokenController = require('../controllers/tokenController') routes.get ('/check', (req, res, next) => { - return res.json({ private: config.private }) + return res.json({ + private: config.private, + maxFileSize: config.uploads.maxsize + }) }) routes.get ('/uploads', (req, res, next) => uploadController.list(req, res))