Merge pull request 'dev' (#46 ) from dev into main

Reviewed-on: #46
Merge pull request 'Füge Funktion zur Umwandlung von Saison-Slugs in Labels hinzu und aktualisiere PDF-Daten mit saisonalen Informationen' (#45 ) from dev into main
2026-07-17 14:00:12 +02:00 · 2026-07-15 11:38:20 +02:00 · 2026-07-15 11:12:16 +02:00 · 2026-06-23 23:50:21 +02:00 · 2026-06-16 14:09:23 +02:00 · 2026-06-10 16:49:07 +02:00
43 changed files with 923 additions and 3044 deletions
--- a/.gitea/workflows/code-analysis.yml
+++ b/.gitea/workflows/code-analysis.yml
@@ -13,16 +13,7 @@ jobs:
        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5
        with:
          clean: true
-          # Der Analyse-Workflow benötigt keine Historie. Ein flacher Checkout
-          # verhindert, dass der Runner das große Repository-Pack vollständig lädt.
-          fetch-depth: 1
-          # Der Web-Workflow braucht keine Android-Artefakte. Insbesondere liegt
-          # dort ein großer Heap-Dump im aktuellen Commit, der auch bei einem
-          # flachen Checkout übertragen würde und den Runner-Checkout abbricht.
-          sparse-checkout: |
-            /*
-            !/android-app/
-          sparse-checkout-cone-mode: false
+          fetch-depth: 0

      - name: Ensure clean workspace
        run: |
--- a/.gitignore
+++ b/.gitignore
@@ -94,8 +94,6 @@ dist
 /android-app/**/build/
 /android-app/local.properties
 /android-app/gradle-local.properties
-# JVM Heap-Dumps sind lokale Diagnoseartefakte und dürfen nie ins Repository.
-*.hprof

 # Build output (but keep production data!)
 .output
--- a/android-app/app/build.gradle.kts
+++ b/android-app/app/build.gradle.kts
@@ -78,12 +78,12 @@ val ensureProductionApiBaseUrl = tasks.register("ensureProductionApiBaseUrl") {

 android {
    namespace = "de.harheimertc"
-    compileSdk = 36
+    compileSdk = 35

    defaultConfig {
        applicationId = "de.harheimertc"
        minSdk = 24
-        targetSdk = 36
+        targetSdk = 35
        versionCode = androidVersionCode
        versionName = androidVersionName
    }
--- a/android-app/app/production/release/app-production-release.aab
+++ b/android-app/app/production/release/app-production-release.aab
--- a/android-app/app/src/main/java/de/harheimertc/data/ApiService.kt
+++ b/android-app/app/src/main/java/de/harheimertc/data/ApiService.kt
@@ -166,7 +166,6 @@ data class MembershipResponse(
    val success: Boolean = false,
    val message: String? = null,
    val downloadUrl: String? = null,
-    val downloadToken: String? = null,
 )
 data class LoginRequest(
    val email: String,
@@ -661,10 +660,7 @@ interface ApiService {

    @Streaming
    @GET
-    suspend fun downloadMembershipPdf(
-        @Url downloadUrl: String,
-        @retrofit2.http.Header("X-Membership-Download-Token") downloadToken: String? = null,
-    ): Response<ResponseBody>
+    suspend fun downloadMembershipPdf(@Url downloadUrl: String): Response<ResponseBody>

    @POST("/api/auth/login")
    suspend fun login(@Body request: LoginRequest): Response<LoginResponse>
--- a/android-app/app/src/main/java/de/harheimertc/notifications/HarheimerNotifications.kt
+++ b/android-app/app/src/main/java/de/harheimertc/notifications/HarheimerNotifications.kt
@@ -16,16 +16,14 @@ import de.harheimertc.R
 import de.harheimertc.ui.navigation.Destinations

 object HarheimerNotifications {
-    // A new ID is intentional: Android does not allow an app update to raise
-    // the importance of an already-created notification channel.
-    const val DEFAULT_CHANNEL_ID = "harheimer_tc_updates_v2"
+    const val DEFAULT_CHANNEL_ID = "harheimer_tc_updates"

    fun createChannels(context: Context) {
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
        val channel = NotificationChannel(
            DEFAULT_CHANNEL_ID,
            "Harheimer TC",
-            NotificationManager.IMPORTANCE_HIGH,
+            NotificationManager.IMPORTANCE_DEFAULT,
        ).apply {
            description = "Benachrichtigungen des Harheimer TC"
        }
@@ -49,7 +47,7 @@ object HarheimerNotifications {
            .setContentTitle(title)
            .setContentText(message)
            .setStyle(NotificationCompat.BigTextStyle().bigText(message))
-            .setPriority(NotificationCompat.PRIORITY_HIGH)
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
            .setContentIntent(createContentIntent(context, notificationId, data))
            .setAutoCancel(true)
            .build()
--- a/android-app/app/src/main/java/de/harheimertc/repositories/MembershipRepository.kt
+++ b/android-app/app/src/main/java/de/harheimertc/repositories/MembershipRepository.kt
@@ -9,7 +9,7 @@ import java.io.File
 import javax.inject.Inject
 import javax.inject.Singleton

-data class MembershipDocument(val message: String, val uri: String? = null)
+data class MembershipDocument(val message: String, val uri: String)

@Singleton
 class MembershipRepository @Inject constructor(
@@ -18,33 +18,21 @@ class MembershipRepository @Inject constructor(
 ) {
    suspend fun submit(request: MembershipRequest): Result<MembershipDocument> = runCatching {
        val response = api.generateMembershipPdf(request)
-        if (!response.isSuccessful) {
-            val serverMessage = response.errorBody()?.string()
-                ?.let { Regex("\\\"(?:statusMessage|message)\\\"\\s*:\\s*\\\"([^\\\"]+)\\\"").find(it)?.groupValues?.getOrNull(1) ?: it }
-                ?.takeIf { it.isNotBlank() }
-            error(serverMessage ?: "Der Antrag konnte nicht übermittelt werden (HTTP ${response.code()}).")
-        }
+        if (!response.isSuccessful) error("HTTP ${response.code()}")
        val body = response.body() ?: error("Leere Antwort")
        if (!body.success) error(body.message ?: "Antrag konnte nicht erstellt werden.")
-        val uri = body.downloadUrl?.let { downloadUrl ->
-            runCatching {
-                val documentResponse = api.downloadMembershipPdf(downloadUrl, body.downloadToken)
-                if (!documentResponse.isSuccessful) error("PDF konnte nicht heruntergeladen werden.")
-                val directory = File(context.cacheDir, "membership").apply { mkdirs() }
-                val file = File(directory, "beitrittserklaerung.pdf")
-                documentResponse.body()?.byteStream()?.use { input ->
-                    file.outputStream().use { output -> input.copyTo(output) }
-                } ?: error("Leere PDF-Antwort")
-                FileProvider.getUriForFile(context, "${context.packageName}.files", file).toString()
-            }.getOrNull()
-        }
+        val downloadUrl = body.downloadUrl ?: error("PDF-Download fehlt.")
+        val documentResponse = api.downloadMembershipPdf(downloadUrl)
+        if (!documentResponse.isSuccessful) error("PDF konnte nicht heruntergeladen werden.")
+        val directory = File(context.cacheDir, "membership").apply { mkdirs() }
+        val file = File(directory, "beitrittserklaerung.pdf")
+        documentResponse.body()?.byteStream()?.use { input ->
+            file.outputStream().use { output -> input.copyTo(output) }
+        } ?: error("Leere PDF-Antwort")
+        val uri = FileProvider.getUriForFile(context, "${context.packageName}.files", file)
        MembershipDocument(
-            message = if (uri == null) {
-                "${body.message ?: "Mitgliedschaftsantrag erfolgreich übermittelt."} Das PDF konnte nicht auf diesem Gerät gespeichert werden."
-            } else {
-                body.message ?: "Beitrittsformular erfolgreich erstellt."
-            },
-            uri = uri,
+            message = body.message ?: "Beitrittsformular erfolgreich erstellt.",
+            uri = uri.toString(),
        )
    }
 }
--- a/android-app/app/src/main/java/de/harheimertc/ui/screens/membership/MembershipViewModel.kt
+++ b/android-app/app/src/main/java/de/harheimertc/ui/screens/membership/MembershipViewModel.kt
@@ -81,10 +81,7 @@ class MembershipViewModel @Inject constructor(private val repository: Membership
                    _state.value = _state.value.copy(sending = false, fieldErrors = emptyMap(), message = document.message, pdfUri = document.uri)
                }
                .onFailure {
-                    _state.value = _state.value.copy(
-                        sending = false,
-                        error = it.message ?: "Beitrittsformular konnte nicht erstellt werden.",
-                    )
+                    _state.value = _state.value.copy(sending = false, error = "Beitrittsformular konnte nicht erstellt werden.")
                }
        }
    }
--- a/android-app/gradle.properties
+++ b/android-app/gradle.properties
@@ -8,8 +8,8 @@ LOCAL_API_BASE_URL=https://harheimertc.tsschulz.de/
 PRODUCTION_API_BASE_URL=https://harheimertc.de/

 # Android app versioning for Play Store uploads
-ANDROID_VERSION_CODE=32
-ANDROID_VERSION_NAME=0.9.27
+ANDROID_VERSION_CODE=29
+ANDROID_VERSION_NAME=0.9.24

 # Temporary hotfix: disable R8 minification for release to avoid Retrofit generic signature stripping.
 RELEASE_MINIFY_ENABLED=false
--- a/android-app/java_pid672503.hprof
+++ b/android-app/java_pid672503.hprof
--- a/app.vue
+++ b/app.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="h-screen flex flex-col overflow-hidden">
    <Navigation />
-    <main class="flex-1 overflow-y-auto pt-20 pb-20 sm:pb-0">
+    <main class="flex-1 overflow-y-auto pt-20">
      <NuxtPage />
    </main>
    <Footer />
--- a/components/Footer.vue
+++ b/components/Footer.vue
@@ -1,39 +1,39 @@
 <template>
-  <footer class="fixed bottom-0 left-0 right-0 z-40 border-t border-gray-200/90 bg-white/95 shadow-[0_-5px_18px_rgba(24,24,27,0.07)] backdrop-blur-sm">
-    <div class="max-w-7xl mx-auto px-3 sm:px-6 lg:px-8 py-2.5 sm:py-3">
-      <div class="flex flex-col sm:flex-row justify-between items-center gap-y-1 sm:gap-y-0">
-        <p class="text-xs sm:text-sm text-gray-600 whitespace-nowrap">
+  <footer class="fixed bottom-0 left-0 right-0 z-40 bg-gray-900 border-t border-gray-800 shadow-2xl">
+    <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-3">
+      <div class="flex flex-col sm:flex-row justify-between items-center space-y-2 sm:space-y-0">
+        <p class="text-sm text-gray-400">
          © {{ currentYear }} Harheimer TC 1954 e.V.
        </p>
-        <div class="flex flex-wrap justify-center items-center gap-x-4 gap-y-1 text-xs sm:text-sm relative">
+        <div class="flex items-center space-x-6 text-sm relative">
          <span
            v-if="isLoggedIn && appVersion"
-            class="text-xs text-gray-500"
+            class="text-xs text-gray-600"
            title="Version"
          >
            v{{ appVersion }}
          </span>
          <NuxtLink
            to="/impressum"
-            class="text-gray-700 hover:text-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 rounded-sm transition-colors"
+            class="text-gray-400 hover:text-primary-400 transition-colors"
          >
            Impressum
          </NuxtLink>
          <NuxtLink
            to="/datenschutz"
-            class="text-gray-700 hover:text-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 rounded-sm transition-colors"
+            class="text-gray-400 hover:text-primary-400 transition-colors"
          >
            Datenschutz
          </NuxtLink>
          <NuxtLink
            to="/konto-loeschen"
-            class="text-gray-700 hover:text-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 rounded-sm transition-colors"
+            class="text-gray-400 hover:text-primary-400 transition-colors"
          >
            Konto loeschen
          </NuxtLink>
          <NuxtLink
            to="/kontakt"
-            class="text-gray-700 hover:text-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 rounded-sm transition-colors"
+            class="text-gray-400 hover:text-primary-400 transition-colors"
          >
            Kontakt
          </NuxtLink>
@@ -41,7 +41,7 @@
          <!-- Login/Logout -->
          <template v-if="isLoggedIn">
            <button
-              class="flex items-center space-x-1 rounded-sm text-gray-700 hover:text-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 transition-colors"
+              class="flex items-center space-x-1 text-gray-400 hover:text-primary-400 transition-colors"
              @click="handleLogout"
            >
              <User :size="16" />
@@ -53,7 +53,7 @@
            class="relative"
          >
            <button
-              class="flex items-center space-x-1 rounded-sm text-gray-700 hover:text-primary-700 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-500 focus-visible:ring-offset-2 transition-colors"
+              class="flex items-center space-x-1 text-gray-400 hover:text-primary-400 transition-colors"
              @click="toggleMemberMenu"
            >
              <User :size="16" />
@@ -75,25 +75,25 @@
            >
              <div
                v-if="isMemberMenuOpen"
-                class="absolute bottom-full right-0 mb-2 w-48 overflow-hidden rounded-md border border-gray-200 bg-white shadow-[0_12px_28px_rgba(24,24,27,0.14)] ring-1 ring-black/5"
+                class="absolute bottom-full right-0 mb-2 w-48 bg-gray-800 border border-gray-700 rounded-lg shadow-xl overflow-hidden"
              >
                <NuxtLink
                  to="/login"
-                  class="block px-4 py-2 text-sm text-gray-700 hover:bg-primary-50 hover:text-primary-800 focus-visible:outline-none focus-visible:bg-primary-50 focus-visible:text-primary-800 transition-colors"
+                  class="block px-4 py-2 text-sm text-gray-300 hover:bg-primary-600 hover:text-white transition-colors"
                  @click="isMemberMenuOpen = false"
                >
                  Anmelden
                </NuxtLink>
                <NuxtLink
                  to="/registrieren"
-                  class="block px-4 py-2 text-sm text-gray-700 hover:bg-primary-50 hover:text-primary-800 focus-visible:outline-none focus-visible:bg-primary-50 focus-visible:text-primary-800 transition-colors"
+                  class="block px-4 py-2 text-sm text-gray-300 hover:bg-primary-600 hover:text-white transition-colors"
                  @click="isMemberMenuOpen = false"
                >
                  Registrieren
                </NuxtLink>
                <NuxtLink
                  to="/passwort-vergessen"
-                  class="block px-4 py-2 text-sm text-gray-700 hover:bg-primary-50 hover:text-primary-800 focus-visible:outline-none focus-visible:bg-primary-50 focus-visible:text-primary-800 transition-colors"
+                  class="block px-4 py-2 text-sm text-gray-300 hover:bg-primary-600 hover:text-white transition-colors"
                  @click="isMemberMenuOpen = false"
                >
                  Passwort vergessen
--- a/components/Hero.vue
+++ b/components/Hero.vue
@@ -29,9 +29,9 @@
    </div>

    <!-- Content -->
-    <div class="relative z-20 max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
+    <div class="relative z-20 max-w-7xl mx-auto">
      <div class="text-center">
-        <h1 class="text-4xl sm:text-6xl lg:text-7xl font-display font-bold text-gray-900 mb-6 leading-tight animate-fade-in">
+        <h1 class="text-5xl sm:text-6xl lg:text-7xl font-display font-bold text-gray-900 mb-6 leading-tight animate-fade-in">
          Willkommen beim<br>
          <span class="text-primary-600">Harheimer TC</span>
        </h1>
@@ -163,3 +163,4 @@ const yearsSinceFounding = new Date().getFullYear() - foundingYear
  animation: fadeIn 0.8s ease-out 0.4s both;
 }
 </style>
+
--- a/components/HomeSpielplanTeamWidget.vue
+++ b/components/HomeSpielplanTeamWidget.vue
@@ -58,9 +58,7 @@
              </p>
            </div>
            <p class="text-sm text-gray-800">
-              {{ formatMatchTeamName(game.HeimMannschaft, game.HeimMannschaftAltersklasse, game.Altersklasse) }}
-              vs
-              {{ formatMatchTeamName(game.GastMannschaft, game.GastMannschaftAltersklasse, game.Altersklasse) }}
+              {{ game.HeimMannschaft }} vs {{ game.GastMannschaft }}
            </p>
          </div>
        </div>
@@ -71,7 +69,6 @@

 <script setup>
 import { computed, ref, watch } from 'vue'
-import { formatTeamDisplayName } from '~/utils/team-display'

 const props = defineProps({
  season: {
@@ -94,13 +91,10 @@ const games = ref([])

 const widgetTitle = computed(() => {
  if (!props.teamName) return 'Mannschaft'
-  return formatTeamDisplayName(props.teamName, props.teamAgeGroup)
+  const youth = String(props.teamAgeGroup || '').toLowerCase().includes('jugend')
+  return youth ? `(J) ${props.teamName}` : props.teamName
 })

-function formatMatchTeamName(teamName, teamAgeGroup, competitionAgeGroup) {
-  return formatTeamDisplayName(teamName, teamAgeGroup, competitionAgeGroup) || '-'
-}
-
 const seasonLabel = computed(() => {
  const match = String(props.season || '').match(/^(\d{2})--(\d{2})$/)
  if (!match) return props.season || '-'
@@ -190,4 +184,4 @@ watch(
  },
  { immediate: true }
 )
-</script>
+</script>
--- a/components/HomeTermine.vue
+++ b/components/HomeTermine.vue
@@ -1,7 +1,7 @@
 <template>
-  <section class="py-8 sm:py-10 bg-gray-50">
+  <section class="py-16 sm:py-20 bg-gray-50">
    <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-      <div class="text-center mb-6 sm:mb-8">
+      <div class="text-center mb-12">
        <h2 class="text-4xl sm:text-5xl font-display font-bold text-gray-900 mb-4">
          Kommende Termine
        </h2>
@@ -12,7 +12,7 @@
        <TermineVorschau />
      </div>

-      <div class="text-center mt-5 sm:mt-6">
+      <div class="text-center mt-8">
        <NuxtLink
          to="/termine"
          class="inline-flex items-center px-6 py-3 bg-primary-600 hover:bg-primary-700 text-white font-semibold rounded-lg transition-colors"
@@ -32,3 +32,4 @@
 import { ArrowRight } from 'lucide-vue-next'
 import TermineVorschau from './TermineVorschau.vue'
 </script>
+
--- a/components/Navigation.vue
+++ b/components/Navigation.vue
@@ -5,11 +5,11 @@
    <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 h-full">
      <div class="flex flex-col justify-between h-full py-2">
        <!-- Hauptmenü -->
-        <div class="flex min-w-0 items-center gap-3">
+        <div class="flex justify-between items-center">
          <!-- Logo -->
          <NuxtLink
            to="/"
-            class="flex shrink-0 items-center space-x-3 origin-left hover:scale-[1.02] transition-transform"
+            class="flex items-center space-x-3 hover:scale-105 transition-transform"
          >
            <img
              src="~/assets/images/logos/Harheimer TC.svg"
@@ -23,12 +23,9 @@
            </div>
          </NuxtLink>

-          <div class="flex min-w-0 flex-1 flex-col">
+          <div style="display:flex;flex-direction:column;">
            <!-- Desktop Navigation -->
-            <div
-              class="hidden min-w-0 max-w-full lg:flex lg:items-center lg:gap-1 lg:overflow-x-auto lg:whitespace-nowrap [scrollbar-color:theme(colors.primary.700)_transparent] [scrollbar-width:thin]"
-              aria-label="Hauptmenü – horizontal scrollbar"
-            >
+            <div class="hidden lg:flex items-center space-x-1">
              <NuxtLink
                to="/"
                class="px-4 py-2 text-gray-300 hover:text-white font-medium transition-all rounded-lg hover:bg-primary-700/50"
@@ -114,10 +111,10 @@
              </NuxtLink>
            </div>

-            <div class="hidden min-w-0 flex-1 lg:flex items-center h-6 border-t border-primary-700/20">
+            <div class="hidden lg:flex items-center h-6 border-t border-primary-700/20">
              <div
                v-if="currentSubmenu"
-                :class="currentSubmenu === 'mannschaften' ? 'relative min-w-0 flex-1' : 'flex min-w-0 items-center gap-1 overflow-x-auto whitespace-nowrap'"
+                class="flex items-center space-x-1"
              >
                <!-- Newsletter Submenu -->
                <template v-if="currentSubmenu === 'newsletter'">
@@ -191,69 +188,41 @@

                <!-- Mannschaften Submenu -->
                <template v-if="currentSubmenu === 'mannschaften'">
-                  <div
-                    ref="mannschaftenSubmenuRail"
-                    class="flex min-w-0 items-center gap-1 overflow-x-auto whitespace-nowrap scroll-smooth px-7 [scrollbar-color:theme(colors.primary.700)_transparent] [scrollbar-width:thin]"
-                    tabindex="0"
-                    aria-label="Mannschaften-Untermenü – horizontal scrollbar"
-                    @scroll.passive="updateMannschaftenSubmenuControls"
+                  <NuxtLink
+                    to="/mannschaften"
+                    class="px-2.5 py-1 text-xs font-semibold text-white hover:bg-primary-700/50 rounded transition-all"
+                    active-class="bg-primary-600"
+                  >
+                    Übersicht
+                  </NuxtLink>
+                  <div class="h-3 w-px bg-primary-700" />
+                  <template
+                    v-for="mannschaft in mannschaften"
+                    :key="mannschaft.slug"
                  >
                    <NuxtLink
-                      to="/mannschaften"
-                      class="shrink-0 px-2.5 py-1 text-xs font-semibold text-white hover:bg-primary-700/50 rounded transition-all"
-                      active-class="bg-primary-600"
-                    >
-                      Übersicht
-                    </NuxtLink>
-                    <div class="h-3 w-px shrink-0 bg-primary-700" />
-                    <template
-                      v-for="mannschaft in mannschaften"
-                      :key="mannschaft.slug"
-                    >
-                      <NuxtLink
-                        :to="`/mannschaften/${mannschaft.slug}`"
-                        class="shrink-0 whitespace-nowrap px-2.5 py-1 text-xs text-gray-300 hover:text-white hover:bg-primary-700/50 rounded transition-all"
-                        active-class="text-white bg-primary-600"
-                      >
-                        {{ mannschaft.mannschaft }}
-                      </NuxtLink>
-                    </template>
-                    <div class="h-3 w-px shrink-0 bg-primary-700" />
-                    <NuxtLink
-                      to="/mannschaften/spielplaene"
-                      class="shrink-0 whitespace-nowrap px-2.5 py-1 text-xs text-gray-300 hover:text-white hover:bg-primary-700/50 rounded transition-all"
+                      :to="`/mannschaften/${mannschaft.slug}`"
+                      class="px-2.5 py-1 text-xs text-gray-300 hover:text-white hover:bg-primary-700/50 rounded transition-all"
                      active-class="text-white bg-primary-600"
                    >
-                      Spielpläne
+                      {{ mannschaft.mannschaft }}
                    </NuxtLink>
-                    <NuxtLink
-                      to="/spielsysteme"
-                      class="shrink-0 whitespace-nowrap px-2.5 py-1 text-xs text-gray-300 hover:text-white hover:bg-primary-700/50 rounded transition-all"
-                      active-class="text-white bg-primary-600"
-                    >
-                      Spielsysteme
-                    </NuxtLink>
-                  </div>
-                  <button
-                    v-if="showMannschaftenSubmenuLeftControl"
-                    type="button"
-                    class="absolute inset-y-0 left-0 z-10 flex w-9 items-center justify-start bg-gradient-to-r from-primary-900 via-primary-900/90 to-transparent pl-1 text-primary-300 transition-colors hover:text-white focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-300"
-                    aria-label="Vorherige Mannschaften anzeigen"
-                    @pointerdown.stop
-                    @click.stop.prevent="scrollMannschaftenSubmenuLeft"
+                  </template>
+                  <div class="h-3 w-px bg-primary-700" />
+                  <NuxtLink
+                    to="/mannschaften/spielplaene"
+                    class="px-2.5 py-1 text-xs text-gray-300 hover:text-white hover:bg-primary-700/50 rounded transition-all"
+                    active-class="text-white bg-primary-600"
                  >
-                    ‹
-                  </button>
-                  <button
-                    v-if="showMannschaftenSubmenuRightControl"
-                    type="button"
-                    class="absolute inset-y-0 right-0 z-10 flex w-9 items-center justify-end bg-gradient-to-l from-primary-900 via-primary-900/90 to-transparent pr-1 text-primary-300 transition-colors hover:text-white focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-300"
-                    aria-label="Weitere Mannschaften anzeigen"
-                    @pointerdown.stop
-                    @click.stop.prevent="scrollMannschaftenSubmenuRight"
+                    Spielpläne
+                  </NuxtLink>
+                  <NuxtLink
+                    to="/spielsysteme"
+                    class="px-2.5 py-1 text-xs text-gray-300 hover:text-white hover:bg-primary-700/50 rounded transition-all"
+                    active-class="text-white bg-primary-600"
                  >
-                    ›
-                  </button>
+                    Spielsysteme
+                  </NuxtLink>
                </template>

                <!-- Training Submenu -->
@@ -884,7 +853,7 @@
 </template>

 <script setup>
-import { ref, onMounted, onUnmounted, computed, nextTick, watch } from 'vue'
+import { ref, onMounted, onUnmounted, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import { Menu, X, ChevronDown } from 'lucide-vue-next'

@@ -892,9 +861,6 @@ const route = useRoute()
 const isMobileMenuOpen = ref(false)
 const mobileSubmenu = ref(null)
 const mannschaften = ref([])
-const mannschaftenSubmenuRail = ref(null)
-const showMannschaftenSubmenuLeftControl = ref(false)
-const showMannschaftenSubmenuRightControl = ref(false)
 const hasGalleryImages = ref(false)
 const showCmsDropdown = ref(false)
 const authStore = useAuthStore()
@@ -932,38 +898,6 @@ const toggleMobileSubmenu = (menu) => {
  mobileSubmenu.value = mobileSubmenu.value === menu ? null : menu
 }

-const updateMannschaftenSubmenuControls = () => {
-  const rail = mannschaftenSubmenuRail.value
-  if (!rail) return
-
-  const canScroll = rail.scrollWidth > rail.clientWidth + 1
-  const atStart = rail.scrollLeft <= 1
-  const atEnd = rail.scrollLeft + rail.clientWidth >= rail.scrollWidth - 1
-
-  showMannschaftenSubmenuLeftControl.value = canScroll && !atStart
-  showMannschaftenSubmenuRightControl.value = canScroll && !atEnd
-}
-
-const scrollMannschaftenSubmenuLeft = () => {
-  const rail = mannschaftenSubmenuRail.value
-  if (!rail) return
-
-  rail.scrollBy({
-    left: -Math.max(rail.clientWidth * 0.8, 160),
-    behavior: 'smooth'
-  })
-}
-
-const scrollMannschaftenSubmenuRight = () => {
-  const rail = mannschaftenSubmenuRail.value
-  if (!rail) return
-
-  rail.scrollBy({
-    left: Math.max(rail.clientWidth * 0.8, 160),
-    behavior: 'smooth'
-  })
-}
-
 const loadMannschaften = async () => {
  try {
    const attempt = async () => {
@@ -1048,23 +982,16 @@ onMounted(() => {
  // Listen for global updates to mannschaften (e.g., CMS saved)
  if (typeof window !== 'undefined') {
    window.addEventListener('mannschaften:changed', loadMannschaften)
-    window.addEventListener('resize', updateMannschaftenSubmenuControls)
  }
-  nextTick(updateMannschaftenSubmenuControls)
 })

 onUnmounted(() => {
  document.removeEventListener('click', handleDocumentClick)
  if (typeof window !== 'undefined') {
    window.removeEventListener('mannschaften:changed', loadMannschaften)
-    window.removeEventListener('resize', updateMannschaftenSubmenuControls)
  }
 })

-watch([currentSubmenu, mannschaften], () => {
-  nextTick(updateMannschaftenSubmenuControls)
-}, { flush: 'post' })
-
 const toggleSubmenu = (menu) => {
  // Wenn wir schon im richtigen Bereich sind, nichts tun (Submenu bleibt offen)
  // Wenn nicht, zur Hauptseite navigieren
--- a/components/PublicNews.vue
+++ b/components/PublicNews.vue
@@ -1,13 +1,9 @@
 <template>
  <section
-    class="bg-white"
-    :class="news.length === 0 && !isLoading ? 'py-8 sm:py-10' : 'py-10 sm:py-12'"
+    class="py-16 sm:py-20 bg-white min-h-[32rem]"
  >
    <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-      <div
-        class="text-center"
-        :class="news.length === 0 && !isLoading ? 'mb-6 sm:mb-8' : 'mb-8 sm:mb-10'"
-      >
+      <div class="text-center mb-16">
        <h2 class="text-4xl sm:text-5xl font-display font-bold text-gray-900 mb-4">
          Aktuelles
        </h2>
@@ -71,7 +67,7 @@

      <div
        v-else
-        class="max-w-xl mx-auto text-center bg-gray-50 border border-gray-200 rounded-xl p-5"
+        class="max-w-xl mx-auto text-center bg-gray-50 border border-gray-200 rounded-xl p-8"
      >
        <p class="text-gray-700 font-semibold mb-2">
          Aktuell keine News
@@ -226,3 +222,4 @@ onUnmounted(() => {
  opacity: 0;
 }
 </style>
+
--- a/components/Spielplan.vue
+++ b/components/Spielplan.vue
@@ -1,7 +1,7 @@
 <template>
-  <section class="py-8 sm:py-10 bg-white">
+  <section class="py-16 bg-white">
    <div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8">
-      <div class="text-center mb-6 sm:mb-8">
+      <div class="text-center mb-12">
        <h2 class="text-3xl font-bold text-gray-900 mb-4">
          Nächste Spiele
        </h2>
@@ -10,7 +10,7 @@
      <!-- Loading State -->
      <div
        v-if="isLoading"
-        class="text-center py-4"
+        class="text-center py-8"
      >
        <svg
          class="w-8 h-8 text-gray-400 mx-auto mb-4 animate-spin"
@@ -33,7 +33,7 @@
      <!-- Error State -->
      <div
        v-else-if="error"
-        class="text-center py-4"
+        class="text-center py-8"
      >
        <svg
          class="w-12 h-12 text-gray-400 mx-auto mb-4"
@@ -62,7 +62,7 @@
      <!-- Empty State -->
      <div
        v-else-if="!upcomingGames || upcomingGames.length === 0"
-        class="text-center py-4"
+        class="text-center py-8"
      >
        <svg
          class="w-12 h-12 text-gray-400 mx-auto mb-4"
@@ -146,7 +146,7 @@
                    Heim
                  </p>
                  <p class="font-semibold text-gray-900">
-                    {{ formatTeamName(game.HeimMannschaft, game.HeimMannschaftAltersklasse, game.Altersklasse) }}
+                    {{ formatTeamName(game.HeimMannschaft, game.HeimMannschaftAltersklasse) }}
                  </p>
                </div>
                <div class="text-center mx-4">
@@ -159,7 +159,7 @@
                    Gast
                  </p>
                  <p class="font-semibold text-gray-900">
-                    {{ formatTeamName(game.GastMannschaft, game.GastMannschaftAltersklasse, game.Altersklasse) }}
+                    {{ formatTeamName(game.GastMannschaft, game.GastMannschaftAltersklasse) }}
                  </p>
                </div>
              </div>
@@ -220,7 +220,6 @@

 <script setup>
 import { ref, onMounted, computed } from 'vue'
-import { formatTeamDisplayName } from '~/utils/team-display'

 const spielplanData = ref([])
 const isLoading = ref(false)
@@ -356,10 +355,17 @@ const formatTime = (terminString) => {
  }
 }

-const formatTeamName = (teamName, ageGroup, competitionAgeGroup) => {
+const formatTeamName = (teamName, ageGroup) => {
  if (!teamName) return 'Nicht angegeben'
-
-  return formatTeamDisplayName(teamName, ageGroup, competitionAgeGroup)
+  
+  // Prüfe ob es Nachwuchs ist
+  const isNachwuchs = ageGroup && (
+    ageGroup.toLowerCase().includes('jugend') || 
+    teamName.toLowerCase().includes('jugend')
+  )
+  
+  // Füge (J) für Nachwuchs hinzu
+  return isNachwuchs ? `(J) ${teamName}` : teamName
 }

 const formatRunde = (runde) => {
--- a/components/TermineVorschau.vue
+++ b/components/TermineVorschau.vue
@@ -45,7 +45,7 @@

    <div
      v-else
-      class="text-center py-4 bg-gray-50 rounded-lg"
+      class="text-center py-8 bg-gray-50 rounded-lg"
    >
      <Calendar
        :size="32"
@@ -123,3 +123,4 @@ onMounted(() => {
  loadTermine()
 })
 </script>
+
--- a/components/cms/CmsMannschaften.vue
+++ b/components/cms/CmsMannschaften.vue
@@ -219,10 +219,7 @@
                >
                <span class="text-sm text-gray-800">{{ team.label }}</span>
              </label>
-              <p
-                v-if="!spielplanTeams.length"
-                class="px-4 py-3 text-sm text-gray-500"
-              >
+              <p v-if="!spielplanTeams.length" class="px-4 py-3 text-sm text-gray-500">
                Noch keine importierten Spielplan-Teams verfügbar.
              </p>
            </div>
--- a/deploy-production.sh
+++ b/deploy-production.sh
@@ -282,11 +282,17 @@ install_dependencies_if_needed
 # 4. Stop running apps before replacing build artifacts
 echo ""
 echo "4. Stopping PM2 before replacing build artifacts..."
-if command -v pm2 >/dev/null 2>&1 && pm2 describe harheimertc >/dev/null 2>&1; then
-  pm2 stop harheimertc || true
-  echo "   ✓ harheimertc gestoppt"
+if command -v pm2 >/dev/null 2>&1; then
+  for instance_name in harheimertc harheimertc-3102; do
+    if pm2 describe "$instance_name" >/dev/null 2>&1; then
+      pm2 stop "$instance_name" || true
+      echo "   ✓ $instance_name gestoppt"
+    else
+      echo "   PM2-Prozess $instance_name läuft nicht"
+    fi
+  done
 else
-  echo "   PM2-Prozess harheimertc läuft nicht oder PM2 ist nicht verfügbar"
+  echo "   PM2 ist nicht verfügbar"
 fi

 # 5. Remove old build (but keep data!)
@@ -553,14 +559,18 @@ restart_pm2_instance() {
  fi
 }

-# Starte/Neustarte die Produktionsinstanz
+# Starte/Neustarte beide Instanzen
 INSTANCE_ERRORS=0

 if ! restart_pm2_instance "harheimertc"; then
  INSTANCE_ERRORS=$((INSTANCE_ERRORS + 1))
 fi

-# Prüfe, ob der Prozess läuft
+if ! restart_pm2_instance "harheimertc-3102"; then
+  INSTANCE_ERRORS=$((INSTANCE_ERRORS + 1))
+fi
+
+# Prüfe, ob beide Prozesse laufen
 sleep 2
 echo ""
 echo "   Checking PM2 instances status..."
@@ -572,11 +582,19 @@ else
  INSTANCE_ERRORS=$((INSTANCE_ERRORS + 1))
 fi

+if pm2 describe harheimertc-3102 | grep -q "online"; then
+  echo "   ✓ PM2-Prozess 'harheimertc-3102' läuft (online)"
+else
+  echo "   WARNING: PM2-Prozess 'harheimertc-3102' ist nicht online. Prüfe Logs: pm2 logs harheimertc-3102"
+  INSTANCE_ERRORS=$((INSTANCE_ERRORS + 1))
+fi
+
 if [ "$INSTANCE_ERRORS" -gt 0 ]; then
  echo ""
  echo "WARNING: Einige PM2-Instanzen haben Probleme. Bitte manuell prüfen:"
  echo "  pm2 status"
  echo "  pm2 logs harheimertc"
+  echo "  pm2 logs harheimertc-3102"
 fi

 echo ""
@@ -585,5 +603,8 @@ echo "The application is now running with the latest code and your production da
 echo ""
 echo "Useful commands:"
 echo "  pm2 logs harheimertc          # View logs (Port 3100)"
+echo "  pm2 logs harheimertc-3102     # View logs (Port 3102)"
 echo "  pm2 status                     # View status"
 echo "  pm2 restart harheimertc        # Restart instance on port 3100"
+echo "  pm2 restart harheimertc-3102   # Restart instance on port 3102"
+echo "  pm2 restart all                # Restart all instances"
--- a/deploy-test.sh
+++ b/deploy-test.sh
@@ -567,10 +567,9 @@ restart_pm2_instance() {
 # Starte/Neustarte Test-Instanz
 if ! restart_pm2_instance "harheimertc.test"; then
  echo ""
-  echo "ERROR: PM2-Instanz konnte nicht gestartet werden."
+  echo "WARNING: PM2-Instanz konnte nicht gestartet werden. Bitte manuell prüfen:"
  echo "  pm2 status"
  echo "  pm2 logs harheimertc.test"
-  exit 1
 fi

 # Prüfe, ob der Prozess läuft
@@ -581,16 +580,9 @@ echo "   Checking PM2 instance status..."
 if pm2 describe harheimertc.test | grep -q "online"; then
  echo "   ✓ PM2-Prozess 'harheimertc.test' läuft (online)"
 else
-  echo "   ERROR: PM2-Prozess 'harheimertc.test' ist nicht online. Prüfe Logs: pm2 logs harheimertc.test"
-  exit 1
+  echo "   WARNING: PM2-Prozess 'harheimertc.test' ist nicht online. Prüfe Logs: pm2 logs harheimertc.test"
 fi

-if ! curl --fail --silent --show-error --max-time 15 http://127.0.0.1:3102/ >/dev/null; then
-  echo "ERROR: Test-Instanz antwortet nicht auf Port 3102."
-  exit 1
-fi
-echo "   ✓ HTTP-Healthcheck auf Port 3102 erfolgreich"
-
 echo ""
 echo "=== Test-Instanz Deployment completed successfully! ==="
 echo "The test application is now running with the latest code and your test data preserved."
--- a/harheimertc.config.cjs
+++ b/harheimertc.config.cjs
@@ -61,6 +61,22 @@ module.exports = {
      out_file: '/var/log/pm2/harheimertc-out.log',
      log_file: '/var/log/pm2/harheimertc-combined.log',
      time: true
+    },
+    {
+      name: 'harheimertc-3102',
+      // Zweite Instanz auf Port 3102
+      script: 'node',
+      args: '.output/server/index.mjs',
+      cwd: '/var/www/harheimertc',
+      instances: 1,
+      autorestart: true,
+      watch: false,
+      max_memory_restart: '1G',
+      env: createEnv(3102),
+      error_file: '/var/log/pm2/harheimertc-3102-error.log',
+      out_file: '/var/log/pm2/harheimertc-3102-out.log',
+      log_file: '/var/log/pm2/harheimertc-3102-combined.log',
+      time: true
    }
  ]
 }
--- a/harheimertc.test.config.cjs
+++ b/harheimertc.test.config.cjs
@@ -58,7 +58,7 @@ module.exports = {
      autorestart: true,
      watch: false,
      max_memory_restart: '1G',
-      env: createEnv(3102),
+      env: createEnv(process.env.PORT || 3102),
      error_file: '/var/log/pm2/harheimertc.test-error.log',
      out_file: '/var/log/pm2/harheimertc.test-out.log',
      log_file: '/var/log/pm2/harheimertc.test-combined.log',
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "harheimertc-website",
-  "version": "1.8.8",
+  "version": "1.8.4",
  "description": "Moderne Webseite für den Harheimer Tischtennis Club",
  "private": true,
  "type": "module",
@@ -18,7 +18,7 @@
    "test": "vitest run",
    "test:data-rotation": "vitest run tests/data-file-rotation.spec.ts",
    "check-security": "node scripts/verify-no-public-writes.js",
-    "smoke-local": "BASE_URL=http://127.0.0.1:3100 node scripts/smoke-test.js",
+    "smoke-local": "BASE_URL=http://127.0.0.1:3100 node scripts/smoke-tests.js",
    "sync-public-data": "node scripts/sync-public-data.js",
    "data-backups:list": "node scripts/data-backup-restore.js list",
    "data-backups:restore": "node scripts/data-backup-restore.js restore",
@@ -40,12 +40,12 @@
    "jsonwebtoken": "^9.0.2",
    "multer": "^2.0.2",
    "nodemailer": "^9.0.1",
-    "nuxt": "^4.5.1",
+    "nuxt": "^4.1.3",
    "pdf-lib": "^1.17.1",
    "pdf-parse": "^2.4.5",
    "pinia": "^3.0.3",
-    "quill": "2.0.2",
-    "sharp": "^0.35.3",
+    "quill": "^2.0.2",
+    "sharp": "^0.34.5",
    "vue": "^3.5.22"
  },
  "devDependencies": {
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -216,7 +216,7 @@
      class="relative z-30 px-4 sm:px-6 lg:px-8"
      :class="hasHeroSection ? '-mt-44 sm:-mt-48 lg:-mt-52' : 'mt-8'"
    >
-      <div class="featured-widget-shell max-w-6xl mx-auto rounded-2xl border border-gray-200 bg-white/25 backdrop-blur-md overflow-hidden">
+      <div class="featured-widget-shell max-w-6xl mx-auto rounded-2xl border border-gray-200 bg-white/25 backdrop-blur-md overflow-hidden min-h-[22rem] sm:min-h-[25rem]">
        <HomeSpielplanTeamWidget
          v-if="featuredWidgetSection.id === 'spielplan_team'"
          :season="featuredWidgetSection.config?.season"
@@ -627,15 +627,9 @@ async function saveEditor() {
  background-color: transparent !important;
 }

-.featured-widget-shell :deep(.py-8),
-.featured-widget-shell :deep(.py-10),
-.featured-widget-shell :deep(.py-12),
 .featured-widget-shell :deep(.py-16),
-.featured-widget-shell :deep(.sm\:py-10),
-.featured-widget-shell :deep(.sm\:py-12),
-.featured-widget-shell :deep(.sm\:py-16),
 .featured-widget-shell :deep(.sm\:py-20) {
  padding-top: 1.5rem !important;
-  padding-bottom: 1.5rem !important;
+  padding-bottom: 2rem !important;
 }
 </style>
--- a/pages/mannschaften/[slug].vue
+++ b/pages/mannschaften/[slug].vue
@@ -362,7 +362,7 @@

 <script setup>
 import { ref, computed, onMounted } from 'vue'
-import { rowMatchesTeamFilter } from '~/utils/spielplan-filter.js'
+import { rowMatchesTeamFilter } from '../../utils/spielplan-filter.js'

 const route = useRoute()

--- a/pages/mannschaften/spielplaene.vue
+++ b/pages/mannschaften/spielplaene.vue
@@ -360,7 +360,7 @@

 <script setup>
 import { ref, onMounted } from 'vue'
-import { filterSpielplanRows, toApiTeamParam } from '~/utils/spielplan-filter.js'
+import { filterSpielplanRows, toApiTeamParam } from '../../utils/spielplan-filter.js'

 const route = useRoute()
 const router = useRouter()
--- a/public/documents/beitrittserklärung_template.pdf
+++ b/public/documents/beitrittserklärung_template.pdf
--- a/server/api/homepage/spielplan-options.get.js
+++ b/server/api/homepage/spielplan-options.get.js
@@ -1,15 +1,18 @@
 import { listSpielplanSeasons, readSpielplanData, validateSeasonSlug } from '../../utils/spielplan-data.js'
-import { formatTeamDisplayName } from '~/utils/team-display.js'

-function teamLabel(teamName, teamAgeGroup, competitionAgeGroup) {
-  return formatTeamDisplayName(teamName, teamAgeGroup, competitionAgeGroup)
+function teamLabel(teamName, teamAgeGroup) {
+  const name = String(teamName || '').trim()
+  const age = String(teamAgeGroup || '').trim()
+  if (!name) return ''
+  const isYouth = age.toLowerCase().includes('jugend') || name.toLowerCase().includes('jugend')
+  return isYouth ? `(J) ${name}` : name
 }

 function extractHarheimerTeams(rows) {
  const seen = new Set()
  const teams = []

-  const addTeam = (teamName, teamAgeGroup, competitionAgeGroup) => {
+  const addTeam = (teamName, teamAgeGroup) => {
    const name = String(teamName || '').trim()
    if (!name) return
    const age = String(teamAgeGroup || '').trim()
@@ -18,7 +21,7 @@ function extractHarheimerTeams(rows) {
    seen.add(key)
    teams.push({
      key,
-      label: teamLabel(name, age, competitionAgeGroup),
+      label: teamLabel(name, age),
      teamName: name,
      teamAgeGroup: age
    })
@@ -26,10 +29,10 @@ function extractHarheimerTeams(rows) {

  for (const row of rows || []) {
    if (String(row.HeimVereinName || '').trim() === 'Harheimer TC') {
-      addTeam(row.HeimMannschaft, row.HeimMannschaftAltersklasse, row.Altersklasse)
+      addTeam(row.HeimMannschaft, row.HeimMannschaftAltersklasse)
    }
    if (String(row.GastVereinName || '').trim() === 'Harheimer TC') {
-      addTeam(row.GastMannschaft, row.GastMannschaftAltersklasse, row.Altersklasse)
+      addTeam(row.GastMannschaft, row.GastMannschaftAltersklasse)
    }
  }

@@ -55,4 +58,4 @@ export default defineEventHandler(async (event) => {
    seasons,
    teams: extractHarheimerTeams(dataResult.data)
  }
-})
+})
--- a/server/api/membership/applications.get.js
+++ b/server/api/membership/applications.get.js
@@ -2,7 +2,6 @@ import fs from 'fs/promises'
 import path from 'path'
 import { requireUserWithAnyRole } from '../../utils/auth.js'
 import { decryptObject } from '../../utils/encryption.js'
-import { getServerDataPath } from '../../utils/paths.js'

 export default defineEventHandler(async (event) => {
  try {
@@ -18,7 +17,7 @@ export default defineEventHandler(async (event) => {
      })
    }
    
-    const dataDir = getServerDataPath('membership-applications')
+    const dataDir = path.join(process.cwd(), 'server/data/membership-applications')
    
    // Prüfen ob Verzeichnis existiert
    try {
--- a/server/api/membership/download/[id].get.js
+++ b/server/api/membership/download/[id].get.js
@@ -1,6 +1,5 @@
 import fs from 'fs/promises'
 import path from 'path'
-import { createHmac, timingSafeEqual } from 'crypto'
 import { getUserFromToken } from '../../../utils/auth.js'
 import { getServerDataPath } from '../../../utils/paths.js'

@@ -48,27 +47,7 @@ export default defineEventHandler(async (event) => {
      }
    }
    
-    // Native apps cannot reliably reuse the httpOnly browser cookie that is
-    // set when the application is created.  They receive the same short-lived
-    // authorization as a signed response token instead.
-    const signedDownloadToken = getHeader(event, 'x-membership-download-token')
-    if (signedDownloadToken) {
-      try {
-        const [payload, signature] = signedDownloadToken.split('.')
-        const secret = process.env.ENCRYPTION_KEY || 'local_development_encryption_key_change_in_production'
-        const expected = createHmac('sha256', secret).update(payload).digest('base64url')
-        const validSignature = signature && timingSafeEqual(Buffer.from(signature), Buffer.from(expected))
-        const decoded = JSON.parse(Buffer.from(payload, 'base64url').toString('utf8'))
-        const tokenAge = Date.now() - Number(decoded.issuedAt)
-        if (validSignature && decoded.fileId === fileId && tokenAge >= 0 && tokenAge < 24 * 60 * 60 * 1000) {
-          isAuthorized = true
-        }
-      } catch (_error) {
-        // Invalid download tokens are treated as unauthorized.
-      }
-    }
-
-    // Browser clients continue to use the httpOnly cookie.
+    // Prüfen ob es sich um eine aktuelle Session handelt (innerhalb der letzten 24 Stunden)
    const downloadToken = getCookie(event, 'download_token')
    
    if (downloadToken) {
--- a/server/api/membership/generate-pdf.post.js
+++ b/server/api/membership/generate-pdf.post.js
@@ -1,13 +1,11 @@
 import { exec } from 'child_process'
 import { promisify } from 'util'
-import { createHmac } from 'crypto'
 import fs from 'fs/promises'
 import path from 'path'
 import { PDFDocument, StandardFonts, rgb } from 'pdf-lib'
 import { getDownloadCookieOptionsWithMaxAge } from '../../utils/cookies.js'
 import { sendMembershipEmail as sendMembershipEmailUtil } from '../../utils/email-service.js'
 import { getProjectPath, getServerDataPath } from '../../utils/paths.js'
-import { createMembershipApplication, removeMembershipApplication } from '../../utils/membership-applications.js'

 // const require = createRequire(import.meta.url) // Nicht verwendet
 const execAsync = promisify(exec)
@@ -312,18 +310,9 @@ function getDataPath(filename) {
  return getServerDataPath(filename)
 }

-function createMembershipDownloadToken(fileId) {
-  const issuedAt = Date.now()
-  const payload = Buffer.from(JSON.stringify({ fileId, issuedAt })).toString('base64url')
-  const secret = process.env.ENCRYPTION_KEY || 'local_development_encryption_key_change_in_production'
-  const signature = createHmac('sha256', secret).update(payload).digest('base64url')
-  return `${payload}.${signature}`
-}
-
 // Use central email service

 export default defineEventHandler(async (event) => {
-  let application = null
  try {
    const body = await readBody(event)
    
@@ -349,10 +338,6 @@ export default defineEventHandler(async (event) => {
      ...body,
      isVolljaehrig
    }
-
-    // Persist the pending application before generating files or sending mail.
-    // This also makes repeated taps and concurrent requests idempotently fail.
-    application = await createMembershipApplication(data)
    
    // Eindeutige Datei-ID generieren
    const timestamp = Date.now()
@@ -645,11 +630,9 @@ export default defineEventHandler(async (event) => {
          success: true,
          message: 'Beitrittsformular erfolgreich aus Template erzeugt und E-Mail gesendet.',
          downloadUrl: `/api/membership/download/${filename}.pdf`,
-          downloadToken: createMembershipDownloadToken(`${filename}.pdf`),
          emailSuccess: emailResult.success,
          emailMessage: emailResult.message,
-          usedTemplate: true,
-          applicationId: application.id
+          usedTemplate: true
        }
      }

@@ -707,10 +690,8 @@ export default defineEventHandler(async (event) => {
        success: true,
        message: 'Beitrittsformular erfolgreich erstellt und E-Mail gesendet.',
        downloadUrl: `/api/membership/download/${filename}.pdf`,
-        downloadToken: createMembershipDownloadToken(`${filename}.pdf`),
        emailSuccess: emailResult.success,
        emailMessage: emailResult.message,
-        applicationId: application.id
      }
      
    } catch (latexError) {
@@ -745,22 +726,16 @@ export default defineEventHandler(async (event) => {
        success: true,
        message: 'Beitrittsformular erfolgreich erstellt und E-Mail gesendet (Fallback-Lösung).',
        downloadUrl: `/api/membership/download/${fallbackFilename}`,
-        downloadToken: createMembershipDownloadToken(fallbackFilename),
        emailSuccess: emailResult.success,
        emailMessage: emailResult.message,
-        applicationId: application.id
      }
    }
    
  } catch (error) {
-    // A failed generation must not leave a pending application that prevents
-    // the applicant from trying again.
-    await removeMembershipApplication(application?.id)
    console.error('Fehler beim Generieren des PDFs:', error)
-    if (error?.statusCode) throw error
    throw createError({
      statusCode: 500,
      statusMessage: 'Fehler beim Generieren des PDFs'
    })
  }
-})
+})
--- a/server/api/membership/update-status.put.js
+++ b/server/api/membership/update-status.put.js
@@ -1,8 +1,8 @@
 import fs from 'fs/promises'
+import path from 'path'
 import { requireUserWithAnyRole } from '../../utils/auth.js'
 import { decryptObject } from '../../utils/encryption.js'
 import { saveMember } from '../../utils/members.js'
-import { getServerDataPath } from '../../utils/paths.js'

 export default defineEventHandler(async (event) => {
  try {
@@ -43,7 +43,9 @@ export default defineEventHandler(async (event) => {
    }
    
    // nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal
-    const filePath = getServerDataPath('membership-applications', `${id}.json`)
+    const dataDir = path.join(process.cwd(), 'server/data/membership-applications')
+    // nosemgrep: javascript.lang.security.audit.path-traversal.path-join-resolve-traversal.path-join-resolve-traversal
+    const filePath = path.join(dataDir, `${id}.json`)
    
    // Antrag laden
    const fileContent = await fs.readFile(filePath, 'utf8')
@@ -65,7 +67,6 @@ export default defineEventHandler(async (event) => {
        const newMember = {
          firstName: decryptedData.vorname,
          lastName: decryptedData.nachname,
-          geburtsdatum: decryptedData.geburtsdatum,
          email: decryptedData.email,
          phone: decryptedData.telefon_privat || decryptedData.telefon_mobil || '',
          address: `${decryptedData.strasse}, ${decryptedData.plz} ${decryptedData.ort}`,
--- a/server/api/spielplan/pdf.get.js
+++ b/server/api/spielplan/pdf.get.js
@@ -2,7 +2,7 @@ import fs from 'fs/promises'
 import path from 'path'
 import { readSpielplanData, validateSeasonSlug } from '../../utils/spielplan-data.js'
 import { info as loggerInfo, error as loggerError } from '../../utils/logger.js'
-import { filterSpielplanRows } from '~/utils/spielplan-filter.js'
+import { filterSpielplanRows } from '../../../utils/spielplan-filter.js'

 function seasonSlugToLabel(slug) {
  const match = String(slug || '').match(/^(\d{2})--(\d{2})$/)
--- a/server/templates/mitgliedschaft-fillable.pdf
+++ b/server/templates/mitgliedschaft-fillable.pdf
--- a/server/utils/members.js
+++ b/server/utils/members.js
@@ -221,23 +221,14 @@ export function normalizeDate(dateString) {
 }

 // Check for duplicate member based on firstName, lastName, and geburtsdatum
-function normalizeIdentityPart(value) {
-  return String(value || '')
-    .normalize('NFKD')
-    .replace(/[\u0300-\u036f]/g, '')
-    .replace(/[^a-zA-Z0-9]+/g, ' ')
-    .trim()
-    .toLowerCase()
-}
-
-export function findDuplicateMember(members, firstName, lastName, geburtsdatum) {
-  const normalizedFirstName = normalizeIdentityPart(firstName)
-  const normalizedLastName = normalizeIdentityPart(lastName)
+function findDuplicateMember(members, firstName, lastName, geburtsdatum) {
+  const normalizedFirstName = (firstName || '').trim().toLowerCase()
+  const normalizedLastName = (lastName || '').trim().toLowerCase()
  const normalizedDate = normalizeDate(geburtsdatum)
  
  return members.find(m => {
-    const mFirstName = normalizeIdentityPart(m.firstName)
-    const mLastName = normalizeIdentityPart(m.lastName)
+    const mFirstName = (m.firstName || '').trim().toLowerCase()
+    const mLastName = (m.lastName || '').trim().toLowerCase()
    const mDate = normalizeDate(m.geburtsdatum)
    
    return mFirstName === normalizedFirstName &&
@@ -316,3 +307,4 @@ export async function deleteMember(id) {
  await writeMembers(filtered)
  return true
 }
+
--- a/server/utils/membership-applications.js
+++ b/server/utils/membership-applications.js
@@ -1,104 +0,0 @@
-import { createHash, randomUUID } from 'crypto'
-import { promises as fs } from 'fs'
-import { decryptObject, encryptObject } from './encryption.js'
-import { readMembers, findDuplicateMember, normalizeDate } from './members.js'
-import { getServerDataPath } from './paths.js'
-
-const APPLICATIONS_DIR = getServerDataPath('membership-applications')
-const LOCKS_DIR = getServerDataPath('membership-application-locks')
-
-function encryptionKey() {
-  return process.env.ENCRYPTION_KEY || 'local_development_encryption_key_change_in_production'
-}
-
-function normalizeName(value) {
-  return String(value || '')
-    .normalize('NFKD')
-    .replace(/[\u0300-\u036f]/g, '')
-    .replace(/[^a-zA-Z0-9]+/g, ' ')
-    .trim()
-    .toLowerCase()
-}
-
-function identityHash(data) {
-  const identity = [normalizeName(data.vorname), normalizeName(data.nachname), normalizeDate(data.geburtsdatum)].join('|')
-  return createHash('sha256').update(identity).digest('hex')
-}
-
-async function withIdentityLock(hash, operation) {
-  await fs.mkdir(LOCKS_DIR, { recursive: true })
-  const lockPath = `${LOCKS_DIR}/${hash}.lock`
-  let handle
-  try {
-    handle = await fs.open(lockPath, 'wx')
-  } catch (error) {
-    if (error?.code === 'EEXIST') {
-      throw createError({ statusCode: 409, statusMessage: 'Für diese Person wird bereits ein Mitgliedschaftsantrag bearbeitet.' })
-    }
-    throw error
-  }
-  try {
-    return await operation()
-  } finally {
-    await handle.close().catch(() => {})
-    await fs.unlink(lockPath).catch(() => {})
-  }
-}
-
-async function findMatchingApplication(data) {
-  try {
-    const files = await fs.readdir(APPLICATIONS_DIR)
-    const target = identityHash(data)
-    for (const file of files.filter(file => file.endsWith('.json'))) {
-      try {
-        const application = JSON.parse(await fs.readFile(`${APPLICATIONS_DIR}/${file}`, 'utf8'))
-        if (application.identityHash === target) return application
-        if (application.encryptedData) {
-          const personalData = decryptObject(application.encryptedData, encryptionKey())
-          if (identityHash(personalData) === target) return application
-        }
-      } catch (error) {
-        console.warn('Mitgliedschaftsantrag konnte bei der Duplikatprüfung nicht gelesen werden:', { file, message: error.message })
-      }
-    }
-    return null
-  } catch (error) {
-    if (error?.code !== 'ENOENT') throw error
-    return null
-  }
-}
-
-export async function createMembershipApplication(data) {
-  const hash = identityHash(data)
-  if (!normalizeName(data.vorname) || !normalizeName(data.nachname) || !normalizeDate(data.geburtsdatum)) {
-    throw createError({ statusCode: 400, statusMessage: 'Vorname, Nachname und ein gültiges Geburtsdatum sind erforderlich.' })
-  }
-  return withIdentityLock(hash, async () => {
-    const members = await readMembers()
-    if (findDuplicateMember(members, data.vorname, data.nachname, data.geburtsdatum)) {
-      throw createError({ statusCode: 409, statusMessage: 'Für diese Person besteht bereits eine Mitgliedschaft.' })
-    }
-    const existing = await findMatchingApplication(data)
-    if (existing) {
-      throw createError({ statusCode: 409, statusMessage: 'Für diese Person liegt bereits ein Mitgliedschaftsantrag vor.' })
-    }
-    await fs.mkdir(APPLICATIONS_DIR, { recursive: true })
-    const application = {
-      id: randomUUID(),
-      timestamp: new Date().toISOString(),
-      status: 'pending',
-      identityHash: hash,
-      metadata: { mitgliedschaftsart: data.mitgliedschaftsart },
-      encryptedData: encryptObject(data, encryptionKey())
-    }
-    await fs.writeFile(`${APPLICATIONS_DIR}/${application.id}.json`, `${JSON.stringify(application, null, 2)}\n`, { encoding: 'utf8', flag: 'wx' })
-    return application
-  })
-}
-
-export async function removeMembershipApplication(applicationId) {
-  if (!applicationId) return
-  await fs.unlink(`${APPLICATIONS_DIR}/${applicationId}.json`).catch(error => {
-    if (error?.code !== 'ENOENT') throw error
-  })
-}
--- a/server/utils/push-notifications.js
+++ b/server/utils/push-notifications.js
@@ -102,7 +102,7 @@ export function upsertPushToken(user, { token, platform = 'android', appVersion
  return user
 }

-async function sendFcmMessage({ serviceAccount, accessToken, token, data = {} }) {
+async function sendFcmMessage({ serviceAccount, accessToken, token, title, body, data = {} }) {
  const projectId = projectIdFromServiceAccount(serviceAccount)
  if (!projectId) throw new Error('FCM project_id fehlt.')
  const response = await fetch(`https://fcm.googleapis.com/v1/projects/${projectId}/messages:send`, {
@@ -114,14 +114,14 @@ async function sendFcmMessage({ serviceAccount, accessToken, token, data = {} })
    body: JSON.stringify({
      message: {
        token,
+        notification: { title, body },
        data,
        android: {
          priority: 'high',
-          // Keep this as a data message.  With a `notification` payload FCM
-          // renders background messages itself, bypassing our notification
-          // channel and HarheimerMessagingService.  Data messages use the
-          // same app-controlled channel while the app is foregrounded and
-          // backgrounded.
+          notification: {
+            channel_id: 'harheimer_tc_updates',
+            click_action: 'OPEN_NEWS'
+          }
        }
      }
    })
@@ -185,7 +185,7 @@ export async function sendPushToUsers({ title, body, data = {}, predicate, bodyF
    const validTokens = []
    for (const entry of tokens) {
      try {
-        await sendFcmMessage({ serviceAccount, accessToken, token: entry.token, data: payload })
+        await sendFcmMessage({ serviceAccount, accessToken, token: entry.token, title, body: userBody, data: payload })
        sent += 1
        validTokens.push(entry)
      } catch (error) {
@@ -206,11 +206,7 @@ export async function sendPushToUsers({ title, body, data = {}, predicate, bodyF
    }
  }
  if (changed) await writeUsers(users)
-  const result = { sent, failed, removed, recipients, tokenCount, skipped: false }
-  // This makes an absent registration immediately visible in the production
-  // log without exposing tokens or user data.
-  console.info('FCM Push Ergebnis:', { failureLabel, ...result })
-  return result
+  return { sent, failed, removed, recipients, tokenCount, skipped: false }
 }

 export async function sendNewNewsPush(news) {
--- a/tests/auth-endpoints.spec.ts
+++ b/tests/auth-endpoints.spec.ts
@@ -83,7 +83,6 @@ describe('Auth API Endpoints', () => {
  afterEach(() => {
    delete process.env.NODE_ENV
    delete process.env.APP_ENV
-    delete process.env.DEBUG
    delete process.env.NUXT_PUBLIC_BASE_URL
    delete process.env.PASSWORD_RESET_TTL_MIN
  })
@@ -283,7 +282,6 @@ describe('Auth API Endpoints', () => {
    it('benachrichtigt in Testumgebung nicht die Vorstand-Empfänger', async () => {
      process.env.NODE_ENV = 'production'
      process.env.APP_ENV = 'test'
-      delete process.env.DEBUG

      const event = createEvent()
      mockSuccessReadBody({
--- a/tests/membership-applications.spec.ts
+++ b/tests/membership-applications.spec.ts
@@ -1,36 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { promises as fs } from 'fs'
-import os from 'os'
-import path from 'path'
-
-const originalAppRoot = process.env.APP_ROOT
-const createdRoots = []
-
-afterEach(async () => {
-  vi.resetModules()
-  if (originalAppRoot === undefined) delete process.env.APP_ROOT
-  else process.env.APP_ROOT = originalAppRoot
-  await Promise.all(createdRoots.splice(0).map(root => fs.rm(root, { recursive: true, force: true })))
-})
-
-describe('membership applications', () => {
-  it('rejects a second pending application with the same name and birth date', async () => {
-    const root = await fs.mkdtemp(path.join(os.tmpdir(), 'harheimertc-membership-'))
-    createdRoots.push(root)
-    await fs.mkdir(path.join(root, 'server', 'data'), { recursive: true })
-    process.env.APP_ROOT = root
-
-    const { createMembershipApplication } = await import('../server/utils/membership-applications.js')
-    const data = {
-      vorname: 'Jörg',
-      nachname: 'Beispiel',
-      geburtsdatum: '1990-02-03',
-      mitgliedschaftsart: 'aktiv'
-    }
-
-    const application = await createMembershipApplication(data)
-    expect(application.status).toBe('pending')
-    await expect(createMembershipApplication({ ...data, vorname: ' JÖRG ' }))
-      .rejects.toMatchObject({ statusCode: 409 })
-  })
-})
--- a/utils/team-display.js
+++ b/utils/team-display.js
@@ -1,30 +0,0 @@
-/**
- * Makes youth teams identifiable while retaining the team name supplied by
- * click-TT. Age groups occur in a few forms, for example "Jugend 13",
- * "Jugend 13 1. Kreisklasse", and "J13". Some imports provide the age
- * only for the whole fixture, therefore `competitionAgeGroup` is considered
- * as a fallback.
- */
-export function youthTeamCode(teamAgeGroup, teamName = '', competitionAgeGroup = '') {
-  const ageGroup = [teamAgeGroup, competitionAgeGroup]
-    .map(value => String(value || '').trim())
-    .filter(Boolean)
-    .join(' ')
-  const name = String(teamName || '').trim()
-  const codeMatch = `${ageGroup} ${name}`.match(/\b(?:jugend\s*|j\s*\(?)(\d{1,2})\b/i)
-
-  if (codeMatch) return `J${codeMatch[1]}`
-  if (/\bjugend\b/i.test(ageGroup) || /\bjugend\b/i.test(name)) return 'J'
-  return ''
-}
-
-export function formatTeamDisplayName(teamName, teamAgeGroup, competitionAgeGroup = '') {
-  const rawName = String(teamName || '').trim()
-  if (!rawName) return ''
-
-  const youthCode = youthTeamCode(teamAgeGroup, rawName, competitionAgeGroup)
-  const name = youthCode
-    ? rawName.replace(/\s*\(J\d{1,2}\)\s*$/i, '').trim()
-    : rawName
-  return youthCode ? `(${youthCode}) ${name}` : name
-}
Author	SHA1	Message	Date
admin	42398dad21	Merge pull request 'dev' (#46 ) from dev into main All checks were successful Code Analysis and Production Deploy / analyze (push) Has been skipped Details Code Analysis and Production Deploy / deploy-production (push) Successful in 2m47s Details Code Analysis and Production Deploy / deploy-test (push) Has been skipped Details Reviewed-on: #46	2026-07-17 14:00:12 +02:00
admin	d563d81584	Merge pull request 'Füge Funktion zur Umwandlung von Saison-Slugs in Labels hinzu und aktualisiere PDF-Daten mit saisonalen Informationen' (#45 ) from dev into main All checks were successful Code Analysis and Production Deploy / analyze (push) Has been skipped Details Code Analysis and Production Deploy / deploy-production (push) Successful in 1m59s Details Code Analysis and Production Deploy / deploy-test (push) Has been skipped Details Reviewed-on: #45	2026-07-15 11:38:20 +02:00
admin	380d0a8332	Merge pull request 'dev' (#44 ) from dev into main All checks were successful Code Analysis and Production Deploy / analyze (push) Has been skipped Details Code Analysis and Production Deploy / deploy-production (push) Successful in 2m41s Details Code Analysis and Production Deploy / deploy-test (push) Has been skipped Details Reviewed-on: #44	2026-07-15 11:12:16 +02:00
admin	301bd7acbd	Merge pull request 'dev' (#43 ) from dev into main All checks were successful Code Analysis and Production Deploy / analyze (push) Has been skipped Details Code Analysis and Production Deploy / deploy-production (push) Successful in 2m44s Details Code Analysis and Production Deploy / deploy-test (push) Has been skipped Details Reviewed-on: #43	2026-06-23 23:50:21 +02:00
admin	05e25aa3d1	Merge pull request 'dev' (#42 ) from dev into main All checks were successful Code Analysis and Production Deploy / analyze (push) Has been skipped Details Code Analysis and Production Deploy / deploy-production (push) Successful in 2m15s Details Code Analysis and Production Deploy / deploy-test (push) Has been skipped Details Reviewed-on: #42	2026-06-16 14:09:23 +02:00
admin	ecae88af78	Merge pull request 'dev' (#41 ) from dev into main All checks were successful Code Analysis and Production Deploy / analyze (push) Has been skipped Details Code Analysis and Production Deploy / deploy-production (push) Successful in 3m0s Details Code Analysis and Production Deploy / deploy-test (push) Has been skipped Details Reviewed-on: #41	2026-06-10 16:49:07 +02:00