19 Commits
0.3.0 ... 0.3.1

Author SHA1 Message Date
11469a2865 removed xss
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2024-02-06 15:54:58 +01:00
9a4160e4e1 removed xss
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-02-06 15:51:14 +01:00
54c67cf5c2 no xss
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-02-06 15:46:53 +01:00
c7bf411f01 another trivy test, 11
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-02-06 13:20:03 +01:00
67c4981cbe another trivy test, 10
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-02-06 13:17:34 +01:00
6211ea95a4 another trivy test, 9
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-02-06 12:52:09 +01:00
3cee043e28 another trivy test, 8
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-02-06 12:50:01 +01:00
6fe351e110 another trivy test, 7
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-02-06 12:47:42 +01:00
7429d4a4f0 another trivy test, 6
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-02-06 12:45:24 +01:00
515657b1fd another trivy test, 5
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-02-06 12:38:55 +01:00
605ddc00d0 another trivy test, 4
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-02-06 12:36:49 +01:00
7e00994a37 another trivy test, 3
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-02-06 12:32:06 +01:00
fb1249d37b another trivy test, 2
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-02-06 10:31:23 +01:00
d9195187f3 another trivy test
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-02-06 10:29:14 +01:00
161aea553c test outaged alpine image
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-02-06 10:12:29 +01:00
7c3ae15c67 use Werkzeug 3.0.1 again
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-02-06 09:54:16 +01:00
d535fe3743 test trivy
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2024-02-06 09:49:55 +01:00
56ed58b6d4 password test
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-02-06 09:19:13 +01:00
863fcef491 add trivy into ci script and separate database for test instance
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-02-06 09:10:09 +01:00
6 changed files with 34 additions and 26 deletions

View File

@ -2,7 +2,7 @@ steps:
build:
image: plugins/kaniko
settings:
repo: gitea.hottis.de/moerp/elo-rezept-rechner
repo: ${FORGE_NAME}/${CI_REPO}
registry:
from_secret: container_registry
tags: latest,${CI_COMMIT_SHA},${CI_COMMIT_TAG}
@ -17,6 +17,11 @@ steps:
when:
- event: [push, tag]
scan_image:
image: aquasec/trivy
commands:
- trivy image $FORGE_NAME/$CI_REPO:$CI_COMMIT_SHA --quiet --exit-code 1
deploytest:
image: portainer/kubectl-shell:latest
secrets:

View File

@ -10,7 +10,8 @@ COPY start.sh ${APP_DIR}/
WORKDIR ${APP_DIR}
RUN \
apk add --no-cache build-base libpq-dev && \
apk add --no-cache build-base libpq-dev npm && \
pip install --upgrade pip && \
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 && \

View File

@ -36,7 +36,7 @@ kubectl create secret generic nutri-secrets \
--from-literal=CLIENT_SECRETS="$CLIENT_SECRETS" \
--from-literal=PGUSER="$PGUSER" \
--from-literal=PGPASSWORD="$PGPASSWORD" \
--from-literal=PGDATABASE="$PGDATABASE" \
--from-literal=PGDATABASE="$PGDATABASE$POSTFIX" \
--from-literal=PGHOST="timescaledb.database.svc.cluster.local" \
--from-literal=PGSSLMODE="require" | \
kubectl apply -f - -n $NAMESPACE

View File

@ -21,6 +21,8 @@ app.config.update({
oidc = OpenIDConnect(app)
app.logger.handlers = logging.getLogger('gunicorn.error').handlers
datapw = 'dasrtwegdffgtewrt4335wferg'
def calculate_nutrition(food, weight):
try:
conn = psycopg2.connect()

View File

@ -49,14 +49,14 @@
const table = document.getElementById('nutrition-table');
const row = table.insertRow();
row.insertCell(0).innerHTML = food;
row.insertCell(1).innerHTML = weight;
row.insertCell(2).innerHTML = nutritionData.kcal;
row.insertCell(3).innerHTML = nutritionData.ew;
row.insertCell(4).innerHTML = nutritionData.fett;
row.insertCell(5).innerHTML = nutritionData.kh;
row.insertCell(6).innerHTML = nutritionData.bst;
row.insertCell(7).innerHTML = nutritionData.ca;
row.insertCell(0).innerText = food;
row.insertCell(1).innerText = weight;
row.insertCell(2).innerText = nutritionData.kcal;
row.insertCell(3).innerText = nutritionData.ew;
row.insertCell(4).innerText = nutritionData.fett;
row.insertCell(5).innerText = nutritionData.kh;
row.insertCell(6).innerText = nutritionData.bst;
row.insertCell(7).innerText = nutritionData.ca;
}
@ -124,14 +124,14 @@
const table = document.getElementById('nutrition-table');
const row = table.insertRow();
// Fügt die einzelnen Nährwerte zur neuen Zeile hinzu
row.insertCell(0).innerHTML = food;
row.insertCell(1).innerHTML = weight;
row.insertCell(2).innerHTML = data.kcal;
row.insertCell(3).innerHTML = data.ew;
row.insertCell(4).innerHTML = data.fett;
row.insertCell(5).innerHTML = data.kh;
row.insertCell(6).innerHTML = data.bst;
row.insertCell(7).innerHTML = data.ca;
row.insertCell(0).innerText = food;
row.insertCell(1).innerText = weight;
row.insertCell(2).innerText = data.kcal;
row.insertCell(3).innerText = data.ew;
row.insertCell(4).innerText = data.fett;
row.insertCell(5).innerText = data.kh;
row.insertCell(6).innerText = data.bst;
row.insertCell(7).innerText = data.ca;
foodInput.value = ''; // Zurücksetzen des Lebensmittel-Eingabefeldes
weightInput.value = ''; // Zurücksetzen des Gewicht-Eingabefeldes

View File

@ -137,13 +137,13 @@
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;
row.insertCell(0).innerText = entry.food;
row.insertCell(1).innerText = entry.kcal;
row.insertCell(2).innerText = entry.ew;
row.insertCell(3).innerText = entry.fett;
row.insertCell(4).innerText = entry.kh;
row.insertCell(5).innerText = entry.bst;
row.insertCell(6).innerText = entry.ca;
// ... Fügen Sie weitere Zellen für die anderen Werte hinzu ...
});