From 2df297483b3f887d6cf9ff2fee3d201a14328421 Mon Sep 17 00:00:00 2001 From: Trevor Merritt Date: Mon, 24 Aug 2026 19:33:51 -0400 Subject: [PATCH] fixes build of web --- shared_ui/build.gradle.kts | 3 +++ web/build.gradle.kts | 9 +++---- .../kotlin/dev/geekback/dopewars/web/main.kt | 24 +++++++++++++++---- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/shared_ui/build.gradle.kts b/shared_ui/build.gradle.kts index 91ffa78..f66f6a8 100644 --- a/shared_ui/build.gradle.kts +++ b/shared_ui/build.gradle.kts @@ -4,12 +4,15 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl plugins { alias(libs.plugins.kotlin.multiplatform) + alias(libs.plugins.compose) + alias(libs.plugins.kotlin.compose) } kotlin { jvm() wasmJs { + browser() } sourceSets { diff --git a/web/build.gradle.kts b/web/build.gradle.kts index 83718c9..2f25ac7 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -17,13 +17,14 @@ kotlin { commonMain.dependencies { implementation(project(":shared")) - implementation(compose.runtime) - implementation(compose.foundation) - implementation(compose.material3) - implementation(compose.ui) + implementation("org.jetbrains.compose.runtime:runtime:1.11.1") + implementation("org.jetbrains.compose.foundation:foundation:1.11.1") + implementation("org.jetbrains.compose.material3:material3:1.9.0") + implementation("org.jetbrains.compose.ui:ui:1.11.1") } wasmJsMain.dependencies { + implementation(project(":shared_ui")) } } } diff --git a/web/src/webMain/kotlin/dev/geekback/dopewars/web/main.kt b/web/src/webMain/kotlin/dev/geekback/dopewars/web/main.kt index 5de362a..e3a0208 100644 --- a/web/src/webMain/kotlin/dev/geekback/dopewars/web/main.kt +++ b/web/src/webMain/kotlin/dev/geekback/dopewars/web/main.kt @@ -1,13 +1,14 @@ package dev.geekback.dopewars.web -import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.Column +import androidx.compose.material3.Card import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.ExperimentalComposeUiApi -import androidx.compose.material3.Text -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp import androidx.compose.ui.window.ComposeViewport +import dev.geekback.dopewars.shared.Location +import dev.geekback.dopewars.shared.api.MarketRequest +import dev.geekback.dopewars.ui.api.MarketRequestUi @OptIn(ExperimentalComposeUiApi::class) fun main() { @@ -18,7 +19,20 @@ fun main() { @Composable fun App() { + val mr = MarketRequest(location = Location("Bronx")) + MaterialTheme { - Text(modifier = Modifier.padding(16.dp), text = "Taxation is theft") + MarketRequestUi().form(mr) { + println("Updated $it") + } } } + +@Composable +fun form(model: MarketRequest) { + Card { + Column { + + } + } +} \ No newline at end of file