test

.woodpecker.yml

@@ -10,10 +10,29 @@ steps:
         from_secret: container_registry_username
       password: 
         from_secret: container_registry_password
+      build_args:
+        - VERSION_ID1=${CI_COMMIT_SHA}
+        - VERSION_ID2=${CI_COMMIT_TAG}
       dockerfile: Dockerfile
     when:
       - event: [push, tag]
 
+  deploytest:
+    image: portainer/kubectl-shell:latest
+    secrets:
+      - source: kube_config
+        target: KUBE_CONFIG_CONTENT
+      - source: encryption_key
+        target: ENCRYPTION_KEY
+      - source: secrets_checksum
+        target: MD5_CHECKSUM
+    commands:
+      - printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
+      - export KUBECONFIG=/tmp/kubeconfig
+      - ./deployment/deploy.sh test
+    when:
+      - event: [push, tag] 
+
   deploy:
     image: portainer/kubectl-shell:latest
     secrets:

Dockerfile

@@ -1,6 +1,8 @@
 FROM python:3.12-alpine3.19
 
 ARG APP_DIR="/opt/app"
+ARG VERSION_ID1="x"
+ARG VERSION_ID2="alpha"
 
 COPY ./src/ ${APP_DIR}/
 COPY start.sh ${APP_DIR}/
@@ -9,7 +11,10 @@ WORKDIR ${APP_DIR}
 
 RUN \
   apk add --no-cache build-base libpq-dev && \
-  pip install -r requirements.txt
+  pip install -r requirements.txt && \
+  if [ "${VERSION_ID2}" != "" ]; then VERSION_ID=${VERSION_ID2}; else VERSION_ID=${VERSION_ID1}; fi && \
+  sed -i -e 's/VERSION_ID/'$VERSION_ID'/' ${APP_DIR}/templates/index.html && \
+  sed -i -e 's/VERSION_ID/'"$VERSION_ID"'/' ${APP_DIR}/templates/nutrition.html
 
 EXPOSE 8080
 

deployment/decrypt-secrets.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+
+
 if [ "$ENCRYPTION_KEY" = "" ]; then
   echo "ENCRYPTION_KEY not set"
   exit 1
@@ -10,6 +12,7 @@ if [ "$MD5_CHECKSUM" = "" ]; then
   exit 1
 fi
 
+
 SECRETS_CIPHERTEXT_FILE=secrets.enc
 SECRETS_PLAINTEXT_FILE=/tmp/secrets
 TMP_FILE=`mktemp`

deployment/deploy-yml.tmpl

@@ -46,10 +46,10 @@ metadata:
 spec:
   tls:
     - hosts:
-        - nutri.hottis.de
+        - nutri%POSTFIX%.hottis.de
       secretName: nutri-cert
   rules:
-    - host: nutri.hottis.de
+    - host: nutri%POSTFIX%.hottis.de
       http:
         paths:
           - path: /

deployment/deploy.sh

@@ -1,13 +1,19 @@
 #!/bin/bash
 
+if [ "$1" == "test" ]; then
+  POSTFIX="-test"
+  IMAGE_TAG=${CI_COMMIT_SHA}
+else
+  POSTFIX=""
+fi
+
 if [ "$IMAGE_TAG" == "" ]; then
   echo "Make sure IMAGE_TAG is set"
   exit 1
 fi
 
-
 IMAGE_NAME=gitea.hottis.de/moerp/elo-rezept-rechner
-NAMESPACE=moerp
+NAMESPACE=moerp${POSTFIX}
 DEPLOYMENT_DIR=$PWD/deployment
 
 pushd $DEPLOYMENT_DIR > /dev/null
@@ -15,7 +21,7 @@ pushd $DEPLOYMENT_DIR > /dev/null
 . /tmp/secrets
 rm /tmp/secrets
 
-CLIENT_SECRETS=`cat oidc-config.json | sed -e's!%CLIENT_SECRET%!'$CLIENT_SECRET'!'`
+CLIENT_SECRETS=`cat oidc-config${POSTFIX}.json | sed -e's!%CLIENT_SECRET%!'$CLIENT_SECRET'!'`
 
 kubectl create namespace $NAMESPACE \
   --dry-run=client \
@@ -37,6 +43,7 @@ kubectl create secret generic nutri-secrets \
 
 cat $DEPLOYMENT_DIR/deploy-yml.tmpl | \
   sed -e 's,%IMAGE%,'$IMAGE_NAME':'$IMAGE_TAG','g | \
