mocode-software/meldestelle
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

### feat(WebMainScreen, OnlineNennungFormular, index.html)
Build and Publish Docker Images / build-and-push (., backend/services/mail/Dockerfile, mail-service, mail-service) (push) Successful in 5m58s
Details
Build and Publish Docker Images / build-and-push (., config/docker/caddy/web-app/Dockerfile, web-app, web-app) (push) Successful in 4m18s
Details

Browse Source 
- **WebMainScreen:** Implementiere hash-basiertes Routing für URLs und Synchronisation mit Adressleiste.
- **OnlineNennungFormular:** Aktualisiere Versionsanzeige mit neuer Farbe und Stil.
- **index.html:** Füge Runtime-Konfiguration per JavaScript hinzu (API, Mail, Keycloak).
This commit is contained in:
Stefan Mogeritsch
2026-04-23 07:16:15 +02:00
parent 6de5b55810
commit eea022b862
3 changed files with 45 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/features/nennung-feature/src/commonMain/kotlin/at/mocode/frontend/features/nennung/presentation/web/OnlineNennungFormular.kt
+3 -3
View File
@@ -222,11 +222,11 @@ fun OnlineNennungFormular(
modifier = Modifier.padding(bottom = 4.dp) modifier = Modifier.padding(bottom = 4.dp)
) )
Text( Text(
text = "v2026-04-23.5 - RADICAL RELOAD", // Eindeutige Version für diesen Fix text = "v2026-04-23.7 - URL-ROUTING", // Version erhöht für URL-Routing Fix
style = MaterialTheme.typography.labelLarge, style = MaterialTheme.typography.labelLarge,
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,
color = Color.Red, color = Color.Blue, // Farbe geändert für neue Version
modifier = Modifier.padding(bottom = 4.dp).background(Color.Yellow.copy(alpha = 0.3f)) modifier = Modifier.padding(bottom = 4.dp).background(Color.Black.copy(alpha = 0.05f))
) )
} }
frontend/shells/meldestelle-web/src/wasmJsMain/kotlin/at/mocode/frontend/shell/web/WebMainScreen.kt
+35
View File
@@ -26,6 +26,15 @@ fun WebMainScreen() {
MainAppContent() MainAppContent()
} }
@OptIn(ExperimentalWasmJsInterop::class)
private fun getWindowHash(): String = js("window.location.hash")
@OptIn(ExperimentalWasmJsInterop::class)
private fun setWindowHash(hash: String): Unit = js("window.location.hash = hash")
@OptIn(ExperimentalWasmJsInterop::class)
private fun onHashChange(onChanged: () -> Unit): Unit = js("window.addEventListener('hashchange', onChanged)")
@OptIn(ExperimentalMaterial3Api::class) @OptIn(ExperimentalMaterial3Api::class)
@Composable @Composable
fun MainAppContent() { fun MainAppContent() {
@@ -34,6 +43,32 @@ fun MainAppContent() {
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
var currentScreen by remember { mutableStateOf<WebScreen>(WebScreen.Landing) } var currentScreen by remember { mutableStateOf<WebScreen>(WebScreen.Landing) }
// Hash-basiertes Routing zur Synchronisation mit der Adressleiste
LaunchedEffect(Unit) {
val handleHashChange = {
val hash = getWindowHash()
currentScreen = when {
hash.startsWith("#/nennung/") -> {
val tId = hash.substringAfter("#/nennung/").toLongOrNull() ?: 26128L
WebScreen.Nennung(1, tId)
}
else -> WebScreen.Landing
}
}
handleHashChange()
onHashChange { handleHashChange() }
}
// Update der Adressleiste bei Screen-Wechsel
LaunchedEffect(currentScreen) {
val targetHash = when (val screen = currentScreen) {
is WebScreen.Landing -> "/"
is WebScreen.Nennung -> "/nennung/${screen.turnierId}"
is WebScreen.Erfolg -> "/erfolg"
}
setWindowHash("#$targetHash")
}
Scaffold( Scaffold(
topBar = { topBar = {
TopAppBar( TopAppBar(
frontend/shells/meldestelle-web/src/wasmJsMain/resources/index.html
+7
View File
@@ -19,6 +19,13 @@
height: 100%; height: 100%;
} }
</style> </style>
<script>
// Runtime configuration injected by Docker entrypoint
window.API_BASE_URL = "${API_BASE_URL}";
window.MAIL_SERVICE_URL = "${MAIL_SERVICE_URL}";
window.KEYCLOAK_URL = "${KEYCLOAK_URL}";
console.log("App Config loaded:", { API: window.API_BASE_URL, Mail: window.MAIL_SERVICE_URL });
</script>
<script type="application/javascript" src="meldestelle-web.js"></script> <script type="application/javascript" src="meldestelle-web.js"></script>
</head> </head>
<body> <body>