From 9d30359602ec878bb2e8e415670d4cd5eb0ddb2b Mon Sep 17 00:00:00 2001
From: Ignace <ignace@suy.nl>
Date: Fri, 17 Jul 2026 18:19:42 +0200
Subject: [PATCH] moved the report button

---
 .gitignore               |   1 -
 instance/calendar.sqlite | Bin 0 -> 20480 bytes
 static/styles.css        |  11 +++++-
 templates/calendar.html  |   4 +-
 tests/test_app.py        |  81 ++++++++++++++++++++++-----------------
 5 files changed, 55 insertions(+), 42 deletions(-)
 create mode 100644 instance/calendar.sqlite

diff --git a/.gitignore b/.gitignore
index 4907a28..de054b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@ __pycache__/
 .pytest_cache/
 *.py[cod]
 config.yaml
-instance/
diff --git a/instance/calendar.sqlite b/instance/calendar.sqlite
new file mode 100644
index 0000000000000000000000000000000000000000..197c3d625eddc3a2d7409a49fa203f03a91812db
GIT binary patch
literal 20480
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
Y$p6bQLciJ$AmTh;nEx019b{PGpGxFOb^rhX

literal 0
HcmV?d00001

diff --git a/static/styles.css b/static/styles.css
index bccadd7..d00043e 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -178,7 +178,6 @@ button { -webkit-tap-highlight-color: transparent; }
 .amount-input span { padding-left: 9px; font-size: 13px; }
 .amount-input input { width: 100%; min-width: 0; height: 100%; padding: 0 8px 0 3px; border: 0; outline: 0; background: transparent; color: var(--ink); font-size: 16px; }
 .custom-amount-form > button { padding: 0 13px; }
-.report-row { display: flex; justify-content: flex-end; margin-bottom: 7px; }
 .delete-row { display: flex; justify-content: flex-end; margin-top: 7px; }
 .report-button {
   display: flex;
@@ -194,7 +193,15 @@ button { -webkit-tap-highlight-color: transparent; }
   font-weight: 800;
   text-decoration: none;
 }
-.report-row .report-button { min-width: 92px; }
+.calendar-header .report-button {
+  min-height: 36px;
+  padding: 0 13px;
+  border-color: var(--green);
+  border-radius: 999px;
+  background: transparent;
+  color: var(--green);
+  font-size: 12px;
+}
 .delete-row button {
   min-height: 28px;
   padding: 0 10px;
diff --git a/templates/calendar.html b/templates/calendar.html
index fea8cdf..7354710 100644
--- a/templates/calendar.html
+++ b/templates/calendar.html
@@ -9,6 +9,7 @@
           <h1 id="visible-month">Calendar</h1>
         </div>
         <div class="header-actions">
+          <a class="report-button" href="{{ url_for('report') }}">Report</a>
           <button class="today-button" data-today-button type="button">Today</button>
           <form action="{{ url_for('logout') }}" method="post">
             <button class="logout-button" type="submit" aria-label="Sign out">Sign out</button>
@@ -25,9 +26,6 @@
 
     <section class="detail-panel" aria-live="polite">
       <p id="selected-date" class="selected-date">Tap a day</p>
-      <div class="report-row">
-        <a class="report-button" href="{{ url_for('report') }}">Report</a>
-      </div>
       <div id="amount-controls" class="amount-controls" hidden>
         <div class="status-options" aria-label="Choose day status">
           <button type="button" data-status="worked">Worked</button>
diff --git a/tests/test_app.py b/tests/test_app.py
index e4f5838..afa7590 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -1,9 +1,15 @@
 import tempfile
 
-from fatima import create_app
+from flask_fatima import create_app
+
+URL_PREFIX = "/fatima"
 
 
-def client(url_prefix="/fatima"):
+def url(path="/"):
+    return f"{URL_PREFIX}{path}"
+
+
+def client(url_prefix=URL_PREFIX):
     database = tempfile.NamedTemporaryFile(suffix=".sqlite")
     app = create_app({
         "TESTING": True,
@@ -19,26 +25,29 @@ def client(url_prefix="/fatima"):
 
 
 def test_calendar_requires_login():
-    response = client().get("/fatima/")
+    response = client().get(url())
     assert response.status_code == 302
-    assert response.headers["Location"].endswith("/fatima/login")
+    assert response.headers["Location"].endswith(url("/login"))
 
 
-def test_prefix_applies_to_generated_links_and_static_assets():
+def test_prefix_applies_to_generated_links_and_unprefixed_routes_are_rejected():
     test_client = client()
-    test_client.post("/fatima/login", data={"username": "user", "password": "pass"})
-    page = test_client.get("/fatima/")
+    test_client.post(url("/login"), data={"username": "user", "password": "pass"})
+    page = test_client.get(url())
 
     assert b'href="/fatima/static/styles.css"' in page.data
     assert b'src="/fatima/static/calendar.js"' in page.data
     assert b'data-save-url="/fatima/api/choices"' in page.data
+    assert b'href="/fatima/report"' in page.data
+    assert page.data.index(b'class="report-button"') < page.data.index(b'class="today-button"')
     assert test_client.get("/").status_code == 404
 
 
 def test_url_prefix_is_configurable_and_can_be_disabled():
     custom_client = client("/calendar")
-    assert custom_client.get("/calendar/").headers["Location"].endswith("/calendar/login")
-    assert custom_client.get("/fatima/").status_code == 404
+    response = custom_client.get("/calendar/")
+    assert response.headers["Location"].endswith("/calendar/login")
+    assert custom_client.get(url()).status_code == 404
 
     root_client = client("")
     assert root_client.get("/").headers["Location"].endswith("/login")
@@ -46,52 +55,52 @@ def test_url_prefix_is_configurable_and_can_be_disabled():
 
 def test_login_and_logout():
     test_client = client()
-    response = test_client.post("/fatima/login", data={"username": "user", "password": "pass"})
+    response = test_client.post(url("/login"), data={"username": "user", "password": "pass"})
     assert response.status_code == 302
-    assert response.headers["Location"].endswith("/fatima/")
-    assert test_client.get("/fatima/").status_code == 200
-    assert test_client.post("/fatima/logout").headers["Location"].endswith("/fatima/login")
+    assert response.headers["Location"].endswith(url())
+    assert test_client.get(url()).status_code == 200
+    assert test_client.post(url("/logout")).headers["Location"].endswith(url("/login"))
 
 
 def test_bad_login_shows_error():
-    response = client().post("/fatima/login", data={"username": "user", "password": "wrong"})
+    response = client().post(url("/login"), data={"username": "user", "password": "wrong"})
     assert response.status_code == 200
     assert b"not correct" in response.data
 
 
 def test_choice_is_saved_and_rendered():
     test_client = client()
-    test_client.post("/fatima/login", data={"username": "user", "password": "pass"})
-    response = test_client.post("/fatima/api/choices", json={"date": "2026-07-15", "amount": "27.50"})
+    test_client.post(url("/login"), data={"username": "user", "password": "pass"})
+    response = test_client.post(url("/api/choices"), json={"date": "2026-07-15", "amount": "27.50"})
     assert response.status_code == 200
     assert response.json["amount_cents"] == 2750
-    assert b'"2026-07-15": 2750' in test_client.get("/fatima/").data
+    assert b'"2026-07-15": 2750' in test_client.get(url()).data
 
 
 def test_choice_rejects_invalid_amount():
     test_client = client()
-    test_client.post("/fatima/login", data={"username": "user", "password": "pass"})
-    response = test_client.post("/fatima/api/choices", json={"date": "2026-07-15", "amount": "-1"})
+    test_client.post(url("/login"), data={"username": "user", "password": "pass"})
+    response = test_client.post(url("/api/choices"), json={"date": "2026-07-15", "amount": "-1"})
     assert response.status_code == 400
 
 
 def test_day_status_is_saved_and_rendered():
     test_client = client()
-    test_client.post("/fatima/login", data={"username": "user", "password": "pass"})
+    test_client.post(url("/login"), data={"username": "user", "password": "pass"})
     response = test_client.post(
-        "/fatima/api/statuses",
+        url("/api/statuses"),
         json={"date": "2026-07-15", "status": "vacation"},
     )
     assert response.status_code == 200
     assert response.json["status"] == "vacation"
-    assert b'"2026-07-15": "vacation"' in test_client.get("/fatima/").data
+    assert b'"2026-07-15": "vacation"' in test_client.get(url()).data
 
 
 def test_day_status_rejects_unknown_value():
     test_client = client()
-    test_client.post("/fatima/login", data={"username": "user", "password": "pass"})
+    test_client.post(url("/login"), data={"username": "user", "password": "pass"})
     response = test_client.post(
-        "/fatima/api/statuses",
+        url("/api/statuses"),
         json={"date": "2026-07-15", "status": "elsewhere"},
     )
     assert response.status_code == 400
@@ -99,14 +108,14 @@ def test_day_status_rejects_unknown_value():
 
 def test_delete_removes_amount_and_status():
     test_client = client()
-    test_client.post("/fatima/login", data={"username": "user", "password": "pass"})
-    test_client.post("/fatima/api/choices", json={"date": "2026-07-15", "amount": "55"})
-    test_client.post("/fatima/api/statuses", json={"date": "2026-07-15", "status": "sick"})
+    test_client.post(url("/login"), data={"username": "user", "password": "pass"})
+    test_client.post(url("/api/choices"), json={"date": "2026-07-15", "amount": "55"})
+    test_client.post(url("/api/statuses"), json={"date": "2026-07-15", "status": "sick"})
 
-    response = test_client.post("/fatima/api/delete-date", json={"date": "2026-07-15"})
+    response = test_client.post(url("/api/delete-date"), json={"date": "2026-07-15"})
     assert response.status_code == 200
     assert response.json["deleted"] is True
-    page = test_client.get("/fatima/").data
+    page = test_client.get(url()).data
     assert b'"2026-07-15": 5500' not in page
     assert b'"2026-07-15": "sick"' not in page
 
@@ -115,15 +124,15 @@ def test_report_groups_money_and_days_by_status():
     from datetime import date
 
     test_client = client()
-    test_client.post("/fatima/login", data={"username": "user", "password": "pass"})
+    test_client.post(url("/login"), data={"username": "user", "password": "pass"})
     year = date.today().year
     worked_date = f"{year}-01-10"
     vacation_date = f"{year}-02-10"
-    test_client.post("/fatima/api/choices", json={"date": worked_date, "amount": "55"})
-    test_client.post("/fatima/api/choices", json={"date": vacation_date, "amount": "27.50"})
-    test_client.post("/fatima/api/statuses", json={"date": vacation_date, "status": "vacation"})
+    test_client.post(url("/api/choices"), json={"date": worked_date, "amount": "55"})
+    test_client.post(url("/api/choices"), json={"date": vacation_date, "amount": "27.50"})
+    test_client.post(url("/api/statuses"), json={"date": vacation_date, "status": "vacation"})
 
-    response = test_client.get("/fatima/report")
+    response = test_client.get(url("/report"))
     assert response.status_code == 200
     assert b"\xe2\x82\xac55.00" in response.data
     assert b"\xe2\x82\xac27.50" in response.data
@@ -132,8 +141,8 @@ def test_report_groups_money_and_days_by_status():
 
 def test_report_can_navigate_to_another_year():
     test_client = client()
-    test_client.post("/fatima/login", data={"username": "user", "password": "pass"})
-    response = test_client.get("/fatima/report?year=2025")
+    test_client.post(url("/login"), data={"username": "user", "password": "pass"})
+    response = test_client.get(url("/report?year=2025"))
     assert response.status_code == 200
     assert b"2025 report" in response.data
     assert b"year=2024" in response.data