Compare commits
No commits in common. "f934560a1270b42db1734ad7040f9bd26c9e5d03" and "8d2cc279ae363e515741a4e587847b314c24dfe4" have entirely different histories.
f934560a12
...
8d2cc279ae
9 changed files with 29 additions and 73 deletions
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
||||||
1139
|
1137
|
||||||
|
|
@ -1216,14 +1216,10 @@ async def fulfill_upgrade_request(req_id: int, user=Depends(require_admin)):
|
||||||
raise HTTPException(400, "Ungültiger Tier.")
|
raise HTTPException(400, "Ungültiger Tier.")
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
expires_at = (datetime.now(_TZ) + timedelta(days=365)).strftime('%Y-%m-%dT%H:%M:%SZ')
|
expires_at = (datetime.now(_TZ) + timedelta(days=365)).strftime('%Y-%m-%dT%H:%M:%SZ')
|
||||||
# is_premium-Flag synchron halten: 1 für pro/breeder, sonst 0.
|
|
||||||
# Sonst zeigt das Frontend „Kostenlos"-Badge obwohl Tier upgraded
|
|
||||||
# ist (Settings-Header las is_premium statt subscription_tier).
|
|
||||||
_is_prem = 1 if req["tier"] in ("pro", "breeder") else 0
|
|
||||||
conn.execute(
|
conn.execute(
|
||||||
"""UPDATE users SET subscription_tier=?, subscription_expires_at=?,
|
"""UPDATE users SET subscription_tier=?, subscription_expires_at=?,
|
||||||
subscription_cancelled_at=NULL, is_premium=? WHERE id=?""",
|
subscription_cancelled_at=NULL WHERE id=?""",
|
||||||
(req["tier"], expires_at, _is_prem, req["user_id"])
|
(req["tier"], expires_at, req["user_id"])
|
||||||
)
|
)
|
||||||
conn.execute(
|
conn.execute(
|
||||||
"UPDATE upgrade_requests SET fulfilled_at=strftime('%Y-%m-%dT%H:%M:%fZ','now'), fulfilled_by=? WHERE id=?",
|
"UPDATE upgrade_requests SET fulfilled_at=strftime('%Y-%m-%dT%H:%M:%fZ','now'), fulfilled_by=? WHERE id=?",
|
||||||
|
|
|
||||||
|
|
@ -2838,7 +2838,6 @@ html.modal-open {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
background: #e8f0e8;
|
background: #e8f0e8;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
position: relative;
|
|
||||||
}
|
}
|
||||||
.rk-preview-empty {
|
.rk-preview-empty {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
|
||||||
|
|
@ -86,14 +86,14 @@
|
||||||
<title>Ban Yaro</title>
|
<title>Ban Yaro</title>
|
||||||
|
|
||||||
<!-- Theme + theme-color Statusleiste vor CSS setzen -->
|
<!-- Theme + theme-color Statusleiste vor CSS setzen -->
|
||||||
<script src="/js/boot-early.js?v=1139"></script>
|
<script src="/js/boot-early.js?v=1137"></script>
|
||||||
|
|
||||||
<!-- CSS: Reihenfolge ist wichtig — ?v= zwingt Browser zur Neuladung -->
|
<!-- CSS: Reihenfolge ist wichtig — ?v= zwingt Browser zur Neuladung -->
|
||||||
<link rel="stylesheet" href="/css/design-system.css?v=1139">
|
<link rel="stylesheet" href="/css/design-system.css?v=1137">
|
||||||
<link rel="stylesheet" href="/css/layout.css?v=1139">
|
<link rel="stylesheet" href="/css/layout.css?v=1137">
|
||||||
<link rel="stylesheet" href="/css/components.css?v=1139">
|
<link rel="stylesheet" href="/css/components.css?v=1137">
|
||||||
<link rel="stylesheet" href="/css/utilities.css?v=1139">
|
<link rel="stylesheet" href="/css/utilities.css?v=1137">
|
||||||
<link rel="stylesheet" href="/css/lists.css?v=1139">
|
<link rel="stylesheet" href="/css/lists.css?v=1137">
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
|
|
@ -617,11 +617,11 @@
|
||||||
<div id="modal-container"></div>
|
<div id="modal-container"></div>
|
||||||
|
|
||||||
<!-- JS: Reihenfolge ist wichtig — erst Basis, dann Features -->
|
<!-- JS: Reihenfolge ist wichtig — erst Basis, dann Features -->
|
||||||
<script src="/js/api.js?v=1139"></script>
|
<script src="/js/api.js?v=1137"></script>
|
||||||
<script src="/js/ui.js?v=1139"></script>
|
<script src="/js/ui.js?v=1137"></script>
|
||||||
<script src="/js/app.js?v=1139"></script>
|
<script src="/js/app.js?v=1137"></script>
|
||||||
<script src="/js/worlds.js?v=1139"></script>
|
<script src="/js/worlds.js?v=1137"></script>
|
||||||
<script src="/js/offline-indicator.js?v=1139"></script>
|
<script src="/js/offline-indicator.js?v=1137"></script>
|
||||||
|
|
||||||
<!-- Feature-Seiten werden lazy geladen -->
|
<!-- Feature-Seiten werden lazy geladen -->
|
||||||
|
|
||||||
|
|
@ -631,7 +631,7 @@
|
||||||
|
|
||||||
|
|
||||||
<!-- Boot: Offline-Banner + SW-Registration (extrahiert für CSP) -->
|
<!-- Boot: Offline-Banner + SW-Registration (extrahiert für CSP) -->
|
||||||
<script src="/js/boot.js?v=1139"></script>
|
<script src="/js/boot.js?v=1137"></script>
|
||||||
|
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
Router, State-Management, Navigation, Initialisierung.
|
Router, State-Management, Navigation, Initialisierung.
|
||||||
============================================================ */
|
============================================================ */
|
||||||
|
|
||||||
const APP_VER = '1139'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
|
const APP_VER = '1137'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
|
||||||
const APP_VERSION = '1.6.0'; // ← semantische Version, wird bei make release gesetzt
|
const APP_VERSION = '1.6.0'; // ← semantische Version, wird bei make release gesetzt
|
||||||
window.APP_VER = APP_VER; // global verfügbar für andere Module (z.B. offline-indicator)
|
window.APP_VER = APP_VER; // global verfügbar für andere Module (z.B. offline-indicator)
|
||||||
window.APP_VERSION = APP_VERSION;
|
window.APP_VERSION = APP_VERSION;
|
||||||
|
|
|
||||||
|
|
@ -1411,29 +1411,12 @@ window.Page_routes = (() => {
|
||||||
const paws = HUNDE_LABEL[r.hunde_tauglichkeit] || '';
|
const paws = HUNDE_LABEL[r.hunde_tauglichkeit] || '';
|
||||||
const dist = r.distanz_km ? `${r.distanz_km.toFixed(1)} km` : '';
|
const dist = r.distanz_km ? `${r.distanz_km.toFixed(1)} km` : '';
|
||||||
const dur = r.dauer_min ? _fmtDur(r.dauer_min) : '';
|
const dur = r.dauer_min ? _fmtDur(r.dauer_min) : '';
|
||||||
// Immer die Karte zeigen — Fotos erst beim Öffnen der Route.
|
const firstPhoto = (r.foto_urls || [])[0];
|
||||||
// Bei Routen mit Fotos einen kleinen Kamera-Marker oben rechts
|
const previewContent = firstPhoto
|
||||||
// einblenden (analog zum Tagebuch).
|
? `<img src="${UI.escape(firstPhoto)}" style="width:100%;height:100%;object-fit:cover">`
|
||||||
const photoCount = (r.foto_urls || []).length;
|
: `<div class="rk-mini-map" data-id="${r.id}"
|
||||||
const photoBadge = photoCount > 0
|
data-track='${JSON.stringify(r.preview_track||[])}'
|
||||||
? `<div class="rk-photo-badge"
|
style="width:100%;height:100%"></div>`;
|
||||||
style="position:absolute;top:6px;right:6px;z-index:2;
|
|
||||||
display:flex;align-items:center;gap:3px;
|
|
||||||
padding:3px 7px;border-radius:999px;
|
|
||||||
background:rgba(0,0,0,0.55);color:#fff;
|
|
||||||
font-size:11px;font-weight:600;
|
|
||||||
backdrop-filter:blur(4px);
|
|
||||||
-webkit-backdrop-filter:blur(4px);
|
|
||||||
pointer-events:none">
|
|
||||||
<svg class="ph-icon" aria-hidden="true" style="width:12px;height:12px"><use href="/icons/phosphor.svg#camera"></use></svg>
|
|
||||||
${photoCount}
|
|
||||||
</div>`
|
|
||||||
: '';
|
|
||||||
const previewContent = `
|
|
||||||
${photoBadge}
|
|
||||||
<div class="rk-mini-map" data-id="${r.id}"
|
|
||||||
data-track='${JSON.stringify(r.preview_track||[])}'
|
|
||||||
style="width:100%;height:100%"></div>`;
|
|
||||||
|
|
||||||
const authorLine = isDiscover
|
const authorLine = isDiscover
|
||||||
? `<div class="rk-card-creator">${UI.icon('user')} ${UI.escape(r.user_name||'Anonym')}</div>`
|
? `<div class="rk-card-creator">${UI.icon('user')} ${UI.escape(r.user_name||'Anonym')}</div>`
|
||||||
|
|
|
||||||
|
|
@ -558,33 +558,11 @@ window.Page_settings = (() => {
|
||||||
title="E-Mail noch nicht bestätigt">Nicht bestätigt</span>`}
|
title="E-Mail noch nicht bestätigt">Nicht bestätigt</span>`}
|
||||||
</div>
|
</div>
|
||||||
<div style="display:flex;flex-wrap:wrap;gap:var(--space-1);margin-top:var(--space-1)">
|
<div style="display:flex;flex-wrap:wrap;gap:var(--space-1);margin-top:var(--space-1)">
|
||||||
${(() => {
|
${u.is_premium
|
||||||
// Tier-Source-of-Truth ist subscription_tier (was auch
|
? `<span class="badge badge-primary">
|
||||||
// _tierCard und has_pro_access nutzen). Das alte is_premium-
|
<svg class="ph-icon" aria-hidden="true" style="width:12px;height:12px"><use href="/icons/phosphor.svg#star"></use></svg> Ban Yaro Plus
|
||||||
// Flag wird bei Admin-Upgrade nicht immer mitgezogen — daher
|
</span>`
|
||||||
// hier den Tier nehmen.
|
: `<span class="badge text-secondary">Kostenlos</span>`}
|
||||||
const _tier = u.subscription_tier || 'standard';
|
|
||||||
const _rolle = u.rolle || 'user';
|
|
||||||
const _isAdminLike = _rolle === 'admin' || _rolle === 'moderator';
|
|
||||||
const _isBreeder = _tier === 'breeder' || _tier === 'breeder_test' || _rolle === 'breeder';
|
|
||||||
const _isPro = _tier === 'pro' || _tier === 'pro_test';
|
|
||||||
if (_isAdminLike) {
|
|
||||||
return `<span class="badge" style="background:#6366f1;color:#fff">
|
|
||||||
<svg class="ph-icon" aria-hidden="true" style="width:12px;height:12px"><use href="/icons/phosphor.svg#shield-star"></use></svg> Admin
|
|
||||||
</span>`;
|
|
||||||
}
|
|
||||||
if (_isBreeder) {
|
|
||||||
return `<span class="badge" style="background:#C4843A;color:#fff">
|
|
||||||
<svg class="ph-icon" aria-hidden="true" style="width:12px;height:12px"><use href="/icons/phosphor.svg#dog"></use></svg> Züchter
|
|
||||||
</span>`;
|
|
||||||
}
|
|
||||||
if (_isPro) {
|
|
||||||
return `<span class="badge badge-primary">
|
|
||||||
<svg class="ph-icon" aria-hidden="true" style="width:12px;height:12px"><use href="/icons/phosphor.svg#star"></use></svg> Ban Yaro Pro
|
|
||||||
</span>`;
|
|
||||||
}
|
|
||||||
return `<span class="badge text-secondary">Kostenlos</span>`;
|
|
||||||
})()}
|
|
||||||
${u.is_founder
|
${u.is_founder
|
||||||
? `<span class="badge" style="background:#7c3aed;color:#fff;cursor:pointer" data-page="gruender">
|
? `<span class="badge" style="background:#7c3aed;color:#fff;cursor:pointer" data-page="gruender">
|
||||||
<svg class="ph-icon" aria-hidden="true" style="width:12px;height:12px"><use href="/icons/phosphor.svg#key"></use></svg>
|
<svg class="ph-icon" aria-hidden="true" style="width:12px;height:12px"><use href="/icons/phosphor.svg#key"></use></svg>
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<meta name="color-scheme" content="light dark">
|
<meta name="color-scheme" content="light dark">
|
||||||
<script src="/js/landing-init.js?v=1139"></script>
|
<script src="/js/landing-init.js?v=1137"></script>
|
||||||
<title>Ban Yaro — Die Hunde-App für Deutschland, Österreich & Schweiz</title>
|
<title>Ban Yaro — Die Hunde-App für Deutschland, Österreich & Schweiz</title>
|
||||||
<meta name="description" content="Ban Yaro: Die kostenlose All-in-One Hunde-App für DACH. Tagebuch, Giftköder-Alarm, Training mit KI, Forum, Wurfbörse, Stammbaum, Inzucht-Check — DSGVO-konform, offline-fähig, ohne App Store.">
|
<meta name="description" content="Ban Yaro: Die kostenlose All-in-One Hunde-App für DACH. Tagebuch, Giftköder-Alarm, Training mit KI, Forum, Wurfbörse, Stammbaum, Inzucht-Check — DSGVO-konform, offline-fähig, ohne App Store.">
|
||||||
<meta name="keywords" content="Hunde App, Hunde Community, Wurfbörse, Züchter, Welpen kaufen, Stammbaum Hund, Inzuchtkoeffizient, Hundezucht, Impfpass Hund, Giftköder Alarm, Gassi Community, Hundetraining App, Hunde Forum, Hunde KI, Hundefilm Datenbank, Welpen Marktplatz">
|
<meta name="keywords" content="Hunde App, Hunde Community, Wurfbörse, Züchter, Welpen kaufen, Stammbaum Hund, Inzuchtkoeffizient, Hundezucht, Impfpass Hund, Giftköder Alarm, Gassi Community, Hundetraining App, Hunde Forum, Hunde KI, Hundefilm Datenbank, Welpen Marktplatz">
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
============================================================ */
|
============================================================ */
|
||||||
|
|
||||||
// ← EINZIGE Stelle für die Version — STATIC_ASSETS und CACHE_VERSION leiten sich ab
|
// ← EINZIGE Stelle für die Version — STATIC_ASSETS und CACHE_VERSION leiten sich ab
|
||||||
const VER = '1139';
|
const VER = '1137';
|
||||||
const CACHE_VERSION = `by-v${VER}`;
|
const CACHE_VERSION = `by-v${VER}`;
|
||||||
const CACHE_STATIC = `${CACHE_VERSION}-static`;
|
const CACHE_STATIC = `${CACHE_VERSION}-static`;
|
||||||
const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten
|
const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue