moerp/elo-rezept-rechner
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: moerp:0.0.1
Branches Tags
moerp:main moerp:containerized
moerp:0.5.0 moerp:0.4.4 moerp:0.4.3 moerp:0.4.2 moerp:0.4.1 moerp:0.3.1 moerp:0.3.0 moerp:0.2.16 moerp:0.2.15 moerp:0.2.14 moerp:0.2.13 moerp:0.2.12 moerp:0.2.11 moerp:0.2.10 moerp:0.2.9 moerp:0.2.8 moerp:0.2.7 moerp:0.2.6 moerp:0.2.5 moerp:0.2.4 moerp:0.2.3 moerp:0.2.2 moerp:0.2.1 moerp:0.2.0 moerp:0.1.9 moerp:0.1.8 moerp:0.1.7 moerp:0.1.6 moerp:0.1.5 moerp:0.1.4 moerp:0.1.3 moerp:0.1.2 moerp:0.1.1 moerp:0.1.0 moerp:0.0.9 moerp:0.0.8 moerp:0.0.7 moerp:0.0.6 moerp:0.0.5 moerp:0.0.4 moerp:0.0.3 moerp:0.0.2 moerp:0.0.1
..
compare: moerp:0.0.3
Branches Tags
moerp:main moerp:containerized
moerp:0.5.0 moerp:0.4.4 moerp:0.4.3 moerp:0.4.2 moerp:0.4.1 moerp:0.3.1 moerp:0.3.0 moerp:0.2.16 moerp:0.2.15 moerp:0.2.14 moerp:0.2.13 moerp:0.2.12 moerp:0.2.11 moerp:0.2.10 moerp:0.2.9 moerp:0.2.8 moerp:0.2.7 moerp:0.2.6 moerp:0.2.5 moerp:0.2.4 moerp:0.2.3 moerp:0.2.2 moerp:0.2.1 moerp:0.2.0 moerp:0.1.9 moerp:0.1.8 moerp:0.1.7 moerp:0.1.6 moerp:0.1.5 moerp:0.1.4 moerp:0.1.3 moerp:0.1.2 moerp:0.1.1 moerp:0.1.0 moerp:0.0.9 moerp:0.0.8 moerp:0.0.7 moerp:0.0.6 moerp:0.0.5 moerp:0.0.4 moerp:0.0.3 moerp:0.0.2 moerp:0.0.1

4 Commits
0.0.1 ... 0.0.3

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
3 changed files with 8 additions and 13 deletions
Expand all files Collapse all files

6
deployment/deploy.sh
View File

@ -6,8 +6,8 @@ if [ "$IMAGE_TAG" == "" ]; then
fi fi
IMAGE_NAME=gitea.hottis.de/wn/oidc-python-example IMAGE_NAME=gitea.hottis.de/moerp/elo-rezept-rechner
NAMESPACE=oidc-python-example NAMESPACE=moerp
DEPLOYMENT_DIR=$PWD/deployment DEPLOYMENT_DIR=$PWD/deployment
pushd $DEPLOYMENT_DIR > /dev/null pushd $DEPLOYMENT_DIR > /dev/null
@ -22,7 +22,7 @@ kubectl create namespace $NAMESPACE \
-o yaml | \ -o yaml | \
kubectl -f - apply kubectl -f - apply
kubectl create secret generic secrets \ kubectl create secret generic nutri-secrets \
--dry-run=client \ --dry-run=client \
-o yaml \ -o yaml \
--save-config \ --save-config \

4
src/Run.py
View File

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

11
src/templates/index.html
View File

@ -172,15 +172,6 @@ function updateTotalNutrition() {
document.getElementById('total-ca').innerText = Math.round(totalCa); 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> </script>
</head> </head>
<body> <body>
@ -196,7 +187,7 @@ function updateTotalNutrition() {
<div class="content"> <div class="content">
<form onsubmit="event.preventDefault(); addProduct();" id="product-form"> <form onsubmit="event.preventDefault(); addProduct();" id="product-form">
<label for="my_combobox">Wählen Sie ein Lebensmittel</label> <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"> <datalist id="products">
<!-- Produkte werden hier dynamisch eingefügt --> <!-- Produkte werden hier dynamisch eingefügt -->
</datalist> </datalist>