diff --git a/docker-compose.yml b/docker-compose.yml index 9f556fa..c443947 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,10 +1,14 @@ +version: '3.8' + services: app: build: context: . dockerfile: Dockerfile ports: - - "${APP_PORT:-8080}:8080" + - "${APP_PORT:-8080}:${APP_PORT:-8080}" volumes: - ./instance:/app/instance restart: unless-stopped + env_file: + - .env diff --git a/templates/index.html b/templates/index.html index d222488..e33a703 100644 --- a/templates/index.html +++ b/templates/index.html @@ -40,23 +40,35 @@ zbiórki{% endif %}{% endblock %}
+ {% if not z.ukryj_kwote %} {% if z.cel > 0 %} - Cel: {{ z.cel|round(2) }} - PLN + + Cel: {{ z.cel|round(2) }} PLN + + {% endif %} + + Stan: {{ z.stan|round(2) }} PLN + + {% else %} + Kwoty ukryte {% endif %} - Stan: {{ z.stan|round(2) }} - PLN
-
+
- {{ progress|round(1) }}% + + {% if not z.ukryj_kwote %} + {{ progress_clamped|round(1) }}% + {% else %} + Postęp ukryty + {% endif %}
+
Szczegóły