Compare commits
57 Commits
v1.4.12
...
67533875bd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
67533875bd | ||
|
|
99809dafb7 | ||
|
|
4cf3e4adc2 | ||
|
|
4fe7950697 | ||
|
|
e162a16550 | ||
|
|
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 | ||
|
|
23ed867ac4 | ||
|
|
f8b1334a9a | ||
|
|
6b1bd46210 | ||
|
|
a429148324 | ||
|
|
5caaf7dcad | ||
|
|
122c1078cf | ||
|
|
ff48befb8a | ||
|
|
9391dfd8d7 | ||
|
|
467e48e1da | ||
|
|
566410eea5 | ||
|
|
37afc2957b | ||
|
|
b1763135aa | ||
|
|
98020f0b8f | ||
|
|
c2e3282131 | ||
|
|
7a82cb06db | ||
|
|
d89b080da5 | ||
|
|
d80863a169 | ||
|
|
ae79c58d30 | ||
|
|
a0ef6e631e | ||
|
|
d895a5fb7c | ||
|
|
fd765a74c0 | ||
|
|
1f184fab8b |
@@ -48,6 +48,11 @@ trigger: always_on
|
|||||||
- **Browser**: Allowed for documentation and safe browsing. No automated logins without permission.
|
- **Browser**: Allowed for documentation and safe browsing. No automated logins without permission.
|
||||||
- **Terminal**: No `rm -rf`. Run tests (`pytest` etc.) after logic changes.
|
- **Terminal**: No `rm -rf`. Run tests (`pytest` etc.) after logic changes.
|
||||||
|
|
||||||
|
## 7. Mandatory Testing Policy 🧪
|
||||||
|
**CRITICAL: No logic or UI fix is complete without a corresponding automated test.**
|
||||||
|
- If you fix a regression or implement a new UI feature, you **MUST** write or update a test in `tests/test_dom.js` or `test_logic.js`.
|
||||||
|
- Refactoring MUST include verifying that no click listeners drop out. This guarantees that features like modal toggles stay functional.
|
||||||
|
|
||||||
## 7. Requirements-Konsistenz 📋
|
## 7. Requirements-Konsistenz 📋
|
||||||
Alle umgesetzten Anforderungen müssen mit `REQUIREMENTS.md` übereinstimmen.
|
Alle umgesetzten Anforderungen müssen mit `REQUIREMENTS.md` übereinstimmen.
|
||||||
1. **Vor der Umsetzung prüfen**: Passt die neue Anforderung zu den bestehenden Requirements?
|
1. **Vor der Umsetzung prüfen**: Passt die neue Anforderung zu den bestehenden Requirements?
|
||||||
|
|||||||
51
README.md
51
README.md
@@ -8,9 +8,14 @@ Ein intelligentes Bookmarklet für die Mitarbeiter-Kantine der Bessa App. Dieses
|
|||||||
* **Bestell-Countdown:** ⏳ Roter Alarm 1h vor Bestellschluss.
|
* **Bestell-Countdown:** ⏳ Roter Alarm 1h vor Bestellschluss.
|
||||||
* **Smart Highlights:** 🌟 Markiere deine Favoriten (z.B. "Schnitzel", "Vegetarisch").
|
* **Smart Highlights:** 🌟 Markiere deine Favoriten (z.B. "Schnitzel", "Vegetarisch").
|
||||||
* **Bestellstatus:** Farbige Indikatoren für bestellte Menüs.
|
* **Bestellstatus:** Farbige Indikatoren für bestellte Menüs.
|
||||||
* **Kostenkontrolle:** Summiert automatisch den Gesamtpreis der Woche.
|
* **Kostenkontrolle:** 💰 Summiert automatisch den Gesamtpreis der Woche.
|
||||||
* **Session Reuse:** Nutzt automatisch eine bestehende Login-Session (Loggt dich automatisch ein).
|
* **Bestellhistorie:** 📜 Gruppiert nach Monat & KW mit inkrementellem Delta-Cache.
|
||||||
* **Menu Badges:** Zeigt Menü-Codes (M1, M2+) direkt im Header.
|
* **Session Reuse:** 🔑 Nutzt automatisch eine bestehende Login-Session.
|
||||||
|
* **Menu Badges:** 🏷️ Zeigt Menü-Codes (M1, M2+) direkt im Header.
|
||||||
|
* **Menü-Flagging:** 🔔 Ausverkaufte Menüs beobachten und bei Verfügbarkeit benachrichtigt werden.
|
||||||
|
* **Version-Menü:** 📦 Versionsliste mit Installer-Links, Dev-Mode Toggle und Downgrade-Support.
|
||||||
|
* **Cache leeren:** 🗑️ Lokalen Cache mit einem Klick bereinigen (im Version-Menü).
|
||||||
|
* **Favicon:** 🍽️ Eigenes Icon für die Lesezeichenleiste.
|
||||||
* **Changelog:** Übersicht über neue Funktionen direkt im Installer.
|
* **Changelog:** Übersicht über neue Funktionen direkt im Installer.
|
||||||
|
|
||||||
## 📦 Installation
|
## 📦 Installation
|
||||||
@@ -19,7 +24,7 @@ Ein intelligentes Bookmarklet für die Mitarbeiter-Kantine der Bessa App. Dieses
|
|||||||
2. Ziehe den blauen Button **"Kantine Wrapper"** in deine Lesezeichen-Leiste.
|
2. Ziehe den blauen Button **"Kantine Wrapper"** in deine Lesezeichen-Leiste.
|
||||||
3. Fertig!
|
3. Fertig!
|
||||||
|
|
||||||
## usage
|
## 🍽️ Nutzung
|
||||||
|
|
||||||
1. Navigiere zu [https://web.bessa.app/knapp-kantine](https://web.bessa.app/knapp-kantine).
|
1. Navigiere zu [https://web.bessa.app/knapp-kantine](https://web.bessa.app/knapp-kantine).
|
||||||
2. Klicke auf das **"Kantine Wrapper"** Lesezeichen.
|
2. Klicke auf das **"Kantine Wrapper"** Lesezeichen.
|
||||||
@@ -28,24 +33,38 @@ Ein intelligentes Bookmarklet für die Mitarbeiter-Kantine der Bessa App. Dieses
|
|||||||
## 🛠️ Entwicklung
|
## 🛠️ Entwicklung
|
||||||
|
|
||||||
### Voraussetzungen
|
### Voraussetzungen
|
||||||
* Node.js (optional, nur für Build-Scripts)
|
* Node.js (für Build- und Test-Scripts)
|
||||||
|
* Python 3 (für Build-Tests)
|
||||||
* Bash (für `build-bookmarklet.sh`)
|
* Bash (für `build-bookmarklet.sh`)
|
||||||
|
|
||||||
### Projektstruktur
|
### Projektstruktur
|
||||||
|
|
||||||
#### Quelldateien
|
#### Quelldateien
|
||||||
* `kantine.js`: Der Haupt-Quellcode des Bookmarklets (UI, API-Logik, Rendering).
|
| Datei | Beschreibung |
|
||||||
* `style.css`: Das komplette Design (CSS mit Light/Dark Mode).
|
|-------|-------------|
|
||||||
* `mock-data.js`: Mock-Fetch-Interceptor mit realistischen Dummy-Menüdaten für Standalone-Tests.
|
| `kantine.js` | Haupt-Quellcode des Bookmarklets (UI, API-Logik, Rendering). |
|
||||||
* `build-bookmarklet.sh`: Build-Skript – erzeugt alle `dist/`-Artefakte.
|
| `style.css` | Komplettes Design (CSS mit Light/Dark Mode). |
|
||||||
* `test_build.py`: Automatische Build-Tests, laufen am Ende jedes Builds.
|
| `favicon.svg` | Favicon für die Installer-Seite (Dreieck + Gabel & Messer). |
|
||||||
|
| `mock-data.js` | Mock-Fetch-Interceptor mit realistischen Dummy-Menüdaten für Standalone-Tests. |
|
||||||
|
| `build-bookmarklet.sh` | Build-Skript – erzeugt alle `dist/`-Artefakte und führt alle Tests aus. |
|
||||||
|
| `release.sh` | Release-Skript – Commit, Tag, Push zu allen Remotes. |
|
||||||
|
| `version.txt` | Aktuelle Versionsnummer (SemVer). |
|
||||||
|
| `changelog.md` | Änderungshistorie aller Versionen. |
|
||||||
|
| `REQUIREMENTS.md` | System Requirements Specification (SRS). |
|
||||||
|
|
||||||
|
#### Tests
|
||||||
|
| Datei | Beschreibung |
|
||||||
|
|-------|-------------|
|
||||||
|
| `test_logic.js` | Logik-Unit-Tests (statische Analyse, Syntax-Check, Sandbox-Ausführung). |
|
||||||
|
| `tests/test_dom.js` | DOM-Interaktionstests via JSDOM (prüft Event-Listener-Bindung aller UI-Komponenten). |
|
||||||
|
| `test_build.py` | Build-Artefakt-Validierung (Existenz, Inhalt). |
|
||||||
|
|
||||||
#### `dist/` – Build-Artefakte
|
#### `dist/` – Build-Artefakte
|
||||||
| Datei | Beschreibung |
|
| Datei | Beschreibung |
|
||||||
|-------|-------------|
|
|-------|-------------|
|
||||||
| `bookmarklet.txt` | Die rohe Bookmarklet-URL (`javascript:...`). Enthält CSS + JS als selbstextrahierendes IIFE. Kann direkt als Lesezeichen-URL eingefügt werden. |
|
| `bookmarklet.txt` | Die rohe Bookmarklet-URL (`javascript:...`). Enthält CSS + JS als selbstextrahierendes IIFE. Kann direkt als Lesezeichen-URL eingefügt werden. |
|
||||||
| `bookmarklet-payload.js` | Der entpackte Bookmarklet-Payload (JS). Erstellt `<style>` + `<script>` Elemente und injiziert sie in die Seite. Nützlich zum Debuggen. |
|
| `bookmarklet-payload.js` | Der entpackte Bookmarklet-Payload (JS). Erstellt `<style>` + `<script>` Elemente und injiziert sie in die Seite. Nützlich zum Debuggen. |
|
||||||
| `install.html` | Installer-Seite mit Drag & Drop Button, Anleitung, Feature-Liste und Changelog. Kann lokal oder gehostet geöffnet werden. |
|
| `install.html` | Installer-Seite mit Drag & Drop Button, Favicon, Anleitung, Feature-Liste und Changelog. Kann lokal oder gehostet geöffnet werden. |
|
||||||
| `kantine-standalone.html` | Eigenständige HTML-Datei mit eingebettetem CSS + JS + **Mock-Daten**. Lädt automatisch Dummy-Menüs für UI-Tests ohne API-Zugriff. |
|
| `kantine-standalone.html` | Eigenständige HTML-Datei mit eingebettetem CSS + JS + **Mock-Daten**. Lädt automatisch Dummy-Menüs für UI-Tests ohne API-Zugriff. |
|
||||||
|
|
||||||
### Build
|
### Build
|
||||||
@@ -55,5 +74,15 @@ Um Änderungen an `kantine.js` oder `style.css` wirksam zu machen, führe den Bu
|
|||||||
./build-bookmarklet.sh
|
./build-bookmarklet.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Release
|
||||||
|
Erstellt einen Git-Tag, committet Build-Artefakte und pusht zu allen Remotes:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
./release.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
## ⚠️ Hinweis
|
||||||
|
Dieses Projekt enthält zum überwiegenden Teil **KI-generierten Code**. Der Code wurde mithilfe von KI-Assistenten erstellt, überprüft und iterativ verfeinert.
|
||||||
|
|
||||||
## 📝 Lizenz
|
## 📝 Lizenz
|
||||||
Internes Tool.
|
Internes Tool.
|
||||||
|
|||||||
@@ -60,10 +60,10 @@ Das System umfasst die Darstellung von Menüplänen in einer Wochenübersicht, d
|
|||||||
| **Header UI & Navigation** | | | |
|
| **Header UI & Navigation** | | | |
|
||||||
| FR-090 | Die Hauptnavigation (Wochen-Toggles) muss linksbündig neben dem App-Titel positioniert sein. | Niedrig | v1.5.0 |
|
| FR-090 | Die Hauptnavigation (Wochen-Toggles) muss linksbündig neben dem App-Titel positioniert sein. | Niedrig | v1.5.0 |
|
||||||
| FR-091 | Ein dynamisches Alarm-Icon im Header muss den Überwachungsstatus geflaggter Menüs anzeigen (Gelb=Überwachung aktiv aber kein Menü verfügbar, Grün=Mindestens ein Menü verfügbar, Versteckt=keine Flags). Der Tooltip muss den Zeitpunkt der letzten Prüfung als relativen String (z.B. "vor 4 Min.") enthalten. | Mittel | v1.5.0 (Update v1.4.10) |
|
| FR-091 | Ein dynamisches Alarm-Icon im Header muss den Überwachungsstatus geflaggter Menüs anzeigen (Gelb=Überwachung aktiv aber kein Menü verfügbar, Grün=Mindestens ein Menü verfügbar, Versteckt=keine Flags). Der Tooltip muss den Zeitpunkt der letzten Prüfung als relativen String (z.B. "vor 4 Min.") enthalten. | Mittel | v1.5.0 (Update v1.4.10) |
|
||||||
| FR-092 | Sobald über den Daten-Refresh erstmals Menüdaten für die Nächste Woche geladen werden, muss der entsprechende Navigation-Button animiert und farblich (Gelb) hervorgehoben werden. Zusätzlich muss einmalig ein Hinweis eingeblendet werden. Bei Klick auf den Button muss die Hervorhebung erlöschen. | Mittel | v1.6.0 |
|
| FR-092 | Solange Menüdaten für die Nächste Woche verfügbar sind, aber noch keine Bestellungen getätigt wurden, muss der entsprechende Navigation-Button animiert und farblich (Gelb) hervorgehoben werden. Nach der ersten Bestellung muss die Hervorhebung automatisch erlöschen. Zusätzlich muss beim erstmaligen Erscheinen der Daten ein einmaliger Toast-Hinweis angezeigt werden. | Mittel | v1.6.0 (Update v1.4.21) |
|
||||||
| **Benutzer-Feedback** | | | |
|
| **Benutzer-Feedback** | | | |
|
||||||
| FR-090 | Alle benutzerrelevanten Aktionen (Bestellung, Stornierung, Fehler) müssen durch nicht-blockierende Benachrichtigungen (Toasts) bestätigt werden. | Mittel | v1.0.1 |
|
| FR-095 | Alle benutzerrelevanten Aktionen (Bestellung, Stornierung, Fehler) müssen durch nicht-blockierende Benachrichtigungen (Toasts) bestätigt werden. | Mittel | v1.0.1 |
|
||||||
| FR-091 | Bei einem Verbindungsfehler muss ein Fehlerdialog mit Fallback-Link zur Originalseite angezeigt werden. | Mittel | v1.0.1 |
|
| FR-096 | Bei einem Verbindungsfehler muss ein Fehlerdialog mit Fallback-Link zur Originalseite angezeigt werden. | Mittel | v1.0.1 |
|
||||||
| **Nächste-Woche-Badge** | | | |
|
| **Nächste-Woche-Badge** | | | |
|
||||||
| FR-100 | Die Navigation zur nächsten Woche muss ein Badge anzeigen, das den Überblick über den Bestellstatus der kommenden Woche visualisiert (bestellt / bestellbar / gesamt). | Niedrig | v1.0.1 |
|
| FR-100 | Die Navigation zur nächsten Woche muss ein Badge anzeigen, das den Überblick über den Bestellstatus der kommenden Woche visualisiert (bestellt / bestellbar / gesamt). | Niedrig | v1.0.1 |
|
||||||
| **Update-Management** | | | |
|
| **Update-Management** | | | |
|
||||||
@@ -73,6 +73,8 @@ Das System umfasst die Darstellung von Menüplänen in einer Wochenübersicht, d
|
|||||||
| FR-113 | Es muss möglich sein, zu einer älteren Version zurückzukehren (Downgrade). | Niedrig | v1.3.0 |
|
| FR-113 | Es muss möglich sein, zu einer älteren Version zurückzukehren (Downgrade). | Niedrig | v1.3.0 |
|
||||||
| FR-114 | Ein Dev-Mode muss es ermöglichen, zwischen stabilen Releases und Entwicklungs-Tags umzuschalten. | Niedrig | v1.3.0 |
|
| FR-114 | Ein Dev-Mode muss es ermöglichen, zwischen stabilen Releases und Entwicklungs-Tags umzuschalten. | Niedrig | v1.3.0 |
|
||||||
| FR-115 | Das Versionsmenü muss Links zur Erstellung von Feature-Requests und Bug-Reports auf GitHub enthalten. | Niedrig | v1.4.4 |
|
| FR-115 | Das Versionsmenü muss Links zur Erstellung von Feature-Requests und Bug-Reports auf GitHub enthalten. | Niedrig | v1.4.4 |
|
||||||
|
| FR-116 | Das Versionsmenü muss eine Funktion zum Leeren des lokalen Caches bereitstellen, um bei hartnäckigen Fehlern alle gespeicherten Daten bereinigen zu können. | Niedrig | v1.4.16 |
|
||||||
|
| FR-117 | Die Installer-Seite muss ein eingebettetes Favicon bereitstellen, das beim Drag & Drop in die Lesezeichenleiste als Icon für das Bookmarklet übernommen wird. | Niedrig | v1.4.19 |
|
||||||
|
|
||||||
## 3. Nicht-funktionale Anforderungen
|
## 3. Nicht-funktionale Anforderungen
|
||||||
|
|
||||||
@@ -85,7 +87,7 @@ Das System umfasst die Darstellung von Menüplänen in einer Wochenübersicht, d
|
|||||||
| **Benutzbarkeit** | NFR-005 | Die Oberfläche muss auf mobilen Geräten fehlerfrei nutzbar sein. | Viewports ab 320px Breite |
|
| **Benutzbarkeit** | NFR-005 | Die Oberfläche muss auf mobilen Geräten fehlerfrei nutzbar sein. | Viewports ab 320px Breite |
|
||||||
| **Benutzbarkeit** | NFR-006 | Alle interaktiven Elemente müssen Tooltips oder Hilfetexte bieten. | 100% Coverage |
|
| **Benutzbarkeit** | NFR-006 | Alle interaktiven Elemente müssen Tooltips oder Hilfetexte bieten. | 100% Coverage |
|
||||||
| **Benutzbarkeit** | NFR-007 | Die Benutzeroberfläche muss vollständig in deutscher Sprache sein. | Vollständige Lokalisierung |
|
| **Benutzbarkeit** | NFR-007 | Die Benutzeroberfläche muss vollständig in deutscher Sprache sein. | Vollständige Lokalisierung |
|
||||||
| **Wartbarkeit** | NFR-008 | Die Build-Artefakte müssen durch automatisierte Tests validiert werden. | Build-Tests + Logik-Tests |
|
| **Wartbarkeit** | NFR-008 | Die Build-Artefakte müssen durch automatisierte Tests validiert werden. | Build-Tests + Logik-Tests + DOM-Tests |
|
||||||
|
|
||||||
## 4. Technische Randbedingungen
|
## 4. Technische Randbedingungen
|
||||||
* **Deployment**: Das System wird als Bookmarklet ausgeliefert, das auf der Bessa-Webseite ausgeführt wird.
|
* **Deployment**: Das System wird als Bookmarklet ausgeliefert, das auf der Bessa-Webseite ausgeführt wird.
|
||||||
@@ -93,4 +95,4 @@ Das System umfasst die Darstellung von Menüplänen in einer Wochenübersicht, d
|
|||||||
* **Datenhaltung**: Clientseitig via `localStorage` (Menü-Cache, Flags, Highlights, Theme) und `sessionStorage` (Auth-Token).
|
* **Datenhaltung**: Clientseitig via `localStorage` (Menü-Cache, Flags, Highlights, Theme) und `sessionStorage` (Auth-Token).
|
||||||
* **Build**: Bash-basiertes Build-Script, das Bookmarklet-URL, Standalone-HTML und Installer-Seite generiert.
|
* **Build**: Bash-basiertes Build-Script, das Bookmarklet-URL, Standalone-HTML und Installer-Seite generiert.
|
||||||
* **Versionierung**: SemVer, verwaltet über GitHub Releases/Tags.
|
* **Versionierung**: SemVer, verwaltet über GitHub Releases/Tags.
|
||||||
* **Tests**: Python-basierte Build-Tests (`python3`) + Node.js-basierte Logik-Tests.
|
* **Tests**: Python-basierte Build-Tests (`python3`) + Node.js-basierte Logik-Tests + Node.js-basierte DOM-Interaktionstests (JSDOM).
|
||||||
|
|||||||
@@ -7,6 +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.png"
|
||||||
|
|
||||||
# === VERSION ===
|
# === VERSION ===
|
||||||
if [ -f "$SCRIPT_DIR/version.txt" ]; then
|
if [ -f "$SCRIPT_DIR/version.txt" ]; then
|
||||||
@@ -24,10 +25,33 @@ echo "=== Kantine Bookmarklet Builder ($VERSION) ==="
|
|||||||
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
|
||||||
|
|
||||||
|
# Generate favicon Base64 data URI from PNG
|
||||||
|
FAVICON_B64=$(base64 -w0 "$FAVICON_FILE")
|
||||||
|
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
|
||||||
@@ -101,6 +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/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 */
|
||||||
@@ -122,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>
|
||||||
|
|
||||||
@@ -200,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(' ', ' ')
|
||||||
@@ -236,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>
|
||||||
@@ -258,6 +297,14 @@ if [ $LOGIC_EXIT -ne 0 ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "=== Running DOM Interaction Tests ==="
|
||||||
|
node "$SCRIPT_DIR/tests/test_dom.js"
|
||||||
|
DOM_EXIT=$?
|
||||||
|
if [ $DOM_EXIT -ne 0 ]; then
|
||||||
|
echo "❌ DOM UI tests FAILED! Regressions detected."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
echo "=== Running Build Tests ==="
|
echo "=== Running Build Tests ==="
|
||||||
python3 "$SCRIPT_DIR/test_build.py"
|
python3 "$SCRIPT_DIR/test_build.py"
|
||||||
TEST_EXIT=$?
|
TEST_EXIT=$?
|
||||||
|
|||||||
47
changelog.md
47
changelog.md
@@ -1,40 +1,19 @@
|
|||||||
## v1.4.12 (2026-02-24)
|
## v1.5.1 (2026-03-04)
|
||||||
- **Fix**: Das Glocken-Icon sollte nun endgültig versteckt bleiben, wenn keine Benachrichtigungen aktiv sind (CSS-Kollision mit `.hidden` behoben).
|
- 🐛 **Bugfix**: Freitagsbestellungen schlugen fehl ("Onlinebestellung sind nicht verfügbar"). Ursache: Der Order-Payload verwendete `preorder: false` und eine falsche Uhrzeit (`T10:00:00.000Z` statt `T10:30:00Z`). Beides wurde anhand der originalen Bessa-API korrigiert.
|
||||||
|
|
||||||
## v1.4.11 (2026-02-24)
|
## v1.5.0 (2026-02-26)
|
||||||
- **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.
|
Das große "Quality of Life"-Update! Zusammenfassung aller Features und Fixes seit v1.4.0:
|
||||||
|
|
||||||
## v1.4.10 (2026-02-24)
|
- ✨ **Bestellhistorie**: Übersichtliche Historie direkt in der App – gruppiert nach Jahr/Monat, inklusive Summen, Stati (Offen/Abgeschlossen/Storniert) und Delta-Cache für rasantes Laden.
|
||||||
- **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.
|
- ⚡ **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.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. 📜✨
|
||||||
|
|||||||
15
debug_test.js
Executable file
15
debug_test.js
Executable file
@@ -0,0 +1,15 @@
|
|||||||
|
const fs = require('fs');
|
||||||
|
const jsCode = fs.readFileSync('kantine.js', 'utf8').replace('(function () {', '').replace(/}\)\(\);$/, '');
|
||||||
|
try {
|
||||||
|
const vm = require('vm');
|
||||||
|
new vm.Script(jsCode);
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e.message);
|
||||||
|
const lines = jsCode.split('\n');
|
||||||
|
console.error("Around line", e.loc?.line);
|
||||||
|
if(e.loc?.line) {
|
||||||
|
console.log(lines[e.loc.line - 2]);
|
||||||
|
console.log(lines[e.loc.line - 1]);
|
||||||
|
console.log(lines[e.loc.line]);
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
dist/Arrow_and_fork_fly_away_bd43310bea.mp4
vendored
Executable file
BIN
dist/Arrow_and_fork_fly_away_bd43310bea.mp4
vendored
Executable file
Binary file not shown.
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
87
dist/install.html
vendored
87
dist/install.html
vendored
File diff suppressed because one or more lines are too long
213
dist/kantine-standalone.html
vendored
213
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,6 +2000,16 @@ 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 PNG)
|
||||||
|
if (document.querySelectorAll) {
|
||||||
|
document.querySelectorAll('link[rel*="icon"]').forEach(el => el.remove());
|
||||||
|
}
|
||||||
|
const favicon = document.createElement('link');
|
||||||
|
favicon.rel = 'icon';
|
||||||
|
favicon.type = 'image/png';
|
||||||
|
favicon.href = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAKQUlEQVR4nKVXa3RVxRX+9sw5uY/khjwgECAJiCFUQhMSCFZKAYMWBQSDRVsUrcXLy4hg2yA0XgLKqjzEmPAIFIggahFs1YovRCh2iYXQgkQUyiNAgBBCgCQ3955zZnZ/hNRGoau0e635MXtmP8737Zl9hvB/CBGBmQkA/0vJTJg7l/41792b2hhVVrbONYqK9P8UFwClpaV1S05O/tVVnfhfHLU6u1GRRKSioqJeamhoyM/Ozv5eRUXF11eTUBnr1nVrlpJE6LJpMVwkZAQ0uxw4LotEBJGIEG4zytdsHTjkf7zSuMHgAoBOTk7uVVNTMzEhIYErKyuXGoZxl5ORIaiiQgVVaMgZ21qjLEcTswEpQUQAETQY0A7I9MIJBp8BUHmj0JFpmlxVVbVw6O1DPdu3f+xYljU8ISFhFCoqbPZnm0cmTin3KT2VXBGGA2Zt26wsix0rrHUopNkKh1VjUIXAl1u/6D/Lpk0SLYUmAaiuXbsOE1KMmhsIqN6908WkSX4+c+bMEmZ2Y1WFgt9v1kyZUdZe82TDjFAQpEEEBgQIAgwJAWmwEP85gUCgZW3cOAUixuDBxMzy+PHjiyc89BBycgbAcWz53HMLdIeEDqk+n2+6EEJj1Srm4mLXqUlPlMWCF8HjkSAoAQKhhQoCQRAzAFy7BpgJRDp99eqO58lam9TYMKXiyVknYxMS8n0+X8a8+fOVbdvStm3ExsaKuYG5etq0abMfffSBDWvXpJ0DTXd6li3rfxrOeLZsTSAB1gpEktFS+ay0c20EAgGBuXPlzWtW3NLHq5Xl2MGvvd6D499+PetSbe3P5zxTyEldk8g0TXi9XgCgqVOnck5OTvS6l994QVKRvnn54r7VUFttRjI7Dhgg9ngkiEAEJhCEkC1FdT0G2q9cWhKWxqgr7Tr2iGusKalvCI6dYXq+eDL3ztwt773HVSdOUDgURkxsDPr368dkSNw/+t5LGU89Pv7LXmmrbaW6kG07TEJKQRQlxOZGpe7TDCW8HhndHJpyftrMld9Q0AI7p61Y0e2S6cza1bnH9P4nj6R5L587tckbP3iN2zfsNZeZG7WvQkc3BsWgQT9Cu+honD17Fh9u28ZXai+Ih+fM3lWeGLdMgrqQ5TgMIun1UJxtP1UzefoLHVcWT6snKtUMJiHsb1FAQCAgkoSoDztqSL/qox/ZU568MxS29k0IXvxi4YCBSU92TuKFF6pFVv5kDL/jDnRKTMTwu+/CyuUrRGFJMXb16n6PJtGdwiHNgoTwumW8Zc08O3n6C6o433V28vRl8VpPFB432d9E/U7xceDtMm9xjXUwGAqdCQ/MnXbbof2fV1sh14yMbJ65Yxt53W6sTO6BK1WncaW+HjcP6IfnLp7H36uq4PZ6NRMJckUgxrZm1kyZuZQDAQNFRQqBgERRkZO4fGmBacgLJ/1PrLnu8Xtw+fIElCz6qt/G8mBDY4OTvXEdY0GAfSuWMhbN41ePfc3MzJdYc/r63zEWPcve0iU6omSxQsnCYOLS5wuoxZ/xbf8EIPDJJ+7rFuHgTwLGzqFFzuxlL41Y7zb+FCUNTYLEySuXIaVEY3MQW8eMw5CuKch8ZS2+qruAqEgvLNtmm4hKhwy7+Ef/lMMfHfhiGjc1/Y2ICID+9yRaO+G1LiLaObRIR3ftGvfm4qVlbw29ky0p6FD1aTSFw7jS1AQNwutHvoIhJQr63wohJWzbgaUVFab1xtQ+feNy88beimDwebfb1Xr0v5GW4HS9BISUUjdUV8+KbN++S1b3HnrNLRmUn9UPo29OxaTMbMRFelH+9wqMeWcLHknPwBsjxwChZqy/Zyx6Vp3GocNf88i777YBDOvUKfEBAAotV3mbirsW+gIA5eXlpQJoHjNmtFLMes6sAlaNjdwq208eZ2/JIsai+Tzw9fXcYIX5WH0dMzNveGUDb9v2EdfV1SkAWkhx2u/3t2v1fa2AbeA3DIO3bt26sHOXzm6fz8fETGxI1DYHAQCL9n6Gvgmd8Pbo++CKiMBfTlUh59VyCGpxFXYcuFxuXLhwQdx113DVJz29y7p16+ZKKfW1EP93hQSgEhIScpVSY15+uVzV19dLIkL7+PaoOXYMvz2wD79+/10M2bwRtyV2waYRYxBhmDhUV4cBr5bjQH0dms6eQ2paGvbv34/MzExZVlambNt+PCsrK/NaVLQmQADAzPLMmTOLJzw8AcNy74BlO9i+4xPkP+bHkqqjeHr7B2gXH4/9586i78Z1uKdHKjbcPQqCGedDIQz5/QZ4BuagY4cOePX3ryM9PZ0GDLgVI0eOMPbs2fOSyxVxTc4BQBCRiomJ+UVsbGzm/HnzlNZajn9wPHa9/wFKq09gfdUx+EwXHK0hDBOP3NIHYaUxruct2PLAeESYJhrCYTx16CBW7/sreiYmYviIEdBay5LSUhUZGTkoOrrdI0TUBoXWwuAFCxbEXr58ed7sObN1YmJnspXChAcfQv3tgzDjnT8g0uOBZo2m5mbMSc/ArKwcmEKgtq4OMQe/wozkboAQsJpD8O/8GEn+RxHXLga2UuiW0o0KC3+ja2trny8oKIhHywkQrdAbUkpHGGJx95TuTx2sPOiAyDClgcLP/oxnd/8FUS43lFawtMbvRo1ByqEjeHfHTnjcLrDWSEpJwaTH/Hjl+BE89OYmRLk9aAwFMfsHg/DcbYOhlIJmrfpm9pWHDx9excyTHMeRABQBoP79+6fu2bPnwJY3t5h59+YRAHrmsz9j/qc7EeWJhNIKzY4Df6fOeDwtHX2ys7/D5drychz8fDfifnY/Cnd/iihPJBpDQUzMzELZ7cMhhMDH27erYbm5okePHgOPHj36GQBJpmnCcZzNeWPz8ja/sdkBs1n4+ad49tOd8Hm9sGxbhVnTaw88iB9cDuLpeUUQROjYsRNcLhcu1l/EhdpaJKekwD9pEnr1TEPZPw5h8rtvIUqaaGwOitG9vof1d4xAtNvj5D+RL0pLSvcxcw4REXVJ6ZJXXVW95dezCjDizh9jd7SHCz7+kHyRkVCOYiM6iqYmJiH7YgOUaYKY8eWXX+LEieMIhcKIj49DWq9euKn7TbAsC1caG9HOFYFdMV6sPHUSZtjSV5oaRW5qT17Suy99+NZbeHr2HET7fL+sr69fQvHx8e83h0I3BZua1NifjnNX5o3sdvjUKccd4RJhZuFP7bX7/NKSuC0ffNjmFnO5XSAScBwbju18h5JHfnIf47EJ1obDh9O9zLrBkOIx03Np7cQp50yPW7hcrvpBPxw0EsXFxS5mFsxsMLOrQ9mL272vrOaoNcu48+qXCq9GNZhZXt333wx51UYklL1YGlm+gmNWvhgeuGXDrcws9jKbe/fuNQcPHvzdn+IRG5fHdt2wKr/7qpKRV/u5aOmmNyatNgJA6stlw9JXL/v+dffimybRNlLr26Dtvv92fNs3rj5w2ugNtG2LDGbCjh0StbWMceNUm7UblxabTZskKisZRLqNHsA/AQoXyB/6HdQ3AAAAAElFTkSuQmCC';
|
||||||
|
document.head.appendChild(favicon);
|
||||||
|
|
||||||
// Inject Google Fonts if not already present
|
// Inject Google Fonts if not already present
|
||||||
if (!document.querySelector('link[href*="fonts.googleapis.com/css2?family=Inter"]')) {
|
if (!document.querySelector('link[href*="fonts.googleapis.com/css2?family=Inter"]')) {
|
||||||
const fontLink = document.createElement('link');
|
const fontLink = document.createElement('link');
|
||||||
@@ -2021,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.12</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;">
|
||||||
@@ -2163,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.12</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;">
|
||||||
@@ -2181,6 +2191,9 @@ body {
|
|||||||
<a href="https://github.com/TauNeutrino/kantine-overview/discussions/categories/ideas" target="_blank" rel="noopener noreferrer" style="color: var(--primary-color); text-decoration: none; display: flex; align-items: center; gap: 0.5rem;" title="Schlage ein neues Feature auf GitHub vor">
|
<a href="https://github.com/TauNeutrino/kantine-overview/discussions/categories/ideas" target="_blank" rel="noopener noreferrer" style="color: var(--primary-color); text-decoration: none; display: flex; align-items: center; gap: 0.5rem;" title="Schlage ein neues Feature auf GitHub vor">
|
||||||
<span class="material-icons-round" style="font-size: 1.2em;">lightbulb</span> Feature vorschlagen
|
<span class="material-icons-round" style="font-size: 1.2em;">lightbulb</span> Feature vorschlagen
|
||||||
</a>
|
</a>
|
||||||
|
<button id="btn-clear-cache" style="background: none; border: none; padding: 0; color: var(--error-color); text-decoration: none; display: flex; align-items: center; gap: 0.5rem; cursor: pointer; text-align: left; font-size: inherit; font-family: inherit;" title="Löscht alle lokalen Daten & erzwingt einen Neuladen">
|
||||||
|
<span class="material-icons-round" style="font-size: 1.2em;">delete_forever</span> Lokalen Cache leeren
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -2228,6 +2241,18 @@ body {
|
|||||||
const historyModal = document.getElementById('history-modal');
|
const historyModal = document.getElementById('history-modal');
|
||||||
const btnHistoryClose = document.getElementById('btn-history-close');
|
const btnHistoryClose = document.getElementById('btn-history-close');
|
||||||
|
|
||||||
|
if (btnHighlights) {
|
||||||
|
btnHighlights.addEventListener('click', () => {
|
||||||
|
highlightsModal.classList.remove('hidden');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (btnHighlightsClose) {
|
||||||
|
btnHighlightsClose.addEventListener('click', () => {
|
||||||
|
highlightsModal.classList.add('hidden');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
btnHistory.addEventListener('click', () => {
|
btnHistory.addEventListener('click', () => {
|
||||||
if (!authToken) {
|
if (!authToken) {
|
||||||
loginModal.classList.remove('hidden');
|
loginModal.classList.remove('hidden');
|
||||||
@@ -2265,6 +2290,21 @@ body {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const btnClearCache = document.getElementById('btn-clear-cache');
|
||||||
|
if (btnClearCache) {
|
||||||
|
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.')) {
|
||||||
|
// Only clear our own keys so we don't destroy the host app's (Bessa's) session
|
||||||
|
Object.keys(localStorage).forEach(key => {
|
||||||
|
if (key.startsWith('kantine_')) {
|
||||||
|
localStorage.removeItem(key);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
window.location.reload();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
window.addEventListener('click', (e) => {
|
window.addEventListener('click', (e) => {
|
||||||
if (e.target === versionModal) versionModal.classList.add('hidden');
|
if (e.target === versionModal) versionModal.classList.add('hidden');
|
||||||
});
|
});
|
||||||
@@ -2373,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 {
|
||||||
@@ -2383,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);
|
||||||
@@ -2414,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();
|
||||||
@@ -2438,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2453,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');
|
||||||
@@ -2505,6 +2545,7 @@ body {
|
|||||||
}
|
}
|
||||||
console.log(`Fetched ${results.length} orders, mapped active ones.`);
|
console.log(`Fetched ${results.length} orders, mapped active ones.`);
|
||||||
renderVisibleWeeks();
|
renderVisibleWeeks();
|
||||||
|
updateNextWeekBadge();
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error fetching orders:', error);
|
console.error('Error fetching orders:', error);
|
||||||
@@ -2820,7 +2861,7 @@ body {
|
|||||||
venue: VENUE_ID,
|
venue: VENUE_ID,
|
||||||
states: [],
|
states: [],
|
||||||
order_state: 1,
|
order_state: 1,
|
||||||
date: `${date}T10:00:00.000Z`,
|
date: `${date}T10:30:00Z`,
|
||||||
payment_method: 'payroll',
|
payment_method: 'payroll',
|
||||||
customer: {
|
customer: {
|
||||||
first_name: userData.first_name,
|
first_name: userData.first_name,
|
||||||
@@ -2828,7 +2869,7 @@ body {
|
|||||||
email: userData.email,
|
email: userData.email,
|
||||||
newsletter: false
|
newsletter: false
|
||||||
},
|
},
|
||||||
preorder: false,
|
preorder: true,
|
||||||
delivery_fee: 0,
|
delivery_fee: 0,
|
||||||
cash_box_table_name: null,
|
cash_box_table_name: null,
|
||||||
take_away: false
|
take_away: false
|
||||||
@@ -2889,6 +2930,67 @@ body {
|
|||||||
localStorage.setItem('kantine_flags', JSON.stringify([...userFlags]));
|
localStorage.setItem('kantine_flags', JSON.stringify([...userFlags]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function refreshFlaggedItems() {
|
||||||
|
if (userFlags.size === 0) return;
|
||||||
|
const token = authToken || GUEST_TOKEN;
|
||||||
|
const datesToFetch = new Set();
|
||||||
|
|
||||||
|
for (const flagId of userFlags) {
|
||||||
|
const [dateStr] = flagId.split('_');
|
||||||
|
datesToFetch.add(dateStr);
|
||||||
|
}
|
||||||
|
|
||||||
|
let updated = false;
|
||||||
|
for (const dateStr of datesToFetch) {
|
||||||
|
try {
|
||||||
|
const resp = await fetch(`${API_BASE}/venues/${VENUE_ID}/menu/${MENU_ID}/${dateStr}/`, {
|
||||||
|
headers: apiHeaders(token)
|
||||||
|
});
|
||||||
|
if (!resp.ok) continue;
|
||||||
|
const data = await resp.json();
|
||||||
|
const menuGroups = data.results || [];
|
||||||
|
let dayItems = [];
|
||||||
|
for (const group of menuGroups) {
|
||||||
|
if (group.items && Array.isArray(group.items)) {
|
||||||
|
dayItems = dayItems.concat(group.items);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update allWeeks in memory
|
||||||
|
for (let week of allWeeks) {
|
||||||
|
if (!week.days) continue;
|
||||||
|
let dayObj = week.days.find(d => d.date === dateStr);
|
||||||
|
if (dayObj) {
|
||||||
|
dayObj.items = dayItems.map(item => {
|
||||||
|
const isUnlimited = item.amount_tracking === false;
|
||||||
|
const hasStock = parseInt(item.available_amount) > 0;
|
||||||
|
return {
|
||||||
|
id: `${dateStr}_${item.id}`,
|
||||||
|
articleId: item.id,
|
||||||
|
name: item.name || 'Unknown',
|
||||||
|
description: item.description || '',
|
||||||
|
price: parseFloat(item.price) || 0,
|
||||||
|
available: isUnlimited || hasStock,
|
||||||
|
availableAmount: parseInt(item.available_amount) || 0,
|
||||||
|
amountTracking: item.amount_tracking !== false
|
||||||
|
};
|
||||||
|
});
|
||||||
|
updated = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Error refreshing flag date', dateStr, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (updated) {
|
||||||
|
saveMenuCache();
|
||||||
|
updateLastUpdatedTime(new Date().toISOString());
|
||||||
|
updateAlarmBell();
|
||||||
|
renderVisibleWeeks();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function updateAlarmBell() {
|
function updateAlarmBell() {
|
||||||
const bellBtn = document.getElementById('alarm-bell');
|
const bellBtn = document.getElementById('alarm-bell');
|
||||||
const bellIcon = document.getElementById('alarm-bell-icon');
|
const bellIcon = document.getElementById('alarm-bell-icon');
|
||||||
@@ -2896,12 +2998,14 @@ body {
|
|||||||
|
|
||||||
if (userFlags.size === 0) {
|
if (userFlags.size === 0) {
|
||||||
bellBtn.classList.add('hidden');
|
bellBtn.classList.add('hidden');
|
||||||
|
bellBtn.style.display = 'none';
|
||||||
bellIcon.style.color = 'var(--text-secondary)';
|
bellIcon.style.color = 'var(--text-secondary)';
|
||||||
bellIcon.style.textShadow = 'none';
|
bellIcon.style.textShadow = 'none';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
bellBtn.classList.remove('hidden');
|
bellBtn.classList.remove('hidden');
|
||||||
|
bellBtn.style.display = 'inline-flex';
|
||||||
|
|
||||||
// Check if any flagged item is available
|
// Check if any flagged item is available
|
||||||
let anyAvailable = false;
|
let anyAvailable = false;
|
||||||
@@ -2920,33 +3024,40 @@ body {
|
|||||||
if (anyAvailable) break;
|
if (anyAvailable) break;
|
||||||
}
|
}
|
||||||
|
|
||||||
const lastUpdatedStr = localStorage.getItem('kantine_last_updated');
|
let lastUpdatedStr = localStorage.getItem('kantine_last_updated');
|
||||||
let timeStr = 'Unbekannt';
|
let timeStr = 'gerade eben'; // Fallback instead of Unbekannt
|
||||||
if (lastUpdatedStr) {
|
if (!lastUpdatedStr) {
|
||||||
|
lastUpdatedStr = new Date().toISOString();
|
||||||
|
localStorage.setItem('kantine_last_updated', lastUpdatedStr);
|
||||||
|
}
|
||||||
|
|
||||||
const lastUpdated = new Date(lastUpdatedStr);
|
const lastUpdated = new Date(lastUpdatedStr);
|
||||||
const diffMs = Date.now() - lastUpdated.getTime();
|
const diffMs = Date.now() - lastUpdated.getTime();
|
||||||
const diffMins = Math.floor(diffMs / 60000);
|
const diffMins = Math.floor(diffMs / 60000);
|
||||||
if (diffMins < 60) timeStr = `vor ${diffMins} Min.`;
|
if (diffMins < 1) timeStr = 'gerade eben';
|
||||||
|
else if (diffMins < 60) timeStr = `vor ${diffMins} Min.`;
|
||||||
else timeStr = `vor ${Math.floor(diffMins / 60)} Std.`;
|
else timeStr = `vor ${Math.floor(diffMins / 60)} Std.`;
|
||||||
}
|
|
||||||
bellBtn.title = `Zuletzt geprüft: ${timeStr}`;
|
bellBtn.title = `Zuletzt geprüft: ${timeStr}`;
|
||||||
|
|
||||||
if (anyAvailable) {
|
if (anyAvailable) {
|
||||||
bellIcon.style.color = 'var(--success-color)';
|
bellIcon.style.color = '#10b981'; // green / success
|
||||||
bellIcon.style.textShadow = '0 0 10px rgba(16, 185, 129, 0.4)';
|
bellIcon.style.textShadow = '0 0 10px rgba(16, 185, 129, 0.4)';
|
||||||
} else {
|
} else {
|
||||||
bellIcon.style.color = 'var(--warning-color)';
|
bellIcon.style.color = '#f59e0b'; // yellow / warning
|
||||||
bellIcon.style.textShadow = '0 0 10px rgba(245, 158, 11, 0.4)';
|
bellIcon.style.textShadow = '0 0 10px rgba(245, 158, 11, 0.4)';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function toggleFlag(date, articleId, name, cutoff) {
|
function toggleFlag(date, articleId, name, cutoff) {
|
||||||
const id = `${date}_${articleId}`;
|
const id = `${date}_${articleId}`;
|
||||||
|
let flagAdded = false;
|
||||||
if (userFlags.has(id)) {
|
if (userFlags.has(id)) {
|
||||||
userFlags.delete(id);
|
userFlags.delete(id);
|
||||||
showToast(`Flag entfernt für ${name}`, 'success');
|
showToast(`Flag entfernt für ${name}`, 'success');
|
||||||
} else {
|
} else {
|
||||||
userFlags.add(id);
|
userFlags.add(id);
|
||||||
|
flagAdded = true;
|
||||||
showToast(`Benachrichtigung aktiviert für ${name}`, 'success');
|
showToast(`Benachrichtigung aktiviert für ${name}`, 'success');
|
||||||
if (Notification.permission === 'default') {
|
if (Notification.permission === 'default') {
|
||||||
Notification.requestPermission();
|
Notification.requestPermission();
|
||||||
@@ -2955,17 +3066,36 @@ body {
|
|||||||
saveFlags();
|
saveFlags();
|
||||||
updateAlarmBell();
|
updateAlarmBell();
|
||||||
renderVisibleWeeks();
|
renderVisibleWeeks();
|
||||||
|
|
||||||
|
if (flagAdded) {
|
||||||
|
refreshFlaggedItems();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// FR-019: Auto-remove flags whose cutoff has passed
|
// FR-019: Auto-remove flags whose cutoff has passed
|
||||||
function cleanupExpiredFlags() {
|
function cleanupExpiredFlags() {
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
|
const todayStr = now.toISOString().split('T')[0]; // Format: YYYY-MM-DD
|
||||||
let changed = false;
|
let changed = false;
|
||||||
|
|
||||||
for (const flagId of [...userFlags]) {
|
for (const flagId of [...userFlags]) {
|
||||||
const [date] = flagId.split('_');
|
const [dateStr] = flagId.split('_'); // Format usually is YYYY-MM-DD
|
||||||
const cutoff = new Date(date);
|
|
||||||
|
// If the flag's date string is entirely in the past (before today)
|
||||||
|
// or if it's today but past the 10:00 cutoff time
|
||||||
|
let isExpired = false;
|
||||||
|
|
||||||
|
if (dateStr < todayStr) {
|
||||||
|
isExpired = true;
|
||||||
|
} else if (dateStr === todayStr) {
|
||||||
|
const cutoff = new Date(dateStr);
|
||||||
cutoff.setHours(10, 0, 0, 0); // Standard cutoff 10:00
|
cutoff.setHours(10, 0, 0, 0); // Standard cutoff 10:00
|
||||||
if (now >= cutoff) {
|
if (now >= cutoff) {
|
||||||
|
isExpired = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isExpired) {
|
||||||
userFlags.delete(flagId);
|
userFlags.delete(flagId);
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
@@ -3481,13 +3611,18 @@ body {
|
|||||||
badge.classList.add('has-highlights');
|
badge.classList.add('has-highlights');
|
||||||
}
|
}
|
||||||
|
|
||||||
// FR-092: Highlight Next Week Button when new data arrives
|
// FR-092: Glow Next Week button while data exists but no orders placed
|
||||||
|
if (daysWithOrders === 0) {
|
||||||
|
btnNextWeek.classList.add('new-week-available');
|
||||||
|
// One-time toast notification when new data first arrives
|
||||||
const storageKey = `kantine_notified_nextweek_${nextYear}_${nextWeek}`;
|
const storageKey = `kantine_notified_nextweek_${nextYear}_${nextWeek}`;
|
||||||
if (!localStorage.getItem(storageKey)) {
|
if (!localStorage.getItem(storageKey)) {
|
||||||
localStorage.setItem(storageKey, 'true');
|
localStorage.setItem(storageKey, 'true');
|
||||||
btnNextWeek.classList.add('new-week-available');
|
|
||||||
showToast('Neue Menüdaten für nächste Woche verfügbar!', 'info');
|
showToast('Neue Menüdaten für nächste Woche verfügbar!', 'info');
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
btnNextWeek.classList.remove('new-week-available');
|
||||||
|
}
|
||||||
|
|
||||||
} else if (badge) {
|
} else if (badge) {
|
||||||
badge.remove();
|
badge.remove();
|
||||||
@@ -3895,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.12';
|
const currentVersion = 'v1.5.0';
|
||||||
const devMode = localStorage.getItem('kantine_dev_mode') === 'true';
|
const devMode = localStorage.getItem('kantine_dev_mode') === 'true';
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -3936,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.12';
|
const currentVersion = 'v1.5.0';
|
||||||
|
|
||||||
if (!modal) return;
|
if (!modal) return;
|
||||||
modal.classList.remove('hidden');
|
modal.classList.remove('hidden');
|
||||||
@@ -4033,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)
|
||||||
@@ -4097,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!',
|
||||||
@@ -4106,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 |
29
favicon.svg
Executable file
29
favicon.svg
Executable file
@@ -0,0 +1,29 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" width="64" height="64">
|
||||||
|
<!-- Fork (left, with gap to triangle) -->
|
||||||
|
<g transform="translate(2, 10)">
|
||||||
|
<!-- Tines -->
|
||||||
|
<rect x="1" y="0" width="1.8" height="16" rx="0.9" fill="#333"/>
|
||||||
|
<rect x="4.6" y="0" width="1.8" height="16" rx="0.9" fill="#333"/>
|
||||||
|
<rect x="8.2" y="0" width="1.8" height="16" rx="0.9" fill="#333"/>
|
||||||
|
<!-- Connector -->
|
||||||
|
<rect x="1" y="14" width="9" height="3.5" rx="1.5" fill="#333"/>
|
||||||
|
<!-- Handle -->
|
||||||
|
<rect x="3.5" y="16.5" width="4" height="24" rx="2" fill="#333"/>
|
||||||
|
</g>
|
||||||
|
|
||||||
|
<!-- Triangle (center, equilateral aspect ratio ~1:0.866) -->
|
||||||
|
<!-- Equilateral: base=28, height=24.25 => keeps proper ratio -->
|
||||||
|
<polygon points="32,8 47,48 17,48" fill="none" stroke="#333" stroke-width="4" stroke-linejoin="round"/>
|
||||||
|
|
||||||
|
<!-- Knife (right, with gap to triangle) -->
|
||||||
|
<g transform="translate(50, 10)">
|
||||||
|
<!-- Blade (slight curve) -->
|
||||||
|
<path d="M3,0 C3,0 3,0 3,0 L3,17 L10,14 C10,6 7,0 3,0 Z" fill="#333"/>
|
||||||
|
<!-- Spine -->
|
||||||
|
<rect x="1.5" y="0" width="2" height="18" rx="1" fill="#333"/>
|
||||||
|
<!-- Bolster -->
|
||||||
|
<rect x="1.5" y="16.5" width="8.5" height="3.5" rx="1.2" fill="#333"/>
|
||||||
|
<!-- Handle -->
|
||||||
|
<rect x="3.5" y="19" width="4" height="22" rx="2" fill="#333"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.3 KiB |
BIN
favicon_base.png
Executable file
BIN
favicon_base.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 MiB |
205
kantine.js
205
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,6 +50,16 @@
|
|||||||
// Replace entire page content
|
// Replace entire page content
|
||||||
document.title = 'Kantine Weekly Menu';
|
document.title = 'Kantine Weekly Menu';
|
||||||
|
|
||||||
|
// Inject custom favicon (triangle + fork & knife PNG)
|
||||||
|
if (document.querySelectorAll) {
|
||||||
|
document.querySelectorAll('link[rel*="icon"]').forEach(el => el.remove());
|
||||||
|
}
|
||||||
|
const favicon = document.createElement('link');
|
||||||
|
favicon.rel = 'icon';
|
||||||
|
favicon.type = 'image/png';
|
||||||
|
favicon.href = '{{FAVICON_DATA_URI}}';
|
||||||
|
document.head.appendChild(favicon);
|
||||||
|
|
||||||
// Inject Google Fonts if not already present
|
// Inject Google Fonts if not already present
|
||||||
if (!document.querySelector('link[href*="fonts.googleapis.com/css2?family=Inter"]')) {
|
if (!document.querySelector('link[href*="fonts.googleapis.com/css2?family=Inter"]')) {
|
||||||
const fontLink = document.createElement('link');
|
const fontLink = document.createElement('link');
|
||||||
@@ -231,6 +241,9 @@
|
|||||||
<a href="https://github.com/TauNeutrino/kantine-overview/discussions/categories/ideas" target="_blank" rel="noopener noreferrer" style="color: var(--primary-color); text-decoration: none; display: flex; align-items: center; gap: 0.5rem;" title="Schlage ein neues Feature auf GitHub vor">
|
<a href="https://github.com/TauNeutrino/kantine-overview/discussions/categories/ideas" target="_blank" rel="noopener noreferrer" style="color: var(--primary-color); text-decoration: none; display: flex; align-items: center; gap: 0.5rem;" title="Schlage ein neues Feature auf GitHub vor">
|
||||||
<span class="material-icons-round" style="font-size: 1.2em;">lightbulb</span> Feature vorschlagen
|
<span class="material-icons-round" style="font-size: 1.2em;">lightbulb</span> Feature vorschlagen
|
||||||
</a>
|
</a>
|
||||||
|
<button id="btn-clear-cache" style="background: none; border: none; padding: 0; color: var(--error-color); text-decoration: none; display: flex; align-items: center; gap: 0.5rem; cursor: pointer; text-align: left; font-size: inherit; font-family: inherit;" title="Löscht alle lokalen Daten & erzwingt einen Neuladen">
|
||||||
|
<span class="material-icons-round" style="font-size: 1.2em;">delete_forever</span> Lokalen Cache leeren
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -278,6 +291,18 @@
|
|||||||
const historyModal = document.getElementById('history-modal');
|
const historyModal = document.getElementById('history-modal');
|
||||||
const btnHistoryClose = document.getElementById('btn-history-close');
|
const btnHistoryClose = document.getElementById('btn-history-close');
|
||||||
|
|
||||||
|
if (btnHighlights) {
|
||||||
|
btnHighlights.addEventListener('click', () => {
|
||||||
|
highlightsModal.classList.remove('hidden');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (btnHighlightsClose) {
|
||||||
|
btnHighlightsClose.addEventListener('click', () => {
|
||||||
|
highlightsModal.classList.add('hidden');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
btnHistory.addEventListener('click', () => {
|
btnHistory.addEventListener('click', () => {
|
||||||
if (!authToken) {
|
if (!authToken) {
|
||||||
loginModal.classList.remove('hidden');
|
loginModal.classList.remove('hidden');
|
||||||
@@ -315,6 +340,21 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const btnClearCache = document.getElementById('btn-clear-cache');
|
||||||
|
if (btnClearCache) {
|
||||||
|
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.')) {
|
||||||
|
// Only clear our own keys so we don't destroy the host app's (Bessa's) session
|
||||||
|
Object.keys(localStorage).forEach(key => {
|
||||||
|
if (key.startsWith('kantine_')) {
|
||||||
|
localStorage.removeItem(key);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
window.location.reload();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
window.addEventListener('click', (e) => {
|
window.addEventListener('click', (e) => {
|
||||||
if (e.target === versionModal) versionModal.classList.add('hidden');
|
if (e.target === versionModal) versionModal.classList.add('hidden');
|
||||||
});
|
});
|
||||||
@@ -423,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 {
|
||||||
@@ -433,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);
|
||||||
@@ -464,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();
|
||||||
@@ -488,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -503,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');
|
||||||
@@ -555,6 +595,7 @@
|
|||||||
}
|
}
|
||||||
console.log(`Fetched ${results.length} orders, mapped active ones.`);
|
console.log(`Fetched ${results.length} orders, mapped active ones.`);
|
||||||
renderVisibleWeeks();
|
renderVisibleWeeks();
|
||||||
|
updateNextWeekBadge();
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Error fetching orders:', error);
|
console.error('Error fetching orders:', error);
|
||||||
@@ -870,7 +911,7 @@
|
|||||||
venue: VENUE_ID,
|
venue: VENUE_ID,
|
||||||
states: [],
|
states: [],
|
||||||
order_state: 1,
|
order_state: 1,
|
||||||
date: `${date}T10:00:00.000Z`,
|
date: `${date}T10:30:00Z`,
|
||||||
payment_method: 'payroll',
|
payment_method: 'payroll',
|
||||||
customer: {
|
customer: {
|
||||||
first_name: userData.first_name,
|
first_name: userData.first_name,
|
||||||
@@ -878,7 +919,7 @@
|
|||||||
email: userData.email,
|
email: userData.email,
|
||||||
newsletter: false
|
newsletter: false
|
||||||
},
|
},
|
||||||
preorder: false,
|
preorder: true,
|
||||||
delivery_fee: 0,
|
delivery_fee: 0,
|
||||||
cash_box_table_name: null,
|
cash_box_table_name: null,
|
||||||
take_away: false
|
take_away: false
|
||||||
@@ -939,6 +980,67 @@
|
|||||||
localStorage.setItem('kantine_flags', JSON.stringify([...userFlags]));
|
localStorage.setItem('kantine_flags', JSON.stringify([...userFlags]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function refreshFlaggedItems() {
|
||||||
|
if (userFlags.size === 0) return;
|
||||||
|
const token = authToken || GUEST_TOKEN;
|
||||||
|
const datesToFetch = new Set();
|
||||||
|
|
||||||
|
for (const flagId of userFlags) {
|
||||||
|
const [dateStr] = flagId.split('_');
|
||||||
|
datesToFetch.add(dateStr);
|
||||||
|
}
|
||||||
|
|
||||||
|
let updated = false;
|
||||||
|
for (const dateStr of datesToFetch) {
|
||||||
|
try {
|
||||||
|
const resp = await fetch(`${API_BASE}/venues/${VENUE_ID}/menu/${MENU_ID}/${dateStr}/`, {
|
||||||
|
headers: apiHeaders(token)
|
||||||
|
});
|
||||||
|
if (!resp.ok) continue;
|
||||||
|
const data = await resp.json();
|
||||||
|
const menuGroups = data.results || [];
|
||||||
|
let dayItems = [];
|
||||||
|
for (const group of menuGroups) {
|
||||||
|
if (group.items && Array.isArray(group.items)) {
|
||||||
|
dayItems = dayItems.concat(group.items);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update allWeeks in memory
|
||||||
|
for (let week of allWeeks) {
|
||||||
|
if (!week.days) continue;
|
||||||
|
let dayObj = week.days.find(d => d.date === dateStr);
|
||||||
|
if (dayObj) {
|
||||||
|
dayObj.items = dayItems.map(item => {
|
||||||
|
const isUnlimited = item.amount_tracking === false;
|
||||||
|
const hasStock = parseInt(item.available_amount) > 0;
|
||||||
|
return {
|
||||||
|
id: `${dateStr}_${item.id}`,
|
||||||
|
articleId: item.id,
|
||||||
|
name: item.name || 'Unknown',
|
||||||
|
description: item.description || '',
|
||||||
|
price: parseFloat(item.price) || 0,
|
||||||
|
available: isUnlimited || hasStock,
|
||||||
|
availableAmount: parseInt(item.available_amount) || 0,
|
||||||
|
amountTracking: item.amount_tracking !== false
|
||||||
|
};
|
||||||
|
});
|
||||||
|
updated = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error('Error refreshing flag date', dateStr, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (updated) {
|
||||||
|
saveMenuCache();
|
||||||
|
updateLastUpdatedTime(new Date().toISOString());
|
||||||
|
updateAlarmBell();
|
||||||
|
renderVisibleWeeks();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function updateAlarmBell() {
|
function updateAlarmBell() {
|
||||||
const bellBtn = document.getElementById('alarm-bell');
|
const bellBtn = document.getElementById('alarm-bell');
|
||||||
const bellIcon = document.getElementById('alarm-bell-icon');
|
const bellIcon = document.getElementById('alarm-bell-icon');
|
||||||
@@ -946,12 +1048,14 @@
|
|||||||
|
|
||||||
if (userFlags.size === 0) {
|
if (userFlags.size === 0) {
|
||||||
bellBtn.classList.add('hidden');
|
bellBtn.classList.add('hidden');
|
||||||
|
bellBtn.style.display = 'none';
|
||||||
bellIcon.style.color = 'var(--text-secondary)';
|
bellIcon.style.color = 'var(--text-secondary)';
|
||||||
bellIcon.style.textShadow = 'none';
|
bellIcon.style.textShadow = 'none';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
bellBtn.classList.remove('hidden');
|
bellBtn.classList.remove('hidden');
|
||||||
|
bellBtn.style.display = 'inline-flex';
|
||||||
|
|
||||||
// Check if any flagged item is available
|
// Check if any flagged item is available
|
||||||
let anyAvailable = false;
|
let anyAvailable = false;
|
||||||
@@ -970,33 +1074,40 @@
|
|||||||
if (anyAvailable) break;
|
if (anyAvailable) break;
|
||||||
}
|
}
|
||||||
|
|
||||||
const lastUpdatedStr = localStorage.getItem('kantine_last_updated');
|
let lastUpdatedStr = localStorage.getItem('kantine_last_updated');
|
||||||
let timeStr = 'Unbekannt';
|
let timeStr = 'gerade eben'; // Fallback instead of Unbekannt
|
||||||
if (lastUpdatedStr) {
|
if (!lastUpdatedStr) {
|
||||||
|
lastUpdatedStr = new Date().toISOString();
|
||||||
|
localStorage.setItem('kantine_last_updated', lastUpdatedStr);
|
||||||
|
}
|
||||||
|
|
||||||
const lastUpdated = new Date(lastUpdatedStr);
|
const lastUpdated = new Date(lastUpdatedStr);
|
||||||
const diffMs = Date.now() - lastUpdated.getTime();
|
const diffMs = Date.now() - lastUpdated.getTime();
|
||||||
const diffMins = Math.floor(diffMs / 60000);
|
const diffMins = Math.floor(diffMs / 60000);
|
||||||
if (diffMins < 60) timeStr = `vor ${diffMins} Min.`;
|
if (diffMins < 1) timeStr = 'gerade eben';
|
||||||
|
else if (diffMins < 60) timeStr = `vor ${diffMins} Min.`;
|
||||||
else timeStr = `vor ${Math.floor(diffMins / 60)} Std.`;
|
else timeStr = `vor ${Math.floor(diffMins / 60)} Std.`;
|
||||||
}
|
|
||||||
bellBtn.title = `Zuletzt geprüft: ${timeStr}`;
|
bellBtn.title = `Zuletzt geprüft: ${timeStr}`;
|
||||||
|
|
||||||
if (anyAvailable) {
|
if (anyAvailable) {
|
||||||
bellIcon.style.color = 'var(--success-color)';
|
bellIcon.style.color = '#10b981'; // green / success
|
||||||
bellIcon.style.textShadow = '0 0 10px rgba(16, 185, 129, 0.4)';
|
bellIcon.style.textShadow = '0 0 10px rgba(16, 185, 129, 0.4)';
|
||||||
} else {
|
} else {
|
||||||
bellIcon.style.color = 'var(--warning-color)';
|
bellIcon.style.color = '#f59e0b'; // yellow / warning
|
||||||
bellIcon.style.textShadow = '0 0 10px rgba(245, 158, 11, 0.4)';
|
bellIcon.style.textShadow = '0 0 10px rgba(245, 158, 11, 0.4)';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function toggleFlag(date, articleId, name, cutoff) {
|
function toggleFlag(date, articleId, name, cutoff) {
|
||||||
const id = `${date}_${articleId}`;
|
const id = `${date}_${articleId}`;
|
||||||
|
let flagAdded = false;
|
||||||
if (userFlags.has(id)) {
|
if (userFlags.has(id)) {
|
||||||
userFlags.delete(id);
|
userFlags.delete(id);
|
||||||
showToast(`Flag entfernt für ${name}`, 'success');
|
showToast(`Flag entfernt für ${name}`, 'success');
|
||||||
} else {
|
} else {
|
||||||
userFlags.add(id);
|
userFlags.add(id);
|
||||||
|
flagAdded = true;
|
||||||
showToast(`Benachrichtigung aktiviert für ${name}`, 'success');
|
showToast(`Benachrichtigung aktiviert für ${name}`, 'success');
|
||||||
if (Notification.permission === 'default') {
|
if (Notification.permission === 'default') {
|
||||||
Notification.requestPermission();
|
Notification.requestPermission();
|
||||||
@@ -1005,17 +1116,36 @@
|
|||||||
saveFlags();
|
saveFlags();
|
||||||
updateAlarmBell();
|
updateAlarmBell();
|
||||||
renderVisibleWeeks();
|
renderVisibleWeeks();
|
||||||
|
|
||||||
|
if (flagAdded) {
|
||||||
|
refreshFlaggedItems();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// FR-019: Auto-remove flags whose cutoff has passed
|
// FR-019: Auto-remove flags whose cutoff has passed
|
||||||
function cleanupExpiredFlags() {
|
function cleanupExpiredFlags() {
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
|
const todayStr = now.toISOString().split('T')[0]; // Format: YYYY-MM-DD
|
||||||
let changed = false;
|
let changed = false;
|
||||||
|
|
||||||
for (const flagId of [...userFlags]) {
|
for (const flagId of [...userFlags]) {
|
||||||
const [date] = flagId.split('_');
|
const [dateStr] = flagId.split('_'); // Format usually is YYYY-MM-DD
|
||||||
const cutoff = new Date(date);
|
|
||||||
|
// If the flag's date string is entirely in the past (before today)
|
||||||
|
// or if it's today but past the 10:00 cutoff time
|
||||||
|
let isExpired = false;
|
||||||
|
|
||||||
|
if (dateStr < todayStr) {
|
||||||
|
isExpired = true;
|
||||||
|
} else if (dateStr === todayStr) {
|
||||||
|
const cutoff = new Date(dateStr);
|
||||||
cutoff.setHours(10, 0, 0, 0); // Standard cutoff 10:00
|
cutoff.setHours(10, 0, 0, 0); // Standard cutoff 10:00
|
||||||
if (now >= cutoff) {
|
if (now >= cutoff) {
|
||||||
|
isExpired = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isExpired) {
|
||||||
userFlags.delete(flagId);
|
userFlags.delete(flagId);
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
@@ -1531,13 +1661,18 @@
|
|||||||
badge.classList.add('has-highlights');
|
badge.classList.add('has-highlights');
|
||||||
}
|
}
|
||||||
|
|
||||||
// FR-092: Highlight Next Week Button when new data arrives
|
// FR-092: Glow Next Week button while data exists but no orders placed
|
||||||
|
if (daysWithOrders === 0) {
|
||||||
|
btnNextWeek.classList.add('new-week-available');
|
||||||
|
// One-time toast notification when new data first arrives
|
||||||
const storageKey = `kantine_notified_nextweek_${nextYear}_${nextWeek}`;
|
const storageKey = `kantine_notified_nextweek_${nextYear}_${nextWeek}`;
|
||||||
if (!localStorage.getItem(storageKey)) {
|
if (!localStorage.getItem(storageKey)) {
|
||||||
localStorage.setItem(storageKey, 'true');
|
localStorage.setItem(storageKey, 'true');
|
||||||
btnNextWeek.classList.add('new-week-available');
|
|
||||||
showToast('Neue Menüdaten für nächste Woche verfügbar!', 'info');
|
showToast('Neue Menüdaten für nächste Woche verfügbar!', 'info');
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
btnNextWeek.classList.remove('new-week-available');
|
||||||
|
}
|
||||||
|
|
||||||
} else if (badge) {
|
} else if (badge) {
|
||||||
badge.remove();
|
badge.remove();
|
||||||
@@ -2083,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)
|
||||||
@@ -2147,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!',
|
||||||
@@ -2156,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
|
||||||
|
|
||||||
|
|||||||
17
syntax_check.js
Executable file
17
syntax_check.js
Executable file
@@ -0,0 +1,17 @@
|
|||||||
|
const fs = require('fs');
|
||||||
|
const jsCode = fs.readFileSync('kantine.js', 'utf8')
|
||||||
|
.replace('(function () {', '')
|
||||||
|
.replace('})();', '')
|
||||||
|
.replace('if (window.__KANTINE_LOADED) return;', '');
|
||||||
|
const testCode = `
|
||||||
|
console.log("TEST");
|
||||||
|
`;
|
||||||
|
const code = jsCode + '\n' + testCode;
|
||||||
|
try {
|
||||||
|
const vm = require('vm');
|
||||||
|
new vm.Script(code);
|
||||||
|
} catch (e) {
|
||||||
|
if(e.stack) {
|
||||||
|
console.log("Syntax error at:", e.stack.split('\n').slice(0,3).join('\n'));
|
||||||
|
}
|
||||||
|
}
|
||||||
184
tests/test_dom.js
Executable file
184
tests/test_dom.js
Executable file
@@ -0,0 +1,184 @@
|
|||||||
|
const fs = require('fs');
|
||||||
|
fs.writeFileSync('trace.log', '');
|
||||||
|
function log(m) { fs.appendFileSync('trace.log', m + '\n'); }
|
||||||
|
|
||||||
|
log("Initializing JSDOM...");
|
||||||
|
const jsdom = require('jsdom');
|
||||||
|
const { JSDOM } = jsdom;
|
||||||
|
|
||||||
|
log("Reading html...");
|
||||||
|
const html = `
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<style>
|
||||||
|
.hidden { display: none !important; }
|
||||||
|
.icon-btn { display: inline-flex; }
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<button id="alarm-bell" class="icon-btn hidden">
|
||||||
|
<span id="alarm-bell-icon" style="color:var(--text-secondary);"></span>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<!-- Mocks for Highlights Feature -->
|
||||||
|
<button id="btn-highlights">Highlights</button>
|
||||||
|
<div id="highlights-modal" class="modal hidden">
|
||||||
|
<button id="btn-highlights-close">Close</button>
|
||||||
|
<input id="tag-input" type="text" />
|
||||||
|
<button id="btn-add-tag">Add</button>
|
||||||
|
<ul id="tags-list"></ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Mocks for Login Modal -->
|
||||||
|
<button id="btn-login-open">Login</button>
|
||||||
|
<div id="login-modal" class="modal hidden">
|
||||||
|
<button id="btn-login-close">Close</button>
|
||||||
|
<form id="login-form"></form>
|
||||||
|
<div id="login-error" class="hidden"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Mocks for History Modal -->
|
||||||
|
<button id="btn-history">History</button>
|
||||||
|
<div id="history-modal" class="modal hidden">
|
||||||
|
<button id="btn-history-close">Close</button>
|
||||||
|
<div id="history-loading" class="hidden"></div>
|
||||||
|
<div id="history-content"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Mocks for Version Modal -->
|
||||||
|
<span class="version-tag">v1.4.17</span>
|
||||||
|
<div id="version-modal" class="modal hidden">
|
||||||
|
<button id="btn-version-close">Close</button>
|
||||||
|
<button id="btn-clear-cache">Clear</button>
|
||||||
|
<span id="version-current"></span>
|
||||||
|
<div id="version-list-container"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Mocks for Theme Toggle -->
|
||||||
|
<button id="theme-toggle"><span class="theme-icon">light_mode</span></button>
|
||||||
|
|
||||||
|
<!-- Mocks for Navigation Tabs -->
|
||||||
|
<button id="btn-this-week" class="active">This Week</button>
|
||||||
|
<button id="btn-next-week">Next Week</button>
|
||||||
|
|
||||||
|
<button id="btn-refresh">Refresh</button>
|
||||||
|
<button id="btn-logout">Logout</button>
|
||||||
|
<div class="order-history-header">Header</div>
|
||||||
|
<button id="btn-error-redirect">Error Redirect</button>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
`;
|
||||||
|
|
||||||
|
log("Reading file jsCode...");
|
||||||
|
const jsCode = fs.readFileSync('kantine.js', 'utf8')
|
||||||
|
.replace('(function () {', '')
|
||||||
|
.replace('})();', '')
|
||||||
|
.replace('if (window.__KANTINE_LOADED) return;', '')
|
||||||
|
.replace('window.location.reload();', 'window.__RELOAD_CALLED = true;');
|
||||||
|
|
||||||
|
log("Instantiating JSDOM...");
|
||||||
|
const dom = new JSDOM(html, { runScripts: "dangerously", url: "http://localhost/" });
|
||||||
|
log("JSDOM dom created...");
|
||||||
|
global.window = dom.window;
|
||||||
|
global.document = window.document;
|
||||||
|
global.localStorage = { getItem: () => '[]', setItem: () => { } };
|
||||||
|
global.sessionStorage = { getItem: () => null };
|
||||||
|
|
||||||
|
global.showToast = () => { };
|
||||||
|
global.saveFlags = () => { };
|
||||||
|
global.renderVisibleWeeks = () => { };
|
||||||
|
// Mock missing browser features if needed
|
||||||
|
global.Notification = { permission: 'default', requestPermission: () => { } };
|
||||||
|
global.window.matchMedia = () => ({ matches: false, addListener: () => { }, removeListener: () => { } });
|
||||||
|
global.fetch = () => Promise.resolve({ ok: true, json: () => Promise.resolve({ results: [] }) });
|
||||||
|
global.window.fetch = global.fetch;
|
||||||
|
|
||||||
|
log("Before eval...");
|
||||||
|
const testCode = `
|
||||||
|
console.log("--- Testing Alarm Bell ---");
|
||||||
|
// Add flag
|
||||||
|
userFlags.add('2026-02-24_123'); updateAlarmBell();
|
||||||
|
if (document.getElementById('alarm-bell').className.includes('hidden')) throw new Error("Bell should be visible");
|
||||||
|
|
||||||
|
// Remove flag
|
||||||
|
userFlags.delete('2026-02-24_123'); updateAlarmBell();
|
||||||
|
if (!document.getElementById('alarm-bell').className.includes('hidden')) throw new Error("Bell should be hidden");
|
||||||
|
|
||||||
|
console.log("✅ Alarm Bell Test Passed");
|
||||||
|
|
||||||
|
console.log("--- Testing Highlights Modal ---");
|
||||||
|
// First, verify initial state
|
||||||
|
const hlModal = document.getElementById('highlights-modal');
|
||||||
|
if (!hlModal.classList.contains('hidden')) throw new Error("Highlights modal should be hidden initially");
|
||||||
|
|
||||||
|
// Click to open
|
||||||
|
document.getElementById('btn-highlights').click();
|
||||||
|
if (hlModal.classList.contains('hidden')) throw new Error("Highlights modal did not open upon clicking btn-highlights!");
|
||||||
|
|
||||||
|
// Click to close
|
||||||
|
document.getElementById('btn-highlights-close').click();
|
||||||
|
if (!hlModal.classList.contains('hidden')) throw new Error("Highlights modal did not close upon clicking btn-highlights-close!");
|
||||||
|
|
||||||
|
console.log("✅ Highlights Modal Test Passed");
|
||||||
|
|
||||||
|
console.log("--- Testing Login Modal ---");
|
||||||
|
const loginModal = document.getElementById('login-modal');
|
||||||
|
document.getElementById('btn-login-open').click();
|
||||||
|
if (loginModal.classList.contains('hidden')) throw new Error("Login modal should open");
|
||||||
|
document.getElementById('btn-login-close').click();
|
||||||
|
if (!loginModal.classList.contains('hidden')) throw new Error("Login modal should close");
|
||||||
|
console.log("✅ Login Modal Test Passed");
|
||||||
|
|
||||||
|
console.log("--- Testing History Modal ---");
|
||||||
|
// We need authToken to be truthy to open history modal
|
||||||
|
authToken = "fake_token";
|
||||||
|
const historyModal = document.getElementById('history-modal');
|
||||||
|
document.getElementById('btn-history').click();
|
||||||
|
if (historyModal.classList.contains('hidden')) throw new Error("History modal should open");
|
||||||
|
document.getElementById('btn-history-close').click();
|
||||||
|
if (!historyModal.classList.contains('hidden')) throw new Error("History modal should close");
|
||||||
|
console.log("✅ History Modal Test Passed");
|
||||||
|
|
||||||
|
console.log("--- Testing Version Modal ---");
|
||||||
|
const versionModal = document.getElementById('version-modal');
|
||||||
|
document.querySelector('.version-tag').click();
|
||||||
|
if (versionModal.classList.contains('hidden')) throw new Error("Version modal should open");
|
||||||
|
document.getElementById('btn-version-close').click();
|
||||||
|
if (!versionModal.classList.contains('hidden')) throw new Error("Version modal should close");
|
||||||
|
console.log("✅ Version Modal Test Passed");
|
||||||
|
|
||||||
|
console.log("--- Testing Theme Toggle ---");
|
||||||
|
const themeBtn = document.getElementById('theme-toggle');
|
||||||
|
const initialTheme = document.documentElement.getAttribute('data-theme');
|
||||||
|
themeBtn.click();
|
||||||
|
const newTheme = document.documentElement.getAttribute('data-theme');
|
||||||
|
if (initialTheme === newTheme) throw new Error("Theme did not toggle");
|
||||||
|
console.log("✅ Theme Toggle Test Passed");
|
||||||
|
|
||||||
|
console.log("--- Testing Navigation Tabs ---");
|
||||||
|
const btnThis = document.getElementById('btn-this-week');
|
||||||
|
const btnNext = document.getElementById('btn-next-week');
|
||||||
|
btnNext.click();
|
||||||
|
if (!btnNext.classList.contains('active') || btnThis.classList.contains('active')) throw new Error("Next week tab not active");
|
||||||
|
btnThis.click();
|
||||||
|
if (!btnThis.classList.contains('active') || btnNext.classList.contains('active')) throw new Error("This week tab not active");
|
||||||
|
console.log("✅ Navigation Tabs Test Passed");
|
||||||
|
|
||||||
|
console.log("--- Testing Clear Cache Button ---");
|
||||||
|
// Mock confirm directly inside evaluated JSDOM context
|
||||||
|
window.confirm = () => true;
|
||||||
|
document.getElementById('btn-clear-cache').click();
|
||||||
|
if (!window.__RELOAD_CALLED) throw new Error("Clear cache did not reload the page");
|
||||||
|
console.log("✅ Clear Cache Button Test Passed");
|
||||||
|
|
||||||
|
window.__TEST_PASSED = true;
|
||||||
|
`;
|
||||||
|
|
||||||
|
dom.window.eval(jsCode + "\n" + testCode);
|
||||||
|
|
||||||
|
if (!dom.window.__TEST_PASSED) {
|
||||||
|
throw new Error("Tests failed to reach completion inside JSDOM.");
|
||||||
|
}
|
||||||
|
|
||||||
|
process.exit(0);
|
||||||
@@ -1 +1 @@
|
|||||||
v1.4.12
|
v1.5.1
|
||||||
|
|||||||
Reference in New Issue
Block a user