From fe10a00ba9a3c30d8718ca004ccd19518466f5bd Mon Sep 17 00:00:00 2001
From: Pitu <7425261+Pitu@users.noreply.github.com>
Date: Sun, 16 Sep 2018 01:09:02 -0300
Subject: Site

---
 src/site/components/uploader/Uploader.vue | 251 ++++++++++++++++++++++++++++++
 1 file changed, 251 insertions(+)
 create mode 100644 src/site/components/uploader/Uploader.vue

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
new file mode 100644
index 0000000..fcb79cb
--- /dev/null
+++ b/src/site/components/uploader/Uploader.vue
@@ -0,0 +1,251 @@
+<template>
+	<div :class="{ hasFiles: files.length > 0 }"
+		class="uploader-wrapper">
+		<b-select v-if="loggedIn"
+			v-model="selectedAlbum"
+			placeholder="Upload to album"
+			size="is-medium"
+			expanded>
+			<option
+				v-for="album in albums"
+				:value="album.id"
+				:key="album.id">
+				{{ album.name }}
+			</option>
+		</b-select>
+		<dropzone v-if="showDropzone"
+			id="dropzone"
+			ref="el"
+			:options="dropzoneOptions"
+			:include-styling="false"
+			@vdropzone-success="dropzoneSuccess"
+			@vdropzone-error="dropzoneError"
+			@vdropzone-files-added="dropzoneFilesAdded" />
+
+		<div id="template"
+			ref="template">
+			<div class="dz-preview dz-file-preview">
+				<div class="dz-details">
+					<div class="dz-filename"><span data-dz-name/></div>
+					<div class="dz-size"><span data-dz-size/></div>
+				</div>
+				<div class="result">
+					<div class="copyLink">
+						<b-tooltip label="Copy link">
+							<i class="icon-web-code"/>
+						</b-tooltip>
+					</div>
+					<div class="openLink">
+						<b-tooltip label="Open file">
+							<a class="link"
+								target="_blank">
+								<i class="icon-web-url"/>
+							</a>
+						</b-tooltip>
+					</div>
+				</div>
+				<div class="error">
+					<div>
+						<span>
+							<span class="error-message"
+								data-dz-errormessage/>
+							<i class="icon-web-warning"/>
+						</span>
+					</div>
+				</div>
+				<div class="dz-progress">
+					<span class="dz-upload"
+						data-dz-uploadprogress/>
+				</div>
+				<!--
+				<div class="dz-error-message"><span data-dz-errormessage/></div>
+				<div class="dz-success-mark"><i class="fa fa-check"/></div>
+				<div class="dz-error-mark"><i class="fa fa-close"/></div>
+				-->
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import Dropzone from 'nuxt-dropzone';
+import '../../styles/dropzone.scss';
+
+export default {
+	components: { Dropzone },
+	data() {
+		return {
+			files: [],
+			dropzoneOptions: {},
+			showDropzone: false,
+			albums: [],
+			selectedAlbum: null
+		};
+	},
+	computed: {
+		config() {
+			return this.$store.state.config;
+		},
+		token() {
+			return this.$store.state.token;
+		},
+		loggedIn() {
+			return this.$store.state.loggedIn;
+		}
+	},
+	watch: {
+		loggedIn() {
+			this.getAlbums();
+		},
+		selectedAlbum() {
+			this.updateDropzoneConfig();
+		}
+	},
+	mounted() {
+		this.dropzoneOptions = {
+			url: `${this.$config.baseURL}/upload`,
+			autoProcessQueue: true,
+			addRemoveLinks: false,
+			parallelUploads: 5,
+			uploadMultiple: false,
+			maxFiles: 1000,
+			createImageThumbnails: false,
+			paramName: 'file',
+			chunking: true,
+			retryChunks: true,
+			retryChunksLimit: 3,
+			parallelChunkUploads: false,
+			chunkSize: this.config.chunkSize * 1000000,
+			chunksUploaded: this.dropzoneChunksUploaded,
+			maxFilesize: this.config.maxFileSize,
+			previewTemplate: this.$refs.template.innerHTML,
+			dictDefaultMessage: 'Drag & Drop your files or click to browse',
+			headers: { Accept: 'application/vnd.lolisafe.json' }
+		};
+		this.showDropzone = true;
+		if (this.loggedIn) this.getAlbums();
+	},
+	methods: {
+		/*
+			Get all available albums so the user can upload directly to one (or several soon™) of them.
+		*/
+		async getAlbums() {
+			try {
+				const response = await this.axios.get(`${this.$config.baseURL}/albums/dropdown`);
+				this.albums = response.data.albums;
+				this.updateDropzoneConfig();
+			} catch (error) {
+				this.$onPromiseError(error);
+			}
+		},
+
+		/*
+			This method needs to be called after the token or selectedAlbum changes
+			since dropzone doesn't seem to update the config values unless you force it.
+			Tch.
+		*/
+		updateDropzoneConfig() {
+			this.$refs.el.setOption('headers', {
+				Accept: 'application/vnd.lolisafe.json',
+				Authorization: this.token ? `Bearer ${this.token}` : '',
+				albumId: this.selectedAlbum ? this.selectedAlbum : null
+			});
+		},
+
+		/*
+			Dropzone stuff
+		*/
+		dropzoneFilesAdded(files) {
+			// console.log(files);
+		},
+		dropzoneSuccess(file, response) {
+			this.processResult(file, response);
+		},
+		dropzoneError(file, message, xhr) {
+			this.$showToast('There was an error uploading this file. Check the console.', true, 5000);
+			console.error(file, message, xhr);
+		},
+		dropzoneChunksUploaded(file, done) {
+			const response = JSON.parse(file.xhr.response);
+			if (!response.url) {
+				console.error('There was a problem uploading the file?');
+				return done();
+			}
+
+			this.processResult(file, response);
+			this.$forceUpdate();
+			return done();
+		},
+
+		/*
+			If upload/s was/were successfull we modify the template so that the buttons for
+			copying the returned url or opening it in a new window appear.
+		*/
+		processResult(file, response) {
+			if (!response.url) return;
+			file.previewTemplate.querySelector('.link').setAttribute('href', response.url);
+			file.previewTemplate.querySelector('.copyLink').addEventListener('click', () => {
+				this.$showToast('Link copied!', false, 1000);
+				this.$clipboard(response.url);
+			});
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+	#template { display: none; }
+	.uploader-wrapper {
+		display: block;
+		width: 400px;
+		margin: 0 auto;
+		max-width: 100%;
+		transition-duration: 86ms;
+		transition-property: box-shadow,-webkit-transform;
+		transition-property: box-shadow,transform;
+		transition-property: box-shadow,transform,-webkit-transform;
+		will-change: box-shadow,transform;
+
+		&:hover, &.hasFiles {
+			box-shadow: 0 1rem 3rem 0rem rgba(10, 10, 10, 0.25);
+			-webkit-transform: translateY(-.5rem);
+			transform: translateY(-.5rem);
+		}
+	}
+</style>
+<style lang="scss">
+	@import '../../styles/colors.scss';
+	.filepond--panel-root {
+		background: transparent;
+		border: 2px solid #2c3340;
+	}
+	.filepond--drop-label {
+		color: #c7ccd8;
+		pointer-events: none;
+	}
+
+	.filepond--item-panel {
+		background-color: #767b8b;
+	}
+
+	.filepond--root .filepond--drip-blob {
+		background-color: #7f8a9a
+	}
+
+	.filepond--drip {
+		background: black;
+	}
+
+	div.uploader-wrapper {
+		div.control {
+			margin-bottom: 5px;
+			span.select {
+				select {
+					border: 2px solid #2c3340;
+					background: rgba(0, 0, 0, 0.15);
+					border-radius: .3em;
+					color: $uploaderDropdownColor;
+				}
+			}
+		}
+	}
+</style>
-- 
cgit v1.2.3


From 41cb8ff9861a88366a65ecfcf6b077a3d5f1615c Mon Sep 17 00:00:00 2001
From: Pitu <7425261+Pitu@users.noreply.github.com>
Date: Tue, 18 Sep 2018 01:44:46 -0300
Subject: Add an add more files button to the uploader

---
 src/site/components/uploader/Uploader.vue | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index fcb79cb..afafd55 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :class="{ hasFiles: files.length > 0 }"
+	<div :class="{ 'has-files': alreadyAddedFiles }"
 		class="uploader-wrapper">
 		<b-select v-if="loggedIn"
 			v-model="selectedAlbum"
@@ -21,6 +21,9 @@
 			@vdropzone-success="dropzoneSuccess"
 			@vdropzone-error="dropzoneError"
 			@vdropzone-files-added="dropzoneFilesAdded" />
+		<label class="add-more">
+			Add more files
+		</label>
 
 		<div id="template"
 			ref="template">
@@ -75,6 +78,7 @@ export default {
 	components: { Dropzone },
 	data() {
 		return {
+			alreadyAddedFiles: false,
 			files: [],
 			dropzoneOptions: {},
 			showDropzone: false,
@@ -156,6 +160,7 @@ export default {
 			Dropzone stuff
 		*/
 		dropzoneFilesAdded(files) {
+			this.alreadyAddedFiles = true;
 			// console.log(files);
 		},
 		dropzoneSuccess(file, response) {
@@ -236,6 +241,20 @@ export default {
 	}
 
 	div.uploader-wrapper {
+		&.has-files {
+			#dropzone {
+				padding-bottom: 50px;
+			}
+			label.add-more {
+				position: absolute;
+				bottom: 23px;
+				width: 100%;
+				text-align: center;
+				color: #797979;
+				display: block;
+				pointer-events: none;
+			}
+		}
 		div.control {
 			margin-bottom: 5px;
 			span.select {
@@ -247,5 +266,6 @@ export default {
 				}
 			}
 		}
+		label.add-more { display: none; }
 	}
 </style>
-- 
cgit v1.2.3


From 430af8306b1ab17e59a6dabf8f65ab816d28695d Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Wed, 19 Sep 2018 04:45:50 -0300
Subject: Switch to Nuxt.js

---
 src/site/components/uploader/Uploader.vue | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index afafd55..bc157bb 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -8,8 +8,8 @@
 			expanded>
 			<option
 				v-for="album in albums"
-				:value="album.id"
-				:key="album.id">
+				:key="album.id"
+				:value="album.id">
 				{{ album.name }}
 			</option>
 		</b-select>
@@ -29,20 +29,20 @@
 			ref="template">
 			<div class="dz-preview dz-file-preview">
 				<div class="dz-details">
-					<div class="dz-filename"><span data-dz-name/></div>
-					<div class="dz-size"><span data-dz-size/></div>
+					<div class="dz-filename"><span data-dz-name /></div>
+					<div class="dz-size"><span data-dz-size /></div>
 				</div>
 				<div class="result">
 					<div class="copyLink">
 						<b-tooltip label="Copy link">
-							<i class="icon-web-code"/>
+							<i class="icon-web-code" />
 						</b-tooltip>
 					</div>
 					<div class="openLink">
 						<b-tooltip label="Open file">
 							<a class="link"
 								target="_blank">
-								<i class="icon-web-url"/>
+								<i class="icon-web-url" />
 							</a>
 						</b-tooltip>
 					</div>
@@ -51,14 +51,14 @@
 					<div>
 						<span>
 							<span class="error-message"
-								data-dz-errormessage/>
-							<i class="icon-web-warning"/>
+								data-dz-errormessage />
+							<i class="icon-web-warning" />
 						</span>
 					</div>
 				</div>
 				<div class="dz-progress">
 					<span class="dz-upload"
-						data-dz-uploadprogress/>
+						data-dz-uploadprogress />
 				</div>
 				<!--
 				<div class="dz-error-message"><span data-dz-errormessage/></div>
@@ -72,7 +72,7 @@
 
 <script>
 import Dropzone from 'nuxt-dropzone';
-import '../../styles/dropzone.scss';
+import '~/assets/styles/dropzone.scss';
 
 export default {
 	components: { Dropzone },
@@ -107,7 +107,7 @@ export default {
 	},
 	mounted() {
 		this.dropzoneOptions = {
-			url: `${this.$config.baseURL}/upload`,
+			url: `${this.config.baseURL}/upload`,
 			autoProcessQueue: true,
 			addRemoveLinks: false,
 			parallelUploads: 5,
@@ -135,7 +135,7 @@ export default {
 		*/
 		async getAlbums() {
 			try {
-				const response = await this.axios.get(`${this.$config.baseURL}/albums/dropdown`);
+				const response = await this.axios.get(`${this.config.baseURL}/albums/dropdown`);
 				this.albums = response.data.albums;
 				this.updateDropzoneConfig();
 			} catch (error) {
@@ -218,7 +218,7 @@ export default {
 	}
 </style>
 <style lang="scss">
-	@import '../../styles/colors.scss';
+	@import '~/assets/styles/_colors.scss';
 	.filepond--panel-root {
 		background: transparent;
 		border: 2px solid #2c3340;
-- 
cgit v1.2.3


From ea3e503d13b7be477c064b02b9b2e5a9ef06c9a9 Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Fri, 29 Mar 2019 00:35:58 +0900
Subject: Added middleware for pages and switched to $axios

---
 src/site/components/uploader/Uploader.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index bc157bb..d81df56 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -135,8 +135,8 @@ export default {
 		*/
 		async getAlbums() {
 			try {
-				const response = await this.axios.get(`${this.config.baseURL}/albums/dropdown`);
-				this.albums = response.data.albums;
+				const response = await this.$axios.$get(`albums/dropdown`);
+				this.albums = response.albums;
 				this.updateDropzoneConfig();
 			} catch (error) {
 				this.$onPromiseError(error);
-- 
cgit v1.2.3


From 3bd8d119ba88e940932eca50be406d50d73040fb Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Wed, 24 Apr 2019 08:36:28 +0000
Subject: Refactor a bit since we globally catch API exceptions

---
 src/site/components/uploader/Uploader.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index d81df56..6a4da8b 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -134,13 +134,9 @@ export default {
 			Get all available albums so the user can upload directly to one (or several soon™) of them.
 		*/
 		async getAlbums() {
-			try {
-				const response = await this.$axios.$get(`albums/dropdown`);
-				this.albums = response.albums;
-				this.updateDropzoneConfig();
-			} catch (error) {
-				this.$onPromiseError(error);
-			}
+			const response = await this.$axios.$get(`albums/dropdown`);
+			this.albums = response.albums;
+			this.updateDropzoneConfig();
 		},
 
 		/*
@@ -161,13 +157,15 @@ export default {
 		*/
 		dropzoneFilesAdded(files) {
 			this.alreadyAddedFiles = true;
-			// console.log(files);
 		},
 		dropzoneSuccess(file, response) {
 			this.processResult(file, response);
 		},
 		dropzoneError(file, message, xhr) {
-			this.$showToast('There was an error uploading this file. Check the console.', true, 5000);
+			this.$store.dispatch('alert', {
+				text: 'There was an error uploading this file. Check the console.',
+				error: true
+			});
 			console.error(file, message, xhr);
 		},
 		dropzoneChunksUploaded(file, done) {
@@ -190,7 +188,9 @@ export default {
 			if (!response.url) return;
 			file.previewTemplate.querySelector('.link').setAttribute('href', response.url);
 			file.previewTemplate.querySelector('.copyLink').addEventListener('click', () => {
-				this.$showToast('Link copied!', false, 1000);
+				this.$store.dispatch('alert', {
+					text: 'Link copied!'
+				});
 				this.$clipboard(response.url);
 			});
 		}
-- 
cgit v1.2.3


From ca9e1c859d714b6646d010d099e318fff2ba5b70 Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Tue, 30 Apr 2019 16:01:38 +0000
Subject: Add parallel chunks and raise timeout

---
 src/site/components/uploader/Uploader.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index 6a4da8b..dda404f 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -108,6 +108,7 @@ export default {
 	mounted() {
 		this.dropzoneOptions = {
 			url: `${this.config.baseURL}/upload`,
+			timeout: 300000, // 5 minutes
 			autoProcessQueue: true,
 			addRemoveLinks: false,
 			parallelUploads: 5,
@@ -118,7 +119,7 @@ export default {
 			chunking: true,
 			retryChunks: true,
 			retryChunksLimit: 3,
-			parallelChunkUploads: false,
+			parallelChunkUploads: true,
 			chunkSize: this.config.chunkSize * 1000000,
 			chunksUploaded: this.dropzoneChunksUploaded,
 			maxFilesize: this.config.maxFileSize,
-- 
cgit v1.2.3


From 579e1e754ab59a69925b5114641174aa70d18555 Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Tue, 1 Oct 2019 14:11:16 -0300
Subject: feature: uploader with chunks support

---
 src/site/components/uploader/Uploader.vue | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index dda404f..d9ed46a 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -108,14 +108,15 @@ export default {
 	mounted() {
 		this.dropzoneOptions = {
 			url: `${this.config.baseURL}/upload`,
-			timeout: 300000, // 5 minutes
+			timeout: 600000, // 10 minutes
 			autoProcessQueue: true,
 			addRemoveLinks: false,
 			parallelUploads: 5,
 			uploadMultiple: false,
 			maxFiles: 1000,
 			createImageThumbnails: false,
-			paramName: 'file',
+			paramName: 'files[]',
+			forceChunking: false,
 			chunking: true,
 			retryChunks: true,
 			retryChunksLimit: 3,
@@ -169,14 +170,18 @@ export default {
 			});
 			console.error(file, message, xhr);
 		},
-		dropzoneChunksUploaded(file, done) {
-			const response = JSON.parse(file.xhr.response);
-			if (!response.url) {
-				console.error('There was a problem uploading the file?');
-				return done();
-			}
+		async dropzoneChunksUploaded(file, done) {
+			const { data } = await this.$axios.post(`${this.config.baseURL}/upload/chunks`, {
+				files: [{
+					uuid: file.upload.uuid,
+					original: file.name,
+					size: file.size,
+					type: file.type,
+					count: file.upload.totalChunkCount
+				}]
+			});
 
-			this.processResult(file, response);
+			this.processResult(file, data);
 			this.$forceUpdate();
 			return done();
 		},
-- 
cgit v1.2.3


From 3680432bdfe49fc2416e50b3e91a740bbe66cfa8 Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Tue, 1 Oct 2019 14:20:37 -0300
Subject: chore: prepare for filepond

---
 src/site/components/uploader/Filepond.vue | 97 +++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 src/site/components/uploader/Filepond.vue

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Filepond.vue b/src/site/components/uploader/Filepond.vue
new file mode 100644
index 0000000..1ee5288
--- /dev/null
+++ b/src/site/components/uploader/Filepond.vue
@@ -0,0 +1,97 @@
+<template>
+	<file-pond
+		ref="pond"
+		name="test"
+		class="pond"
+		class-name="my-pond"
+		label-idle="Drop files here or click to browse"
+		:allow-multiple="true"
+		:files="myFiles"
+		:max-files="1000"
+		:chunk-uploads="true"
+		:chunk-size:="50 * 1000000"
+		:server="server"
+		@init="handleFilePondInit"
+		@error="handleFilePondError"
+		@addfile="handleFilePondAddFile" />
+</template>
+
+<script>
+// Import Vue FilePond
+import vueFilePond from 'vue-filepond';
+
+// Import FilePond styles
+import 'filepond/dist/filepond.min.css';
+
+// Import FilePond plugins
+// Please note that you need to install these plugins separately
+
+// Import image preview plugin styles
+// import 'filepond-plugin-image-preview/dist/filepond-plugin-image-preview.min.css';
+
+// Import image preview and file type validation plugins
+// import FilePondPluginFileValidateType from 'filepond-plugin-file-validate-type';
+// import FilePondPluginImagePreview from 'filepond-plugin-image-preview';
+
+// Create component
+const FilePond = vueFilePond(); // FilePondPluginFileValidateType, FilePondPluginImagePreview);
+
+export default {
+	components: {
+		FilePond
+	},
+	data() {
+		return {
+			myFiles: [],
+			server: {
+				url: 'http://localhost:5000',
+				process: {
+					url: '/api/upload',
+					method: 'POST',
+					headers: {
+						'Accept': 'application/vnd.lolisafe.json'
+					},
+					timeout: 300000, // 5 minutes
+					onload: response => console.log(response)
+				}
+			}
+		};
+	},
+	methods: {
+		handleFilePondInit() {
+			console.log('FilePond has initialized');
+			console.log(this.$refs.pond);
+			// FilePond instance methods are available on `this.$refs.pond`
+		},
+		handleFilePondError(error) {
+			console.log(error);
+		},
+		handleFilePondAddFile(error, file) {
+			console.log(error, file);
+		}
+	}
+};
+</script>
+<style lang="scss">
+.pond {
+	width: 400px;
+	margin: 0 auto;
+
+	.filepond--browser.filepond--browser {
+		height: 100%;
+		padding-top: 1.75rem;
+		top: 0;
+		left: 0;
+		width: 100%;
+		cursor: pointer;
+	}
+}
+
+.pond.mini {
+	position: absolute;
+	width: 300px;
+	height: auto;
+	top: calc(50% - 40px);
+	left: calc(50% - 150px);
+}
+</style>
-- 
cgit v1.2.3


From 05c129ec322216356456cdcae517cd6c879a844a Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Sat, 11 Apr 2020 00:52:06 +0900
Subject: chore: remove filepond

---
 src/site/components/uploader/Filepond.vue | 97 -------------------------------
 src/site/components/uploader/Uploader.vue | 20 -------
 2 files changed, 117 deletions(-)
 delete mode 100644 src/site/components/uploader/Filepond.vue

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Filepond.vue b/src/site/components/uploader/Filepond.vue
deleted file mode 100644
index 1ee5288..0000000
--- a/src/site/components/uploader/Filepond.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
-	<file-pond
-		ref="pond"
-		name="test"
-		class="pond"
-		class-name="my-pond"
-		label-idle="Drop files here or click to browse"
-		:allow-multiple="true"
-		:files="myFiles"
-		:max-files="1000"
-		:chunk-uploads="true"
-		:chunk-size:="50 * 1000000"
-		:server="server"
-		@init="handleFilePondInit"
-		@error="handleFilePondError"
-		@addfile="handleFilePondAddFile" />
-</template>
-
-<script>
-// Import Vue FilePond
-import vueFilePond from 'vue-filepond';
-
-// Import FilePond styles
-import 'filepond/dist/filepond.min.css';
-
-// Import FilePond plugins
-// Please note that you need to install these plugins separately
-
-// Import image preview plugin styles
-// import 'filepond-plugin-image-preview/dist/filepond-plugin-image-preview.min.css';
-
-// Import image preview and file type validation plugins
-// import FilePondPluginFileValidateType from 'filepond-plugin-file-validate-type';
-// import FilePondPluginImagePreview from 'filepond-plugin-image-preview';
-
-// Create component
-const FilePond = vueFilePond(); // FilePondPluginFileValidateType, FilePondPluginImagePreview);
-
-export default {
-	components: {
-		FilePond
-	},
-	data() {
-		return {
-			myFiles: [],
-			server: {
-				url: 'http://localhost:5000',
-				process: {
-					url: '/api/upload',
-					method: 'POST',
-					headers: {
-						'Accept': 'application/vnd.lolisafe.json'
-					},
-					timeout: 300000, // 5 minutes
-					onload: response => console.log(response)
-				}
-			}
-		};
-	},
-	methods: {
-		handleFilePondInit() {
-			console.log('FilePond has initialized');
-			console.log(this.$refs.pond);
-			// FilePond instance methods are available on `this.$refs.pond`
-		},
-		handleFilePondError(error) {
-			console.log(error);
-		},
-		handleFilePondAddFile(error, file) {
-			console.log(error, file);
-		}
-	}
-};
-</script>
-<style lang="scss">
-.pond {
-	width: 400px;
-	margin: 0 auto;
-
-	.filepond--browser.filepond--browser {
-		height: 100%;
-		padding-top: 1.75rem;
-		top: 0;
-		left: 0;
-		width: 100%;
-		cursor: pointer;
-	}
-}
-
-.pond.mini {
-	position: absolute;
-	width: 300px;
-	height: auto;
-	top: calc(50% - 40px);
-	left: calc(50% - 150px);
-}
-</style>
diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index d9ed46a..9974e1d 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -225,26 +225,6 @@ export default {
 </style>
 <style lang="scss">
 	@import '~/assets/styles/_colors.scss';
-	.filepond--panel-root {
-		background: transparent;
-		border: 2px solid #2c3340;
-	}
-	.filepond--drop-label {
-		color: #c7ccd8;
-		pointer-events: none;
-	}
-
-	.filepond--item-panel {
-		background-color: #767b8b;
-	}
-
-	.filepond--root .filepond--drip-blob {
-		background-color: #7f8a9a
-	}
-
-	.filepond--drip {
-		background: black;
-	}
 
 	div.uploader-wrapper {
 		&.has-files {
-- 
cgit v1.2.3


From d63f1f57e9bd1314de204d92634ca1262d089111 Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Tue, 28 Apr 2020 10:47:22 +0900
Subject: wip: * Dark theme by default * Re-arranged vue files structure *
 Re-arranged the layout file to make it easier to extend

---
 src/site/components/uploader/Uploader.vue | 32 +++++++++----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index 9974e1d..1b03ff8 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -22,7 +22,7 @@
 			@vdropzone-error="dropzoneError"
 			@vdropzone-files-added="dropzoneFilesAdded" />
 		<label class="add-more">
-			Add more files
+			Add or drop more files
 		</label>
 
 		<div id="template"
@@ -33,18 +33,11 @@
 					<div class="dz-size"><span data-dz-size /></div>
 				</div>
 				<div class="result">
-					<div class="copyLink">
-						<b-tooltip label="Copy link">
-							<i class="icon-web-code" />
-						</b-tooltip>
-					</div>
 					<div class="openLink">
-						<b-tooltip label="Open file">
-							<a class="link"
-								target="_blank">
-								<i class="icon-web-url" />
-							</a>
-						</b-tooltip>
+						<a class="link"
+							target="_blank">
+							Link
+						</a>
 					</div>
 				</div>
 				<div class="error">
@@ -193,12 +186,14 @@ export default {
 		processResult(file, response) {
 			if (!response.url) return;
 			file.previewTemplate.querySelector('.link').setAttribute('href', response.url);
+			/*
 			file.previewTemplate.querySelector('.copyLink').addEventListener('click', () => {
 				this.$store.dispatch('alert', {
 					text: 'Link copied!'
 				});
 				this.$clipboard(response.url);
 			});
+			*/
 		}
 	}
 };
@@ -210,17 +205,7 @@ export default {
 		width: 400px;
 		margin: 0 auto;
 		max-width: 100%;
-		transition-duration: 86ms;
-		transition-property: box-shadow,-webkit-transform;
-		transition-property: box-shadow,transform;
-		transition-property: box-shadow,transform,-webkit-transform;
-		will-change: box-shadow,transform;
-
-		&:hover, &.hasFiles {
-			box-shadow: 0 1rem 3rem 0rem rgba(10, 10, 10, 0.25);
-			-webkit-transform: translateY(-.5rem);
-			transform: translateY(-.5rem);
-		}
+		position: relative;
 	}
 </style>
 <style lang="scss">
@@ -249,6 +234,7 @@ export default {
 					background: rgba(0, 0, 0, 0.15);
 					border-radius: .3em;
 					color: $uploaderDropdownColor;
+					padding: 0 0 0 1rem;
 				}
 			}
 		}
-- 
cgit v1.2.3


From 1a8b6602e094289a4f477c33e432e0f5e1587b45 Mon Sep 17 00:00:00 2001
From: Zephyrrus <krisztian1997@gmail.com>
Date: Wed, 8 Jul 2020 03:13:51 +0300
Subject: refactor: change uploader component to use vuex

---
 src/site/components/uploader/Uploader.vue | 74 ++++++++++++++++++-------------
 1 file changed, 42 insertions(+), 32 deletions(-)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index 1b03ff8..c7be372 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -1,7 +1,9 @@
 <template>
-	<div :class="{ 'has-files': alreadyAddedFiles }"
+	<div
+		:class="{ 'has-files': alreadyAddedFiles }"
 		class="uploader-wrapper">
-		<b-select v-if="loggedIn"
+		<b-select
+			v-if="loggedIn"
 			v-model="selectedAlbum"
 			placeholder="Upload to album"
 			size="is-medium"
@@ -13,7 +15,8 @@
 				{{ album.name }}
 			</option>
 		</b-select>
-		<dropzone v-if="showDropzone"
+		<dropzone
+			v-if="showDropzone"
 			id="dropzone"
 			ref="el"
 			:options="dropzoneOptions"
@@ -25,16 +28,22 @@
 			Add or drop more files
 		</label>
 
-		<div id="template"
+		<div
+			id="template"
 			ref="template">
 			<div class="dz-preview dz-file-preview">
 				<div class="dz-details">
-					<div class="dz-filename"><span data-dz-name /></div>
-					<div class="dz-size"><span data-dz-size /></div>
+					<div class="dz-filename">
+						<span data-dz-name />
+					</div>
+					<div class="dz-size">
+						<span data-dz-size />
+					</div>
 				</div>
 				<div class="result">
 					<div class="openLink">
-						<a class="link"
+						<a
+							class="link"
 							target="_blank">
 							Link
 						</a>
@@ -43,14 +52,16 @@
 				<div class="error">
 					<div>
 						<span>
-							<span class="error-message"
+							<span
+								class="error-message"
 								data-dz-errormessage />
 							<i class="icon-web-warning" />
 						</span>
 					</div>
 				</div>
 				<div class="dz-progress">
-					<span class="dz-upload"
+					<span
+						class="dz-upload"
 						data-dz-uploadprogress />
 				</div>
 				<!--
@@ -64,6 +75,8 @@
 </template>
 
 <script>
+import { mapState, mapGetters } from 'vuex';
+
 import Dropzone from 'nuxt-dropzone';
 import '~/assets/styles/dropzone.scss';
 
@@ -75,20 +88,15 @@ export default {
 			files: [],
 			dropzoneOptions: {},
 			showDropzone: false,
-			albums: [],
-			selectedAlbum: null
+			selectedAlbum: null,
 		};
 	},
 	computed: {
-		config() {
-			return this.$store.state.config;
-		},
-		token() {
-			return this.$store.state.token;
-		},
-		loggedIn() {
-			return this.$store.state.loggedIn;
-		}
+		...mapState({
+			config: (state) => state.config,
+			albums: (state) => state.albums.tinyDetails,
+		}),
+		...mapGetters({ loggedIn: 'auth/isLoggedIn', token: 'auth/getToken' }),
 	},
 	watch: {
 		loggedIn() {
@@ -96,7 +104,7 @@ export default {
 		},
 		selectedAlbum() {
 			this.updateDropzoneConfig();
-		}
+		},
 	},
 	mounted() {
 		this.dropzoneOptions = {
@@ -119,7 +127,7 @@ export default {
 			maxFilesize: this.config.maxFileSize,
 			previewTemplate: this.$refs.template.innerHTML,
 			dictDefaultMessage: 'Drag & Drop your files or click to browse',
-			headers: { Accept: 'application/vnd.lolisafe.json' }
+			headers: { Accept: 'application/vnd.lolisafe.json' },
 		};
 		this.showDropzone = true;
 		if (this.loggedIn) this.getAlbums();
@@ -129,8 +137,11 @@ export default {
 			Get all available albums so the user can upload directly to one (or several soon™) of them.
 		*/
 		async getAlbums() {
-			const response = await this.$axios.$get(`albums/dropdown`);
-			this.albums = response.albums;
+			try {
+				await this.$store.dispatch('albums/getTinyDetails');
+			} catch (e) {
+				this.$store.dispatch('alert/set', { text: e.message, error: true }, { root: true });
+			}
 			this.updateDropzoneConfig();
 		},
 
@@ -143,14 +154,14 @@ export default {
 			this.$refs.el.setOption('headers', {
 				Accept: 'application/vnd.lolisafe.json',
 				Authorization: this.token ? `Bearer ${this.token}` : '',
-				albumId: this.selectedAlbum ? this.selectedAlbum : null
+				albumId: this.selectedAlbum ? this.selectedAlbum : null,
 			});
 		},
 
 		/*
 			Dropzone stuff
 		*/
-		dropzoneFilesAdded(files) {
+		dropzoneFilesAdded() {
 			this.alreadyAddedFiles = true;
 		},
 		dropzoneSuccess(file, response) {
@@ -159,7 +170,7 @@ export default {
 		dropzoneError(file, message, xhr) {
 			this.$store.dispatch('alert', {
 				text: 'There was an error uploading this file. Check the console.',
-				error: true
+				error: true,
 			});
 			console.error(file, message, xhr);
 		},
@@ -170,12 +181,11 @@ export default {
 					original: file.name,
 					size: file.size,
 					type: file.type,
-					count: file.upload.totalChunkCount
-				}]
+					count: file.upload.totalChunkCount,
+				}],
 			});
 
 			this.processResult(file, data);
-			this.$forceUpdate();
 			return done();
 		},
 
@@ -194,8 +204,8 @@ export default {
 				this.$clipboard(response.url);
 			});
 			*/
-		}
-	}
+		},
+	},
 };
 </script>
 <style lang="scss" scoped>
-- 
cgit v1.2.3


From ad852de51a0d2dd5d29c08838d5a430c58849e74 Mon Sep 17 00:00:00 2001
From: Zephyrrus <krisztian1997@gmail.com>
Date: Wed, 8 Jul 2020 04:00:12 +0300
Subject: chore: linter the entire project using the new rules

---
 src/site/components/uploader/Uploader.vue | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index c7be372..7e2d446 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -172,6 +172,7 @@ export default {
 				text: 'There was an error uploading this file. Check the console.',
 				error: true,
 			});
+			// eslint-disable-next-line no-console
 			console.error(file, message, xhr);
 		},
 		async dropzoneChunksUploaded(file, done) {
-- 
cgit v1.2.3


From 90001c2df56d58e69fd199a518ae7f3e4ed327fc Mon Sep 17 00:00:00 2001
From: Zephyrrus <krisztian1997@gmail.com>
Date: Thu, 24 Dec 2020 10:40:50 +0200
Subject: chore: remove trailing commas

---
 src/site/components/uploader/Uploader.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index 7e2d446..2740bee 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -88,15 +88,15 @@ export default {
 			files: [],
 			dropzoneOptions: {},
 			showDropzone: false,
-			selectedAlbum: null,
+			selectedAlbum: null
 		};
 	},
 	computed: {
 		...mapState({
 			config: (state) => state.config,
-			albums: (state) => state.albums.tinyDetails,
+			albums: (state) => state.albums.tinyDetails
 		}),
-		...mapGetters({ loggedIn: 'auth/isLoggedIn', token: 'auth/getToken' }),
+		...mapGetters({ loggedIn: 'auth/isLoggedIn', token: 'auth/getToken' })
 	},
 	watch: {
 		loggedIn() {
@@ -104,7 +104,7 @@ export default {
 		},
 		selectedAlbum() {
 			this.updateDropzoneConfig();
-		},
+		}
 	},
 	mounted() {
 		this.dropzoneOptions = {
@@ -127,7 +127,7 @@ export default {
 			maxFilesize: this.config.maxFileSize,
 			previewTemplate: this.$refs.template.innerHTML,
 			dictDefaultMessage: 'Drag & Drop your files or click to browse',
-			headers: { Accept: 'application/vnd.lolisafe.json' },
+			headers: { Accept: 'application/vnd.lolisafe.json' }
 		};
 		this.showDropzone = true;
 		if (this.loggedIn) this.getAlbums();
@@ -154,7 +154,7 @@ export default {
 			this.$refs.el.setOption('headers', {
 				Accept: 'application/vnd.lolisafe.json',
 				Authorization: this.token ? `Bearer ${this.token}` : '',
-				albumId: this.selectedAlbum ? this.selectedAlbum : null,
+				albumId: this.selectedAlbum ? this.selectedAlbum : null
 			});
 		},
 
@@ -170,7 +170,7 @@ export default {
 		dropzoneError(file, message, xhr) {
 			this.$store.dispatch('alert', {
 				text: 'There was an error uploading this file. Check the console.',
-				error: true,
+				error: true
 			});
 			// eslint-disable-next-line no-console
 			console.error(file, message, xhr);
@@ -182,8 +182,8 @@ export default {
 					original: file.name,
 					size: file.size,
 					type: file.type,
-					count: file.upload.totalChunkCount,
-				}],
+					count: file.upload.totalChunkCount
+				}]
 			});
 
 			this.processResult(file, data);
@@ -205,8 +205,8 @@ export default {
 				this.$clipboard(response.url);
 			});
 			*/
-		},
-	},
+		}
+	}
 };
 </script>
 <style lang="scss" scoped>
-- 
cgit v1.2.3


From fb2c27086f570fec60f4d52dcc9ca80e53186293 Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Thu, 24 Dec 2020 23:45:16 +0900
Subject: Fix ESLint rules once and for all

---
 src/site/components/uploader/Uploader.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index 2740bee..94d4003 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -93,8 +93,8 @@ export default {
 	},
 	computed: {
 		...mapState({
-			config: (state) => state.config,
-			albums: (state) => state.albums.tinyDetails
+			config: state => state.config,
+			albums: state => state.albums.tinyDetails
 		}),
 		...mapGetters({ loggedIn: 'auth/isLoggedIn', token: 'auth/getToken' })
 	},
-- 
cgit v1.2.3


From 7190e035b441aef96c8249bb02d12f7cd55a17d9 Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Fri, 25 Dec 2020 20:17:47 +0900
Subject: chore: style changes

---
 src/site/components/uploader/Uploader.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index 94d4003..6d17e4a 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -241,7 +241,7 @@ export default {
 			margin-bottom: 5px;
 			span.select {
 				select {
-					border: 2px solid #2c3340;
+					border: 1px solid #00000061;
 					background: rgba(0, 0, 0, 0.15);
 					border-radius: .3em;
 					color: $uploaderDropdownColor;
-- 
cgit v1.2.3


From ec2f9e0d989792c1760b48e063467cf6e59c580a Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Fri, 25 Dec 2020 20:45:22 +0900
Subject: Rebrand

---
 src/site/components/uploader/Uploader.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index 6d17e4a..70acf91 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -127,7 +127,7 @@ export default {
 			maxFilesize: this.config.maxFileSize,
 			previewTemplate: this.$refs.template.innerHTML,
 			dictDefaultMessage: 'Drag & Drop your files or click to browse',
-			headers: { Accept: 'application/vnd.lolisafe.json' }
+			headers: { Accept: 'application/vnd.chibisafe.json' }
 		};
 		this.showDropzone = true;
 		if (this.loggedIn) this.getAlbums();
@@ -152,7 +152,7 @@ export default {
 		*/
 		updateDropzoneConfig() {
 			this.$refs.el.setOption('headers', {
-				Accept: 'application/vnd.lolisafe.json',
+				Accept: 'application/vnd.chibisafe.json',
 				Authorization: this.token ? `Bearer ${this.token}` : '',
 				albumId: this.selectedAlbum ? this.selectedAlbum : null
 			});
-- 
cgit v1.2.3


From e97fee48441717f3b508ac855339d0fb8210be53 Mon Sep 17 00:00:00 2001
From: Pitu <heyitspitu@gmail.com>
Date: Sun, 27 Dec 2020 04:27:56 +0900
Subject: Fixes chunked uploads not being saved to albums or thumbnails

---
 src/site/components/uploader/Uploader.vue | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/site/components/uploader')

diff --git a/src/site/components/uploader/Uploader.vue b/src/site/components/uploader/Uploader.vue
index 70acf91..f180546 100644
--- a/src/site/components/uploader/Uploader.vue
+++ b/src/site/components/uploader/Uploader.vue
@@ -184,6 +184,10 @@ export default {
 					type: file.type,
 					count: file.upload.totalChunkCount
 				}]
+			}, {
+				headers: {
+					albumId: this.selectedAlbum ? this.selectedAlbum : null
+				}
 			});
 
 			this.processResult(file, data);
-- 
cgit v1.2.3