chore: entferne DesktopApp und DesktopMainLayout, da diese nicht mehr benötigt werden
This commit is contained in:
Generated
+4
@@ -1,4 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="FrameworkDetectionExcludesConfiguration">
|
||||
<file type="web" url="file://$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_25" project-jdk-name="openjdk-25" project-jdk-type="JavaSDK" />
|
||||
</project>
|
||||
+1
-1
@@ -70,7 +70,7 @@ fun StammdatenTabContent(
|
||||
// ohne die Abhängigkeit zu haben. In einer echten Architektur kommt dies über das Repository.
|
||||
// Aber für die Demo/Fakten-Präsentation im Desktop-Shell-Kontext:
|
||||
try {
|
||||
val clazz = Class.forName("at.mocode.desktop.data.TurnierStore")
|
||||
val clazz = Class.forName("at.mocode.frontend.shell.desktop.data.TurnierStore")
|
||||
val method = clazz.getMethod("allTurniere")
|
||||
val all = method.invoke(null) as? List<*>
|
||||
val turnier = all?.find { t ->
|
||||
|
||||
@@ -97,7 +97,7 @@ kotlin {
|
||||
|
||||
compose.desktop {
|
||||
application {
|
||||
mainClass = "at.mocode.desktop.MainKt"
|
||||
mainClass = "at.mocode.frontend.shell.desktop.MainKt"
|
||||
|
||||
nativeDistributions {
|
||||
// Ziel-Formate: Linux .deb, Windows .msi, macOS .dmg
|
||||
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop
|
||||
package at.mocode.frontend.shell.desktop
|
||||
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
@@ -8,8 +8,8 @@ import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.collectAsState
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.ui.Modifier
|
||||
import at.mocode.desktop.navigation.DesktopNavigationPort
|
||||
import at.mocode.desktop.screens.layout.DesktopMainLayout
|
||||
import at.mocode.frontend.shell.desktop.navigation.DesktopNavigationPort
|
||||
import at.mocode.frontend.shell.desktop.screens.layout.DesktopMainLayout
|
||||
import at.mocode.frontend.core.auth.data.local.AuthTokenManager
|
||||
import at.mocode.frontend.core.auth.presentation.LoginScreen
|
||||
import at.mocode.frontend.core.auth.presentation.LoginViewModel
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop
|
||||
package at.mocode.frontend.shell.desktop
|
||||
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.data
|
||||
package at.mocode.frontend.shell.desktop.data
|
||||
|
||||
import androidx.compose.runtime.mutableStateListOf
|
||||
import androidx.compose.runtime.snapshots.SnapshotStateList
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.data
|
||||
package at.mocode.frontend.shell.desktop.data
|
||||
|
||||
import androidx.compose.runtime.mutableStateListOf
|
||||
import androidx.compose.runtime.snapshots.SnapshotStateList
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package at.mocode.desktop.di
|
||||
package at.mocode.frontend.shell.desktop.di
|
||||
|
||||
import at.mocode.desktop.navigation.DesktopNavigationPort
|
||||
import at.mocode.desktop.repository.DesktopMasterdataRepository
|
||||
import at.mocode.frontend.shell.desktop.navigation.DesktopNavigationPort
|
||||
import at.mocode.frontend.shell.desktop.repository.DesktopMasterdataRepository
|
||||
import at.mocode.frontend.core.auth.data.local.AuthTokenManager
|
||||
import at.mocode.frontend.core.domain.models.User
|
||||
import at.mocode.frontend.core.domain.repository.MasterdataRepository
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
package at.mocode.desktop
|
||||
package at.mocode.frontend.shell.desktop
|
||||
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.window.Window
|
||||
import androidx.compose.ui.window.WindowState
|
||||
import androidx.compose.ui.window.application
|
||||
import at.mocode.desktop.di.desktopModule
|
||||
import at.mocode.frontend.shell.desktop.di.desktopModule
|
||||
import at.mocode.frontend.core.auth.di.authModule
|
||||
import at.mocode.frontend.core.localdb.AppDatabase
|
||||
import at.mocode.frontend.core.localdb.DatabaseProvider
|
||||
@@ -50,7 +50,7 @@ fun main() = application {
|
||||
}
|
||||
println("[DesktopApp] KOIN initialisiert")
|
||||
// Testdaten für Prototyp laden
|
||||
at.mocode.desktop.data.Store.seed()
|
||||
at.mocode.frontend.shell.desktop.data.Store.seed()
|
||||
} catch (e: Exception) {
|
||||
println("[DesktopApp] Koin-Warnung: ${e.message}")
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.navigation
|
||||
package at.mocode.frontend.shell.desktop.navigation
|
||||
|
||||
import at.mocode.frontend.core.navigation.AppScreen
|
||||
import at.mocode.frontend.core.navigation.NavigationPort
|
||||
+6
-6
@@ -1,10 +1,10 @@
|
||||
package at.mocode.desktop.repository
|
||||
package at.mocode.frontend.shell.desktop.repository
|
||||
|
||||
import at.mocode.desktop.data.Funktionaer
|
||||
import at.mocode.desktop.data.Pferd
|
||||
import at.mocode.desktop.data.Reiter
|
||||
import at.mocode.desktop.data.Store
|
||||
import at.mocode.desktop.data.Verein
|
||||
import at.mocode.frontend.shell.desktop.data.Funktionaer
|
||||
import at.mocode.frontend.shell.desktop.data.Pferd
|
||||
import at.mocode.frontend.shell.desktop.data.Reiter
|
||||
import at.mocode.frontend.shell.desktop.data.Store
|
||||
import at.mocode.frontend.shell.desktop.data.Verein
|
||||
import at.mocode.frontend.core.domain.repository.MasterdataRepository
|
||||
import at.mocode.frontend.core.domain.zns.ZnsRemoteFunktionaer
|
||||
import at.mocode.frontend.core.domain.zns.ZnsRemotePferd
|
||||
+15
-15
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.layout
|
||||
package at.mocode.frontend.shell.desktop.screens.layout
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
@@ -16,20 +16,20 @@ import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import at.mocode.desktop.data.Store
|
||||
import at.mocode.desktop.data.Turnier
|
||||
import at.mocode.desktop.data.TurnierStore
|
||||
import at.mocode.desktop.screens.management.FunktionaerVerwaltungScreen
|
||||
import at.mocode.desktop.screens.management.VeranstalterAuswahl
|
||||
import at.mocode.desktop.screens.management.VeranstalterDetail
|
||||
import at.mocode.desktop.screens.management.VeranstalterVerwaltungScreen
|
||||
import at.mocode.desktop.screens.nennung.NennungsEingangScreen
|
||||
import at.mocode.desktop.screens.profile.FunktionaerProfil
|
||||
import at.mocode.desktop.screens.veranstaltung.VeranstaltungVerwaltung
|
||||
import at.mocode.desktop.screens.veranstaltung.details.VeranstaltungKonfig
|
||||
import at.mocode.desktop.screens.veranstaltung.details.VeranstaltungProfilScreen
|
||||
import at.mocode.desktop.screens.veranstaltung.wizards.TurnierWizard
|
||||
import at.mocode.desktop.screens.veranstaltung.wizards.VeranstalterAnlegenWizard
|
||||
import at.mocode.frontend.shell.desktop.data.Store
|
||||
import at.mocode.frontend.shell.desktop.data.Turnier
|
||||
import at.mocode.frontend.shell.desktop.data.TurnierStore
|
||||
import at.mocode.frontend.shell.desktop.screens.management.FunktionaerVerwaltungScreen
|
||||
import at.mocode.frontend.shell.desktop.screens.management.VeranstalterAuswahl
|
||||
import at.mocode.frontend.shell.desktop.screens.management.VeranstalterDetail
|
||||
import at.mocode.frontend.shell.desktop.screens.management.VeranstalterVerwaltungScreen
|
||||
import at.mocode.frontend.shell.desktop.screens.nennung.NennungsEingangScreen
|
||||
import at.mocode.frontend.shell.desktop.screens.profile.FunktionaerProfil
|
||||
import at.mocode.frontend.shell.desktop.screens.veranstaltung.VeranstaltungVerwaltung
|
||||
import at.mocode.frontend.shell.desktop.screens.veranstaltung.details.VeranstaltungKonfig
|
||||
import at.mocode.frontend.shell.desktop.screens.veranstaltung.details.VeranstaltungProfilScreen
|
||||
import at.mocode.frontend.shell.desktop.screens.veranstaltung.wizards.TurnierWizard
|
||||
import at.mocode.frontend.shell.desktop.screens.veranstaltung.wizards.VeranstalterAnlegenWizard
|
||||
import at.mocode.frontend.core.auth.data.local.AuthTokenManager
|
||||
import at.mocode.frontend.core.designsystem.theme.AppColors
|
||||
import at.mocode.frontend.core.designsystem.theme.Dimens
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.management
|
||||
package at.mocode.frontend.shell.desktop.screens.management
|
||||
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.*
|
||||
@@ -16,7 +16,7 @@ import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import at.mocode.desktop.data.Store
|
||||
import at.mocode.frontend.shell.desktop.data.Store
|
||||
|
||||
@Composable
|
||||
fun <T> ManagementTableScreen(
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.management
|
||||
package at.mocode.frontend.shell.desktop.screens.management
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
@@ -15,8 +15,8 @@ import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import at.mocode.desktop.data.Store
|
||||
import at.mocode.desktop.theme.DesktopTheme
|
||||
import at.mocode.frontend.shell.desktop.data.Store
|
||||
import at.mocode.frontend.shell.desktop.theme.DesktopTheme
|
||||
|
||||
@Composable
|
||||
fun VeranstalterAuswahl(
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.nennung
|
||||
package at.mocode.frontend.shell.desktop.screens.nennung
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.*
|
||||
@@ -18,7 +18,7 @@ import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import at.mocode.desktop.theme.DesktopTheme
|
||||
import at.mocode.frontend.shell.desktop.theme.DesktopTheme
|
||||
import at.mocode.frontend.features.nennung.domain.NennungRemoteRepository
|
||||
import at.mocode.frontend.features.nennung.domain.NennungResponse
|
||||
import kotlinx.coroutines.launch
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.onboarding
|
||||
package at.mocode.frontend.shell.desktop.screens.onboarding
|
||||
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
@@ -20,7 +20,7 @@ import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||
import androidx.compose.ui.text.input.VisualTransformation
|
||||
import androidx.compose.ui.unit.dp
|
||||
import at.mocode.desktop.theme.DesktopTheme
|
||||
import at.mocode.frontend.shell.desktop.theme.DesktopTheme
|
||||
import at.mocode.frontend.core.designsystem.components.MsEnumDropdown
|
||||
import at.mocode.frontend.core.network.discovery.NetworkDiscoveryService
|
||||
import org.koin.compose.koinInject
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.onboarding
|
||||
package at.mocode.frontend.shell.desktop.screens.onboarding
|
||||
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.onboarding
|
||||
package at.mocode.frontend.shell.desktop.screens.onboarding
|
||||
|
||||
/**
|
||||
* Validierungslogik für den DeviceInitialization-Wizard.
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.onboarding
|
||||
package at.mocode.frontend.shell.desktop.screens.onboarding
|
||||
|
||||
import kotlinx.serialization.json.Json
|
||||
import java.io.File
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.preview
|
||||
package at.mocode.frontend.shell.desktop.screens.preview
|
||||
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.runtime.Composable
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.profile
|
||||
package at.mocode.frontend.shell.desktop.screens.profile
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.*
|
||||
@@ -11,8 +11,8 @@ import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import at.mocode.desktop.data.Store
|
||||
import at.mocode.desktop.theme.DesktopTheme
|
||||
import at.mocode.frontend.shell.desktop.data.Store
|
||||
import at.mocode.frontend.shell.desktop.theme.DesktopTheme
|
||||
import at.mocode.frontend.core.designsystem.components.MsTextField
|
||||
|
||||
@Composable
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.veranstaltung
|
||||
package at.mocode.frontend.shell.desktop.screens.veranstaltung
|
||||
|
||||
import java.time.LocalDate
|
||||
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.veranstaltung
|
||||
package at.mocode.frontend.shell.desktop.screens.veranstaltung
|
||||
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
@@ -12,8 +12,8 @@ import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import at.mocode.desktop.data.Store
|
||||
import at.mocode.desktop.theme.DesktopTheme
|
||||
import at.mocode.frontend.shell.desktop.data.Store
|
||||
import at.mocode.frontend.shell.desktop.theme.DesktopTheme
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
@@ -132,7 +132,7 @@ fun VeranstaltungVerwaltung(
|
||||
|
||||
@Composable
|
||||
fun VeranstaltungCard(
|
||||
veranstaltung: at.mocode.desktop.data.Veranstaltung,
|
||||
veranstaltung: at.mocode.frontend.shell.desktop.data.Veranstaltung,
|
||||
vereinName: String,
|
||||
onClick: () -> Unit
|
||||
) {
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.veranstaltung.components
|
||||
package at.mocode.frontend.shell.desktop.screens.veranstaltung.components
|
||||
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.material.icons.Icons
|
||||
@@ -11,7 +11,7 @@ import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import at.mocode.desktop.data.Turnier
|
||||
import at.mocode.frontend.shell.desktop.data.Turnier
|
||||
import java.time.LocalDate
|
||||
import javax.swing.JFileChooser
|
||||
import javax.swing.filechooser.FileNameExtensionFilter
|
||||
+6
-6
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.veranstaltung.details
|
||||
package at.mocode.frontend.shell.desktop.screens.veranstaltung.details
|
||||
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.material.icons.Icons
|
||||
@@ -12,11 +12,11 @@ import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import at.mocode.desktop.data.Store
|
||||
import at.mocode.desktop.data.TurnierStore
|
||||
import at.mocode.desktop.screens.veranstaltung.components.KpiCard
|
||||
import at.mocode.desktop.screens.veranstaltung.components.TurnierCard
|
||||
import at.mocode.desktop.theme.DesktopTheme
|
||||
import at.mocode.frontend.shell.desktop.data.Store
|
||||
import at.mocode.frontend.shell.desktop.data.TurnierStore
|
||||
import at.mocode.frontend.shell.desktop.screens.veranstaltung.components.KpiCard
|
||||
import at.mocode.frontend.shell.desktop.screens.veranstaltung.components.TurnierCard
|
||||
import at.mocode.frontend.shell.desktop.theme.DesktopTheme
|
||||
|
||||
@Composable
|
||||
fun VeranstaltungProfilScreen(
|
||||
+7
-7
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.veranstaltung.wizards
|
||||
package at.mocode.frontend.shell.desktop.screens.veranstaltung.wizards
|
||||
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
@@ -15,12 +15,12 @@ import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import at.mocode.desktop.data.Store
|
||||
import at.mocode.desktop.data.Turnier
|
||||
import at.mocode.desktop.data.Veranstaltung
|
||||
import at.mocode.desktop.theme.DesktopTheme
|
||||
import at.mocode.frontend.shell.desktop.data.Store
|
||||
import at.mocode.frontend.shell.desktop.data.Turnier
|
||||
import at.mocode.frontend.shell.desktop.data.Veranstaltung
|
||||
import at.mocode.frontend.shell.desktop.theme.DesktopTheme
|
||||
import java.time.LocalDate
|
||||
import at.mocode.desktop.screens.veranstaltung.components.AppDatePickerDialog
|
||||
import at.mocode.frontend.shell.desktop.screens.veranstaltung.components.AppDatePickerDialog
|
||||
|
||||
@Composable
|
||||
fun TurnierWizard(
|
||||
@@ -145,7 +145,7 @@ fun TurnierWizard(
|
||||
subTitel = subTitel,
|
||||
sponsoren = sponsoren
|
||||
)
|
||||
at.mocode.desktop.data.TurnierStore.add(veranstaltungId, newTurnier)
|
||||
at.mocode.frontend.shell.desktop.data.TurnierStore.add(veranstaltungId, newTurnier)
|
||||
onSaved(newTurnier.id)
|
||||
}
|
||||
},
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.veranstaltung.wizards
|
||||
package at.mocode.frontend.shell.desktop.screens.veranstaltung.wizards
|
||||
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.*
|
||||
@@ -12,10 +12,10 @@ import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.unit.dp
|
||||
import at.mocode.desktop.data.Store
|
||||
import at.mocode.frontend.shell.desktop.data.Store
|
||||
import at.mocode.frontend.core.domain.zns.ZnsImportProvider
|
||||
import at.mocode.frontend.core.domain.zns.ZnsImportState
|
||||
import at.mocode.desktop.screens.veranstaltung.components.pickZnsFile
|
||||
import at.mocode.frontend.shell.desktop.screens.veranstaltung.components.pickZnsFile
|
||||
import org.koin.compose.koinInject
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.theme
|
||||
package at.mocode.frontend.shell.desktop.theme
|
||||
|
||||
import androidx.compose.material3.ColorScheme
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package at.mocode.desktop.screens.onboarding
|
||||
package at.mocode.frontend.shell.desktop.screens.onboarding
|
||||
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertFalse
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package at.mocode.web
|
||||
package at.mocode.frontend.shell.web
|
||||
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package at.mocode.web
|
||||
package at.mocode.frontend.shell.web
|
||||
|
||||
import androidx.compose.ui.ExperimentalComposeUiApi
|
||||
import androidx.compose.ui.window.ComposeViewport
|
||||
Reference in New Issue
Block a user