chore: entferne AuthApiClient, AuthTokenManager und DeviceInitializationConfig.jvm, da diese nicht mehr benötigt werden
This commit is contained in:
+5
-1
@@ -1,6 +1,10 @@
|
||||
@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
|
||||
|
||||
package at.mocode.frontend.features.deviceinitialization.domain
|
||||
|
||||
|
||||
package at.mocode.frontend.features.device.initialization.data.local
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
|
||||
|
||||
|
||||
expect object DeviceInitializationSettingsManager {
|
||||
fun saveSettings(settings: DeviceInitializationSettings)
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
|
||||
|
||||
package at.mocode.frontend.features.device.initialization.di
|
||||
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
|
||||
import at.mocode.frontend.features.device.initialization.presentation.DeviceInitializationViewModel
|
||||
import org.koin.dsl.module
|
||||
|
||||
val deviceInitializationModule = module {
|
||||
factory { (onComplete: (DeviceInitializationSettings) -> Unit) ->
|
||||
DeviceInitializationViewModel(get(), onComplete)
|
||||
}
|
||||
}
|
||||
+6
-2
@@ -1,4 +1,9 @@
|
||||
package at.mocode.frontend.features.deviceinitialization.domain
|
||||
@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
|
||||
|
||||
package at.mocode.frontend.features.device.initialization.domain
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
|
||||
|
||||
|
||||
/**
|
||||
* Validierungslogik für den Geräte-Initialisierungs-Wizard.
|
||||
@@ -29,7 +34,6 @@ object DeviceInitializationValidator {
|
||||
fun canContinue(settings: DeviceInitializationSettings): Boolean {
|
||||
val basicValid = isNameValid(settings.deviceName) &&
|
||||
isKeyValid(settings.sharedKey) &&
|
||||
(if (settings.networkRole == NetworkRole.MASTER) isBackupPathValid(settings.backupPath) else true) &&
|
||||
isSyncIntervalValid(settings.syncInterval)
|
||||
|
||||
if (!basicValid) return false
|
||||
+4
-1
@@ -1,4 +1,7 @@
|
||||
package at.mocode.frontend.features.deviceinitialization.domain
|
||||
@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
|
||||
|
||||
package at.mocode.frontend.features.device.initialization.domain.model
|
||||
|
||||
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
+10
-2
@@ -1,4 +1,12 @@
|
||||
package at.mocode.frontend.features.deviceinitialization.presentation
|
||||
@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
|
||||
|
||||
package at.mocode.frontend.features.device.initialization.presentation
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.ExpectedClient
|
||||
|
||||
|
||||
|
||||
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
@@ -20,7 +28,7 @@ import androidx.compose.ui.input.key.*
|
||||
import androidx.compose.ui.platform.LocalFocusManager
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import at.mocode.frontend.features.deviceinitialization.domain.DeviceInitializationValidator
|
||||
import at.mocode.frontend.features.device.initialization.domain.DeviceInitializationValidator
|
||||
|
||||
@Composable
|
||||
fun DeviceInitializationScreen(
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
|
||||
|
||||
package at.mocode.frontend.features.device.initialization.presentation
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.ExpectedClient
|
||||
|
||||
|
||||
|
||||
|
||||
import at.mocode.frontend.core.network.discovery.DiscoveredService
|
||||
|
||||
data class DeviceInitializationUiState(
|
||||
val currentStep: Int = 0,
|
||||
val settings: DeviceInitializationSettings = DeviceInitializationSettings(),
|
||||
val discoveredMasters: List<DiscoveredService> = emptyList(),
|
||||
val isProcessing: Boolean = false,
|
||||
val error: String? = null
|
||||
)
|
||||
+9
-4
@@ -1,11 +1,16 @@
|
||||
package at.mocode.frontend.features.deviceinitialization.presentation
|
||||
@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
|
||||
|
||||
package at.mocode.frontend.features.device.initialization.presentation
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.ExpectedClient
|
||||
|
||||
|
||||
|
||||
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import at.mocode.frontend.core.network.discovery.NetworkDiscoveryService
|
||||
import at.mocode.frontend.features.deviceinitialization.domain.DeviceInitializationSettings
|
||||
import at.mocode.frontend.features.deviceinitialization.domain.ExpectedClient
|
||||
import at.mocode.frontend.features.deviceinitialization.domain.NetworkRole
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
+9
-2
@@ -1,4 +1,12 @@
|
||||
package at.mocode.frontend.features.deviceinitialization.presentation
|
||||
@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
|
||||
|
||||
package at.mocode.frontend.features.device.initialization.presentation
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.ExpectedClient
|
||||
|
||||
|
||||
|
||||
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
@@ -10,7 +18,6 @@ import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.input.key.*
|
||||
import androidx.compose.ui.unit.dp
|
||||
import at.mocode.frontend.features.deviceinitialization.domain.NetworkRole
|
||||
|
||||
@Composable
|
||||
fun NetworkRoleSelector(
|
||||
-10
@@ -1,10 +0,0 @@
|
||||
package at.mocode.frontend.features.deviceinitialization.di
|
||||
|
||||
import at.mocode.frontend.features.deviceinitialization.presentation.DeviceInitializationViewModel
|
||||
import org.koin.dsl.module
|
||||
|
||||
val deviceInitializationModule = module {
|
||||
factory { (onComplete: (at.mocode.frontend.features.deviceinitialization.domain.DeviceInitializationSettings) -> Unit) ->
|
||||
DeviceInitializationViewModel(get(), onComplete)
|
||||
}
|
||||
}
|
||||
-12
@@ -1,12 +0,0 @@
|
||||
package at.mocode.frontend.features.deviceinitialization.presentation
|
||||
|
||||
import at.mocode.frontend.core.network.discovery.DiscoveredService
|
||||
import at.mocode.frontend.features.deviceinitialization.domain.DeviceInitializationSettings
|
||||
|
||||
data class DeviceInitializationUiState(
|
||||
val currentStep: Int = 0,
|
||||
val settings: DeviceInitializationSettings = DeviceInitializationSettings(),
|
||||
val discoveredMasters: List<DiscoveredService> = emptyList(),
|
||||
val isProcessing: Boolean = false,
|
||||
val error: String? = null
|
||||
)
|
||||
+5
-1
@@ -1,5 +1,9 @@
|
||||
package at.mocode.frontend.features.deviceinitialization.domain
|
||||
@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
|
||||
|
||||
package at.mocode.frontend.features.device.initialization.data.local
|
||||
|
||||
import at.mocode.frontend.features.device.initialization.domain.DeviceInitializationValidator
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
|
||||
import kotlinx.serialization.json.Json
|
||||
import java.io.File
|
||||
|
||||
+10
-3
@@ -1,4 +1,12 @@
|
||||
package at.mocode.frontend.features.deviceinitialization.presentation
|
||||
@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
|
||||
|
||||
package at.mocode.frontend.features.device.initialization.presentation
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.ExpectedClient
|
||||
|
||||
|
||||
|
||||
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.text.KeyboardActions
|
||||
@@ -29,8 +37,7 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||
import androidx.compose.ui.text.input.VisualTransformation
|
||||
import androidx.compose.ui.unit.dp
|
||||
import at.mocode.frontend.core.designsystem.components.MsEnumDropdown
|
||||
import at.mocode.frontend.features.deviceinitialization.domain.DeviceInitializationValidator
|
||||
import at.mocode.frontend.features.deviceinitialization.domain.NetworkRole
|
||||
import at.mocode.frontend.features.device.initialization.domain.DeviceInitializationValidator
|
||||
import java.io.File
|
||||
import javax.swing.JFileChooser
|
||||
import javax.swing.UIManager
|
||||
+5
-2
@@ -1,7 +1,10 @@
|
||||
@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
|
||||
|
||||
package at.mocode.frontend.features.deviceinitialization.domain
|
||||
|
||||
package at.mocode.frontend.features.device.initialization.data.local
|
||||
|
||||
import at.mocode.frontend.features.device.initialization.domain.DeviceInitializationValidator
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
|
||||
import kotlinx.browser.localStorage
|
||||
import kotlinx.serialization.json.Json
|
||||
|
||||
@@ -21,7 +24,7 @@ actual object DeviceInitializationSettingsManager {
|
||||
actual fun loadSettings(): DeviceInitializationSettings? {
|
||||
val content = localStorage.getItem(SETTINGS_KEY) ?: return null
|
||||
return try {
|
||||
json.decodeFromString<DeviceInitializationSettings>(DeviceInitializationSettings.serializer(), content)
|
||||
json.decodeFromString(DeviceInitializationSettings.serializer(), content)
|
||||
} catch (e: Exception) {
|
||||
println("Fehler beim Laden der Einstellungen (WasmJS): ${e.message}")
|
||||
null
|
||||
+10
-2
@@ -1,4 +1,12 @@
|
||||
package at.mocode.frontend.features.deviceinitialization.presentation
|
||||
@file:Suppress("EXPECT_ACTUAL_CLASSIFIERS_ARE_IN_BETA_WARNING")
|
||||
|
||||
package at.mocode.frontend.features.device.initialization.presentation
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.DeviceInitializationSettings
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.NetworkRole
|
||||
import at.mocode.frontend.features.device.initialization.domain.model.ExpectedClient
|
||||
|
||||
|
||||
|
||||
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Column
|
||||
@@ -13,7 +21,7 @@ import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||
import androidx.compose.ui.text.input.VisualTransformation
|
||||
import androidx.compose.ui.unit.dp
|
||||
import at.mocode.frontend.features.deviceinitialization.domain.DeviceInitializationValidator
|
||||
import at.mocode.frontend.features.device.initialization.domain.DeviceInitializationValidator
|
||||
|
||||
@Composable
|
||||
actual fun DeviceInitializationConfig(
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package at.mocode.frontend.features.profile.data
|
||||
|
||||
import at.mocode.frontend.core.auth.data.AuthTokenManager
|
||||
import at.mocode.frontend.core.auth.data.local.AuthTokenManager
|
||||
import at.mocode.frontend.core.network.PlatformConfig
|
||||
import io.ktor.client.*
|
||||
import io.ktor.client.call.*
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ import androidx.compose.runtime.setValue
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import at.mocode.core.domain.serialization.UuidSerializer
|
||||
import at.mocode.frontend.core.auth.data.AuthTokenManager
|
||||
import at.mocode.frontend.core.auth.data.local.AuthTokenManager
|
||||
import at.mocode.frontend.core.domain.zns.ZnsImportProvider
|
||||
import at.mocode.frontend.core.network.NetworkConfig
|
||||
import io.ktor.client.*
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import at.mocode.frontend.core.auth.data.AuthTokenManager
|
||||
import at.mocode.frontend.core.auth.data.local.AuthTokenManager
|
||||
import at.mocode.frontend.core.domain.repository.MasterdataRepository
|
||||
import at.mocode.frontend.core.domain.zns.ZnsImportProvider
|
||||
import at.mocode.frontend.core.domain.zns.ZnsImportState
|
||||
|
||||
Reference in New Issue
Block a user