Add possibility to share Composables with Web (#430)

Co-authored-by: hfhbd <[email protected]>
hfhbd · Dec 23, 2021 · 2773574 · 2773574
1 parent 14d6382
commit 2773574
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 11 deletions.
diff --git a/clients/src/commonMain/kotlin/app/softwork/composetodo/viewmodels/TodoViewModel.kt b/clients/src/commonMain/kotlin/app/softwork/composetodo/viewmodels/TodoViewModel.kt
@@ -27,7 +27,6 @@ class TodoViewModel(private val scope: CoroutineScope, private val repo: TodoRep
  fun create(title: String, until: Instant?) {
  scope.launch(Dispatchers.Default) {
  repo.create(title = title, until = until)
- repo.sync()
  }
  }
 

diff --git a/web/build.gradle.kts b/web/build.gradle.kts
@@ -18,7 +18,7 @@ kotlin {
  sourceSets {
  commonMain {
  dependencies {
- api(projects.clients) // try composeClients
+ api(projects.composeClients)
  }
  }
  commonTest {
@@ -29,7 +29,6 @@ kotlin {
 
  val jsMain by getting {
  dependencies {
- implementation("app.softwork:bootstrap-compose:0.0.49")
  implementation("app.softwork:routing-compose:0.1.5")
  implementation(compose.web.core)
  implementation(compose.runtime)

diff --git a/web/src/jsMain/kotlin/app/softwork/composetodo/login/Login.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/login/Login.kt
@@ -3,8 +3,10 @@ package app.softwork.composetodo.login
 import androidx.compose.runtime.*
 import app.softwork.bootstrapcompose.*
 import app.softwork.composetodo.*
+import app.softwork.composetodo.Column
+import app.softwork.composetodo.Row
+import app.softwork.composetodo.Text
 import app.softwork.composetodo.viewmodels.*
-import kotlinx.coroutines.*
 import org.jetbrains.compose.web.attributes.*
 import org.jetbrains.compose.web.dom.*
 
@@ -37,7 +39,7 @@ fun Login(viewModel: LoginViewModel) {
  }
  val enableLogin by viewModel.enableLogin.collectAsState(false)
 
- Button("Login $username", disabled = !enableLogin) {
+ Button("Login $username", enabled = enableLogin) {
  viewModel.login()
  }
 

diff --git a/web/src/jsMain/kotlin/app/softwork/composetodo/login/Register.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/login/Register.kt
@@ -3,9 +3,10 @@ package app.softwork.composetodo.login
 import androidx.compose.runtime.*
 import app.softwork.bootstrapcompose.*
 import app.softwork.composetodo.*
-import app.softwork.composetodo.dto.*
+import app.softwork.composetodo.Column
+import app.softwork.composetodo.Row
+import app.softwork.composetodo.Text
 import app.softwork.composetodo.viewmodels.*
-import kotlinx.coroutines.*
 import org.jetbrains.compose.web.attributes.*
 import org.jetbrains.compose.web.dom.*
 
@@ -62,7 +63,7 @@ fun Register(viewModel: RegisterViewModel) {
 
  val enableRegisterButton by viewModel.enableRegisterButton.collectAsState(false)
 
- Button("Register", disabled = !enableRegisterButton) {
+ Button("Register", enabled = enableRegisterButton) {
  viewModel.register()
  }
 

diff --git a/web/src/jsMain/kotlin/app/softwork/composetodo/todos/Todo.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/todos/Todo.kt
@@ -4,7 +4,6 @@ import androidx.compose.runtime.*
 import app.softwork.composetodo.*
 import app.softwork.composetodo.dto.Todo
 import kotlinx.uuid.*
-import org.jetbrains.compose.web.dom.*
 
 @Composable
 fun Todo(api: API.LoggedIn, todoID: UUID) {

diff --git a/web/src/jsMain/kotlin/app/softwork/composetodo/todos/Todos.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/todos/Todos.kt
@@ -18,7 +18,7 @@ fun Todos(viewModel: TodoViewModel) {
  if (todos.isEmpty()) {
  Text("No Todos created")
  } else {
- Table(data = todos, key = { it.id }) { _, todo ->
+ Table(data = todos.sortedBy { it.title }, key = { it.id }) { _, todo ->
  rowColor = when {
  todo.finished -> Color.Success
  todo.until?.let {

diff --git a/web/src/jsMain/kotlin/app/softwork/composetodo/users/Users.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/users/Users.kt
@@ -2,7 +2,6 @@ package app.softwork.composetodo.users
 
 import androidx.compose.runtime.*
 import app.softwork.composetodo.*
-import org.jetbrains.compose.web.dom.*
 
 @Composable
 fun Users(api: API.LoggedIn) {