Fix: Wetter-Chip ohne farbigen Rand, Update-Prüfung nutzt APP_VER+API+location.replace('/') (SW by-v769)
This commit is contained in:
parent
4a6c056742
commit
572fbf642f
6 changed files with 14 additions and 17 deletions
|
|
@ -327,7 +327,7 @@ MEDIA_DIR = os.getenv("MEDIA_DIR", "/data/media")
|
||||||
os.makedirs(MEDIA_DIR, exist_ok=True)
|
os.makedirs(MEDIA_DIR, exist_ok=True)
|
||||||
app.mount("/media", StaticFiles(directory=MEDIA_DIR), name="media")
|
app.mount("/media", StaticFiles(directory=MEDIA_DIR), name="media")
|
||||||
|
|
||||||
APP_VER = "768" # muss mit APP_VER in app.js übereinstimmen
|
APP_VER = "769" # muss mit APP_VER in app.js übereinstimmen
|
||||||
|
|
||||||
@app.get("/api/version")
|
@app.get("/api/version")
|
||||||
async def app_version():
|
async def app_version():
|
||||||
|
|
|
||||||
|
|
@ -578,7 +578,7 @@
|
||||||
<script src="/js/api.js?v=94"></script>
|
<script src="/js/api.js?v=94"></script>
|
||||||
<script src="/js/ui.js?v=94"></script>
|
<script src="/js/ui.js?v=94"></script>
|
||||||
<script src="/js/app.js?v=94"></script>
|
<script src="/js/app.js?v=94"></script>
|
||||||
<script src="/js/worlds.js?v=768"></script>
|
<script src="/js/worlds.js?v=769"></script>
|
||||||
|
|
||||||
<!-- Feature-Seiten werden lazy geladen -->
|
<!-- Feature-Seiten werden lazy geladen -->
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
Router, State-Management, Navigation, Initialisierung.
|
Router, State-Management, Navigation, Initialisierung.
|
||||||
============================================================ */
|
============================================================ */
|
||||||
|
|
||||||
const APP_VER = '768'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
|
const APP_VER = '769'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
|
||||||
const APP_VERSION = '1.5.0'; // ← semantische Version, wird bei make release gesetzt
|
const APP_VERSION = '1.5.0'; // ← semantische Version, wird bei make release gesetzt
|
||||||
const IS_STAGING = location.hostname === 'staging.banyaro.app';
|
const IS_STAGING = location.hostname === 'staging.banyaro.app';
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -753,27 +753,24 @@ window.Page_settings = (() => {
|
||||||
}
|
}
|
||||||
if (btn) btn.textContent = 'Prüfe…';
|
if (btn) btn.textContent = 'Prüfe…';
|
||||||
try {
|
try {
|
||||||
// Aktuelle Version vom Server holen (no-cache)
|
// Versionsnummer direkt vom API-Endpunkt holen
|
||||||
const serverResp = await fetch('/js/app.js', { cache: 'no-store' });
|
const r = await fetch('/api/version', { cache: 'no-store' });
|
||||||
const serverText = await serverResp.text();
|
const { version: serverVersion } = await r.json();
|
||||||
const match = serverText.match(/APP_VERSION\s*=\s*'([^']+)'/);
|
const localVersion = typeof APP_VER !== 'undefined' ? APP_VER : '0';
|
||||||
const serverVersion = match?.[1] || null;
|
|
||||||
const localVersion = typeof APP_VERSION !== 'undefined' ? APP_VERSION : '0';
|
|
||||||
|
|
||||||
// SW update anstoßen
|
|
||||||
const reg = await navigator.serviceWorker.getRegistration();
|
const reg = await navigator.serviceWorker.getRegistration();
|
||||||
await reg?.update();
|
reg?.update().catch(() => {}); // kein await — kann hängen
|
||||||
|
|
||||||
if (serverVersion && serverVersion !== localVersion) {
|
if (serverVersion && serverVersion !== localVersion) {
|
||||||
// Neuere Version verfügbar — Seite neu laden
|
|
||||||
if (reg?.waiting) reg.waiting.postMessage({ type: 'SKIP_WAITING' });
|
if (reg?.waiting) reg.waiting.postMessage({ type: 'SKIP_WAITING' });
|
||||||
UI.toast.info(`Update auf v${serverVersion} verfügbar — Seite wird neu geladen…`);
|
UI.toast.info(`Update auf v${serverVersion} — Seite wird neu geladen…`);
|
||||||
setTimeout(() => location.reload(), 1500);
|
setTimeout(() => location.replace('/'), 1500);
|
||||||
} else if (reg?.waiting) {
|
} else if (reg?.waiting) {
|
||||||
reg.waiting.postMessage({ type: 'SKIP_WAITING' });
|
reg.waiting.postMessage({ type: 'SKIP_WAITING' });
|
||||||
UI.toast.success('Update wird installiert…');
|
UI.toast.success('Update wird installiert…');
|
||||||
|
setTimeout(() => location.replace('/'), 1500);
|
||||||
} else {
|
} else {
|
||||||
UI.toast.success(`Ban Yaro ist aktuell — v${localVersion}`);
|
UI.toast.success(`Ban Yaro ist aktuell — Build ${localVersion}`);
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
UI.toast.error('Update-Prüfung fehlgeschlagen.');
|
UI.toast.error('Update-Prüfung fehlgeschlagen.');
|
||||||
|
|
|
||||||
|
|
@ -1096,7 +1096,7 @@ window.Worlds = (() => {
|
||||||
${alertHtml}
|
${alertHtml}
|
||||||
${user && dog ? `
|
${user && dog ? `
|
||||||
<div class="wj-chip-row">
|
<div class="wj-chip-row">
|
||||||
<div class="wj-chip" data-wnav="wetter" style="${gassiScore ? `border-color:${gassiColor}44;background:${gassiColor}12;` : ''}">
|
<div class="wj-chip" data-wnav="wetter">
|
||||||
<div style="display:flex;align-items:center;gap:6px;width:100%">
|
<div style="display:flex;align-items:center;gap:6px;width:100%">
|
||||||
<span style="font-size:1.4rem;line-height:1;flex-shrink:0">${weatherEmoji}</span>
|
<span style="font-size:1.4rem;line-height:1;flex-shrink:0">${weatherEmoji}</span>
|
||||||
<div style="flex:1;min-width:0">
|
<div style="flex:1;min-width:0">
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
Offline-Cache + Push Notifications + Tile-Cache
|
Offline-Cache + Push Notifications + Tile-Cache
|
||||||
============================================================ */
|
============================================================ */
|
||||||
|
|
||||||
const CACHE_VERSION = 'by-v768';
|
const CACHE_VERSION = 'by-v769';
|
||||||
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
|
||||||
const CACHE_API = 'ban-yaro-api-v1'; // API-Response-Cache
|
const CACHE_API = 'ban-yaro-api-v1'; // API-Response-Cache
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue