3 Commits

3 changed files with 33 additions and 4 deletions

5
app.py
View File

@@ -11,6 +11,9 @@ app_start_time = time.time()
app = Flask(__name__) app = Flask(__name__)
app.secret_key = os.environ.get('SECRET_KEY', 'dev-key') app.secret_key = os.environ.get('SECRET_KEY', 'dev-key')
# Version der App
APP_VERSION = "1.3.10"
# HTML-Template wird jetzt aus templates/index.html geladen # HTML-Template wird jetzt aus templates/index.html geladen
WOCHENTAGE = ["Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"] WOCHENTAGE = ["Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"]
@@ -158,7 +161,7 @@ def index():
except Exception: except Exception:
plusminus_result = 'Ungültige Eingabe' plusminus_result = 'Ungültige Eingabe'
return render_template('index.html', tage=tage, werktage=werktage, wochentag=wochentag, plusminus_result=plusminus_result, kw_berechnen=kw_berechnen, kw_datum=kw_datum, active_idx=active_idx return render_template('index.html', tage=tage, werktage=werktage, wochentag=wochentag, plusminus_result=plusminus_result, kw_berechnen=kw_berechnen, kw_datum=kw_datum, active_idx=active_idx
, feiertage_anzahl=feiertage_anzahl, wochenendtage_anzahl=wochenendtage_anzahl , feiertage_anzahl=feiertage_anzahl, wochenendtage_anzahl=wochenendtage_anzahl, app_version=APP_VERSION
) )

View File

