From e18566d8019312324f50912514e3f3c5cef1b3dd Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Wed, 9 Jul 2025 22:20:58 +0200 Subject: [PATCH] Solved some bugs --- app/app.py | 24 +++++++++++++++++++----- docker-compose.yml | 7 ++----- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/app/app.py b/app/app.py index 448baae..efd7e48 100644 --- a/app/app.py +++ b/app/app.py @@ -33,15 +33,29 @@ def load_config(app): app.config.update(resolver.get_config()) def cache_icons_and_logos(app): - """Cache all icons and logos to local files.""" + """Cache all icons and logos to local files, mit Fallback auf source.""" for card in app.config["cards"]: icon = card.get("icon", {}) if icon.get("source"): - icon["cache"] = cache_manager.cache_file(icon["source"]) + cached = cache_manager.cache_file(icon["source"]) + # Fallback: wenn cache_file None liefert, nutze weiterhin source + icon["cache"] = cached or icon["source"] + + # Company-Logo + company_logo = app.config["company"]["logo"] + cached = cache_manager.cache_file(company_logo["source"]) + company_logo["cache"] = cached or company_logo["source"] + + # Platform Favicon + favicon = app.config["platform"]["favicon"] + cached = cache_manager.cache_file(favicon["source"]) + favicon["cache"] = cached or favicon["source"] + + # Platform Logo + platform_logo = app.config["platform"]["logo"] + cached = cache_manager.cache_file(platform_logo["source"]) + platform_logo["cache"] = cached or platform_logo["source"] - app.config["company"]["logo"]["cache"] = cache_manager.cache_file(app.config["company"]["logo"]["source"]) - app.config["platform"]["favicon"]["cache"] = cache_manager.cache_file(app.config["platform"]["favicon"]["source"]) - app.config["platform"]["logo"]["cache"] = cache_manager.cache_file(app.config["platform"]["logo"]["source"]) # Initialize Flask app app = Flask(__name__) diff --git a/docker-compose.yml b/docker-compose.yml index 94413bc..1559a0c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,14 +5,11 @@ services: build: context: . dockerfile: Dockerfile - image: application-portfolio container_name: portfolio ports: - "${PORT:-5000}:${PORT:-5000}" + env_file: + - .env volumes: - ./app:/app - - ./.env:/app./.env - environment: - - PORT=${PORT:-5000} - - FLASK_ENV=${FLASK_ENV:-production} restart: unless-stopped