diff --git a/mosogepsch/src/jsMain/kotlin/Main.kt b/mosogepsch/src/jsMain/kotlin/Main.kt index b9bda91f7c78a91b34adb16a04f528a0a0747201..10e482cb2f54905efb706a971ca7562af0aea6d8 100644 --- a/mosogepsch/src/jsMain/kotlin/Main.kt +++ b/mosogepsch/src/jsMain/kotlin/Main.kt @@ -1,20 +1,14 @@ import androidx.compose.runtime.* -import api.MachineKind -import app.softwork.bootstrapcompose.* -import app.softwork.bootstrapcompose.Color import components.* import kotlinx.browser.localStorage import kotlinx.browser.window -import localization.English import localization.Hungarian import localization.LocalLang import localization.Localization import org.jetbrains.compose.web.css.* import org.jetbrains.compose.web.dom.* import org.jetbrains.compose.web.renderComposable -import org.w3c.dom.HTMLDivElement import org.w3c.dom.get -import org.w3c.dom.set import styles.FloorStyle import styles.LocalStyle import styles.Style diff --git a/mosogepsch/src/jsMain/kotlin/components/Card.kt b/mosogepsch/src/jsMain/kotlin/components/Card.kt index 4517ab58d171cef58a13eac573d649c73522775f..0bd53f1ba068e654265c89b47c99bfd71e4a8b25 100644 --- a/mosogepsch/src/jsMain/kotlin/components/Card.kt +++ b/mosogepsch/src/jsMain/kotlin/components/Card.kt @@ -5,7 +5,6 @@ import org.jetbrains.compose.web.css.* import org.jetbrains.compose.web.dom.AttrBuilderContext import org.jetbrains.compose.web.dom.Div import org.w3c.dom.HTMLDivElement -import styles.LocalStyle object CardStyle: StyleSheet() { val cardStyle by style { diff --git a/mosogepsch/src/jsMain/kotlin/components/Content.kt b/mosogepsch/src/jsMain/kotlin/components/Content.kt index a6b77d5a928c851257cf9dbe8f6e63e0d2f1d3b5..7f39130e646b604e23a021922b6e76ce3871e5b5 100644 --- a/mosogepsch/src/jsMain/kotlin/components/Content.kt +++ b/mosogepsch/src/jsMain/kotlin/components/Content.kt @@ -1,9 +1,7 @@ package components import androidx.compose.runtime.* -import api.Api -import api.Machine -import api.Response +import api.* import app.softwork.bootstrapcompose.Container import kotlinx.coroutines.delay import kotlinx.coroutines.launch @@ -11,7 +9,7 @@ import org.jetbrains.compose.web.css.* import org.jetbrains.compose.web.dom.Div @Composable -fun content(offline: (Boolean) -> Unit = {}) { +fun content(offline: (Boolean) -> Unit) { var data by remember { mutableStateOf<Response?>(null) } var machine by remember { mutableStateOf<Machine?>(null) } val subscriptions = remember { mutableStateListOf<Machine>() } @@ -20,10 +18,8 @@ fun content(offline: (Boolean) -> Unit = {}) { val scope = rememberCoroutineScope() LaunchedEffect(Unit) { scope.launch { - data = Api.getOnce() while (true) { // todo optimize - delay(5000) try { data = Api.getOnce() val machines = data!!.floors.map { it.machines }.flatten() @@ -36,6 +32,7 @@ fun content(offline: (Boolean) -> Unit = {}) { } error = null offline(false) + delay(5000) } catch (e: dynamic) { error = if (e is Throwable) e else Error(e.toString()) if (error?.isNetwork == true) { offline(true) } diff --git a/mosogepsch/src/jsMain/kotlin/components/UnderCard.kt b/mosogepsch/src/jsMain/kotlin/components/UnderCard.kt index 54ecb5fe8da97f05f5fbabd457b653b560a11640..1ffd48ab5a8dd330b397dcf482b86a077b73dcc6 100644 --- a/mosogepsch/src/jsMain/kotlin/components/UnderCard.kt +++ b/mosogepsch/src/jsMain/kotlin/components/UnderCard.kt @@ -12,11 +12,9 @@ import org.jetbrains.compose.web.dom.P import org.jetbrains.compose.web.dom.Text import styles.ColorPair import styles.FloorStyle -import styles.LocalStyle import styles.applyColorPair - @Composable fun underCard(floor: Floor, machine: Machine, selectedMachine: Machine?, subscriptions: SnapshotStateList<Machine>) { val lang = LocalLang.current diff --git a/mosogepsch/src/jsMain/kotlin/styles/Style.kt b/mosogepsch/src/jsMain/kotlin/styles/Style.kt index 13010568bb807525d73972a21638f8303353ab86..7631cb0dd0cb9ba8788099bcade9c09dc8ee6a7e 100644 --- a/mosogepsch/src/jsMain/kotlin/styles/Style.kt +++ b/mosogepsch/src/jsMain/kotlin/styles/Style.kt @@ -1,4 +1,3 @@ -@file:Suppress("NonAsciiCharacters") package styles import androidx.compose.runtime.compositionLocalOf