@@ -36,15 +36,22 @@
--text: #1e293b; --text: #1e293b;
--shadow: 0 2px 8px rgba(30,41,59,0.07); --shadow: 0 2px 8px rgba(30,41,59,0.07);
} }
* {
box-sizing: border-box;
}
body { body {
background: var(--background); background: var(--background);
color: var(--text); color: var(--text);
font-family: 'Segoe UI', Arial, sans-serif; font-family: 'Segoe UI', Arial, sans-serif;
margin: 0; margin: 0;
padding: 0; padding: 0;
overflow-x: hidden;
box-sizing: border-box;
} }
.container { .container {
max-width: 480px; max-width: 480px;
width: 100%;
margin: 3em auto; margin: 3em auto;
background: var(--surface); background: var(--surface);
border-radius: 16px; border-radius: 16px;
@@ -52,6 +59,7 @@ body {
padding: 2.5em 2em 2em 2em; padding: 2.5em 2em 2em 2em;
border: 1px solid var(--border); border: 1px solid var(--border);
position: relative; position: relative;
box-sizing: border-box;
} }
.help-button-container { .help-button-container {
position: absolute; position: absolute;
@@ -136,6 +144,7 @@ body {
border-radius: 12px; border-radius: 12px;
padding: 2em; padding: 2em;
max-width: 90%; max-width: 90%;
width: 90%;
max-height: 90%; max-height: 90%;
overflow-y: auto; overflow-y: auto;
position: relative; position: relative;
@@ -143,6 +152,7 @@ body {
margin: 0 auto; margin: 0 auto;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
box-sizing: border-box;
} }
.modal-close { .modal-close {
position: absolute; position: absolute;
@@ -410,6 +420,8 @@ button:focus, .accordion-header:focus {
.container { .container {
margin: 1em; margin: 1em;
padding: 1.2em 0.7em 1em 0.7em; padding: 1.2em 0.7em 1em 0.7em;
width: calc(100% - 2em);
max-width: none;
} }
h1 { h1 {
font-size: 1.3em; font-size: 1.3em;
@@ -432,6 +444,10 @@ button:focus, .accordion-header:focus {
.modal-content { .modal-content {
padding: 1.5em; padding: 1.5em;
margin: 1em; margin: 1em;
width: calc(100% - 2em);
max-width: none;
left: 0;
transform: none;
} }
} }
@@ -820,6 +836,7 @@ footer br + a {
Dies ist ein werbe- und trackingfreier <a href="https://codeberg.org/elpatron/datecalc/src/branch/main/README.md" target="_blank" style="color:#2563eb; text-decoration:underline;">Open Source Datumsrechner</a><br> Dies ist ein werbe- und trackingfreier <a href="https://codeberg.org/elpatron/datecalc/src/branch/main/README.md" target="_blank" style="color:#2563eb; text-decoration:underline;">Open Source Datumsrechner</a><br>
<a href="/api-docs" target="_blank" style="color:#2563eb; text-decoration:underline;">REST API Dokumentation (Swagger)</a><br> <a href="/api-docs" target="_blank" style="color:#2563eb; text-decoration:underline;">REST API Dokumentation (Swagger)</a><br>
© 2025 <a href="mailto:elpatron@mailbox.org?subject=Datumsrechner" style="color:#2563eb; text-decoration:underline;">M. Busche</a> © 2025 <a href="mailto:elpatron@mailbox.org?subject=Datumsrechner" style="color:#2563eb; text-decoration:underline;">M. Busche</a>
<div style="margin-top:0.5em; font-size:0.85em; color:#94a3b8;">v{{ app_version }}</div>
</footer> </footer>
<script> <script>
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {

View File

@@ -6,6 +6,13 @@
<link rel="stylesheet" href="/static/style.css"> <link rel="stylesheet" href="/static/style.css">
<script src="https://cdn.jsdelivr.net/npm/chart.js"></script> <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
<style> <style>
body {
font-family: 'Segoe UI', Arial, sans-serif;
background: #f8fafc;
color: #1e293b;
margin: 0;
padding: 0;
}
.dashboard-box { max-width: 600px; margin: 3em auto; background: #fff; border-radius: 12px; box-shadow: 0 2px 8px #cbd5e1; padding: 2em 2em 1.5em 2em; border: 1px solid #e5e7eb; } .dashboard-box { max-width: 600px; margin: 3em auto; background: #fff; border-radius: 12px; box-shadow: 0 2px 8px #cbd5e1; padding: 2em 2em 1.5em 2em; border: 1px solid #e5e7eb; }
.dashboard-box h2 { text-align: center; margin-bottom: 1.2em; } .dashboard-box h2 { text-align: center; margin-bottom: 1.2em; }
.stats-row { display: flex; justify-content: space-between; margin-bottom: 2em; } .stats-row { display: flex; justify-content: space-between; margin-bottom: 2em; }
@@ -16,9 +23,9 @@
</head> </head>
<body> <body>
<div class="dashboard-box"> <div class="dashboard-box">
<h2>Statistik-Dashboard</h2> <h1>Statistik-Dashboard</h1>
<div class="stats-row"> <div class="stats-row">
<div class="stats-label">Gesamt-Pageviews:</div> <div class="stats-label">Gesamt-Pageviews (7 Tage):</div>
<div class="stats-value">{{ pageviews }}</div> <div class="stats-value">{{ pageviews }}</div>
</div> </div>
<div class="chart-container"> <div class="chart-container">
@@ -32,12 +39,12 @@
<canvas id="apiChart" width="400" height="220"></canvas> <canvas id="apiChart" width="400" height="220"></canvas>
</div> </div>
{% endif %} {% endif %}
<pre style="background:#f3f4f6; color:#334155; padding:0.5em; border-radius:6px; font-size:0.9em;">API-Counts: {{ api_counts|tojson }}</pre>
<a href="/" style="color:#2563eb;">Zurück zur App</a> <a href="/" style="color:#2563eb;">Zurück zur App</a>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
// Impressions pro Tag // Impressions pro Tag
// eslint-disable-next-line
const imprData = {{ impressions_per_day|tojson }}; const imprData = {{ impressions_per_day|tojson }};
const imprLabels = Object.keys(imprData); const imprLabels = Object.keys(imprData);
const imprCounts = Object.values(imprData); const imprCounts = Object.values(imprData);
@@ -62,6 +69,7 @@
} }
}); });
// Funktionsaufrufe // Funktionsaufrufe
// eslint-disable-next-line
const funcCounts = {{ func_counts|tojson }}; const funcCounts = {{ func_counts|tojson }};
const labels = Object.keys(funcCounts); const labels = Object.keys(funcCounts);
const data = Object.values(funcCounts); const data = Object.values(funcCounts);
@@ -83,6 +91,7 @@
} }
}); });
// API-Nutzung // API-Nutzung
// eslint-disable-next-line
const apiCounts = {{ api_counts|tojson }}; const apiCounts = {{ api_counts|tojson }};
if (Object.keys(apiCounts).length > 0 && document.getElementById('apiChart')) { if (Object.keys(apiCounts).length > 0 && document.getElementById('apiChart')) {
new Chart(document.getElementById('apiChart').getContext('2d'), { new Chart(document.getElementById('apiChart').getContext('2d'), {