kotlinjs build improvement

test post fetch for index
2020-02-18 20:22:00 +01:00 · 2020-02-18 20:22:00 +01:00 · af321c8aad
commit af321c8aad
parent 16939c7b6a
11 changed files with 52 additions and 15 deletions
--- a/WebServer/build.gradle
+++ b/WebServer/build.gradle
@ -24,13 +24,13 @@ sourceSets {
 }

 compileKotlin2Js {
-    kotlinOptions.outputFile = "${projectDir}/web/lib/WasteInformationServer.js"
-    kotlinOptions.moduleKind = "amd"
+    kotlinOptions.outputFile = "${projectDir}/build/web/WasteInformationServer.js"
+    kotlinOptions.moduleKind = "plain"
    kotlinOptions.sourceMap = true
 }

 compileTestKotlin2Js {
-    kotlinOptions.moduleKind = "amd"
+    kotlinOptions.moduleKind = "plain"
    kotlinOptions.sourceMap = true
 }

@ -91,11 +91,4 @@ build.doLast() {
        from new File("build/classes/test")
        into "${web_dir}/lib"
    }
-
-    copy {
-        includeEmptyDirs = false
-        from new File("build/resources/test")
-        into "${web_dir}"
-    }
-
 }
--- a/WebServer/src/js/Main.kt
+++ b/WebServer/src/js/Main.kt
@ -1,3 +1,33 @@
+import org.w3c.dom.HTMLInputElement
+import org.w3c.fetch.RequestInit
+import org.w3c.xhr.XMLHttpRequest
+import kotlin.browser.document
+import kotlin.browser.window
+
 fun main() {
-    println("success execute main")
+    val callurl = window.document.URL
+    if(callurl.contains("sec.html")){
+        document.write("Hello, in document 2!")
+    }else {
+        window.onload = {
+            println("loaded sucessfully")
+            document.getElementById("loginbtn")?.addEventListener("click",{
+                it.preventDefault()
+                println("clicked!!!")
+
+                val username = document.getElementById("userfield") as HTMLInputElement
+                val passfield = document.getElementById("passfield") as HTMLInputElement
+                println(username.value)
+
+                console.log("fetch 'data.json' with 'post'")
+                window.fetch("/senddata/loginget", RequestInit(method = "POST", body = "username=${username.value}&password=${passfield.value}")).then {
+                    it.text().then { println(it) }
+                }
+            })
+        }
+        document.write("Hello, world!")
+
+        val req = Requester()
+        req.request()
+    }
 }
--- a/WebServer/src/js/Requester.kt
+++ b/WebServer/src/js/Requester.kt
@ -0,0 +1,15 @@
+import org.w3c.xhr.XMLHttpRequest
+
+class Requester {
+    fun request(){
+        val test = XMLHttpRequest()
+
+        test.open("GET","https://api.ipify.org?format=json")
+
+        test.onload = {
+            println(test.responseText)
+        }
+
+        test.send()
+    }
+}
--- a/src/resources/wwwroot/index.html
+++ b/src/resources/wwwroot/index.html
@ -24,18 +24,17 @@
    <!--Custom styles-->
    <link rel="stylesheet" type="text/css" href="css/index.css">

-    <script type="text/javascript" src="js/index.js"></script>
-
    <script src="lib/AdminLTE/plugins/sweetalert2/sweetalert2.all.js"></script>

    <link rel="manifest" href="/manifest.json">

    <link rel="icon" type="image/png" href="/favicon.png">

-</head>
-<body>
    <script type="text/javascript" src="js/lib/kotlin.js"></script>
    <script type="text/javascript" src="js/WasteInformationServer.js"></script>
+
+</head>
+<body>
 <div class="container">
    <div class="d-flex justify-content-center h-100">
        <div class="card">
--- a/src/resources/wwwroot/jsold/adminpanel.js
+++ b/src/resources/wwwroot/jsold/adminpanel.js
--- a/src/resources/wwwroot/jsold/dashboard.js
+++ b/src/resources/wwwroot/jsold/dashboard.js
--- a/src/resources/wwwroot/jsold/device.js
+++ b/src/resources/wwwroot/jsold/device.js
--- a/src/resources/wwwroot/jsold/index.js
+++ b/src/resources/wwwroot/jsold/index.js
--- a/src/resources/wwwroot/jsold/profile.js
+++ b/src/resources/wwwroot/jsold/profile.js
--- a/src/resources/wwwroot/jsold/register.js
+++ b/src/resources/wwwroot/jsold/register.js
--- a/src/resources/wwwroot/jsold/userManager.js
+++ b/src/resources/wwwroot/jsold/userManager.js