From b660263f30a806a286973414147c0b52f0b42b88 Mon Sep 17 00:00:00 2001 From: derekc Date: Tue, 17 Mar 2026 23:43:27 -0700 Subject: [PATCH] Merge History into Log Eggs page; update dashboard card order and colors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Removed standalone History page (history.html); full collection history (date filter, edit, delete, totals footer) is now embedded in the Log Eggs page below the log form - Removed History nav link from all pages - Reordered dashboard stat cards: egg counts → averages → Flock Size → cost cards - Egg count and average cards now use green; Flock Size card uses orange - Updated README to reflect removed History page, merged log/history feature, dashboard card changes, and project structure Co-Authored-By: Claude Sonnet 4.6 --- README.md | 12 ++++--- nginx/html/admin.html | 1 - nginx/html/budget.html | 1 - nginx/html/flock.html | 1 - nginx/html/history.html | 70 ----------------------------------------- nginx/html/index.html | 7 ++--- nginx/html/log.html | 26 ++++++++++++--- nginx/html/summary.html | 1 - 8 files changed, 32 insertions(+), 87 deletions(-) delete mode 100644 nginx/html/history.html diff --git a/README.md b/README.md index 5b1cad7..35b7dbb 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,8 @@ A self-hosted, multi-user web app for backyard chicken keepers to track egg prod ## Features -- **Dashboard** — at-a-glance stats: total eggs, 7/30-day totals, average eggs per day and per hen, cost per egg and per dozen -- **Daily log** — record egg collections with one entry per day -- **History** — browse, edit, and delete past egg collection records +- **Dashboard** — at-a-glance stats: total eggs, 7/30-day totals, averages (green), flock size (orange), cost per egg and per dozen +- **Daily log** — record egg collections with one entry per day; includes full collection history with date filtering, edit, and delete below the form - **Flock management** — track changes to your flock size over time so per-hen averages stay accurate - **Feed tracking** — log feed purchases (bags + price per bag) - **Budget** — cost per egg and cost per dozen, all-time and over the last 30 days @@ -145,9 +144,12 @@ yolkbook/ │ │ ├── login.html │ │ ├── admin.html │ │ ├── index.html # Dashboard +│ │ ├── log.html # Log Eggs + full collection history │ │ ├── js/ -│ │ │ ├── api.js # Shared fetch helpers -│ │ │ └── auth.js # Auth utilities, nav, settings modal +│ │ │ ├── api.js # Shared fetch helpers +│ │ │ ├── auth.js # Auth utilities, nav, settings modal +│ │ │ ├── history.js # Collection history table (used on log page) +│ │ │ └── dashboard.js │ │ └── css/style.css │ └── nginx.conf ├── mysql/ diff --git a/nginx/html/admin.html b/nginx/html/admin.html index 7a38b96..022730f 100644 --- a/nginx/html/admin.html +++ b/nginx/html/admin.html @@ -13,7 +13,6 @@