Merge branch 'main' of gitea.hottis.de:moerp/elo-rezept-rechner

roles
placeholder
2024-01-30 13:59:13 +01:00 · 2024-01-30 13:59:02 +01:00 · 2024-01-30 13:53:30 +01:00 · 2024-01-30 13:41:59 +01:00
3 changed files with 8 additions and 13 deletions
--- a/deployment/deploy.sh
+++ b/deployment/deploy.sh
@ -6,8 +6,8 @@ if [ "$IMAGE_TAG" == "" ]; then
 fi


-IMAGE_NAME=gitea.hottis.de/wn/oidc-python-example
-NAMESPACE=oidc-python-example
+IMAGE_NAME=gitea.hottis.de/moerp/elo-rezept-rechner
+NAMESPACE=moerp
 DEPLOYMENT_DIR=$PWD/deployment

 pushd $DEPLOYMENT_DIR > /dev/null
@ -22,7 +22,7 @@ kubectl create namespace $NAMESPACE \
  -o yaml | \
  kubectl -f - apply

-kubectl create secret generic secrets \
+kubectl create secret generic nutri-secrets \
  --dry-run=client \
  -o yaml \
  --save-config \
--- a/src/Run.py
+++ b/src/Run.py
@ -94,6 +94,7 @@ def calculate_nutrition(food, weight):
 # Index-Route
@app.route('/')
@oidc.require_login
+@oidc.require_keycloak_role('user')
 def index():
    return render_template('index.html')

@ -101,6 +102,7 @@ def index():

@app.route('/get_products')
@oidc.require_login
+@oidc.require_keycloak_role('user')
 def get_products():
    conn = get_db_connection()
    cursor = conn.cursor()
@ -117,6 +119,7 @@ def get_products():
 # Route zum Hinzufügen und Berechnen von Lebensmitteln
@app.route('/add_lm', methods=['GET'])
@oidc.require_login
+@oidc.require_keycloak_role('user')
 def add_lm():
    food = request.args.get('food')
    weight = float(request.args.get('weight'))
@ -164,6 +167,7 @@ def add_nutrition():

@app.route('/nutrition')
@oidc.require_login
+@oidc.require_keycloak_role('user')
 def nutrition():
    return render_template('nutrition.html')

--- a/src/templates/index.html
+++ b/src/templates/index.html
@ -172,15 +172,6 @@ function updateTotalNutrition() {
    document.getElementById('total-ca').innerText = Math.round(totalCa);
 }

-// Rufen Sie diese Funktion auf, wenn sich die Haupttabelle ändert
-
-
-
-
-
-// Diese Funktion sollte aufgerufen werden, wenn ein Produkt hinzugefügt oder entfernt wird
-
-
 </script>
 </head>
 <body>
@ -196,7 +187,7 @@ function updateTotalNutrition() {
    <div class="content">
        <form onsubmit="event.preventDefault(); addProduct();" id="product-form">
            <label for="my_combobox">Wählen Sie ein Lebensmittel</label>
-            <input list="products" name="my_combobox" id="my_combobox" oninput="updateButtonState()" autocomplete="off">
+            <input list="products" name="my_combobox" id="my_combobox" placeholder="Lebensmittel" oninput="updateButtonState()" autocomplete="off">
            <datalist id="products">
                <!-- Produkte werden hier dynamisch eingefügt -->
            </datalist>
Author	SHA1	Message	Date
Wolfgang Hottgenroth	fc9cd70776	Merge branch 'main' of gitea.hottis.de:moerp/elo-rezept-rechner	2024-01-30 13:59:13 +01:00
Wolfgang Hottgenroth	8b9654370c	roles	2024-01-30 13:59:02 +01:00
moerp	4471c140c1	placeholder	2024-01-30 13:53:30 +01:00
Wolfgang Hottgenroth	e87675dcbd	fix namespace All checks were successful ci/woodpecker/push/woodpecker Pipeline was successful Details ci/woodpecker/tag/woodpecker Pipeline was successful Details	2024-01-30 13:41:59 +01:00