Fixed some minor typos

Co-authored-by: LarsVomMars <lars@kroenner.eu>

4 files changed, 18 insertions, 18 deletions

diff --git a/src/main/kotlin/App.kt b/src/main/kotlin/App.kt
index 39275ec..49cc553 100644
--- a/src/main/kotlin/App.kt
+++ b/src/main/kotlin/App.kt
@@ -115,14 +115,14 @@ fun main() {
         post("/share/*", fileController::share, roles(Roles.USER))
 
         /**
-         * Shows the shared file
+         * Shares file in directory
          */
-        get("/shared", fileController::renderShared, roles(Roles.GUEST))
+        post("/share", fileController::handleSharedFile, roles(Roles.GUEST))
 
         /**
-         * Shares file in directory
+         * Shows the shared file
          */
-        post("/shared", fileController::handleSharedFile, roles(Roles.GUEST))
+        get("/shared", fileController::renderShared, roles(Roles.GUEST))
     }
 }
 
diff --git a/src/main/kotlin/DatabaseController.kt b/src/main/kotlin/DatabaseController.kt
index 6ec13e4..dbb41ba 100644
--- a/src/main/kotlin/DatabaseController.kt
+++ b/src/main/kotlin/DatabaseController.kt
@@ -261,13 +261,13 @@ class DatabaseController(dbFileLocation: String = "main.db") {
     /**
      * Returns accessId of file in directory
      */
-    fun getAccessIdOfDirectory(fileName: String, accessId: String): String {
+    fun getAccessIdOfDirectory(filename: String, accessId: String): String {
         return transaction {
             try {
                 val fileData =
                     FileLocation.select { FileLocation.accessId eq accessId }.map { it[FileLocation.path] to it[FileLocation.userId] to it[FileLocation.isShared] }[0]
                 if (fileData.second)
-                    FileLocation.select { (FileLocation.path eq "${fileData.first.first}${fileName.substring(1)}") and (FileLocation.userId eq fileData.first.second) }.map { it[FileLocation.accessId] }[0]
+                    FileLocation.select { (FileLocation.path eq "${fileData.first.first}${filename.substring(1)}") and (FileLocation.userId eq fileData.first.second) }.map { it[FileLocation.accessId] }[0]
                 else ""
             } catch (_: Exception) {
                 ""
diff --git a/src/main/kotlin/FileController.kt b/src/main/kotlin/FileController.kt
index 1d5bada..673e425 100644
--- a/src/main/kotlin/FileController.kt
+++ b/src/main/kotlin/FileController.kt
@@ -237,9 +237,9 @@ class FileController {
     }
 
     fun handleSharedFile(ctx: Context) {
-        val fileName = ctx.formParam("fileName").toString()
+        val filename = ctx.formParam("filename").toString()
         val accessId = ctx.formParam("accessId").toString()
-        val returnAccessId = databaseController.getAccessIdOfDirectory(fileName, accessId)
+        val returnAccessId = databaseController.getAccessIdOfDirectory(filename, accessId)
         ctx.result(returnAccessId)
     }
 }
diff --git a/src/main/resources/js/files.js b/src/main/resources/js/files.js
index 0cd15a7..d8755cb 100644
--- a/src/main/resources/js/files.js
+++ b/src/main/resources/js/files.js
@@ -104,19 +104,19 @@ drop.addEventListener('drop', e => {
  * Set up listeners
  */
 function setListeners() {
-    if (isShared) {
+    if (isShared === "true") {
         const accessId = location.pathname === '/shared' ? location.search.split('=')[1] : undefined;
         document.querySelectorAll('[data-path], [data-href]').forEach(element => {
             element.addEventListener('click', () => {
                 const request = new XMLHttpRequest();
                 const formData = new FormData();
                 formData.append('accessId', accessId);
-                formData.append('fileName', element.getAttribute('data-path') || element.getAttribute('data-href'));
-                request.open('POST', '/shared', true);
+                formData.append('filename', element.getAttribute('data-path') || element.getAttribute('data-href'));
+                request.open('POST', '/share', true);
                 request.onload = () => {
                     if (request.status === 200 && request.readyState === 4) {
                         if (request.responseText)
-                            window.location = `/shared?id=${request.responseText}`;
+                            window.location = `/share?id=${request.responseText}`;
                         else alert('File not found!');
                     }
                 };
@@ -192,9 +192,9 @@ function setListeners() {
             e.stopPropagation();
             const request = new XMLHttpRequest();
             const parent = e.target.closest("tr");
-            const fileName = parent.getAttribute("data-href") || parent.getAttribute("data-path");
-            if (confirm(`Do you really want to delete: ${fileName}?`)) {
-                request.open("POST", `/delete/${path}/${fileName}`.clean(), true);
+            const filename = parent.getAttribute("data-href") || parent.getAttribute("data-path");
+            if (confirm(`Do you really want to delete: ${filename}?`)) {
+                request.open("POST", `/delete/${path}/${filename}`.clean(), true);
                 request.send();
                 parent.remove();
             } else console.log("File not deleted!")
@@ -221,10 +221,10 @@ function setListeners() {
             e.stopPropagation();
             const request = new XMLHttpRequest();
             const parent = e.target.closest("tr");
-            const fileName = parent.getAttribute("data-href") || parent.getAttribute("data-path");
-            const type = fileName.endsWith('/') ? 'dir' : 'file';
+            const filename = parent.getAttribute("data-href") || parent.getAttribute("data-path");
+            const type = filename.endsWith('/') ? 'dir' : 'file';
 
-            request.open("POST", `/share/${path}/${fileName}?type=${type}`.clean());
+            request.open("POST", `/share/${path}/${filename}?type=${type}`.clean());
             request.onload = () => {
                 if (request.readyState === 4) {
                     if (request.status === 200) {  // TODO: fix clipboard in Firefox