+  sed -e 's,%POSTFIX%,'$POSTFIX','g | \
   kubectl apply -f - -n $NAMESPACE
 
 popd > /dev/null

deployment/oidc-config-test.json

@@ -0,0 +1,13 @@
+{
+    "web": {
+        "issuer": "https://auth2.hottis.de/realms/hottis",
+        "auth_uri": "https://auth2.hottis.de/ealms/hottis/protocol/openid-connect/auth",
+        "client_id": "nutri",
+        "client_secret": "%CLIENT_SECRET%",
+        "redirect_uris": [
+            "https://nutri-test.hottis.de/*"
+        ],
+        "userinfo_uri": "https://auth2.hottis.de/realms/hottis/protocol/openid-connect/userinfo", 
+        "token_uri": "https://auth2.hottis.de/realms/hottis/protocol/openid-connect/token"
+    }
+}

src/Run.py

@@ -5,6 +5,7 @@ from werkzeug.middleware.proxy_fix import ProxyFix
 import os
 import json
 import psycopg2
+import logging
 
 app = Flask(__name__)
 app.config.update({
@@ -18,7 +19,7 @@ app.config.update({
 })
 
 oidc = OpenIDConnect(app)
-
+app.logger.handlers = logging.getLogger('gunicorn.error').handlers
 
 def calculate_nutrition(food, weight):
     try:
@@ -64,7 +65,7 @@ def get_products():
     try:
         conn = psycopg2.connect()
         with conn.cursor() as cursor:
-            cursor.execute('SELECT name FROM nutrition_table')
+            cursor.execute('SELECT name FROM nutrition_table ORDER BY name')
             products = cursor.fetchall()
             return {'products': [product[0] for product in products]}
     finally:
@@ -104,8 +105,10 @@ def convert_decimal(value):
 
 
 @app.route('/add_nutrition', methods=['POST'])
-@oidc.accept_token(True)
+@oidc.accept_token(['openid'])
 def add_nutrition():
+    app.logger.info("add_nutrition")
+
     food = request.form.get('food')
     kcal = convert_decimal(request.form.get('kcal'))
     ew = convert_decimal(request.form.get('ew'))
@@ -120,9 +123,12 @@ def add_nutrition():
         with conn.cursor() as cursor:
             cursor.execute("INSERT INTO nutrition_table (name, kcal, ew, fett, kh, bst, ca) VALUES (%s, %s, %s, %s, %s, %s, %s)",
                         (food, kcal, ew, fett, kh, bst, ca))
-
+        conn.commit()
     
         return redirect(url_for('nutrition'))
+    except Exception as e:
+        app.logger.warn(f"error in add_nutrition: {e}")
+        return jsonify({"error": str(e)}), 500
     finally:
         if conn:
             conn.close()
@@ -133,10 +139,66 @@ def add_nutrition():
 def nutrition():
     return render_template('nutrition.html')
 
+@app.route('/get_token')
+@oidc.require_login
+def get_token():
+    return jsonify(token=oidc.get_access_token())
 
 
-app = ProxyFix(app, x_for=1, x_host=1)
+@app.route('/get_database_entries')
+@oidc.require_login
+def get_database_entries():
+    try:
+        # Ersetzen Sie diese Werte mit Ihren Datenbank-Verbindungsinformationen
+        conn = psycopg2.connect()
+        cursor = conn.cursor()
+        with conn.cursor() as cursor:
+            cursor.execute("SELECT name, kcal, ew, fett, kh, bst, ca FROM nutrition_table ORDER BY name")
+            entries = cursor.fetchall()
+
+        # Umwandeln der Daten in ein JSON-freundliches Format
+        entries_list = []
+        for entry in entries:
+            entries_list.append({
+                "food": entry[0],
+                "kcal": entry[1],
+                "ew": entry[2],
+                "fett": entry[3],
+                "kh": entry[4],
+                "bst": entry[5],
+                "ca": entry[6]
+            })
+        return jsonify(entries_list)
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        if conn:
+            conn.close()
 
 
+@app.route('/delete_nutrition', methods=['POST'])
+@oidc.accept_token(['openid'])
+def delete_nutrition():
+    data = request.get_json()
+    foodNames = data['foodNames']
+
+    if not foodNames:
+        return jsonify({'error': 'Keine Lebensmittel zum Löschen angegeben'}), 400
+
+    try:
+        conn = psycopg2.connect()
+        with conn.cursor() as cursor:
+            query = "DELETE FROM nutrition_table WHERE name = ANY(%s)"
+            cursor.execute(query, (foodNames,))
+        conn.commit()
+        return jsonify({'message': 'Erfolgreich gelöscht'}), 200
+    except Exception as e:
+        return jsonify({'error': str(e)}), 500
+    finally:
+        if conn:
+            conn.close()
+
+
+exposed_app = ProxyFix(app, x_for=1, x_host=1)
 
 

src/db.py

@@ -13,13 +13,16 @@ cursor = conn.cursor()
 # Erstellen der Tabelle (falls noch nicht vorhanden)
 cursor.execute('''
     CREATE TABLE IF NOT EXISTS nutrition_table (
-        name TEXT,
+        id serial not null,
+        name TEXT not null,
         kcal REAL,
         EW REAL,
         Fett REAL,
         KH REAL,
         BST REAL,
-        Ca REAL
+        Ca REAL,
+        constraint nutrition_table_pk primary key (id),
+        constraint nutrition_table_name_uk unique (name)
     )
 ''')
 

src/nu.csv

@@ -6,7 +6,6 @@ Hühnerei,137,11.9,9.3,1.5,0.0,51
 Pflanzenmargarine,722,0.2,80.0,0.4,0.0,8
 Sahne 30%,309,2.4,31.7,3.4,0.0,80
 Maisstärke,353,0.4,0.1,85.9,1.0,0
-Paniermehl,368,10.1,2.1,73.5,5.3,50
 Weizengrieß,335,9.6,0.8,69.0,7.1,17
 Mehl405,343,9.8,1.0,71.8,4.0,15
 Rapsöl,884,0,100.0,0,0,0
@@ -43,13 +42,11 @@ Knoblauch,145,6.1,0.1,28.4,1.8,38
 Senf,88,6.0,4.0,6.0,1.0,124
 Blattspinat roh,21,2.7,0.3,0.6,2.6,117
 Buttermilch,37,3.5,0.5,4.0,0.0,109
-Himbeere,37,1.3,0.3,4.8,4.7,40
 Salz dill gurken,9,0.4,0.1,1.3,0.5,18
 Schmand 20%,205,2.8,20.0,3.6,0.0,100
 Aspikpulver,338,84.2,0.1,0.0,0.0,11
 Lachs atlantischer,210,20.4,13.4,0.3,0.0,4
 Pinienkerne,589,24.0,50.7,7.3,7.2,26
-Zwieback,385,9.9,4.3,73.1,5.2,42
 Speisequark,72,13.5,0.3,3.2,0.0,92
 Basilikum,47,3.1,0.8,5.1,3.1,369
 Mayonaise 50%,490,0.5,52.0,5.0,0.0,10
@@ -83,7 +80,6 @@ Naturreis,349,7.2,2.2,74.1,2.2,16
 Mehl Type 405,343,9.8,1.0,71.8,4.0,15
 Mehl Type 550,346,9.8,1.1,72.0,4.3,17
 Milchreis,316,6.4,0.8,80.2,1.1,6
-Kartoffelstärke,341,0.6,0.1,83.1,0.1,35
 Hmilch fettarm 1.5%,47,3.4,1.5,4.9,0.0,123
 Edamer 30%,254,26.4,16.2,0,0.0,800
 Gouda alt 48%,414,24.6,33.7,0.1,0.0,871
@@ -98,7 +94,6 @@ Butterkeks,441,8.2,11.0,74.7,3.3,47
 Zwieback,385,9.9,4.3,73.1,5.2,42
 Schokolade 75% Kakaomasse,598,7.8,42.6,35.0,10.9,73
 Paniermehl,368,10.1,0.1,73.5,5.3,50
-Senf,88,6.0,4.0,6.0,1.0,124
 Schinken geräuchert,152,20.7,7.7,0.0,0.0,2
 Rinderkeule,148,20.0,7.6,0.0,0.0,6
 Kirsche süß,62,0.9,0.3,13.3,1.3,17
@@ -107,7 +102,6 @@ Eisbergsalat,16,1.0,0.2,2.0,1.1,19
 Endivie,18,1.8,0.2,1.2,1.9,54
 Feldsalat,18,1.8,0.4,0.8,1.5,32
 Gurke,14,0.6,0.2,1.8,0.9,15
-Kopfsalat,14,1.2,0.2,1.1,1.4,20
 Schalotte,25,1.5,0.2,3.3,1.5,37
 Gemüsebrühe verz,7,1.6,0,0,0,12
 Fleischbrühe,4,0.2,0,1,0,5
@@ -122,8 +116,7 @@ Paprika rot,43,1.3,0.5,6.4,3.6,10
 Knollensellerie,27,1.6,0.3,2.3,4.2,50
 Erdbeeren tiefgefroren,38,0.9,0.4,5.8,2.1,24
 Himbeeren tiefgefroren,45,1.4,0.3,5.0,4.8,42
-Dill,65,3.7,0.8,8.0,5.3,230
 Kerbel,58,4.1,0.6,6.2,5.3,400
 Majoran,52,2.1,1.1,6.9,2.9,322
 Oregano,72,2.2,2.0,9.7,2.5,310
-Thymian,52,1.5,1.2,7.4,3.0,307
+Thymian,52,1.5,1.2,7.4,3.0,307

src/static/style.css

@@ -46,13 +46,30 @@ button#remove-button:not(:disabled):hover {
     background-color: #490000; /* Dunkleres Rot */
 }
 
-
-
 table {
     width: 100%;
-    border-collapse: collapse;
+    border-collapse: separate; /* Erlaubt die Anwendung von border-radius */
+    border-spacing: 0;
+    border-radius: 10px;
 }
 
+table th:first-child {
+    border-top-left-radius: 10px;
+}
+
+table th:last-child {
+    border-top-right-radius: 10px;
+}
+
+table tr:last-child td:first-child {
+    border-bottom-left-radius: 10px;
+}
+
+table tr:last-child td:last-child {
+    border-bottom-right-radius: 10px;
+}
+
+
 table, th, td {
     border: 1px solid #ddd;
 }
@@ -72,7 +89,7 @@ tr:nth-child(even) {
 }
 
 .selected, tr.selected {
-    background-color: #e19595; /* Hervorhebung der Auswahl */
+    background-color: #efcccc; /* Hervorhebung der Auswahl */
 }
 
 tr:hover:not(.selected) {
@@ -89,9 +106,20 @@ tr:hover:not(.selected) {
     border-radius: 10px;
 }
 
+#navbar .navbar-header {
+    display: flex;
+    align-items: center;
+}
+
 #navbar h1 {
     margin: 0;
     font-size: 24px;
+    display: inline-block;
+}
+
+#navbar .versionid {
+    margin-left: 20px;
+    display: inline-block;
 }
 
 #navbar ul {
