Merge branch 'release/v1.9.0'

Author: techprd

backend/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = "com.techprd"
-version = "1.7.0"
+version = "1.9.0"
 
 repositories {
     mavenCentral()
@@ -19,11 +19,11 @@ kotlin {
     js {
         nodejs {
             dependencies {
-                implementation(npm("body-parser", "1.19.0"))
-                implementation(npm("cookie-parser", "1.4.3"))
-                implementation(npm("ejs", "2.5.6"))
-                implementation(npm("express", "4.17.1"))
-                implementation(npm("materialize-css", "1.0.0-rc.2"))
+                implementation(npm("body-parser", "1.20.2"))
+                implementation(npm("cookie-parser", "1.4.6"))
+                implementation(npm("ejs", "3.1.9"))
+                implementation(npm("express", "4.18.2"))
+                implementation(npm("materialize-css", "1.0.0"))
             }
         }
         binaries.executable()

backend/src/main/kotlin/main.kt

@@ -24,9 +24,9 @@ fun main() {
 
     // view engine setup
     // TODO: find a better way to find the webapp views and js files
-    app.set("views", path.join(__dirname, "../../../../../webapp/build/distributions"))
+    app.set("views", path.join(__dirname, "../../../../../webapp/build/dist/js/productionExecutable"))
     app.set("view engine", "ejs")
-    app.use(express.static(path.join(__dirname, "../../../../../webapp/build/distributions")))
+    app.use(express.static(path.join(__dirname, "../../../../../webapp/build/dist/js/productionExecutable")))
 
     http.createServer(app)
     app.listen(port) {

backend/src/main/kotlin/routes/route.kt

@@ -20,17 +20,18 @@ fun router() {
     }
 
     router.get("/api/tasks") { _, res ->
-        res.send(db.values.toList())
+        val values = JSON.stringify(db.values.map { it.toJson() })
+        res.send(values)
     }
 
     router.get("/api/task/:id") { req, res ->
         res.json(db[req.params.id])
     }
 
     router.post("/api/task/:id") { req, res ->
-        val task = JSON.parse<Task>(JSON.stringify(req.body))
+        val task = Task.fromJson(req.body)
         db[task.id] = task
-        res.json(task)
+        res.send(task.toJson())
     }
 
     return router

build.gradle.kts

@@ -1,9 +1,9 @@
 plugins {
-    id("org.jetbrains.kotlin.js") version "1.7.0"
+    id("org.jetbrains.kotlin.js") version "1.9.0"
 }
 
 group = "com.techprd"
-version = "1.7.0"
+version = "1.9.0"
 
 repositories {
     mavenCentral()
@@ -15,8 +15,3 @@ kotlin {
         nodejs()
     }
 }
-
-rootProject.plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
-    rootProject.the<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>().versions.webpackCli.version =
-        "4.10.0"
-}

common/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = "com.techprd"
-version = "1.7.0"
+version = "1.9.0"
 
 repositories {
     mavenCentral()

common/src/main/kotlin/model/Task.kt

@@ -1,8 +1,9 @@
 package model
 
-data class Task(val id: String, val text: String) {
-    var isArchived = false
-    var isDone = false
+import kotlin.js.Json
+import kotlin.js.json
+
+data class Task(val id: String, val text: String, var isDone: Boolean = false, var isArchived: Boolean = false) {
 
     fun markAsDone() {
         isDone = true
@@ -11,4 +12,24 @@ data class Task(val id: String, val text: String) {
     fun archive() {
         isArchived = true
     }
+
+    fun toJson(): Json {
+        return json(
+            "id" to id,
+            "text" to text,
+            "isDone" to isDone,
+            "isArchived" to isArchived
+        )
+    }
+
+    companion object {
+        fun fromJson(it: Json): Task {
+            return Task(
+                id = it["id"] as String,
+                text = it["text"] as String,
+                isDone = it["isDone"] as Boolean,
+                isArchived = it["isArchived"] as Boolean
+            )
+        }
+    }
 }

webapp/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.techprd"
-version = "1.7.0"
+version = "1.9.0"
 
 repositories {
     mavenCentral()
@@ -15,31 +15,34 @@ repositories {
 
 dependencies {
     implementation(kotlin("stdlib-js"))
-    implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.7.5")
+    implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.9.1")
     implementation(project(":common"))
 }
 
 kotlin {
     js {
         browser {
-            webpackTask {
-                cssSupport.enabled = true
-            }
+            webpackTask(Action {
+                cssSupport {
+                    enabled.set(true)
+                }
+            })
 
-            runTask {
-                cssSupport.enabled = true
+            runTask(Action {
                 devServer = KotlinWebpackConfig.DevServer(
-                    static = mutableListOf("$buildDir/distributions"),
+                    static = mutableListOf("$buildDir/processedResources/js/main"),
                     proxy = hashMapOf("/api" to "http://localhost:3000")
                 )
-            }
+            })
 
-            testTask {
+            testTask(Action {
                 useKarma {
                     useChromeHeadless()
-                    webpackConfig.cssSupport.enabled = true
+                    webpackConfig.cssSupport {
+                        enabled.set(true)
+                    }
                 }
-            }
+            })
         }
         binaries.executable()
     }

webapp/src/main/kotlin/services/Ajax.kt

@@ -2,6 +2,7 @@ package services
 
 import model.Task
 import org.w3c.xhr.*
+import kotlin.js.Json
 
 class Ajax {
 
@@ -22,7 +23,7 @@ class Ajax {
         xhttp.send()
     }
 
-    fun post(url: String, task: Task, callback: (XMLHttpRequest) -> Unit) {
+    fun post(url: String, task: Json, callback: (XMLHttpRequest) -> Unit) {
         xhttp.open(
                 method = "POST",
                 url = url,

webapp/src/main/kotlin/services/StorageService.kt

@@ -2,6 +2,7 @@ package services
 
 import events.TodoEventEmitter
 import model.Task
+import kotlin.js.Json
 
 class StorageService(val eventEmitter: TodoEventEmitter) : LinkedHashMap<String, Task>() {
 
@@ -27,19 +28,17 @@ class StorageService(val eventEmitter: TodoEventEmitter) : LinkedHashMap<String,
 
     fun getAll(callback: () -> Unit) {
         return Ajax().get("/api/tasks") {
-            val tasks = JSON.parse<Array<Task>>(it.responseText)
+            val tasks = JSON.parse<Array<Json>>(it.responseText)
             tasks.forEach {
-                val task = Task(it.id, it.text)
-                task.isArchived = it.isArchived
-                task.isDone = it.isDone
+                val task = Task.fromJson(it)
                 this[task.id] = task
             }
             callback()
         }
     }
 
     fun update(task: Task) {
-        return Ajax().post("/api/task/${task.id}", task) {
+        return Ajax().post("/api/task/${task.id}", task.toJson()) {
             console.log(it.response)
         }
     }