From 2186c81264dbc4c8618ce6c9fa39b2c9b637f6d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Gruszczy=C5=84ski?=
 <mateusz.gruszczynski@firma.interia.pl>
Date: Thu, 28 Aug 2025 10:41:01 +0200
Subject: [PATCH] poprawki w anonimizacji i env

---
 docker-compose.yml   |  6 +++++-
 templates/index.html | 28 ++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 9 deletions(-)

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 %}
                 </div>
 
                 <div class="mb-2 d-flex flex-wrap gap-2">
+                    {% if not z.ukryj_kwote %}
                     {% if z.cel > 0 %}
-                    <span class="badge bg-dark border" style="border-color: var(--border);">Cel: {{ z.cel|round(2) }}
-                        PLN</span>
+                    <span class="badge bg-dark border" style="border-color: var(--border);">
+                        Cel: {{ z.cel|round(2) }} PLN
+                    </span>
+                    {% endif %}
+                    <span class="badge bg-dark border" style="border-color: var(--border);">
+                        Stan: {{ z.stan|round(2) }} PLN
+                    </span>
+                    {% else %}
+                    <span class="badge bg-secondary">Kwoty ukryte</span>
                     {% endif %}
-                    <span class="badge bg-dark border" style="border-color: var(--border);">Stan: {{ z.stan|round(2) }}
-                        PLN</span>
                 </div>
 
                 <div class="mb-1">
-                    <div class="progress" role="progressbar" aria-valuenow="{{ progress_clamped|round(2) }}"
-                        aria-valuemin="0" aria-valuemax="100"
-                        aria-label="Postęp zbiórki {{ progress_clamped|round(0) }} procent">
+                    <div class="progress" role="progressbar" aria-valuemin="0" aria-valuemax="100"
+                        aria-valuenow="{{ progress_clamped|round(2) if not z.ukryj_kwote else '' }}"
+                        aria-label="{% if z.ukryj_kwote %}Postęp ukryty{% else %}Postęp zbiórki {{ progress_clamped|round(0) }} procent{% endif %}">
                         <div class="progress-bar" style="width: {{ progress_clamped }}%;"></div>
                     </div>
-                    <small class="text-muted">{{ progress|round(1) }}%</small>
+
+                    {% if not z.ukryj_kwote %}
+                    <small class="text-muted">{{ progress_clamped|round(1) }}%</small>
+                    {% else %}
+                    <small class="text-muted">Postęp ukryty</small>
+                    {% endif %}
                 </div>
 
+
                 <div class="mt-auto pt-2">
                     <a href="{{ url_for('zbiorka', zbiorka_id=z.id) }}" class="stretched-link"></a>
                     <a href="{{ url_for('zbiorka', zbiorka_id=z.id) }}" class="btn btn-primary btn-sm">Szczegóły</a>