@@ -113,13 +141,10 @@ tr:hover:not(.selected) {
     transition: background-color 0.3s;
 }
 
-#navbar a:hover {
+#navbar a:hover, #navbar a.active {
     background-color: #007344; /* Etwas helleres Grün */
 }
 
-#navbar a.active {
-    background-color: #008C50; /* Mittleres Grün */
-}
 
 
 .content {
@@ -130,10 +155,8 @@ tr:hover:not(.selected) {
 }
 
 
-#nutrition-input-table {
-    width: 100%; /* Tabelle nimmt die volle Breite ein */
-    border-collapse: collapse; /* Entfernt doppelte Ränder */
-}
+
+
 
 #nutrition-input-table th, #nutrition-input-table td {
     border: 1px solid #ddd; /* Fügt Ränder hinzu */
@@ -152,3 +175,60 @@ tr:hover:not(.selected) {
         overflow-x: auto; /* Ermöglicht horizontales Scrollen auf kleinen Bildschirmen */
     }
 }
+
+.table-container {
+    overflow-y: auto;
+    max-height: 500px; /* Passen Sie die Höhe nach Bedarf an */
+    border-radius: 10px;
+    margin-top: 20px;
+}
+
+#database-nutrition-table {
+    width: 100%;
+    border-collapse: separate; /* Erlaubt die Anwendung von border-radius */
+    border-spacing: 0;
+}
+
+#database-nutrition-table th, #database-nutrition-table td {
+    border: 1px solid #ddd;
+    padding: 8px;
+    text-align: left;
+}
+
+#database-nutrition-table tr.selected {
+    background-color: #efcccc;
+}
+
+
+#password-prompt {
+    margin-top: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+button#delete-row-button {
+    background-color: #640000; /* Helles Rot */
+}
+
+button#delete-row-button:disabled {
+    background-color: #cccccc;
+    color: #666666;
+}
+
+button#delete-row-button:not(:disabled):hover {
+    background-color: #490000; /* Dunkleres Rot */
+}
+
+button#cancel-button {
+    background-color: #640000; /* Helles Rot */
+}
+
+button#cancel-button:disabled {
+    background-color: #cccccc;
+    color: #666666;
+}
+
+button#cancel-button:not(:disabled):hover {
+    background-color: #490000; /* Dunkleres Rot */
+}

