aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarvin Borner2019-04-17 01:30:39 +0200
committerMarvin Borner2019-04-17 01:30:39 +0200
commitb8e81e52f4e12186455b6d17b378f29383d7ce88 (patch)
tree585fe42fc6966d5f3f74decf6af5b25ee40bc83a /src
parent1b790423c46498b96ad2cd0671114226c9941f9f (diff)
Added directory uploading template
Co-authored-by: LarsVomMars <lars@kroenner.eu>
Diffstat (limited to 'src')
-rw-r--r--src/main/kotlin/DatabaseController.kt2
-rw-r--r--src/main/kotlin/FileController.kt7
-rw-r--r--src/main/resources/css/files.css2
-rw-r--r--src/main/resources/fonts/ionicons .eotbin112662 -> 0 bytes
-rw-r--r--src/main/resources/js/files.js14
5 files changed, 17 insertions, 8 deletions
diff --git a/src/main/kotlin/DatabaseController.kt b/src/main/kotlin/DatabaseController.kt
index 7b229f4..c21b175 100644
--- a/src/main/kotlin/DatabaseController.kt
+++ b/src/main/kotlin/DatabaseController.kt
@@ -18,7 +18,7 @@ class DatabaseController(dbFileLocation: String = "main.db") {
val id = integer("id").autoIncrement().primaryKey()
val path = text("path").uniqueIndex()
val userId = integer("userId").references(UserData.id)
- val accessId = varchar("accessId", 64).uniqueIndex() // TODO: Add file sharing
+ val accessId = varchar("accessId", 64).uniqueIndex()
val isShared = bool("isShared").default(false)
}
diff --git a/src/main/kotlin/FileController.kt b/src/main/kotlin/FileController.kt
index 528df3a..5586212 100644
--- a/src/main/kotlin/FileController.kt
+++ b/src/main/kotlin/FileController.kt
@@ -111,8 +111,11 @@ class FileController {
*/
fun upload(ctx: Context) {
ctx.uploadedFiles("file").forEach { (_, content, name, _) ->
- val path = "${ctx.splats()[0]}/$name"
- FileUtil.streamToFile(content, "$fileHome/${userHandler.getVerifiedUserId(ctx)}/$path")
+ val path = "${ctx.splats()[0]}/$name" // es gibt kein [content] bei nem dir
+ FileUtil.streamToFile(
+ content,
+ "$fileHome/${userHandler.getVerifiedUserId(ctx)}/$path"
+ ) // ich würde alle files aus der directory einzeln uploaden <- deshalb das (foreach)
databaseController.addFile(path, userHandler.getVerifiedUserId(ctx))
}
}
diff --git a/src/main/resources/css/files.css b/src/main/resources/css/files.css
index d03e092..c7302bf 100644
--- a/src/main/resources/css/files.css
+++ b/src/main/resources/css/files.css
@@ -58,7 +58,7 @@ colgroup col:nth-child(5) {
.drop {
padding: 8px;
- min-height: calc(100vmin - 16px);
+ min-height: calc(100vh - 16px);
z-index: -1;
}
diff --git a/src/main/resources/fonts/ionicons .eot b/src/main/resources/fonts/ionicons .eot
deleted file mode 100644
index 671df91..0000000
--- a/src/main/resources/fonts/ionicons .eot
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/js/files.js b/src/main/resources/js/files.js
index 28d091b..ea90f3b 100644
--- a/src/main/resources/js/files.js
+++ b/src/main/resources/js/files.js
@@ -15,7 +15,6 @@ drop.addEventListener('dragleave', () =>
);
drop.addEventListener('drop', e => {
- // TODO: Fix directory uploading
e.stopPropagation();
e.preventDefault();
drop.style.background = "white";
@@ -38,9 +37,16 @@ drop.addEventListener('drop', e => {
setListeners();
- formData.append("file", file);
- request.open("POST", "/upload/" + path);
- request.send(formData);
+ const reader = new FileReader();
+ reader.onload = () => {
+ formData.append("file", file);
+ request.open("POST", "/upload/" + path);
+ request.send(formData);
+ };
+ reader.onerror = () => {
+ // TODO: Add uploading of directories
+ };
+ reader.readAsText(file)
}
function bytesToSize(bytes) {