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

Reviewed-on: #47

.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: |

.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

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">
+  <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-3 sm:px-6 lg:px-8 py-2 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">
+        <p class="text-xs sm:text-sm text-gray-400 whitespace-nowrap">
           © {{ 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">
           <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

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>

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

components/Spielplan.vue

@@ -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) => {

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"

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."

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
     }
   ]
 }

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',

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "harheimertc-website",
-  "version": "1.8.7",
+  "version": "1.8.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "harheimertc-website",
-      "version": "1.8.7",
+      "version": "1.8.4",
       "hasInstallScript": true,
       "dependencies": {
         "@pinia/nuxt": "^0.11.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "harheimertc-website",
-  "version": "1.8.8",
+  "version": "1.8.5",
   "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",

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()
 

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()

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)
   }
-})
+})

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})$/)

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({

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
-}