Pro-Badge im Profil: zeigt jetzt korrekten Tier statt veraltetem is_premium
- settings.js Header-Badge unter dem Namen leitet jetzt aus subscription_tier ab (analog _tierCard / has_pro_access): Admin/ Moderator, Züchter, Pro, sonst 'Kostenlos'. Vorher las nur das alte is_premium-Flag, was beim Admin-Upgrade nicht mitgezogen wurde. - admin.py fulfill_upgrade_request setzt jetzt is_premium synchron mit subscription_tier (1 für pro/breeder, sonst 0). Hält Login-Response, /auth/me und Reports konsistent.
This commit is contained in:
parent
8d2cc279ae
commit
4cfce1051f
7 changed files with 49 additions and 23 deletions
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
|||
1137
|
||||
1138
|
||||
|
|
@ -1216,10 +1216,14 @@ async def fulfill_upgrade_request(req_id: int, user=Depends(require_admin)):
|
|||
raise HTTPException(400, "Ungültiger Tier.")
|
||||
from datetime import timedelta
|
||||
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(
|
||||
"""UPDATE users SET subscription_tier=?, subscription_expires_at=?,
|
||||
subscription_cancelled_at=NULL WHERE id=?""",
|
||||
(req["tier"], expires_at, req["user_id"])
|
||||
subscription_cancelled_at=NULL, is_premium=? WHERE id=?""",
|
||||
(req["tier"], expires_at, _is_prem, req["user_id"])
|
||||
)
|
||||
conn.execute(
|
||||
"UPDATE upgrade_requests SET fulfilled_at=strftime('%Y-%m-%dT%H:%M:%fZ','now'), fulfilled_by=? WHERE id=?",
|
||||
|
|
|
|||
|
|
@ -86,14 +86,14 @@
|
|||
<title>Ban Yaro</title>
|
||||
|
||||
<!-- Theme + theme-color Statusleiste vor CSS setzen -->
|
||||
<script src="/js/boot-early.js?v=1137"></script>
|
||||
<script src="/js/boot-early.js?v=1138"></script>
|
||||
|
||||
<!-- CSS: Reihenfolge ist wichtig — ?v= zwingt Browser zur Neuladung -->
|
||||
<link rel="stylesheet" href="/css/design-system.css?v=1137">
|
||||
<link rel="stylesheet" href="/css/layout.css?v=1137">
|
||||
<link rel="stylesheet" href="/css/components.css?v=1137">
|
||||
<link rel="stylesheet" href="/css/utilities.css?v=1137">
|
||||
<link rel="stylesheet" href="/css/lists.css?v=1137">
|
||||
<link rel="stylesheet" href="/css/design-system.css?v=1138">
|
||||
<link rel="stylesheet" href="/css/layout.css?v=1138">
|
||||
<link rel="stylesheet" href="/css/components.css?v=1138">
|
||||
<link rel="stylesheet" href="/css/utilities.css?v=1138">
|
||||
<link rel="stylesheet" href="/css/lists.css?v=1138">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
|
@ -617,11 +617,11 @@
|
|||
<div id="modal-container"></div>
|
||||
|
||||
<!-- JS: Reihenfolge ist wichtig — erst Basis, dann Features -->
|
||||
<script src="/js/api.js?v=1137"></script>
|
||||
<script src="/js/ui.js?v=1137"></script>
|
||||
<script src="/js/app.js?v=1137"></script>
|
||||
<script src="/js/worlds.js?v=1137"></script>
|
||||
<script src="/js/offline-indicator.js?v=1137"></script>
|
||||
<script src="/js/api.js?v=1138"></script>
|
||||
<script src="/js/ui.js?v=1138"></script>
|
||||
<script src="/js/app.js?v=1138"></script>
|
||||
<script src="/js/worlds.js?v=1138"></script>
|
||||
<script src="/js/offline-indicator.js?v=1138"></script>
|
||||
|
||||
<!-- Feature-Seiten werden lazy geladen -->
|
||||
|
||||
|
|
@ -631,7 +631,7 @@
|
|||
|
||||
|
||||
<!-- Boot: Offline-Banner + SW-Registration (extrahiert für CSP) -->
|
||||
<script src="/js/boot.js?v=1137"></script>
|
||||
<script src="/js/boot.js?v=1138"></script>
|
||||
|
||||
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
Router, State-Management, Navigation, Initialisierung.
|
||||
============================================================ */
|
||||
|
||||
const APP_VER = '1137'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
|
||||
const APP_VER = '1138'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
|
||||
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_VERSION = APP_VERSION;
|
||||
|
|
|
|||
|
|
@ -558,11 +558,33 @@ window.Page_settings = (() => {
|
|||
title="E-Mail noch nicht bestätigt">Nicht bestätigt</span>`}
|
||||
</div>
|
||||
<div style="display:flex;flex-wrap:wrap;gap:var(--space-1);margin-top:var(--space-1)">
|
||||
${u.is_premium
|
||||
? `<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 Plus
|
||||
</span>`
|
||||
: `<span class="badge text-secondary">Kostenlos</span>`}
|
||||
${(() => {
|
||||
// Tier-Source-of-Truth ist subscription_tier (was auch
|
||||
// _tierCard und has_pro_access nutzen). Das alte is_premium-
|
||||
// Flag wird bei Admin-Upgrade nicht immer mitgezogen — daher
|
||||
// hier den Tier nehmen.
|
||||
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
|
||||
? `<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>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta name="color-scheme" content="light dark">
|
||||
<script src="/js/landing-init.js?v=1137"></script>
|
||||
<script src="/js/landing-init.js?v=1138"></script>
|
||||
<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="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
|
||||
const VER = '1137';
|
||||
const VER = '1138';
|
||||
const CACHE_VERSION = `by-v${VER}`;
|
||||
const CACHE_STATIC = `${CACHE_VERSION}-static`;
|
||||
const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue