Compare commits
27 Commits
redesign
...
4705d411d5
| Author | SHA1 | Date | |
|---|---|---|---|
| 4705d411d5 | |||
|
|
65e7563e79 | ||
|
|
9bc9501219 | ||
| 64bd7d56e5 | |||
|
|
5ca4253b44 | ||
|
|
eb75f86d45 | ||
|
|
395e2a84bd | ||
|
|
3fb60227df | ||
|
|
9a4eb77c56 | ||
|
|
02c1765214 | ||
|
|
ee93e15af8 | ||
|
|
d31026a606 | ||
|
|
4dca2af645 | ||
|
|
63b5786e43 | ||
|
|
497d804244 | ||
|
|
9ca1464899 | ||
|
|
8f6fda2e61 | ||
| 446ec752b4 | |||
| aa3d065294 | |||
| ffc4b66601 | |||
| f1fc5eafc3 | |||
| 42398dad21 | |||
| d563d81584 | |||
| 380d0a8332 | |||
| 301bd7acbd | |||
| 05e25aa3d1 | |||
| ecae88af78 |
@@ -121,11 +121,12 @@ jobs:
|
||||
|
||||
- name: OSV-Scanner (SCA)
|
||||
run: |
|
||||
cd "$GITHUB_WORKSPACE"
|
||||
curl -L -o osv-scanner https://github.com/google/osv-scanner/releases/latest/download/osv-scanner_linux_amd64
|
||||
chmod +x osv-scanner
|
||||
./osv-scanner --version
|
||||
test -f ./package-lock.json
|
||||
./osv-scanner scan -L ./package-lock.json --config ./.osv-scanner.toml
|
||||
test -f "$GITHUB_WORKSPACE/package-lock.json"
|
||||
./osv-scanner scan -L "$GITHUB_WORKSPACE/package-lock.json" --config "$GITHUB_WORKSPACE/.osv-scanner.toml"
|
||||
|
||||
deploy-production:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
@@ -269,6 +269,7 @@ data class NotificationSettingsDto(
|
||||
val birthdays: Boolean = false,
|
||||
val newContactRequest: Boolean = false,
|
||||
val newUserRegistration: Boolean = false,
|
||||
val ownTtrChanges: Boolean = false,
|
||||
val selectedTeamSlugs: List<String> = emptyList(),
|
||||
val selectedTeamSeason: String? = null,
|
||||
val notificationTime: String = "09:00",
|
||||
@@ -302,6 +303,7 @@ data class QttrRowDto(
|
||||
val playerName: String = "",
|
||||
val clubName: String = "",
|
||||
val currentQttr: Int? = null,
|
||||
val currentTtr: Int? = null,
|
||||
val previousQttr: Int? = null,
|
||||
val birthdate: String? = null,
|
||||
)
|
||||
|
||||
@@ -19,6 +19,7 @@ data class NotificationPreferences(
|
||||
val birthdays: Boolean = false,
|
||||
val newContactRequest: Boolean = false,
|
||||
val newUserRegistration: Boolean = false,
|
||||
val ownTtrChanges: Boolean = false,
|
||||
val selectedTeamSlugs: Set<String> = emptySet(),
|
||||
val selectedTeamSeason: String? = null,
|
||||
val notificationTime: String = DEFAULT_NOTIFICATION_TIME,
|
||||
@@ -43,6 +44,7 @@ class NotificationPreferencesRepository @Inject constructor(
|
||||
birthdays = preferences.getBoolean(KEY_BIRTHDAYS, false),
|
||||
newContactRequest = preferences.getBoolean(KEY_NEW_CONTACT_REQUEST, false),
|
||||
newUserRegistration = preferences.getBoolean(KEY_NEW_USER_REGISTRATION, false),
|
||||
ownTtrChanges = preferences.getBoolean(KEY_OWN_TTR_CHANGES, false),
|
||||
selectedTeamSlugs = preferences.getStringSet(KEY_SELECTED_TEAM_SLUGS, emptySet()).orEmpty(),
|
||||
selectedTeamSeason = preferences.getString(KEY_SELECTED_TEAM_SEASON, null)?.takeIf { it.isNotBlank() },
|
||||
notificationTime = preferences.getString(KEY_NOTIFICATION_TIME, DEFAULT_NOTIFICATION_TIME) ?: DEFAULT_NOTIFICATION_TIME,
|
||||
@@ -69,6 +71,7 @@ class NotificationPreferencesRepository @Inject constructor(
|
||||
.putBoolean(KEY_BIRTHDAYS, settings.birthdays)
|
||||
.putBoolean(KEY_NEW_CONTACT_REQUEST, settings.newContactRequest)
|
||||
.putBoolean(KEY_NEW_USER_REGISTRATION, settings.newUserRegistration)
|
||||
.putBoolean(KEY_OWN_TTR_CHANGES, settings.ownTtrChanges)
|
||||
.putStringSet(KEY_SELECTED_TEAM_SLUGS, settings.selectedTeamSlugs)
|
||||
.putString(KEY_SELECTED_TEAM_SEASON, settings.selectedTeamSeason)
|
||||
.putString(KEY_NOTIFICATION_TIME, settings.notificationTime)
|
||||
@@ -98,6 +101,7 @@ class NotificationPreferencesRepository @Inject constructor(
|
||||
const val KEY_BIRTHDAYS = "birthdays"
|
||||
const val KEY_NEW_CONTACT_REQUEST = "new_contact_request"
|
||||
const val KEY_NEW_USER_REGISTRATION = "new_user_registration"
|
||||
const val KEY_OWN_TTR_CHANGES = "own_ttr_changes"
|
||||
const val KEY_SELECTED_TEAM_SLUGS = "selected_team_slugs"
|
||||
const val KEY_SELECTED_TEAM_SEASON = "selected_team_season"
|
||||
const val KEY_NOTIFICATION_TIME = "notification_time"
|
||||
@@ -114,6 +118,7 @@ private fun NotificationSettingsDto.toPreferences(): NotificationPreferences = N
|
||||
birthdays = birthdays,
|
||||
newContactRequest = newContactRequest,
|
||||
newUserRegistration = newUserRegistration,
|
||||
ownTtrChanges = ownTtrChanges,
|
||||
selectedTeamSlugs = selectedTeamSlugs.toSet(),
|
||||
selectedTeamSeason = selectedTeamSeason,
|
||||
notificationTime = notificationTime,
|
||||
@@ -129,6 +134,7 @@ private fun NotificationPreferences.toDto(): NotificationSettingsDto = Notificat
|
||||
birthdays = birthdays,
|
||||
newContactRequest = newContactRequest,
|
||||
newUserRegistration = newUserRegistration,
|
||||
ownTtrChanges = ownTtrChanges,
|
||||
selectedTeamSlugs = selectedTeamSlugs.toList(),
|
||||
selectedTeamSeason = selectedTeamSeason,
|
||||
notificationTime = notificationTime,
|
||||
|
||||
@@ -472,7 +472,7 @@ private fun submenu(section: MenuSection?, state: NavigationUiState): List<MenuT
|
||||
MenuSection.INTERN -> buildList {
|
||||
add(MenuTarget("Übersicht", Destinations.MemberArea.route))
|
||||
add(MenuTarget("Mitgliederliste", Destinations.Members.route))
|
||||
add(MenuTarget("QTTR", Destinations.Qttr.route))
|
||||
add(MenuTarget("TTR / QTTR", Destinations.Qttr.route))
|
||||
add(MenuTarget("News", Destinations.MemberNews.route))
|
||||
add(MenuTarget("Mein Profil", Destinations.Profile.route))
|
||||
add(MenuTarget("Benachrichtigungen", Destinations.NotificationSettings.route))
|
||||
|
||||
@@ -28,7 +28,6 @@ import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalUriHandler
|
||||
import android.util.Log
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
@@ -248,18 +247,7 @@ fun QttrScreen(
|
||||
viewModel: QttrViewModel = hiltViewModel(),
|
||||
) {
|
||||
val state by viewModel.state.collectAsState()
|
||||
val uriHandler = LocalUriHandler.current
|
||||
val externalUrl = "https://www.mytischtennis.de/rankings/andro-rangliste?continent=all&country=Deutschland&all-players=on&as=DE.WE.R4.07&di=DE.WE.R4.07.04&area=DE.WE.R4.07.04.43&clubnr-search=Harheimer+TC&clubnr=43030&fednickname=HeTTV&gender=all¤t-ranking=yes&ttr-range=100%3B3000&birth-range=1926%3B2021"
|
||||
|
||||
MemberAreaPage(navController, showBackNavigation, "QTTR-Werte", "Aus technischen Gründen sind nur die QTTR-Werte verfügbar.") {
|
||||
item {
|
||||
Surface(color = Primary100, shape = RoundedCornerShape(12.dp)) {
|
||||
Column(Modifier.fillMaxWidth().padding(16.dp), verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
Text("Für TTR bitte die myTischtennis-Rangliste verwenden.", color = Primary900)
|
||||
TextButton(onClick = { uriHandler.openUri(externalUrl) }) { Text("myTischtennis öffnen") }
|
||||
}
|
||||
}
|
||||
}
|
||||
MemberAreaPage(navController, showBackNavigation, "TTR- und QTTR-Werte", "Aktuelle Werte der Vereinsmitglieder aus myTischtennis.") {
|
||||
item {
|
||||
Surface(color = Color.White, shape = RoundedCornerShape(14.dp), shadowElevation = 3.dp) {
|
||||
Column(Modifier.fillMaxWidth().padding(18.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||
@@ -269,9 +257,9 @@ fun QttrScreen(
|
||||
}
|
||||
}
|
||||
when {
|
||||
state.loading -> item { LoadingState("QTTR-Werte werden geladen...") }
|
||||
state.loading -> item { LoadingState("TTR- und QTTR-Werte werden geladen...") }
|
||||
state.error != null -> item { ErrorCard(state.error.orEmpty(), viewModel::load) }
|
||||
state.rows.isEmpty() -> item { Text("Keine QTTR-Werte gefunden.", color = Accent700) }
|
||||
state.rows.isEmpty() -> item { Text("Keine TTR- oder QTTR-Werte gefunden.", color = Accent700) }
|
||||
else -> items(state.rows.size) { index -> QttrRowCard(state.rows[index], isOwnRow(state.rows[index].playerName, state.currentUserName)) }
|
||||
}
|
||||
}
|
||||
@@ -388,7 +376,10 @@ private fun QttrRowCard(row: QttrRowDto, highlighted: Boolean) {
|
||||
)
|
||||
Text(row.clubName.ifBlank { "Harheimer TC" }, color = qttrNameColor(row.gender, isMinor(row.birthdate)).copy(alpha = 0.88f))
|
||||
}
|
||||
Text(row.currentQttr?.toString() ?: "-", color = Primary600, style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold)
|
||||
Column(horizontalAlignment = Alignment.End, verticalArrangement = Arrangement.spacedBy(3.dp)) {
|
||||
Text("TTR ${row.currentTtr?.toString() ?: "-"}", color = Accent700, style = MaterialTheme.typography.labelLarge)
|
||||
Text("QTTR ${row.currentQttr?.toString() ?: "-"}", color = Primary600, style = MaterialTheme.typography.titleMedium, fontWeight = FontWeight.Bold)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -121,9 +121,9 @@ private fun MemberAreaCardGrid(navController: NavController) {
|
||||
onClick = { navController.navigate(Destinations.MemberNews.route) },
|
||||
)
|
||||
MemberAreaCard(
|
||||
title = "QTTR",
|
||||
description = "Aktuelle QTTR-Werte der Vereinsmitglieder",
|
||||
marker = "Q",
|
||||
title = "TTR / QTTR",
|
||||
description = "Aktuelle TTR- und QTTR-Werte der Vereinsmitglieder",
|
||||
marker = "T",
|
||||
onClick = { navController.navigate(Destinations.Qttr.route) },
|
||||
)
|
||||
}
|
||||
|
||||
@@ -162,6 +162,9 @@ fun NotificationSettingsScreen(
|
||||
ToggleRow("Geburtstage", state.settings.birthdays) {
|
||||
viewModel.update(state.settings.copy(birthdays = it))
|
||||
}
|
||||
ToggleRow("Änderung meines TTR-Werts", state.settings.ownTtrChanges) {
|
||||
viewModel.update(state.settings.copy(ownTtrChanges = it))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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=33
|
||||
ANDROID_VERSION_NAME=0.9.28
|
||||
|
||||
# Temporary hotfix: disable R8 minification for release to avoid Retrofit generic signature stripping.
|
||||
RELEASE_MINIFY_ENABLED=false
|
||||
|
||||
@@ -117,7 +117,7 @@
|
||||
<div class="hidden min-w-0 flex-1 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="currentSubmenu === 'mannschaften' ? 'relative min-w-0 flex-1' : currentSubmenu === 'intern' ? 'flex min-w-0 items-center gap-1' : 'flex min-w-0 items-center gap-1 overflow-x-auto whitespace-nowrap'"
|
||||
>
|
||||
<!-- Newsletter Submenu -->
|
||||
<template v-if="currentSubmenu === 'newsletter'">
|
||||
@@ -290,7 +290,8 @@
|
||||
|
||||
<!-- Intern Submenu -->
|
||||
<template v-if="currentSubmenu === 'intern'">
|
||||
<NuxtLink
|
||||
<div class="flex min-w-0 flex-1 items-center gap-1 overflow-x-auto whitespace-nowrap">
|
||||
<NuxtLink
|
||||
to="/mitgliederbereich"
|
||||
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"
|
||||
@@ -310,7 +311,7 @@
|
||||
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"
|
||||
>
|
||||
QTTR
|
||||
TTR / QTTR
|
||||
</NuxtLink>
|
||||
<NuxtLink
|
||||
to="/mitgliederbereich/news"
|
||||
@@ -354,9 +355,10 @@
|
||||
Kontaktanfragen
|
||||
</NuxtLink>
|
||||
</template>
|
||||
</div>
|
||||
<template v-if="isAdmin">
|
||||
<div class="h-3 w-px bg-primary-700" />
|
||||
<div class="relative inline-block">
|
||||
<div class="h-3 w-px shrink-0 bg-primary-700" />
|
||||
<div class="relative shrink-0 inline-block">
|
||||
<button
|
||||
class="px-2.5 py-1 text-xs text-yellow-300 hover:text-white hover:bg-primary-700/50 rounded transition-all flex items-center"
|
||||
:class="route.path.startsWith('/cms') ? 'text-white bg-primary-600' : ''"
|
||||
@@ -441,6 +443,13 @@
|
||||
>
|
||||
Einstellungen
|
||||
</NuxtLink>
|
||||
<NuxtLink
|
||||
to="/cms/mytischtennis"
|
||||
class="block px-4 py-2 text-sm text-gray-300 hover:bg-primary-600 hover:text-white transition-colors"
|
||||
@click="showCmsDropdown = false"
|
||||
>
|
||||
myTischtennis
|
||||
</NuxtLink>
|
||||
<NuxtLink
|
||||
to="/cms/benutzer"
|
||||
class="block px-4 py-2 text-sm text-gray-300 hover:bg-primary-600 hover:text-white transition-colors"
|
||||
@@ -757,7 +766,7 @@
|
||||
class="block px-4 py-2 text-sm text-gray-400 hover:text-white hover:bg-primary-700/50 rounded-lg transition-colors"
|
||||
@click="isMobileMenuOpen = false"
|
||||
>
|
||||
QTTR
|
||||
TTR / QTTR
|
||||
</NuxtLink>
|
||||
<NuxtLink
|
||||
to="/mitgliederbereich/news"
|
||||
@@ -858,6 +867,13 @@
|
||||
>
|
||||
Einstellungen
|
||||
</NuxtLink>
|
||||
<NuxtLink
|
||||
to="/cms/mytischtennis"
|
||||
class="block px-4 py-2 text-sm text-yellow-300 hover:text-white hover:bg-primary-700/50 rounded-lg transition-colors"
|
||||
@click="isMobileMenuOpen = false"
|
||||
>
|
||||
myTischtennis
|
||||
</NuxtLink>
|
||||
<NuxtLink
|
||||
v-if="canManageUsers"
|
||||
to="/cms/benutzer"
|
||||
|
||||
@@ -102,6 +102,18 @@ install_dependencies_if_needed() {
|
||||
printf '%s\n' "$current_lock_hash" > "$lock_hash_file"
|
||||
}
|
||||
|
||||
install_playwright_browser() {
|
||||
if [ ! -d "node_modules/playwright" ]; then
|
||||
echo " Playwright ist nicht installiert; Browser-Installation wird übersprungen"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Muss mit demselben Benutzer laufen, der später den PM2-Prozess startet;
|
||||
# Playwright legt den Browser im benutzerspezifischen Cache ab.
|
||||
echo " Installing/verifying Playwright Chromium browser..."
|
||||
npx playwright install chromium
|
||||
}
|
||||
|
||||
use_project_node() {
|
||||
export NVM_DIR="${NVM_DIR:-$HOME/.nvm}"
|
||||
if [ -s "$NVM_DIR/nvm.sh" ]; then
|
||||
@@ -278,6 +290,7 @@ echo "3. Installing dependencies..."
|
||||
use_project_node
|
||||
ensure_node_version
|
||||
install_dependencies_if_needed
|
||||
install_playwright_browser
|
||||
|
||||
# 4. Stop running apps before replacing build artifacts
|
||||
echo ""
|
||||
|
||||
@@ -115,6 +115,18 @@ install_dependencies_if_needed() {
|
||||
printf '%s\n' "$current_lock_hash" > "$lock_hash_file"
|
||||
}
|
||||
|
||||
install_playwright_browser() {
|
||||
if [ ! -d "node_modules/playwright" ]; then
|
||||
echo " Playwright ist nicht installiert; Browser-Installation wird übersprungen"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Muss mit demselben Benutzer laufen, der später den PM2-Prozess startet;
|
||||
# Playwright legt den Browser im benutzerspezifischen Cache ab.
|
||||
echo " Installing/verifying Playwright Chromium browser..."
|
||||
npx playwright install chromium
|
||||
}
|
||||
|
||||
use_project_node() {
|
||||
export NVM_DIR="${NVM_DIR:-$HOME/.nvm}"
|
||||
if [ -s "$NVM_DIR/nvm.sh" ]; then
|
||||
@@ -284,6 +296,7 @@ echo "3. Installing dependencies..."
|
||||
use_project_node
|
||||
ensure_node_version
|
||||
install_dependencies_if_needed
|
||||
install_playwright_browser
|
||||
|
||||
# 4. Stop running app before replacing build artifacts
|
||||
echo ""
|
||||
|
||||
53
package-lock.json
generated
53
package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "harheimertc-website",
|
||||
"version": "1.8.7",
|
||||
"version": "1.8.8",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "harheimertc-website",
|
||||
"version": "1.8.7",
|
||||
"version": "1.8.8",
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"@pinia/nuxt": "^0.11.2",
|
||||
@@ -21,6 +21,7 @@
|
||||
"pdf-lib": "^1.17.1",
|
||||
"pdf-parse": "^2.4.5",
|
||||
"pinia": "^3.0.3",
|
||||
"playwright": "^1.62.1",
|
||||
"quill": "2.0.2",
|
||||
"sharp": "^0.35.3",
|
||||
"vue": "^3.5.22"
|
||||
@@ -8527,6 +8528,50 @@
|
||||
"pathe": "^2.0.3"
|
||||
}
|
||||
},
|
||||
"node_modules/playwright": {
|
||||
"version": "1.62.1",
|
||||
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.62.1.tgz",
|
||||
"integrity": "sha512-0M+L3LAD8/nm554LOla9Ayx0j0tmFZ0FBcoQ7F1VuVHpM/XpiC8RcDzBQB8W5+hA8L22THxELzeF+2WcUzvcLg==",
|
||||
"license": "Apache-2.0",
|
||||
"dependencies": {
|
||||
"playwright-core": "1.62.1"
|
||||
},
|
||||
"bin": {
|
||||
"playwright": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"fsevents": "2.3.2"
|
||||
}
|
||||
},
|
||||
"node_modules/playwright-core": {
|
||||
"version": "1.62.1",
|
||||
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.62.1.tgz",
|
||||
"integrity": "sha512-wPYSwEBJY9GHraISXqyqtx0na0LpO3XEX7jNDhntbex7tzUS7kLnZsOlFruFJB4Hi/rhDMjXGqHewDZ68nYZVw==",
|
||||
"license": "Apache-2.0",
|
||||
"bin": {
|
||||
"playwright-core": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=20"
|
||||
}
|
||||
},
|
||||
"node_modules/playwright/node_modules/fsevents": {
|
||||
"version": "2.3.2",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
|
||||
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/portfinder": {
|
||||
"version": "1.0.38",
|
||||
"dev": true,
|
||||
@@ -9225,7 +9270,9 @@
|
||||
}
|
||||
},
|
||||
"node_modules/qs": {
|
||||
"version": "6.15.3",
|
||||
"version": "6.16.0",
|
||||
"resolved": "https://registry.npmjs.org/qs/-/qs-6.16.0.tgz",
|
||||
"integrity": "sha512-h6fhOIaRrID2CbEY2fqs+7t+UXZo+MLAnU5gRIq85uFtdiUPCdsApMlHhXogKVM4HM2DVbIjGNTTYH2OcmP1vA==",
|
||||
"dev": true,
|
||||
"license": "BSD-3-Clause",
|
||||
"dependencies": {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "harheimertc-website",
|
||||
"version": "1.8.8",
|
||||
"version": "1.8.9",
|
||||
"description": "Moderne Webseite für den Harheimer Tischtennis Club",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
@@ -44,6 +44,7 @@
|
||||
"pdf-lib": "^1.17.1",
|
||||
"pdf-parse": "^2.4.5",
|
||||
"pinia": "^3.0.3",
|
||||
"playwright": "^1.62.1",
|
||||
"quill": "2.0.2",
|
||||
"sharp": "^0.35.3",
|
||||
"vue": "^3.5.22"
|
||||
@@ -67,6 +68,7 @@
|
||||
},
|
||||
"overrides": {
|
||||
"@peculiar/x509": "1.13.0",
|
||||
"esbuild": "0.28.1"
|
||||
"esbuild": "0.28.1",
|
||||
"qs": "6.16.0"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -201,6 +201,20 @@
|
||||
</p>
|
||||
</NuxtLink>
|
||||
|
||||
<NuxtLink
|
||||
v-if="authStore.hasAnyRole('admin', 'vorstand')"
|
||||
to="/cms/mytischtennis"
|
||||
class="bg-white p-6 rounded-xl shadow-lg border border-gray-100 hover:shadow-xl transition-all group"
|
||||
>
|
||||
<div class="flex items-center mb-4">
|
||||
<div class="w-12 h-12 bg-teal-100 rounded-lg flex items-center justify-center group-hover:bg-teal-600 transition-colors">
|
||||
<RefreshCw :size="24" class="text-teal-600 group-hover:text-white" />
|
||||
</div>
|
||||
<h2 class="ml-4 text-xl font-semibold text-gray-900">myTischtennis</h2>
|
||||
</div>
|
||||
<p class="text-gray-600">Vereinszugang und TTR-Synchronisierung</p>
|
||||
</NuxtLink>
|
||||
|
||||
<!-- Benutzerverwaltung (Admin ODER Vorstand) -->
|
||||
<NuxtLink
|
||||
v-if="authStore.hasAnyRole('admin', 'vorstand')"
|
||||
@@ -249,7 +263,7 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { Newspaper, Calendar, Users, UserCog, Settings, Layout, Mail, ShieldAlert } from 'lucide-vue-next'
|
||||
import { Newspaper, Calendar, Users, UserCog, Settings, Layout, Mail, ShieldAlert, RefreshCw } from 'lucide-vue-next'
|
||||
import { ref, onMounted } from 'vue'
|
||||
|
||||
const authStore = useAuthStore()
|
||||
|
||||
52
pages/cms/mytischtennis.vue
Normal file
52
pages/cms/mytischtennis.vue
Normal file
@@ -0,0 +1,52 @@
|
||||
<template>
|
||||
<div class="min-h-screen bg-gray-50 py-10">
|
||||
<div class="max-w-2xl mx-auto px-4">
|
||||
<h1 class="text-3xl font-display font-bold text-gray-900">myTischtennis-Verbindung</h1>
|
||||
<p class="mt-2 text-gray-600">Vereinszugang für den geschützten Import aktueller TTR- und QTTR-Werte.</p>
|
||||
<form class="mt-8 bg-white rounded-xl shadow-lg p-6 space-y-5" @submit.prevent="save">
|
||||
<div class="rounded-lg bg-amber-50 border border-amber-200 p-4 text-sm text-amber-900">
|
||||
Das Passwort wird verschlüsselt auf dem Server gespeichert und nie wieder angezeigt. Zugriff haben ausschließlich Admin und Vorstand.
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">myTischtennis-E-Mail</label>
|
||||
<input v-model.trim="form.email" type="email" required autocomplete="username" class="w-full rounded-lg border border-gray-300 px-3 py-2">
|
||||
</div>
|
||||
<div>
|
||||
<label class="block text-sm font-medium text-gray-700 mb-1">Passwort</label>
|
||||
<input v-model="form.password" type="password" required autocomplete="current-password" class="w-full rounded-lg border border-gray-300 px-3 py-2">
|
||||
</div>
|
||||
<div class="grid sm:grid-cols-2 gap-4">
|
||||
<label class="block text-sm font-medium text-gray-700">Verband<input v-model.trim="form.association" required class="mt-1 w-full rounded-lg border border-gray-300 px-3 py-2"></label>
|
||||
<label class="block text-sm font-medium text-gray-700">Vereinsnummer<input v-model.trim="form.clubId" required class="mt-1 w-full rounded-lg border border-gray-300 px-3 py-2"></label>
|
||||
</div>
|
||||
<p v-if="status.configured" class="text-sm text-gray-600">Hinterlegt: {{ status.email }} · letzter erfolgreicher Abruf: {{ formattedLastImport }}</p>
|
||||
<p v-if="status.lastImportError" class="rounded-lg border border-red-200 bg-red-50 p-3 text-sm text-red-800">
|
||||
Letzter Abruf fehlgeschlagen: {{ status.lastImportError }}
|
||||
</p>
|
||||
<p v-if="message" class="text-sm" :class="error ? 'text-red-700' : 'text-green-700'">{{ message }}</p>
|
||||
<div class="flex gap-3 flex-wrap">
|
||||
<button :disabled="busy" class="rounded-lg bg-primary-600 px-4 py-2 font-semibold text-white disabled:opacity-60">Zugang speichern</button>
|
||||
<button type="button" :disabled="busy || !status.configured" class="rounded-lg border border-primary-600 px-4 py-2 font-semibold text-primary-700 disabled:opacity-60" @click="runImport">Jetzt abrufen</button>
|
||||
<button v-if="authStore.hasRole('admin')" type="button" :disabled="busy" class="rounded-lg border border-teal-600 px-4 py-2 font-semibold text-teal-700 disabled:opacity-60" @click="sendTestPush">Push-Test an mich senden</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed, onMounted, reactive, ref } from 'vue'
|
||||
import { useAuthStore } from '~/stores/auth'
|
||||
definePageMeta({ middleware: 'auth' })
|
||||
useHead({ title: 'myTischtennis-Verbindung – CMS' })
|
||||
const form = reactive({ email: '', password: '', association: 'HeTTV', clubId: '43030' })
|
||||
const authStore = useAuthStore()
|
||||
const status = ref({ configured: false })
|
||||
const busy = ref(false); const message = ref(''); const error = ref(false)
|
||||
const formattedLastImport = computed(() => status.value.lastSuccessfulImportAt ? new Intl.DateTimeFormat('de-DE', { dateStyle: 'medium', timeStyle: 'short' }).format(new Date(status.value.lastSuccessfulImportAt)) : 'noch nie')
|
||||
async function load() { status.value = await $fetch('/api/cms/mytischtennis') }
|
||||
async function save() { busy.value = true; message.value = ''; error.value = false; try { status.value = await $fetch('/api/cms/mytischtennis', { method: 'PUT', body: form }); form.password = ''; message.value = 'Zugang verschlüsselt gespeichert.' } catch { error.value = true; message.value = 'Zugang konnte nicht gespeichert werden.' } finally { busy.value = false } }
|
||||
async function runImport() { busy.value = true; message.value = ''; error.value = false; try { const result = await $fetch('/api/cms/mytischtennis/import', { method: 'POST' }); message.value = `${result.rowCount} Werte wurden aktualisiert.`; await load() } catch (caught) { error.value = true; message.value = caught?.data?.message || 'Abruf fehlgeschlagen. Details stehen im Serverlog.'; await load().catch(() => {}) } finally { busy.value = false } }
|
||||
async function sendTestPush() { busy.value = true; message.value = ''; error.value = false; try { const result = await $fetch('/api/cms/notifications/test', { method: 'POST' }); message.value = result.sent > 0 ? 'Push-Test wurde an deine registrierten Android-Geräte gesendet.' : 'Kein registriertes Android-Gerät gefunden. Bitte App einmal öffnen und Benachrichtigungen erlauben.' } catch (caught) { error.value = true; message.value = caught?.data?.statusMessage || caught?.data?.message || 'Push-Test konnte nicht gesendet werden.' } finally { busy.value = false } }
|
||||
onMounted(load)
|
||||
</script>
|
||||
@@ -3,18 +3,11 @@
|
||||
<div class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 space-y-8">
|
||||
<div>
|
||||
<h1 class="text-4xl sm:text-5xl font-display font-bold text-gray-900 mb-4">
|
||||
QTTR-Werte
|
||||
TTR- und QTTR-Werte
|
||||
</h1>
|
||||
<div class="w-24 h-1 bg-primary-600 mb-6" />
|
||||
<p class="text-lg text-gray-700 max-w-3xl">
|
||||
Aus technischen Gründen sind nur die QTTR-Werte verfügbar. Für TTR bitte auf
|
||||
<a
|
||||
:href="externalUrl"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
class="text-primary-600 hover:text-primary-800 underline"
|
||||
>myTischtennis</a>
|
||||
wechseln.
|
||||
Aktuelle TTR- und QTTR-Werte des Harheimer TC. Der Abruf erfolgt über die geschützte Vereinsverbindung.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
@@ -37,13 +30,13 @@
|
||||
v-if="pending"
|
||||
class="py-12 text-center text-gray-500"
|
||||
>
|
||||
Lade QTTR-Werte...
|
||||
Lade TTR- und QTTR-Werte...
|
||||
</div>
|
||||
<div
|
||||
v-else-if="error"
|
||||
class="rounded-lg border border-red-200 bg-red-50 p-4 text-red-800"
|
||||
>
|
||||
{{ error.statusMessage || error.message || 'QTTR-Werte konnten nicht geladen werden.' }}
|
||||
{{ error.statusMessage || error.message || 'TTR- und QTTR-Werte konnten nicht geladen werden.' }}
|
||||
</div>
|
||||
<div
|
||||
v-else
|
||||
@@ -61,6 +54,9 @@
|
||||
<th class="px-4 py-3 text-left text-xs font-semibold uppercase tracking-wider text-gray-500">
|
||||
Verein
|
||||
</th>
|
||||
<th class="px-4 py-3 text-right text-xs font-semibold uppercase tracking-wider text-gray-500">
|
||||
TTR
|
||||
</th>
|
||||
<th class="px-4 py-3 text-right text-xs font-semibold uppercase tracking-wider text-gray-500">
|
||||
QTTR
|
||||
</th>
|
||||
@@ -83,6 +79,9 @@
|
||||
<td class="px-4 py-3 text-sm text-gray-700">
|
||||
{{ row.clubName || 'Harheimer TC' }}
|
||||
</td>
|
||||
<td class="px-4 py-3 text-right text-lg font-semibold text-gray-900 tabular-nums">
|
||||
{{ row.currentTtr ?? '–' }}
|
||||
</td>
|
||||
<td class="px-4 py-3 text-right text-lg font-semibold text-gray-900 tabular-nums">
|
||||
{{ row.currentQttr ?? '–' }}
|
||||
</td>
|
||||
@@ -99,7 +98,6 @@
|
||||
import { computed } from 'vue'
|
||||
|
||||
const authStore = useAuthStore()
|
||||
const externalUrl = 'https://www.mytischtennis.de/rankings/andro-rangliste?continent=all&country=Deutschland&all-players=on&as=DE.WE.R4.07&di=DE.WE.R4.07.04&area=DE.WE.R4.07.04.43&clubnr-search=Harheimer+TC&clubnr=43030&fednickname=HeTTV&gender=all¤t-ranking=yes&ttr-range=100%3B3000&birth-range=1926%3B2021'
|
||||
|
||||
definePageMeta({
|
||||
middleware: 'auth',
|
||||
@@ -126,7 +124,7 @@ function isMaleGender(value) {
|
||||
|
||||
function isFemaleGender(value) {
|
||||
const gender = normalizeName(value)
|
||||
return gender.startsWith('w') || gender.includes('weib') || gender.includes('frau')
|
||||
return gender.startsWith('w') || gender.includes('weib') || gender.includes('frau') || gender.includes('female')
|
||||
}
|
||||
|
||||
function isOwnRow(playerName) {
|
||||
@@ -180,6 +178,6 @@ function formatDate(value) {
|
||||
}
|
||||
|
||||
useHead({
|
||||
title: 'QTTR-Werte - Harheimer TC'
|
||||
title: 'TTR- und QTTR-Werte - Harheimer TC'
|
||||
})
|
||||
</script>
|
||||
|
||||
10
server/api/cms/mytischtennis.get.js
Normal file
10
server/api/cms/mytischtennis.get.js
Normal file
@@ -0,0 +1,10 @@
|
||||
import { getUserFromToken, hasAnyRole } from '../../utils/auth.js'
|
||||
import { publicConnectionStatus, readMyTischtennisConnection } from '../../utils/mytischtennis-connection.js'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
const token = getCookie(event, 'auth_token') || getHeader(event, 'authorization')?.replace(/^Bearer\s+/i, '')
|
||||
const user = token ? await getUserFromToken(token) : null
|
||||
if (!user) throw createError({ statusCode: 401, statusMessage: 'Nicht authentifiziert' })
|
||||
if (!hasAnyRole(user, 'admin', 'vorstand')) throw createError({ statusCode: 403, statusMessage: 'Keine Berechtigung' })
|
||||
return publicConnectionStatus(await readMyTischtennisConnection())
|
||||
})
|
||||
17
server/api/cms/mytischtennis.put.js
Normal file
17
server/api/cms/mytischtennis.put.js
Normal file
@@ -0,0 +1,17 @@
|
||||
import { getUserFromToken, hasAnyRole } from '../../utils/auth.js'
|
||||
import { readMyTischtennisConnection, saveMyTischtennisConnection, publicConnectionStatus } from '../../utils/mytischtennis-connection.js'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
const token = getCookie(event, 'auth_token') || getHeader(event, 'authorization')?.replace(/^Bearer\s+/i, '')
|
||||
const user = token ? await getUserFromToken(token) : null
|
||||
if (!user) throw createError({ statusCode: 401, statusMessage: 'Nicht authentifiziert' })
|
||||
if (!hasAnyRole(user, 'admin', 'vorstand')) throw createError({ statusCode: 403, statusMessage: 'Keine Berechtigung' })
|
||||
const body = await readBody(event)
|
||||
if (!/^\S+@\S+\.\S+$/.test(String(body.email || '')) || String(body.password || '').length < 1) {
|
||||
throw createError({ statusCode: 400, statusMessage: 'E-Mail und Passwort sind erforderlich.' })
|
||||
}
|
||||
const previous = await readMyTischtennisConnection()
|
||||
const connection = { ...previous, email: body.email.trim(), password: body.password, association: String(body.association || 'HeTTV'), clubId: String(body.clubId || '43030') }
|
||||
await saveMyTischtennisConnection(connection)
|
||||
return publicConnectionStatus(connection)
|
||||
})
|
||||
24
server/api/cms/mytischtennis/import.post.js
Normal file
24
server/api/cms/mytischtennis/import.post.js
Normal file
@@ -0,0 +1,24 @@
|
||||
import { getUserFromToken, hasAnyRole } from '../../../utils/auth.js'
|
||||
import { importQttrValues } from '../../../utils/qttr-import.js'
|
||||
import { readMyTischtennisConnection, saveMyTischtennisConnection } from '../../../utils/mytischtennis-connection.js'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
const token = getCookie(event, 'auth_token') || getHeader(event, 'authorization')?.replace(/^Bearer\s+/i, '')
|
||||
const user = token ? await getUserFromToken(token) : null
|
||||
if (!user) throw createError({ statusCode: 401, statusMessage: 'Nicht authentifiziert' })
|
||||
if (!hasAnyRole(user, 'admin', 'vorstand')) throw createError({ statusCode: 403, statusMessage: 'Keine Berechtigung' })
|
||||
const connection = await readMyTischtennisConnection()
|
||||
if (!connection) throw createError({ statusCode: 409, statusMessage: 'Keine myTischtennis-Verbindung eingerichtet.' })
|
||||
try {
|
||||
const result = await importQttrValues({ connection })
|
||||
return { success: true, rowCount: result.rowCount, importedAt: result.importedAt }
|
||||
} catch (error) {
|
||||
const fullDetail = String(error.stack || error.message || error)
|
||||
const detail = fullDetail.slice(0, 500)
|
||||
// Vollständig nur ins serverseitige PM2-Log schreiben; im CMS wird der Fehler
|
||||
// bewusst gekürzt gespeichert, damit Browser-/Systempfade nicht öffentlich werden.
|
||||
console.error('[mytischtennis] TTR-Abruf fehlgeschlagen:', fullDetail)
|
||||
await saveMyTischtennisConnection({ ...connection, lastImportError: detail })
|
||||
throw createError({ statusCode: 502, message: 'TTR-Abruf fehlgeschlagen. Details stehen im Serverlog.' })
|
||||
}
|
||||
})
|
||||
12
server/api/cms/notifications/test.post.js
Normal file
12
server/api/cms/notifications/test.post.js
Normal file
@@ -0,0 +1,12 @@
|
||||
import { getUserFromToken, hasRole } from '../../../utils/auth.js'
|
||||
import { sendTestPushToUser } from '../../../utils/push-notifications.js'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
const token = getCookie(event, 'auth_token') || getHeader(event, 'authorization')?.replace(/^Bearer\s+/i, '')
|
||||
const user = token ? await getUserFromToken(token) : null
|
||||
if (!user) throw createError({ statusCode: 401, statusMessage: 'Nicht authentifiziert' })
|
||||
if (!hasRole(user, 'admin')) throw createError({ statusCode: 403, statusMessage: 'Nur Administratoren dürfen einen Push-Test auslösen.' })
|
||||
|
||||
const result = await sendTestPushToUser(user.id)
|
||||
return { success: true, ...result }
|
||||
})
|
||||
170
server/utils/mytischtennis-client.js
Normal file
170
server/utils/mytischtennis-client.js
Normal file
@@ -0,0 +1,170 @@
|
||||
import { chromium } from 'playwright'
|
||||
|
||||
const BASE_URL = 'https://www.mytischtennis.de'
|
||||
const HEADERS = { 'accept-language': 'de-DE,de;q=0.9', 'user-agent': 'Harheimer-TC-Vereinsverwaltung/1.0' }
|
||||
|
||||
function findAuthCookie(headers) {
|
||||
const raw = headers.getSetCookie?.() || (headers.get('set-cookie') ? [headers.get('set-cookie')] : [])
|
||||
return raw.find(value => value.startsWith('sb-10-auth-token='))?.split(';')[0] || null
|
||||
}
|
||||
|
||||
function findEntries(value) {
|
||||
if (!value || typeof value !== 'object') return null
|
||||
if (Array.isArray(value.entries)) return value.entries
|
||||
for (const child of Object.values(value)) {
|
||||
const result = findEntries(child)
|
||||
if (result) return result
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
async function loginDirect(email, password) {
|
||||
const page = await fetch(`${BASE_URL}/login?next=%2F`, { headers: HEADERS })
|
||||
const html = await page.text()
|
||||
if (/captcha/i.test(html)) throw new Error('CAPTCHA_REQUIRED')
|
||||
const xsrf = html.match(/name=["']xsrf["'][^>]*value=["']([^"']+)/i)?.[1]
|
||||
const form = new URLSearchParams({ email, password, intent: 'login' })
|
||||
if (xsrf) form.set('xsrf', xsrf)
|
||||
const result = await fetch(`${BASE_URL}/login?next=%2F&_data=routes%2F_auth%2B%2Flogin`, {
|
||||
method: 'POST', headers: { ...HEADERS, 'content-type': 'application/x-www-form-urlencoded' }, body: form, redirect: 'manual'
|
||||
})
|
||||
const cookie = findAuthCookie(result.headers)
|
||||
if (!cookie) throw new Error('Direkter myTischtennis-Login fehlgeschlagen.')
|
||||
return cookie
|
||||
}
|
||||
|
||||
async function loginWithBrowser(email, password) {
|
||||
const browser = await chromium.launch({
|
||||
headless: true,
|
||||
args: ['--no-sandbox', '--disable-dev-shm-usage']
|
||||
})
|
||||
try {
|
||||
const page = await browser.newPage()
|
||||
// Das myTT-CAPTCHA wird erst nach dem Laden der Seite erzeugt. Der Ablauf
|
||||
// entspricht der erprobten Integration im Trainingstagebuch.
|
||||
const acceptConsentDialog = async (waitMs = 0) => {
|
||||
if (waitMs) await page.waitForTimeout(waitMs)
|
||||
for (const selector of [
|
||||
'#onetrust-accept-btn-handler', 'button:has-text("Alle akzeptieren")',
|
||||
'button:has-text("Akzeptieren")', 'button:has-text("Einverstanden")',
|
||||
'button:has-text("Zustimmen")', '[data-testid="accept-button"]', '.cmp-accept-all', '.accept-all-btn'
|
||||
]) {
|
||||
try {
|
||||
const button = page.locator(selector).first()
|
||||
if (await button.count()) { await button.click({ timeout: 2_500 }); await page.waitForTimeout(800); return true }
|
||||
} catch { /* try next CMP selector */ }
|
||||
}
|
||||
return false
|
||||
}
|
||||
await page.goto(BASE_URL, { waitUntil: 'domcontentloaded', timeout: 30_000 }).catch(() => {})
|
||||
if (!await acceptConsentDialog()) await acceptConsentDialog(2_500)
|
||||
await page.goto(`${BASE_URL}/login?next=%2F`, { waitUntil: 'domcontentloaded', timeout: 45_000 })
|
||||
if (!await acceptConsentDialog()) await acceptConsentDialog(1_500)
|
||||
await page.locator('input[name="email"]').fill(email)
|
||||
await page.locator('input[name="password"]').fill(password)
|
||||
|
||||
// Exakt wie in trainingstagebuch: Das Widget wird nach dem DOM-Load
|
||||
// nachgeladen; ein sofortiges count() würde es häufig übersehen.
|
||||
await page.waitForSelector('private-captcha', { timeout: 8_000 }).catch(() => {})
|
||||
const captchaHost = page.locator('private-captcha').first()
|
||||
const hasCaptcha = await captchaHost.count() > 0
|
||||
console.info('[mytischtennis] CAPTCHA widget detected:', hasCaptcha)
|
||||
if (hasCaptcha) {
|
||||
await page.waitForTimeout(1_200)
|
||||
// Ein echter Playwright-Klick erzeugt im Gegensatz zu element.click() ein
|
||||
// vertrauenswürdiges Pointer-Ereignis für das Widget.
|
||||
await captchaHost.click({ timeout: 5_000, force: true }).catch(error => {
|
||||
console.warn('[mytischtennis] CAPTCHA pointer click failed:', error.message)
|
||||
})
|
||||
await page.evaluate(() => {
|
||||
const host = document.querySelector('private-captcha')
|
||||
const checkbox = host?.shadowRoot?.querySelector('#pc-checkbox')
|
||||
if (!checkbox) return
|
||||
checkbox.click()
|
||||
checkbox.dispatchEvent(new Event('input', { bubbles: true }))
|
||||
checkbox.dispatchEvent(new Event('change', { bubbles: true }))
|
||||
})
|
||||
await page.waitForFunction(() => {
|
||||
const token = document.querySelector('input[name="captcha"]')?.value?.trim() || ''
|
||||
const clicked = document.querySelector('input[name="captcha_clicked"]')?.value?.toLowerCase() || ''
|
||||
return token.length > 80 && (clicked === 'true' || clicked === '1')
|
||||
}, { timeout: 32_000 }).catch(() => {})
|
||||
const captchaState = await page.evaluate(() => {
|
||||
const host = document.querySelector('private-captcha')
|
||||
const checkbox = host?.shadowRoot?.querySelector('#pc-checkbox')
|
||||
const token = document.querySelector('input[name="captcha"]')?.value?.trim() || ''
|
||||
return {
|
||||
tokenLength: token.length,
|
||||
clicked: document.querySelector('input[name="captcha_clicked"]')?.value || null,
|
||||
shadowRoot: Boolean(host?.shadowRoot),
|
||||
checkboxFound: Boolean(checkbox),
|
||||
checkboxChecked: Boolean(checkbox?.checked),
|
||||
widgetState: host?.getAttribute('data-state') || null
|
||||
}
|
||||
})
|
||||
console.info('[mytischtennis] CAPTCHA state after wait:', captchaState)
|
||||
const captchaReady = captchaState.tokenLength > 80
|
||||
if (!captchaReady) throw new Error('CAPTCHA konnte nicht automatisch gelöst werden.')
|
||||
await page.waitForTimeout(2_500)
|
||||
}
|
||||
|
||||
await page.evaluate(() => {
|
||||
const form = document.querySelector('form[action*="/login"]')
|
||||
if (!form) return
|
||||
let intent = form.querySelector('input[name="intent"]')
|
||||
if (!intent) {
|
||||
intent = document.createElement('input')
|
||||
intent.setAttribute('type', 'hidden')
|
||||
intent.setAttribute('name', 'intent')
|
||||
form.appendChild(intent)
|
||||
}
|
||||
intent.setAttribute('value', 'login')
|
||||
})
|
||||
const submit = page.locator('button[type="submit"][name="intent"][value="login"]').first()
|
||||
const genericSubmit = page.locator('button[type="submit"], input[type="submit"]').first()
|
||||
if (await submit.count()) await submit.click({ noWaitAfter: true })
|
||||
else if (await genericSubmit.count()) await genericSubmit.click({ noWaitAfter: true })
|
||||
else await page.locator('form').evaluate(form => form.requestSubmit())
|
||||
let cookie = null
|
||||
let cookieNames = []
|
||||
let loginPageText = ''
|
||||
for (let attempt = 0; attempt < 40; attempt += 1) {
|
||||
const cookies = await page.context().cookies()
|
||||
cookieNames = cookies.map(item => item.name)
|
||||
cookie = cookies.find(item => item.name === 'sb-10-auth-token' || /^sb-\d+-auth-token$/.test(item.name) || item.name.includes('auth-token'))
|
||||
if (cookie) break
|
||||
if (attempt % 4 === 0) {
|
||||
loginPageText = await page.locator('body').innerText().catch(() => '')
|
||||
}
|
||||
await page.waitForTimeout(500)
|
||||
}
|
||||
if (!cookie) {
|
||||
console.warn('[mytischtennis] Login after solved CAPTCHA did not create a session', {
|
||||
url: page.url(), cookieNames, pageText: loginPageText.slice(0, 1_000)
|
||||
})
|
||||
throw new Error('myTischtennis-Login nach gelöstem CAPTCHA fehlgeschlagen.')
|
||||
}
|
||||
return `${cookie.name}=${cookie.value}`
|
||||
} finally { await browser.close() }
|
||||
}
|
||||
|
||||
export async function fetchClubRankings(connection, currentRanking = 'yes') {
|
||||
let cookie
|
||||
try { cookie = await loginDirect(connection.email, connection.password) } catch (error) {
|
||||
if (error.message !== 'CAPTCHA_REQUIRED') throw error
|
||||
cookie = await loginWithBrowser(connection.email, connection.password)
|
||||
}
|
||||
const url = new URL('/rankings/andro-rangliste', BASE_URL)
|
||||
url.search = new URLSearchParams({ 'all-players': 'on', clubnr: connection.clubId, fednickname: connection.association, 'current-ranking': currentRanking, 'results-per-page': '100', page: '0', _data: 'routes/$' })
|
||||
console.info('[mytischtennis] Ranking request URL:', url.toString())
|
||||
const response = await fetch(url, { headers: { ...HEADERS, cookie, accept: 'application/json', referer: `${BASE_URL}/` } })
|
||||
if (!response.ok) throw new Error(`Ranglisten-Abruf fehlgeschlagen (HTTP ${response.status}).`)
|
||||
const entries = findEntries(await response.json())
|
||||
if (!entries) throw new Error('myTischtennis hat keine Ranglisten-Daten geliefert.')
|
||||
console.info('[mytischtennis] Ranking response:', {
|
||||
currentRanking,
|
||||
entryCount: entries.length,
|
||||
entryKeys: Object.keys(entries[0] || {})
|
||||
})
|
||||
return entries
|
||||
}
|
||||
44
server/utils/mytischtennis-connection.js
Normal file
44
server/utils/mytischtennis-connection.js
Normal file
@@ -0,0 +1,44 @@
|
||||
import { promises as fs } from 'fs'
|
||||
import { encryptObject, decryptObject } from './encryption.js'
|
||||
import { getServerDataPath } from './paths.js'
|
||||
|
||||
const FILE = getServerDataPath('mytischtennis-connection.json')
|
||||
|
||||
function encryptionKey() {
|
||||
const key = process.env.ENCRYPTION_KEY
|
||||
if (!key) throw new Error('ENCRYPTION_KEY ist für die myTischtennis-Verbindung erforderlich.')
|
||||
return key
|
||||
}
|
||||
|
||||
export async function readMyTischtennisConnection() {
|
||||
try {
|
||||
const stored = JSON.parse(await fs.readFile(FILE, 'utf8'))
|
||||
return decryptObject(stored.encrypted, encryptionKey())
|
||||
} catch (error) {
|
||||
if (error?.code === 'ENOENT') return null
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
export async function saveMyTischtennisConnection(connection) {
|
||||
const payload = {
|
||||
version: 1,
|
||||
encrypted: encryptObject(connection, encryptionKey())
|
||||
}
|
||||
await fs.mkdir(getServerDataPath(), { recursive: true })
|
||||
await fs.writeFile(FILE, `${JSON.stringify(payload)}\n`, { encoding: 'utf8', mode: 0o600 })
|
||||
}
|
||||
|
||||
export function publicConnectionStatus(connection) {
|
||||
if (!connection) return { configured: false }
|
||||
const email = String(connection.email || '')
|
||||
const [name, domain] = email.split('@')
|
||||
return {
|
||||
configured: true,
|
||||
email: name ? `${name.slice(0, 2)}${'•'.repeat(Math.max(1, name.length - 2))}${domain ? `@${domain}` : ''}` : null,
|
||||
association: connection.association || null,
|
||||
clubId: connection.clubId || null,
|
||||
lastSuccessfulImportAt: connection.lastSuccessfulImportAt || null,
|
||||
lastImportError: connection.lastImportError || null
|
||||
}
|
||||
}
|
||||
@@ -8,6 +8,7 @@ export const DEFAULT_NOTIFICATION_SETTINGS = Object.freeze({
|
||||
birthdays: false,
|
||||
newContactRequest: false,
|
||||
newUserRegistration: false,
|
||||
ownTtrChanges: false,
|
||||
selectedTeamSlugs: [],
|
||||
selectedTeamSeason: null,
|
||||
notificationTime: '09:00'
|
||||
@@ -41,6 +42,7 @@ export function sanitizeNotificationSettings(input = {}) {
|
||||
birthdays: coerceBoolean(input.birthdays),
|
||||
newContactRequest: coerceBoolean(input.newContactRequest),
|
||||
newUserRegistration: coerceBoolean(input.newUserRegistration),
|
||||
ownTtrChanges: coerceBoolean(input.ownTtrChanges),
|
||||
selectedTeamSlugs: [...new Set(selectedTeamSlugs)],
|
||||
selectedTeamSeason,
|
||||
notificationTime
|
||||
|
||||
@@ -150,6 +150,26 @@ function isVorstandUser(user) {
|
||||
return roles.includes('admin') || roles.includes('vorstand')
|
||||
}
|
||||
|
||||
function normalizePersonName(value) {
|
||||
return String(value || '')
|
||||
.trim()
|
||||
.toLowerCase()
|
||||
.normalize('NFKD')
|
||||
.replace(/[\u0300-\u036f]/g, '')
|
||||
.replace(/[’'`]/g, '')
|
||||
.replace(/\s+/g, ' ')
|
||||
}
|
||||
|
||||
function userMatchesPlayer(user, playerName) {
|
||||
const player = normalizePersonName(playerName)
|
||||
if (!player) return false
|
||||
const candidates = [
|
||||
user?.name,
|
||||
`${user?.firstName || ''} ${user?.lastName || ''}`.trim()
|
||||
].map(normalizePersonName).filter(Boolean)
|
||||
return candidates.includes(player)
|
||||
}
|
||||
|
||||
export async function sendPushToUsers({ title, body, data = {}, predicate, bodyForUser, dataForUser, failureLabel = 'FCM-Push' }) {
|
||||
const serviceAccount = await readServiceAccount()
|
||||
if (serviceAccount == null) {
|
||||
@@ -275,3 +295,44 @@ export async function sendNewUserRegistrationPush(registration) {
|
||||
failureLabel: 'FCM Registrierungs-Push'
|
||||
})
|
||||
}
|
||||
|
||||
export async function sendOwnTtrChangePush(changes = []) {
|
||||
const byPlayer = new Map(
|
||||
changes
|
||||
.filter(change => change?.playerName && Number.isFinite(change?.previousTtr) && Number.isFinite(change?.currentTtr))
|
||||
.map(change => [normalizePersonName(change.playerName), change])
|
||||
)
|
||||
if (!byPlayer.size) return { sent: 0, failed: 0, removed: 0, recipients: 0, tokenCount: 0, skipped: false }
|
||||
|
||||
return sendPushToUsers({
|
||||
title: 'TTR-Wert geändert',
|
||||
data: { type: 'ttr_change' },
|
||||
predicate: (user, settings) => settings.ownTtrChanges && [...byPlayer.values()].some(change => userMatchesPlayer(user, change.playerName)),
|
||||
bodyForUser: (user) => {
|
||||
const change = [...byPlayer.values()].find(entry => userMatchesPlayer(user, entry.playerName))
|
||||
return `Dein TTR-Wert hat sich von ${change.previousTtr} auf ${change.currentTtr} geändert.`
|
||||
},
|
||||
dataForUser: (user) => {
|
||||
const change = [...byPlayer.values()].find(entry => userMatchesPlayer(user, entry.playerName))
|
||||
return {
|
||||
previousTtr: change.previousTtr,
|
||||
currentTtr: change.currentTtr,
|
||||
notificationId: notificationIdFor(`ttr:${change.playerName}:${change.previousTtr}:${change.currentTtr}`)
|
||||
}
|
||||
},
|
||||
failureLabel: 'FCM TTR-Änderungs-Push'
|
||||
})
|
||||
}
|
||||
|
||||
export async function sendTestPushToUser(userId) {
|
||||
return sendPushToUsers({
|
||||
title: 'Harheimer TC: Push-Test',
|
||||
body: 'Diese Test-Benachrichtigung wurde erfolgreich vom CMS ausgelöst.',
|
||||
data: {
|
||||
type: 'test',
|
||||
notificationId: notificationIdFor(`test:${userId}:${Date.now()}`)
|
||||
},
|
||||
predicate: user => user?.id === userId,
|
||||
failureLabel: 'FCM Test-Push'
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
import { promises as fs } from 'fs'
|
||||
import { getServerDataPath } from './paths.js'
|
||||
import { sendOwnTtrChangePush } from './push-notifications.js'
|
||||
import { fetchClubRankings } from './mytischtennis-client.js'
|
||||
import { readMyTischtennisConnection, saveMyTischtennisConnection } from './mytischtennis-connection.js'
|
||||
|
||||
const QTTR_URL = 'https://www.mytischtennis.de/rankings/andro-rangliste?continent=all&country=Deutschland&all-players=on&as=DE.WE.R4.07&di=DE.WE.R4.07.04&area=DE.WE.R4.07.04.43&clubnr-search=Harheimer+TC&clubnr=43030&fednickname=HeTTV&gender=all¤t-ranking=no&ttr-range=100%3B3000&birth-range=1926%3B2021'
|
||||
const OUTPUT_FILE = getServerDataPath('qttr-values.json')
|
||||
@@ -59,8 +62,8 @@ function toNumberOrNull(value) {
|
||||
|
||||
function normalizeGender(value) {
|
||||
const normalized = String(value || '').trim().toLowerCase()
|
||||
if (normalized === 'm' || normalized === 'männlich') return 'männlich'
|
||||
if (normalized === 'w' || normalized === 'weiblich') return 'weiblich'
|
||||
if (['m', 'männlich', 'maennlich', 'male', 'man'].includes(normalized)) return 'männlich'
|
||||
if (['w', 'weiblich', 'female', 'woman', 'f'].includes(normalized)) return 'weiblich'
|
||||
return normalized || null
|
||||
}
|
||||
|
||||
@@ -160,6 +163,9 @@ function deriveQttrFields(headers, cells) {
|
||||
}
|
||||
|
||||
export async function importQttrValues(options = {}) {
|
||||
const connection = options.connection ?? await readMyTischtennisConnection()
|
||||
if (connection) return importAuthenticatedTtrValues(connection)
|
||||
|
||||
const url = options.url || QTTR_URL
|
||||
const response = await fetch(url, {
|
||||
headers: {
|
||||
@@ -207,4 +213,55 @@ export async function importQttrValues(options = {}) {
|
||||
rowCount: parsedRows.length,
|
||||
...payload
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function importAuthenticatedTtrValues(connection) {
|
||||
const previousPayload = await fs.readFile(OUTPUT_FILE, 'utf8')
|
||||
.then(JSON.parse)
|
||||
.catch(() => ({ rows: [] }))
|
||||
const [ttrEntries, qttrEntries] = await Promise.all([
|
||||
fetchClubRankings(connection, 'yes'),
|
||||
fetchClubRankings(connection, 'no')
|
||||
])
|
||||
const qttrByPlayer = new Map(qttrEntries.map(entry => [
|
||||
String(entry.personId || `${entry.firstname || ''}|${entry.lastname || ''}`).toLowerCase(), entry
|
||||
]))
|
||||
const rows = ttrEntries.map((entry, index) => {
|
||||
const key = String(entry.personId || `${entry.firstname || ''}|${entry.lastname || ''}`).toLowerCase()
|
||||
const qttrEntry = qttrByPlayer.get(key)
|
||||
return ({
|
||||
rank: toNumberOrNull(entry.rank ?? entry.ranking ?? index + 1),
|
||||
playerNumber: toNumberOrNull(entry.playernr ?? entry.player_number ?? entry.nuid),
|
||||
gender: normalizeGender(entry.gender ?? entry.sex ?? entry.genderCode ?? entry.gender_code),
|
||||
playerName: `${entry.firstname ?? entry.first_name ?? ''} ${entry.lastname ?? entry.last_name ?? ''}`.trim() || entry.name || null,
|
||||
clubName: entry.clubname ?? entry.club_name ?? 'Harheimer TC',
|
||||
currentQttr: toNumberOrNull(qttrEntry?.fedRank ?? qttrEntry?.qttr ?? entry.qttr),
|
||||
currentTtr: toNumberOrNull(entry.fedRank ?? entry.ttr ?? entry.current_ttr),
|
||||
previousQttr: null,
|
||||
valuesByHeader: entry,
|
||||
rawCells: []
|
||||
})
|
||||
}).filter(row => row.playerName && (row.currentTtr != null || row.currentQttr != null))
|
||||
|
||||
if (!rows.length) throw new Error('Keine verwertbaren TTR-Werte in der myTischtennis-Rangliste gefunden.')
|
||||
const importedAt = new Date().toISOString()
|
||||
const payload = {
|
||||
format: 'harheimertc.qttr.v2', importedAt,
|
||||
source: { type: 'mytischtennis-authenticated', association: connection.association, clubId: connection.clubId },
|
||||
title: 'Aktuelle myTischtennis-Rangliste', headerCount: 0, rowCount: rows.length, headers: [], rows
|
||||
}
|
||||
await fs.mkdir(getServerDataPath(), { recursive: true })
|
||||
await fs.writeFile(OUTPUT_FILE, `${JSON.stringify(payload, null, 2)}\n`, 'utf8')
|
||||
const previousTtrByPlayer = new Map((previousPayload.rows || []).map(row => [
|
||||
String(row?.playerName || '').trim().toLowerCase(), toNumberOrNull(row?.currentTtr)
|
||||
]))
|
||||
const changes = rows.flatMap(row => {
|
||||
const previousTtr = previousTtrByPlayer.get(String(row.playerName || '').trim().toLowerCase())
|
||||
return previousTtr != null && row.currentTtr != null && previousTtr !== row.currentTtr
|
||||
? [{ playerName: row.playerName, previousTtr, currentTtr: row.currentTtr }]
|
||||
: []
|
||||
})
|
||||
await sendOwnTtrChangePush(changes)
|
||||
await saveMyTischtennisConnection({ ...connection, lastSuccessfulImportAt: importedAt, lastImportError: null })
|
||||
return { outputFile: OUTPUT_FILE, tableCount: 1, ...payload }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user