+ {% for category, message in messages %}
+
+ {% endif %}
+ {% endwith %}
- {% block content %} {% endblock %}
+ {% block content %}{% endblock %}
+{{ message }}
+ {% endfor %}
+
+
+  }})
+ Brew Log
+
- {% block title %} Let there Be Pool Data {% endblock %}
+
- {{ bootstrap.load_css() }}
+
+
+
+ Brew Log
+
-
+
+
+
+{% endblock %}
diff --git a/src/flask/templates/error.html b/src/flask/templates/error.html
new file mode 100644
index 0000000..045e1f8
--- /dev/null
+++ b/src/flask/templates/error.html
@@ -0,0 +1,14 @@
+{% extends 'base.html' %}
+
+{% block title %}{{ code }} — Brew Log{% endblock %}
+
+{% block content %}
+
+
+Brew Process
+Record a gravity reading, then review where each brew is up to.
+
+
+
+{% endblock %}
diff --git a/src/flask/templates/index.html b/src/flask/templates/index.html
deleted file mode 100644
index 244597f..0000000
--- a/src/flask/templates/index.html
+++ /dev/null
@@ -1,37 +0,0 @@
-{% extends 'base.html' %}
-{% from 'bootstrap5/form.html' import render_form %}
-
-{% block title %}
-Login to Pool Data Tracker
-{% endblock %}
-{% block content %}
-
-
-
-
- {% if try_again %}
-
-
-{% endblock %}
diff --git a/src/flask/templates/login.html b/src/flask/templates/login.html
new file mode 100644
index 0000000..24c3b25
--- /dev/null
+++ b/src/flask/templates/login.html
@@ -0,0 +1,32 @@
+{% extends 'base.html' %}
+
+{% block title %}Sign in — Brew Log{% endblock %}
+{% block main_class %}page page--narrow{% endblock %}
+
+{% block content %}
+Login Failed Please try Again
- {% endif %} - -
-
-
-
-
-
-
- WHOOOOOOO ARE YOU!
- -If you know you know
- - {{ render_form(form) }} - -{{ message }}
- -
+
+{% endblock %}
diff --git a/src/flask/templates/run_detail.html b/src/flask/templates/run_detail.html
new file mode 100644
index 0000000..7cd6f15
--- /dev/null
+++ b/src/flask/templates/run_detail.html
@@ -0,0 +1,107 @@
+{% extends 'base.html' %}
+
+{% block title %}Run {{ summary.beer_run_id }} — Brew Log{% endblock %}
+
+{% block content %}
+
+
+
+
+ Brew Log
+Track the gravity of every brew.
+ + +
+
+
+
+
+ ← Back
++ {{ summary.canonical_name }} + {% if summary.active %} + Active + {% else %} + Finished + {% endif %} +
++ Run {{ summary.beer_run_id }} + {% if summary.first_date %} · started {{ summary.first_date }}{% endif %} + {% if summary.final_date %} · finished {{ summary.final_date }}{% endif %} +
+
+
+
+
+
+ Original gravity
+
+ {% if summary.og_points is not none %}{{ summary.og_points }}{% else %}—{% endif %}
+
+ {% if summary.og_decimal %}
+
+ {% endif %}
+
+
+
+ {% if summary.active %}Current gravity{% else %}Final gravity{% endif %}
+
+
+ {% if summary.fg_points is not none %}{{ summary.fg_points }}{% else %}—{% endif %}
+
+ {% if summary.fg_decimal %}
+
+ {% endif %}
+
+
+ Alcohol
+
+ {% if summary.abv is not none %}
+ {{ '%.2f' % summary.abv }}%
+ {% elif summary.projected_abv is not none %}
+ {{ '%.2f' % summary.projected_abv }}%
+ {% else %}—{% endif %}
+
+
+
+
+Days brewing
+
+ {% if summary.days_in_fermenter is not none %}{{ summary.days_in_fermenter }}{% else %}—{% endif %}
+
+
+
+
+ Readings
+ {{ summary.reading_count }} total +
+
+-
+ {% for reading in summary.readings %}
+
-
+ {{ reading.date or '—' }}
+
+ {% if reading.sg is not none %}{{ reading.sg }}{% else %}—{% endif %}
+
+ + {% if reading.comment %} ++ {% if reading.final_reading %} + Final + + {% else %} + + {% endif %} +{{ reading.comment }}+ {% else %} +No comment+ {% endif %} +
+ {% endfor %}
+
-
-{% endblock %}
diff --git a/src/flask/test.py b/src/flask/test.py
deleted file mode 100644
index 8a4794c..0000000
--- a/src/flask/test.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import table.table_builder as table_builder
-
-test = table_builder.TableBuilder()
-
-print(test.table_build())
diff --git a/src/flask/views/__init__.py b/src/flask/views/__init__.py
new file mode 100644
index 0000000..9609b99
--- /dev/null
+++ b/src/flask/views/__init__.py
@@ -0,0 +1 @@
+"""Blueprints for the beer_data app."""
diff --git a/src/flask/views/auth.py b/src/flask/views/auth.py
new file mode 100644
index 0000000..fcfa5fa
--- /dev/null
+++ b/src/flask/views/auth.py
@@ -0,0 +1,45 @@
+"""Login and logout."""
+
+from __future__ import annotations
+
+from flask import Blueprint, flash, redirect, render_template, request, session, url_for
+from flask_wtf import FlaskForm
+from wtforms import PasswordField, StringField, SubmitField
+from wtforms.validators import DataRequired, Length
+
+bp = Blueprint("auth", __name__)
+
+
+class LoginForm(FlaskForm):
+ username = StringField("Username", validators=[DataRequired(), Length(max=64)])
+ password = PasswordField("Password", validators=[DataRequired(), Length(max=128)])
+ submit = SubmitField("Sign in")
+
+
+def repo():
+ """The request-scoped repository (one Mongo client per request)."""
+ from flask import current_app
+
+ return current_app.extensions["beer_repo"]()
+
+
+@bp.route("/login", methods=["GET", "POST"])
+def login():
+ form = LoginForm()
+ if form.validate_on_submit():
+ ok = repo().user_check(form.username.data.strip(), form.password.data)
+ if ok:
+ session.clear()
+ session["logged_in"] = True
+ session["username"] = form.username.data.strip()
+ return redirect(request.args.get("next") or url_for("brews.index"))
+ flash("Those credentials were not recognised.", "error")
+
+ return render_template("login.html", form=form)
+
+
+@bp.route("/logout", methods=["POST"])
+def logout():
+ session.clear()
+ flash("Signed out.", "info")
+ return redirect(url_for("auth.login"))
diff --git a/src/flask/views/brews.py b/src/flask/views/brews.py
new file mode 100644
index 0000000..3fb0d39
--- /dev/null
+++ b/src/flask/views/brews.py
@@ -0,0 +1,152 @@
+"""The brew-process pages: record readings and review the runs."""
+
+from __future__ import annotations
+
+from flask import (Blueprint, flash, redirect, render_template, request,
+ session, url_for)
+from flask_wtf import FlaskForm
+from wtforms import (BooleanField, DateField, IntegerField, StringField,
+ SubmitField, TextAreaField)
+from wtforms.validators import DataRequired, Length, NumberRange, Optional
+
+from brewing import is_plausible_sg, run_summary
+
+bp = Blueprint("brews", __name__)
+
+
+def repo():
+ """The request-scoped repository (one Mongo client per request)."""
+ from flask import current_app
+
+ return current_app.extensions["beer_repo"]()
+
+
+def login_required(fn):
+ """Redirect to the login page when there is no session."""
+ from functools import wraps
+
+ @wraps(fn)
+ def wrapper(*args, **kwargs):
+ if not session.get("logged_in"):
+ return redirect(url_for("auth.login", next=request.path))
+ return fn(*args, **kwargs)
+
+ return wrapper
+
+
+def _last_reading_date(run) -> str | None:
+ """The ISO date of the most recent reading in a run."""
+ last = run.last_reading()
+ if last is None or last.date is None:
+ return None
+ return last.date.isoformat()
+
+
+class ReadingForm(FlaskForm):
+ """Add or update a gravity reading."""
+
+ beer_run_id = IntegerField("Run number", validators=[DataRequired()])
+ beer_run_type = StringField("Beer / cider name",
+ validators=[Optional(), Length(max=120)])
+ Date = DateField("Reading date", validators=[DataRequired()])
+ sg = IntegerField("Gravity reading (points)",
+ validators=[DataRequired(), NumberRange(min=900, max=1300)])
+ final_reading = BooleanField("This is the final reading")
+ comment = TextAreaField("Comment", validators=[Optional(), Length(max=2000)])
+ submit = SubmitField("Save reading")
+
+
+@bp.route("/brews", methods=["GET", "POST"])
+@login_required
+def index():
+ """The brew-process page: record a reading, then review the runs."""
+ form = ReadingForm()
+
+ if form.validate_on_submit():
+ sg_points = int(form.sg.data)
+ if not is_plausible_sg(sg_points):
+ flash(
+ f"{sg_points} is outside the usual hydrometer range "
+ "(990-1200). It was saved anyway — double-check the reading.",
+ "warning",
+ )
+ repo().upsert_reading(
+ beer_run_id=str(form.beer_run_id.data),
+ beer_type=(form.beer_run_type.data or "").strip(),
+ sg=sg_points,
+ reading_date=form.Date.data.isoformat(),
+ final_reading=bool(form.final_reading.data),
+ comment=(form.comment.data or "").strip(),
+ )
+ flash("Reading saved.", "success")
+ return redirect(url_for("brews.index"))
+
+ runs = repo().runs()
+
+ summaries = []
+ for run in runs:
+ summary = run_summary(run)
+ summary["canonical_name"] = run.display_name()
+ summary["last_date"] = _last_reading_date(run)
+ summaries.append(summary)
+
+ # Active runs: most recent activity first — that is what is fermenting now.
+ active = sorted([s for s in summaries if s["active"]],
+ key=lambda s: s["last_date"] or "", reverse=True)
+ # Finished runs: most recently finished first.
+ completed = sorted([s for s in summaries if not s["active"]],
+ key=lambda s: s["final_date"] or "", reverse=True)
+
+ return render_template(
+ "brews.html",
+ form=form,
+ summaries=summaries,
+ active_runs=active,
+ completed_runs=completed,
+ )
+
+
+@bp.route("/runs/
-
-
-
- Thank you {{ updater_name | safe }}, Data Updated Successfully
- {% endif %}
-
-
- Input Data you want to store
- {% if success %} -Thank you {{ updater_name | safe }}, Data Updated Successfully
- {% endif %}
-
-
-
-
-
-
- {{ render_form(form) }}
-
-
-
-
-
-
-
-
- Current Runs
- {{ current_data | safe }}
-
- Previous Runs
- {{ beer_data | safe }}
-
-
-
-
-
-
-
- | - {{ render_form(form) }} - | - - -
-
-
-