diff --git a/.DS_Store b/.DS_Store index e7e02f6..b5ffce1 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/README.md b/README.md index e4760af..4ed8b7a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![loli-safe](https://i.imgur.com/YqO1nuc.png) +![loli-safe](https://i.kanacchi.moe/m9pi.png) # loli-safe Pomf-like image uploading service, written in NodeJS diff --git a/public/.DS_Store b/public/.DS_Store index 213a4b9..0a0d8a3 100644 Binary files a/public/.DS_Store and b/public/.DS_Store differ diff --git a/public/index.html b/public/index.html index dcd4697..bbf12e1 100644 --- a/public/index.html +++ b/public/index.html @@ -5,6 +5,7 @@ + @@ -39,7 +40,7 @@

- +

@@ -50,67 +51,5 @@ - - \ No newline at end of file diff --git a/public/js/envResolver.js b/public/js/envResolver.js deleted file mode 100644 index a7419b4..0000000 --- a/public/js/envResolver.js +++ /dev/null @@ -1,83 +0,0 @@ -var http = function (url, success, failure) { - var request = new XMLHttpRequest(); - request.open("GET", url, true); - request.send(null); - request.onreadystatechange = function () { - if (request.readyState == 4) { - if (request.status == 200) - success(request.responseText); - else if (failure) - failure(request.status, request.statusText); - } - }; -}; -var mockXhr = function () { - XMLHttpRequest = XhrMock; - FormData = FormDataMock; -}; -var resolveEnvironment = function () { - if (window.location.href.toString().toLowerCase().indexOf('file://') >= 0) { - mockXhr(); - return; - } - http('api/check', function (result) { - if (result !== 'API OK') - mockXhr(); - }, function () { - mockXhr(); - }); -}; -var FormDataMock = (function () { - function FormDataMock() { - this.data = {}; - } - FormDataMock.prototype.append = function (key, data, additional) { - this.data[key] = { data: data, additional: additional }; - }; - return FormDataMock; -})(); -var XhrMock = (function () { - function XhrMock() { - this.loaded = 0; - this.step = 2000000; - this.readyState = 0; - this.status = 0; - this.upload = { onprogress: function () { } }; - } - XhrMock.prototype.open = function (method, url, async) { - }; - XhrMock.prototype.setRequestHeader = function (name, value) { - }; - XhrMock.prototype.send = function (formData) { - this.file = formData.data['file'].data; - this.performStep(); - }; - XhrMock.prototype.abort = function () { - window.clearTimeout(this.timeoutId); - }; - XhrMock.prototype.performStep = function () { - var _this = this; - this.timeoutId = window.setTimeout(function () { - if (_this.addStep() === _this.file.size) { - _this.readyState = 4; - _this.status = 200; - _this.onload(new Event('loaded')); - } - else { - var e = { - lengthComputable: true, - loaded: _this.loaded, - total: _this.file.size - }; - _this.upload.onprogress(e); - _this.performStep(); - } - }, 100); - }; - XhrMock.prototype.addStep = function () { - var newValue = this.loaded + this.step; - this.loaded = newValue > this.file.size ? this.file.size : newValue; - return this.loaded; - }; - return XhrMock; -})(); diff --git a/public/js/pureupload.min.js b/public/js/pureupload.min.js deleted file mode 100755 index 508ffb6..0000000 --- a/public/js/pureupload.min.js +++ /dev/null @@ -1 +0,0 @@ -var pu;!function(t){function e(t,e,i){if(t.addEventListener)t.addEventListener(e,i);else{var o=t;o.attachEvent?o.attachEvent("on"+e,i):o[e]=i}}function i(t,e){var i;return i="object"==typeof t?c(o(u(t),function(t){return"length"!==t}),function(e){return t[e]}):t,n(i,function(t){t.uploadStatus=e||t.uploadStatus,t.responseCode=t.responseCode||0,t.responseText=t.responseText||"",t.progress=t.progress||0,t.sentBytes=t.sentBytes||0,t.cancel=t.cancel||function(){}}),i}function o(t,e){var i=[];return t?(n(t,function(t){e(t)&&i.push(t)}),i):i}function n(t,e){if(t)for(var i=0;ie||0===t.size)},o.prototype.isFileTypeInvalid=function(t){if(t.name&&this.options.accept&&("*"!==this.options.accept.trim()||"*.*"!==this.options.accept.trim())&&this.options.validateExtension&&this.options.accept.indexOf("/")===-1){var e=this.options.accept.split(","),i=t.name.substring(t.name.lastIndexOf("."),t.name.length);if(i.indexOf(".")===-1)return!0;for(var o=!0,n=0;n=0&&(this.uploadAreas[e].destroy(),this.uploadAreas.splice(e,1))},t}();t.Uploader=m;var F=function(){function e(t,e){this.queuedFiles=[],this.options=t,this.callbacks=e,this.setFullOptions(),this.setFullCallbacks()}return e.prototype.addFiles=function(t){var e=this;n(t,function(t){e.queuedFiles.push(t),t.remove=s(t.remove,function(){e.removeFile(t)}),e.callbacks.onFileAddedCallback&&e.callbacks.onFileAddedCallback(t),t.uploadStatus===g.failed?e.callbacks.onErrorCallback&&e.callbacks.onErrorCallback(t):t.uploadStatus=g.queued}),this.filesChanged()},e.prototype.removeFile=function(t,e){void 0===e&&(e=!1);var i=p(this.queuedFiles,t);i<0||(this.deactivateFile(t),this.queuedFiles.splice(i,1),this.callbacks.onFileRemovedCallback&&this.callbacks.onFileRemovedCallback(t),e||this.filesChanged())},e.prototype.clearFiles=function(t,e){var i=this;void 0===t&&(t=[]),void 0===e&&(e=!1),e||(t=t.concat([g.queued,g.uploading])),n(o(this.queuedFiles,function(e){return p(t,e.uploadStatus)<0}),function(t){return i.removeFile(t,!0)}),this.callbacks.onQueueChangedCallback&&this.callbacks.onQueueChangedCallback(this.queuedFiles)},e.prototype.filesChanged=function(){this.options.autoRemove&&this.removeFinishedFiles(),this.options.autoStart&&this.startWaitingFiles(),this.callbacks.onQueueChangedCallback&&this.callbacks.onQueueChangedCallback(this.queuedFiles),this.checkAllFinished()},e.prototype.checkAllFinished=function(){var t=o(this.queuedFiles,function(t){return p([g.queued,g.uploading],t.uploadStatus)>=0});0===t.length&&this.callbacks.onAllFinishedCallback&&this.callbacks.onAllFinishedCallback()},e.prototype.setFullOptions=function(){this.options.maxParallelUploads=this.options.maxParallelUploads||0,this.options.autoStart=t.isFileApi&&(this.options.autoStart||!1),this.options.autoRemove=this.options.autoRemove||!1},e.prototype.setFullCallbacks=function(){var t=this;this.callbacks.onFileAddedCallback=this.callbacks.onFileAddedCallback||function(){},this.callbacks.onFileRemovedCallback=this.callbacks.onFileRemovedCallback||function(){},this.callbacks.onAllFinishedCallback=this.callbacks.onAllFinishedCallback||function(){},this.callbacks.onQueueChangedCallback=this.callbacks.onQueueChangedCallback||function(){},this.callbacks.onFileStateChangedCallback=function(){return t.filesChanged()}},e.prototype.startWaitingFiles=function(){n(this.getWaitingFiles(),function(t){return t.start()})},e.prototype.removeFinishedFiles=function(){var t=this;n(o(this.queuedFiles,function(t){return p([g.uploaded,g.canceled],t.uploadStatus)>=0}),function(e){return t.removeFile(e,!0)})},e.prototype.deactivateFile=function(t){t.uploadStatus===g.uploading&&t.cancel(),t.uploadStatus=g.removed,t.cancel=function(){},t.remove=function(){},t.start=function(){}},e.prototype.getWaitingFiles=function(){if(!this.options.autoStart)return[];var t=o(this.queuedFiles,function(t){return t.uploadStatus===g.queued});if(this.options.maxParallelUploads>0){var e=o(this.queuedFiles,function(t){return t.uploadStatus===g.uploading}).length,i=this.options.maxParallelUploads-e;if(i<=0)return[];t=t.slice(0,i)}return t},e}();t.UploadQueue=F;var g;!function(t){t[t.queued=0]="queued",t[t.uploading=1]="uploading",t[t.uploaded=2]="uploaded",t[t.failed=3]="failed",t[t.canceled=4]="canceled",t[t.removed=5]="removed"}(g=t.UploadStatus||(t.UploadStatus={}))}(pu||(pu={})); \ No newline at end of file diff --git a/public/js/queueRenderer.js b/public/js/queueRenderer.js deleted file mode 100644 index ae06531..0000000 --- a/public/js/queueRenderer.js +++ /dev/null @@ -1,87 +0,0 @@ -var getQueueRenderer = function () { - return new QueueRenderer(); -}; -var QueueRenderer = (function () { - function QueueRenderer() { - } - QueueRenderer.prototype.createTextDiv = function (className, value) { - var element = document.createElement("div"); - element.className = className; - element.innerHTML = value; - return element; - }; - QueueRenderer.prototype.createButton = function (value, callback) { - var element = document.createElement("button"); - element.className = "table-row-button"; - element.innerHTML = value; - element.addEventListener("click", callback); - return element; - }; - QueueRenderer.prototype.createQueueRow = function (file, queueSettings) { - var itemRow = document.createElement("div"); - itemRow.id = file.guid; - itemRow.className = "table-row-item"; - this.renderQueueRowContent(itemRow, file, queueSettings); - return itemRow; - }; - QueueRenderer.prototype.translateFileStatus = function (file) { - console.log(file) - console.log(pu) - switch (file.uploadStatus.toString()) { - case pu.UploadStatus.queued: - return "Queued"; - case pu.UploadStatus.uploading: - return "Uploading"; - case pu.UploadStatus.uploaded: - return "Uploaded"; - case pu.UploadStatus.failed: - return "Failed"; - case pu.UploadStatus.canceled: - return "Canceled"; - } - return "Unknown"; - }; - QueueRenderer.prototype.renderQueueRowContent = function (itemRow, file, queueSettings) { - while (itemRow.firstChild) - itemRow.removeChild(itemRow.firstChild); - itemRow.appendChild(this.createTextDiv('table-row-item-status', this.translateFileStatus(file))); - itemRow.appendChild(this.createTextDiv('table-row-item-name', file.name)); - itemRow.appendChild(this.createTextDiv('table-row-item-progress', file.progress.toString() + "%")); - switch (file.uploadStatus.toString()) { - case pu.UploadStatus.queued: - if (!queueSettings.autoStart) { - itemRow.appendChild(this.createButton("Start", function () { return file.start(); })); - break; - } - case pu.UploadStatus.uploading: - itemRow.appendChild(this.createButton("Cancel", function () { return file.cancel(); })); - break; - case pu.UploadStatus.uploaded: - case pu.UploadStatus.failed: - case pu.UploadStatus.canceled: - itemRow.appendChild(this.createButton("Delete", function () { return file.remove(); })); - break; - } - }; - QueueRenderer.prototype.renderItemProgress = function (queueId, file) { - var itemRow = document.getElementById(file.guid); - for (var i = 0; i < itemRow.childNodes.length; i++) { - var node = itemRow.childNodes[i]; - if (node.attributes.getNamedItem('class').value == 'table-row-item-progress') { - node.textContent = file.progress.toString() + "%"; - break; - } - } - }; - QueueRenderer.prototype.renderQueue = function (queueId, queueTitle, files, queueSettings) { - var _this = this; - var queue = document.getElementById(queueId); - while (queue.firstChild) - queue.removeChild(queue.firstChild); - queue.appendChild(this.createTextDiv("table-header-title", queueTitle)); - files.forEach(function (file) { - queue.appendChild(_this.createQueueRow(file, queueSettings)); - }); - }; - return QueueRenderer; -})(); diff --git a/public/js/upload.js b/public/js/upload.js new file mode 100644 index 0000000..4795679 --- /dev/null +++ b/public/js/upload.js @@ -0,0 +1,56 @@ +var maxSize = '512'; +var urlPrefix = ''; + +var xhr = new XMLHttpRequest(); +xhr.onreadystatechange = function() { + if (xhr.readyState == XMLHttpRequest.DONE) { + if(xhr.responseText !== 'not-authorized'){ + document.getElementById('btnGithub').style.display = 'none'; + document.getElementById('dropzone').style.display = 'flex'; + } + if(xhr.responseText.maxFileSize) + maxSize = xhr.responseText.maxFileSize; + if(xhr.responseText.urlPrefix) + urlPrefix = xhr.responseText.urlPrefix + '/'; + } +} +xhr.open('GET', '/api/info', true); +xhr.send(null); + +window.onload = function () { + + var previewNode = document.querySelector("#template"); + previewNode.id = ""; + var previewTemplate = previewNode.parentNode.innerHTML; + previewNode.parentNode.removeChild(previewNode); + + var dropzone = new Dropzone('div#dropzone', { + url: '/api/upload', + paramName: 'file', + maxFilesize: maxSize, + parallelUploads: 2, + uploadMultiple: false, + previewsContainer: 'div#uploads', + previewTemplate: previewTemplate, + createImageThumbnails: false, + maxFiles: 1000, + autoProcessQueue: true + }); + + // Update the total progress bar + dropzone.on("uploadprogress", function(file, progress) { + file.previewElement.querySelector(".progress").style.width = progress + "%"; + }); + + dropzone.on("success", function(file, response) { + // Handle the responseText here. For example, add the text to the preview element: + a = document.createElement('a'); + a.href = window.location.origin + '/' + urlPrefix + response.filename; + a.target = '_blank'; + a.innerHTML = response.filename; + + file.previewTemplate.querySelector(".progress").style.display = 'none'; + file.previewTemplate.querySelector(".link").appendChild(a); + }); + +}; \ No newline at end of file