The homepage was a bare tool: a find-bar and an empty panel reading "Find a location to begin." A visitor arriving from a search result or a shared link learned nothing about what the product does before deciding to leave. Rebuild it around the Weekly view, which is untouched: - Hero with the question as the h1, and a grade card showing a real graded example — the most unusual city we're currently tracking, either tail. The card's frame and text slots are server-rendered with reserved heights, so app.js re-pointing it at the visitor's own place shifts nothing. - "Unusual right now" strip, CSS scroll-snap, no JS carousel. A cold-tail city is force-included whenever one qualifies. - Stance line, how-it-works, explore cards, and 12 city chips linking into the ~1000-page /climate surface. - Monthly digest form, in the footer of every page. Serve / from Jinja instead of a static file with placeholder substitution, so crawlers and no-JS readers get the whole page as real HTML. home.html.j2 extends base.html.j2 and carries app.js's DOM contract over verbatim; the brand degrades to a <p> so the hero owns the sole h1. frontend/index.html is deleted rather than left behind the static mount, where it would keep serving indexable duplicate content. "Where is it most unusual right now" has no cheap answer at request time — percentiles live inside zlib-compressed payload blobs with no column to sort on. So homepage.py sweeps the warm cache and writes data/homepage.json, read by the template. The sweep is strictly cache-only (climate.load_cached_recent_forecast is new, the sibling of load_cached_history), so grading ~1000 cities costs zero upstream requests. It rides the notifier's timer behind an hourly guard rather than starting a second daemon, and also runs at the tail of warm_cities so a fresh deploy has a populated feed. Instrumentation: metrics gains a product-event counter keyed by (event, referrer domain, UTC day), behind an allowlist and a per-IP rate limit, fed by POST /api/v2/event. The referrer is taken from the request's own header, never from the client. The beacon gets its own inbound category that record_inbound ignores, so reporting an interaction doesn't also count as traffic. The dashboard grows an events block with per-referrer attribution. Email is scaffolded but sends nothing yet. mailer.py talks stdlib smtplib to a local Postfix null client on 127.0.0.1:25 (deploy/provision-mail.sh), so the choice between direct-to-MX and relaying through a provider stays a Postfix config change with no code change. The backend defaults to "console", which logs and sends nothing, so dev and tests exercise the whole signup path safely. Signups land in pending_digest unconfirmed; collecting the list shouldn't wait on delivery. Also adds /privacy, linked from the footer and kept out of the sitemap. The strip's classes are named unusual-* rather than record-*: .record-card is already the SEO records page's, and reusing it leaked layout rules onto /climate/<slug>/records.
117 lines
4.5 KiB
Python
117 lines
4.5 KiB
Python
"""Monthly-digest signup.
|
|
|
|
The form ships ahead of email delivery on purpose (see models.PendingDigest):
|
|
collecting the list is the slow part, so signups are stored now and confirmed
|
|
once SMTP is live. Nothing is mailed while mailer.enabled() is False.
|
|
|
|
Privacy: the address is used for the digest and nothing else, and the only other
|
|
thing recorded is the bare referrer domain for attribution.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import re
|
|
import time
|
|
|
|
from fastapi import Request, Response
|
|
from fastapi.responses import JSONResponse
|
|
from sqlalchemy import select
|
|
|
|
import mailer
|
|
import metrics
|
|
from db import async_session_maker
|
|
from models import PendingDigest
|
|
|
|
# Deliberately permissive: real-world addresses defeat clever patterns, and the
|
|
# confirmation email is the actual validator. This only rejects obvious junk.
|
|
_EMAIL_RE = re.compile(r"^[^@\s]+@[^@\s.]+(\.[^@\s.]+)+$")
|
|
|
|
# The same answer for every outcome — new row, duplicate, or throttled. Anything
|
|
# else would turn the endpoint into an oracle for "is this address subscribed?".
|
|
GENERIC_OK = "Check your inbox to confirm your address."
|
|
|
|
# Don't re-send a confirmation to an unconfirmed address more than this often.
|
|
RESEND_INTERVAL_S = 600
|
|
|
|
|
|
def _valid(email: str) -> bool:
|
|
return bool(email) and len(email) <= 320 and bool(_EMAIL_RE.match(email))
|
|
|
|
|
|
async def _store(email: str, place: str | None, source: str | None) -> None:
|
|
"""Upsert the signup. A repeat submit updates the existing row rather than
|
|
creating a second one — the unique constraint on email is the idempotency."""
|
|
async with async_session_maker() as session:
|
|
existing = (
|
|
await session.execute(
|
|
select(PendingDigest).where(PendingDigest.email == email)
|
|
)
|
|
).scalar_one_or_none()
|
|
|
|
now = time.time()
|
|
if existing is None:
|
|
session.add(PendingDigest(
|
|
email=email, place_label=place, source=source, created_at=now,
|
|
))
|
|
else:
|
|
if place and not existing.place_label:
|
|
existing.place_label = place
|
|
# Re-subscribing after an unsubscribe re-opens the row.
|
|
existing.unsubscribed_at = None
|
|
if existing.confirmed_at is None:
|
|
if existing.last_sent_at and now - existing.last_sent_at < RESEND_INTERVAL_S:
|
|
await session.commit()
|
|
return
|
|
existing.last_sent_at = now
|
|
await session.commit()
|
|
|
|
# Nothing is sent until a real mail backend is configured; the console
|
|
# backend logs it so the flow can be verified end-to-end without a server.
|
|
if mailer.enabled():
|
|
mailer.send(
|
|
email,
|
|
"Confirm your Thermograph digest",
|
|
"Thanks for signing up for the Thermograph monthly digest.\n\n"
|
|
"Confirmation links are not active yet — you're on the list, and "
|
|
"you'll get a confirmation as soon as they are.\n",
|
|
)
|
|
|
|
|
|
async def signup(request: Request) -> Response:
|
|
"""POST {BASE}/digest — accepts a JSON body (the fetch path) or a plain form
|
|
post (the no-JS path). Always answers 200 with the same message."""
|
|
email = ""
|
|
place = None
|
|
try:
|
|
ctype = request.headers.get("content-type", "")
|
|
if ctype.startswith("application/json"):
|
|
body = await request.json()
|
|
if isinstance(body, dict):
|
|
email = str(body.get("email") or "").strip().lower()
|
|
place = (str(body.get("place")).strip() or None) if body.get("place") else None
|
|
else:
|
|
form = await request.form()
|
|
email = str(form.get("email") or "").strip().lower()
|
|
place = (str(form.get("place")).strip() or None) if form.get("place") else None
|
|
except Exception: # noqa: BLE001 - a malformed body is just an invalid signup
|
|
pass
|
|
|
|
if _valid(email):
|
|
source = metrics.normalize_referrer(
|
|
request.headers.get("referer"), request.headers.get("host")
|
|
)
|
|
try:
|
|
await _store(email, place, source)
|
|
except Exception: # noqa: BLE001 - never surface storage detail to the form
|
|
pass
|
|
metrics.record_event(
|
|
"home.digest_signup",
|
|
referer=request.headers.get("referer"),
|
|
host=request.headers.get("host"),
|
|
ip=request.client.host if request.client else None,
|
|
)
|
|
return JSONResponse({"ok": True, "message": GENERIC_OK})
|
|
|
|
return JSONResponse(
|
|
{"ok": False, "message": "That doesn't look like an email address."},
|
|
status_code=400,
|
|
)
|