Compare commits
30 Commits
v1.4.23
...
b7c3aac921
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b7c3aac921 | ||
|
|
a902732d4b | ||
|
|
eaab21151a | ||
|
|
5af1f86700 | ||
|
|
90b503ddb7 | ||
|
|
10ffbd8c68 | ||
|
|
0294db7976 | ||
|
|
5a2c23524d | ||
|
|
d4a9d39d67 | ||
|
|
3c8d946a1e | ||
|
|
f71bcf1ac7 | ||
|
|
b041e9f318 | ||
|
|
984a897f73 | ||
|
|
ae54d97d96 | ||
|
|
6ed0831f5d | ||
|
|
ba75544f68 | ||
|
|
7fdf7f6f3e | ||
|
|
614f498d11 | ||
|
|
5f30696315 | ||
|
|
cb5aa28f94 | ||
|
|
bc1a91b7d7 | ||
|
|
7d5beedfbb | ||
|
|
0651d517b2 | ||
|
|
c5e236e095 | ||
|
|
a5bff19796 | ||
|
|
284f3d9a32 | ||
|
|
7ce82ce82e | ||
|
|
ce12684193 | ||
|
|
6cee38e99f | ||
|
|
88758427fd |
@@ -7,7 +7,7 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
|||||||
DIST_DIR="$SCRIPT_DIR/dist"
|
DIST_DIR="$SCRIPT_DIR/dist"
|
||||||
CSS_FILE="$SCRIPT_DIR/style.css"
|
CSS_FILE="$SCRIPT_DIR/style.css"
|
||||||
JS_FILE="$SCRIPT_DIR/kantine.js"
|
JS_FILE="$SCRIPT_DIR/kantine.js"
|
||||||
FAVICON_FILE="$SCRIPT_DIR/favicon.svg"
|
FAVICON_FILE="$SCRIPT_DIR/favicon.png"
|
||||||
|
|
||||||
# === VERSION ===
|
# === VERSION ===
|
||||||
if [ -f "$SCRIPT_DIR/version.txt" ]; then
|
if [ -f "$SCRIPT_DIR/version.txt" ]; then
|
||||||
@@ -24,16 +24,34 @@ echo "=== Kantine Bookmarklet Builder ($VERSION) ==="
|
|||||||
# Check files exist
|
# Check files exist
|
||||||
if [ ! -f "$CSS_FILE" ]; then echo "ERROR: $CSS_FILE not found"; exit 1; fi
|
if [ ! -f "$CSS_FILE" ]; then echo "ERROR: $CSS_FILE not found"; exit 1; fi
|
||||||
if [ ! -f "$JS_FILE" ]; then echo "ERROR: $JS_FILE not found"; exit 1; fi
|
if [ ! -f "$JS_FILE" ]; then echo "ERROR: $JS_FILE not found"; exit 1; fi
|
||||||
|
|
||||||
|
# Generate favicon.png from favicon_base.png if base exists
|
||||||
|
FAVICON_BASE="$SCRIPT_DIR/favicon_base.png"
|
||||||
|
if [ -f "$FAVICON_BASE" ]; then
|
||||||
|
echo "Generating 32x32 favicon.png from favicon_base.png..."
|
||||||
|
python3 -c "
|
||||||
|
import sys
|
||||||
|
from PIL import Image
|
||||||
|
try:
|
||||||
|
img = Image.open('$FAVICON_BASE')
|
||||||
|
img_resized = img.resize((32, 32), Image.Resampling.LANCZOS)
|
||||||
|
img_resized.save('$FAVICON_FILE')
|
||||||
|
except Exception as e:
|
||||||
|
print('Favicon generation error:', e)
|
||||||
|
sys.exit(1)
|
||||||
|
"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -f "$FAVICON_FILE" ]; then echo "ERROR: $FAVICON_FILE not found"; exit 1; fi
|
if [ ! -f "$FAVICON_FILE" ]; then echo "ERROR: $FAVICON_FILE not found"; exit 1; fi
|
||||||
|
|
||||||
# Generate favicon Base64 data URI
|
# Generate favicon Base64 data URI from PNG
|
||||||
FAVICON_B64=$(base64 -w0 "$FAVICON_FILE")
|
FAVICON_B64=$(base64 -w0 "$FAVICON_FILE")
|
||||||
FAVICON_URI="data:image/svg+xml;base64,${FAVICON_B64}"
|
FAVICON_URL="data:image/png;base64,${FAVICON_B64}"
|
||||||
|
|
||||||
CSS_CONTENT=$(cat "$CSS_FILE")
|
CSS_CONTENT=$(cat "$CSS_FILE")
|
||||||
|
|
||||||
# Inject version into JS
|
# Inject version and favicon into JS
|
||||||
JS_CONTENT=$(cat "$JS_FILE" | sed "s|{{VERSION}}|$VERSION|g")
|
JS_CONTENT=$(cat "$JS_FILE" | sed "s|{{VERSION}}|$VERSION|g" | sed "s|{{FAVICON_DATA_URI}}|$FAVICON_URL|g")
|
||||||
|
|
||||||
# === 1. Build standalone HTML (for local testing/dev) ===
|
# === 1. Build standalone HTML (for local testing/dev) ===
|
||||||
cat > "$DIST_DIR/kantine-standalone.html" << HTMLEOF
|
cat > "$DIST_DIR/kantine-standalone.html" << HTMLEOF
|
||||||
@@ -107,7 +125,7 @@ cat > "$DIST_DIR/install.html" << INSTALLEOF
|
|||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<title>Kantine Wrapper Installer ($VERSION)</title>
|
<title>Kantine Wrapper Installer ($VERSION)</title>
|
||||||
<link rel="icon" type="image/svg+xml" href="$FAVICON_URI">
|
<link rel="icon" type="image/png" href="$FAVICON_URL">
|
||||||
<style>
|
<style>
|
||||||
body { font-family: 'Inter', sans-serif; max-width: 600px; margin: 40px auto; padding: 20px; background: #1a1a2e; color: #eee; }
|
body { font-family: 'Inter', sans-serif; max-width: 600px; margin: 40px auto; padding: 20px; background: #1a1a2e; color: #eee; }
|
||||||
h1 { color: #029AA8; } /* Knapp Teal */
|
h1 { color: #029AA8; } /* Knapp Teal */
|
||||||
@@ -129,7 +147,11 @@ cat > "$DIST_DIR/install.html" << INSTALLEOF
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div style="text-align: center; margin-bottom: 30px;">
|
<div style="text-align: center; margin-bottom: 30px;">
|
||||||
<h1 style="margin-bottom: 5px;">🍽️ Kantine Wrapper <span style="font-size:0.5em; opacity:0.6; font-weight:400; vertical-align:middle; margin-left:10px;">$VERSION</span></h1>
|
<h1 style="margin-bottom: 5px; display: flex; align-items: center; justify-content: center; gap: 10px;">
|
||||||
|
<img src="$FAVICON_URL" alt="Logo" style="width: 38px; height: 38px;">
|
||||||
|
Kantine Wrapper
|
||||||
|
<span style="font-size:0.5em; opacity:0.6; font-weight:400; margin-left:5px;">$VERSION</span>
|
||||||
|
</h1>
|
||||||
<p style="font-size: 1.2rem; color: #a0aec0; margin-top: 0; font-style: italic;">"Mahlzeit! Jetzt bessa einfach."</p>
|
<p style="font-size: 1.2rem; color: #a0aec0; margin-top: 0; font-style: italic;">"Mahlzeit! Jetzt bessa einfach."</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -207,9 +229,9 @@ echo "document.getElementById('bookmarklet-link').href = " >> "$DIST_DIR/install
|
|||||||
echo "$JS_CONTENT" | python3 -c "
|
echo "$JS_CONTENT" | python3 -c "
|
||||||
import sys, json, urllib.parse
|
import sys, json, urllib.parse
|
||||||
|
|
||||||
# 1. Read JS and Replace VERSION
|
# 1. Read JS and Replace VERSION + Favicon
|
||||||
js_template = sys.stdin.read()
|
js_template = sys.stdin.read()
|
||||||
js = js_template.replace('{{VERSION}}', '$VERSION')
|
js = js_template.replace('{{VERSION}}', '$VERSION').replace('{{FAVICON_DATA_URI}}', '$FAVICON_URL')
|
||||||
|
|
||||||
# 2. Prepare CSS for injection via createElement('style')
|
# 2. Prepare CSS for injection via createElement('style')
|
||||||
css = open('$CSS_FILE').read().replace('\n', ' ').replace(' ', ' ')
|
css = open('$CSS_FILE').read().replace('\n', ' ').replace(' ', ' ')
|
||||||
@@ -243,6 +265,16 @@ $CHANGELOG_HTML
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat >> "$DIST_DIR/install.html" << INSTALLEOF
|
cat >> "$DIST_DIR/install.html" << INSTALLEOF
|
||||||
|
// Dynamic favicon injection — setTimeout ensures it runs AFTER
|
||||||
|
// htmlpreview.github.io's document.write() processing completes
|
||||||
|
setTimeout(function() {
|
||||||
|
document.querySelectorAll('link[rel*="icon"]').forEach(function(el) { el.remove(); });
|
||||||
|
var fi = document.createElement('link');
|
||||||
|
fi.rel = 'icon';
|
||||||
|
fi.type = 'image/png';
|
||||||
|
fi.href = '$FAVICON_URL';
|
||||||
|
document.head.appendChild(fi);
|
||||||
|
}, 0);
|
||||||
document.getElementById('bookmarklet-link').textContent = 'Kantine $VERSION';
|
document.getElementById('bookmarklet-link').textContent = 'Kantine $VERSION';
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
82
changelog.md
82
changelog.md
@@ -1,76 +1,16 @@
|
|||||||
## v1.4.23
|
## v1.5.0 (2026-02-26)
|
||||||
- 🐛 **Bugfix**: Favicon wird jetzt beim Ausführen des Bookmarklets in die Seite injiziert (ersetzt das Bessa-Favicon im Tab). Chrome cached das Icon und übernimmt es anschließend auch in die Lesezeichenleiste.
|
Das große "Quality of Life"-Update! Zusammenfassung aller Features und Fixes seit v1.4.0:
|
||||||
|
|
||||||
## v1.4.22
|
- ✨ **Bestellhistorie**: Übersichtliche Historie direkt in der App – gruppiert nach Jahr/Monat, inklusive Summen, Stati (Offen/Abgeschlossen/Storniert) und Delta-Cache für rasantes Laden.
|
||||||
- 📝 **Docs**: Vollständiger Dokumentations-Audit: README.md um fehlende Dateien (favicon.svg, release.sh, Tests) und Features (Bestellhistorie, Version-Menü, Cache leeren, Favicon) ergänzt. REQUIREMENTS.md: Doppelte IDs (FR-090/091) behoben, FR-092 an dynamische Glow-Logik angepasst, FR-116 (Cache leeren) und FR-117 (Favicon) hinzugefügt, NFR-008 um DOM-Tests erweitert.
|
- ⚡ **Smart Cache & Performance**: Massive Reduzierung von API-Calls und Ladezeiten durch intelligenten lokalen Cache. Das Bookmarklet startet nun praktisch verzögerungsfrei.
|
||||||
|
- 🔄 **GitHub Release Management**: In-App Versions-Menü mit Auto-Update Check (`🆕` Icon). Umschalten zwischen "Stable" und "Dev" Versionen sowie Downgrade-Möglichkeit direkt über die GitHub API.
|
||||||
|
- 🌟 **Smart Highlights & UX**: Speisen-Favoriten leuchten nun im Design-Violett und erhalten Feature-Badges. Der Bestell-Badge für nächste Woche filtert nun intelligent personalisierte Highlights voraus.
|
||||||
|
- 🔔 **Bestell-Warnung & Notifications**: Der System-Alarm berücksichtigt nun Sessions korrekt, zeigt dynamische Farbwechsel (gelb/grün/rot) und warnt verlässlich vor dem Bestellschluss (10:00 Uhr). Altlasten von Vortagen werden automatisch geputzt.
|
||||||
|
- 🎨 **Eigenes Favicon**: Das Bookmarklet und der Installer haben nun ein eigenes Icon (Dreieck mit Besteck), das beim Hineinziehen in die Lesezeichenleiste übernommen wird (dynamisch generiert als lokales PNG).
|
||||||
|
- 🧹 **Lokaler Cache-Clear**: Ein in das Versions-Menü eingebauter "Papierkorb", der ausschließlich fehlerhafte Kantinen-Caches putzt, ohne dabei versehentlich die aktive Bessa-Host-Session zu zerstören.
|
||||||
|
- 🔒 **Sitzungs-Persistenz**: Die Login-Session überdauert jetzt neue Tabs, Fenster und Version-Upgrades reibungslos durch den Wechsel auf `localStorage`.
|
||||||
|
- 🛡️ **Testing & Stabilität**: Vollautomatische DOM- und Logik-Testing-Suites in der Release-Pipeline integriert. Fehlerhafte UI-Buttons gehören der Vergangenheit an.
|
||||||
|
|
||||||
## v1.4.21
|
|
||||||
- ✨ **UX**: Der Glow-Effekt des „Nächste Woche"-Buttons bleibt nun aktiv, solange Menüdaten vorhanden aber noch keine Bestellungen getätigt wurden. Verschwindet automatisch nach der ersten Bestellung.
|
|
||||||
|
|
||||||
## v1.4.20
|
|
||||||
- 🐛 **Bugfix**: Der Badge-Counter im „Nächste Woche"-Tab wird jetzt sofort nach einer Bestellung oder Stornierung aktualisiert.
|
|
||||||
|
|
||||||
## v1.4.19
|
|
||||||
- 🎨 **Feature**: Eigenes Favicon für die Installer-Seite hinzugefügt (Dreieck + Gabel & Messer). Wird beim Drag & Drop in die Lesezeichenleiste als Icon übernommen.
|
|
||||||
|
|
||||||
## v1.4.18
|
|
||||||
- 🧪 **Testing**: Die automatische DOM-Testing Suite (`test_dom.js`) wurde massiv ausgebaut. Sie prüft nun neben der Alarmglocke und den Highlights auch systematisch alle anderen UI-Komponenten (Login-Modal, History-Modal, Versionen-Modal, Theme-Toggle, und Navigation Tabs) auf korrekte Event-Listener-Bindungen, um Regressionen (tote Buttons) endgültig auszuschließen.
|
|
||||||
|
|
||||||
## v1.4.17
|
|
||||||
- 🐛 **Bugfix**: Regression behoben: Der "Persönliche Highlights" (Stern-Button) Dialog öffnet sich nun wieder korrekt.
|
|
||||||
- 🧪 **Testing**: Es wurde ein initialer UI-Testing-Hook (`test_dom.js` mit `jsdom`) in die Build-Pipeline integriert, um kritische DOM Event-Listener Regressionen (wie den Highlights-Button und die Alarmglocke) automatisch zu preventen.
|
|
||||||
|
|
||||||
## v1.4.16
|
|
||||||
- ⚡ **Feature**: Ein Button "Lokalen Cache leeren" wurde zum Versionen-Menü hinzugefügt, um bei hartnäckigen lokalen Fehlern alle Caches und Sessions bereinigen zu können, ohne die Entwicklertools (F12) des Browsers bemühen zu müssen.
|
|
||||||
|
|
||||||
## v1.4.15
|
|
||||||
- 🧹 **Bugfix**: In der Vergangenheit gesetzte Alarme/Flags wurden nicht zuverlässig gelöscht. Dies ist nun behoben, sodass verfallene Menüs nach 10:00 Uhr bzw. an vergangenen Tagen automatisch aus dem Tracker verschwinden.
|
|
||||||
|
|
||||||
## v1.4.14
|
|
||||||
- 🐛 **Bugfix**: Alarmglocke versteckt sich jetzt zuverlässig auch auf Endgeräten mit CSS Konflikten
|
|
||||||
- 🚀 **Feature**: Sofortige API-Aktualisierung (Refresh) bei Aktivierung eines Menüalarms
|
|
||||||
- ⚡ **Optimierung**: "Unbekannt" im letzten Refresh-Zeitpunkt wird abgefangen und zeigt initial "gerade eben"
|
|
||||||
|
|
||||||
## v1.4.13 (2026-02-24)
|
|
||||||
- **Fix**: Die Farben der Glocke funktionieren nun verlässlich, da CSS-Variablen durch direkte Hex-Codes ersetzt wurden.
|
|
||||||
|
|
||||||
## v1.4.12 (2026-02-24)
|
|
||||||
- **Fix**: Das Glocken-Icon sollte nun endgültig versteckt bleiben, wenn keine Benachrichtigungen aktiv sind (CSS-Kollision mit `.hidden` behoben).
|
|
||||||
|
|
||||||
## v1.4.11 (2026-02-24)
|
|
||||||
- **Feature**: Das Versionsmenü prüft nun im Hintergrund direkt beim Öffnen nach neuen Versionen und aktualisiert die Liste automatisch, selbst wenn eine veraltete Liste noch im Cache liegt.
|
|
||||||
|
|
||||||
## v1.4.10 (2026-02-24)
|
|
||||||
- **Fix**: Die Farben der Benachrichtigungs-Glocke wurden korrigiert: Sie ist nun gelb, während man auf ein Menü wartet, und wird grün, sobald eines verfügbar ist.
|
|
||||||
|
|
||||||
## v1.4.9 (2026-02-24)
|
|
||||||
- **Fix**: Das Glocken-Icon für Benachrichtigungen wird nun direkt beim Start (wenn Daten aus dem lokalen Cache geladen werden) korrekt angezeigt.
|
|
||||||
|
|
||||||
## v1.4.8 (2026-02-24)
|
|
||||||
- **Fix**: Die Benachrichtigungs-Glocke wird nun korrekt in Gelb dargestellt, wenn beobachtete Menüs verfügbar sind.
|
|
||||||
- **Tools**: Fehler in Testskript behoben, der den CI/CD Build verlangsamt hat.
|
|
||||||
|
|
||||||
## v1.4.7 (2026-02-24)
|
|
||||||
- **Performance**: Die Bestellhistorie nutzt nun einen inkrementellen Delta-Cache anstatt immer alle Seiten von der API herunterzuladen, was die Ladezeiten für Vielbesteller enorm reduziert.
|
|
||||||
|
|
||||||
## v1.4.6 (2026-02-24)
|
|
||||||
- **Fix**: Die Umrandung für bereits bestellte Menüs der vergangenen Tage ist nun ebenfalls einheitlich violett statt blau.
|
|
||||||
|
|
||||||
## v1.4.5 (2026-02-24)
|
|
||||||
- **Fix**: Doppelten Scrollbalken in der Versionen-Liste entfernt.
|
|
||||||
|
|
||||||
## v1.4.4 (2026-02-24)
|
|
||||||
- **Feature**: Das Versionsmenü enthält nun direkte Links zu GitHub, um Fehler zu melden oder neue Features vorzuschlagen.
|
|
||||||
|
|
||||||
## v1.4.3 (2026-02-24)
|
|
||||||
- **Fix**: Der Rahmen des "Heute Bestellt" Menüs ist nun konsequent violett (passend zum Glow-Effekt).
|
|
||||||
|
|
||||||
## v1.4.2 (2026-02-23)
|
|
||||||
- **Fix**: Das "Heute Bestellt" Menü leuchtet nun stimmig im Design-Violett statt Blau.
|
|
||||||
- **Fix**: Abfangen des GitHub API Rate Limit (403) im Versionsdialog mit einer freundlicheren Fehlermeldung, da der User-Agent im Browser nicht manuell gesetzt werden darf.
|
|
||||||
|
|
||||||
## v1.4.1 (2026-02-22)
|
|
||||||
- **UX Verbesserungen**: Bestellhistorie gruppiert nach Jahren und Monaten mittels einklappbarem Akkordeon. Monatssummen integriert und Stati farblich abgehoben (Offen, Abgeschlossen, Storniert).
|
|
||||||
|
|
||||||
## v1.4.0 (2026-02-22)
|
## v1.4.0 (2026-02-22)
|
||||||
- **Feature**: Bestellhistorie per Knopfdruck abrufbar. Übersichtliche Darstellung, gruppiert nach Monaten und Kalenderwochen, inklusive Stornos. 📜✨
|
- **Feature**: Bestellhistorie per Knopfdruck abrufbar. Übersichtliche Darstellung, gruppiert nach Monaten und Kalenderwochen, inklusive Stornos. 📜✨
|
||||||
|
|||||||
2
dist/bookmarklet-payload.js
vendored
2
dist/bookmarklet-payload.js
vendored
File diff suppressed because one or more lines are too long
2
dist/bookmarklet.txt
vendored
2
dist/bookmarklet.txt
vendored
File diff suppressed because one or more lines are too long
135
dist/install.html
vendored
135
dist/install.html
vendored
File diff suppressed because one or more lines are too long
66
dist/kantine-standalone.html
vendored
66
dist/kantine-standalone.html
vendored
@@ -1979,8 +1979,8 @@ body {
|
|||||||
let currentWeekNumber = getISOWeek(new Date());
|
let currentWeekNumber = getISOWeek(new Date());
|
||||||
let currentYear = new Date().getFullYear();
|
let currentYear = new Date().getFullYear();
|
||||||
let displayMode = 'this-week';
|
let displayMode = 'this-week';
|
||||||
let authToken = sessionStorage.getItem('kantine_authToken');
|
let authToken = localStorage.getItem('kantine_authToken');
|
||||||
let currentUser = sessionStorage.getItem('kantine_currentUser');
|
let currentUser = localStorage.getItem('kantine_currentUser');
|
||||||
let orderMap = new Map();
|
let orderMap = new Map();
|
||||||
let userFlags = new Set(JSON.parse(localStorage.getItem('kantine_flags') || '[]'));
|
let userFlags = new Set(JSON.parse(localStorage.getItem('kantine_flags') || '[]'));
|
||||||
let pollIntervalId = null;
|
let pollIntervalId = null;
|
||||||
@@ -2000,14 +2000,14 @@ body {
|
|||||||
// Replace entire page content
|
// Replace entire page content
|
||||||
document.title = 'Kantine Weekly Menu';
|
document.title = 'Kantine Weekly Menu';
|
||||||
|
|
||||||
// Inject custom favicon (triangle + fork & knife)
|
// Inject custom favicon (triangle + fork & knife PNG)
|
||||||
if (document.querySelectorAll) {
|
if (document.querySelectorAll) {
|
||||||
document.querySelectorAll('link[rel*="icon"]').forEach(el => el.remove());
|
document.querySelectorAll('link[rel*="icon"]').forEach(el => el.remove());
|
||||||
}
|
}
|
||||||
const favicon = document.createElement('link');
|
const favicon = document.createElement('link');
|
||||||
favicon.rel = 'icon';
|
favicon.rel = 'icon';
|
||||||
favicon.type = 'image/svg+xml';
|
favicon.type = 'image/png';
|
||||||
favicon.href = 'data:image/svg+xml,' + encodeURIComponent('<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><g transform="translate(2,10)"><rect x="1" y="0" width="1.8" height="16" rx=".9" fill="%23333"/><rect x="4.6" y="0" width="1.8" height="16" rx=".9" fill="%23333"/><rect x="8.2" y="0" width="1.8" height="16" rx=".9" fill="%23333"/><rect x="1" y="14" width="9" height="3.5" rx="1.5" fill="%23333"/><rect x="3.5" y="16.5" width="4" height="24" rx="2" fill="%23333"/></g><polygon points="32,8 47,48 17,48" fill="none" stroke="%23333" stroke-width="4" stroke-linejoin="round"/><g transform="translate(50,10)"><path d="M3,0C3,0,3,0,3,0L3,17L10,14C10,6,7,0,3,0Z" fill="%23333"/><rect x="1.5" y="0" width="2" height="18" rx="1" fill="%23333"/><rect x="1.5" y="16.5" width="8.5" height="3.5" rx="1.2" fill="%23333"/><rect x="3.5" y="19" width="4" height="22" rx="2" fill="%23333"/></g></svg>');
|
favicon.href = 'data:image/png;base64,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';
|
||||||
document.head.appendChild(favicon);
|
document.head.appendChild(favicon);
|
||||||
|
|
||||||
// Inject Google Fonts if not already present
|
// Inject Google Fonts if not already present
|
||||||
@@ -2031,7 +2031,7 @@ body {
|
|||||||
<div class="brand">
|
<div class="brand">
|
||||||
<span class="material-icons-round logo-icon">restaurant_menu</span>
|
<span class="material-icons-round logo-icon">restaurant_menu</span>
|
||||||
<div class="header-left">
|
<div class="header-left">
|
||||||
<h1>Kantinen Übersicht <small class="version-tag" style="font-size: 0.6em; opacity: 0.7; font-weight: 400; cursor: pointer;" title="Klick für Versionsmenü">v1.4.23</small></h1>
|
<h1>Kantinen Übersicht <small class="version-tag" style="font-size: 0.6em; opacity: 0.7; font-weight: 400; cursor: pointer;" title="Klick für Versionsmenü">v1.5.0</small></h1>
|
||||||
<div id="last-updated-subtitle" class="subtitle"></div>
|
<div id="last-updated-subtitle" class="subtitle"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="nav-group" style="margin-left: 1rem;">
|
<div class="nav-group" style="margin-left: 1rem;">
|
||||||
@@ -2173,7 +2173,7 @@ body {
|
|||||||
</div>
|
</div>
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<div style="margin-bottom: 1rem;">
|
<div style="margin-bottom: 1rem;">
|
||||||
<strong>Aktuell:</strong> <span id="version-current">v1.4.23</span>
|
<strong>Aktuell:</strong> <span id="version-current">v1.5.0</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="dev-toggle">
|
<div class="dev-toggle">
|
||||||
<label style="display:flex;align-items:center;gap:8px;cursor:pointer;">
|
<label style="display:flex;align-items:center;gap:8px;cursor:pointer;">
|
||||||
@@ -2294,8 +2294,12 @@ body {
|
|||||||
if (btnClearCache) {
|
if (btnClearCache) {
|
||||||
btnClearCache.addEventListener('click', () => {
|
btnClearCache.addEventListener('click', () => {
|
||||||
if (confirm('Möchtest du wirklich alle lokalen Daten (inkl. Login-Session, Cache und Einstellungen) löschen? Die Seite wird danach neu geladen.')) {
|
if (confirm('Möchtest du wirklich alle lokalen Daten (inkl. Login-Session, Cache und Einstellungen) löschen? Die Seite wird danach neu geladen.')) {
|
||||||
localStorage.clear();
|
// Only clear our own keys so we don't destroy the host app's (Bessa's) session
|
||||||
sessionStorage.clear();
|
Object.keys(localStorage).forEach(key => {
|
||||||
|
if (key.startsWith('kantine_')) {
|
||||||
|
localStorage.removeItem(key);
|
||||||
|
}
|
||||||
|
});
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -2409,8 +2413,8 @@ body {
|
|||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
authToken = data.key;
|
authToken = data.key;
|
||||||
currentUser = employeeId;
|
currentUser = employeeId;
|
||||||
sessionStorage.setItem('kantine_authToken', data.key);
|
localStorage.setItem('kantine_authToken', data.key);
|
||||||
sessionStorage.setItem('kantine_currentUser', employeeId);
|
localStorage.setItem('kantine_currentUser', employeeId);
|
||||||
|
|
||||||
// Fetch user name
|
// Fetch user name
|
||||||
try {
|
try {
|
||||||
@@ -2419,8 +2423,8 @@ body {
|
|||||||
});
|
});
|
||||||
if (userResp.ok) {
|
if (userResp.ok) {
|
||||||
const userData = await userResp.json();
|
const userData = await userResp.json();
|
||||||
if (userData.first_name) sessionStorage.setItem('kantine_firstName', userData.first_name);
|
if (userData.first_name) localStorage.setItem('kantine_firstName', userData.first_name);
|
||||||
if (userData.last_name) sessionStorage.setItem('kantine_lastName', userData.last_name);
|
if (userData.last_name) localStorage.setItem('kantine_lastName', userData.last_name);
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Failed to fetch user info:', err);
|
console.error('Failed to fetch user info:', err);
|
||||||
@@ -2450,10 +2454,10 @@ body {
|
|||||||
|
|
||||||
// Logout
|
// Logout
|
||||||
btnLogout.addEventListener('click', () => {
|
btnLogout.addEventListener('click', () => {
|
||||||
sessionStorage.removeItem('kantine_authToken');
|
localStorage.removeItem('kantine_authToken');
|
||||||
sessionStorage.removeItem('kantine_currentUser');
|
localStorage.removeItem('kantine_currentUser');
|
||||||
sessionStorage.removeItem('kantine_firstName');
|
localStorage.removeItem('kantine_firstName');
|
||||||
sessionStorage.removeItem('kantine_lastName');
|
localStorage.removeItem('kantine_lastName');
|
||||||
authToken = null;
|
authToken = null;
|
||||||
currentUser = null;
|
currentUser = null;
|
||||||
orderMap = new Map();
|
orderMap = new Map();
|
||||||
@@ -2474,13 +2478,13 @@ body {
|
|||||||
if (parsed.auth && parsed.auth.token) {
|
if (parsed.auth && parsed.auth.token) {
|
||||||
console.log('Found existing Bessa session!');
|
console.log('Found existing Bessa session!');
|
||||||
authToken = parsed.auth.token;
|
authToken = parsed.auth.token;
|
||||||
sessionStorage.setItem('kantine_authToken', authToken);
|
localStorage.setItem('kantine_authToken', authToken);
|
||||||
|
|
||||||
if (parsed.auth.user) {
|
if (parsed.auth.user) {
|
||||||
currentUser = parsed.auth.user.id || 'unknown';
|
currentUser = parsed.auth.user.id || 'unknown';
|
||||||
sessionStorage.setItem('kantine_currentUser', currentUser);
|
localStorage.setItem('kantine_currentUser', currentUser);
|
||||||
if (parsed.auth.user.firstName) sessionStorage.setItem('kantine_firstName', parsed.auth.user.firstName);
|
if (parsed.auth.user.firstName) localStorage.setItem('kantine_firstName', parsed.auth.user.firstName);
|
||||||
if (parsed.auth.user.lastName) sessionStorage.setItem('kantine_lastName', parsed.auth.user.lastName);
|
if (parsed.auth.user.lastName) localStorage.setItem('kantine_lastName', parsed.auth.user.lastName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2489,9 +2493,9 @@ body {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
authToken = sessionStorage.getItem('kantine_authToken');
|
authToken = localStorage.getItem('kantine_authToken');
|
||||||
currentUser = sessionStorage.getItem('kantine_currentUser');
|
currentUser = localStorage.getItem('kantine_currentUser');
|
||||||
const firstName = sessionStorage.getItem('kantine_firstName');
|
const firstName = localStorage.getItem('kantine_firstName');
|
||||||
const btnLoginOpen = document.getElementById('btn-login-open');
|
const btnLoginOpen = document.getElementById('btn-login-open');
|
||||||
const userInfo = document.getElementById('user-info');
|
const userInfo = document.getElementById('user-info');
|
||||||
const userIdDisplay = document.getElementById('user-id-display');
|
const userIdDisplay = document.getElementById('user-id-display');
|
||||||
@@ -4026,7 +4030,7 @@ body {
|
|||||||
|
|
||||||
// Periodic update check (runs on init + every hour)
|
// Periodic update check (runs on init + every hour)
|
||||||
async function checkForUpdates() {
|
async function checkForUpdates() {
|
||||||
const currentVersion = 'v1.4.23';
|
const currentVersion = 'v1.5.0';
|
||||||
const devMode = localStorage.getItem('kantine_dev_mode') === 'true';
|
const devMode = localStorage.getItem('kantine_dev_mode') === 'true';
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -4067,7 +4071,7 @@ body {
|
|||||||
const modal = document.getElementById('version-modal');
|
const modal = document.getElementById('version-modal');
|
||||||
const container = document.getElementById('version-list-container');
|
const container = document.getElementById('version-list-container');
|
||||||
const devToggle = document.getElementById('dev-mode-toggle');
|
const devToggle = document.getElementById('dev-mode-toggle');
|
||||||
const currentVersion = 'v1.4.23';
|
const currentVersion = 'v1.5.0';
|
||||||
|
|
||||||
if (!modal) return;
|
if (!modal) return;
|
||||||
modal.classList.remove('hidden');
|
modal.classList.remove('hidden');
|
||||||
@@ -4164,6 +4168,12 @@ body {
|
|||||||
|
|
||||||
// === Order Countdown ===
|
// === Order Countdown ===
|
||||||
function updateCountdown() {
|
function updateCountdown() {
|
||||||
|
// Only show order alarms for logged-in users
|
||||||
|
if (!authToken || !currentUser) {
|
||||||
|
removeCountdown();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const currentDay = now.getDay();
|
const currentDay = now.getDay();
|
||||||
// Skip weekends (0=Sun, 6=Sat)
|
// Skip weekends (0=Sun, 6=Sat)
|
||||||
@@ -4228,7 +4238,7 @@ body {
|
|||||||
|
|
||||||
// Notification logic (One time)
|
// Notification logic (One time)
|
||||||
const notifiedKey = `kantine_notified_${todayStr}`;
|
const notifiedKey = `kantine_notified_${todayStr}`;
|
||||||
if (!sessionStorage.getItem(notifiedKey)) {
|
if (!localStorage.getItem(notifiedKey)) {
|
||||||
if (Notification.permission === 'granted') {
|
if (Notification.permission === 'granted') {
|
||||||
new Notification('Kantine: Bestellschluss naht!', {
|
new Notification('Kantine: Bestellschluss naht!', {
|
||||||
body: 'Du hast heute noch nichts bestellt. Nur noch 1 Stunde!',
|
body: 'Du hast heute noch nichts bestellt. Nur noch 1 Stunde!',
|
||||||
@@ -4237,7 +4247,7 @@ body {
|
|||||||
} else if (Notification.permission === 'default') {
|
} else if (Notification.permission === 'default') {
|
||||||
Notification.requestPermission();
|
Notification.requestPermission();
|
||||||
}
|
}
|
||||||
sessionStorage.setItem(notifiedKey, 'true');
|
localStorage.setItem(notifiedKey, 'true');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
countdownEl.classList.remove('urgent');
|
countdownEl.classList.remove('urgent');
|
||||||
|
|||||||
BIN
favicon.png
Executable file
BIN
favicon.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
BIN
favicon_base.png
Executable file
BIN
favicon_base.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 3.9 MiB |
58
kantine.js
58
kantine.js
@@ -29,8 +29,8 @@
|
|||||||
let currentWeekNumber = getISOWeek(new Date());
|
let currentWeekNumber = getISOWeek(new Date());
|
||||||
let currentYear = new Date().getFullYear();
|
let currentYear = new Date().getFullYear();
|
||||||
let displayMode = 'this-week';
|
let displayMode = 'this-week';
|
||||||
let authToken = sessionStorage.getItem('kantine_authToken');
|
let authToken = localStorage.getItem('kantine_authToken');
|
||||||
let currentUser = sessionStorage.getItem('kantine_currentUser');
|
let currentUser = localStorage.getItem('kantine_currentUser');
|
||||||
let orderMap = new Map();
|
let orderMap = new Map();
|
||||||
let userFlags = new Set(JSON.parse(localStorage.getItem('kantine_flags') || '[]'));
|
let userFlags = new Set(JSON.parse(localStorage.getItem('kantine_flags') || '[]'));
|
||||||
let pollIntervalId = null;
|
let pollIntervalId = null;
|
||||||
@@ -50,14 +50,14 @@
|
|||||||
// Replace entire page content
|
// Replace entire page content
|
||||||
document.title = 'Kantine Weekly Menu';
|
document.title = 'Kantine Weekly Menu';
|
||||||
|
|
||||||
// Inject custom favicon (triangle + fork & knife)
|
// Inject custom favicon (triangle + fork & knife PNG)
|
||||||
if (document.querySelectorAll) {
|
if (document.querySelectorAll) {
|
||||||
document.querySelectorAll('link[rel*="icon"]').forEach(el => el.remove());
|
document.querySelectorAll('link[rel*="icon"]').forEach(el => el.remove());
|
||||||
}
|
}
|
||||||
const favicon = document.createElement('link');
|
const favicon = document.createElement('link');
|
||||||
favicon.rel = 'icon';
|
favicon.rel = 'icon';
|
||||||
favicon.type = 'image/svg+xml';
|
favicon.type = 'image/png';
|
||||||
favicon.href = 'data:image/svg+xml,' + encodeURIComponent('<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64"><g transform="translate(2,10)"><rect x="1" y="0" width="1.8" height="16" rx=".9" fill="%23333"/><rect x="4.6" y="0" width="1.8" height="16" rx=".9" fill="%23333"/><rect x="8.2" y="0" width="1.8" height="16" rx=".9" fill="%23333"/><rect x="1" y="14" width="9" height="3.5" rx="1.5" fill="%23333"/><rect x="3.5" y="16.5" width="4" height="24" rx="2" fill="%23333"/></g><polygon points="32,8 47,48 17,48" fill="none" stroke="%23333" stroke-width="4" stroke-linejoin="round"/><g transform="translate(50,10)"><path d="M3,0C3,0,3,0,3,0L3,17L10,14C10,6,7,0,3,0Z" fill="%23333"/><rect x="1.5" y="0" width="2" height="18" rx="1" fill="%23333"/><rect x="1.5" y="16.5" width="8.5" height="3.5" rx="1.2" fill="%23333"/><rect x="3.5" y="19" width="4" height="22" rx="2" fill="%23333"/></g></svg>');
|
favicon.href = '{{FAVICON_DATA_URI}}';
|
||||||
document.head.appendChild(favicon);
|
document.head.appendChild(favicon);
|
||||||
|
|
||||||
// Inject Google Fonts if not already present
|
// Inject Google Fonts if not already present
|
||||||
@@ -344,8 +344,12 @@
|
|||||||
if (btnClearCache) {
|
if (btnClearCache) {
|
||||||
btnClearCache.addEventListener('click', () => {
|
btnClearCache.addEventListener('click', () => {
|
||||||
if (confirm('Möchtest du wirklich alle lokalen Daten (inkl. Login-Session, Cache und Einstellungen) löschen? Die Seite wird danach neu geladen.')) {
|
if (confirm('Möchtest du wirklich alle lokalen Daten (inkl. Login-Session, Cache und Einstellungen) löschen? Die Seite wird danach neu geladen.')) {
|
||||||
localStorage.clear();
|
// Only clear our own keys so we don't destroy the host app's (Bessa's) session
|
||||||
sessionStorage.clear();
|
Object.keys(localStorage).forEach(key => {
|
||||||
|
if (key.startsWith('kantine_')) {
|
||||||
|
localStorage.removeItem(key);
|
||||||
|
}
|
||||||
|
});
|
||||||
window.location.reload();
|
window.location.reload();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -459,8 +463,8 @@
|
|||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
authToken = data.key;
|
authToken = data.key;
|
||||||
currentUser = employeeId;
|
currentUser = employeeId;
|
||||||
sessionStorage.setItem('kantine_authToken', data.key);
|
localStorage.setItem('kantine_authToken', data.key);
|
||||||
sessionStorage.setItem('kantine_currentUser', employeeId);
|
localStorage.setItem('kantine_currentUser', employeeId);
|
||||||
|
|
||||||
// Fetch user name
|
// Fetch user name
|
||||||
try {
|
try {
|
||||||
@@ -469,8 +473,8 @@
|
|||||||
});
|
});
|
||||||
if (userResp.ok) {
|
if (userResp.ok) {
|
||||||
const userData = await userResp.json();
|
const userData = await userResp.json();
|
||||||
if (userData.first_name) sessionStorage.setItem('kantine_firstName', userData.first_name);
|
if (userData.first_name) localStorage.setItem('kantine_firstName', userData.first_name);
|
||||||
if (userData.last_name) sessionStorage.setItem('kantine_lastName', userData.last_name);
|
if (userData.last_name) localStorage.setItem('kantine_lastName', userData.last_name);
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Failed to fetch user info:', err);
|
console.error('Failed to fetch user info:', err);
|
||||||
@@ -500,10 +504,10 @@
|
|||||||
|
|
||||||
// Logout
|
// Logout
|
||||||
btnLogout.addEventListener('click', () => {
|
btnLogout.addEventListener('click', () => {
|
||||||
sessionStorage.removeItem('kantine_authToken');
|
localStorage.removeItem('kantine_authToken');
|
||||||
sessionStorage.removeItem('kantine_currentUser');
|
localStorage.removeItem('kantine_currentUser');
|
||||||
sessionStorage.removeItem('kantine_firstName');
|
localStorage.removeItem('kantine_firstName');
|
||||||
sessionStorage.removeItem('kantine_lastName');
|
localStorage.removeItem('kantine_lastName');
|
||||||
authToken = null;
|
authToken = null;
|
||||||
currentUser = null;
|
currentUser = null;
|
||||||
orderMap = new Map();
|
orderMap = new Map();
|
||||||
@@ -524,13 +528,13 @@
|
|||||||
if (parsed.auth && parsed.auth.token) {
|
if (parsed.auth && parsed.auth.token) {
|
||||||
console.log('Found existing Bessa session!');
|
console.log('Found existing Bessa session!');
|
||||||
authToken = parsed.auth.token;
|
authToken = parsed.auth.token;
|
||||||
sessionStorage.setItem('kantine_authToken', authToken);
|
localStorage.setItem('kantine_authToken', authToken);
|
||||||
|
|
||||||
if (parsed.auth.user) {
|
if (parsed.auth.user) {
|
||||||
currentUser = parsed.auth.user.id || 'unknown';
|
currentUser = parsed.auth.user.id || 'unknown';
|
||||||
sessionStorage.setItem('kantine_currentUser', currentUser);
|
localStorage.setItem('kantine_currentUser', currentUser);
|
||||||
if (parsed.auth.user.firstName) sessionStorage.setItem('kantine_firstName', parsed.auth.user.firstName);
|
if (parsed.auth.user.firstName) localStorage.setItem('kantine_firstName', parsed.auth.user.firstName);
|
||||||
if (parsed.auth.user.lastName) sessionStorage.setItem('kantine_lastName', parsed.auth.user.lastName);
|
if (parsed.auth.user.lastName) localStorage.setItem('kantine_lastName', parsed.auth.user.lastName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -539,9 +543,9 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
authToken = sessionStorage.getItem('kantine_authToken');
|
authToken = localStorage.getItem('kantine_authToken');
|
||||||
currentUser = sessionStorage.getItem('kantine_currentUser');
|
currentUser = localStorage.getItem('kantine_currentUser');
|
||||||
const firstName = sessionStorage.getItem('kantine_firstName');
|
const firstName = localStorage.getItem('kantine_firstName');
|
||||||
const btnLoginOpen = document.getElementById('btn-login-open');
|
const btnLoginOpen = document.getElementById('btn-login-open');
|
||||||
const userInfo = document.getElementById('user-info');
|
const userInfo = document.getElementById('user-info');
|
||||||
const userIdDisplay = document.getElementById('user-id-display');
|
const userIdDisplay = document.getElementById('user-id-display');
|
||||||
@@ -2214,6 +2218,12 @@
|
|||||||
|
|
||||||
// === Order Countdown ===
|
// === Order Countdown ===
|
||||||
function updateCountdown() {
|
function updateCountdown() {
|
||||||
|
// Only show order alarms for logged-in users
|
||||||
|
if (!authToken || !currentUser) {
|
||||||
|
removeCountdown();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const currentDay = now.getDay();
|
const currentDay = now.getDay();
|
||||||
// Skip weekends (0=Sun, 6=Sat)
|
// Skip weekends (0=Sun, 6=Sat)
|
||||||
@@ -2278,7 +2288,7 @@
|
|||||||
|
|
||||||
// Notification logic (One time)
|
// Notification logic (One time)
|
||||||
const notifiedKey = `kantine_notified_${todayStr}`;
|
const notifiedKey = `kantine_notified_${todayStr}`;
|
||||||
if (!sessionStorage.getItem(notifiedKey)) {
|
if (!localStorage.getItem(notifiedKey)) {
|
||||||
if (Notification.permission === 'granted') {
|
if (Notification.permission === 'granted') {
|
||||||
new Notification('Kantine: Bestellschluss naht!', {
|
new Notification('Kantine: Bestellschluss naht!', {
|
||||||
body: 'Du hast heute noch nichts bestellt. Nur noch 1 Stunde!',
|
body: 'Du hast heute noch nichts bestellt. Nur noch 1 Stunde!',
|
||||||
@@ -2287,7 +2297,7 @@
|
|||||||
} else if (Notification.permission === 'default') {
|
} else if (Notification.permission === 'default') {
|
||||||
Notification.requestPermission();
|
Notification.requestPermission();
|
||||||
}
|
}
|
||||||
sessionStorage.setItem(notifiedKey, 'true');
|
localStorage.setItem(notifiedKey, 'true');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
countdownEl.classList.remove('urgent');
|
countdownEl.classList.remove('urgent');
|
||||||
|
|||||||
@@ -49,8 +49,9 @@ echo "=== Pushing to remotes ==="
|
|||||||
git push origin HEAD
|
git push origin HEAD
|
||||||
git push origin --force tag "$VERSION"
|
git push origin --force tag "$VERSION"
|
||||||
|
|
||||||
# If a remote named 'github' exists, push tags there too
|
# If a remote named 'github' exists, push branch and tags there too
|
||||||
if git remote | grep -q "^github$"; then
|
if git remote | grep -q "^github$"; then
|
||||||
|
git push github HEAD
|
||||||
git push github --force tag "$VERSION"
|
git push github --force tag "$VERSION"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
v1.4.23
|
v1.5.0
|
||||||
|
|||||||
Reference in New Issue
Block a user