src/templates/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>Nährwertberechnungs-App</title>
+    <title>Elo's Rezept Rechner</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
     <link rel="shortcut icon" href="../static/images/favicon.ico">
 
@@ -175,7 +175,10 @@ function updateTotalNutrition() {
 </head>
 <body>
     <nav id="navbar">
-        <h1>Elo's Rezept Rechner</h1>
+        <div class="navbar-header">
+            <h1>Elo's Rezept Rechner</h1>
+            <li class="versionid">VERSION_ID</li>
+        </div>
         <ul>
             <li><a href="/" class="active">Rechner</a></li>
             <li><a href="/nutrition">Neue Lebensmittel</a></li>
@@ -220,8 +223,8 @@ function updateTotalNutrition() {
                 <th>CA</th>
             </tr>
             <tr>
-                <t>Gesamtwerte</td>
-                <td></td>-</td>
+                <td>Gesamtwerte</td>
+                <td>-</td>
                 <td id="total-kcal">0</td>
                 <td id="total-ew">0</td>
                 <td id="total-fett">0</td>
@@ -232,4 +235,4 @@ function updateTotalNutrition() {
         </table>
     </div>
 </body>
-</html>
+</html>

src/templates/nutrition.html

@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>Neue Lebensmittel hinzufügen</title>
+    <title>Elo's Rezept Rechner</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='style.css') }}">
     <link rel="shortcut icon" href="../static/images/favicon.ico">
     
@@ -13,68 +13,238 @@
             document.getElementById('submit-button').disabled = !allFilled;
         }
 
-        function addNutritionEntry() {
-
-            const form = document.getElementById('nutrition-form');
-            const formData = new FormData(form);
-
-            fetch('/add_nutrition', {
-                method: 'POST',
-                body: formData
-            }).then(response => {
-                // Behandlung der Serverantwort
-                // Beispielsweise das Formular zurücksetzen
-                form.reset();
-                updateSubmitButtonState();
-            }).catch(error => {
-                console.error('Fehler:', error);
-            });
-            // ... Code, um den Eintrag zur Datenbank hinzuzufügen
-
-            // Nach dem Hinzufügen, setze alle Eingabefelder zurück
-            document.querySelectorAll('#nutrition-form input').forEach(input => {
-                input.value = ''; // Setzt den Wert jedes Eingabefeldes zurück
-            });
-
-            // Deaktiviere den "Hinzufügen"-Button wieder
-            document.getElementById('submit-button').disabled = true;
+        function getBearerToken(callback) {
+            fetch('/get_token')
+                .then(response => response.json())
+                .then(data => {
+                    callback(data.token);
+                })
+                .catch(error => {
+                    console.error('Fehler beim Abrufen des Tokens:', error);
+                });
         }
 
+        function addNutritionEntry() {
+            getBearerToken(token => {
+                const form = document.getElementById('nutrition-form');
+                const formData = new FormData(form);
+
+                fetch('/add_nutrition', {
+                    method: 'POST',
+                    headers: {
+                        'Authorization': 'Bearer ' + token
+                    },
+                    body: formData
+                }).then(response => {
+                    // Behandlung der Serverantwort
+                    // Beispielsweise das Formular zurücksetzen
+                    form.reset();
+                    updateSubmitButtonState();
+                    loadDatabaseEntries();
+                }).catch(error => {
+                    console.error('Fehler:', error);
+                });
+                // ... Code, um den Eintrag zur Datenbank hinzuzufügen
+
+                // Nach dem Hinzufügen, setze alle Eingabefelder zurück
+                document.querySelectorAll('#nutrition-form input').forEach(input => {
+                    input.value = ''; // Setzt den Wert jedes Eingabefeldes zurück
+                });
+
+                // Deaktiviere den "Hinzufügen"-Button wieder
+                document.getElementById('submit-button').disabled = true;
+            });
+        }
+
+
+        document.addEventListener('DOMContentLoaded', function() {
+            const table = document.getElementById('database-nutrition-table');
+            table.addEventListener('click', function(e) {
+                if (e.target.tagName === 'TD') {
+                    e.target.parentNode.classList.toggle('selected');
+                    updateDeleteButtonState(); 
+                }
+            });
+            updateDeleteButtonState(); 
+        });
+
+        function deleteSelectedRows() {
+            const table = document.getElementById('database-nutrition-table');
+            const selectedRows = Array.from(table.querySelectorAll('tr.selected'));
+            const foodNames = selectedRows.map(row => row.cells[0].innerText); // Annahme, der Name des Lebensmittels befindet sich in der ersten Zelle
+
+            if (foodNames.length > 0) {
+                // Holen des Tokens und Senden einer Anfrage an das Backend, um die Einträge zu löschen
+                getBearerToken(token => {
+                    fetch('/delete_nutrition', {
+                        method: 'POST',
+                        headers: {
+                            'Content-Type': 'application/json',
+                            'Authorization': 'Bearer ' + token
+                        },
+                        body: JSON.stringify({foodNames: foodNames})
+                    }).then(response => {
+                        if (response.ok) {
+                            // Erfolgreich gelöscht, entferne Zeilen aus der Tabelle
+                            selectedRows.forEach(row => {
+                                table.deleteRow(row.rowIndex);
+                            });
+                        } else {
+                            console.error('Fehler beim Löschen der Datenbank-Einträge');
+                        }
+                    }).catch(error => console.error('Fehler:', error));
+                });
+            }
+        }
+
+
+        function showPasswordPrompt() {
+            document.getElementById('delete-row-button').style.display = 'none';
+            document.getElementById('password-prompt').style.display = 'block';
+        }
+
+        function hidePasswordPrompt() {
+            document.getElementById('delete-row-button').style.display = 'block';
+            document.getElementById('password-prompt').style.display = 'none';
+        }
+
+        function deleteRowsIfPasswordCorrect() {
+            const password = document.getElementById('password-input').value;
+            if (password === 'geheim') {
+                deleteSelectedRows();  // Funktion, die die ausgewählten Zeilen löscht
+                hidePasswordPrompt();
+            } else {
+                alert('Falsches Passwort!');
+            }
+        }
+
+        function updateDeleteButtonState() {
+            const selectedRows = document.querySelectorAll('#database-nutrition-table .selected').length;
+            const deleteButton = document.getElementById('delete-row-button');
+            deleteButton.disabled = selectedRows === 0;
+            if (selectedRows === 0) {
+                hidePasswordPrompt(); // Versteckt die Passwort-Eingabe, falls keine Zeile ausgewählt ist
+            }
+        }
+
+
+
+        function loadDatabaseEntries() {
+            fetch('/get_database_entries') // Pfad zur entsprechenden Flask-Route
+                .then(response => response.json())
+                .then(data => {
+                    const tableBody = document.getElementById('database-nutrition-table').getElementsByTagName('tbody')[0];
+                    tableBody.innerHTML = '';
+                    data.forEach(entry => {
+                        const row = tableBody.insertRow();
+                        row.insertCell(0).innerHTML = entry.food;
+                        row.insertCell(1).innerHTML = entry.kcal;
+                        row.insertCell(2).innerHTML = entry.ew;
+                        row.insertCell(3).innerHTML = entry.fett;
+                        row.insertCell(4).innerHTML = entry.kh;
+                        row.insertCell(5).innerHTML = entry.bst;
+                        row.insertCell(6).innerHTML = entry.ca;
+
+                        // ... Fügen Sie weitere Zellen für die anderen Werte hinzu ...
+                    });
+                })
+                .catch(error => console.error('Fehler:', error));
+        }
+
+    document.addEventListener('DOMContentLoaded', loadDatabaseEntries);
+
+    function filterTable() {
+        const searchInput = document.getElementById('search-input');
+        const filterText = searchInput.value.toUpperCase();
+        const table = document.getElementById('database-nutrition-table');
+        const rows = table.getElementsByTagName('tr');
+
+        for (let i = 1; i < rows.length; i++) { // Beginnen bei 1, um die Kopfzeile auszulassen
+            const cell = rows[i].getElementsByTagName('td')[0]; // Angenommen, der zu suchende Text befindet sich in der ersten Spalte
+            if (cell) {
+                const textValue = cell.textContent || cell.innerText;
+                if (textValue.toUpperCase().indexOf(filterText) > -1) {
+                    rows[i].style.display = ""; // Zeile anzeigen
+                } else {
+                    rows[i].style.display = "none"; // Zeile verstecken
+                }
+            }
+        }
+    }
+
+
     </script>
 </head>
 <body>
     <nav id="navbar">
-        <h1>Elo's Rezept Rechner</h1>
+        <div class="navbar-header">
+            <h1>Elo's Rezept Rechner</h1>
+            <li class="versionid">VERSION_ID</li>
+        </div>
         <ul>
             <li><a href="/">Rechner</a></li>
             <li><a href="/nutrition" class="active">Neue Lebensmittel</a></li>
         </ul>
     </nav>
     
+    
     <div class="content">
         <form onsubmit="event.preventDefault(); addNutritionEntry();" method="POST" id="nutrition-form">
-            <table id="nutrition-input-table">
-                <tr>
-                    <th>Lebensmittel</th>
-                    <th>kcal</th>
-                    <th>EW</th>
-                    <th>Fett</th>
-                    <th>KH</th>
-                    <th>BST</th>
-                    <th>CA</th>
-                </tr>
-                <tr>
-                    <td><input type="text" name="food" placeholder="Lebensmittel" oninput="updateSubmitButtonState()"></td>
-                    <td><input <input type="text" name="kcal" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
-                    <td><input <input type="text" name="ew" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
-                    <td><input <input type="text" name="fett" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
-                    <td><input <input type="text" name="kh" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
-                    <td><input <input type="text" name="bst" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
-                    <td><input <input type="text" name="ca" pattern="\d+([.,]\d{1,2})?" placeholder="mg" oninput="updateSubmitButtonState()"></td>
-                </tr>
-            </table>
+                <table id="nutrition-input-table">
+                    <tr>
+                        <th>Lebensmittel</th>
+                        <th>kcal</th>
+                        <th>EW</th>
+                        <th>Fett</th>
+                        <th>KH</th>
+                        <th>BST</th>
+                        <th>CA</th>
+                    </tr>
+                    <tr>
+                        <td><input type="text" name="food" placeholder="Lebensmittel" oninput="updateSubmitButtonState()"></td>
+                        <td><input <input type="text" name="kcal" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
+                        <td><input <input type="text" name="ew" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
+                        <td><input <input type="text" name="fett" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
+                        <td><input <input type="text" name="kh" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
+                        <td><input <input type="text" name="bst" pattern="\d+([.,]\d{1,2})?" placeholder="g" oninput="updateSubmitButtonState()"></td>
+                        <td><input <input type="text" name="ca" pattern="\d+([.,]\d{1,2})?" placeholder="mg" oninput="updateSubmitButtonState()"></td>
+                    </tr>
+                </table>
             <button type="submit" id="submit-button" disabled>Hinzufügen</button>
         </form>
+
+        <div class="search-container">
+            <input type="text" id="search-input" placeholder="Lebensmittel suchen..." oninput="filterTable()">
+        </div>
+        
+
+        <div class="table-container">
+            <table id="database-nutrition-table">
+                <thead>
+                    <tr>
+                        <th>Lebensmittel</th>
+                        <th>kcal</th>
+                        <th>EW</th>
+                        <th>Fett</th>
+                        <th>KH</th>
+                        <th>BST</th>
+                        <th>CA</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <!-- Die Zeilen werden dynamisch aus der Datenbank geladen -->
+                </tbody>
+            </table>
+        </div>
+        <button id="delete-row-button" onclick="showPasswordPrompt()">Zeilen löschen</button>
+
+        <div id="password-prompt" style="display: none;">
+            <input type="password" id="password-input" placeholder="Passwort">
+            <button id="ok-button" onclick="deleteRowsIfPasswordCorrect()">OK</button>
+            <button id="cancel-button" onclick="hidePasswordPrompt()">Abbrechen</button>
+        </div>
+        
+        
     </div>
 </body>
 </html>

start.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-gunicorn 'Run:app' --bind 0.0.0.0:8080 --log-level=info --workers=4
+gunicorn 'Run:exposed_app' --bind 0.0.0.0:8080 --log-level=debug --workers=4