Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Esa Kataja
|
aa6541addd | ||
|
Esa Kataja
|
3564d74c39 | ||
|
Esa Kataja
|
b67c4edd5a | ||
|
Esa Kataja
|
e64c4aa212 | ||
|
Esa Kataja
|
4ce189d1e4 | ||
|
Esa Kataja
|
705ad5af26 | ||
|
Esa Kataja
|
813e82ef5c |
+7
-14
@@ -1,29 +1,22 @@
|
||||
# Copy to .env and fill in. .env is gitignored — the real registry hostname
|
||||
# must not end up in the repository.
|
||||
|
||||
# Image coordinates. REPO carries no tag.
|
||||
REPO=registry.example.com/you/foodster
|
||||
TAG=latest
|
||||
# Image coordinates. FOODSTER_REPO carries no tag.
|
||||
FOODSTER_REPO=registry.example.com/you/foodster
|
||||
FOODSTER_TAG=latest
|
||||
|
||||
# Shared household password. The app will not start without it.
|
||||
PASSWORD=changeme
|
||||
FOODSTER_PASSWORD=changeme
|
||||
|
||||
# Hostname Traefik routes to. Kept here rather than in compose.yaml so no
|
||||
# infrastructure detail is committed.
|
||||
HOST=foodster.example.com
|
||||
|
||||
# Anything other than prod is written into the browser tab title, so a dev
|
||||
# instance open beside the real one can be told apart.
|
||||
ENV=prod
|
||||
FOODSTER_HOST=foodster.example.com
|
||||
|
||||
# The database lives in ./data, bind-mounted into the container. These must
|
||||
# match whoever owns that directory on the host, or the container cannot
|
||||
# write to it. `id -u` and `id -g` will tell you.
|
||||
#
|
||||
# Named PUID/PGID because UID is read-only in bash and a plain UID here would
|
||||
# be quietly replaced by the invoking shell's own.
|
||||
PUID=1000
|
||||
PGID=1000
|
||||
FOODSTER_UID=1000
|
||||
FOODSTER_GID=1000
|
||||
|
||||
# Used for every calendar-day calculation. Set it in development too: under
|
||||
# UTC the date rolls over three hours late, which is exactly when dinner
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
name: check
|
||||
on:
|
||||
push:
|
||||
branches: [dev]
|
||||
|
||||
# ponytail: only because Traefik still serves its default self-signed cert for
|
||||
# git.kessinen.com. Remove once the LE-DNS01-cloudflare runbook has been run.
|
||||
env:
|
||||
GIT_SSL_NO_VERIFY: "true"
|
||||
|
||||
jobs:
|
||||
check:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- uses: actions/setup-go@v5
|
||||
with:
|
||||
go-version-file: go.mod
|
||||
cache: true
|
||||
|
||||
- run: make check
|
||||
@@ -1,58 +0,0 @@
|
||||
name: release
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
|
||||
# ponytail: only because Traefik still serves its default self-signed cert for
|
||||
# git.kessinen.com. Remove once the LE-DNS01-cloudflare runbook has been run.
|
||||
env:
|
||||
GIT_SSL_NO_VERIFY: "true"
|
||||
REGISTRY: git.kessinen.com
|
||||
IMAGE: git.kessinen.com/kessinen/foodster
|
||||
|
||||
jobs:
|
||||
image:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
# Full history and tags: the release number is derived by counting the
|
||||
# tags already cut today.
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
# The job container is node:22-bookworm and has no docker client. The
|
||||
# static binary is one file; installing docker.io would pull a daemon
|
||||
# that is never used, since the build runs against the host's.
|
||||
- name: Install the docker client
|
||||
run: |
|
||||
curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-27.3.1.tgz \
|
||||
| tar xz --strip-components=1 -C /usr/local/bin docker/docker
|
||||
docker version --format '{{.Client.Version}}'
|
||||
|
||||
- name: Work out the release tag
|
||||
id: rel
|
||||
run: |
|
||||
day=$(date +%Y%m%d)
|
||||
tag="v$day-$(( $(git tag -l "v$day-*" | wc -l) + 1 ))"
|
||||
echo "tag=$tag" >> "$GITHUB_OUTPUT"
|
||||
echo "==> $tag"
|
||||
|
||||
- name: Tag the commit
|
||||
run: |
|
||||
git tag "${{ steps.rel.outputs.tag }}"
|
||||
git push origin "${{ steps.rel.outputs.tag }}"
|
||||
|
||||
- name: Log in to the registry
|
||||
run: |
|
||||
echo "${{ secrets.GITEA_TOKEN }}" \
|
||||
| docker login "$REGISTRY" -u "${{ gitea.actor }}" --password-stdin
|
||||
|
||||
- name: Build and push
|
||||
run: |
|
||||
tag="${{ steps.rel.outputs.tag }}"
|
||||
docker build --platform linux/amd64 --build-arg VERSION="$tag" \
|
||||
-f Containerfile \
|
||||
-t "$IMAGE:$tag" -t "$IMAGE:latest" .
|
||||
docker push "$IMAGE:$tag"
|
||||
docker push "$IMAGE:latest"
|
||||
echo "pushed $IMAGE:$tag and :latest - pull it in dockge when ready"
|
||||
-104
@@ -1,104 +0,0 @@
|
||||
# Contributing
|
||||
|
||||
A household project, so this is less a set of rules than a note to whoever
|
||||
picks it up next — including me in six months.
|
||||
|
||||
## Getting set up
|
||||
|
||||
```sh
|
||||
cp .env.example .env # then edit it
|
||||
make run # http://localhost:8080, tab titled "dev · Foodster"
|
||||
make # every target, with a one-line description
|
||||
```
|
||||
|
||||
`make check` is the gate: `go vet`, gofmt, unit tests, and `scripts/smoke.sh`,
|
||||
which drives a real server over HTTP. Run it before every commit.
|
||||
|
||||
## Branches
|
||||
|
||||
`dev` is where work happens. `main` holds released versions only — it is
|
||||
protected on the remote and takes no direct pushes, so a release arrives as a
|
||||
pull request from `dev`, squash-merged.
|
||||
|
||||
After a squash merge, reset `dev` onto it or the next pull request will offer
|
||||
the same commits again:
|
||||
|
||||
```sh
|
||||
git switch main && git pull --ff-only
|
||||
git switch dev && git reset --hard main
|
||||
git push --force-with-lease origin dev
|
||||
```
|
||||
|
||||
The release workflow only triggers on `main`, and `main` only moves through a
|
||||
pull request, so a release can never be built from the wrong branch. Nothing
|
||||
needs to check for it.
|
||||
|
||||
## Commit messages
|
||||
|
||||
Conventional Commits — a type, an optional scope, then a short subject in the
|
||||
imperative.
|
||||
|
||||
```
|
||||
feat(kirjaa): expand the selected day in place
|
||||
fix: redirect the catalog to /ruuat, not /ruoat
|
||||
chore(deps): bump the vendored Datastar client
|
||||
```
|
||||
|
||||
| Type | For |
|
||||
|---|---|
|
||||
| `feat` | new behaviour someone will notice |
|
||||
| `fix` | a bug, ideally naming what broke |
|
||||
| `refactor` | same behaviour, different shape |
|
||||
| `test` | tests only |
|
||||
| `docs` | documentation only |
|
||||
| `build` | Makefile, Containerfile, compose, CI |
|
||||
| `chore` | anything else: dependencies, seeds, tidying |
|
||||
|
||||
**The body matters more than the type.** Explain *why*, and what the
|
||||
alternative was — the diff already says what changed. If a fix was subtle,
|
||||
say what made it subtle; if a test caught something, say what. Commits here
|
||||
are the only design record this project has.
|
||||
|
||||
### Release pull requests
|
||||
|
||||
Because `main` is squash-merged, a pull request title becomes a commit message
|
||||
on `main`. A release spans a fix, a feature and some chores at once, so none
|
||||
of the types above fits it honestly. Use `release:` instead:
|
||||
|
||||
```
|
||||
release: repair the catalog 404 and stop the page jumping
|
||||
```
|
||||
|
||||
`main`'s log is then one line per deployment, which is what that branch is
|
||||
for, and the pull request body serves as the release notes. No version in the
|
||||
title — CI creates the CalVer tag after the merge, so it is not known yet.
|
||||
|
||||
The types above are for `dev`, where a commit really does do one thing.
|
||||
|
||||
## Deploying
|
||||
|
||||
The server keeps its own `compose.yaml` and `.env`. Neither is pulled from
|
||||
here, so a release that renames a variable, adds one, or changes a mount
|
||||
needs both copied across **in the same deploy** — otherwise the container
|
||||
comes up against the old names and the app refuses to start.
|
||||
|
||||
Anything in this repository that reaches the server by hand belongs in the
|
||||
release notes, flagged as breaking.
|
||||
|
||||
## Things that are easy to get wrong
|
||||
|
||||
- **The interface is Finnish.** Code, comments, this file and the PRD are
|
||||
English. There is no i18n layer and no language switcher.
|
||||
- **No infrastructure detail is committed** — no hostnames, registry paths or
|
||||
ports. They live in `.env`, which is gitignored, because the PRD leaves the
|
||||
door open to publishing this repository.
|
||||
- **Migrations are immutable once shipped.** A released migration has run on a
|
||||
live database and will not run again. Add a new numbered file instead.
|
||||
- **Interactions patch, they do not navigate.** Anything that reloads the page
|
||||
loses the scroll position, which on a long list is maddening. Links stay
|
||||
links and forms stay forms so it works without JavaScript; Datastar layers
|
||||
over them with `data-on:click__prevent` and `data-on:submit__prevent`.
|
||||
- **A `ponytail:` comment marks a deliberate shortcut** and names its ceiling,
|
||||
so the next reader can tell a decision from an oversight.
|
||||
- **Assert what a response does, not just that it responded.** A redirect to a
|
||||
dead URL is still a 303; that one shipped.
|
||||
@@ -3,8 +3,13 @@
|
||||
COMPOSE ?= podman compose
|
||||
BIN := foodster
|
||||
PKG := ./cmd/foodster
|
||||
STATIC := cmd/foodster/static
|
||||
|
||||
# Shared password and TZ live here. Gitignored.
|
||||
# Vendored Datastar client. Bump, run `make vendor`, commit the result.
|
||||
DATASTAR_VERSION ?= v1.0.3
|
||||
SEED ?= seeds/testi.json
|
||||
|
||||
# Registry coordinates, shared password and TZ live here. Gitignored.
|
||||
ifneq (,$(wildcard .env))
|
||||
include .env
|
||||
export
|
||||
@@ -14,7 +19,7 @@ endif
|
||||
GOFILES = $(shell find . -name '*.go' -not -name '*_templ.go' 2>/dev/null)
|
||||
|
||||
.DEFAULT_GOAL := help
|
||||
.PHONY: help generate build run test smoke check lint fix up down logs clean
|
||||
.PHONY: help generate build run seed test smoke check lint fix icons vendor image push release up down logs clean
|
||||
|
||||
help: ## Show this help
|
||||
@grep -hE '^[a-zA-Z_-]+:.*## ' $(MAKEFILE_LIST) \
|
||||
@@ -28,7 +33,10 @@ build: generate ## Build ./foodster
|
||||
-ldflags="-s -w -X main.version=dev" -o $(BIN) $(PKG)
|
||||
|
||||
run: generate ## Run locally on :8080 (database in ./data)
|
||||
PASSWORD=$${PASSWORD:-dev} ENV=dev go run $(PKG)
|
||||
FOODSTER_PASSWORD=$${FOODSTER_PASSWORD:-dev} go run $(PKG)
|
||||
|
||||
seed: ## Import a dish bundle (SEED=seeds/testi.json)
|
||||
go run $(PKG) -import $(SEED)
|
||||
|
||||
test: generate ## Run unit tests
|
||||
go test ./...
|
||||
@@ -44,6 +52,21 @@ check: ## Everything that must pass before a commit
|
||||
@$(MAKE) --no-print-directory smoke
|
||||
@echo "check: all passed"
|
||||
|
||||
icons: ## Rasterise home-screen PNGs from assets/icon.svg and optimise them
|
||||
rsvg-convert -w 180 -h 180 assets/icon.svg -o $(STATIC)/apple-touch-icon.png
|
||||
rsvg-convert -w 192 -h 192 assets/icon.svg -o $(STATIC)/icon-192.png
|
||||
rsvg-convert -w 512 -h 512 assets/icon.svg -o $(STATIC)/icon-512.png
|
||||
# oxipng -o max alone loses to optipng on the 512; --zopfli wins at every
|
||||
# size. Slow, but these are three tiny files built by hand.
|
||||
oxipng -o max --zopfli --quiet \
|
||||
$(STATIC)/apple-touch-icon.png $(STATIC)/icon-192.png $(STATIC)/icon-512.png
|
||||
@ls -l $(STATIC)/*.png
|
||||
|
||||
vendor: ## Re-download the Datastar client (DATASTAR_VERSION=v1.0.3)
|
||||
curl -sSfL -o $(STATIC)/datastar.js \
|
||||
"https://cdn.jsdelivr.net/gh/starfederation/datastar@$(DATASTAR_VERSION)/bundles/datastar.js"
|
||||
@head -1 $(STATIC)/datastar.js
|
||||
|
||||
lint: generate ## go vet, gofmt check, golangci-lint when installed
|
||||
go vet ./...
|
||||
@bad=$$(gofmt -l $(GOFILES) 2>/dev/null); \
|
||||
@@ -56,6 +79,32 @@ fix: ## Format Go and templ sources, tidy go.mod
|
||||
go tool templ fmt .
|
||||
go mod tidy
|
||||
|
||||
image: ## Build and tag an image as vYYYYMMDD-N. Creates a git tag.
|
||||
@test -n "$(FOODSTER_REPO)" || { echo "set FOODSTER_REPO in .env"; exit 1; }
|
||||
@# A release tag must point into main, or the tag records a commit that
|
||||
@# was never released.
|
||||
@branch=$$(git symbolic-ref --short HEAD); \
|
||||
if [ "$$branch" != "main" ]; then \
|
||||
echo "releases are cut from main, not $$branch:"; \
|
||||
echo " git switch main && git merge --ff-only dev"; \
|
||||
exit 1; \
|
||||
fi
|
||||
@day=$$(date +%Y%m%d); \
|
||||
tag="v$$day-$$(( $$(git tag -l "v$$day-*" | wc -l) + 1 ))"; \
|
||||
echo "==> $$tag"; \
|
||||
git tag "$$tag"; \
|
||||
podman build --platform linux/amd64 --build-arg VERSION="$$tag" \
|
||||
-t "$(FOODSTER_REPO):$$tag" -t "$(FOODSTER_REPO):latest" .
|
||||
|
||||
push: ## Push the newest tag and :latest
|
||||
@test -n "$(FOODSTER_REPO)" || { echo "set FOODSTER_REPO in .env"; exit 1; }
|
||||
@tag=$$(git tag -l 'v*' --sort=-creatordate | head -n1); \
|
||||
test -n "$$tag" || { echo "no tags yet - run make image"; exit 1; }; \
|
||||
podman push "$(FOODSTER_REPO):$$tag"; \
|
||||
podman push "$(FOODSTER_REPO):latest"
|
||||
|
||||
release: image push ## Build, tag and push in one go
|
||||
|
||||
up: ## Start the stack
|
||||
@mkdir -p data # or the engine creates it root-owned and the app cannot write
|
||||
$(COMPOSE) up -d
|
||||
|
||||
@@ -113,23 +113,6 @@ in English.
|
||||
Side dishes live in their own table and have no category. The pool is
|
||||
expected to stay small.
|
||||
|
||||
### Tähteet — leftovers (stage 1)
|
||||
|
||||
A single built-in entry, flagged `special` on the main dish table. It is
|
||||
**not food**: it exists so a day can be recorded as "we ate what was already
|
||||
there" without inventing a meal that was never cooked.
|
||||
|
||||
- No category, which is why it cannot be an ordinary main: those must have
|
||||
at least one.
|
||||
- Created by a migration. The household does not add, edit or delete it, and
|
||||
it never appears in the Ruuat catalog.
|
||||
- Loggable exactly like any other entry, and shown on the log board apart
|
||||
from the categories.
|
||||
- **The stage 2 suggester must never propose it.** It is excluded from the
|
||||
eligible pool outright, so cooldown, category coverage (§8.1) and
|
||||
frequency weighting (§8.2) all skip it — despite it being among the
|
||||
most-logged entries.
|
||||
|
||||
### Meal log entry ("what was actually eaten") (stage 1)
|
||||
- `id`
|
||||
- `date` — SQL `DATE`, day granularity only. There is no time-of-day field
|
||||
@@ -351,7 +334,7 @@ build and no asset bundler.
|
||||
is imported because the runtime image carries no zoneinfo. All date logic
|
||||
uses that location explicitly and never `time.Local`.
|
||||
- **Auth**: HTTP Basic with one shared household password read from
|
||||
`PASSWORD`; the username is ignored. Compared using
|
||||
`FOODSTER_PASSWORD`; the username is ignored. Compared using
|
||||
`subtle.ConstantTimeCompare` over SHA-256 digests so neither the value nor
|
||||
its length leaks through timing. `/healthz` is the only route outside auth.
|
||||
- **Exposure**: the app is served on a public hostname behind Traefik, which
|
||||
@@ -372,27 +355,22 @@ Explicitly *not* React.
|
||||
|
||||
## 10. Deployment
|
||||
|
||||
Images are built by CI, pushed to a private container registry, then pulled on
|
||||
the server and run with Docker Compose.
|
||||
Images are built locally, pushed to a private container registry, then pulled
|
||||
on the server and run with Docker Compose.
|
||||
|
||||
- **Branches**: `main` carries released versions only, so its history is the
|
||||
deployment history and every release tag points into it. Development happens
|
||||
on `dev`, and `main` is protected on the remote: it accepts no direct
|
||||
pushes, so a release arrives as a pull request from `dev`. The release
|
||||
workflow runs only on `main`, so a release cannot be built from anywhere
|
||||
else and nothing needs to check for it.
|
||||
pushes, so a release arrives as a pull request from `dev`. `make image`
|
||||
additionally refuses to run outside `main` — that one has to be local,
|
||||
because the tag and the image are made before anything reaches the remote.
|
||||
- **Versioning**: CalVer `vYYYYMMDD-N`, where `N` is the Nth build of that
|
||||
day. The release workflow derives `N` by counting the day's existing git
|
||||
tags, creates the new tag, and bakes the version into the binary through
|
||||
`-ldflags -X main.version`.
|
||||
- **CI**: Gitea Actions, workflows in `.gitea/workflows/`. `check.yaml` runs
|
||||
`make check` on every push to `dev`; `release.yaml` builds and pushes the
|
||||
image when a pull request merges into `main`. Merging is the release —
|
||||
there is no local build step.
|
||||
- **Tooling**: a `Makefile` covers development — `make` on its own lists every
|
||||
target. Build, test, lint, format and compose commands live there rather
|
||||
than in loose scripts. Commands run a handful of times a year are written
|
||||
out in the README instead of earning a target.
|
||||
day. `make image` derives `N` by counting the day's existing git tags,
|
||||
creates the new tag, and bakes the version into the binary through
|
||||
`-ldflags -X main.version`. `make release` builds, tags and pushes.
|
||||
- **Tooling**: a `Makefile` is the single entry point — `make` on its own
|
||||
lists every target. Build, test, lint, format, image and compose commands
|
||||
all live there rather than in loose scripts.
|
||||
- **Image**: a two-stage `Containerfile`. `golang:1.27-alpine` compiles a
|
||||
static binary; the runtime stage is `FROM scratch` holding only that
|
||||
binary, running as UID 65534.
|
||||
@@ -400,25 +378,21 @@ the server and run with Docker Compose.
|
||||
`/data/foodster.db`, bind-mounted from `./data` on the host rather than
|
||||
kept in a named volume, so the file can be listed and copied without going
|
||||
through the container engine. Backup is `cp -r data`. Because the image
|
||||
runs as UID 65534, compose sets `user:` from `PUID`/`PGID`
|
||||
runs as UID 65534, compose sets `user:` from `FOODSTER_UID`/`FOODSTER_GID`
|
||||
to match whoever owns that directory. `restart: unless-stopped`.
|
||||
- **Configuration**, entirely through environment variables (see
|
||||
`.env.example`):
|
||||
Names carry no application prefix: the container namespaces them already.
|
||||
- `REPO` and `TAG` — image coordinates.
|
||||
- `PASSWORD` — the shared password. Required; the app refuses to start
|
||||
without it.
|
||||
- `DB` — database file path, default `./data/foodster.db`. The directory is
|
||||
created on startup if missing.
|
||||
- `ENV` — anything but `prod` is prefixed to the browser tab title, so a
|
||||
dev instance open beside the real one can be told apart.
|
||||
- `PUID` / `PGID` — host owner of `./data`. Not `UID`, which is read-only
|
||||
in bash and would be replaced by the invoking shell's own value.
|
||||
- `FOODSTER_REPO` and `FOODSTER_TAG` — image coordinates.
|
||||
- `FOODSTER_PASSWORD` — the shared password. Required; the app refuses to
|
||||
start without it.
|
||||
- `FOODSTER_DB` — database file path, default `./data/foodster.db`. The
|
||||
directory is created on startup if missing.
|
||||
- `FOODSTER_UID` / `FOODSTER_GID` — host owner of `./data`.
|
||||
- `TZ` — default `Europe/Helsinki`.
|
||||
- The registry hostname exists only in `.env`, which is gitignored, because
|
||||
§11 leaves open the possibility of publishing this repository.
|
||||
- **Routing**: Traefik on an external `traefik` network, matching on
|
||||
`HOST` and terminating TLS. The container publishes no ports —
|
||||
`FOODSTER_HOST` and terminating TLS. The container publishes no ports —
|
||||
doing so would put an unencrypted copy of the app on the host, bypassing
|
||||
the proxy. The hostname lives in `.env` rather than `compose.yaml`, so no
|
||||
infrastructure detail is committed.
|
||||
@@ -430,7 +404,7 @@ the server and run with Docker Compose.
|
||||
- Pending migrations are applied on app start.
|
||||
- The Datastar client is vendored at `cmd/foodster/static/datastar.js` and
|
||||
served from the app's own origin — the SDK ships no browser asset, and a
|
||||
CDN link would break an offline LAN. The README says how to refresh it; the pinned
|
||||
CDN link would break an offline LAN. `make vendor` refreshes it; the pinned
|
||||
version lives in the `Makefile` and in the file's first line.
|
||||
- No internet exposure; the server binds to the LAN.
|
||||
|
||||
|
||||
@@ -11,35 +11,35 @@ See [PRD.md](PRD.md) for the full specification.
|
||||
|
||||
## Status
|
||||
|
||||
**Stage 1 — eating history: in use.** The meal catalog and the daily log came
|
||||
first, because the suggester is worthless until there are a few weeks of real
|
||||
history to weight against.
|
||||
**Stage 1 — eating history: in development.** The meal catalog and the daily
|
||||
log come first, because the suggester is worthless until there are a few
|
||||
weeks of real history to weight against.
|
||||
|
||||
Working:
|
||||
|
||||
- **Kirjaa** — log a dinner: pick a dish, tick sides, save. Dishes are grouped
|
||||
by category, then ordered and sized by how often they are eaten, so the
|
||||
likely answer is the biggest target. The history sits on the same page
|
||||
underneath: every day back to the first entry, unlogged days shown as
|
||||
explicit gaps, and every row opening that day's logger in place. Older days
|
||||
arrive a window at a time.
|
||||
- **Kirjaa** — log a dinner: pick a dish, tick sides, save. Dishes are ordered
|
||||
and sized by how often they are eaten, so the likely answer is the biggest
|
||||
target. The history sits on the same page underneath: every day back to the
|
||||
first entry, unlogged days shown as explicit gaps, and every row a link that
|
||||
loads that day into the logger above it.
|
||||
- **Ruuat** — add, edit and delete mains and sides, or import a whole bundle
|
||||
by paste or file upload. Grouped by category and alphabetical inside, since
|
||||
this is a list you manage rather than one you pick from. Edit and delete are
|
||||
row icons, and a delete asks first. Deletes are soft, so old log entries
|
||||
keep showing the dish they used.
|
||||
- **Search as you type** on both tabs, debounced, patching just the list.
|
||||
- **Category icons**, not colour dots: shape and colour together, so two marks
|
||||
are told apart by more than hue.
|
||||
this is a list you manage rather than one you pick from. Deletes are soft,
|
||||
so old log entries keep showing the dish they used.
|
||||
- **Light / dark**, remembered per device, dark by default. The button shows
|
||||
the theme that is on — moon while dark, sun while light — not the one a
|
||||
click would bring.
|
||||
|
||||
Nothing navigates. Every interaction patches the page through Datastar, so
|
||||
the scroll position survives; links and forms still work with JavaScript off.
|
||||
|
||||
Still to build:
|
||||
|
||||
- Live search as you type, and paging for the history and catalog lists once
|
||||
years of entries make them long. Both via Datastar.
|
||||
- Category icons instead of plain colour dots — colour and shape together, so
|
||||
a red blob and a yellow blob are told apart by more than hue.
|
||||
- Edit and delete as icons in the catalog rows, and a confirmation step before
|
||||
a delete actually happens.
|
||||
- A background for the header. Something subtle; the palette gets overhauled
|
||||
later.
|
||||
- Stage 2: the seven-meal suggester, which starts once there is history to
|
||||
weight against.
|
||||
|
||||
@@ -58,9 +58,6 @@ One static Go binary. No Node.js, no bundler, no separate database server.
|
||||
| Auth | HTTP Basic, one shared household password |
|
||||
| Runtime image | `FROM scratch` |
|
||||
|
||||
Working on it: [CONTRIBUTING.md](CONTRIBUTING.md) — branches, commit messages,
|
||||
and the conventions that are easy to miss.
|
||||
|
||||
## Branches
|
||||
|
||||
`main` holds released versions only. Every release tag points at a commit on
|
||||
@@ -74,20 +71,20 @@ no direct pushes, so a release arrives through a pull request.
|
||||
git switch dev # where the work happens
|
||||
# ... commits ...
|
||||
make check # lint, unit tests, smoke
|
||||
git push origin dev # CI runs make check too
|
||||
git push origin dev
|
||||
|
||||
tea pr create --base main --head dev # or open it in the forge
|
||||
# squash-merge the pull request — that is the whole release
|
||||
# merge the pull request, then:
|
||||
|
||||
git switch main && git pull --ff-only
|
||||
make release # builds, tags vYYYYMMDD-N, pushes the image
|
||||
git push origin --tags
|
||||
```
|
||||
|
||||
Merging is the release. CI builds the image, tags it `vYYYYMMDD-N` and
|
||||
`latest`, pushes both to the registry, and creates the matching git tag. There
|
||||
is nothing to run locally afterwards; pull the new image on the server when
|
||||
you are ready.
|
||||
|
||||
A release tag can therefore never point at a commit that was not released:
|
||||
the workflow only runs on `main`, and `main` only moves through a pull
|
||||
request.
|
||||
`make image` additionally refuses to run from any branch but `main`, so a
|
||||
release tag can never point at a commit that was not released. That check
|
||||
lives locally because it has to: tags and images are built before anything
|
||||
reaches the remote, so protection there cannot catch it.
|
||||
|
||||
## Quick start
|
||||
|
||||
@@ -102,39 +99,15 @@ make run # http://localhost:8080
|
||||
make fix gofmt, templ fmt, go mod tidy
|
||||
make lint go vet, gofmt check, golangci-lint when installed
|
||||
make test go test ./...
|
||||
make smoke end-to-end check against a scratch server
|
||||
make check lint + test + smoke — run before every commit
|
||||
make build ./foodster
|
||||
make seed import a dish bundle (SEED=seeds/testi.json)
|
||||
make vendor re-download the Datastar client
|
||||
make image build and tag vYYYYMMDD-N (creates a git tag)
|
||||
make push push the newest tag and :latest
|
||||
make release image + push
|
||||
make up/down/logs compose
|
||||
```
|
||||
|
||||
Images are built by CI, not here — see [Deployment](#deployment).
|
||||
|
||||
### Occasional commands
|
||||
|
||||
Rare enough not to earn a `make` target. Both write into
|
||||
`cmd/foodster/static/`, and the results are committed.
|
||||
|
||||
Re-download the vendored Datastar client after bumping the version:
|
||||
|
||||
```sh
|
||||
curl -sSfL -o cmd/foodster/static/datastar.js \
|
||||
"https://cdn.jsdelivr.net/gh/starfederation/[email protected]/bundles/datastar.js"
|
||||
```
|
||||
|
||||
Re-rasterise the home-screen icons after editing `assets/icon.svg`:
|
||||
|
||||
```sh
|
||||
cd cmd/foodster/static
|
||||
rsvg-convert -w 180 -h 180 ../../../assets/icon.svg -o apple-touch-icon.png
|
||||
rsvg-convert -w 192 -h 192 ../../../assets/icon.svg -o icon-192.png
|
||||
rsvg-convert -w 512 -h 512 ../../../assets/icon.svg -o icon-512.png
|
||||
oxipng -o max --zopfli --quiet apple-touch-icon.png icon-192.png icon-512.png
|
||||
```
|
||||
|
||||
`oxipng -o max` on its own loses to optipng on the 512; `--zopfli` wins at
|
||||
every size. Slow, but these are three tiny files built by hand.
|
||||
|
||||
## Importing dishes
|
||||
|
||||
The **Ruuat** tab takes a bundle of mains and sides: paste the JSON or upload
|
||||
@@ -165,7 +138,7 @@ The same importer runs from the command line when you just want to repopulate
|
||||
a scratch database:
|
||||
|
||||
```sh
|
||||
go run ./cmd/foodster -import seeds/testi.json
|
||||
make seed # or: SEED=seeds/other.json make seed
|
||||
```
|
||||
|
||||
## Icons
|
||||
@@ -176,8 +149,12 @@ cannot be transparent and must not change with the theme; they are rasterised
|
||||
from `assets/icon.svg`, which is opaque and keeps the artwork inside the
|
||||
central 80% so Android can mask it to any shape.
|
||||
|
||||
The PNGs are committed so the build needs no rasterizer. The commands to
|
||||
regenerate them are under [Occasional commands](#occasional-commands).
|
||||
```sh
|
||||
make icons # rsvg-convert, then optipng -o7
|
||||
```
|
||||
|
||||
The PNGs are committed so the build needs no rasterizer. Re-run `make icons`
|
||||
after editing `assets/icon.svg`.
|
||||
|
||||
## Migrations
|
||||
|
||||
@@ -196,30 +173,25 @@ Everything is environment variables. `.env` is gitignored; start from
|
||||
|
||||
| Variable | Default | Purpose |
|
||||
|---|---|---|
|
||||
| `PASSWORD` | *required* | Shared password. The app will not start without it. |
|
||||
| `DB` | `./data/foodster.db` | SQLite file path; the directory is created if missing. |
|
||||
| `ENV` | `prod` | Anything else is prefixed to the tab title (`dev · Foodster`). |
|
||||
| `ADDR` | `:8080` | Listen address. Only useful for a second local instance. |
|
||||
| `PUID` / `PGID` | `1000` | Host owner of `./data`, for the bind mount. |
|
||||
| `FOODSTER_PASSWORD` | *required* | Shared password. The app will not start without it. |
|
||||
| `FOODSTER_DB` | `./data/foodster.db` | SQLite file path; the directory is created if missing. |
|
||||
| `FOODSTER_UID` / `FOODSTER_GID` | `1000` | Host owner of `./data`, for the bind mount. |
|
||||
| `TZ` | `Europe/Helsinki` | Used for every calendar-day calculation. |
|
||||
| `REPO` | *required to run* | Image repository, no tag. Used by `compose.yaml`. |
|
||||
| `TAG` | `latest` | Tag to run under compose. |
|
||||
| `HOST` | *required to run* | Hostname Traefik routes to. |
|
||||
|
||||
Names carry no prefix: the container gives them their own namespace already.
|
||||
`PUID`/`PGID` are the exception — `UID` is read-only in bash, so a value set
|
||||
in `.env` would be silently replaced by the invoking shell's own.
|
||||
| `FOODSTER_REPO` | *required to build* | Image repository, no tag. |
|
||||
| `FOODSTER_TAG` | `latest` | Tag to run under compose. |
|
||||
| `FOODSTER_PORT` | `8080` | Host port to publish. |
|
||||
|
||||
Set `TZ` in development too. Under UTC the date rolls over three hours late,
|
||||
which is exactly when dinner gets logged.
|
||||
|
||||
## Deployment
|
||||
|
||||
Images are built by CI when a pull request merges into `main`, and run under
|
||||
Docker Compose on a LAN server. They are OCI images, so either engine works.
|
||||
Images are built with Podman and run under Docker Compose on a LAN server.
|
||||
They are OCI images, so either engine works.
|
||||
|
||||
```sh
|
||||
# on the server, once CI reports the build finished:
|
||||
make release # build, tag, push
|
||||
# on the server:
|
||||
docker compose pull && docker compose up -d
|
||||
```
|
||||
|
||||
@@ -228,18 +200,11 @@ running version is served at `GET /healthz`, which is the one route outside
|
||||
authentication.
|
||||
|
||||
There is no database container. SQLite lives in `./data`, bind-mounted into
|
||||
the container, so you can inspect the file with any sqlite client without
|
||||
going through the engine. Back it up with
|
||||
|
||||
```sh
|
||||
sqlite3 data/foodster.db ".backup data/foodster-$(date +%F).db"
|
||||
```
|
||||
|
||||
rather than copying the directory: the database runs in WAL mode, and a plain
|
||||
copy of a live database can catch the `.db` and its `-wal` mid-write.
|
||||
the container, so a backup is `cp -r data` and you can inspect the file with
|
||||
any sqlite client without going through the engine.
|
||||
|
||||
That directory must exist and be owned by the user compose runs as — `make up`
|
||||
creates it, and `PUID`/`PGID` in `.env` tell the container who
|
||||
creates it, and `FOODSTER_UID`/`FOODSTER_GID` in `.env` tell the container who
|
||||
that is. Get them from `id -u` and `id -g`.
|
||||
|
||||
If the app exits with `cannot open /data/foodster.db ... unable to open
|
||||
@@ -248,7 +213,7 @@ bind-mount directory as root, and the container is not root:
|
||||
|
||||
```sh
|
||||
ls -ldn data # whose is it?
|
||||
sudo chown -R 1000:1000 data # match PUID / PGID
|
||||
sudo chown -R 1000:1000 data # match FOODSTER_UID / FOODSTER_GID
|
||||
docker compose restart
|
||||
```
|
||||
|
||||
@@ -270,7 +235,7 @@ counting it would lock the household out for simply opening the app.
|
||||
address, meaning it arrived through the proxy. A client connecting directly
|
||||
could otherwise forge a new address per attempt and skip the limiter.
|
||||
|
||||
**None of this replaces a strong `PASSWORD`.** Rate limiting removes
|
||||
**None of this replaces a strong `FOODSTER_PASSWORD`.** Rate limiting removes
|
||||
brute force as a practical route; it does not make a guessable password safe.
|
||||
|
||||
## Mockups
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="512" height="512"
|
||||
role="img" aria-label="Foodster">
|
||||
<!-- Source for the home-screen PNGs; the README says how to rasterise it.
|
||||
<!-- Source for the home-screen PNGs; `make icons` rasterises it.
|
||||
Unlike favicon.svg this one is opaque and fixed-colour: a home screen
|
||||
icon cannot be transparent and must not change with the system theme.
|
||||
The bowl sits inside the central 80% so Android can mask it to any
|
||||
|
||||
|
Before Width: | Height: | Size: 927 B After Width: | Height: | Size: 918 B |
@@ -131,55 +131,6 @@ func TestSoftDeleteHidesDishButKeepsHistory(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestTahteetIsLoggableButNotFood(t *testing.T) {
|
||||
h := seeded(t)
|
||||
|
||||
// The migration creates it; nobody adds it.
|
||||
special, err := listSpecial(h.db, "")
|
||||
if err != nil {
|
||||
t.Fatalf("listSpecial: %v", err)
|
||||
}
|
||||
if len(special) != 1 || special[0].Name != "Tähteet" {
|
||||
t.Fatalf("special = %+v, want exactly Tähteet", special)
|
||||
}
|
||||
|
||||
// It must not turn up among the dishes: not on the board's categories,
|
||||
// not in the catalog, and not in whatever the suggester later draws from.
|
||||
dishes, err := listDishes(h.db, "")
|
||||
if err != nil {
|
||||
t.Fatalf("listDishes: %v", err)
|
||||
}
|
||||
for _, d := range dishes {
|
||||
if d.Name == "Tähteet" {
|
||||
t.Fatal("Tähteet appears among the dishes")
|
||||
}
|
||||
}
|
||||
|
||||
// It carries no category at all, which is why it cannot be an ordinary
|
||||
// dish: those are required to have one.
|
||||
if len(special[0].Categories) != 0 {
|
||||
t.Errorf("categories = %v, want none", special[0].Categories)
|
||||
}
|
||||
// And it gets its own mark: no categories is not the same as several, so
|
||||
// it must not fall through to the mixed Sekalaiset one.
|
||||
if got := special[0].CategoryKey(); got != "tahteet" {
|
||||
t.Errorf("CategoryKey = %q, want tahteet", got)
|
||||
}
|
||||
|
||||
// Logging it has to work exactly like logging a real meal.
|
||||
date := day(t, "2026-09-05")
|
||||
if err := saveEntry(h.db, date, special[0].ID, nil); err != nil {
|
||||
t.Fatalf("saveEntry: %v", err)
|
||||
}
|
||||
entry, err := entryFor(h.db, date)
|
||||
if err != nil || entry == nil {
|
||||
t.Fatalf("entryFor: %v, %v", entry, err)
|
||||
}
|
||||
if entry.Main.Name != "Tähteet" {
|
||||
t.Errorf("logged %q, want Tähteet", entry.Main.Name)
|
||||
}
|
||||
}
|
||||
|
||||
func TestSoftDeleteSideHidesItFromPickers(t *testing.T) {
|
||||
h := seeded(t)
|
||||
id := h.sideNamed(t, "Riisi")
|
||||
@@ -187,7 +138,7 @@ func TestSoftDeleteSideHidesItFromPickers(t *testing.T) {
|
||||
if err := softDeleteSide(h.db, id); err != nil {
|
||||
t.Fatalf("softDeleteSide: %v", err)
|
||||
}
|
||||
sides, err := listSides(h.db, "")
|
||||
sides, err := listSides(h.db)
|
||||
if err != nil {
|
||||
t.Fatalf("listSides: %v", err)
|
||||
}
|
||||
|
||||
+48
-299
@@ -2,7 +2,6 @@ package main
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"io"
|
||||
"log"
|
||||
@@ -18,27 +17,11 @@ import (
|
||||
// kilobytes; a megabyte is already absurd generosity.
|
||||
const maxUpload = 1 << 20
|
||||
|
||||
const (
|
||||
// historyDays is one window of the history under the logger, and the step
|
||||
// that "show more" grows it by. Older days arrive a window at a time
|
||||
// rather than all at once.
|
||||
historyDays = 30
|
||||
|
||||
// maxHistoryDays caps what a hand-edited URL can ask for, so ?paivat=
|
||||
// cannot be turned into a request to render a decade of rows.
|
||||
maxHistoryDays = 366 * 5
|
||||
)
|
||||
|
||||
// historyWindow reads ?paivat=, the number of days of history to show.
|
||||
func historyWindow(r *http.Request) int {
|
||||
days := historyDays
|
||||
if raw := r.URL.Query().Get("paivat"); raw != "" {
|
||||
if n, err := strconv.Atoi(raw); err == nil && n > days {
|
||||
days = min(n, maxHistoryDays)
|
||||
}
|
||||
}
|
||||
return days
|
||||
}
|
||||
// historyDays is how far back the history under the logger walks.
|
||||
//
|
||||
// ponytail: a fixed window. After a year of daily entries this list is the
|
||||
// thing that needs paging; load more on scroll when it actually hurts.
|
||||
const historyDays = 60
|
||||
|
||||
type app struct {
|
||||
db *sql.DB
|
||||
@@ -60,19 +43,12 @@ func render(w http.ResponseWriter, r *http.Request, c templ.Component) {
|
||||
// there is nothing to write down for a dinner that has not happened, and a
|
||||
// stray entry dated next year would sit at the top of the history forever.
|
||||
// Every read and write goes through here, so the clamp covers them all.
|
||||
//
|
||||
// The past is clamped too, at maxHistoryDays. The day list runs unbroken from
|
||||
// today down to the selected day, so a picker set to 1994 would ask for eleven
|
||||
// thousand rows. Same ceiling ?paivat= already has.
|
||||
func (a *app) date(r *http.Request) time.Time {
|
||||
now := today(a.loc)
|
||||
if raw := r.FormValue("pvm"); raw != "" {
|
||||
if d, err := time.ParseInLocation(dateLayout, raw, a.loc); err == nil {
|
||||
switch floor := now.AddDate(0, 0, -maxHistoryDays+1); {
|
||||
case d.After(now):
|
||||
if d.After(now) {
|
||||
return now
|
||||
case d.Before(floor):
|
||||
return floor
|
||||
}
|
||||
return d
|
||||
}
|
||||
@@ -93,69 +69,26 @@ type logView struct {
|
||||
ShowBoard bool
|
||||
Dishes []Dish // flat, only to know whether anything matched
|
||||
Groups []DishGroup // what the board actually renders
|
||||
Special []Dish // Tähteet and the like: loggable, but not food
|
||||
Sides []Side
|
||||
New mainForm // inline "add the dish you were looking for"
|
||||
History HistoryPage
|
||||
HistoryDays int // size of the window currently shown
|
||||
HistoryMore int // the window size the "show more" link asks for
|
||||
History []HistoryRow
|
||||
|
||||
// Deleting a logged meal drops the row outright, unlike a dish which is
|
||||
// only soft-deleted, so it asks first.
|
||||
Confirming bool
|
||||
}
|
||||
|
||||
// logOptions is what the Kirjaa screen is being asked to show. Pulled out of
|
||||
// the request for a page load or a patch, and set directly after a write,
|
||||
// where the answer is simply "that day, nothing else open".
|
||||
type logOptions struct {
|
||||
Date time.Time
|
||||
Dish string // ?ruoka=, opening the sides step
|
||||
Changing bool // ?muuta=, swapping the dish on a logged day
|
||||
Confirming bool // ?poista=, asking before deleting the entry
|
||||
Search string
|
||||
}
|
||||
|
||||
func (a *app) logOptionsFrom(r *http.Request) logOptions {
|
||||
q := r.URL.Query()
|
||||
return logOptions{
|
||||
Date: a.date(r),
|
||||
Dish: q.Get("ruoka"),
|
||||
Changing: q.Get("muuta") != "",
|
||||
Confirming: q.Get("poista") != "",
|
||||
Search: strings.TrimSpace(q.Get("haku")),
|
||||
}
|
||||
}
|
||||
|
||||
func (a *app) index(w http.ResponseWriter, r *http.Request) {
|
||||
render(w, r, logPage(a.buildLog(r, a.logOptionsFrom(r))))
|
||||
}
|
||||
|
||||
// day patches the list in place. Every link in it calls here rather than
|
||||
// loading a page, so opening a day leaves the scroll position alone.
|
||||
func (a *app) day(w http.ResponseWriter, r *http.Request) {
|
||||
fragment(w, r, dayList(a.buildLog(r, a.logOptionsFrom(r))))
|
||||
}
|
||||
|
||||
// finishDay answers a write: a patch for Datastar, a redirect otherwise.
|
||||
func (a *app) finishDay(w http.ResponseWriter, r *http.Request, date time.Time) {
|
||||
if isDatastar(r) {
|
||||
fragment(w, r, dayList(a.buildLog(r, logOptions{Date: date})))
|
||||
return
|
||||
}
|
||||
a.redirectToDay(w, r, date)
|
||||
}
|
||||
|
||||
func (a *app) buildLog(r *http.Request, o logOptions) logView {
|
||||
date := o.Date
|
||||
date := a.date(r)
|
||||
v := logView{
|
||||
Date: date,
|
||||
Today: today(a.loc),
|
||||
Search: o.Search,
|
||||
Search: strings.TrimSpace(r.URL.Query().Get("haku")),
|
||||
Checked: map[int64]bool{},
|
||||
Confirming: o.Confirming,
|
||||
}
|
||||
|
||||
v.Confirming = r.URL.Query().Get("poista") != ""
|
||||
|
||||
entry, err := entryFor(a.db, date)
|
||||
if err != nil {
|
||||
log.Printf("entry for %s: %v", date.Format(dateLayout), err)
|
||||
@@ -165,8 +98,8 @@ func (a *app) buildLog(r *http.Request, o logOptions) logView {
|
||||
// ?ruoka= opens the sides step for that dish. When it is the dish already
|
||||
// logged, the existing sides come back ticked, which makes editing an
|
||||
// entry the same screen as creating one.
|
||||
if o.Dish != "" {
|
||||
if id, err := strconv.ParseInt(o.Dish, 10, 64); err == nil {
|
||||
if raw := r.URL.Query().Get("ruoka"); raw != "" {
|
||||
if id, err := strconv.ParseInt(raw, 10, 64); err == nil {
|
||||
if dish, err := dishByID(a.db, id); err == nil {
|
||||
v.Chosen = dish
|
||||
if entry != nil && entry.Main.ID == id {
|
||||
@@ -181,7 +114,7 @@ func (a *app) buildLog(r *http.Request, o logOptions) logView {
|
||||
// The board shows when there is nothing logged yet, or when the entry is
|
||||
// being changed. "Muokkaa" on a logged day sets ?muuta=1 and lands here,
|
||||
// so swapping the dish and picking one for the first time are one path.
|
||||
changing := o.Changing || v.Search != ""
|
||||
changing := r.URL.Query().Get("muuta") != "" || v.Search != ""
|
||||
if v.Chosen == nil && (v.Entry == nil || changing) {
|
||||
v.ShowBoard = true
|
||||
if v.Dishes, err = listDishes(a.db, v.Search); err != nil {
|
||||
@@ -190,168 +123,21 @@ func (a *app) buildLog(r *http.Request, o logOptions) logView {
|
||||
// listDishes already orders by frequency then name, so grouping keeps
|
||||
// the favourites at the top of each category.
|
||||
v.Groups = groupDishes(v.Dishes)
|
||||
if v.Special, err = listSpecial(a.db, v.Search); err != nil {
|
||||
log.Printf("list special: %v", err)
|
||||
}
|
||||
// Seed the inline add form with whatever was searched for, so a miss
|
||||
// turns straight into "add it" without retyping.
|
||||
v.New = mainForm{Name: v.Search, Categories: map[string]bool{}, HasSides: true}
|
||||
}
|
||||
if v.Chosen != nil && v.Chosen.HasSides {
|
||||
if v.Sides, err = listSides(a.db, ""); err != nil {
|
||||
if v.Sides, err = listSides(a.db); err != nil {
|
||||
log.Printf("list sides: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
a.loadDays(r, &v)
|
||||
return v
|
||||
}
|
||||
|
||||
// loadDays fills the day list. The selected day expands inside it rather than
|
||||
// in a panel above it, so choosing a day from the list does not reorder the
|
||||
// list underneath the tap.
|
||||
func (a *app) loadDays(r *http.Request, v *logView) {
|
||||
v.HistoryDays = historyWindow(r)
|
||||
v.HistoryMore = v.HistoryDays + historyDays
|
||||
|
||||
// The window has to reach the selected day, or it would have nowhere to
|
||||
// expand. history() takes it as a floor rather than the caller inflating
|
||||
// the day count, because the window also truncates at the first entry ever
|
||||
// logged — and a day older than that still has to be loggable.
|
||||
page, err := history(a.db, a.loc, v.Today, v.HistoryDays, v.Date)
|
||||
if err != nil {
|
||||
if v.History, err = history(a.db, a.loc, historyDays); err != nil {
|
||||
log.Printf("history: %v", err)
|
||||
}
|
||||
// Nothing logged ever: the selected day is still the one being worked on,
|
||||
// so it needs a row of its own to open in.
|
||||
if len(page.Rows) == 0 {
|
||||
page.Rows = []HistoryRow{{Date: v.Date, Entry: v.Entry}}
|
||||
}
|
||||
v.History = page
|
||||
}
|
||||
|
||||
// searchSignals is what Datastar sends back: for a GET it JSON-encodes the
|
||||
// signals into the `datastar` query parameter.
|
||||
type searchSignals struct {
|
||||
Haku string `json:"haku"`
|
||||
}
|
||||
|
||||
// readSignals decodes that parameter.
|
||||
//
|
||||
// ponytail: the Datastar SDK does this too, but pulling it in for one JSON
|
||||
// decode dragged along four modules — an HTTP compression stack among them —
|
||||
// for an SSE generator this app never uses. Absent or empty is not an error:
|
||||
// the first request carries no signals.
|
||||
func readSignals(r *http.Request, into any) error {
|
||||
raw := r.URL.Query().Get("datastar")
|
||||
if raw == "" {
|
||||
return nil
|
||||
}
|
||||
return json.Unmarshal([]byte(raw), into)
|
||||
}
|
||||
|
||||
// fragment renders a piece of a page for Datastar to patch in. A plain
|
||||
// text/html response is enough — Datastar matches the returned element by its
|
||||
// id and replaces it, so there is no SSE stream to manage.
|
||||
func fragment(w http.ResponseWriter, r *http.Request, c templ.Component) {
|
||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||
if err := c.Render(r.Context(), w); err != nil {
|
||||
log.Printf("fragment %s: %v", r.URL.Path, err)
|
||||
}
|
||||
}
|
||||
|
||||
// isDatastar reports whether the request came from the client library, which
|
||||
// tags its own. Everything below keeps working without JavaScript: the same
|
||||
// handlers redirect instead of patching when the header is absent.
|
||||
func isDatastar(r *http.Request) bool {
|
||||
return r.Header.Get("Datastar-Request") != ""
|
||||
}
|
||||
|
||||
// patchElements sends one Datastar event carrying several elements, each
|
||||
// matched to the page by its id. A text/html response can only replace one
|
||||
// element, and the catalog has to move its list and its forms together —
|
||||
// opening an edit form also has to un-highlight whatever was open before.
|
||||
//
|
||||
// ponytail: about twenty lines instead of the SDK, which brought four modules
|
||||
// for an SSE generator we would otherwise never call.
|
||||
func patchElements(w http.ResponseWriter, r *http.Request, components ...templ.Component) {
|
||||
w.Header().Set("Content-Type", "text/event-stream")
|
||||
w.Header().Set("Cache-Control", "no-cache")
|
||||
|
||||
var out strings.Builder
|
||||
out.WriteString("event: datastar-patch-elements\n")
|
||||
for _, c := range components {
|
||||
var html strings.Builder
|
||||
if err := c.Render(r.Context(), &html); err != nil {
|
||||
log.Printf("patch %s: %v", r.URL.Path, err)
|
||||
return
|
||||
}
|
||||
// One `data: elements` line per line of HTML, as the protocol wants.
|
||||
for _, line := range strings.Split(html.String(), "\n") {
|
||||
if strings.TrimSpace(line) == "" {
|
||||
continue
|
||||
}
|
||||
out.WriteString("data: elements ")
|
||||
out.WriteString(line)
|
||||
out.WriteString("\n")
|
||||
}
|
||||
}
|
||||
out.WriteString("\n")
|
||||
|
||||
io.WriteString(w, out.String())
|
||||
if f, ok := w.(http.Flusher); ok {
|
||||
f.Flush()
|
||||
}
|
||||
}
|
||||
|
||||
// searchBoard re-renders the dish board as the search box is typed into.
|
||||
func (a *app) searchBoard(w http.ResponseWriter, r *http.Request) {
|
||||
var signals searchSignals
|
||||
if err := readSignals(r, &signals); err != nil {
|
||||
http.Error(w, "bad signals", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
v := logView{
|
||||
Date: a.date(r),
|
||||
Today: today(a.loc),
|
||||
Search: strings.TrimSpace(signals.Haku),
|
||||
}
|
||||
dishes, err := listDishes(a.db, v.Search)
|
||||
if err != nil {
|
||||
log.Printf("search dishes: %v", err)
|
||||
}
|
||||
v.Dishes = dishes
|
||||
v.Groups = groupDishes(dishes)
|
||||
if v.Special, err = listSpecial(a.db, v.Search); err != nil {
|
||||
log.Printf("search special: %v", err)
|
||||
}
|
||||
v.New = mainForm{Name: v.Search, Categories: map[string]bool{}, HasSides: true}
|
||||
|
||||
fragment(w, r, boardList(v))
|
||||
}
|
||||
|
||||
// searchCatalog re-renders the catalog lists as the search box is typed into.
|
||||
func (a *app) searchCatalog(w http.ResponseWriter, r *http.Request) {
|
||||
var signals searchSignals
|
||||
if err := readSignals(r, &signals); err != nil {
|
||||
http.Error(w, "bad signals", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
v := catalogView{Search: strings.TrimSpace(signals.Haku)}
|
||||
mains, err := listDishes(a.db, v.Search)
|
||||
if err != nil {
|
||||
log.Printf("search catalog: %v", err)
|
||||
}
|
||||
v.Mains = len(mains)
|
||||
sortByName(mains)
|
||||
v.Groups = groupDishes(mains)
|
||||
if v.Sides, err = listSides(a.db, v.Search); err != nil {
|
||||
log.Printf("search sides: %v", err)
|
||||
}
|
||||
|
||||
fragment(w, r, catalogList(v))
|
||||
render(w, r, logPage(v))
|
||||
}
|
||||
|
||||
// quickAdd creates a dish from the Kirjaa screen and goes straight on to
|
||||
@@ -389,12 +175,6 @@ func (a *app) quickAdd(w http.ResponseWriter, r *http.Request) {
|
||||
log.Printf("quick add: %v", err)
|
||||
form.Err = "Tallennus epäonnistui."
|
||||
default:
|
||||
// Created: straight on to its sides step.
|
||||
opts := logOptions{Date: date, Dish: strconv.FormatInt(id, 10)}
|
||||
if isDatastar(r) {
|
||||
fragment(w, r, dayList(a.buildLog(r, opts)))
|
||||
return
|
||||
}
|
||||
a.redirectToPick(w, r, date, id)
|
||||
return
|
||||
}
|
||||
@@ -402,11 +182,21 @@ func (a *app) quickAdd(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
// Rejected: back to the board with the form filled in and the search
|
||||
// still narrowed, so the add card stays on screen.
|
||||
v := a.buildLog(r, logOptions{Date: date, Search: form.Name})
|
||||
v.New = form
|
||||
if isDatastar(r) {
|
||||
fragment(w, r, dayList(v))
|
||||
return
|
||||
v := logView{
|
||||
Date: date,
|
||||
Today: today(a.loc),
|
||||
Search: form.Name,
|
||||
Checked: map[int64]bool{},
|
||||
New: form,
|
||||
ShowBoard: true,
|
||||
}
|
||||
var err error
|
||||
if v.Dishes, err = listDishes(a.db, v.Search); err != nil {
|
||||
log.Printf("list dishes: %v", err)
|
||||
}
|
||||
v.Groups = groupDishes(v.Dishes)
|
||||
if v.History, err = history(a.db, a.loc, historyDays); err != nil {
|
||||
log.Printf("history: %v", err)
|
||||
}
|
||||
render(w, r, logPage(v))
|
||||
}
|
||||
@@ -442,7 +232,7 @@ func (a *app) save(w http.ResponseWriter, r *http.Request) {
|
||||
http.Error(w, "tallennus epäonnistui", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
a.finishDay(w, r, date)
|
||||
a.redirectToDay(w, r, date)
|
||||
}
|
||||
|
||||
func (a *app) delete(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -452,12 +242,15 @@ func (a *app) delete(w http.ResponseWriter, r *http.Request) {
|
||||
http.Error(w, "poisto epäonnistui", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
a.finishDay(w, r, date)
|
||||
a.redirectToDay(w, r, date)
|
||||
}
|
||||
|
||||
// redirectToDay is the no-JavaScript path back after a write.
|
||||
func (a *app) redirectToDay(w http.ResponseWriter, r *http.Request, date time.Time) {
|
||||
http.Redirect(w, r, dayURL("/", date, today(a.loc)), http.StatusSeeOther)
|
||||
target := "/"
|
||||
if !date.Equal(today(a.loc)) {
|
||||
target += "?pvm=" + date.Format(dateLayout)
|
||||
}
|
||||
http.Redirect(w, r, target, http.StatusSeeOther)
|
||||
}
|
||||
|
||||
// mainForm and sideForm carry what the user typed, so a rejected submission
|
||||
@@ -483,7 +276,6 @@ type catalogView struct {
|
||||
Side sideForm
|
||||
Report *ImportReport
|
||||
Mains int // count, for the header
|
||||
Search string
|
||||
|
||||
// The row awaiting a delete confirmation, if any. A trash icon is easy to
|
||||
// hit by accident, so the row asks before anything happens.
|
||||
@@ -491,23 +283,9 @@ type catalogView struct {
|
||||
DeleteKind string
|
||||
}
|
||||
|
||||
// catalog renders the whole page. show patches the same state in place, so
|
||||
// nothing navigates: both build the view the same way.
|
||||
func (a *app) catalog(w http.ResponseWriter, r *http.Request) {
|
||||
a.renderCatalog(w, r, a.catalogState(r))
|
||||
}
|
||||
|
||||
// show is what every catalog link actually calls. It patches the list and both
|
||||
// forms rather than loading a page, so opening an edit form or asking to
|
||||
// delete a row leaves the scroll position exactly where it was.
|
||||
func (a *app) show(w http.ResponseWriter, r *http.Request) {
|
||||
a.patchCatalog(w, r, a.catalogState(r))
|
||||
}
|
||||
|
||||
func (a *app) catalogState(r *http.Request) catalogView {
|
||||
v := catalogView{
|
||||
Main: mainForm{Categories: map[string]bool{}, HasSides: true},
|
||||
Search: strings.TrimSpace(r.URL.Query().Get("haku")),
|
||||
}
|
||||
|
||||
// ?muokkaa= loads a dish into its form; the same form adds and edits.
|
||||
@@ -540,16 +318,15 @@ func (a *app) catalogState(r *http.Request) catalogView {
|
||||
}
|
||||
}
|
||||
|
||||
return v
|
||||
a.renderCatalog(w, r, v)
|
||||
}
|
||||
|
||||
// fillCatalog loads the lists into a view built from the request.
|
||||
func (a *app) fillCatalog(v *catalogView) {
|
||||
func (a *app) renderCatalog(w http.ResponseWriter, r *http.Request, v catalogView) {
|
||||
if v.Main.Categories == nil {
|
||||
v.Main.Categories = map[string]bool{}
|
||||
}
|
||||
|
||||
mains, err := listDishes(a.db, v.Search)
|
||||
mains, err := listDishes(a.db, "")
|
||||
if err != nil {
|
||||
log.Printf("list mains: %v", err)
|
||||
}
|
||||
@@ -557,23 +334,12 @@ func (a *app) fillCatalog(v *catalogView) {
|
||||
sortByName(mains) // the catalog is managed, so position should be predictable
|
||||
v.Groups = groupDishes(mains)
|
||||
|
||||
if v.Sides, err = listSides(a.db, v.Search); err != nil {
|
||||
if v.Sides, err = listSides(a.db); err != nil {
|
||||
log.Printf("list sides: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func (a *app) renderCatalog(w http.ResponseWriter, r *http.Request, v catalogView) {
|
||||
a.fillCatalog(&v)
|
||||
render(w, r, catalogPage(v))
|
||||
}
|
||||
|
||||
// patchCatalog swaps the list and both forms in one event. They move together:
|
||||
// opening an edit form also has to clear whatever delete was being confirmed.
|
||||
func (a *app) patchCatalog(w http.ResponseWriter, r *http.Request, v catalogView) {
|
||||
a.fillCatalog(&v)
|
||||
patchElements(w, r, catalogList(v), mainForm_(v.Main), sideForm_(v.Side))
|
||||
}
|
||||
|
||||
// saveMain adds or updates a main dish. A rejected form is re-rendered with
|
||||
// the values still in it; a good one redirects, so refresh cannot re-submit.
|
||||
func (a *app) saveMain(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -614,28 +380,11 @@ func (a *app) saveMain(w http.ResponseWriter, r *http.Request) {
|
||||
log.Printf("save main: %v", err)
|
||||
form.Err = "Tallennus epäonnistui."
|
||||
default:
|
||||
// Saved: hand back a blank form so it collapses, and a list with
|
||||
// the dish in it.
|
||||
a.finishCatalog(w, r, catalogView{})
|
||||
http.Redirect(w, r, "/ruoat", http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
}
|
||||
a.finishCatalog(w, r, catalogView{Main: form})
|
||||
}
|
||||
|
||||
// finishCatalog answers a catalog write: a patch for Datastar, a redirect for
|
||||
// a plain form post. Without the redirect, submitting with JavaScript off
|
||||
// would leave the browser sitting on a POST it could not reload.
|
||||
func (a *app) finishCatalog(w http.ResponseWriter, r *http.Request, v catalogView) {
|
||||
if isDatastar(r) {
|
||||
a.patchCatalog(w, r, v)
|
||||
return
|
||||
}
|
||||
if v.Main.Err != "" || v.Side.Err != "" {
|
||||
a.renderCatalog(w, r, v)
|
||||
return
|
||||
}
|
||||
http.Redirect(w, r, "/ruuat", http.StatusSeeOther)
|
||||
a.renderCatalog(w, r, catalogView{Main: form})
|
||||
}
|
||||
|
||||
func (a *app) saveSide(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -660,11 +409,11 @@ func (a *app) saveSide(w http.ResponseWriter, r *http.Request) {
|
||||
log.Printf("save side: %v", err)
|
||||
form.Err = "Tallennus epäonnistui."
|
||||
default:
|
||||
a.finishCatalog(w, r, catalogView{})
|
||||
http.Redirect(w, r, "/ruoat", http.StatusSeeOther)
|
||||
return
|
||||
}
|
||||
}
|
||||
a.finishCatalog(w, r, catalogView{Side: form})
|
||||
a.renderCatalog(w, r, catalogView{Side: form})
|
||||
}
|
||||
|
||||
// deleteDish soft-deletes, so log entries keep resolving the name (PRD §6).
|
||||
@@ -688,7 +437,7 @@ func (a *app) deleteDish(w http.ResponseWriter, r *http.Request) {
|
||||
http.Error(w, "poisto epäonnistui", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
a.finishCatalog(w, r, catalogView{})
|
||||
http.Redirect(w, r, "/ruoat", http.StatusSeeOther)
|
||||
}
|
||||
|
||||
// importDishes takes a bundle either pasted into the textarea or uploaded as a
|
||||
|
||||
+7
-33
@@ -32,24 +32,9 @@ import (
|
||||
//go:embed static
|
||||
var staticFS embed.FS
|
||||
|
||||
// version is replaced at build time with the CalVer tag by the release workflow.
|
||||
// version is replaced at build time with the CalVer tag (see `make image`).
|
||||
var version = "dev"
|
||||
|
||||
// envTag marks the browser tab of anything that is not production, so a dev
|
||||
// instance and the real one open side by side are told apart at a glance.
|
||||
// Empty in production, which is the default.
|
||||
var envTag string
|
||||
|
||||
func setEnvTag(value string) {
|
||||
value = strings.TrimSpace(value)
|
||||
if value == "" || strings.EqualFold(value, "prod") || strings.EqualFold(value, "production") {
|
||||
envTag = ""
|
||||
return
|
||||
}
|
||||
// Whatever it says, so ENV=staging labels itself too.
|
||||
envTag = strings.ToLower(value)
|
||||
}
|
||||
|
||||
const (
|
||||
listenAddr = ":8080"
|
||||
defaultTZ = "Europe/Helsinki"
|
||||
@@ -70,7 +55,7 @@ func run() error {
|
||||
"import a JSON dish bundle (PRD §7.3 shape) and exit")
|
||||
flag.Parse()
|
||||
|
||||
db, err := openDB(cmp.Or(os.Getenv("DB"), defaultDB))
|
||||
db, err := openDB(cmp.Or(os.Getenv("FOODSTER_DB"), defaultDB))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -81,9 +66,9 @@ func run() error {
|
||||
return runImport(db, *importPath)
|
||||
}
|
||||
|
||||
password := os.Getenv("PASSWORD")
|
||||
password := os.Getenv("FOODSTER_PASSWORD")
|
||||
if password == "" {
|
||||
return errors.New("PASSWORD is not set")
|
||||
return errors.New("FOODSTER_PASSWORD is not set")
|
||||
}
|
||||
|
||||
// Fail rather than fall back to UTC: a silently wrong zone shifts logged
|
||||
@@ -94,21 +79,14 @@ func run() error {
|
||||
return fmt.Errorf("TZ: %w", err)
|
||||
}
|
||||
|
||||
setEnvTag(os.Getenv("ENV"))
|
||||
// The container always publishes :8080; FOODSTER_ADDR exists so tests and
|
||||
// a second local instance can pick another port.
|
||||
addr := cmp.Or(os.Getenv("FOODSTER_ADDR"), listenAddr)
|
||||
|
||||
// The container always publishes :8080; ADDR exists so tests and a second
|
||||
// local instance can pick another port.
|
||||
addr := cmp.Or(os.Getenv("ADDR"), listenAddr)
|
||||
|
||||
// WriteTimeout and IdleTimeout matter more than they look: the pool holds
|
||||
// exactly one database connection, so a reader stalling on a long history
|
||||
// response blocks every other request behind it.
|
||||
srv := &http.Server{
|
||||
Addr: addr,
|
||||
Handler: routes(db, loc, password),
|
||||
ReadHeaderTimeout: 10 * time.Second,
|
||||
WriteTimeout: 30 * time.Second,
|
||||
IdleTimeout: 120 * time.Second,
|
||||
}
|
||||
|
||||
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
|
||||
@@ -180,12 +158,8 @@ func routes(db *sql.DB, loc *time.Location, password string) http.Handler {
|
||||
mux.HandleFunc("GET /{$}", a.index)
|
||||
mux.HandleFunc("POST /kirjaa", a.save)
|
||||
mux.HandleFunc("POST /lisaa", a.quickAdd)
|
||||
mux.HandleFunc("GET /etsi", a.searchBoard)
|
||||
mux.HandleFunc("GET /paiva", a.day)
|
||||
mux.HandleFunc("POST /poista", a.delete)
|
||||
mux.HandleFunc("GET /ruuat", a.catalog)
|
||||
mux.HandleFunc("GET /ruuat/etsi", a.searchCatalog)
|
||||
mux.HandleFunc("GET /ruuat/nayta", a.show)
|
||||
mux.HandleFunc("POST /ruuat/paaruoka", a.saveMain)
|
||||
mux.HandleFunc("POST /ruuat/lisuke", a.saveSide)
|
||||
mux.HandleFunc("POST /ruuat/poista", a.deleteDish)
|
||||
|
||||
@@ -3,7 +3,6 @@ package main
|
||||
import (
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"net/url"
|
||||
"os"
|
||||
"strings"
|
||||
"testing"
|
||||
@@ -76,58 +75,6 @@ func TestDateRejectsTheFuture(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestReadSignals(t *testing.T) {
|
||||
cases := []struct {
|
||||
name string
|
||||
query string
|
||||
want string
|
||||
wantErr bool
|
||||
}{
|
||||
{"a signal", `/etsi?datastar=` + url.QueryEscape(`{"haku":"keitto"}`), "keitto", false},
|
||||
{"other signals are ignored", `/etsi?datastar=` + url.QueryEscape(`{"haku":"kala","muu":1}`), "kala", false},
|
||||
// The first request carries no signals at all; that is not a failure.
|
||||
{"no parameter", "/etsi", "", false},
|
||||
{"empty parameter", "/etsi?datastar=", "", false},
|
||||
{"malformed json", "/etsi?datastar=%7Bnope", "", true},
|
||||
}
|
||||
|
||||
for _, c := range cases {
|
||||
t.Run(c.name, func(t *testing.T) {
|
||||
var got searchSignals
|
||||
err := readSignals(httptest.NewRequest(http.MethodGet, c.query, nil), &got)
|
||||
if (err != nil) != c.wantErr {
|
||||
t.Fatalf("err = %v, wantErr %v", err, c.wantErr)
|
||||
}
|
||||
if got.Haku != c.want {
|
||||
t.Errorf("haku = %q, want %q", got.Haku, c.want)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnvTagMarksNonProduction(t *testing.T) {
|
||||
t.Cleanup(func() { envTag = "" })
|
||||
|
||||
cases := []struct{ env, want string }{
|
||||
// Production is the default and must stay unmarked: the tag exists to
|
||||
// pick the dev tab out of two identical ones.
|
||||
{"", "Foodster"},
|
||||
{"prod", "Foodster"},
|
||||
{"PRODUCTION", "Foodster"},
|
||||
{" ", "Foodster"},
|
||||
{"dev", "dev · Foodster"},
|
||||
{"DEV", "dev · Foodster"},
|
||||
{"staging", "staging · Foodster"},
|
||||
}
|
||||
|
||||
for _, c := range cases {
|
||||
setEnvTag(c.env)
|
||||
if got := pageTitle("Foodster"); got != c.want {
|
||||
t.Errorf("ENV=%q: title = %q, want %q", c.env, got, c.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestMigrateCreatesSchema(t *testing.T) {
|
||||
db, err := openDB(t.TempDir() + "/test.db")
|
||||
if err != nil {
|
||||
@@ -269,16 +216,14 @@ func TestMealLogOneEntryPerDate(t *testing.T) {
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
// Ids well clear of anything the migrations create.
|
||||
if _, err := db.Exec(
|
||||
`INSERT INTO main_dishes (id, name) VALUES (101, 'Lohikeitto'), (102, 'Lihapullat')`); err != nil {
|
||||
if _, err := db.Exec(`INSERT INTO main_dishes (id, name) VALUES (1, 'Lohikeitto'), (2, 'Lihapullat')`); err != nil {
|
||||
t.Fatalf("seed: %v", err)
|
||||
}
|
||||
if _, err := db.Exec(`INSERT INTO meal_log (date, main_dish_id) VALUES ('2026-09-05', 101)`); err != nil {
|
||||
if _, err := db.Exec(`INSERT INTO meal_log (date, main_dish_id) VALUES ('2026-09-05', 1)`); err != nil {
|
||||
t.Fatalf("first entry: %v", err)
|
||||
}
|
||||
// PRD §6: a second dinner for the same day must be refused.
|
||||
if _, err := db.Exec(`INSERT INTO meal_log (date, main_dish_id) VALUES ('2026-09-05', 102)`); err == nil {
|
||||
if _, err := db.Exec(`INSERT INTO meal_log (date, main_dish_id) VALUES ('2026-09-05', 2)`); err == nil {
|
||||
t.Error("second entry for the same date was accepted, want a unique violation")
|
||||
}
|
||||
}
|
||||
@@ -290,18 +235,18 @@ func TestDuplicateNamesAreCaseInsensitive(t *testing.T) {
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
if _, err := db.Exec(`INSERT INTO main_dishes (id, name) VALUES (101, 'Kanacurry')`); err != nil {
|
||||
if _, err := db.Exec(`INSERT INTO main_dishes (id, name) VALUES (1, 'Kanacurry')`); err != nil {
|
||||
t.Fatalf("first insert: %v", err)
|
||||
}
|
||||
if _, err := db.Exec(`INSERT INTO main_dishes (id, name) VALUES (102, 'kanacurry')`); err == nil {
|
||||
if _, err := db.Exec(`INSERT INTO main_dishes (id, name) VALUES (2, 'kanacurry')`); err == nil {
|
||||
t.Error("case-variant duplicate was accepted, want a unique violation")
|
||||
}
|
||||
|
||||
// Soft-deleting the original frees the name again (PRD §7.3).
|
||||
if _, err := db.Exec(`UPDATE main_dishes SET deleted_at = datetime('now') WHERE id = 101`); err != nil {
|
||||
if _, err := db.Exec(`UPDATE main_dishes SET deleted_at = datetime('now') WHERE id = 1`); err != nil {
|
||||
t.Fatalf("soft delete: %v", err)
|
||||
}
|
||||
if _, err := db.Exec(`INSERT INTO main_dishes (id, name) VALUES (102, 'kanacurry')`); err != nil {
|
||||
if _, err := db.Exec(`INSERT INTO main_dishes (id, name) VALUES (2, 'kanacurry')`); err != nil {
|
||||
t.Errorf("name still blocked after soft delete: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
-- Tähteet: leftovers.
|
||||
--
|
||||
-- Not a dish. It exists so a day can be recorded as "we ate what was already
|
||||
-- there" without inventing a meal that was never cooked. It has no category,
|
||||
-- it is not something the household adds or edits, and the stage 2 suggester
|
||||
-- must never propose it (PRD §8).
|
||||
--
|
||||
-- Modelled as a flagged row in main_dishes rather than a nullable
|
||||
-- main_dish_id on meal_log: the log keeps one shape, and every foreign key
|
||||
-- and join carries on working untouched.
|
||||
|
||||
ALTER TABLE main_dishes
|
||||
ADD COLUMN special INTEGER NOT NULL DEFAULT 0 CHECK (special IN (0, 1));
|
||||
|
||||
-- OR IGNORE in case a household already typed a dish by this name: the unique
|
||||
-- index on lower(name) would otherwise fail the migration. Their row stays as
|
||||
-- an ordinary dish, which is wrong but harmless and fixable by hand.
|
||||
INSERT OR IGNORE INTO main_dishes (name, has_sides, special)
|
||||
VALUES ('Tähteet', 0, 1);
|
||||
@@ -134,8 +134,6 @@ html[data-theme="light"] .themetoggle .i-moon { display: none; }
|
||||
.c-kana { color: var(--kana); }
|
||||
.c-kala { color: var(--kala); }
|
||||
.c-kasvis { color: var(--kasvis); }
|
||||
/* Not a category, so not a category colour. */
|
||||
.c-tahteet { color: var(--muted); }
|
||||
|
||||
/* Day switcher */
|
||||
.dayseg { display: flex; gap: 6px; margin-top: 11px; flex-wrap: wrap; }
|
||||
@@ -210,20 +208,6 @@ html[data-theme="light"] .themetoggle .i-moon { display: none; }
|
||||
font-size: 10px;
|
||||
color: var(--muted);
|
||||
}
|
||||
/* Not food: set apart from the categories, and deliberately quiet. */
|
||||
.special {
|
||||
margin-top: 22px;
|
||||
padding-top: 16px;
|
||||
border-top: 1px dashed var(--line);
|
||||
}
|
||||
.pill.plain {
|
||||
font-size: 16px;
|
||||
padding: 12px 16px;
|
||||
background: var(--sunk);
|
||||
color: var(--muted);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.pill.xl { font-size: 22px; padding: 14px 18px; flex: 1 1 100%; }
|
||||
.pill.lg { font-size: 18px; padding: 12px 16px; }
|
||||
.pill.md { font-size: 15.5px; padding: 11px 14px; }
|
||||
@@ -326,26 +310,8 @@ html[data-theme="light"] .themetoggle .i-moon { display: none; }
|
||||
text-transform: uppercase;
|
||||
color: var(--muted);
|
||||
}
|
||||
/* The day list is the page; rows are links and the selected one expands. */
|
||||
.history { margin-top: 4px; }
|
||||
|
||||
/* Marked with a bar down the side, not rules above and below: the rows either
|
||||
side already draw a bottom border, so a horizontal rule here doubled up.
|
||||
scroll-margin keeps the anchor off the viewport edge. */
|
||||
.open {
|
||||
scroll-margin-top: 12px;
|
||||
margin: 8px 0 18px;
|
||||
padding: 10px 0 4px 13px;
|
||||
border-left: 3px solid var(--accent);
|
||||
}
|
||||
.openday {
|
||||
margin: 0 0 12px;
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.06em;
|
||||
text-transform: uppercase;
|
||||
color: var(--accent);
|
||||
}
|
||||
/* History sits under the logger on the same page, so whole rows are links. */
|
||||
.history { margin-top: 8px; }
|
||||
.entry, .gapline {
|
||||
display: flex;
|
||||
gap: 12px;
|
||||
@@ -362,19 +328,6 @@ html[data-theme="light"] .themetoggle .i-moon { display: none; }
|
||||
color: var(--accent);
|
||||
font-weight: 600;
|
||||
}
|
||||
.more {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: var(--tap);
|
||||
margin-top: 12px;
|
||||
border: 1px solid var(--line);
|
||||
border-radius: 10px;
|
||||
color: var(--accent);
|
||||
font-size: 15px;
|
||||
font-weight: 600;
|
||||
text-decoration: none;
|
||||
}
|
||||
.gapline { border-bottom-style: dashed; font-size: 13.5px; color: var(--muted); }
|
||||
.entry time, .gapline time {
|
||||
flex: none;
|
||||
@@ -457,52 +410,15 @@ html[data-theme="light"] .themetoggle .i-moon { display: none; }
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/* Catalog structure: Pääruuat and Lisukkeet are the two halves of the
|
||||
catalog, the categories are subdivisions of the first. Two levels, so they
|
||||
must not look alike. */
|
||||
.section + .section { margin-top: 34px; }
|
||||
.sectiontitle {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 9px;
|
||||
margin: 0 0 4px;
|
||||
padding-bottom: 8px;
|
||||
border-bottom: 2px solid var(--ink);
|
||||
font-size: 18px;
|
||||
font-weight: 700;
|
||||
letter-spacing: -0.03em;
|
||||
}
|
||||
.sectiontitle .count {
|
||||
padding: 2px 8px;
|
||||
border-radius: 999px;
|
||||
background: var(--sunk);
|
||||
color: var(--muted);
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
letter-spacing: 0;
|
||||
}
|
||||
|
||||
/* Catalog rows */
|
||||
.sechead {
|
||||
margin: 20px 0 2px;
|
||||
margin: 26px 0 6px;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.09em;
|
||||
text-transform: uppercase;
|
||||
color: var(--muted);
|
||||
}
|
||||
|
||||
/* Collapsed add/edit forms, so the page opens on the catalog. */
|
||||
.addform > summary {
|
||||
cursor: pointer;
|
||||
font-weight: 600;
|
||||
font-size: 15px;
|
||||
min-height: 24px;
|
||||
}
|
||||
.addform[open] > summary {
|
||||
margin-bottom: 14px;
|
||||
padding-bottom: 10px;
|
||||
border-bottom: 1px solid var(--line);
|
||||
}
|
||||
.row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
+30
-159
@@ -28,24 +28,13 @@ type Dish struct {
|
||||
TimesEaten int
|
||||
}
|
||||
|
||||
// Rows flagged `special` in the database — Tähteet — are loggable but are not
|
||||
// food. They carry no category, never appear in the catalog, and PRD §8
|
||||
// excludes them from the suggester: cooldown, coverage and weighting all skip
|
||||
// them. dishByID deliberately does not filter on the flag, because logging one
|
||||
// has to work like logging anything else.
|
||||
|
||||
// CategoryKey picks the mark for a dish. One covering several categories
|
||||
// (tortillas, build-your-own pizza) gets the mixed one; carrying none at all
|
||||
// means it is not food, and Tähteet is not a mixture of anything.
|
||||
// CategoryKey is the class suffix for the colour dot. A dish covering several
|
||||
// categories (tortillas, build-your-own pizza) gets the mixed marker.
|
||||
func (d Dish) CategoryKey() string {
|
||||
switch len(d.Categories) {
|
||||
case 0:
|
||||
return "tahteet"
|
||||
case 1:
|
||||
if len(d.Categories) == 1 {
|
||||
return categoryFI[d.Categories[0]]
|
||||
default:
|
||||
return "sek"
|
||||
}
|
||||
return "sek"
|
||||
}
|
||||
|
||||
// Size buckets the dish by how often it has been eaten. The board draws
|
||||
@@ -88,17 +77,6 @@ func (e Entry) SidesLabel() string {
|
||||
// listDishes returns live mains ordered by how often they have been eaten.
|
||||
// An empty search matches everything.
|
||||
func listDishes(db *sql.DB, search string) ([]Dish, error) {
|
||||
return queryDishes(db, search, false)
|
||||
}
|
||||
|
||||
// listSpecial returns the entries that are not food — Tähteet and anything
|
||||
// like it. They are loggable but never suggested, and never appear in the
|
||||
// catalog, so they are fetched deliberately rather than by accident.
|
||||
func listSpecial(db *sql.DB, search string) ([]Dish, error) {
|
||||
return queryDishes(db, search, true)
|
||||
}
|
||||
|
||||
func queryDishes(db *sql.DB, search string, special bool) ([]Dish, error) {
|
||||
rows, err := db.Query(`
|
||||
SELECT m.id, m.name, m.has_sides,
|
||||
coalesce((SELECT group_concat(c.category)
|
||||
@@ -107,9 +85,8 @@ func queryDishes(db *sql.DB, search string, special bool) ([]Dish, error) {
|
||||
(SELECT count(*) FROM meal_log l WHERE l.main_dish_id = m.id)
|
||||
FROM main_dishes m
|
||||
WHERE m.deleted_at IS NULL
|
||||
AND m.special = ?
|
||||
AND (? = '' OR lower(m.name) LIKE '%' || lower(?) || '%')
|
||||
ORDER BY 5 DESC, m.name`, special, search, search)
|
||||
ORDER BY 5 DESC, m.name`, search, search)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -151,12 +128,9 @@ func dishByID(db *sql.DB, id int64) (*Dish, error) {
|
||||
return &d, nil
|
||||
}
|
||||
|
||||
func listSides(db *sql.DB, search string) ([]Side, error) {
|
||||
rows, err := db.Query(`
|
||||
SELECT id, name FROM side_dishes
|
||||
WHERE deleted_at IS NULL
|
||||
AND (? = '' OR lower(name) LIKE '%' || lower(?) || '%')
|
||||
ORDER BY name`, search, search)
|
||||
func listSides(db *sql.DB) ([]Side, error) {
|
||||
rows, err := db.Query(
|
||||
`SELECT id, name FROM side_dishes WHERE deleted_at IS NULL ORDER BY name`)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -305,8 +279,7 @@ func updateMain(db *sql.DB, id int64, name string, categories []string, hasSides
|
||||
defer tx.Rollback()
|
||||
|
||||
if _, err := tx.Exec(
|
||||
`UPDATE main_dishes SET name = ?, has_sides = ?
|
||||
WHERE id = ? AND deleted_at IS NULL AND special = 0`,
|
||||
`UPDATE main_dishes SET name = ?, has_sides = ? WHERE id = ? AND deleted_at IS NULL`,
|
||||
name, hasSides, id,
|
||||
); err != nil {
|
||||
return taken(err)
|
||||
@@ -346,14 +319,9 @@ func updateSide(db *sql.DB, id int64, name string) error {
|
||||
|
||||
// Soft delete: the row stays so historical log entries keep resolving their
|
||||
// names, but it disappears from the catalog and every picker (PRD §6).
|
||||
//
|
||||
// `special = 0` here and in updateMain: the catalog never lists Tähteet, so
|
||||
// the UI cannot reach it, but a stale tab or a hand-made POST could — and
|
||||
// removing it would take away the row migration 0002 guarantees.
|
||||
func softDeleteMain(db *sql.DB, id int64) error {
|
||||
_, err := db.Exec(
|
||||
`UPDATE main_dishes SET deleted_at = datetime('now')
|
||||
WHERE id = ? AND special = 0`, id)
|
||||
`UPDATE main_dishes SET deleted_at = datetime('now') WHERE id = ?`, id)
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -427,133 +395,36 @@ type HistoryRow struct {
|
||||
Entry *Entry
|
||||
}
|
||||
|
||||
// HistoryPage is one window of history plus where to continue from. After a
|
||||
// few years of daily entries the whole log is far too much to render at once.
|
||||
type HistoryPage struct {
|
||||
Rows []HistoryRow
|
||||
More bool // older entries exist beyond this window
|
||||
Next time.Time // the day the next window starts at
|
||||
// history walks back day by day from today, so a day nobody wrote down shows
|
||||
// up as an explicit gap rather than silently missing. It stops at the first
|
||||
// entry ever recorded — before that there is no history to be missing.
|
||||
func history(db *sql.DB, loc *time.Location, days int) ([]HistoryRow, error) {
|
||||
var first string
|
||||
err := db.QueryRow(`SELECT min(date) FROM meal_log`).Scan(&first)
|
||||
if err == sql.ErrNoRows || first == "" {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
// history walks back day by day from a given day, so a day nobody wrote down
|
||||
// shows up as an explicit gap rather than silently missing. It stops at the
|
||||
// first entry ever recorded — before that there is no history to be missing.
|
||||
//
|
||||
// reach names a day that must appear whatever the window says. The log board
|
||||
// opens inside the selected day's row, so a date picked from before the first
|
||||
// entry ever logged used to render nothing at all: no row, no board, no way to
|
||||
// log it. Pass the zero time to ask for the plain window.
|
||||
func history(db *sql.DB, loc *time.Location, from time.Time, days int, reach time.Time) (HistoryPage, error) {
|
||||
var first sql.NullString
|
||||
if err := db.QueryRow(`SELECT min(date) FROM meal_log`).Scan(&first); err != nil {
|
||||
if err == sql.ErrNoRows {
|
||||
return HistoryPage{}, nil
|
||||
}
|
||||
return HistoryPage{}, err
|
||||
}
|
||||
if !first.Valid || first.String == "" {
|
||||
return HistoryPage{}, nil
|
||||
}
|
||||
firstDate, err := time.ParseInLocation(dateLayout, first.String, loc)
|
||||
if err != nil {
|
||||
return HistoryPage{}, err
|
||||
return nil, err
|
||||
}
|
||||
if from.Before(firstDate) {
|
||||
return HistoryPage{}, nil
|
||||
firstDate, err := time.ParseInLocation(dateLayout, first, loc)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
oldest := from.AddDate(0, 0, -days+1)
|
||||
page := HistoryPage{More: true}
|
||||
if !firstDate.Before(oldest) {
|
||||
now := today(loc)
|
||||
oldest := now.AddDate(0, 0, -days)
|
||||
if firstDate.After(oldest) {
|
||||
oldest = firstDate
|
||||
page.More = false
|
||||
}
|
||||
if !reach.IsZero() && reach.Before(oldest) {
|
||||
oldest = reach
|
||||
page.More = firstDate.Before(oldest)
|
||||
}
|
||||
page.Next = oldest.AddDate(0, 0, -1)
|
||||
|
||||
entries, err := entriesBetween(db, oldest, from)
|
||||
if err != nil {
|
||||
return HistoryPage{}, err
|
||||
}
|
||||
for d := from; !d.Before(oldest); d = d.AddDate(0, 0, -1) {
|
||||
row := HistoryRow{Date: d}
|
||||
if e := entries[d.Format(dateLayout)]; e != nil {
|
||||
e.Date = d
|
||||
row.Entry = e
|
||||
}
|
||||
page.Rows = append(page.Rows, row)
|
||||
}
|
||||
return page, nil
|
||||
}
|
||||
|
||||
// entriesBetween loads every logged day in the inclusive range, keyed by
|
||||
// stored date string, in two queries rather than two per day. The widest
|
||||
// window a URL can ask for is five years, which day-at-a-time made 3,600 round
|
||||
// trips through a pool of exactly one connection.
|
||||
func entriesBetween(db *sql.DB, from, to time.Time) (map[string]*Entry, error) {
|
||||
lo, hi := from.Format(dateLayout), to.Format(dateLayout)
|
||||
|
||||
rows, err := db.Query(`
|
||||
SELECT l.id, l.date, m.id, m.name, m.has_sides,
|
||||
coalesce((SELECT group_concat(c.category)
|
||||
FROM main_dish_categories c
|
||||
WHERE c.main_dish_id = m.id), '')
|
||||
FROM meal_log l
|
||||
JOIN main_dishes m ON m.id = l.main_dish_id
|
||||
WHERE l.date BETWEEN ? AND ?`, lo, hi)
|
||||
var rows []HistoryRow
|
||||
for d := now; !d.Before(oldest); d = d.AddDate(0, 0, -1) {
|
||||
entry, err := entryFor(db, d)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
byDate := map[string]*Entry{}
|
||||
byLog := map[int64]*Entry{}
|
||||
for rows.Next() {
|
||||
var logID int64
|
||||
var date, cats string
|
||||
var e Entry
|
||||
if err := rows.Scan(
|
||||
&logID, &date, &e.Main.ID, &e.Main.Name, &e.Main.HasSides, &cats,
|
||||
); err != nil {
|
||||
return nil, err
|
||||
rows = append(rows, HistoryRow{Date: d, Entry: entry})
|
||||
}
|
||||
if cats != "" {
|
||||
e.Main.Categories = strings.Split(cats, ",")
|
||||
}
|
||||
byDate[date] = &e
|
||||
byLog[logID] = &e
|
||||
}
|
||||
if err := rows.Err(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if len(byLog) == 0 {
|
||||
return byDate, nil
|
||||
}
|
||||
|
||||
sides, err := db.Query(`
|
||||
SELECT ls.meal_log_id, s.id, s.name
|
||||
FROM meal_log_sides ls
|
||||
JOIN side_dishes s ON s.id = ls.side_dish_id
|
||||
JOIN meal_log l ON l.id = ls.meal_log_id
|
||||
WHERE l.date BETWEEN ? AND ?
|
||||
ORDER BY s.name`, lo, hi)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
defer sides.Close()
|
||||
|
||||
for sides.Next() {
|
||||
var logID int64
|
||||
var s Side
|
||||
if err := sides.Scan(&logID, &s.ID, &s.Name); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if e := byLog[logID]; e != nil {
|
||||
e.Sides = append(e.Sides, s)
|
||||
}
|
||||
}
|
||||
return byDate, sides.Err()
|
||||
return rows, nil
|
||||
}
|
||||
|
||||
+4
-116
@@ -235,11 +235,10 @@ func TestHistoryMarksUnloggedDaysAsGaps(t *testing.T) {
|
||||
t.Fatalf("save -3: %v", err)
|
||||
}
|
||||
|
||||
page, err := history(h.db, loc, now, 60, time.Time{})
|
||||
rows, err := history(h.db, loc, 60)
|
||||
if err != nil {
|
||||
t.Fatalf("history: %v", err)
|
||||
}
|
||||
rows := page.Rows
|
||||
// Walks back to the oldest entry only: today, -1, -2, -3.
|
||||
if len(rows) != 4 {
|
||||
t.Fatalf("%d rows, want 4", len(rows))
|
||||
@@ -253,127 +252,16 @@ func TestHistoryMarksUnloggedDaysAsGaps(t *testing.T) {
|
||||
if rows[3].Entry == nil || rows[3].Entry.Main.Name != "Lihapullat" {
|
||||
t.Errorf("last row should be Lihapullat, got %+v", rows[3].Entry)
|
||||
}
|
||||
if page.More {
|
||||
t.Error("More is set although the window reached the oldest entry")
|
||||
}
|
||||
}
|
||||
|
||||
func TestHistoryPagesInWindows(t *testing.T) {
|
||||
h := seeded(t)
|
||||
loc := time.UTC
|
||||
now := today(loc)
|
||||
|
||||
// Entries today and 9 days back, with a 5-day window over them.
|
||||
if err := saveEntry(h.db, now, h.mainNamed(t, "Lohikeitto"), nil); err != nil {
|
||||
t.Fatalf("save today: %v", err)
|
||||
}
|
||||
if err := saveEntry(h.db, now.AddDate(0, 0, -9), h.mainNamed(t, "Lihapullat"), nil); err != nil {
|
||||
t.Fatalf("save -9: %v", err)
|
||||
}
|
||||
|
||||
first, err := history(h.db, loc, now, 5, time.Time{})
|
||||
if err != nil {
|
||||
t.Fatalf("first window: %v", err)
|
||||
}
|
||||
if len(first.Rows) != 5 {
|
||||
t.Errorf("%d rows in the first window, want 5", len(first.Rows))
|
||||
}
|
||||
if !first.More {
|
||||
t.Error("More should be set: older entries exist")
|
||||
}
|
||||
if want := now.AddDate(0, 0, -5); !first.Next.Equal(want) {
|
||||
t.Errorf("Next = %s, want %s", first.Next.Format(dateLayout), want.Format(dateLayout))
|
||||
}
|
||||
|
||||
// The windows must meet exactly: no day repeated, none skipped.
|
||||
second, err := history(h.db, loc, first.Next, 5, time.Time{})
|
||||
if err != nil {
|
||||
t.Fatalf("second window: %v", err)
|
||||
}
|
||||
if len(second.Rows) != 5 {
|
||||
t.Errorf("%d rows in the second window, want 5", len(second.Rows))
|
||||
}
|
||||
if second.More {
|
||||
t.Error("the second window reaches the oldest entry, so More should be clear")
|
||||
}
|
||||
last := second.Rows[len(second.Rows)-1]
|
||||
if last.Entry == nil || last.Entry.Main.Name != "Lihapullat" {
|
||||
t.Errorf("last row should be the oldest entry, got %+v", last.Entry)
|
||||
}
|
||||
}
|
||||
|
||||
func TestHistoryEmptyWithoutEntries(t *testing.T) {
|
||||
h := seeded(t)
|
||||
|
||||
page, err := history(h.db, time.UTC, today(time.UTC), 60, time.Time{})
|
||||
rows, err := history(h.db, time.UTC, 60)
|
||||
if err != nil {
|
||||
t.Fatalf("history: %v", err)
|
||||
}
|
||||
if len(page.Rows) != 0 {
|
||||
t.Errorf("%d rows for an empty log, want 0", len(page.Rows))
|
||||
}
|
||||
if page.More {
|
||||
t.Error("More is set although there is no history at all")
|
||||
}
|
||||
}
|
||||
|
||||
// A date picked from before the first entry ever logged used to fall outside
|
||||
// the window entirely: no row, so the log board had nothing to open in and the
|
||||
// day could not be filled in at all.
|
||||
func TestHistoryReachesDaysOlderThanTheFirstEntry(t *testing.T) {
|
||||
h := seeded(t)
|
||||
loc := time.UTC
|
||||
now := today(loc)
|
||||
|
||||
if err := saveEntry(h.db, now, h.mainNamed(t, "Lohikeitto"), nil); err != nil {
|
||||
t.Fatalf("save today: %v", err)
|
||||
}
|
||||
|
||||
want := now.AddDate(0, 0, -100)
|
||||
page, err := history(h.db, loc, now, 30, want)
|
||||
if err != nil {
|
||||
t.Fatalf("history: %v", err)
|
||||
}
|
||||
if len(page.Rows) != 101 {
|
||||
t.Fatalf("%d rows, want 101 (today back to the selected day)", len(page.Rows))
|
||||
}
|
||||
last := page.Rows[len(page.Rows)-1]
|
||||
if !last.Date.Equal(want) {
|
||||
t.Errorf("last row is %s, want the selected %s",
|
||||
last.Date.Format(dateLayout), want.Format(dateLayout))
|
||||
}
|
||||
if page.More {
|
||||
t.Error("More is set although the window reached past the oldest entry")
|
||||
}
|
||||
}
|
||||
|
||||
// The sides of every day come back in one query now; each still has to land on
|
||||
// its own day.
|
||||
func TestHistoryKeepsSidesWithTheirOwnDay(t *testing.T) {
|
||||
h := seeded(t)
|
||||
loc := time.UTC
|
||||
now := today(loc)
|
||||
|
||||
muusi := h.sideNamed(t, "Perunamuusi")
|
||||
riisi := h.sideNamed(t, "Riisi")
|
||||
if err := saveEntry(h.db, now, h.mainNamed(t, "Lohikeitto"), []int64{muusi}); err != nil {
|
||||
t.Fatalf("save today: %v", err)
|
||||
}
|
||||
if err := saveEntry(h.db, now.AddDate(0, 0, -1), h.mainNamed(t, "Lihapullat"), []int64{riisi}); err != nil {
|
||||
t.Fatalf("save -1: %v", err)
|
||||
}
|
||||
|
||||
page, err := history(h.db, loc, now, 30, time.Time{})
|
||||
if err != nil {
|
||||
t.Fatalf("history: %v", err)
|
||||
}
|
||||
if len(page.Rows) != 2 {
|
||||
t.Fatalf("%d rows, want 2", len(page.Rows))
|
||||
}
|
||||
for i, want := range []string{"Perunamuusi", "Riisi"} {
|
||||
got := page.Rows[i].Entry
|
||||
if got == nil || len(got.Sides) != 1 || got.Sides[0].Name != want {
|
||||
t.Errorf("row %d sides = %+v, want just %s", i, got.Sides, want)
|
||||
}
|
||||
if len(rows) != 0 {
|
||||
t.Errorf("%d rows for an empty log, want 0", len(rows))
|
||||
}
|
||||
}
|
||||
|
||||
+59
-295
@@ -1,7 +1,6 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
@@ -43,23 +42,6 @@ func dayURL(base string, d, now time.Time) string {
|
||||
return base + "?pvm=" + isoDate(d)
|
||||
}
|
||||
|
||||
// showURL turns a catalog page link into the patch endpoint behind it, so the
|
||||
// href and the Datastar call never drift apart.
|
||||
func showURL(pageURL string) string {
|
||||
return strings.Replace(pageURL, "/ruuat?", "/ruuat/nayta?", 1)
|
||||
}
|
||||
|
||||
// dayPatch is the endpoint behind every link in the day list. The href beside
|
||||
// it stays a real page URL for anyone without JavaScript; Datastar calls this
|
||||
// instead and swaps the list where it stands.
|
||||
func dayPatch(d time.Time, param string) string {
|
||||
url := "/paiva?pvm=" + isoDate(d)
|
||||
if param != "" {
|
||||
url += "&" + param
|
||||
}
|
||||
return url
|
||||
}
|
||||
|
||||
// pickSeparator joins a dish onto a day URL, which already carries ?pvm= for
|
||||
// any day but today.
|
||||
func pickSeparator(v logView) string {
|
||||
@@ -69,36 +51,6 @@ func pickSeparator(v logView) string {
|
||||
return "&"
|
||||
}
|
||||
|
||||
// stepURL is the page URL for a link inside the open day: the fallback when
|
||||
// there is no JavaScript to intercept it.
|
||||
func stepURL(v logView, param string) string {
|
||||
url := dayURL("/", v.Date, v.Today)
|
||||
if param != "" {
|
||||
url += pickSeparator(v) + param
|
||||
}
|
||||
return url
|
||||
}
|
||||
|
||||
// jsString renders a Go string as a JavaScript literal, for the data-signals
|
||||
// attribute that seeds the search box.
|
||||
func jsString(s string) string {
|
||||
b, err := json.Marshal(s)
|
||||
if err != nil {
|
||||
return `""`
|
||||
}
|
||||
return string(b)
|
||||
}
|
||||
|
||||
// searchURL is where the live search posts back to. The day travels in the
|
||||
// path so the board keeps rendering links for the right date; the search text
|
||||
// travels as a Datastar signal.
|
||||
func searchURL(v logView) string {
|
||||
if v.Date.Equal(v.Today) {
|
||||
return "/etsi"
|
||||
}
|
||||
return "/etsi?pvm=" + isoDate(v.Date)
|
||||
}
|
||||
|
||||
// categoryLabels lists a dish's categories in Finnish, for the catalog rows.
|
||||
func categoryLabels(d Dish) string {
|
||||
names := make([]string, 0, len(d.Categories))
|
||||
@@ -108,16 +60,6 @@ func categoryLabels(d Dish) string {
|
||||
return strings.Join(names, ", ")
|
||||
}
|
||||
|
||||
// pageTitle prefixes the tab title on any instance that is not production.
|
||||
// The tab is the only place a browser shows which of two identical apps you
|
||||
// are looking at.
|
||||
func pageTitle(title string) string {
|
||||
if envTag == "" {
|
||||
return title
|
||||
}
|
||||
return envTag + " · " + title
|
||||
}
|
||||
|
||||
// countFI renders "1 pääruoka" but "16 pääruokaa": Finnish takes the partitive
|
||||
// after every number except one.
|
||||
func countFI(n int, one, many string) string {
|
||||
@@ -140,7 +82,7 @@ templ page(title, current string) {
|
||||
// header rather than butting against it.
|
||||
<meta name="theme-color" media="(prefers-color-scheme: light)" content="#FFFFFF"/>
|
||||
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="#1C1E22"/>
|
||||
<title>{ pageTitle(title) }</title>
|
||||
<title>{ title }</title>
|
||||
<link rel="icon" href="/static/favicon.svg" type="image/svg+xml"/>
|
||||
<link rel="apple-touch-icon" href="/static/apple-touch-icon.png"/>
|
||||
<!-- use-credentials: the manifest is fetched behind Basic auth and
|
||||
@@ -220,10 +162,6 @@ templ categoryIcon(key string) {
|
||||
<span class="cat c-kasvis">
|
||||
@glyphKasvis()
|
||||
</span>
|
||||
case "tahteet":
|
||||
<span class="cat c-tahteet">
|
||||
@glyphTahteet()
|
||||
</span>
|
||||
default:
|
||||
<span class="cat">
|
||||
@glyphSekalaiset()
|
||||
@@ -231,15 +169,6 @@ templ categoryIcon(key string) {
|
||||
}
|
||||
}
|
||||
|
||||
// A lidded tub. Tähteet is not food and not a mixture of categories, so it
|
||||
// gets neither a category colour nor the quartered mark.
|
||||
templ glyphTahteet() {
|
||||
<svg viewBox="0 0 16 16" aria-hidden="true" focusable="false" fill="currentColor">
|
||||
<rect x="1.4" y="2.6" width="13.2" height="3" rx="1.3"></rect>
|
||||
<path d="M2.8 6.8h10.4l-.9 6.6a1.6 1.6 0 0 1-1.6 1.4H5.3a1.6 1.6 0 0 1-1.6-1.4z"></path>
|
||||
</svg>
|
||||
}
|
||||
|
||||
// A steak, its bone knocked out with fill-rule so the hole is transparent on
|
||||
// whatever background the icon lands on.
|
||||
templ glyphLiha() {
|
||||
@@ -318,30 +247,6 @@ templ logPage(v logView) {
|
||||
@daySwitch(v)
|
||||
</header>
|
||||
<main class="pad">
|
||||
@dayList(v)
|
||||
</main>
|
||||
}
|
||||
}
|
||||
|
||||
// dayList is the whole page: every day back through the window, with the
|
||||
// selected one expanded where it sits. Opening a day used to swap in a panel
|
||||
// above the list and drop that day out of it, so the rows below jumped up
|
||||
// under the tap. Now nothing moves — the row grows.
|
||||
templ dayList(v logView) {
|
||||
<section class="history" id="paivat">
|
||||
for i, row := range v.History.Rows {
|
||||
if i == 0 || v.History.Rows[i-1].Date.Month() != row.Date.Month() {
|
||||
<p class="monthrule">{ monthFI(row.Date) }</p>
|
||||
}
|
||||
if row.Date.Equal(v.Date) {
|
||||
<div class="open">
|
||||
<p class="openday">
|
||||
if row.Date.Equal(v.Today) {
|
||||
Tänään
|
||||
} else {
|
||||
{ longDateFI(row.Date) }
|
||||
}
|
||||
</p>
|
||||
switch {
|
||||
case v.Chosen != nil:
|
||||
@sidesStep(v)
|
||||
@@ -350,13 +255,26 @@ templ dayList(v logView) {
|
||||
default:
|
||||
@loggedCard(v)
|
||||
}
|
||||
</div>
|
||||
} else if row.Entry != nil {
|
||||
<a
|
||||
class="entry"
|
||||
href={ templ.SafeURL(dayURL("/", row.Date, v.Today)) }
|
||||
data-on:click__prevent={ "@get('" + dayPatch(row.Date, "") + "')" }
|
||||
>
|
||||
@historyList(v)
|
||||
</main>
|
||||
}
|
||||
}
|
||||
|
||||
// historyList sits under the day being logged: the two were always one thing,
|
||||
// since every row here is a link back into the logger above it.
|
||||
templ historyList(v logView) {
|
||||
<section class="history">
|
||||
<h3 class="sechead">Aiemmin</h3>
|
||||
if len(v.History) == 0 {
|
||||
<p class="muted small">Ei vielä merkintöjä.</p>
|
||||
}
|
||||
for i, row := range v.History {
|
||||
if !row.Date.Equal(v.Date) {
|
||||
if i == 0 || v.History[i-1].Date.Month() != row.Date.Month() {
|
||||
<p class="monthrule">{ monthFI(row.Date) }</p>
|
||||
}
|
||||
if row.Entry != nil {
|
||||
<a class="entry" href={ templ.SafeURL(dayURL("/", row.Date, v.Today)) }>
|
||||
<time>{ dayLabelFI(row.Date) }</time>
|
||||
<div>
|
||||
<div class="nm">
|
||||
@@ -368,23 +286,13 @@ templ dayList(v logView) {
|
||||
<span class="chev">›</span>
|
||||
</a>
|
||||
} else {
|
||||
<a
|
||||
class="gapline"
|
||||
href={ templ.SafeURL(dayURL("/", row.Date, v.Today)) }
|
||||
data-on:click__prevent={ "@get('" + dayPatch(row.Date, "") + "')" }
|
||||
>
|
||||
<a class="gapline" href={ templ.SafeURL(dayURL("/", row.Date, v.Today)) }>
|
||||
<time>{ dayLabelFI(row.Date) }</time>
|
||||
<span>Ei merkintää</span>
|
||||
<span class="act">Merkitse</span>
|
||||
</a>
|
||||
}
|
||||
}
|
||||
if v.History.More {
|
||||
<a
|
||||
class="more"
|
||||
href={ templ.SafeURL(dayURL("/", v.Date, v.Today) + pickSeparator(v) + "paivat=" + strconv.Itoa(v.HistoryMore)) }
|
||||
data-on:click__prevent={ "@get('" + dayPatch(v.Date, "paivat="+strconv.Itoa(v.HistoryMore)) + "')" }
|
||||
>Näytä lisää</a>
|
||||
}
|
||||
</section>
|
||||
}
|
||||
@@ -410,38 +318,16 @@ templ dayButton(label string, target, selected, now time.Time) {
|
||||
}
|
||||
}
|
||||
|
||||
// The form still works on its own: submitting reloads the page with ?haku=.
|
||||
// Datastar binds the same box to a signal and re-renders just the list as it
|
||||
// is typed into, so the live version is an enhancement rather than a
|
||||
// requirement.
|
||||
templ board(v logView) {
|
||||
<div data-signals:haku={ jsString(v.Search) }>
|
||||
<form method="get" action="/" class="searchrow">
|
||||
if !v.Date.Equal(v.Today) {
|
||||
<input type="hidden" name="pvm" value={ isoDate(v.Date) }/>
|
||||
}
|
||||
<input
|
||||
class="filter"
|
||||
type="search"
|
||||
name="haku"
|
||||
value={ v.Search }
|
||||
placeholder="Etsi tai lisää uusi"
|
||||
aria-label="Etsi"
|
||||
data-bind:haku
|
||||
data-on:input__debounce.250ms={ "@get('" + searchURL(v) + "')" }
|
||||
/>
|
||||
<input class="filter" type="search" name="haku" value={ v.Search } placeholder="Etsi tai lisää uusi" aria-label="Etsi"/>
|
||||
</form>
|
||||
@boardList(v)
|
||||
</div>
|
||||
}
|
||||
|
||||
// boardList is what Datastar patches: it carries the id, so a plain text/html
|
||||
// response is matched to it and swapped in place.
|
||||
templ boardList(v logView) {
|
||||
<div id="lauta">
|
||||
// Grouped by category, and inside each group the most-eaten first — so
|
||||
// a dish keeps a predictable neighbourhood while favourites still
|
||||
// surface at the top of it.
|
||||
// Grouped by category, and inside each group the most-eaten first — so a
|
||||
// dish keeps a predictable neighbourhood while favourites still surface
|
||||
// at the top of it.
|
||||
for _, g := range v.Groups {
|
||||
<h3 class="sechead">{ g.Label }</h3>
|
||||
<div class="board">
|
||||
@@ -450,33 +336,9 @@ templ boardList(v logView) {
|
||||
}
|
||||
</div>
|
||||
}
|
||||
// Tähteet is not food, so it sits apart from the categories rather
|
||||
// than inside one. Fixed size: it will be among the most-logged
|
||||
// entries, and it should not tower over the actual cooking.
|
||||
if len(v.Special) > 0 {
|
||||
<div class="special">
|
||||
for _, d := range v.Special {
|
||||
<a
|
||||
class="pill plain"
|
||||
href={ templ.SafeURL(stepURL(v, "ruoka="+strconv.FormatInt(d.ID, 10))) }
|
||||
data-on:click__prevent={ "@get('" + dayPatch(v.Date, "ruoka="+strconv.FormatInt(d.ID, 10)) + "')" }
|
||||
>
|
||||
@categoryIcon(d.CategoryKey())
|
||||
{ d.Name }
|
||||
if d.TimesEaten > 0 {
|
||||
<span class="n">{ strconv.Itoa(d.TimesEaten) }</span>
|
||||
}
|
||||
</a>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
// Tähteet always matches an empty search, so the add card keys off the
|
||||
// real dishes only: otherwise a fresh install would show leftovers and
|
||||
// no way to add anything.
|
||||
if len(v.Dishes) == 0 {
|
||||
@quickAddCard(v)
|
||||
}
|
||||
</div>
|
||||
}
|
||||
|
||||
// quickAddCard turns a search that found nothing into the thing to do next.
|
||||
@@ -495,11 +357,7 @@ templ quickAddCard(v logView) {
|
||||
if v.New.Err != "" {
|
||||
<p class="formerr">{ v.New.Err }</p>
|
||||
}
|
||||
<form
|
||||
method="post"
|
||||
action="/lisaa"
|
||||
data-on:submit__prevent="@post('/lisaa', {contentType: 'form'})"
|
||||
>
|
||||
<form method="post" action="/lisaa">
|
||||
<input type="hidden" name="pvm" value={ isoDate(v.Date) }/>
|
||||
<label class="field">
|
||||
<span>Nimi</span>
|
||||
@@ -530,8 +388,7 @@ templ quickAddCard(v logView) {
|
||||
templ dishPill(d Dish, v logView) {
|
||||
<a
|
||||
class={ "pill", d.Size() }
|
||||
href={ templ.SafeURL(stepURL(v, "ruoka="+strconv.FormatInt(d.ID, 10))) }
|
||||
data-on:click__prevent={ "@get('" + dayPatch(v.Date, "ruoka="+strconv.FormatInt(d.ID, 10)) + "')" }
|
||||
href={ templ.SafeURL(dayURL("/", v.Date, v.Today) + pickSeparator(v) + "ruoka=" + strconv.FormatInt(d.ID, 10)) }
|
||||
>
|
||||
@categoryIcon(d.CategoryKey())
|
||||
{ d.Name }
|
||||
@@ -547,11 +404,7 @@ templ sidesStep(v logView) {
|
||||
@categoryIcon(v.Chosen.CategoryKey())
|
||||
{ v.Chosen.Name }
|
||||
</h3>
|
||||
<form
|
||||
method="post"
|
||||
action="/kirjaa"
|
||||
data-on:submit__prevent="@post('/kirjaa', {contentType: 'form'})"
|
||||
>
|
||||
<form method="post" action="/kirjaa">
|
||||
<input type="hidden" name="pvm" value={ isoDate(v.Date) }/>
|
||||
<input type="hidden" name="ruoka" value={ strconv.FormatInt(v.Chosen.ID, 10) }/>
|
||||
if v.Chosen.HasSides && len(v.Sides) > 0 {
|
||||
@@ -573,11 +426,7 @@ templ sidesStep(v logView) {
|
||||
}
|
||||
<button class="primary" type="submit">Tallenna</button>
|
||||
</form>
|
||||
<a
|
||||
class="ghost"
|
||||
href={ templ.SafeURL(stepURL(v, "")) }
|
||||
data-on:click__prevent={ "@get('" + dayPatch(v.Date, "") + "')" }
|
||||
>Peruuta</a>
|
||||
<a class="ghost" href={ templ.SafeURL(dayURL("/", v.Date, v.Today)) }>Peruuta</a>
|
||||
</section>
|
||||
}
|
||||
|
||||
@@ -598,31 +447,21 @@ templ loggedCard(v logView) {
|
||||
if v.Confirming {
|
||||
<p class="q">Poistetaanko merkintä?</p>
|
||||
<div class="pair">
|
||||
<form
|
||||
method="post"
|
||||
action="/poista"
|
||||
data-on:submit__prevent="@post('/poista', {contentType: 'form'})"
|
||||
>
|
||||
<form method="post" action="/poista">
|
||||
<input type="hidden" name="pvm" value={ isoDate(v.Date) }/>
|
||||
<button class="btn del" type="submit">Kyllä, poista</button>
|
||||
</form>
|
||||
<a
|
||||
class="btn"
|
||||
href={ templ.SafeURL(stepURL(v, "")) }
|
||||
data-on:click__prevent={ "@get('" + dayPatch(v.Date, "") + "')" }
|
||||
>Peruuta</a>
|
||||
<a class="btn" href={ templ.SafeURL(dayURL("/", v.Date, v.Today)) }>Peruuta</a>
|
||||
</div>
|
||||
} else {
|
||||
<div class="pair">
|
||||
<a
|
||||
class="btn"
|
||||
href={ templ.SafeURL(stepURL(v, "muuta=1")) }
|
||||
data-on:click__prevent={ "@get('" + dayPatch(v.Date, "muuta=1") + "')" }
|
||||
href={ templ.SafeURL(dayURL("/", v.Date, v.Today) + pickSeparator(v) + "muuta=1") }
|
||||
>Muokkaa</a>
|
||||
<a
|
||||
class="btn del"
|
||||
href={ templ.SafeURL(stepURL(v, "poista=1")) }
|
||||
data-on:click__prevent={ "@get('" + dayPatch(v.Date, "poista=1") + "')" }
|
||||
href={ templ.SafeURL(dayURL("/", v.Date, v.Today) + pickSeparator(v) + "poista=1") }
|
||||
>Poista</a>
|
||||
</div>
|
||||
}
|
||||
@@ -642,46 +481,10 @@ templ catalogPage(v catalogView) {
|
||||
if v.Report != nil {
|
||||
@importReport(v.Report)
|
||||
}
|
||||
<div data-signals:haku={ jsString(v.Search) }>
|
||||
<form method="get" action="/ruuat" class="searchrow">
|
||||
<input
|
||||
class="filter"
|
||||
type="search"
|
||||
name="haku"
|
||||
value={ v.Search }
|
||||
placeholder="Etsi ruokaa"
|
||||
aria-label="Etsi"
|
||||
data-bind:haku
|
||||
data-on:input__debounce.250ms="@get('/ruuat/etsi')"
|
||||
/>
|
||||
</form>
|
||||
// The add and edit forms stay outside the patched fragment, or
|
||||
// typing in the search box would collapse a form mid-edit.
|
||||
@mainForm_(v.Main)
|
||||
@sideForm_(v.Side)
|
||||
@catalogList(v)
|
||||
</div>
|
||||
<details class="card">
|
||||
<summary>Tuo ruokia tiedostosta</summary>
|
||||
@importForm()
|
||||
</details>
|
||||
</main>
|
||||
}
|
||||
}
|
||||
|
||||
// catalogList carries the id Datastar patches, so typing in the search box
|
||||
// swaps the lists without touching the forms above them.
|
||||
//
|
||||
// Two levels of heading, because there are two: Pääruuat and Lisukkeet are
|
||||
// the halves of the catalog, and the categories are subdivisions of the
|
||||
// first. They were previously styled the same, which made a category look
|
||||
// like a peer of the entire side-dish list.
|
||||
templ catalogList(v catalogView) {
|
||||
<div id="ruokalista">
|
||||
<section class="section">
|
||||
@sectionTitle("Pääruuat", v.Mains)
|
||||
if v.Mains == 0 {
|
||||
@emptyNote(v.Search)
|
||||
<h3 class="sechead">Pääruuat</h3>
|
||||
<p class="muted small">Ei vielä pääruokia.</p>
|
||||
}
|
||||
// Grouped by category, alphabetical inside. The catalog is a list
|
||||
// you manage, so a predictable position beats a useful one.
|
||||
@@ -700,11 +503,10 @@ templ catalogList(v catalogView) {
|
||||
</div>
|
||||
}
|
||||
}
|
||||
</section>
|
||||
<section class="section">
|
||||
@sectionTitle("Lisukkeet", len(v.Sides))
|
||||
@sideForm_(v.Side)
|
||||
<h3 class="sechead">Lisukkeet</h3>
|
||||
if len(v.Sides) == 0 {
|
||||
@emptyNote(v.Search)
|
||||
<p class="muted small">Ei vielä lisukkeita.</p>
|
||||
}
|
||||
for _, s := range v.Sides {
|
||||
<div class="row">
|
||||
@@ -712,63 +514,36 @@ templ catalogList(v catalogView) {
|
||||
@rowActions(v, "/ruuat?muokkaa-lisuke="+strconv.FormatInt(s.ID, 10), s.ID, "lisuke")
|
||||
</div>
|
||||
}
|
||||
</section>
|
||||
</div>
|
||||
<details class="card">
|
||||
<summary>Tuo ruokia tiedostosta</summary>
|
||||
@importForm()
|
||||
</details>
|
||||
</main>
|
||||
}
|
||||
|
||||
templ sectionTitle(label string, n int) {
|
||||
<h2 class="sectiontitle">
|
||||
{ label }
|
||||
<span class="count">{ strconv.Itoa(n) }</span>
|
||||
</h2>
|
||||
}
|
||||
|
||||
templ emptyNote(search string) {
|
||||
<p class="muted small">
|
||||
if search == "" {
|
||||
Ei vielä mitään.
|
||||
} else {
|
||||
Ei osumia haulle { search }.
|
||||
}
|
||||
</p>
|
||||
}
|
||||
|
||||
// rowActions is a pencil and a bin, until the bin is tapped: then the row
|
||||
// asks. An icon is a smaller target to hit by accident than a word, and the
|
||||
// dish disappears from every picker the moment it goes.
|
||||
// Every control here is a real link or form, so the page still works without
|
||||
// JavaScript. Datastar intercepts them and patches the list in place instead,
|
||||
// which is the whole point: a delete confirmation halfway down a long list
|
||||
// must not send the browser back to the top.
|
||||
templ rowActions(v catalogView, editURL string, id int64, kind string) {
|
||||
if v.DeleteID == id && v.DeleteKind == kind {
|
||||
<div class="rowactions confirming">
|
||||
<span>Poista?</span>
|
||||
<form
|
||||
method="post"
|
||||
action="/ruuat/poista"
|
||||
data-on:submit__prevent="@post('/ruuat/poista', {contentType: 'form'})"
|
||||
>
|
||||
<form method="post" action="/ruuat/poista">
|
||||
<input type="hidden" name="id" value={ strconv.FormatInt(id, 10) }/>
|
||||
<input type="hidden" name="tyyppi" value={ kind }/>
|
||||
<button type="submit" class="del">Kyllä</button>
|
||||
</form>
|
||||
<a href="/ruuat" data-on:click__prevent="@get('/ruuat/nayta')">Peruuta</a>
|
||||
<a href="/ruuat">Peruuta</a>
|
||||
</div>
|
||||
} else {
|
||||
<div class="rowactions">
|
||||
<a
|
||||
href={ templ.SafeURL(editURL) }
|
||||
data-on:click__prevent={ "@get('" + showURL(editURL) + "')" }
|
||||
aria-label="Muokkaa"
|
||||
title="Muokkaa"
|
||||
>
|
||||
<a href={ templ.SafeURL(editURL) } aria-label="Muokkaa" title="Muokkaa">
|
||||
@iconPencil()
|
||||
</a>
|
||||
<a
|
||||
class="del"
|
||||
href={ templ.SafeURL("/ruuat?poista=" + strconv.FormatInt(id, 10) + "&tyyppi=" + kind) }
|
||||
data-on:click__prevent={ "@get('/ruuat/nayta?poista=" + strconv.FormatInt(id, 10) + "&tyyppi=" + kind + "')" }
|
||||
aria-label="Poista"
|
||||
title="Poista"
|
||||
>
|
||||
@@ -792,26 +567,19 @@ templ iconTrash() {
|
||||
</svg>
|
||||
}
|
||||
|
||||
// Collapsed by default so the page opens on the catalog rather than on two
|
||||
// screens of empty form. Forced open when editing or after a rejected
|
||||
// submission, since the form is then the thing that needs attention.
|
||||
templ mainForm_(f mainForm) {
|
||||
<details class="card addform" id="paaruoka" open?={ f.ID != 0 || f.Err != "" }>
|
||||
<summary>
|
||||
<section class="card" id="paaruoka">
|
||||
<h3>
|
||||
if f.ID == 0 {
|
||||
Lisää pääruoka
|
||||
} else {
|
||||
Muokkaa pääruokaa
|
||||
}
|
||||
</summary>
|
||||
</h3>
|
||||
if f.Err != "" {
|
||||
<p class="formerr">{ f.Err }</p>
|
||||
}
|
||||
<form
|
||||
method="post"
|
||||
action="/ruuat/paaruoka"
|
||||
data-on:submit__prevent="@post('/ruuat/paaruoka', {contentType: 'form'})"
|
||||
>
|
||||
<form method="post" action="/ruuat/paaruoka">
|
||||
if f.ID != 0 {
|
||||
<input type="hidden" name="id" value={ strconv.FormatInt(f.ID, 10) }/>
|
||||
}
|
||||
@@ -839,9 +607,9 @@ templ mainForm_(f mainForm) {
|
||||
<button class="primary" type="submit">Tallenna</button>
|
||||
</form>
|
||||
if f.ID != 0 {
|
||||
<a class="ghost" href="/ruuat" data-on:click__prevent="@get('/ruuat/nayta')">Peruuta</a>
|
||||
<a class="ghost" href="/ruuat">Peruuta</a>
|
||||
}
|
||||
</details>
|
||||
</section>
|
||||
}
|
||||
|
||||
templ categoryChip(value, label string, f mainForm) {
|
||||
@@ -857,22 +625,18 @@ templ categoryChip(value, label string, f mainForm) {
|
||||
}
|
||||
|
||||
templ sideForm_(f sideForm) {
|
||||
<details class="card addform" id="lisuke" open?={ f.ID != 0 || f.Err != "" }>
|
||||
<summary>
|
||||
<section class="card" id="lisuke">
|
||||
<h3>
|
||||
if f.ID == 0 {
|
||||
Lisää lisuke
|
||||
} else {
|
||||
Muokkaa lisuketta
|
||||
}
|
||||
</summary>
|
||||
</h3>
|
||||
if f.Err != "" {
|
||||
<p class="formerr">{ f.Err }</p>
|
||||
}
|
||||
<form
|
||||
method="post"
|
||||
action="/ruuat/lisuke"
|
||||
data-on:submit__prevent="@post('/ruuat/lisuke', {contentType: 'form'})"
|
||||
>
|
||||
<form method="post" action="/ruuat/lisuke">
|
||||
if f.ID != 0 {
|
||||
<input type="hidden" name="id" value={ strconv.FormatInt(f.ID, 10) }/>
|
||||
}
|
||||
@@ -883,9 +647,9 @@ templ sideForm_(f sideForm) {
|
||||
<button class="primary" type="submit">Tallenna</button>
|
||||
</form>
|
||||
if f.ID != 0 {
|
||||
<a class="ghost" href="/ruuat" data-on:click__prevent="@get('/ruuat/nayta')">Peruuta</a>
|
||||
<a class="ghost" href="/ruuat">Peruuta</a>
|
||||
}
|
||||
</details>
|
||||
</section>
|
||||
}
|
||||
|
||||
templ importForm() {
|
||||
|
||||
+9
-13
@@ -1,23 +1,19 @@
|
||||
services:
|
||||
app:
|
||||
image: ${REPO:?set REPO in .env}:${TAG:-latest}
|
||||
image: ${FOODSTER_REPO:?set FOODSTER_REPO in .env}:${FOODSTER_TAG:-latest}
|
||||
restart: unless-stopped
|
||||
|
||||
# A bind mount rather than a named volume: the database sits in ./data on
|
||||
# the host, where it can be listed, copied and backed up without going
|
||||
# through the container engine. The image runs as UID 65534, so the
|
||||
# container has to be told which host user owns that directory.
|
||||
#
|
||||
# PUID/PGID rather than UID/GID: UID is a read-only variable in bash, so a
|
||||
# value set here would be silently replaced by the invoking shell's own.
|
||||
user: "${PUID:-1000}:${PGID:-1000}"
|
||||
# The database is a bind mount, not a named volume: it sits in ./data on
|
||||
# the host where it can be listed, copied and opened with any sqlite
|
||||
# client. The image runs as UID 65534, so the container has to be told
|
||||
# which host user owns that directory.
|
||||
user: "${FOODSTER_UID:-1000}:${FOODSTER_GID:-1000}"
|
||||
volumes:
|
||||
- ./data:/data
|
||||
|
||||
environment:
|
||||
PASSWORD: ${PASSWORD:?set PASSWORD in .env}
|
||||
DB: /data/foodster.db
|
||||
ENV: ${ENV:-prod}
|
||||
FOODSTER_PASSWORD: ${FOODSTER_PASSWORD:?set FOODSTER_PASSWORD in .env}
|
||||
FOODSTER_DB: /data/foodster.db
|
||||
TZ: ${TZ:-Europe/Helsinki}
|
||||
|
||||
# No published ports: Traefik reaches the container over the shared
|
||||
@@ -26,7 +22,7 @@ services:
|
||||
labels:
|
||||
- traefik.enable=true
|
||||
- traefik.http.routers.foodster.entrypoints=websecure
|
||||
- traefik.http.routers.foodster.rule=Host(`${HOST:?set HOST in .env}`)
|
||||
- traefik.http.routers.foodster.rule=Host(`${FOODSTER_HOST:?set FOODSTER_HOST in .env}`)
|
||||
- traefik.http.routers.foodster.tls=true
|
||||
- traefik.http.services.foodster.loadbalancer.server.port=8080
|
||||
- traefik.docker.network=traefik
|
||||
|
||||
+18
-111
@@ -11,18 +11,12 @@ cd "$(dirname "$0")/.."
|
||||
|
||||
addr=127.0.0.1:8099
|
||||
pass=smoke
|
||||
|
||||
# Dates are relative, never literal. A hardcoded one turns into "some day in
|
||||
# the past" at the next midnight, and the assertions quietly start meaning
|
||||
# something else.
|
||||
d0=$(date +%F)
|
||||
d1=$(date -d yesterday +%F)
|
||||
tmp=$(mktemp -d)
|
||||
trap 'kill ${srv:-0} 2>/dev/null || true; rm -rf "$tmp"' EXIT
|
||||
|
||||
go build -o "$tmp/foodster" ./cmd/foodster
|
||||
|
||||
PASSWORD="$pass" DB="$tmp/smoke.db" ADDR="$addr" \
|
||||
FOODSTER_PASSWORD="$pass" FOODSTER_DB="$tmp/smoke.db" FOODSTER_ADDR="$addr" \
|
||||
"$tmp/foodster" >"$tmp/server.log" 2>&1 &
|
||||
srv=$!
|
||||
|
||||
@@ -78,8 +72,6 @@ check "theme script is served" \
|
||||
|
||||
home=$(curl -s -u ":$pass" "http://$addr/")
|
||||
check "the header carries the brand" "$home" "Foodster"
|
||||
# ENV is unset here, so this instance is production and unmarked.
|
||||
check "production tabs are not tagged" "$home" "<title>Foodster</title>"
|
||||
check "dark is the default without JavaScript" "$home" '<html lang="fi" data-theme="dark">'
|
||||
check "the theme toggle is present" "$home" "data-theme-toggle"
|
||||
check "both theme icons ship so CSS can pick one" "$home" 'class="i-moon"'
|
||||
@@ -122,11 +114,6 @@ check "malformed JSON is explained" \
|
||||
board=$(curl -s -u ":$pass" "http://$addr/")
|
||||
check "board lists imported dishes" "$board" "Lihapullat"
|
||||
|
||||
# Tähteet is loggable but is not food: on the board, never in the catalog.
|
||||
check "leftovers are on the board" "$board" "Tähteet"
|
||||
refute "leftovers are not in the catalog" \
|
||||
"$(curl -s -u ":$pass" "http://$addr/ruuat")" "Tähteet"
|
||||
|
||||
# Pull a real dish id out of the board rather than assuming one.
|
||||
ruoka=$(printf '%s' "$board" | grep -o 'ruoka=[0-9]*' | head -n1 | cut -d= -f2)
|
||||
if [ -z "$ruoka" ]; then
|
||||
@@ -140,79 +127,29 @@ check "picking a dish opens the sides step" \
|
||||
|
||||
check "saving redirects back to the day" \
|
||||
"$(curl -s -o /dev/null -w '%{http_code}' -u ":$pass" \
|
||||
-d "pvm=$d0&ruoka=$ruoka" "http://$addr/kirjaa")" "303"
|
||||
-d "pvm=2026-09-05&ruoka=$ruoka" "http://$addr/kirjaa")" "303"
|
||||
|
||||
check "the saved day shows what was eaten" \
|
||||
"$(curl -s -u ":$pass" "http://$addr/?pvm=$d0")" "kirjattu"
|
||||
"$(curl -s -u ":$pass" "http://$addr/?pvm=2026-09-05")" "kirjattu"
|
||||
|
||||
# The selected day expands inside the list rather than in a panel above it,
|
||||
# so the rows below do not shift when one is tapped.
|
||||
day=$(curl -s -u ":$pass" "http://$addr/?pvm=$d0")
|
||||
check "the selected day expands in place" "$day" 'class="open"'
|
||||
check "and stays in the list rather than being lifted out" "$day" "kirjattu"
|
||||
|
||||
# ---- the day list patches in place instead of navigating ----------------
|
||||
|
||||
dayp=$(curl -s -u ":$pass" -H 'Datastar-Request: true' "http://$addr/paiva?pvm=$d0")
|
||||
check "opening a day patches the list" "$dayp" 'id="paivat"'
|
||||
refute "and returns a fragment, not a page" "$dayp" "<html"
|
||||
|
||||
check "picking a dish patches to the sides step" \
|
||||
"$(curl -s -u ":$pass" -H 'Datastar-Request: true' \
|
||||
"http://$addr/paiva?pvm=$d0&ruoka=$ruoka")" "Tallenna"
|
||||
|
||||
check "saving from Datastar patches back" \
|
||||
"$(curl -s -u ":$pass" -H 'Datastar-Request: true' \
|
||||
-d "pvm=$d1&ruoka=$ruoka" "http://$addr/kirjaa")" 'id="paivat"'
|
||||
|
||||
check "deleting from Datastar patches back" \
|
||||
"$(curl -s -u ":$pass" -H 'Datastar-Request: true' \
|
||||
-d "pvm=$d1" "http://$addr/poista")" 'id="paivat"'
|
||||
|
||||
# Without the header it must still redirect, for no JavaScript.
|
||||
check "a plain save still redirects to the day" \
|
||||
"$(curl -s -o /dev/null -w '%{redirect_url}' -u ":$pass" \
|
||||
-d "pvm=$d1&ruoka=$ruoka" "http://$addr/kirjaa")" "pvm=$d1"
|
||||
check "history is on the same page as the logger" \
|
||||
"$(curl -s -u ":$pass" "http://$addr/")" "Aiemmin"
|
||||
|
||||
# Deleting a logged meal drops the row outright, so it asks first.
|
||||
saved=$(curl -s -u ":$pass" "http://$addr/?pvm=$d0&poista=1")
|
||||
saved=$(curl -s -u ":$pass" "http://$addr/?pvm=2026-09-05&poista=1")
|
||||
check "deleting a meal asks first" "$saved" "Poistetaanko merkintä?"
|
||||
# Assert the entry is still shown, rather than that no gap row exists anywhere
|
||||
# on the page: other days are legitimately unlogged and render their own.
|
||||
check "and the entry is still there while asking" "$saved" "kirjattu"
|
||||
refute "and does not delete while asking" "$saved" "Ei merkintää"
|
||||
|
||||
check "deleting redirects back" \
|
||||
"$(curl -s -o /dev/null -w '%{http_code}' -u ":$pass" \
|
||||
-d "pvm=$d0" "http://$addr/poista")" "303"
|
||||
-d "pvm=2026-09-05" "http://$addr/poista")" "303"
|
||||
|
||||
check "the day is empty again" \
|
||||
"$(curl -s -u ":$pass" "http://$addr/?pvm=$d0")" "Etsi"
|
||||
"$(curl -s -u ":$pass" "http://$addr/?pvm=2026-09-05")" "Etsi"
|
||||
|
||||
check "search filters the board" \
|
||||
"$(curl -s -u ":$pass" "http://$addr/?haku=keitto")" "keitto"
|
||||
|
||||
# ---- live search: Datastar sends signals as JSON in ?datastar= -----------
|
||||
|
||||
live=$(curl -s -u ":$pass" --get --data-urlencode 'datastar={"haku":"keitto"}' "http://$addr/etsi")
|
||||
check "live search returns the board fragment" "$live" 'id="lauta"'
|
||||
check "live search applies the term" "$live" "keitto"
|
||||
refute "live search excludes non-matches" "$live" "Lihapullat"
|
||||
refute "the fragment is not a whole page" "$live" "<html"
|
||||
|
||||
check "live search is served as html for Datastar to patch" \
|
||||
"$(curl -s -o /dev/null -w '%{content_type}' -u ":$pass" \
|
||||
--get --data-urlencode 'datastar={"haku":"keitto"}' "http://$addr/etsi")" \
|
||||
"text/html"
|
||||
|
||||
cat_live=$(curl -s -u ":$pass" --get --data-urlencode 'datastar={"haku":"riisi"}' "http://$addr/ruuat/etsi")
|
||||
check "catalog live search returns its fragment" "$cat_live" 'id="ruokalista"'
|
||||
check "catalog live search matches sides too" "$cat_live" "Riisi"
|
||||
refute "catalog live search excludes non-matches" "$cat_live" "Lihapullat"
|
||||
|
||||
# The plain form still works without JavaScript.
|
||||
check "catalog search works as a plain form too" \
|
||||
"$(curl -s -u ":$pass" "http://$addr/ruuat?haku=riisi")" "Riisi"
|
||||
|
||||
# Nothing was eaten tomorrow. A future date is clamped rather than logged.
|
||||
future=$(date -d '+30 days' +%Y-%m-%d)
|
||||
check "a future date falls back to today" \
|
||||
@@ -248,12 +185,9 @@ check "the quick-added dish is on the board" \
|
||||
|
||||
# ---- catalog CRUD from the UI -------------------------------------------
|
||||
|
||||
# Assert where it redirects, not just that it does: these pointed at the old
|
||||
# /ruoat spelling for a while and every 303-only check was happy.
|
||||
check "adding a main redirects back to the catalog" \
|
||||
"$(curl -s -o /dev/null -w '%{redirect_url}' -u ":$pass" \
|
||||
-d 'nimi=uunikala&kategoria=fish&lisukkeita=1' "http://$addr/ruuat/paaruoka")" \
|
||||
"/ruuat"
|
||||
check "adding a main redirects" \
|
||||
"$(curl -s -o /dev/null -w '%{http_code}' -u ":$pass" \
|
||||
-d 'nimi=uunikala&kategoria=fish&lisukkeita=1' "http://$addr/ruuat/paaruoka")" "303"
|
||||
|
||||
catalog=$(curl -s -u ":$pass" "http://$addr/ruuat")
|
||||
check "the new main is listed, sentence-cased" "$catalog" "Uunikala"
|
||||
@@ -270,10 +204,9 @@ check "a nameless dish is refused" \
|
||||
"$(curl -s -u ":$pass" -d 'nimi=+++&kategoria=fish' "http://$addr/ruuat/paaruoka")" \
|
||||
"Anna nimi."
|
||||
|
||||
check "adding a side redirects back to the catalog" \
|
||||
"$(curl -s -o /dev/null -w '%{redirect_url}' -u ":$pass" \
|
||||
-d 'nimi=lohkoperunat' "http://$addr/ruuat/lisuke")" \
|
||||
"/ruuat"
|
||||
check "adding a side redirects" \
|
||||
"$(curl -s -o /dev/null -w '%{http_code}' -u ":$pass" \
|
||||
-d 'nimi=lohkoperunat' "http://$addr/ruuat/lisuke")" "303"
|
||||
|
||||
check "the new side is listed" \
|
||||
"$(curl -s -u ":$pass" "http://$addr/ruuat")" "Lohkoperunat"
|
||||
@@ -296,35 +229,9 @@ check "the bin asks before deleting" \
|
||||
check "the dish is still there while it asks" \
|
||||
"$(curl -s -u ":$pass" "http://$addr/ruuat?poista=$uusi&tyyppi=paa")" "Uunikala"
|
||||
|
||||
# ---- the catalog patches in place instead of navigating -----------------
|
||||
|
||||
# A delete confirmation halfway down a long list must not send the browser
|
||||
# back to the top, so these answer with a Datastar patch rather than a page.
|
||||
patch=$(curl -s -u ":$pass" -H 'Datastar-Request: true' \
|
||||
"http://$addr/ruuat/nayta?poista=$uusi&tyyppi=paa")
|
||||
check "asking to delete patches rather than navigates" "$patch" "event: datastar-patch-elements"
|
||||
check "the patch carries the list" "$patch" 'id="ruokalista"'
|
||||
check "and both forms, so an open one closes" "$patch" 'id="paaruoka"'
|
||||
check "the row it patches in is asking" "$patch" "Poista?"
|
||||
|
||||
check "patches are served as an event stream" \
|
||||
"$(curl -s -o /dev/null -w '%{content_type}' -u ":$pass" -H 'Datastar-Request: true' \
|
||||
"http://$addr/ruuat/nayta")" "text/event-stream"
|
||||
|
||||
check "deleting from Datastar patches too" \
|
||||
"$(curl -s -u ":$pass" -H 'Datastar-Request: true' \
|
||||
-d "id=$uusi&tyyppi=paa" "http://$addr/ruuat/poista")" \
|
||||
"event: datastar-patch-elements"
|
||||
|
||||
refute "and the dish is gone from the patched list" \
|
||||
"$(curl -s -u ":$pass" -H 'Datastar-Request: true' "http://$addr/ruuat/nayta")" \
|
||||
"Uunikala"
|
||||
|
||||
# Without the header it must still be an ordinary redirect, for no JavaScript.
|
||||
check "a plain form post still redirects" \
|
||||
"$(curl -s -o /dev/null -w '%{redirect_url}' -u ":$pass" \
|
||||
-d 'nimi=Testiruoka&kategoria=fish' "http://$addr/ruuat/paaruoka")" \
|
||||
"/ruuat"
|
||||
check "confirming the delete redirects" \
|
||||
"$(curl -s -o /dev/null -w '%{http_code}' -u ":$pass" \
|
||||
-d "id=$uusi&tyyppi=paa" "http://$addr/ruuat/poista")" "303"
|
||||
|
||||
refute "the dish is gone once confirmed" \
|
||||
"$(curl -s -u ":$pass" "http://$addr/ruuat")" "Uunikala"
|
||||
|
||||
+8
-45
@@ -1,56 +1,19 @@
|
||||
{
|
||||
"mains": [
|
||||
{"name": "Jauheliha-perunasiivu pelti", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Jauhelihakastike", "categories": ["meat"], "has_sides": true},
|
||||
{"name": "Jauhelihakeitto", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Jauhelihapihvit", "categories": ["meat"], "has_sides": true},
|
||||
{"name": "Kebab", "categories": ["meat"], "has_sides": true},
|
||||
{"name": "Kinkkukiusaus", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Lasagnette", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Lihapullat/pihvit", "categories": ["meat"], "has_sides": true},
|
||||
{"name": "Makaronilaatikko", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Makaronimössö", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Maksalaatikko", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Nachopelti", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Nakkikeitto", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Pakastepizza", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Possunsuikalekastike", "categories": ["meat"], "has_sides": true},
|
||||
{"name": "Possurisotto", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Pyttipannu", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Uuniliha", "categories": ["meat"], "has_sides": true},
|
||||
{"name": "Uunimakkara", "categories": ["meat"], "has_sides": true},
|
||||
|
||||
{"name": "Broilerin koipireidet", "categories": ["chicken"], "has_sides": true},
|
||||
{"name": "Kanakastike", "categories": ["chicken"], "has_sides": true},
|
||||
{"name": "Kanakeitto", "categories": ["chicken"], "has_sides": false},
|
||||
{"name": "Kanamakaronilaatikko", "categories": ["chicken"], "has_sides": false},
|
||||
{"name": "Kanapasta", "categories": ["chicken"], "has_sides": false},
|
||||
{"name": "Kanarisotto", "categories": ["chicken"], "has_sides": false},
|
||||
|
||||
{"name": "Kalakeitto", "categories": ["fish"], "has_sides": false},
|
||||
{"name": "Lohicuscus-salaatti", "categories": ["fish"], "has_sides": false},
|
||||
{"name": "Lohipyörykät", "categories": ["fish"], "has_sides": true},
|
||||
{"name": "Uunilohi", "categories": ["fish"], "has_sides": true},
|
||||
{"name": "Uuniperunat (lohitäytteellä)", "categories": ["fish"], "has_sides": false},
|
||||
|
||||
{"name": "Hernekeitto", "categories": ["vegetarian"], "has_sides": false},
|
||||
{"name": "Italianpata (lihaton)", "categories": ["vegetarian"], "has_sides": true},
|
||||
{"name": "Kasvispihvit", "categories": ["vegetarian"], "has_sides": true},
|
||||
{"name": "Kasvissosekeitto", "categories": ["vegetarian"], "has_sides": false},
|
||||
{"name": "Pinaattiletut", "categories": ["vegetarian"], "has_sides": false},
|
||||
{"name": "Lasagnette", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Jauhelihakastike", "categories": ["meat"], "has_sides": true},
|
||||
{"name": "Risotto", "categories": ["vegetarian"], "has_sides": false},
|
||||
|
||||
{"name": "Tortillat", "categories": ["meat", "chicken", "fish", "vegetarian"], "has_sides": false}
|
||||
{"name": "Pakastepizza", "categories": ["meat"], "has_sides": false},
|
||||
{"name": "Kanakeitto", "categories": ["chicken"], "has_sides": false},
|
||||
{"name": "Kasvissosekeitto", "categories": ["vegetarian"], "has_sides": false}
|
||||
],
|
||||
"sides": [
|
||||
{"name": "Keitetyt perunat"},
|
||||
{"name": "Lohkoperunat"},
|
||||
{"name": "Muusi"},
|
||||
{"name": "Pasta"},
|
||||
{"name": "Ranskalaiset"},
|
||||
{"name": "Lohkoperunat"},
|
||||
{"name": "Muussi"},
|
||||
{"name": "Riisi"},
|
||||
{"name": "Spagetti"},
|
||||
{"name": "Tillikastike"},
|
||||
{"name": "Wokkivihannekset"}
|
||||
{"name": "Pasta"}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user