From 92807cfb7249eff1d96b70aa33a46c9eb6c0e733 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sun, 7 Apr 2019 14:14:30 +0200
Subject: Added upload page as a rocker template
---
src/main/kotlin/App.kt | 6 +++---
src/main/resources/views/upload.html | 16 ----------------
src/main/resources/views/upload.rocker.html | 8 ++++++++
3 files changed, 11 insertions(+), 19 deletions(-)
delete mode 100644 src/main/resources/views/upload.html
create mode 100644 src/main/resources/views/upload.rocker.html
(limited to 'src')
diff --git a/src/main/kotlin/App.kt b/src/main/kotlin/App.kt
index 2869525..44f60bb 100644
--- a/src/main/kotlin/App.kt
+++ b/src/main/kotlin/App.kt
@@ -41,9 +41,9 @@ fun main() {
get("/files/*", { ctx -> crawlFiles(ctx) }, roles(Roles.ADMIN))
/**
- * Redirects upload to corresponding html file
+ * Renders the upload rocker template
*/
- get("/upload", { ctx -> ctx.redirect("/views/upload.html") }, roles(Roles.USER))
+ get("/upload", { ctx -> ctx.render("upload.rocker.html") }, roles(Roles.USER))
/**
* Receives and saves multipart media data
@@ -102,7 +102,7 @@ fun upload(ctx: Context) {
ctx.uploadedFiles("files").forEach { (contentType, content, name, extension) ->
if (ctx.queryParam("dir") !== null) {
FileUtil.streamToFile(content, "files/${ctx.queryParam("dir")}/$name")
- ctx.redirect("/views/upload.html")
+ ctx.redirect("/views/upload.rocker.html")
} else
throw BadRequestResponse("Error: Please enter a filename.")
}
diff --git a/src/main/resources/views/upload.html b/src/main/resources/views/upload.html
deleted file mode 100644
index 16c8a94..0000000
--- a/src/main/resources/views/upload.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
- Upload Testing
-
-
-
-
-
diff --git a/src/main/resources/views/upload.rocker.html b/src/main/resources/views/upload.rocker.html
new file mode 100644
index 0000000..441a570
--- /dev/null
+++ b/src/main/resources/views/upload.rocker.html
@@ -0,0 +1,8 @@
+@args (String content)
+
+@layout.template("Upload") -> {
+
+}
--
cgit v1.2.3