diff --git a/doc/Notes.md b/doc/Notes.md index 5397ec9..9b40588 100644 --- a/doc/Notes.md +++ b/doc/Notes.md @@ -1,3 +1,11 @@ +# ### Achtung! \### +Diese Datei ist nicht mehr aktuell.
+Bitte nutze die neue Wiki unter [https://git.gaminggeneration.de/tobiash/itender/wiki](https://git.gaminggeneration.de/tobiash/itender/wiki) (Wiki des iTender Projekts) + +











+ + + # Notes und kleine Dokumentation Was haben wir bereits am iTender Projekt gemacht? @@ -53,66 +61,35 @@ Was haben wir bereits am iTender Projekt gemacht? - Nach jedem mischen und alle 5 minuten werden die Füllstände der Behälter erfasst - Danach werden auch die verfügbaren Cocktails berechnet, diese werden dann im Webinterface angezeigt -#### Code fakten - -- Inzwischen hat der Programmiercode 14492 Zeilen -- In Stunden wurde das Projekt (Stand 29.11) ~80 Stunden programmiert - -#### Fotos des Webinterfaces (Stand 21.11) - -Main -
-Die Main Pane ist der Hauptteil und direkt die Einstiegsseite des iTenders
-Hier können Getränke ausgewählt werden, welche dann "gemacht" werden - - -

-Menu
-Das Menü ist das Navigationsherz, von hier aus können alle anderen Panels erreicht werden
- -

-Containers
-Hier können die Behälter inhalte aktualisiert werden
-Man wählt die "Zutat" aus und danach wie voll der Behälter nun ist
-In der Regel kann das auch automatisch eingemessen werden, wenn alle Sensoren eingestellt sind
- - - -

-Fill
-Einfach ein "Popup" welches anzeigt dass das Getränk gefüllt wird - - - -

-Setup
-Das Setup ist das erste menü was nach dem ersten einrichten erscheint
-es dient zur Grundkonfiguration - - - -

- - -
- -

### Erklärung der Dateien und Modulen -| Context | Datei | Beschreibung | -|-----------|---------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------| -| iTender | main | Die Hauptdatei, sie ist der Einstiegspunkt des Programms, von hier aus wird die Datenbank verbunden und der Webserver gestartet | -| iTender | MyGPIO | Die eigene GPIO Library von Tobias Hopp. Sie dient zum Steuern von GPIO-Pins am Raspberry Pi | -| iTender | Utils | Hier befinden sich einige schnelle Funktionen, welche des öfteren von mehreren Methoden im Programm genutzt werden | -| iTender | RejectReason, SensorType, RequestType | Ein paar Klassen welche Enums (sogenannte feste Platzhalter für Variablen) bereitstellen | -| iTender | SensorType | Die Art des Sensors, aktuell sind Ultraschallsensoren und Wäge sensoren unterstützt | -| Webserver | App | Die App ist die Instanz des Webservers, welcher für die Oberfläche genutzt wird, dieser wird vom iTender selbst, sowie etwaigen anderen Geräten aufgerufen | -| Webserver | WebsocketApp | Ähnlich wie die normale App, nur spezifisch für die Direktverbindung zwischen Oberfläche und Server | -| iTender | LEDHandler | Übernimmt die Steuerung der WS2812b LEDs | -| iTender | Category | Kategorie des Getränks | -| iTender | Settings | Die Einstellungen des iTenders, werden gespeichert in der config.json | -| Webseite | error.pug, index.pug, layout.pug | Die statische Webseite für den iTender, diese Oberfläche liest die JavaScript Dateien ein und verbindet sich dann mit dem WebSocket (mit dem iTender) | -| Compiler | dist/ Ordner | Hier sind alle kompilierten Dateien zu finden | -| Webserver | web/main | Der Einstiegspunkt für die Weboberfläche, von hier aus wird mit dem WebSocket verbunden | -| | | | +| Context | Datei | Beschreibung | +|--------------------------|---------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| iTender | main | Die Hauptdatei, sie ist der Einstiegspunkt des Programms, von hier aus wird die Datenbank verbunden und der Webserver gestartet | +| iTender | MyGPIO | Die eigene GPIO Library von Tobias Hopp. Sie dient zum Steuern von GPIO-Pins am Raspberry Pi | +| iTender | Utils | Hier befinden sich einige schnelle Funktionen, welche des öfteren von mehreren Methoden im Programm genutzt werden | +| iTender | RejectReason, SensorType, RequestType | Ein paar Klassen welche Enums (sogenannte feste Platzhalter für Variablen) bereitstellen | +| iTender | SensorType | Die Art des Sensors, aktuell sind Ultraschallsensoren und Wäge sensoren unterstützt | +| Webserver | App | Die App ist die Instanz des Webservers, welcher für die Oberfläche genutzt wird, dieser wird vom iTender selbst, sowie etwaigen anderen Geräten aufgerufen | +| Webserver | WebsocketApp | Ähnlich wie die normale App, nur spezifisch für die Direktverbindung zwischen Oberfläche und Server | +| Webserver | WebSocketHandler | Die Server-Seitige WebSocket-Verbindung. Hier werden die Nachrichten an die Oberfläche gesendet und verarbeitet | +| iTender | LEDHandler | Übernimmt die Steuerung der WS2812b LEDs | +| iTender | Category | Kategorie des Getränks | +| iTender | Settings | Die Einstellungen des iTenders, werden gespeichert in der config.json | +| Weboberfläche | error.pug, index.pug, layout.pug | Die statische Webseite für den iTender, diese Oberfläche liest die JavaScript Dateien ein und verbindet sich dann mit dem WebSocket (mit dem iTender) | +| Compiler | dist/ Ordner | Hier sind alle kompilierten Dateien zu finden | +| Webserver | web/main | Der Einstiegspunkt für die Weboberfläche, von hier aus wird mit dem WebSocket verbunden | +| iTender | HX711 | Die Klasse um den HX711 Wäge sensor abzufragen | +| Webserver, Weboberfläche | WebsocketPayload | Das ist die Payload (zu Deutsch Datenpaket), welche sowohl vom Webserver als auch von der Weboberfläche zum kommunizieren genutzt wird | +| Datenbank | database/Container | Hier werden die jeweiligen Container (wo die Inhalte für den Cocktail rein gefüllt werden) gespeichert | +| Datenbank | database/Database | Die Hauptklasse der Datenbank im iTender, sie sorgt für eine statische Verbindung mit der Datenbank und ermöglicht die Abfragen / Speicherungen von Getränken, Behältern und Zutaten | +| Datenbank | database/Drink | Hier werden die Getränke gespeichert, welche vom Server heruntergeladen werden | +| Datenbank | database/Job | Diese Klasse stellt den aktuellen Job des iTenders da, er wird erstellt wenn der Benutzer einen Drink haben möchte. In diesem Job-Objekt sind dann Werte wie die Kalkulation der Dauer, die Zutaten und Mengen, die jeweiligen Pumpen sowie ein Start und Endzeitpunkt festgelegt | +| Datenbank | database/Ingredient | Hier sind die Zutaten für die jeweiligen Drinks gespeichert. Es werden zu allen Drinks referenzen zu diesen Objekten erstellt | +| Weboberfläche | web/Fill | In dieser Klasse werden die Fill-Events erwartet. Sollte der Benutzer ein Getränk haben wollen, wechselt der iTender auf den Status FILLING. Diese Klasse greift das Event auf und zeigt dementsprechend dem Benutzer den aktuellen Status seines Auftrags an | +| Weboberfläche | web/Modal | Diese Klasse ist eine Art Herzstück geworden. Sie ermöglicht das schnelle und einfache Darstellen von Popups für den Benutzer. Beispiele sind Fehler oder Bestätigungsfenster. | +| Weboberfläche | web/Setup | Das Setup erwartet wie die Fill-Klasse ein Event. Hierbei das SETUP-Event. Sollte es "gefeuert" werden, werden hier die nötigen Maßnahmen getroffen um dem Benutzer das Setup anzuzeigen.
| +| Weboberfläche | web/WebHandler | Der WebHandler übernimmt das öffnen von Panels (welches Menü gerade offen ist) sowie dem korrekten Anzeigen aller Drinks welche vom iTender bereitgestellt werden | +| Weboberfläche | web/WebWebSocketHandler | Das Gegenstück zum WebSocketHandler, nur auf Web-Seite. Daher auch das doppelte Web im Namen. Es übernimmt das Verbinden mit dem WebSocket, welcher die Kommunikation zwischen iTender und Oberfläche ermöglicht | +| Weboberfläche | | | diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-300.woff b/public/fonts/Chakra Petch/chakra-petch-v9-latin-300.woff new file mode 100644 index 0000000..a657e18 Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-300.woff differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-300.woff2 b/public/fonts/Chakra Petch/chakra-petch-v9-latin-300.woff2 new file mode 100644 index 0000000..eec3efd Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-300.woff2 differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-300italic.woff b/public/fonts/Chakra Petch/chakra-petch-v9-latin-300italic.woff new file mode 100644 index 0000000..b6e20b4 Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-300italic.woff differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-300italic.woff2 b/public/fonts/Chakra Petch/chakra-petch-v9-latin-300italic.woff2 new file mode 100644 index 0000000..4ddd813 Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-300italic.woff2 differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-500.woff b/public/fonts/Chakra Petch/chakra-petch-v9-latin-500.woff new file mode 100644 index 0000000..17b0032 Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-500.woff differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-500.woff2 b/public/fonts/Chakra Petch/chakra-petch-v9-latin-500.woff2 new file mode 100644 index 0000000..6b77a07 Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-500.woff2 differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-500italic.woff b/public/fonts/Chakra Petch/chakra-petch-v9-latin-500italic.woff new file mode 100644 index 0000000..7a6fc3d Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-500italic.woff differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-500italic.woff2 b/public/fonts/Chakra Petch/chakra-petch-v9-latin-500italic.woff2 new file mode 100644 index 0000000..4dffeda Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-500italic.woff2 differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-600.woff b/public/fonts/Chakra Petch/chakra-petch-v9-latin-600.woff new file mode 100644 index 0000000..7d588a7 Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-600.woff differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-600.woff2 b/public/fonts/Chakra Petch/chakra-petch-v9-latin-600.woff2 new file mode 100644 index 0000000..7cd8fb3 Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-600.woff2 differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-600italic.woff b/public/fonts/Chakra Petch/chakra-petch-v9-latin-600italic.woff new file mode 100644 index 0000000..d7bdd0b Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-600italic.woff differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-600italic.woff2 b/public/fonts/Chakra Petch/chakra-petch-v9-latin-600italic.woff2 new file mode 100644 index 0000000..ac1e786 Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-600italic.woff2 differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-700.woff b/public/fonts/Chakra Petch/chakra-petch-v9-latin-700.woff new file mode 100644 index 0000000..88974a3 Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-700.woff differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-700.woff2 b/public/fonts/Chakra Petch/chakra-petch-v9-latin-700.woff2 new file mode 100644 index 0000000..4402786 Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-700.woff2 differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-700italic.woff b/public/fonts/Chakra Petch/chakra-petch-v9-latin-700italic.woff new file mode 100644 index 0000000..5ea73c3 Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-700italic.woff differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-700italic.woff2 b/public/fonts/Chakra Petch/chakra-petch-v9-latin-700italic.woff2 new file mode 100644 index 0000000..0213a40 Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-700italic.woff2 differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-italic.woff b/public/fonts/Chakra Petch/chakra-petch-v9-latin-italic.woff new file mode 100644 index 0000000..b163a61 Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-italic.woff differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-italic.woff2 b/public/fonts/Chakra Petch/chakra-petch-v9-latin-italic.woff2 new file mode 100644 index 0000000..fe1e88d Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-italic.woff2 differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-regular.woff b/public/fonts/Chakra Petch/chakra-petch-v9-latin-regular.woff new file mode 100644 index 0000000..3da494a Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-regular.woff differ diff --git a/public/fonts/Chakra Petch/chakra-petch-v9-latin-regular.woff2 b/public/fonts/Chakra Petch/chakra-petch-v9-latin-regular.woff2 new file mode 100644 index 0000000..98470dc Binary files /dev/null and b/public/fonts/Chakra Petch/chakra-petch-v9-latin-regular.woff2 differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-200.woff b/public/fonts/Inconsolata/inconsolata-v31-latin-200.woff new file mode 100644 index 0000000..6636bf9 Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-200.woff differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-200.woff2 b/public/fonts/Inconsolata/inconsolata-v31-latin-200.woff2 new file mode 100644 index 0000000..ef3bf06 Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-200.woff2 differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-300.woff b/public/fonts/Inconsolata/inconsolata-v31-latin-300.woff new file mode 100644 index 0000000..08d4834 Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-300.woff differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-300.woff2 b/public/fonts/Inconsolata/inconsolata-v31-latin-300.woff2 new file mode 100644 index 0000000..a837d31 Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-300.woff2 differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-500.woff b/public/fonts/Inconsolata/inconsolata-v31-latin-500.woff new file mode 100644 index 0000000..3221f5f Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-500.woff differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-500.woff2 b/public/fonts/Inconsolata/inconsolata-v31-latin-500.woff2 new file mode 100644 index 0000000..26b61e9 Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-500.woff2 differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-600.woff b/public/fonts/Inconsolata/inconsolata-v31-latin-600.woff new file mode 100644 index 0000000..0ff280a Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-600.woff differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-600.woff2 b/public/fonts/Inconsolata/inconsolata-v31-latin-600.woff2 new file mode 100644 index 0000000..7e7f927 Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-600.woff2 differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-700.woff b/public/fonts/Inconsolata/inconsolata-v31-latin-700.woff new file mode 100644 index 0000000..d24d1a1 Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-700.woff differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-700.woff2 b/public/fonts/Inconsolata/inconsolata-v31-latin-700.woff2 new file mode 100644 index 0000000..010da61 Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-700.woff2 differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-800.woff b/public/fonts/Inconsolata/inconsolata-v31-latin-800.woff new file mode 100644 index 0000000..dd7d59d Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-800.woff differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-800.woff2 b/public/fonts/Inconsolata/inconsolata-v31-latin-800.woff2 new file mode 100644 index 0000000..14a7c1c Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-800.woff2 differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-900.woff b/public/fonts/Inconsolata/inconsolata-v31-latin-900.woff new file mode 100644 index 0000000..db22480 Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-900.woff differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-900.woff2 b/public/fonts/Inconsolata/inconsolata-v31-latin-900.woff2 new file mode 100644 index 0000000..fd349e5 Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-900.woff2 differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-regular.woff b/public/fonts/Inconsolata/inconsolata-v31-latin-regular.woff new file mode 100644 index 0000000..891d79e Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-regular.woff differ diff --git a/public/fonts/Inconsolata/inconsolata-v31-latin-regular.woff2 b/public/fonts/Inconsolata/inconsolata-v31-latin-regular.woff2 new file mode 100644 index 0000000..6119e59 Binary files /dev/null and b/public/fonts/Inconsolata/inconsolata-v31-latin-regular.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-200.woff b/public/fonts/Nunito/nunito-v25-latin-200.woff new file mode 100644 index 0000000..4d444eb Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-200.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-200.woff2 b/public/fonts/Nunito/nunito-v25-latin-200.woff2 new file mode 100644 index 0000000..af85fe6 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-200.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-200italic.woff b/public/fonts/Nunito/nunito-v25-latin-200italic.woff new file mode 100644 index 0000000..41f444c Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-200italic.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-200italic.woff2 b/public/fonts/Nunito/nunito-v25-latin-200italic.woff2 new file mode 100644 index 0000000..0647a00 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-200italic.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-300.woff b/public/fonts/Nunito/nunito-v25-latin-300.woff new file mode 100644 index 0000000..ddb18a9 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-300.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-300.woff2 b/public/fonts/Nunito/nunito-v25-latin-300.woff2 new file mode 100644 index 0000000..04548e2 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-300.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-300italic.woff b/public/fonts/Nunito/nunito-v25-latin-300italic.woff new file mode 100644 index 0000000..d98cec9 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-300italic.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-300italic.woff2 b/public/fonts/Nunito/nunito-v25-latin-300italic.woff2 new file mode 100644 index 0000000..0b43eef Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-300italic.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-500.woff b/public/fonts/Nunito/nunito-v25-latin-500.woff new file mode 100644 index 0000000..ea98a9c Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-500.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-500.woff2 b/public/fonts/Nunito/nunito-v25-latin-500.woff2 new file mode 100644 index 0000000..96f3121 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-500.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-500italic.woff b/public/fonts/Nunito/nunito-v25-latin-500italic.woff new file mode 100644 index 0000000..c5dbc30 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-500italic.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-500italic.woff2 b/public/fonts/Nunito/nunito-v25-latin-500italic.woff2 new file mode 100644 index 0000000..16ec315 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-500italic.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-600.woff b/public/fonts/Nunito/nunito-v25-latin-600.woff new file mode 100644 index 0000000..aa4b811 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-600.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-600.woff2 b/public/fonts/Nunito/nunito-v25-latin-600.woff2 new file mode 100644 index 0000000..5ed5e51 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-600.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-600italic.woff b/public/fonts/Nunito/nunito-v25-latin-600italic.woff new file mode 100644 index 0000000..930a141 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-600italic.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-600italic.woff2 b/public/fonts/Nunito/nunito-v25-latin-600italic.woff2 new file mode 100644 index 0000000..2cf160d Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-600italic.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-700.woff b/public/fonts/Nunito/nunito-v25-latin-700.woff new file mode 100644 index 0000000..6048b67 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-700.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-700.woff2 b/public/fonts/Nunito/nunito-v25-latin-700.woff2 new file mode 100644 index 0000000..d0a5677 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-700.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-700italic.woff b/public/fonts/Nunito/nunito-v25-latin-700italic.woff new file mode 100644 index 0000000..036fa0b Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-700italic.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-700italic.woff2 b/public/fonts/Nunito/nunito-v25-latin-700italic.woff2 new file mode 100644 index 0000000..d8bce57 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-700italic.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-800.woff b/public/fonts/Nunito/nunito-v25-latin-800.woff new file mode 100644 index 0000000..e82ecc7 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-800.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-800.woff2 b/public/fonts/Nunito/nunito-v25-latin-800.woff2 new file mode 100644 index 0000000..63fe567 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-800.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-800italic.woff b/public/fonts/Nunito/nunito-v25-latin-800italic.woff new file mode 100644 index 0000000..5116260 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-800italic.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-800italic.woff2 b/public/fonts/Nunito/nunito-v25-latin-800italic.woff2 new file mode 100644 index 0000000..4ce205d Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-800italic.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-900.woff b/public/fonts/Nunito/nunito-v25-latin-900.woff new file mode 100644 index 0000000..20724ad Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-900.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-900.woff2 b/public/fonts/Nunito/nunito-v25-latin-900.woff2 new file mode 100644 index 0000000..0fbfe77 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-900.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-900italic.woff b/public/fonts/Nunito/nunito-v25-latin-900italic.woff new file mode 100644 index 0000000..3977342 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-900italic.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-900italic.woff2 b/public/fonts/Nunito/nunito-v25-latin-900italic.woff2 new file mode 100644 index 0000000..33edc2f Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-900italic.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-italic.woff b/public/fonts/Nunito/nunito-v25-latin-italic.woff new file mode 100644 index 0000000..e3d10e3 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-italic.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-italic.woff2 b/public/fonts/Nunito/nunito-v25-latin-italic.woff2 new file mode 100644 index 0000000..0017722 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-italic.woff2 differ diff --git a/public/fonts/Nunito/nunito-v25-latin-regular.woff b/public/fonts/Nunito/nunito-v25-latin-regular.woff new file mode 100644 index 0000000..2df129c Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-regular.woff differ diff --git a/public/fonts/Nunito/nunito-v25-latin-regular.woff2 b/public/fonts/Nunito/nunito-v25-latin-regular.woff2 new file mode 100644 index 0000000..8b85e17 Binary files /dev/null and b/public/fonts/Nunito/nunito-v25-latin-regular.woff2 differ diff --git a/public/fonts/Roboto/roboto-v30-latin-100.woff b/public/fonts/Roboto/roboto-v30-latin-100.woff new file mode 100644 index 0000000..a815cf8 Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-100.woff differ diff --git a/public/fonts/Roboto/roboto-v30-latin-100.woff2 b/public/fonts/Roboto/roboto-v30-latin-100.woff2 new file mode 100644 index 0000000..71c9bb7 Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-100.woff2 differ diff --git a/public/fonts/Roboto/roboto-v30-latin-100italic.woff b/public/fonts/Roboto/roboto-v30-latin-100italic.woff new file mode 100644 index 0000000..5c0c285 Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-100italic.woff differ diff --git a/public/fonts/Roboto/roboto-v30-latin-100italic.woff2 b/public/fonts/Roboto/roboto-v30-latin-100italic.woff2 new file mode 100644 index 0000000..4ccadd1 Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-100italic.woff2 differ diff --git a/public/fonts/Roboto/roboto-v30-latin-300.woff b/public/fonts/Roboto/roboto-v30-latin-300.woff new file mode 100644 index 0000000..36979ae Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-300.woff differ diff --git a/public/fonts/Roboto/roboto-v30-latin-300.woff2 b/public/fonts/Roboto/roboto-v30-latin-300.woff2 new file mode 100644 index 0000000..6068138 Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-300.woff2 differ diff --git a/public/fonts/Roboto/roboto-v30-latin-300italic.woff b/public/fonts/Roboto/roboto-v30-latin-300italic.woff new file mode 100644 index 0000000..f52f767 Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-300italic.woff differ diff --git a/public/fonts/Roboto/roboto-v30-latin-300italic.woff2 b/public/fonts/Roboto/roboto-v30-latin-300italic.woff2 new file mode 100644 index 0000000..22c57b0 Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-300italic.woff2 differ diff --git a/public/fonts/Roboto/roboto-v30-latin-500.woff b/public/fonts/Roboto/roboto-v30-latin-500.woff new file mode 100644 index 0000000..d39bb52 Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-500.woff differ diff --git a/public/fonts/Roboto/roboto-v30-latin-500.woff2 b/public/fonts/Roboto/roboto-v30-latin-500.woff2 new file mode 100644 index 0000000..29342a8 Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-500.woff2 differ diff --git a/public/fonts/Roboto/roboto-v30-latin-500italic.woff b/public/fonts/Roboto/roboto-v30-latin-500italic.woff new file mode 100644 index 0000000..b6ad1c5 Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-500italic.woff differ diff --git a/public/fonts/Roboto/roboto-v30-latin-500italic.woff2 b/public/fonts/Roboto/roboto-v30-latin-500italic.woff2 new file mode 100644 index 0000000..ae1933f Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-500italic.woff2 differ diff --git a/public/fonts/Roboto/roboto-v30-latin-700.woff b/public/fonts/Roboto/roboto-v30-latin-700.woff new file mode 100644 index 0000000..db0012d Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-700.woff differ diff --git a/public/fonts/Roboto/roboto-v30-latin-700.woff2 b/public/fonts/Roboto/roboto-v30-latin-700.woff2 new file mode 100644 index 0000000..771fbec Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-700.woff2 differ diff --git a/public/fonts/Roboto/roboto-v30-latin-700italic.woff b/public/fonts/Roboto/roboto-v30-latin-700italic.woff new file mode 100644 index 0000000..17efecc Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-700italic.woff differ diff --git a/public/fonts/Roboto/roboto-v30-latin-700italic.woff2 b/public/fonts/Roboto/roboto-v30-latin-700italic.woff2 new file mode 100644 index 0000000..a56a6ed Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-700italic.woff2 differ diff --git a/public/fonts/Roboto/roboto-v30-latin-900.woff b/public/fonts/Roboto/roboto-v30-latin-900.woff new file mode 100644 index 0000000..04cbe94 Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-900.woff differ diff --git a/public/fonts/Roboto/roboto-v30-latin-900.woff2 b/public/fonts/Roboto/roboto-v30-latin-900.woff2 new file mode 100644 index 0000000..067cb32 Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-900.woff2 differ diff --git a/public/fonts/Roboto/roboto-v30-latin-900italic.woff b/public/fonts/Roboto/roboto-v30-latin-900italic.woff new file mode 100644 index 0000000..4d7794b Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-900italic.woff differ diff --git a/public/fonts/Roboto/roboto-v30-latin-900italic.woff2 b/public/fonts/Roboto/roboto-v30-latin-900italic.woff2 new file mode 100644 index 0000000..59cab0f Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-900italic.woff2 differ diff --git a/public/fonts/Roboto/roboto-v30-latin-italic.woff b/public/fonts/Roboto/roboto-v30-latin-italic.woff new file mode 100644 index 0000000..ebee16b Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-italic.woff differ diff --git a/public/fonts/Roboto/roboto-v30-latin-italic.woff2 b/public/fonts/Roboto/roboto-v30-latin-italic.woff2 new file mode 100644 index 0000000..e1b7a79 Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-italic.woff2 differ diff --git a/public/fonts/Roboto/roboto-v30-latin-regular.woff b/public/fonts/Roboto/roboto-v30-latin-regular.woff new file mode 100644 index 0000000..9eaa94f Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-regular.woff differ diff --git a/public/fonts/Roboto/roboto-v30-latin-regular.woff2 b/public/fonts/Roboto/roboto-v30-latin-regular.woff2 new file mode 100644 index 0000000..020729e Binary files /dev/null and b/public/fonts/Roboto/roboto-v30-latin-regular.woff2 differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-300.woff b/public/fonts/Ubuntu/ubuntu-v20-latin-300.woff new file mode 100644 index 0000000..5bbeb9d Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-300.woff differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-300.woff2 b/public/fonts/Ubuntu/ubuntu-v20-latin-300.woff2 new file mode 100644 index 0000000..b6ecd3a Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-300.woff2 differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-300italic.woff b/public/fonts/Ubuntu/ubuntu-v20-latin-300italic.woff new file mode 100644 index 0000000..a17a40e Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-300italic.woff differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-300italic.woff2 b/public/fonts/Ubuntu/ubuntu-v20-latin-300italic.woff2 new file mode 100644 index 0000000..d6fdf85 Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-300italic.woff2 differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-500.woff b/public/fonts/Ubuntu/ubuntu-v20-latin-500.woff new file mode 100644 index 0000000..2456b4b Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-500.woff differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-500.woff2 b/public/fonts/Ubuntu/ubuntu-v20-latin-500.woff2 new file mode 100644 index 0000000..47657f1 Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-500.woff2 differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-500italic.woff b/public/fonts/Ubuntu/ubuntu-v20-latin-500italic.woff new file mode 100644 index 0000000..a7323d3 Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-500italic.woff differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-500italic.woff2 b/public/fonts/Ubuntu/ubuntu-v20-latin-500italic.woff2 new file mode 100644 index 0000000..744a1b7 Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-500italic.woff2 differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-700.woff b/public/fonts/Ubuntu/ubuntu-v20-latin-700.woff new file mode 100644 index 0000000..e58e9da Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-700.woff differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-700.woff2 b/public/fonts/Ubuntu/ubuntu-v20-latin-700.woff2 new file mode 100644 index 0000000..2c08bc6 Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-700.woff2 differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-700italic.woff b/public/fonts/Ubuntu/ubuntu-v20-latin-700italic.woff new file mode 100644 index 0000000..fb1da8c Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-700italic.woff differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-700italic.woff2 b/public/fonts/Ubuntu/ubuntu-v20-latin-700italic.woff2 new file mode 100644 index 0000000..bd08e15 Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-700italic.woff2 differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-italic.woff b/public/fonts/Ubuntu/ubuntu-v20-latin-italic.woff new file mode 100644 index 0000000..a5cbfea Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-italic.woff differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-italic.woff2 b/public/fonts/Ubuntu/ubuntu-v20-latin-italic.woff2 new file mode 100644 index 0000000..70755ed Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-italic.woff2 differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-regular.woff b/public/fonts/Ubuntu/ubuntu-v20-latin-regular.woff new file mode 100644 index 0000000..24cf9ae Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-regular.woff differ diff --git a/public/fonts/Ubuntu/ubuntu-v20-latin-regular.woff2 b/public/fonts/Ubuntu/ubuntu-v20-latin-regular.woff2 new file mode 100644 index 0000000..8070e4f Binary files /dev/null and b/public/fonts/Ubuntu/ubuntu-v20-latin-regular.woff2 differ diff --git a/public/stylesheets/fonts.css b/public/stylesheets/fonts.css index 9b44389..b5ef1bf 100644 --- a/public/stylesheets/fonts.css +++ b/public/stylesheets/fonts.css @@ -4,8 +4,8 @@ font-style: normal; font-weight: 100; src: local(''), - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-100.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-100.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/Roboto/roboto-v30-latin-100.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/fonts/Roboto/roboto-v30-latin-100.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-100italic - latin */ @@ -14,8 +14,8 @@ font-style: italic; font-weight: 100; src: local(''), - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-100italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-100italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/Roboto/roboto-v30-latin-100italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/fonts/Roboto/roboto-v30-latin-100italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-300 - latin */ @@ -24,8 +24,8 @@ font-style: normal; font-weight: 300; src: local(''), - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/Roboto/roboto-v30-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/fonts/Roboto/roboto-v30-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-300italic - latin */ @@ -34,8 +34,8 @@ font-style: italic; font-weight: 300; src: local(''), - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-300italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-300italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/Roboto/roboto-v30-latin-300italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/fonts/Roboto/roboto-v30-latin-300italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-regular - latin */ @@ -44,8 +44,8 @@ font-style: normal; font-weight: 400; src: local(''), - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/Roboto/roboto-v30-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/fonts/Roboto/roboto-v30-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-italic - latin */ @@ -54,8 +54,8 @@ font-style: italic; font-weight: 400; src: local(''), - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/Roboto/roboto-v30-latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/fonts/Roboto/roboto-v30-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-500 - latin */ @@ -64,8 +64,8 @@ font-style: normal; font-weight: 500; src: local(''), - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/Roboto/roboto-v30-latin-500.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/fonts/Roboto/roboto-v30-latin-500.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-500italic - latin */ @@ -74,8 +74,8 @@ font-style: italic; font-weight: 500; src: local(''), - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-500italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-500italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/Roboto/roboto-v30-latin-500italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/fonts/Roboto/roboto-v30-latin-500italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-700 - latin */ @@ -84,8 +84,8 @@ font-style: normal; font-weight: 700; src: local(''), - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/Roboto/roboto-v30-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/fonts/Roboto/roboto-v30-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-700italic - latin */ @@ -94,8 +94,8 @@ font-style: italic; font-weight: 700; src: local(''), - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/Roboto/roboto-v30-latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/fonts/Roboto/roboto-v30-latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-900 - latin */ @@ -104,8 +104,8 @@ font-style: normal; font-weight: 900; src: local(''), - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-900.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-900.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/Roboto/roboto-v30-latin-900.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/fonts/Roboto/roboto-v30-latin-900.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* roboto-900italic - latin */ @@ -114,6 +114,6 @@ font-style: italic; font-weight: 900; src: local(''), - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-900italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('https://fonts.gaminggeneration.de/Roboto/roboto-v30-latin-900italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('/fonts/Roboto/roboto-v30-latin-900italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('/fonts/Roboto/roboto-v30-latin-900italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } diff --git a/src/test.ts b/src/test.ts deleted file mode 100644 index e69de29..0000000 diff --git a/staticWeb/index.html b/staticWeb/index.html deleted file mode 100644 index 1bfe91e..0000000 --- a/staticWeb/index.html +++ /dev/null @@ -1,28 +0,0 @@ - - -iTender - - - - - - -
-
Status: iTenderVerbinden...
-
- -
-
-
- -
-
-
- - - \ No newline at end of file diff --git a/staticWeb/web.bundle.js b/staticWeb/web.bundle.js deleted file mode 100644 index 21e3fef..0000000 --- a/staticWeb/web.bundle.js +++ /dev/null @@ -1,346 +0,0 @@ -/******/ (() => { // webpackBootstrap -/******/ "use strict"; -/******/ var __webpack_modules__ = ({ - -/***/ "./src/WebSocketEvent.ts": -/*!*******************************!*\ - !*** ./src/WebSocketEvent.ts ***! - \*******************************/ -/***/ ((__unused_webpack_module, exports) => { - - -Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.WebSocketEvent = void 0; -var WebSocketEvent; -(function (WebSocketEvent) { - WebSocketEvent["STATUS"] = "STATUS"; -})(WebSocketEvent = exports.WebSocketEvent || (exports.WebSocketEvent = {})); - - -/***/ }), - -/***/ "./src/WebSocketPayload.ts": -/*!*********************************!*\ - !*** ./src/WebSocketPayload.ts ***! - \*********************************/ -/***/ ((__unused_webpack_module, exports, __webpack_require__) => { - - -Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.WebSocketPayload = void 0; -const WebSocketEvent_1 = __webpack_require__(/*! ./WebSocketEvent */ "./src/WebSocketEvent.ts"); -class WebSocketPayload { - constructor(event, error = false, data) { - this._event = event; - this._error = error; - this._data = data; - } - set event(value) { - this._event = value; - } - set error(value) { - this._error = value; - } - set data(value) { - this._data = value; - } - get event() { - return this._event; - } - get error() { - return this._error; - } - get data() { - return this._data; - } - static parseFromBase64Json(json) { - json = (typeof window != 'undefined') ? atob(json) : Buffer.from(json, "base64").toString(); - let rawPayload; - try { - rawPayload = JSON.parse(json); - } - catch (e) { - return null; - } - let wsEvent = WebSocketEvent_1.WebSocketEvent[rawPayload.event]; - return new WebSocketPayload(wsEvent, rawPayload.error, rawPayload.data); - } - toString() { - let json = JSON.stringify({ "event": this._event, status: this._error, data: this._data }); - json = ((typeof window != 'undefined') ? btoa(json) : Buffer.from(json).toString("base64")); - return json; - } -} -exports.WebSocketPayload = WebSocketPayload; - - -/***/ }), - -/***/ "./src/web/ButtonType.ts": -/*!*******************************!*\ - !*** ./src/web/ButtonType.ts ***! - \*******************************/ -/***/ ((__unused_webpack_module, exports) => { - - -Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.ButtonType = void 0; -var ButtonType; -(function (ButtonType) { - ButtonType["SUCCESS"] = "success"; - ButtonType["ERROR"] = "error"; -})(ButtonType = exports.ButtonType || (exports.ButtonType = {})); - - -/***/ }), - -/***/ "./src/web/Modal.ts": -/*!**************************!*\ - !*** ./src/web/Modal.ts ***! - \**************************/ -/***/ ((__unused_webpack_module, exports) => { - - -Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.Modal = void 0; -class Modal { - constructor(id, title, content) { - this._title = "iTender"; - this._content = ""; - this._id = ""; - this._loader = false; - this._buttons = []; - this._id = id; - this._title = title; - this._content = content; - } - set title(value) { - this._title = value; - } - set content(value) { - this._content = value; - } - set id(value) { - this._id = value; - } - set loader(value) { - this._loader = value; - } - addButton(type, content, onclick) { - this._buttons.push({ type: type, content: content, onclick: onclick }); - } - open() { - if (!this._content) - this._content = ""; - if (this._loader) - this._content += "
\n" + - "
\n" + - "
"; - for (let btn of this._buttons) { - this._content += ``; - } - Modal.open(this._title, this._content, this._id); - } - static open(title, content, id) { - const modal = document.getElementById("modal"); - const modalContent = document.getElementById("modalInnerContent"); - if (!modal || !modalContent) - return; - modalContent.classList.add("modalBlendIn"); - modal.classList.add("modalBlendIn"); - setTimeout(() => { - modalContent.classList.remove("modalBlendIn"); - modal.classList.remove("modalBlendIn"); - }, 800); - modalContent.innerHTML = `

${title}

${content}`; - modal.style.display = "block"; - this.currentModalId = id ? id : "null"; - } - static close(id) { - if (this.currentModalId != id) - return; - const modal = document.getElementById("modal"); - const modalContent = document.getElementById("modal-content"); - const modalInnerContent = document.getElementById("modalInnerContent"); - if (!modal || !modalContent || !modalInnerContent) - return; - modalContent.classList.add("modalBlendOut"); - modal.classList.add("modalBlendOut"); - setTimeout(() => { - modal.style.display = "none"; - modalInnerContent.innerHTML = ""; - modalContent.classList.remove("modalBlendOut"); - modal.classList.remove("modalBlendOut"); - }, 800); - } -} -exports.Modal = Modal; -Modal.currentModalId = ""; - - -/***/ }), - -/***/ "./src/web/WebWebSocketHandler.ts": -/*!****************************************!*\ - !*** ./src/web/WebWebSocketHandler.ts ***! - \****************************************/ -/***/ ((__unused_webpack_module, exports, __webpack_require__) => { - - -Object.defineProperty(exports, "__esModule", ({ value: true })); -exports.WebWebSocketHandler = void 0; -const Modal_1 = __webpack_require__(/*! ./Modal */ "./src/web/Modal.ts"); -const WebSocketEvent_1 = __webpack_require__(/*! ../WebSocketEvent */ "./src/WebSocketEvent.ts"); -const WebSocketPayload_1 = __webpack_require__(/*! ../WebSocketPayload */ "./src/WebSocketPayload.ts"); -const ButtonType_1 = __webpack_require__(/*! ./ButtonType */ "./src/web/ButtonType.ts"); -class WebWebSocketHandler { - constructor() { - this.socket = new WebSocket(WebWebSocketHandler.url); - this.socket.onopen = this.onOpen; - this.socket.onclose = this.onClose; - this.socket.onerror = this.onError; - this.socket.onmessage = this.onMessage; - } - onMessage(msgEvent) { - console.log("[WS] Incoming message", msgEvent); - let payload = WebSocketPayload_1.WebSocketPayload.parseFromBase64Json(msgEvent.data); - if (!payload) { - console.log("[WS] Could not parse message: ", msgEvent); - return; - } - console.debug(payload); - console.debug(payload.event); - console.log("[WS] Received " + payload.event + " Event"); - switch (payload.event) { - case WebSocketEvent_1.WebSocketEvent.STATUS: { - let statusElement = document.getElementById("status"); - if (statusElement) - statusElement.innerText = payload.data.status; - } - } - } - onOpen(event) { - console.log("[WS] Connected", event); - Modal_1.Modal.close("start"); - let connectionElement = document.getElementById("right"); - if (connectionElement) - connectionElement.innerText = "Verbunden"; - } - onClose(event) { - console.error("[WS] Closed!", event); - if (event.wasClean) { - let modal = new Modal_1.Modal("socketClosed", "Sitzung beendet!"); - modal.content = `Diese Sitzung wurde beendet, da der iTender nun an einem anderen Gerät bzw. an dem Hauptgerät gesteuert wird.

`; - modal.addButton(ButtonType_1.ButtonType.SUCCESS, "Sitzung wiederherstellen", () => { - window.location.reload(); - }); - modal.open(); - } - else { - let modal = new Modal_1.Modal("socketClosed", "Verbindungsproblem!"); - modal.content = `Die Benutzeroberfläche hat die Verbindung mit dem Gerät verloren.
Die Verbindung wird wiederhergestellt...
`; - modal.loader = true; - modal.open(); - setInterval(() => { - window.location.reload(); - }, 5000); - } - let connectionElement = document.getElementById("right"); - if (connectionElement) - connectionElement.innerText = "Keine Verbindung"; - } - onError(event) { - console.error("[WS] Error", event); - let connectionElement = document.getElementById("right"); - if (connectionElement) - connectionElement.innerText = "Fehler"; - } -} -exports.WebWebSocketHandler = WebWebSocketHandler; -WebWebSocketHandler.url = (window.location.protocol == "http:" ? "ws://" : "wss://") + window.location.hostname + ":3005"; - - -/***/ }) - -/******/ }); -/************************************************************************/ -/******/ // The module cache -/******/ var __webpack_module_cache__ = {}; -/******/ -/******/ // The require function -/******/ function __webpack_require__(moduleId) { -/******/ // Check if module is in cache -/******/ var cachedModule = __webpack_module_cache__[moduleId]; -/******/ if (cachedModule !== undefined) { -/******/ return cachedModule.exports; -/******/ } -/******/ // Create a new module (and put it into the cache) -/******/ var module = __webpack_module_cache__[moduleId] = { -/******/ // no module.id needed -/******/ // no module.loaded needed -/******/ exports: {} -/******/ }; -/******/ -/******/ // Execute the module function -/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__); -/******/ -/******/ // Return the exports of the module -/******/ return module.exports; -/******/ } -/******/ -/************************************************************************/ -var __webpack_exports__ = {}; -// This entry need to be wrapped in an IIFE because it need to be isolated against other modules in the chunk. -(() => { -var exports = __webpack_exports__; -/*!*************************!*\ - !*** ./src/web/main.ts ***! - \*************************/ - -Object.defineProperty(exports, "__esModule", ({ value: true })); -const WebWebSocketHandler_1 = __webpack_require__(/*! ./WebWebSocketHandler */ "./src/web/WebWebSocketHandler.ts"); -const Modal_1 = __webpack_require__(/*! ./Modal */ "./src/web/Modal.ts"); -const main = document.getElementById("main"); -const time = document.getElementById("title"); -document.addEventListener("DOMContentLoaded", () => { - console.log("DOM Loaded"); - let modal = new Modal_1.Modal("start", "iTender"); - modal.content = "Willkommen"; - modal.loader = true; - modal.open(); - connect(); - setTimeout(load, 1000); -}); -function load() { - if (!main || !time) - return; - setInterval(() => { - let currentDate = new Date(); - time.innerText = "" + (currentDate.getHours() < 10 ? "0" + currentDate.getHours() : currentDate.getHours()) + ":" + (currentDate.getMinutes() < 10 ? "0" + currentDate.getMinutes() : currentDate.getMinutes()); - }, 1000); - let maxI = 20; - main.style.gridTemplateRows = `repeat(${Math.round(maxI / 3)}, calc(90%/2))`; - for (let i = 0; i < maxI; i++) { - let testDrink = document.createElement("div"); - testDrink.classList.add("drink"); - let img = document.createElement("img"); - img.classList.add("thumbnail"); - testDrink.append(img); - let name = document.createElement("p"); - name.classList.add("name"); - testDrink.append(name); - img.alt = "Thumbnail"; - name.innerText = "Mixery"; - main.append(testDrink); - } -} -let wsHandler; -function connect() { - wsHandler = new WebWebSocketHandler_1.WebWebSocketHandler(); -} - -})(); - -/******/ })() -; -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"web.bundle.js","mappings":";;;;;;;;;;;;;AAAA,IAAY,cAEX;AAFD,WAAY,cAAc;IACtB,mCAAgB;AACpB,CAAC,EAFW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAEzB;;;;;;;;;;;;;;ACFD,gGAAgD;AAEhD,MAAa,gBAAgB;IA8BzB,YAAY,KAAqB,EAAE,QAAiB,KAAK,EAAE,IAAU;QACjE,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACtB,CAAC;IAjCD,IAAI,KAAK,CAAC,KAAqB;QAC3B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,IAAI,KAAK,CAAC,KAAc;QACpB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,IAAI,IAAI,CAAC,KAAsB;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAOD,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAQM,MAAM,CAAC,mBAAmB,CAAC,IAAY;QAC1C,IAAI,GAAG,CAAC,OAAO,MAAM,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC5F,IAAI,UAAwD,CAAC;QAC7D,IAAI;YACA,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACjC;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,IAAI,CAAC;SACf;QAED,IAAI,OAAO,GAAG,+BAAc,CAA8B,UAAU,CAAC,KAAK,CAAC,CAAC;QAE5E,OAAO,IAAI,gBAAgB,CAAC,OAAO,EAAE,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;IAC5E,CAAC;IAKM,QAAQ;QACX,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAC,CAAC,CAAC;QACzF,IAAI,GAAG,CAAC,CAAC,OAAO,MAAM,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AA1DD,4CA0DC;;;;;;;;;;;;;;AC5DD,IAAY,UAIX;AAJD,WAAY,UAAU;IAClB,iCAAmB;IACnB,6BAAe;AAEnB,CAAC,EAJW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAIrB;;;;;;;;;;;;;;ACFD,MAAa,KAAK;IAWd,YAAY,EAAE,EAAE,KAAa,EAAE,OAAgB;QAPvC,WAAM,GAAW,SAAS,CAAC;QAC3B,aAAQ,GAAuB,EAAE,CAAC;QAClC,QAAG,GAAW,EAAE,CAAC;QACjB,YAAO,GAAY,KAAK,CAAC;QACzB,aAAQ,GAA2D,EAAE,CAAC;QAI1E,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5B,CAAC;IAGD,IAAI,KAAK,CAAC,KAAa;QACnB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IAED,IAAI,OAAO,CAAC,KAAyB;QACjC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED,IAAI,EAAE,CAAC,KAAa;QAChB,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,IAAI,MAAM,CAAC,KAAc;QACrB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACzB,CAAC;IAEM,SAAS,CAAE,IAAgB,EAAE,OAAe,EAAE,OAAiB;QAElE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAC,CAAC,CAAC;IACzE,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,IAAI,CAAC,QAAQ;YACd,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QAEvB,IAAI,IAAI,CAAC,OAAO;YACZ,IAAI,CAAC,QAAQ,IAAI,oCAAoC;gBACjD,kDAAkD;gBAClD,QAAQ,CAAC;QAEjB,KAAK,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC3B,IAAI,CAAC,QAAQ,IAAI,0BAA0B,GAAG,CAAC,IAAI,eAAe,GAAG,CAAC,OAAO,SAAS,GAAG,CAAC,OAAO,WAAW,CAAC;SAChH;QAED,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IACrD,CAAC;IAOM,MAAM,CAAC,IAAI,CAAC,KAAa,EAAE,OAAe,EAAE,EAAW;QAC1D,MAAM,KAAK,GAAG,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,QAAQ,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;QAElE,IAAI,CAAC,KAAK,IAAI,CAAC,YAAY;YACvB,OAAO;QAEX,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC3C,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAEpC,UAAU,CAAC,GAAG,EAAE;YACZ,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAC9C,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QAC3C,CAAC,EAAE,GAAG,CAAC,CAAC;QAER,YAAY,CAAC,SAAS,GAAG,uBAAuB,KAAK,QAAQ,OAAO,EAAE,CAAC;QACvE,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;QAE9B,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IAC3C,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,EAAW;QAC3B,IAAI,IAAI,CAAC,cAAc,IAAI,EAAE;YACzB,OAAO;QAEX,MAAM,KAAK,GAAG,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,YAAY,GAAG,QAAQ,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;QAC9D,MAAM,iBAAiB,GAAG,QAAQ,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;QAEvE,IAAI,CAAC,KAAK,IAAI,CAAC,YAAY,IAAI,CAAC,iBAAiB;YAC7C,OAAO;QAEX,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAC5C,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAErC,UAAU,CAAC,GAAG,EAAE;YACZ,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;YAC7B,iBAAiB,CAAC,SAAS,GAAG,EAAE,CAAC;YACjC,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YAC/C,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC5C,CAAC,EAAE,GAAG,CAAC,CAAC;IACZ,CAAC;;AArGL,sBAsGC;AApGkB,oBAAc,GAAG,EAAE,CAAC;;;;;;;;;;;;;;ACJvC,yEAA8B;AAC9B,iGAAiD;AACjD,uGAAqD;AACrD,wFAAwC;AAExC,MAAa,mBAAmB;IAI5B;QACI,IAAI,CAAC,MAAM,GAAG,IAAI,SAAS,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACrD,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACjC,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IAC3C,CAAC;IAEO,SAAS,CAAC,QAAsB;QACpC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,QAAQ,CAAC,CAAC;QAC/C,IAAI,OAAO,GAAG,mCAAgB,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAClE,IAAI,CAAC,OAAO,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,QAAQ,CAAC,CAAC;YACxD,OAAO;SACV;QACD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;QAEtB,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAE7B,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,OAAO,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC;QAEzD,QAAQ,OAAO,CAAC,KAAK,EAAE;YACnB,KAAK,+BAAc,CAAC,MAAM,CAAC,CAAC;gBACxB,IAAI,aAAa,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;gBACtD,IAAI,aAAa;oBACb,aAAa,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;aACrD;SACJ;IACL,CAAC;IAEO,MAAM,CAAC,KAAK;QAChB,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;QACrC,aAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACrB,IAAI,iBAAiB,GAAG,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACzD,IAAI,iBAAiB;YACjB,iBAAiB,CAAC,SAAS,GAAG,WAAW,CAAC;IAClD,CAAC;IAEO,OAAO,CAAC,KAAK;QACjB,OAAO,CAAC,KAAK,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;QACrC,IAAI,KAAK,CAAC,QAAQ,EAClB;YACI,IAAI,KAAK,GAAG,IAAI,aAAK,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;YAC1D,KAAK,CAAC,OAAO,GAAG,uHAAuH,CAAC;YACxI,KAAK,CAAC,SAAS,CAAC,uBAAU,CAAC,OAAO,EAAE,0BAA0B,EAAE,GAAG,EAAE;gBACjE,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC7B,CAAC,CAAC,CAAC;YACH,KAAK,CAAC,IAAI,EAAE,CAAC;SAChB;aAED;YACI,IAAI,KAAK,GAAG,IAAI,aAAK,CAAC,cAAc,EAAE,qBAAqB,CAAC,CAAC;YAC7D,KAAK,CAAC,OAAO,GAAG,mHAAmH,CAAC;YACpI,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;YACpB,KAAK,CAAC,IAAI,EAAE,CAAC;YACb,WAAW,CAAE,GAAG,EAAE;gBACd,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC7B,CAAC,EAAE,IAAI,CAAE,CAAC;SACb;QAED,IAAI,iBAAiB,GAAG,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACzD,IAAI,iBAAiB;YACjB,iBAAiB,CAAC,SAAS,GAAG,kBAAkB,CAAC;IACzD,CAAC;IAEO,OAAO,CAAC,KAAK;QACjB,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACnC,IAAI,iBAAiB,GAAG,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACzD,IAAI,iBAAiB;YACjB,iBAAiB,CAAC,SAAS,GAAG,QAAQ,CAAC;IAG/C,CAAC;;AA5EL,kDA6EC;AA3EkB,uBAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC;;;;;;;UCPzH;UACA;;UAEA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;;UAEA;UACA;;UAEA;UACA;UACA;;;;;;;;;;;;ACtBA,mHAA0D;AAC1D,yEAA8B;AAE9B,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;AAC7C,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;AAE9C,QAAQ,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAChD,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAE1B,IAAI,KAAK,GAAG,IAAI,aAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC1C,KAAK,CAAC,OAAO,GAAG,YAAY,CAAC;IAC7B,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;IACpB,KAAK,CAAC,IAAI,EAAE,CAAC;IACb,OAAO,EAAE,CAAC;IAEV,UAAU,CAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAEH,SAAS,IAAI;IAEV,IAAG,CAAC,IAAI,IAAE,CAAC,IAAI;QACZ,OAAO;IAEV,WAAW,CAAE,GAAG,EAAE;QACf,IAAI,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,EAAE,GAAG,CAAE,WAAW,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAE,GAAG,GAAG,GAAG,CAAE,WAAW,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,WAAW,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,EAAE,CAAE,CAAC;IACvN,CAAC,EAAE,IAAI,CAAE,CAAC;IAEV,IAAI,IAAI,GAAG,EAAE,CAAC;IAEd,IAAI,CAAC,KAAK,CAAC,gBAAgB,GAAG,UAAU,IAAI,CAAC,KAAK,CAAC,IAAI,GAAC,CAAC,CAAC,gBAAgB,CAAC;IAG3E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAC,IAAI,EAAE,CAAC,EAAE,EAC3B;QACG,IAAI,SAAS,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9C,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAEjC,IAAI,GAAG,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACxC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC/B,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAEtB,IAAI,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3B,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEvB,GAAG,CAAC,GAAG,GAAC,WAAW,CAAC;QACpB,IAAI,CAAC,SAAS,GAAG,QAAQ;QAEzB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;KACzB;AACJ,CAAC;AAED,IAAI,SAAS,CAAC;AACd,SAAS,OAAO;IAEb,SAAS,GAAG,IAAI,yCAAmB,EAAE,CAAC;AAEzC,CAAC","sources":["webpack://itender/./src/WebSocketEvent.ts","webpack://itender/./src/WebSocketPayload.ts","webpack://itender/./src/web/ButtonType.ts","webpack://itender/./src/web/Modal.ts","webpack://itender/./src/web/WebWebSocketHandler.ts","webpack://itender/webpack/bootstrap","webpack://itender/./src/web/main.ts"],"sourcesContent":["export enum WebSocketEvent {\n    STATUS= \"STATUS\"\n}","import {WebSocketEvent} from \"./WebSocketEvent\";\n\nexport class WebSocketPayload {\n    set event(value: WebSocketEvent) {\n        this._event = value;\n    }\n\n    set error(value: boolean) {\n        this._error = value;\n    }\n\n    set data(value: any | undefined) {\n        this._data = value;\n    }\n\n    private _event: WebSocketEvent;\n    private _error: boolean;\n    private _data: any | undefined;\n\n\n    get event(): WebSocketEvent {\n        return this._event;\n    }\n\n    get error(): boolean {\n        return this._error;\n    }\n\n    get data(): any | undefined {\n        return this._data;\n    }\n\n    constructor(event: WebSocketEvent, error: boolean = false, data?: any) {\n        this._event = event;\n        this._error = error;\n        this._data = data;\n    }\n\n    public static parseFromBase64Json(json: string): WebSocketPayload | null {\n        json = (typeof window != 'undefined') ? atob(json) : Buffer.from(json, \"base64\").toString();\n        let rawPayload: { event: string, error: boolean, data: any };\n        try {\n            rawPayload = JSON.parse(json);\n        } catch (e) {\n            return null;\n        }\n\n        let wsEvent = WebSocketEvent[<keyof typeof WebSocketEvent>rawPayload.event];\n\n        return new WebSocketPayload(wsEvent, rawPayload.error, rawPayload.data);\n    }\n\n    /**\n     * Returns the payload as base64 encoded json string\n     */\n    public toString(): string {\n        let json = JSON.stringify({\"event\": this._event, status: this._error, data: this._data});\n        json = ((typeof window != 'undefined') ? btoa(json) : Buffer.from(json).toString(\"base64\"));\n        return json;\n    }\n}","export enum ButtonType {\n    SUCCESS = \"success\",\n    ERROR = \"error\",\n\n}","import {ButtonType} from \"./ButtonType\";\n\nexport class Modal {\n\n    private static currentModalId = \"\";\n\n    private _title: string = \"iTender\";\n    private _content: string | undefined = \"\";\n    private _id: string = \"\";\n    private _loader: boolean = false;\n    private _buttons: { type: string, content: string, onclick: Function }[] = [];\n\n\n    constructor(id, title: string, content?: string) {\n        this._id = id;\n        this._title = title;\n        this._content = content;\n    }\n\n\n    set title(value: string) {\n        this._title = value;\n    }\n\n    set content(value: string | undefined) {\n        this._content = value;\n    }\n\n    set id(value: string) {\n        this._id = value;\n    }\n\n    set loader(value: boolean) {\n        this._loader = value;\n    }\n\n    public addButton( type: ButtonType, content: string, onclick: Function )\n    {\n        this._buttons.push({type: type, content: content, onclick: onclick});\n    }\n\n    public open() {\n        if (!this._content)\n            this._content = \"\";\n\n        if (this._loader)\n            this._content += \"<br><div class=\\\"lds-ellipsis\\\">\\n\" +\n                \"  <div></div><div></div><div></div><div></div>\\n\" +\n                \"</div>\";\n\n        for (let btn of this._buttons) {\n            this._content += `<button class=\"btn btn-${btn.type}\" onclick=\"(${btn.onclick})();\">${btn.content}</button>`;\n        }\n\n        Modal.open(this._title, this._content, this._id);\n    }\n\n    /**\n     * @param title\n     * @param content\n     * @param id\n     */\n    public static open(title: string, content: string, id?: string): void {\n        const modal = document.getElementById(\"modal\");\n        const modalContent = document.getElementById(\"modalInnerContent\");\n\n        if (!modal || !modalContent)\n            return;\n\n        modalContent.classList.add(\"modalBlendIn\");\n        modal.classList.add(\"modalBlendIn\");\n\n        setTimeout(() => {\n            modalContent.classList.remove(\"modalBlendIn\");\n            modal.classList.remove(\"modalBlendIn\");\n        }, 800);\n\n        modalContent.innerHTML = `<h1 id=\"modalTitle\">${title}</h1>${content}`;\n        modal.style.display = \"block\";\n\n        this.currentModalId = id ? id : \"null\";\n    }\n\n    public static close(id?: string): void {\n        if (this.currentModalId != id)\n            return;\n\n        const modal = document.getElementById(\"modal\");\n        const modalContent = document.getElementById(\"modal-content\");\n        const modalInnerContent = document.getElementById(\"modalInnerContent\");\n\n        if (!modal || !modalContent || !modalInnerContent)\n            return;\n\n        modalContent.classList.add(\"modalBlendOut\");\n        modal.classList.add(\"modalBlendOut\");\n\n        setTimeout(() => {\n            modal.style.display = \"none\";\n            modalInnerContent.innerHTML = \"\";\n            modalContent.classList.remove(\"modalBlendOut\");\n            modal.classList.remove(\"modalBlendOut\");\n        }, 800);\n    }\n}","import {Modal} from \"./Modal\";\nimport {WebSocketEvent} from \"../WebSocketEvent\";\nimport {WebSocketPayload} from \"../WebSocketPayload\";\nimport {ButtonType} from \"./ButtonType\";\n\nexport class WebWebSocketHandler {\n    private socket: WebSocket;\n    private static url = (window.location.protocol == \"http:\" ? \"ws://\" : \"wss://\") + window.location.hostname + \":3005\";\n\n    constructor() {\n        this.socket = new WebSocket(WebWebSocketHandler.url);\n        this.socket.onopen = this.onOpen;\n        this.socket.onclose = this.onClose;\n        this.socket.onerror = this.onError;\n        this.socket.onmessage = this.onMessage;\n    }\n\n    private onMessage(msgEvent: MessageEvent) {\n        console.log(\"[WS] Incoming message\", msgEvent);\n        let payload = WebSocketPayload.parseFromBase64Json(msgEvent.data);\n        if (!payload) {\n            console.log(\"[WS] Could not parse message: \", msgEvent);\n            return;\n        }\n        console.debug(payload)\n\n        console.debug(payload.event);\n\n        console.log(\"[WS] Received \" + payload.event + \" Event\");\n\n        switch (payload.event) {\n            case WebSocketEvent.STATUS: {\n                let statusElement = document.getElementById(\"status\");\n                if (statusElement)\n                    statusElement.innerText = payload.data.status;\n            }\n        }\n    }\n\n    private onOpen(event) {\n        console.log(\"[WS] Connected\", event);\n        Modal.close(\"start\");\n        let connectionElement = document.getElementById(\"right\");\n        if (connectionElement)\n            connectionElement.innerText = \"Verbunden\";\n    }\n\n    private onClose(event) {\n        console.error(\"[WS] Closed!\", event);\n        if( event.wasClean )\n        {\n            let modal = new Modal(\"socketClosed\", \"Sitzung beendet!\");\n            modal.content = `Diese Sitzung wurde beendet, da der iTender nun an einem anderen Gerät bzw. an dem Hauptgerät gesteuert wird.<br><br>`;\n            modal.addButton(ButtonType.SUCCESS, \"Sitzung wiederherstellen\", () => {\n                window.location.reload();\n            });\n            modal.open();\n        }\n        else\n        {\n            let modal = new Modal(\"socketClosed\", \"Verbindungsproblem!\");\n            modal.content = `Die Benutzeroberfläche hat die Verbindung mit dem Gerät verloren.<br>Die Verbindung wird wiederhergestellt...<br>`;\n            modal.loader = true;\n            modal.open();\n            setInterval( () => {\n                window.location.reload();\n            }, 5000 );\n        }\n\n        let connectionElement = document.getElementById(\"right\");\n        if (connectionElement)\n            connectionElement.innerText = \"Keine Verbindung\";\n    }\n\n    private onError(event) {\n        console.error(\"[WS] Error\", event);\n        let connectionElement = document.getElementById(\"right\");\n        if (connectionElement)\n            connectionElement.innerText = \"Fehler\";\n        //openModal(\"Einen Augenblick...\", `Es wurde ein kritischer Fehler festgestellt.\\nBitte warten Sie, während der Prozess neu gestartet wird...` );\n        //window.location.reload();\n    }\n}","// The module cache\nvar __webpack_module_cache__ = {};\n\n// The require function\nfunction __webpack_require__(moduleId) {\n\t// Check if module is in cache\n\tvar cachedModule = __webpack_module_cache__[moduleId];\n\tif (cachedModule !== undefined) {\n\t\treturn cachedModule.exports;\n\t}\n\t// Create a new module (and put it into the cache)\n\tvar module = __webpack_module_cache__[moduleId] = {\n\t\t// no module.id needed\n\t\t// no module.loaded needed\n\t\texports: {}\n\t};\n\n\t// Execute the module function\n\t__webpack_modules__[moduleId](module, module.exports, __webpack_require__);\n\n\t// Return the exports of the module\n\treturn module.exports;\n}\n\n","import {WebWebSocketHandler} from \"./WebWebSocketHandler\";\nimport {Modal} from \"./Modal\";\n\nconst main = document.getElementById(\"main\");\nconst time = document.getElementById(\"title\");\n\ndocument.addEventListener(\"DOMContentLoaded\", () => {\n   console.log(\"DOM Loaded\");\n\n   let modal = new Modal(\"start\", \"iTender\");\n   modal.content = \"Willkommen\";\n   modal.loader = true;\n   modal.open();\n   connect();\n\n   setTimeout( load, 1000);\n});\n\nfunction load()\n{\n   if(!main||!time)\n      return;\n\n   setInterval( () => {\n      let currentDate = new Date();\n      time.innerText = \"\" + ( currentDate.getHours() < 10 ? \"0\" + currentDate.getHours() : currentDate.getHours() ) + \":\" + ( currentDate.getMinutes() < 10 ? \"0\" + currentDate.getMinutes() : currentDate.getMinutes() );\n   }, 1000 );\n\n   let maxI = 20;\n\n   main.style.gridTemplateRows = `repeat(${Math.round(maxI/3)}, calc(90%/2))`;\n\n\n   for( let i = 0; i<maxI; i++ )\n   {\n      let testDrink = document.createElement(\"div\");\n      testDrink.classList.add(\"drink\");\n\n      let img = document.createElement(\"img\");\n      img.classList.add(\"thumbnail\");\n      testDrink.append(img);\n\n      let name = document.createElement(\"p\");\n      name.classList.add(\"name\");\n      testDrink.append(name);\n\n      img.alt=\"Thumbnail\";\n      name.innerText = \"Mixery\"\n\n      main.append(testDrink);\n   }\n}\n\nlet wsHandler;\nfunction connect()\n{\n   wsHandler = new WebWebSocketHandler();\n\n}\n"],"names":[],"sourceRoot":""} \ No newline at end of file