Merge History into Log Eggs page; update dashboard card order and colors
- 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 <noreply@anthropic.com>
This commit is contained in:
10
README.md
10
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
|
||||
│ │ │ ├── auth.js # Auth utilities, nav, settings modal
|
||||
│ │ │ ├── history.js # Collection history table (used on log page)
|
||||
│ │ │ └── dashboard.js
|
||||
│ │ └── css/style.css
|
||||
│ └── nginx.conf
|
||||
├── mysql/
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
<ul class="nav-links">
|
||||
<li><a href="/">Dashboard</a></li>
|
||||
<li><a href="/log">Log Eggs</a></li>
|
||||
<li><a href="/history">History</a></li>
|
||||
<li><a href="/flock">Flock</a></li>
|
||||
<li><a href="/budget">Budget</a></li>
|
||||
<li><a href="/summary">Summary</a></li>
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
<ul class="nav-links">
|
||||
<li><a href="/">Dashboard</a></li>
|
||||
<li><a href="/log">Log Eggs</a></li>
|
||||
<li><a href="/history">History</a></li>
|
||||
<li><a href="/flock">Flock</a></li>
|
||||
<li><a href="/budget">Budget</a></li>
|
||||
<li><a href="/summary">Summary</a></li>
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
<ul class="nav-links">
|
||||
<li><a href="/">Dashboard</a></li>
|
||||
<li><a href="/log">Log Eggs</a></li>
|
||||
<li><a href="/history">History</a></li>
|
||||
<li><a href="/flock">Flock</a></li>
|
||||
<li><a href="/budget">Budget</a></li>
|
||||
<li><a href="/summary">Summary</a></li>
|
||||
|
||||
@@ -1,70 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>History — Yolkbook</title>
|
||||
<link rel="icon" href="/favicon.svg" type="image/svg+xml">
|
||||
<link rel="stylesheet" href="/css/style.css">
|
||||
</head>
|
||||
<body>
|
||||
<nav class="nav">
|
||||
<a class="nav-brand" href="/">🥚 <span>Yolkbook</span></a>
|
||||
<ul class="nav-links">
|
||||
<li><a href="/">Dashboard</a></li>
|
||||
<li><a href="/log">Log Eggs</a></li>
|
||||
<li><a href="/history">History</a></li>
|
||||
<li><a href="/flock">Flock</a></li>
|
||||
<li><a href="/budget">Budget</a></li>
|
||||
<li><a href="/summary">Summary</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
<main class="container">
|
||||
<h1>Egg Collection History</h1>
|
||||
|
||||
<div id="msg" class="message"></div>
|
||||
|
||||
<!-- Date filter -->
|
||||
<div class="card">
|
||||
<div class="filter-bar">
|
||||
<div class="form-group">
|
||||
<label for="filter-start">From</label>
|
||||
<input type="date" id="filter-start">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="filter-end">To</label>
|
||||
<input type="date" id="filter-end">
|
||||
</div>
|
||||
<button class="btn btn-primary" onclick="loadHistory()">Filter</button>
|
||||
<button class="btn btn-ghost" onclick="clearFilter()">Clear</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="section-header">
|
||||
<span class="text-muted" id="result-count"></span>
|
||||
</div>
|
||||
|
||||
<div class="table-wrap">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Date</th>
|
||||
<th>Eggs</th>
|
||||
<th>Notes</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="history-body">
|
||||
<tr class="empty-row"><td colspan="4">Loading…</td></tr>
|
||||
</tbody>
|
||||
<tfoot id="history-foot"></tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
<script src="/js/api.js?v=3"></script>
|
||||
<script src="/js/auth.js?v=3"></script>
|
||||
<script src="/js/history.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -13,7 +13,6 @@
|
||||
<ul class="nav-links">
|
||||
<li><a href="/">Dashboard</a></li>
|
||||
<li><a href="/log">Log Eggs</a></li>
|
||||
<li><a href="/history">History</a></li>
|
||||
<li><a href="/flock">Flock</a></li>
|
||||
<li><a href="/budget">Budget</a></li>
|
||||
<li><a href="/summary">Summary</a></li>
|
||||
@@ -27,12 +26,12 @@
|
||||
|
||||
<!-- Stat cards -->
|
||||
<div class="stats-grid" id="stats-grid">
|
||||
<div class="stat-card"><div class="label">Flock Size</div><div class="value" id="s-flock">—</div><div class="unit">chickens</div></div>
|
||||
<div class="stat-card"><div class="label">Last 7 Days</div><div class="value" id="s-7d">—</div><div class="unit">eggs</div></div>
|
||||
<div class="stat-card"><div class="label">Last 30 Days</div><div class="value" id="s-30d">—</div><div class="unit">eggs</div></div>
|
||||
<div class="stat-card"><div class="label">All-Time Eggs</div><div class="value" id="s-total">—</div><div class="unit">eggs</div></div>
|
||||
<div class="stat-card accent"><div class="label">Avg / Day (30d)</div><div class="value" id="s-avg-day">—</div><div class="unit">eggs/day</div></div>
|
||||
<div class="stat-card accent"><div class="label">Avg / Hen / Day (30d)</div><div class="value" id="s-avg-hen">—</div><div class="unit">eggs/hen</div></div>
|
||||
<div class="stat-card"><div class="label">Avg / Day (30d)</div><div class="value" id="s-avg-day">—</div><div class="unit">eggs/day</div></div>
|
||||
<div class="stat-card"><div class="label">Avg / Hen / Day (30d)</div><div class="value" id="s-avg-hen">—</div><div class="unit">eggs/hen</div></div>
|
||||
<div class="stat-card accent"><div class="label">Flock Size</div><div class="value" id="s-flock">—</div><div class="unit">chickens</div></div>
|
||||
<div class="stat-card accent"><div class="label">Cost / Egg</div><div class="value" id="s-cpe">—</div></div>
|
||||
<div class="stat-card accent"><div class="label">Cost / Egg (30d)</div><div class="value" id="s-cpe-30d">—</div></div>
|
||||
<div class="stat-card accent"><div class="label">Cost / Dozen</div><div class="value" id="s-cpd">—</div></div>
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
<ul class="nav-links">
|
||||
<li><a href="/">Dashboard</a></li>
|
||||
<li><a href="/log">Log Eggs</a></li>
|
||||
<li><a href="/history">History</a></li>
|
||||
<li><a href="/flock">Flock</a></li>
|
||||
<li><a href="/budget">Budget</a></li>
|
||||
<li><a href="/summary">Summary</a></li>
|
||||
@@ -46,8 +45,24 @@
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<!-- Date filter -->
|
||||
<div class="card">
|
||||
<div class="filter-bar">
|
||||
<div class="form-group">
|
||||
<label for="filter-start">From</label>
|
||||
<input type="date" id="filter-start">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="filter-end">To</label>
|
||||
<input type="date" id="filter-end">
|
||||
</div>
|
||||
<button class="btn btn-primary" onclick="loadHistory()">Filter</button>
|
||||
<button class="btn btn-ghost" onclick="clearFilter()">Clear</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="section-header">
|
||||
<h2>Recent Entries</h2>
|
||||
<span class="text-muted" id="result-count"></span>
|
||||
</div>
|
||||
|
||||
<div class="table-wrap">
|
||||
@@ -57,11 +72,13 @@
|
||||
<th>Date</th>
|
||||
<th>Eggs</th>
|
||||
<th>Notes</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="recent-body">
|
||||
<tr class="empty-row"><td colspan="3">Loading…</td></tr>
|
||||
<tbody id="history-body">
|
||||
<tr class="empty-row"><td colspan="4">Loading…</td></tr>
|
||||
</tbody>
|
||||
<tfoot id="history-foot"></tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</main>
|
||||
@@ -69,5 +86,6 @@
|
||||
<script src="/js/api.js?v=3"></script>
|
||||
<script src="/js/auth.js?v=3"></script>
|
||||
<script src="/js/log.js"></script>
|
||||
<script src="/js/history.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -13,7 +13,6 @@
|
||||
<ul class="nav-links">
|
||||
<li><a href="/">Dashboard</a></li>
|
||||
<li><a href="/log">Log Eggs</a></li>
|
||||
<li><a href="/history">History</a></li>
|
||||
<li><a href="/flock">Flock</a></li>
|
||||
<li><a href="/budget">Budget</a></li>
|
||||
<li><a href="/summary">Summary</a></li>
|
||||
|
||||
Reference in New Issue
Block a user